Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions blob/s3blob/s3blob.go
Original file line number Diff line number Diff line change
Expand Up @@ -751,29 +751,33 @@ func (b *bucket) NewTypedWriter(ctx context.Context, key, contentType string, op
u.Concurrency = opts.MaxConcurrency
}
})
md := make(map[string]string, len(opts.Metadata))
for k, v := range opts.Metadata {
// See the package comments for more details on escaping of metadata
// keys & values.
k = escape.HexEscape(url.PathEscape(k), func(runes []rune, i int) bool {
c := runes[i]
return c == '@' || c == ':' || c == '='
})
md[k] = url.PathEscape(v)
}

req := &s3.PutObjectInput{
Bucket: aws.String(b.name),
ContentType: aws.String(contentType),
Key: aws.String(key),
Metadata: md,
}

if len(opts.Tags) > 0 {
encodedTags := encodeTags(opts.Tags)
req.Tagging = aws.String(encodedTags)
}

if len(opts.Metadata) > 0 {
md := make(map[string]string, len(opts.Metadata))
for k, v := range opts.Metadata {
// See the package comments for more details on escaping of metadata
// keys & values.
k = escape.HexEscape(url.PathEscape(k), func(runes []rune, i int) bool {
c := runes[i]
return c == '@' || c == ':' || c == '='
})
md[k] = url.PathEscape(v)
}

req.Metadata = md
}

if opts.IfNotExist {
// See https://docs.aws.amazon.com/AmazonS3/latest/userguide/conditional-writes.html
req.IfNoneMatch = aws.String("*")
Expand Down