diff options
Diffstat (limited to 'weed/remote_storage/s3')
| -rw-r--r-- | weed/remote_storage/s3/s3_storage_client.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/weed/remote_storage/s3/s3_storage_client.go b/weed/remote_storage/s3/s3_storage_client.go index 9b4e93088..980f970fb 100644 --- a/weed/remote_storage/s3/s3_storage_client.go +++ b/weed/remote_storage/s3/s3_storage_client.go @@ -160,13 +160,16 @@ func (s *s3RemoteStorageClient) WriteFile(loc *remote_pb.RemoteStorageLocation, // process tagging tags := "" - if s.supportTagging { + var awsTags *string + // openstack swift doesn't support s3 object tagging + if s.conf.S3SupportTagging { for k, v := range entry.Extended { if len(tags) > 0 { tags = tags + "&" } tags = tags + k + "=" + string(v) } + awsTags = aws.String(tags) } // Upload the file to S3. @@ -174,7 +177,7 @@ func (s *s3RemoteStorageClient) WriteFile(loc *remote_pb.RemoteStorageLocation, Bucket: aws.String(loc.Bucket), Key: aws.String(loc.Path[1:]), Body: reader, - Tagging: aws.String(tags), + Tagging: awsTags, StorageClass: aws.String(s.conf.S3StorageClass), }) |