[chore]: Bump github.com/minio/minio-go/v7 from 7.0.71 to 7.0.72 (#3037)
This commit is contained in:
parent
ddef307622
commit
b9864e83a0
2
go.mod
2
go.mod
|
@ -43,7 +43,7 @@ require (
|
||||||
github.com/jackc/pgx/v5 v5.6.0
|
github.com/jackc/pgx/v5 v5.6.0
|
||||||
github.com/microcosm-cc/bluemonday v1.0.26
|
github.com/microcosm-cc/bluemonday v1.0.26
|
||||||
github.com/miekg/dns v1.1.61
|
github.com/miekg/dns v1.1.61
|
||||||
github.com/minio/minio-go/v7 v7.0.71
|
github.com/minio/minio-go/v7 v7.0.72
|
||||||
github.com/mitchellh/mapstructure v1.5.0
|
github.com/mitchellh/mapstructure v1.5.0
|
||||||
github.com/ncruces/go-sqlite3 v0.16.3
|
github.com/ncruces/go-sqlite3 v0.16.3
|
||||||
github.com/oklog/ulid v1.3.1
|
github.com/oklog/ulid v1.3.1
|
||||||
|
|
4
go.sum
4
go.sum
|
@ -422,8 +422,8 @@ github.com/miekg/dns v1.1.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs=
|
||||||
github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ=
|
github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ=
|
||||||
github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
|
github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
|
||||||
github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
|
github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
|
||||||
github.com/minio/minio-go/v7 v7.0.71 h1:No9XfOKTYi6i0GnBj+WZwD8WP5GZfL7n7GOjRqCdAjA=
|
github.com/minio/minio-go/v7 v7.0.72 h1:ZSbxs2BfJensLyHdVOgHv+pfmvxYraaUy07ER04dWnA=
|
||||||
github.com/minio/minio-go/v7 v7.0.71/go.mod h1:4yBA8v80xGA30cfM3fz0DKYMXunWl/AV/6tWEs9ryzo=
|
github.com/minio/minio-go/v7 v7.0.72/go.mod h1:4yBA8v80xGA30cfM3fz0DKYMXunWl/AV/6tWEs9ryzo=
|
||||||
github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
|
github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
|
||||||
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
|
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
|
||||||
github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
|
github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
|
||||||
|
|
|
@ -119,7 +119,7 @@ func (opts CopyDestOptions) Marshal(header http.Header) {
|
||||||
if opts.ReplaceMetadata {
|
if opts.ReplaceMetadata {
|
||||||
header.Set("x-amz-metadata-directive", replaceDirective)
|
header.Set("x-amz-metadata-directive", replaceDirective)
|
||||||
for k, v := range filterCustomMeta(opts.UserMetadata) {
|
for k, v := range filterCustomMeta(opts.UserMetadata) {
|
||||||
if isAmzHeader(k) || isStandardHeader(k) || isStorageClassHeader(k) || isValidReplicationEncryptionHeader(k) {
|
if isAmzHeader(k) || isStandardHeader(k) || isStorageClassHeader(k) || isMinioHeader(k) {
|
||||||
header.Set(k, v)
|
header.Set(k, v)
|
||||||
} else {
|
} else {
|
||||||
header.Set("x-amz-meta-"+k, v)
|
header.Set("x-amz-meta-"+k, v)
|
||||||
|
|
|
@ -106,7 +106,11 @@ func (opts *PutObjectOptions) SetMatchETag(etag string) {
|
||||||
if opts.customHeaders == nil {
|
if opts.customHeaders == nil {
|
||||||
opts.customHeaders = http.Header{}
|
opts.customHeaders = http.Header{}
|
||||||
}
|
}
|
||||||
opts.customHeaders.Set("If-Match", "\""+etag+"\"")
|
if etag == "*" {
|
||||||
|
opts.customHeaders.Set("If-Match", "*")
|
||||||
|
} else {
|
||||||
|
opts.customHeaders.Set("If-Match", "\""+etag+"\"")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetMatchETagExcept if etag does not match while PUT MinIO returns an
|
// SetMatchETagExcept if etag does not match while PUT MinIO returns an
|
||||||
|
@ -116,7 +120,11 @@ func (opts *PutObjectOptions) SetMatchETagExcept(etag string) {
|
||||||
if opts.customHeaders == nil {
|
if opts.customHeaders == nil {
|
||||||
opts.customHeaders = http.Header{}
|
opts.customHeaders = http.Header{}
|
||||||
}
|
}
|
||||||
opts.customHeaders.Set("If-None-Match", "\""+etag+"\"")
|
if etag == "*" {
|
||||||
|
opts.customHeaders.Set("If-None-Match", "*")
|
||||||
|
} else {
|
||||||
|
opts.customHeaders.Set("If-None-Match", "\""+etag+"\"")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// getNumThreads - gets the number of threads to be used in the multipart
|
// getNumThreads - gets the number of threads to be used in the multipart
|
||||||
|
@ -212,7 +220,7 @@ func (opts PutObjectOptions) Header() (header http.Header) {
|
||||||
}
|
}
|
||||||
|
|
||||||
for k, v := range opts.UserMetadata {
|
for k, v := range opts.UserMetadata {
|
||||||
if isAmzHeader(k) || isStandardHeader(k) || isStorageClassHeader(k) || isValidReplicationEncryptionHeader(k) {
|
if isAmzHeader(k) || isStandardHeader(k) || isStorageClassHeader(k) || isMinioHeader(k) {
|
||||||
header.Set(k, v)
|
header.Set(k, v)
|
||||||
} else {
|
} else {
|
||||||
header.Set("x-amz-meta-"+k, v)
|
header.Set("x-amz-meta-"+k, v)
|
||||||
|
@ -230,7 +238,7 @@ func (opts PutObjectOptions) Header() (header http.Header) {
|
||||||
// validate() checks if the UserMetadata map has standard headers or and raises an error if so.
|
// validate() checks if the UserMetadata map has standard headers or and raises an error if so.
|
||||||
func (opts PutObjectOptions) validate() (err error) {
|
func (opts PutObjectOptions) validate() (err error) {
|
||||||
for k, v := range opts.UserMetadata {
|
for k, v := range opts.UserMetadata {
|
||||||
if !httpguts.ValidHeaderFieldName(k) || isStandardHeader(k) || isSSEHeader(k) || isStorageClassHeader(k) || isValidReplicationEncryptionHeader(k) {
|
if !httpguts.ValidHeaderFieldName(k) || isStandardHeader(k) || isSSEHeader(k) || isStorageClassHeader(k) || isMinioHeader(k) {
|
||||||
return errInvalidArgument(k + " unsupported user defined metadata name")
|
return errInvalidArgument(k + " unsupported user defined metadata name")
|
||||||
}
|
}
|
||||||
if !httpguts.ValidHeaderFieldValue(v) {
|
if !httpguts.ValidHeaderFieldValue(v) {
|
||||||
|
|
|
@ -129,7 +129,7 @@ type Options struct {
|
||||||
// Global constants.
|
// Global constants.
|
||||||
const (
|
const (
|
||||||
libraryName = "minio-go"
|
libraryName = "minio-go"
|
||||||
libraryVersion = "v7.0.71"
|
libraryVersion = "v7.0.72"
|
||||||
)
|
)
|
||||||
|
|
||||||
// User Agent should always following the below style.
|
// User Agent should always following the below style.
|
||||||
|
|
|
@ -510,19 +510,9 @@ func isAmzHeader(headerKey string) bool {
|
||||||
return strings.HasPrefix(key, "x-amz-meta-") || strings.HasPrefix(key, "x-amz-grant-") || key == "x-amz-acl" || isSSEHeader(headerKey) || strings.HasPrefix(key, "x-amz-checksum-")
|
return strings.HasPrefix(key, "x-amz-meta-") || strings.HasPrefix(key, "x-amz-grant-") || key == "x-amz-acl" || isSSEHeader(headerKey) || strings.HasPrefix(key, "x-amz-checksum-")
|
||||||
}
|
}
|
||||||
|
|
||||||
var supportedReplicationEncryptionHeaders = map[string]bool{
|
// isMinioHeader returns true if header is x-minio- header.
|
||||||
"x-minio-replication-server-side-encryption-sealed-key": true,
|
func isMinioHeader(headerKey string) bool {
|
||||||
"x-minio-replication-server-side-encryption-seal-algorithm": true,
|
return strings.HasPrefix(strings.ToLower(headerKey), "x-minio-")
|
||||||
"x-minio-replication-server-side-encryption-iv": true,
|
|
||||||
"x-minio-replication-encrypted-multipart": true,
|
|
||||||
"x-minio-replication-actual-object-size": true,
|
|
||||||
// Add more supported headers here.
|
|
||||||
// Must be lower case.
|
|
||||||
}
|
|
||||||
|
|
||||||
// isValidReplicationEncryptionHeader returns true if header is one of valid replication encryption headers
|
|
||||||
func isValidReplicationEncryptionHeader(headerKey string) bool {
|
|
||||||
return supportedReplicationEncryptionHeaders[strings.ToLower(headerKey)]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// supportedQueryValues is a list of query strings that can be passed in when using GetObject.
|
// supportedQueryValues is a list of query strings that can be passed in when using GetObject.
|
||||||
|
|
|
@ -488,7 +488,7 @@ github.com/miekg/dns
|
||||||
# github.com/minio/md5-simd v1.1.2
|
# github.com/minio/md5-simd v1.1.2
|
||||||
## explicit; go 1.14
|
## explicit; go 1.14
|
||||||
github.com/minio/md5-simd
|
github.com/minio/md5-simd
|
||||||
# github.com/minio/minio-go/v7 v7.0.71
|
# github.com/minio/minio-go/v7 v7.0.72
|
||||||
## explicit; go 1.21
|
## explicit; go 1.21
|
||||||
github.com/minio/minio-go/v7
|
github.com/minio/minio-go/v7
|
||||||
github.com/minio/minio-go/v7/pkg/credentials
|
github.com/minio/minio-go/v7/pkg/credentials
|
||||||
|
|
Loading…
Reference in New Issue