aws - output - strip trailing slashes from s3 output url paths (#8559)

cloud-custodian · May 12, 2023 · 0819287 · 0819287
1 parent 072d238
commit 0819287
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/c7n/resources/aws.py b/c7n/resources/aws.py
@@ -170,8 +170,10 @@ def get_bucket_url_with_region(bucket_url, region):
     query = f"region={region}"
     if parsed.query:
         query = parsed.query + f"&region={region}"
-    parts = list(parsed)
-    parts[4] = query
+    parts = parsed._replace(
+        path=parsed.path.strip("/"),
+        query=query
+    )
     return urlparse.urlunparse(parts)
 
 

diff --git a/tests/test_aws.py b/tests/test_aws.py
@@ -521,6 +521,9 @@ def test_get_bucket_url_s3_cross_region():
     assert aws.get_bucket_url_with_region(
         "s3://slack.cloudcustodian.io",
         "us-west-2") == "s3://slack.cloudcustodian.io?region=us-east-1"
+    assert aws.get_bucket_url_with_region(
+        "s3://slack.cloudcustodian.io/",
+        "us-west-2") == "s3://slack.cloudcustodian.io?region=us-east-1"
 
 
 @vcr.use_cassette(
@@ -533,3 +536,7 @@ def test_get_bucket_url_s3_same_region():
     assert aws.get_bucket_url_with_region(
         "s3://slack.cloudcustodian.io?param=x",
         "us-east-1") == "s3://slack.cloudcustodian.io?param=x&region=us-east-1"
+
+    assert aws.get_bucket_url_with_region(
+        "s3://slack.cloudcustodian.io/logs/?param=x",
+        "us-east-1") == "s3://slack.cloudcustodian.io/logs?param=x&region=us-east-1"