feat(backend): update minio-go to support irsa (#7946)

kubeflow · Jul 8, 2022 · 7923ba3 · 7923ba3
1 parent 176d3ff
commit 7923ba3
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 15 deletions.
diff --git a/backend/src/apiserver/client/minio.go b/backend/src/apiserver/client/minio.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/cenkalti/backoff"
 	"github.com/golang/glog"
-	minio "github.com/minio/minio-go"
-	credentials "github.com/minio/minio-go/pkg/credentials"
+	minio "github.com/minio/minio-go/v6"
+	credentials "github.com/minio/minio-go/v6/pkg/credentials"
 	"github.com/pkg/errors"
 )
 

diff --git a/backend/src/apiserver/client_manager.go b/backend/src/apiserver/client_manager.go
@@ -31,7 +31,7 @@ import (
 	"github.com/kubeflow/pipelines/backend/src/apiserver/model"
 	"github.com/kubeflow/pipelines/backend/src/apiserver/storage"
 	"github.com/kubeflow/pipelines/backend/src/common/util"
-	"github.com/minio/minio-go"
+	"github.com/minio/minio-go/v6"
 )
 
 const (

diff --git a/backend/src/apiserver/storage/minio_client.go b/backend/src/apiserver/storage/minio_client.go
@@ -17,7 +17,7 @@ package storage
 import (
 	"io"
 
-	minio "github.com/minio/minio-go"
+	minio "github.com/minio/minio-go/v6"
 )
 
 // Create interface for minio client struct, making it more unit testable.

diff --git a/backend/src/apiserver/storage/minio_client_fake.go b/backend/src/apiserver/storage/minio_client_fake.go
@@ -18,7 +18,7 @@ import (
 	"bytes"
 	"io"
 
-	"github.com/minio/minio-go"
+	"github.com/minio/minio-go/v6"
 	"github.com/pkg/errors"
 )
 

diff --git a/backend/src/apiserver/storage/object_store.go b/backend/src/apiserver/storage/object_store.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/ghodss/yaml"
 	"github.com/kubeflow/pipelines/backend/src/common/util"
-	minio "github.com/minio/minio-go"
+	minio "github.com/minio/minio-go/v6"
 )
 
 const (

diff --git a/backend/src/apiserver/storage/object_store_test.go b/backend/src/apiserver/storage/object_store_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"github.com/kubeflow/pipelines/backend/src/common/util"
-	minio "github.com/minio/minio-go"
+	minio "github.com/minio/minio-go/v6"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc/codes"

diff --git a/backend/third_party_licenses/apiserver.csv b/backend/third_party_licenses/apiserver.csv
@@ -22,7 +22,6 @@ github.com/doublerebel/bellows,https://github.com/doublerebel/bellows/blob/f177d
 github.com/emicklei/go-restful,https://github.com/emicklei/go-restful/blob/v2.15.0/LICENSE,MIT
 github.com/fsnotify/fsnotify,https://github.com/fsnotify/fsnotify/blob/v1.4.9/LICENSE,BSD-3-Clause
 github.com/ghodss/yaml,https://github.com/ghodss/yaml/blob/25d852aebe32/LICENSE,MIT
-github.com/go-ini/ini,https://github.com/go-ini/ini/blob/v1.51.1/LICENSE,Apache-2.0
 github.com/go-logr/logr,https://github.com/go-logr/logr/blob/v0.4.0/LICENSE,Apache-2.0
 github.com/go-openapi/errors,https://github.com/go-openapi/errors/blob/v0.19.9/LICENSE,Apache-2.0
 github.com/go-openapi/jsonpointer,https://github.com/go-openapi/jsonpointer/blob/v0.19.5/LICENSE,Apache-2.0
@@ -59,6 +58,7 @@ github.com/jmespath/go-jmespath,https://github.com/jmespath/go-jmespath/blob/v0.
 github.com/josharian/intern,https://github.com/josharian/intern/blob/v1.0.0/license.md,MIT
 github.com/json-iterator/go,https://github.com/json-iterator/go/blob/v1.1.11/LICENSE,MIT
 github.com/klauspost/compress/flate,https://github.com/klauspost/compress/blob/v1.13.1/LICENSE,BSD-3-Clause
+github.com/klauspost/cpuid,https://github.com/klauspost/cpuid/blob/v1.2.3/LICENSE,MIT
 github.com/klauspost/pgzip,https://github.com/klauspost/pgzip/blob/v1.2.5/LICENSE,MIT
 github.com/kubeflow/pipelines/api/v2alpha1/go,https://github.com/kubeflow/pipelines/blob/11635101d944/api/LICENSE,Apache-2.0
 github.com/kubeflow/pipelines/backend,https://github.com/kubeflow/pipelines/blob/HEAD/LICENSE,Apache-2.0
@@ -70,7 +70,9 @@ github.com/magiconair/properties,https://github.com/magiconair/properties/blob/v
 github.com/mailru/easyjson,https://github.com/mailru/easyjson/blob/v0.7.6/LICENSE,MIT
 github.com/mattn/go-sqlite3,https://github.com/mattn/go-sqlite3/blob/v1.9.0/LICENSE,MIT
 github.com/matttproud/golang_protobuf_extensions/pbutil,https://github.com/matttproud/golang_protobuf_extensions/blob/c182affec369/LICENSE,Apache-2.0
-github.com/minio/minio-go,https://github.com/minio/minio-go/blob/v6.0.14/LICENSE,Apache-2.0
+github.com/minio/md5-simd,https://github.com/minio/md5-simd/blob/v1.1.0/LICENSE,Apache-2.0
+github.com/minio/minio-go/v6,https://github.com/minio/minio-go/blob/v6.0.57/LICENSE,Apache-2.0
+github.com/minio/sha256-simd,https://github.com/minio/sha256-simd/blob/v0.1.1/LICENSE,Apache-2.0
 github.com/mitchellh/copystructure,https://github.com/mitchellh/copystructure/blob/v1.2.0/LICENSE,MIT
 github.com/mitchellh/go-homedir,https://github.com/mitchellh/go-homedir/blob/v1.1.0/LICENSE,MIT
 github.com/mitchellh/mapstructure,https://github.com/mitchellh/mapstructure/blob/v1.4.1/LICENSE,MIT

diff --git a/go.mod b/go.mod
@@ -11,7 +11,6 @@ require (
 	github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 // indirect
 	github.com/fsnotify/fsnotify v1.4.9
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
-	github.com/go-ini/ini v1.51.1 // indirect
 	github.com/go-openapi/errors v0.19.9
 	github.com/go-openapi/runtime v0.19.24
 	github.com/go-openapi/strfmt v0.19.11
@@ -34,7 +33,7 @@ require (
 	github.com/kubeflow/pipelines/third_party/ml-metadata v0.0.0-20220118175555-e78ed557ddcb
 	github.com/lestrrat-go/strftime v1.0.4
 	github.com/mattn/go-sqlite3 v1.9.0
-	github.com/minio/minio-go v6.0.14+incompatible
+	github.com/minio/minio-go/v6 v6.0.57
 	github.com/peterhellberg/duration v0.0.0-20191119133758-ec6baeebcd10
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.11.0

diff --git a/go.sum b/go.sum
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ import ( @@
     	"bytes"
     	"io"
-    	"github.com/minio/minio-go"
+    	"github.com/minio/minio-go/v6"
     	"github.com/pkg/errors"
     )
@@ Expand Down @@