Feat(minio#1755):

Support passing in a URL query string in GetObjectOptions.

.gitignore

@@ -2,4 +2,5 @@
 *.test
 validator
 golangci-lint
-functional_tests
+functional_tests
+.idea

api-get-object.go

@@ -23,8 +23,6 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"net/url"
-	"strconv"
 	"sync"
 
 	"github.com/minio/minio-go/v7/pkg/s3utils"
@@ -640,7 +638,7 @@ func newObject(ctx context.Context, cancel context.CancelFunc, reqCh chan<- getR
 
 // getObject - retrieve object from Object Storage.
 //
-// Additionally this function also takes range arguments to download the specified
+// Additionally, this function also takes range arguments to download the specified
 // range bytes of an object. Setting offset and length = 0 will download the full object.
 //
 // For more information about the HTTP Range header.
@@ -654,19 +652,11 @@ func (c *Client) getObject(ctx context.Context, bucketName, objectName string, o
 		return nil, ObjectInfo{}, nil, err
 	}
 
-	urlValues := make(url.Values)
-	if opts.VersionID != "" {
-		urlValues.Set("versionId", opts.VersionID)
-	}
-	if opts.PartNumber > 0 {
-		urlValues.Set("partNumber", strconv.Itoa(opts.PartNumber))
-	}
-
 	// Execute GET on objectName.
 	resp, err := c.executeMethod(ctx, http.MethodGet, requestMetadata{
 		bucketName:       bucketName,
 		objectName:       objectName,
-		queryValues:      urlValues,
+		queryValues:      opts.ToQueryValues(),
 		customHeader:     opts.Header(),
 		contentSHA256Hex: emptySHA256Hex,
 	})

api-get-options.go

@@ -20,6 +20,8 @@ package minio
 import (
 	"fmt"
 	"net/http"
+	"net/url"
+	"strconv"
 	"time"
 
 	"github.com/minio/minio-go/v7/pkg/encrypt"
@@ -36,6 +38,7 @@ type AdvancedGetOptions struct {
 // during GET requests.
 type GetObjectOptions struct {
 	headers              map[string]string
+	reqParams            url.Values
 	ServerSideEncryption encrypt.ServerSide
 	VersionID            string
 	PartNumber           int
@@ -54,7 +57,7 @@ type GetObjectOptions struct {
 type StatObjectOptions = GetObjectOptions
 
 // Header returns the http.Header representation of the GET options.
-func (o GetObjectOptions) Header() http.Header {
+func (o *GetObjectOptions) Header() http.Header {
 	headers := make(http.Header, len(o.headers))
 	for k, v := range o.headers {
 		headers.Set(k, v)
@@ -83,6 +86,22 @@ func (o *GetObjectOptions) Set(key, value string) {
 	o.headers[http.CanonicalHeaderKey(key)] = value
 }
 
+// SetReqParam - set request query string parameter
+func (o *GetObjectOptions) SetReqParam(key, value string) {
+	if o.reqParams == nil {
+		o.reqParams = make(url.Values)
+	}
+	o.reqParams.Set(key, value)
+}
+
+// AddReqParam - add request query string parameter
+func (o *GetObjectOptions) AddReqParam(key, value string) {
+	if o.reqParams == nil {
+		o.reqParams = make(url.Values)
+	}
+	o.reqParams.Add(key, value)
+}
+
 // SetMatchETag - set match etag.
 func (o *GetObjectOptions) SetMatchETag(etag string) error {
 	if etag == "" {
@@ -149,3 +168,24 @@ func (o *GetObjectOptions) SetRange(start, end int64) error {
 	}
 	return nil
 }
+
+// ToQueryValues - Convert the versionId, partNumber, and reqParams in Options to query string parameters.
+func (o *GetObjectOptions) ToQueryValues() url.Values {
+	urlValues := make(url.Values)
+	if o.VersionID != "" {
+		urlValues.Set("versionId", o.VersionID)
+	}
+	if o.PartNumber > 0 {
+		urlValues.Set("partNumber", strconv.Itoa(o.PartNumber))
+	}
+
+	if o.reqParams != nil {
+		for key, values := range o.reqParams {
+			for _, value := range values {
+				urlValues.Add(key, value)
+			}
+		}
+	}
+
+	return urlValues
+}