Merge pull request #3575 from aws/release-v1.87.0

Release 1.87.0 (to main)
aws · Apr 4, 2024 · 8fb8f6c · 8fb8f6c
2 parents 5a5ab3c + 8b7b677
commit 8fb8f6c
Show file tree

Hide file tree

Showing 8 changed files with 760 additions and 580 deletions.
diff --git a/samtranslator/__init__.py b/samtranslator/__init__.py
@@ -1 +1 @@
-__version__ = "1.86.0"
+__version__ = "1.87.0"
diff --git a/samtranslator/region_configuration.py b/samtranslator/region_configuration.py
@@ -18,12 +18,7 @@ def is_apigw_edge_configuration_supported(cls) -> bool:
         :return: True, if API Gateway does not support Edge configuration
         """
 
-        return ArnGenerator.get_partition_name() not in [
-            "aws-us-gov",
-            "aws-iso",
-            "aws-iso-b",
-            "aws-cn",
-        ]
+        return ArnGenerator.get_partition_name() not in ["aws-us-gov", "aws-iso", "aws-iso-b", "aws-cn", "aws-iso-e"]
 
     @classmethod
     def is_service_supported(cls, service, region=None):  # type: ignore[no-untyped-def]

diff --git a/samtranslator/schema/schema.json b/samtranslator/schema/schema.json
diff --git a/samtranslator/translator/arn_generator.py b/samtranslator/translator/arn_generator.py
@@ -25,6 +25,8 @@ def _region_to_partition(region: str) -> str:
         return "aws-iso-b"
     if region_string.startswith("us-gov"):
         return "aws-us-gov"
+    if region_string.startswith("eu-isoe"):
+        return "aws-iso-e"
 
     return "aws"
 

diff --git a/schema_source/cloudformation-docs.json b/schema_source/cloudformation-docs.json
diff --git a/schema_source/cloudformation.schema.json b/schema_source/cloudformation.schema.json
diff --git a/tests/unit/test_region_configuration.py b/tests/unit/test_region_configuration.py
@@ -26,6 +26,7 @@ def test_when_apigw_edge_configuration_supported(self, partition):
             ["aws-us-gov"],
             ["aws-iso"],
             ["aws-iso-b"],
+            ["aws-iso-e"],
         ]
     )
     def test_when_apigw_edge_configuration_is_not_supported(self, partition):

diff --git a/tests/unit/translator/test_arn_generator.py b/tests/unit/translator/test_arn_generator.py
@@ -14,6 +14,7 @@ class TestArnGenerator(TestCase):
             ["us-gov-west-1", "aws-us-gov"],
             ["us-iso-east-1", "aws-iso"],
             ["us-isob-east-1", "aws-iso-b"],
+            ["eu-isoe-west-1", "aws-iso-e"],
         ]
     )
     def test_get_partition_name(self, region, expected_partition):
@@ -27,6 +28,7 @@ def test_get_partition_name(self, region, expected_partition):
             ["us-gov-west-1", "aws-us-gov"],
             ["us-iso-east-1", "aws-iso"],
             ["us-isob-east-1", "aws-iso-b"],
+            ["eu-isoe-west-1", "aws-iso-e"],
         ]
     )
     def test_get_partition_name_when_region_not_provided(self, region, expected_partition):