Skip to content

Commit 6824961

Browse files
terryyylimterryyylim
authored
Update MLP dependency references (#333)
* Update mlp repository reference * Update MLP library version
1 parent 7390e9e commit 6824961

File tree

154 files changed

+267
-247
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+267
-247
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Refer to the README under the individual directories for getting started with th
3636

3737
The following guide will help you quickly get started with running Turing.
3838
Turing requires these infrastructure dependencies in order to function properly:
39-
- [MLP](https://github.com/gojek/mlp) API server to namespace Turing routers
39+
- [MLP](https://github.com/caraml-dev/mlp) API server to namespace Turing routers
4040
- [Merlin](https://github.com/caraml-dev/merlin) API server to manage environments where Turing routers are deployed
4141
- [Kubernetes](https://kubernetes.io/) cluster (with [Knative Serving](https://knative.dev/docs/serving/) and [Istio](https://istio.io/) installed and [Spark on K8s Operator](https://github.com/GoogleCloudPlatform/spark-on-k8s-operator)) to provision and manage Turing router workloads (Note that our local setup does not install Spark on K8s Operator as of writing)
4242
- [Vault](https://www.vaultproject.io/) to store deployment and user secrets

‎api/e2e/test/cluster/cluster.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"path/filepath"
77
"reflect"
88

9-
mlpcluster "github.com/gojek/mlp/api/pkg/cluster"
9+
mlpcluster "github.com/caraml-dev/mlp/api/pkg/cluster"
1010
"github.com/pkg/errors"
1111
"istio.io/client-go/pkg/apis/networking/v1alpha3"
1212
networkingv1alpha3 "istio.io/client-go/pkg/clientset/versioned/typed/networking/v1alpha3"

‎api/e2e/test/config/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"strings"
88
"time"
99

10+
mlpcluster "github.com/caraml-dev/mlp/api/pkg/cluster"
1011
"github.com/gavv/httpexpect/v2"
1112
"github.com/go-playground/validator/v10"
12-
mlpcluster "github.com/gojek/mlp/api/pkg/cluster"
1313
"github.com/mitchellh/mapstructure"
1414
"github.com/spf13/viper"
1515
"github.com/stretchr/testify/assert"

‎api/go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ require (
88
github.com/GoogleCloudPlatform/spark-on-k8s-operator v0.0.0-20220214044918-55732a6a392c
99
github.com/antihax/optional v1.0.0
1010
github.com/caraml-dev/merlin v0.0.0
11+
github.com/caraml-dev/mlp v1.7.6
1112
github.com/caraml-dev/turing/engines/experiment v0.0.0
1213
github.com/caraml-dev/turing/engines/router v0.0.0
1314
github.com/caraml-dev/universal-prediction-interface v0.3.4
@@ -16,7 +17,6 @@ require (
1617
github.com/ghodss/yaml v1.0.0
1718
github.com/go-playground/validator/v10 v10.11.1
1819
github.com/gojek/fiber v0.2.1-rc2
19-
github.com/gojek/mlp v1.7.6-0.20230329030735-c28dca2aeef9
2020
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
2121
github.com/golang-migrate/migrate/v4 v4.11.0
2222
github.com/google/go-cmp v0.5.9
@@ -100,7 +100,7 @@ require (
100100
github.com/google/go-querystring v1.0.0 // indirect
101101
github.com/google/gofuzz v1.2.0 // indirect
102102
github.com/google/uuid v1.3.0 // indirect
103-
github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
103+
github.com/googleapis/enterprise-certificate-proxy v0.2.1 // indirect
104104
github.com/googleapis/gnostic v0.5.5 // indirect
105105
github.com/gorilla/websocket v1.4.2 // indirect
106106
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.2 // indirect
@@ -186,9 +186,9 @@ require (
186186
golang.org/x/text v0.7.0 // indirect
187187
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
188188
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
189-
google.golang.org/api v0.103.0 // indirect
189+
google.golang.org/api v0.106.0 // indirect
190190
google.golang.org/appengine v1.6.7 // indirect
191-
google.golang.org/genproto v0.0.0-20230104163317-caabf589fcbf // indirect
191+
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
192192
gopkg.in/errgo.v2 v2.1.0 // indirect
193193
gopkg.in/inf.v0 v0.9.1 // indirect
194194
gopkg.in/ini.v1 v1.63.2 // indirect

‎api/go.sum‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,8 @@ github.com/cactus/go-statsd-client/statsd v0.0.0-20200423205355-cb0885a1018c/go.
243243
github.com/caraml-dev/merlin/api v0.0.0-20230403075012-795947162429 h1:utxGPa/erqKIUhgBFMgnbORjKUIqVKLs7VXa0ZB0jNY=
244244
github.com/caraml-dev/merlin/api v0.0.0-20230403075012-795947162429/go.mod h1:BRGKVbv3zEu9rE6pE2RNlj/IZfqy/3HEqBQGLK5rHMc=
245245
github.com/caraml-dev/merlin/python/batch-predictor v0.0.0-20230403075012-795947162429/go.mod h1:jYSIcxx7FDccKSva3mo12YhQ0rYuP4MOEbgSveY82HE=
246+
github.com/caraml-dev/mlp v1.7.6 h1:u3OvbtPY7w/j9z7WO9YwhKJA0Y0Qy6OzanREfeA7os4=
247+
github.com/caraml-dev/mlp v1.7.6/go.mod h1:ahdKpb/SKFEyHE6817AOh0b2fyroTzJmXM8U+2BG75M=
246248
github.com/caraml-dev/universal-prediction-interface v0.3.4 h1:cPytzpjXE/8RhSw3iS0JFZzNdM3tJ/l8UcHTPrxQWEo=
247249
github.com/caraml-dev/universal-prediction-interface v0.3.4/go.mod h1:e0qmFOXQxx8HFg5ObYyQO3WVnrqsr5v5JApFmeF7eJo=
248250
github.com/casbin/casbin v1.7.0/go.mod h1:c67qKN6Oum3UF5Q1+BByfFxkwKvhwW57ITjqwtzR1KE=
@@ -726,8 +728,6 @@ github.com/gojek/fiber v0.2.1-rc2 h1:hJPaH4jDlIBhfRKQby2CISPnbSh7vx5S996IvuXA34U
726728
github.com/gojek/fiber v0.2.1-rc2/go.mod h1:R5cRkUnXdTLpdchCkm3lmGJS+nfhPhLDOklRq1T65Jg=
727729
github.com/gojek/heimdall/v7 v7.0.2/go.mod h1:Z43HtMid7ysSjmsedPTXAki6jcdcNVnjn5pmsTyiMic=
728730
github.com/gojek/mlp v0.0.0-20201002030420-4e35e69a9ab8/go.mod h1:IjQCiAzap7TZRZVZ4r2RdzVTuAzoyR5el2GgEu2X1FM=
729-
github.com/gojek/mlp v1.7.6-0.20230329030735-c28dca2aeef9 h1:R6sFh5lqE8ulke5nDQrLTQPbsNhk80gMeBC7qcOoBeo=
730-
github.com/gojek/mlp v1.7.6-0.20230329030735-c28dca2aeef9/go.mod h1:HJDSyFXHB9FG479T0mrQ6cBDdftZ7an/3HfFxRGu3BA=
731731
github.com/gojek/valkyrie v0.0.0-20180215180059-6aee720afcdf/go.mod h1:QzhUKaYKJmcbTnCYCAVQrroCOY7vOOI8cSQ4NbuhYf0=
732732
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 h1:zN2lZNZRflqFyxVaTIU61KNKQ9C0055u9CAfpmqUvo4=
733733
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3/go.mod h1:nPpo7qLxd6XL3hWJG/O60sR8ZKfMCiIoNap5GvD12KU=
@@ -849,15 +849,17 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
849849
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
850850
github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
851851
github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
852-
github.com/googleapis/enterprise-certificate-proxy v0.2.0 h1:y8Yozv7SZtlU//QXbezB6QkpuE6jMD2/gfzk4AftXjs=
853-
github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
852+
github.com/googleapis/enterprise-certificate-proxy v0.2.1 h1:RY7tHKZcRlk788d5WSo/e83gOyyy742E8GSs771ySpg=
853+
github.com/googleapis/enterprise-certificate-proxy v0.2.1/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
854+
github.com/googleapis/gax-go v1.0.0 h1:JnjRrtym4tFyMe2kvEN1vyuG482TwL0dKqb+UWsZB1U=
854855
github.com/googleapis/gax-go v1.0.0/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
855856
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
856857
github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
857858
github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
858859
github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM=
859860
github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM=
860861
github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c=
862+
github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ=
861863
github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
862864
github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
863865
github.com/googleapis/gnostic v0.2.2/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
@@ -2358,8 +2360,8 @@ google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6r
23582360
google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o=
23592361
google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g=
23602362
google.golang.org/api v0.93.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
2361-
google.golang.org/api v0.103.0 h1:9yuVqlu2JCvcLg9p8S3fcFLZij8EPSyvODIY1rkMizQ=
2362-
google.golang.org/api v0.103.0/go.mod h1:hGtW6nK1AC+d9si/UBhw8Xli+QMOf6xyNAyJw4qU9w0=
2363+
google.golang.org/api v0.106.0 h1:ffmW0faWCwKkpbbtvlY/K/8fUl+JKvNS5CVzRoyfCv8=
2364+
google.golang.org/api v0.106.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY=
23632365
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
23642366
google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
23652367
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -2441,8 +2443,8 @@ google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljW
24412443
google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
24422444
google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
24432445
google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
2444-
google.golang.org/genproto v0.0.0-20230104163317-caabf589fcbf h1:/JqRexUvugu6JURQ0O7RfV1EnvgrOxUV4tSjuAv0Sr0=
2445-
google.golang.org/genproto v0.0.0-20230104163317-caabf589fcbf/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
2446+
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f h1:BWUVssLB0HVOSY78gIdvk1dTVYtT1y8SBWtPYuTJ/6w=
2447+
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
24462448
google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
24472449
google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
24482450
google.golang.org/grpc v1.13.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=

‎api/turing/api/alerts_api_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/stretchr/testify/mock"
1111

1212
merlin "github.com/caraml-dev/merlin/client"
13-
mlp "github.com/gojek/mlp/api/client"
13+
mlp "github.com/caraml-dev/mlp/api/client"
1414
testifyAssert "github.com/stretchr/testify/assert"
1515
"gotest.tools/assert"
1616

‎api/turing/api/appcontext.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"gorm.io/gorm"
77

8-
mlpcluster "github.com/gojek/mlp/api/pkg/cluster"
8+
mlpcluster "github.com/caraml-dev/mlp/api/pkg/cluster"
99

1010
batchensembling "github.com/caraml-dev/turing/api/turing/batch/ensembling"
1111
batchrunner "github.com/caraml-dev/turing/api/turing/batch/runner"

‎api/turing/api/appcontext_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
//nolint:all
88
"bou.ke/monkey"
99
merlin "github.com/caraml-dev/merlin/client"
10-
mlpcluster "github.com/gojek/mlp/api/pkg/cluster"
11-
"github.com/gojek/mlp/api/pkg/instrumentation/sentry"
10+
mlpcluster "github.com/caraml-dev/mlp/api/pkg/cluster"
11+
"github.com/caraml-dev/mlp/api/pkg/instrumentation/sentry"
1212
"github.com/stretchr/testify/assert"
1313
"github.com/xanzy/go-gitlab"
1414
"gorm.io/gorm"

‎api/turing/api/base_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package api
22

33
import (
4+
mlp "github.com/caraml-dev/mlp/api/client"
45
val "github.com/go-playground/validator/v10"
5-
mlp "github.com/gojek/mlp/api/client"
66
"github.com/gorilla/schema"
77

88
"github.com/caraml-dev/turing/api/turing/models"

‎api/turing/api/base_controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"errors"
55
"testing"
66

7-
mlp "github.com/gojek/mlp/api/client"
7+
mlp "github.com/caraml-dev/mlp/api/client"
88
testifyAssert "github.com/stretchr/testify/assert"
99

1010
"github.com/caraml-dev/turing/api/turing/models"

0 commit comments

Comments
 (0)