[minio] update minio library to v7

Author: corneliusludmann

components/content-service/go.mod

@@ -16,16 +16,22 @@ require (
 	github.com/go-ozzo/ozzo-validation v3.5.0+incompatible
 	github.com/golang/protobuf v1.4.3
 	github.com/google/go-cmp v0.5.2
-	github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
-	github.com/minio/minio-go/v6 v6.0.34
+	github.com/google/uuid v1.1.4 // indirect
+	github.com/minio/md5-simd v1.1.1 // indirect
+	github.com/minio/minio-go/v7 v7.0.7
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/opencontainers/image-spec v1.0.1
 	github.com/opentracing/opentracing-go v1.1.0
-	github.com/sirupsen/logrus v1.4.2
+	github.com/sirupsen/logrus v1.7.0
+	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
+	golang.org/x/net v0.0.0-20201224014010-6772e930b67b // indirect
 	golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43
+	golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061 // indirect
+	golang.org/x/text v0.3.5 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
 	google.golang.org/api v0.32.0
 	google.golang.org/grpc v1.34.0
+	gopkg.in/ini.v1 v1.62.0 // indirect
 )
 
 replace github.com/gitpod-io/gitpod/common-go => ../common-go // leeway

components/content-service/go.sum

@@ -18,7 +18,8 @@ import (
 	"golang.org/x/xerrors"
 
 	validation "github.com/go-ozzo/ozzo-validation"
-	minio "github.com/minio/minio-go/v6"
+	minio "github.com/minio/minio-go/v7"
+	"github.com/minio/minio-go/v7/pkg/credentials"
 )
 
 var _ DirectAccess = &DirectMinIOStorage{}
@@ -57,7 +58,10 @@ func (c *MinIOConfig) MinIOClient() (*minio.Client, error) {
 		return nil, err
 	}
 
-	minioClient, err := minio.New(c.Endpoint, c.AccessKeyID, c.SecretAccessKey, c.Secure)
+	minioClient, err := minio.New(c.Endpoint, &minio.Options{
+		Creds:  credentials.NewStaticV4(c.AccessKeyID, c.SecretAccessKey, ""),
+		Secure: c.Secure,
+	})
 	if err != nil {
 		return nil, err
 	}
@@ -125,7 +129,7 @@ func (rs *DirectMinIOStorage) defaultObjectAccess(ctx context.Context, bkt, obj
 		return nil, xerrors.Errorf("no MinIO client avialable - did you call Init()?")
 	}
 
-	object, err := rs.client.GetObjectWithContext(ctx, bkt, obj, minio.GetObjectOptions{})
+	object, err := rs.client.GetObject(ctx, bkt, obj, minio.GetObjectOptions{})
 	if err != nil {
 		return nil, translateMinioError(err)
 	}
@@ -147,7 +151,7 @@ func (rs *DirectMinIOStorage) EnsureExists(ctx context.Context) (err error) {
 		return xerrors.Errorf("no MinIO client avialable - did you call Init()?")
 	}
 
-	exists, err := rs.client.BucketExists(rs.bucketName())
+	exists, err := rs.client.BucketExists(ctx, rs.bucketName())
 	if err != nil {
 		return err
 	}
@@ -157,7 +161,7 @@ func (rs *DirectMinIOStorage) EnsureExists(ctx context.Context) (err error) {
 	}
 
 	log.WithField("bucketName", rs.bucketName()).Debug("Creating bucket")
-	err = rs.client.MakeBucket(rs.bucketName(), rs.MinIOConfig.Region)
+	err = rs.client.MakeBucket(ctx, rs.bucketName(), minio.MakeBucketOptions{Region: rs.MinIOConfig.Region})
 	if err != nil {
 		return xerrors.Errorf("cannot create bucket: %w", err)
 	}
@@ -224,7 +228,7 @@ func (rs *DirectMinIOStorage) Upload(ctx context.Context, source string, name st
 	// upload the thing
 	bucket = rs.bucketName()
 	obj = rs.objectName(name)
-	_, err = rs.client.FPutObjectWithContext(ctx, bucket, obj, source, minio.PutObjectOptions{
+	_, err = rs.client.FPutObject(ctx, bucket, obj, source, minio.PutObjectOptions{
 		NumThreads:   rs.MinIOConfig.ParallelUpload,
 		UserMetadata: options.Annotations,
 		ContentType:  options.ContentType,
@@ -283,15 +287,15 @@ func (s *presignedMinIOStorage) SignDownload(ctx context.Context, bucket, object
 		tracing.FinishSpan(span, &err)
 	}()
 
-	obj, err := s.client.GetObject(bucket, object, minio.GetObjectOptions{})
+	obj, err := s.client.GetObject(ctx, bucket, object, minio.GetObjectOptions{})
 	if err != nil {
 		return nil, translateMinioError(err)
 	}
 	stat, err := obj.Stat()
 	if err != nil {
 		return nil, translateMinioError(err)
 	}
-	url, err := s.client.PresignedGetObject(bucket, object, 30*time.Minute, nil)
+	url, err := s.client.PresignedGetObject(ctx, bucket, object, 30*time.Minute, nil)
 	if err != nil {
 		return nil, translateMinioError(err)
 	}

components/content-service/pkg/storage/minio.go

@@ -27,13 +27,13 @@ require (
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.0.0
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/mattn/go-isatty v0.0.9
+	github.com/mattn/go-isatty v0.0.11
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/opencontainers/image-spec v1.0.1
 	github.com/opentracing/opentracing-go v1.1.0
 	github.com/prometheus/client_golang v1.1.0
-	github.com/sirupsen/logrus v1.4.2
+	github.com/sirupsen/logrus v1.7.0
 	github.com/spf13/cobra v0.0.3
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
 	google.golang.org/grpc v1.34.0