From 07c45de2164ab7ac18e1f9fb2f187b8d5938120e Mon Sep 17 00:00:00 2001 From: Abhishek Lekshmanan Date: Fri, 24 Feb 2017 13:50:53 +0100 Subject: [PATCH] rgw: aws sync: make bucket name more url friendly Signed-off-by: Abhishek Lekshmanan --- src/rgw/rgw_sync_module_aws.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_sync_module_aws.cc b/src/rgw/rgw_sync_module_aws.cc index 9a96ec75303c7..e67951f56e834 100644 --- a/src/rgw/rgw_sync_module_aws.cc +++ b/src/rgw/rgw_sync_module_aws.cc @@ -16,12 +16,18 @@ static string aws_bucket_name(const RGWBucketInfo& bucket_info, bool user_bucket if (user_buckets){ bucket_name+=bucket_info.owner.tenant + bucket_info.owner.id; } + bucket_name.erase(std::remove(bucket_name.begin(),bucket_name.end(),'-')); return bucket_name; } static string aws_object_name(const RGWBucketInfo& bucket_info, const rgw_obj_key&key, bool user_buckets=false){ - auto bucket = aws_bucket_name(bucket_info, user_buckets); - return bucket + key.name; + string bucket_name = aws_bucket_name(bucket_info, user_buckets); + string object_name = bucket_name+"/"; + if (!user_buckets){ + object_name += bucket_info.bucket.name; + } + object_name += key.name; + return object_name; } struct AWSConfig { -- 2.39.5