Merge pull request #4402 from sanathkr/fix4364

fix(cloudformation): Support S3 URLs with region names

Author: stealthycoin

awscli/customizations/cloudformation/artifact_exporter.py

@@ -438,6 +438,7 @@ def do_export(self, resource_id, resource_dict, parent_dir):
         template_path = resource_dict.get(self.PROPERTY_NAME, None)
 
         if template_path is None or is_s3_url(template_path) or \
+                template_path.startswith(self.uploader.s3.meta.endpoint_url) or \
                 template_path.startswith("https://s3.amazonaws.com/"):
             # Nothing to do
             return

tests/unit/customizations/cloudformation/test_artifact_exporter.py

@@ -210,6 +210,7 @@ class TestArtifactExporter(unittest.TestCase):
 
     def setUp(self):
         self.s3_uploader_mock = Mock()
+        self.s3_uploader_mock.s3.meta.endpoint_url = "https://s3.some-valid-region.amazonaws.com"
 
     def test_parse_s3_url(self):
 
@@ -746,6 +747,18 @@ def test_export_cloudformation_stack_no_upload_path_is_httpsurl(self):
         self.assertEquals(resource_dict[property_name], s3_url)
         self.s3_uploader_mock.upload_with_dedup.assert_not_called()
 
+    def test_export_cloudformation_stack_no_upload_path_is_s3_region_httpsurl(self):
+        stack_resource = CloudFormationStackResource(self.s3_uploader_mock)
+        resource_id = "id"
+        property_name = stack_resource.PROPERTY_NAME
+
+        s3_url = "https://s3.some-valid-region.amazonaws.com/hello/world"
+        resource_dict = {property_name: s3_url}
+
+        stack_resource.export(resource_id, resource_dict, "dir")
+        self.assertEquals(resource_dict[property_name], s3_url)
+        self.s3_uploader_mock.upload_with_dedup.assert_not_called()
+
     def test_export_cloudformation_stack_no_upload_path_is_empty(self):
         stack_resource = CloudFormationStackResource(self.s3_uploader_mock)
         resource_id = "id"