diff options
author | 6543 <6543@obermui.de> | 2021-02-17 04:47:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-16 22:47:24 -0500 |
commit | fe628d8406632e6f5b3969ac86d817a035d4bae9 (patch) | |
tree | cf29502ba516dcceb6d36c818d6596bfc6715ffd /vendor/github.com/minio/minio-go/v7/api-compose-object.go | |
parent | dc707aea090741acb48d370152e65aa37d89800b (diff) | |
download | gitea-fe628d8406632e6f5b3969ac86d817a035d4bae9.tar.gz gitea-fe628d8406632e6f5b3969ac86d817a035d4bae9.zip |
Vendor Update (#14696)
* github.com/yuin/goldmark v1.3.1 -> v1.3.2
* github.com/xanzy/go-gitlab v0.42.0 -> v0.44.0
* github.com/prometheus/client_golang v1.8.0 -> v1.9.0
* github.com/minio/minio-go v7.0.7 -> v7.0.9
* github.com/lafriks/xormstore v1.3.2 -> v1.4.0
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'vendor/github.com/minio/minio-go/v7/api-compose-object.go')
-rw-r--r-- | vendor/github.com/minio/minio-go/v7/api-compose-object.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vendor/github.com/minio/minio-go/v7/api-compose-object.go b/vendor/github.com/minio/minio-go/v7/api-compose-object.go index edcd44e74a..40238de35f 100644 --- a/vendor/github.com/minio/minio-go/v7/api-compose-object.go +++ b/vendor/github.com/minio/minio-go/v7/api-compose-object.go @@ -202,7 +202,7 @@ func (opts CopySrcOptions) validate() (err error) { // Low level implementation of CopyObject API, supports only upto 5GiB worth of copy. func (c Client) copyObjectDo(ctx context.Context, srcBucket, srcObject, destBucket, destObject string, - metadata map[string]string, dstOpts PutObjectOptions) (ObjectInfo, error) { + metadata map[string]string, srcOpts CopySrcOptions, dstOpts PutObjectOptions) (ObjectInfo, error) { // Build headers. headers := make(http.Header) @@ -240,7 +240,9 @@ func (c Client) copyObjectDo(ctx context.Context, srcBucket, srcObject, destBuck // Set the source header headers.Set("x-amz-copy-source", s3utils.EncodePath(srcBucket+"/"+srcObject)) - + if srcOpts.VersionID != "" { + headers.Set("x-amz-copy-source", s3utils.EncodePath(srcBucket+"/"+srcObject)+"?versionId="+srcOpts.VersionID) + } // Send upload-part-copy request resp, err := c.executeMethod(ctx, http.MethodPut, reqMetadata) defer closeResponse(resp) |