Update AWS SageMaker Operator (flyteorg#156)

* Update AWS SageMaker Operator

Signed-off-by: Haytham Abuelfutuh <[email protected]>

* Remove gogo and fix failing test..

Signed-off-by: Haytham Abuelfutuh <[email protected]>

* Ping protobuf version to avoid unmarshaling breakage.

Signed-off-by: Haytham Abuelfutuh <[email protected]>

copilot/data/download.go

@@ -11,7 +11,8 @@ import (
 	"reflect"
 	"strconv"
 
-	"github.com/gogo/protobuf/jsonpb"
+	"github.com/golang/protobuf/jsonpb"
+
 	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/ptypes"
 	structpb "github.com/golang/protobuf/ptypes/struct"

copilot/go.mod

@@ -5,7 +5,6 @@ go 1.13
 require (
 	github.com/aws/aws-sdk-go v1.29.23
 	github.com/fsnotify/fsnotify v1.4.9
-	github.com/gogo/protobuf v1.3.1
 	github.com/golang/protobuf v1.4.2
 	github.com/imdario/mergo v0.3.9 // indirect
 	github.com/lyft/flyteidl v0.18.11

go.mod

@@ -3,41 +3,58 @@ module github.com/lyft/flyteplugins
 go 1.13
 
 require (
-	github.com/GoogleCloudPlatform/spark-on-k8s-operator v0.0.0-20200210170106-c8ae9e352035
+	cloud.google.com/go v0.78.0 // indirect
+	github.com/Azure/azure-sdk-for-go v39.0.0+incompatible // indirect
+	github.com/GoogleCloudPlatform/spark-on-k8s-operator v0.1.3
 	github.com/Masterminds/semver v1.5.0
+	github.com/adammck/venv v0.0.0-20200610172036-e77789703e7c // indirect
 	github.com/aws/amazon-sagemaker-operator-for-k8s v1.0.1-0.20200410212604-780c48ecb21a
-	github.com/aws/aws-sdk-go v1.29.23
-	github.com/aws/aws-sdk-go-v2 v1.0.0
+	github.com/aws/aws-sdk-go v1.37.3
+	github.com/aws/aws-sdk-go-v2 v1.2.0
 	github.com/aws/aws-sdk-go-v2/config v1.0.0
 	github.com/aws/aws-sdk-go-v2/service/athena v1.0.0
-	github.com/aws/aws-sdk-go-v2/service/sagemaker v1.0.0 // indirect
 	github.com/coocood/freecache v1.1.0
 	github.com/fsnotify/fsnotify v1.4.9 // indirect
+	github.com/go-logr/zapr v0.4.0 // indirect
 	github.com/go-test/deep v1.0.5
-	github.com/golang/protobuf v1.3.5
+	github.com/golang/protobuf v1.4.3
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.2.0 // indirect
+	github.com/googleapis/gnostic v0.5.4 // indirect
 	github.com/hashicorp/golang-lru v0.5.4
+	github.com/imdario/mergo v0.3.11 // indirect
 	github.com/kubeflow/pytorch-operator v0.6.0
 	github.com/kubeflow/tf-operator v0.5.3
-	github.com/lyft/flyteidl v0.18.9
+	github.com/lyft/flyteidl v0.18.11
 	github.com/lyft/flytestdlib v0.3.9
 	github.com/magiconair/properties v1.8.1
 	github.com/mitchellh/mapstructure v1.1.2
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.5.0
-	github.com/spf13/cobra v0.0.6 // indirect
+	github.com/prometheus/client_golang v1.9.0
+	github.com/prometheus/common v0.18.0 // indirect
+	github.com/prometheus/procfs v0.6.0 // indirect
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.6.1
-	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
-	google.golang.org/api v0.16.0 // indirect
-	google.golang.org/genproto v0.0.0-20200205142000-a86caf926a67 // indirect
-	google.golang.org/grpc v1.28.0
+	go.uber.org/multierr v1.6.0 // indirect
+	go.uber.org/zap v1.16.0 // indirect
+	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
+	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
+	golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93 // indirect
+	golang.org/x/sys v0.0.0-20210303074136-134d130e1a04 // indirect
+	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
+	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
+	google.golang.org/grpc v1.35.0
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c // indirect
 	gotest.tools v2.2.0+incompatible
-	k8s.io/api v0.17.3
-	k8s.io/apimachinery v0.17.3
+	k8s.io/api v0.20.4
+	k8s.io/apiextensions-apiserver v0.20.4 // indirect
+	k8s.io/apimachinery v0.20.4
 	k8s.io/client-go v11.0.1-0.20190918222721-c0e3722d5cf0+incompatible
-	k8s.io/utils v0.0.0-20200124190032-861946025e34
-	sigs.k8s.io/controller-runtime v0.5.1
+	k8s.io/klog/v2 v2.6.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20210216185858-15cd8face8d6 // indirect
+	k8s.io/utils v0.0.0-20210111153108-fddb29f9d009
+	sigs.k8s.io/controller-runtime v0.8.2
 )
 
 // Pin the version of client-go to something that's compatible with katrogan's fork of api and apimachinery
@@ -47,8 +64,16 @@ require (
 
 replace (
 	github.com/GoogleCloudPlatform/spark-on-k8s-operator => github.com/lyft/spark-on-k8s-operator v0.1.4-0.20201027003055-c76b67e3b6d0
+	github.com/aws/amazon-sagemaker-operator-for-k8s => github.com/aws/amazon-sagemaker-operator-for-k8s v1.0.1-0.20210303003444-0fb33b1fd49d
+	github.com/golang/protobuf => github.com/golang/protobuf v1.3.5
 	github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.3.1
+	google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200205142000-a86caf926a67
+	google.golang.org/grpc => google.golang.org/grpc v1.28.0
+
+	// Delete all of these pinned versions as soon as we move to mainline k8s.io/api
 	k8s.io/api => github.com/lyft/api v0.0.0-20191031200350-b49a72c274e0
 	k8s.io/apimachinery => github.com/lyft/apimachinery v0.0.0-20191031200210-047e3ea32d7f
 	k8s.io/client-go => k8s.io/client-go v0.0.0-20191016111102-bec269661e48
+	sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.5.1
+
 )