go1.16 (#14783)

vendor/github.com/minio/minio-go/v7/api-get-object.go

@@ -47,9 +47,12 @@ func (c Client) GetObject(ctx context.Context, bucketName, objectName string, op
 		}
 	}
 
-	var httpReader io.ReadCloser
-	var objectInfo ObjectInfo
-	var err error
+	var (
+		err        error
+		httpReader io.ReadCloser
+		objectInfo ObjectInfo
+		totalRead  int
+	)
 
 	// Create request channel.
 	reqCh := make(chan getRequest)
@@ -103,6 +106,7 @@ func (c Client) GetObject(ctx context.Context, bucketName, objectName string, op
 						// Read at least firstReq.Buffer bytes, if not we have
 						// reached our EOF.
 						size, err := readFull(httpReader, req.Buffer)
+						totalRead += size
 						if size > 0 && err == io.ErrUnexpectedEOF {
 							if int64(size) < objectInfo.Size {
 								// In situations when returned size
@@ -125,7 +129,7 @@ func (c Client) GetObject(ctx context.Context, bucketName, objectName string, op
 						// Send back the first response.
 						resCh <- getResponse{
 							objectInfo: objectInfo,
-							Size:       int(size),
+							Size:       size,
 							Error:      err,
 							didRead:    true,
 						}
@@ -202,19 +206,36 @@ func (c Client) GetObject(ctx context.Context, bucketName, objectName string, op
 							}
 							return
 						}
+						totalRead = 0
 					}
 
 					// Read at least req.Buffer bytes, if not we have
 					// reached our EOF.
 					size, err := readFull(httpReader, req.Buffer)
+					totalRead += size
 					if size > 0 && err == io.ErrUnexpectedEOF {
-						// If an EOF happens after reading some but not
-						// all the bytes ReadFull returns ErrUnexpectedEOF
-						err = io.EOF
+						if int64(totalRead) < objectInfo.Size {
+							// In situations when returned size
+							// is less than the expected content
+							// length set by the server, make sure
+							// we return io.ErrUnexpectedEOF
+							err = io.ErrUnexpectedEOF
+						} else {
+							// If an EOF happens after reading some but not
+							// all the bytes ReadFull returns ErrUnexpectedEOF
+							err = io.EOF
+						}
+					} else if size == 0 && err == io.EOF && objectInfo.Size > 0 {
+						// Special cases when server writes more data
+						// than the content-length, net/http response
+						// body returns an error, instead of converting
+						// it to io.EOF - return unexpected EOF.
+						err = io.ErrUnexpectedEOF
 					}
+
 					// Reply back how much was read.
 					resCh <- getResponse{
-						Size:       int(size),
+						Size:       size,
 						Error:      err,
 						didRead:    true,
 						objectInfo: objectInfo,

vendor/github.com/minio/minio-go/v7/api.go

@@ -108,7 +108,7 @@ type Options struct {
 // Global constants.
 const (
 	libraryName    = "minio-go"
-	libraryVersion = "v7.0.9"
+	libraryVersion = "v7.0.10"
 )
 
 // User Agent should always following the below style.

vendor/github.com/minio/minio-go/v7/pkg/credentials/env_minio.go

@@ -22,10 +22,12 @@ import "os"
 // A EnvMinio retrieves credentials from the environment variables of the
 // running process. EnvMinioironment credentials never expire.
 //
-// EnvMinioironment variables used:
+// Environment variables used:
 //
 // * Access Key ID:     MINIO_ACCESS_KEY.
 // * Secret Access Key: MINIO_SECRET_KEY.
+// * Access Key ID:     MINIO_ROOT_USER.
+// * Secret Access Key: MINIO_ROOT_PASSWORD.
 type EnvMinio struct {
 	retrieved bool
 }
@@ -40,12 +42,16 @@ func NewEnvMinio() *Credentials {
 func (e *EnvMinio) Retrieve() (Value, error) {
 	e.retrieved = false
 
-	id := os.Getenv("MINIO_ACCESS_KEY")
-	secret := os.Getenv("MINIO_SECRET_KEY")
+	id := os.Getenv("MINIO_ROOT_USER")
+	secret := os.Getenv("MINIO_ROOT_PASSWORD")
 
 	signerType := SignatureV4
 	if id == "" || secret == "" {
-		signerType = SignatureAnonymous
+		id = os.Getenv("MINIO_ACCESS_KEY")
+		secret = os.Getenv("MINIO_SECRET_KEY")
+		if id == "" || secret == "" {
+			signerType = SignatureAnonymous
+		}
 	}
 
 	e.retrieved = true