Support new S3 URL format (#123)

* add support for new s3 format

* update version and changelog

* update tests

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.19.1] - 2020-09-01
+### Improvements
+- Add support for this new S3 url format: `https://bucket.s3.aws-region.amazonaws.com/path1/path2`
+
 ## [0.19.0] - 2020-05-21
 ### Breaking changes
 - `rule_mode` is now `BLOCKING` for all Rules.

cfripper/__version__.py

@@ -1,3 +1,3 @@
-VERSION = (0, 19, 0)
+VERSION = (0, 19, 1)
 
 __version__ = ".".join(map(str, VERSION))

cfripper/model/utils.py

@@ -32,6 +32,11 @@ def extract_bucket_name_and_path_from_url(url):
     if match:
         bucket_name, path = match.group(1), match.group(2)[1:]  # Trim start /
 
+    # https://bucket.s3.aws-region.amazonaws.com/path1/path2
+    match = re.search(r"^https://([^.]+)\.s3\.[^\.]+\.amazonaws\.com(.*?)$", url)
+    if match:
+        bucket_name, path = match.group(1), match.group(2)[1:]  # Trim start /
+
     # https://bucket.s3-aws-region.amazonaws.com/path1/path2
     match = re.search(r"^https://([^.]+)\.s3-[^\.]+\.amazonaws\.com(.*?)$", url)
     if match:

tests/model/test_utils.py

@@ -23,6 +23,11 @@
             "cf-templates",
             "path/to/template.yml",
         ),
+        (
+            "https://cf-templates.s3.eu-central-1.amazonaws.com/path/to/template.yml",
+            "cf-templates",
+            "path/to/template.yml",
+        ),
     ],
 )
 def test_extract_bucket_name_and_path_from_url_works(template_url, bucket, path):