summaryrefslogtreecommitdiff
path: root/vendor/github.com/minio/minio-go/v7/api-put-object-multipart.go
diff options
context:
space:
mode:
authorLibravatar dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>2023-01-16 10:29:47 +0100
committerLibravatar GitHub <noreply@github.com>2023-01-16 10:29:47 +0100
commitfe3e9ede521a580dcc2e1ec918ebb53e78898885 (patch)
treeb79d4ed648bdf20fcb36406266cda5ac5cddf58e /vendor/github.com/minio/minio-go/v7/api-put-object-multipart.go
parent[chore]: Bump golang.org/x/oauth2 from 0.3.0 to 0.4.0 (#1347) (diff)
downloadgotosocial-fe3e9ede521a580dcc2e1ec918ebb53e78898885.tar.xz
[chore]: Bump github.com/minio/minio-go/v7 from 7.0.44 to 7.0.47 (#1348)
Bumps [github.com/minio/minio-go/v7](https://github.com/minio/minio-go) from 7.0.44 to 7.0.47. - [Release notes](https://github.com/minio/minio-go/releases) - [Commits](https://github.com/minio/minio-go/compare/v7.0.44...v7.0.47) --- updated-dependencies: - dependency-name: github.com/minio/minio-go/v7 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Diffstat (limited to 'vendor/github.com/minio/minio-go/v7/api-put-object-multipart.go')
-rw-r--r--vendor/github.com/minio/minio-go/v7/api-put-object-multipart.go7
1 files changed, 4 insertions, 3 deletions
diff --git a/vendor/github.com/minio/minio-go/v7/api-put-object-multipart.go b/vendor/github.com/minio/minio-go/v7/api-put-object-multipart.go
index 3c9a13ff2..18bdeb24c 100644
--- a/vendor/github.com/minio/minio-go/v7/api-put-object-multipart.go
+++ b/vendor/github.com/minio/minio-go/v7/api-put-object-multipart.go
@@ -26,7 +26,6 @@ import (
"fmt"
"hash/crc32"
"io"
- "io/ioutil"
"net/http"
"net/url"
"sort"
@@ -201,7 +200,9 @@ func (c *Client) putObjectMultipartNoStream(ctx context.Context, bucketName, obj
// Sort all completed parts.
sort.Sort(completedParts(complMultipartUpload.Parts))
- opts = PutObjectOptions{}
+ opts = PutObjectOptions{
+ ServerSideEncryption: opts.ServerSideEncryption,
+ }
if len(crcBytes) > 0 {
// Add hash of hashes.
crc.Reset()
@@ -412,7 +413,7 @@ func (c *Client) completeMultipartUpload(ctx context.Context, bucketName, object
// Read resp.Body into a []bytes to parse for Error response inside the body
var b []byte
- b, err = ioutil.ReadAll(resp.Body)
+ b, err = io.ReadAll(resp.Body)
if err != nil {
return UploadInfo{}, err
}