From ac2842dda874e5b7e7f0bcb6836ec72533e2ec06 Mon Sep 17 00:00:00 2001 From: Aayush Thapa Date: Wed, 29 May 2024 09:57:40 -0700 Subject: [PATCH 1/4] add missing partition to edge config support --- samtranslator/region_configuration.py | 2 +- tests/unit/test_region_configuration.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/samtranslator/region_configuration.py b/samtranslator/region_configuration.py index c2a210b9c..42d6dcbde 100644 --- a/samtranslator/region_configuration.py +++ b/samtranslator/region_configuration.py @@ -18,7 +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", "aws-iso-e"] + return ArnGenerator.get_partition_name() not in ["aws-us-gov", "aws-iso", "aws-iso-b", "aws-cn", "aws-iso-e", "aws-iso-f"] @classmethod def is_service_supported(cls, service, region=None): # type: ignore[no-untyped-def] diff --git a/tests/unit/test_region_configuration.py b/tests/unit/test_region_configuration.py index e9bcf50b3..efd53aa9b 100644 --- a/tests/unit/test_region_configuration.py +++ b/tests/unit/test_region_configuration.py @@ -27,6 +27,7 @@ def test_when_apigw_edge_configuration_supported(self, partition): ["aws-iso"], ["aws-iso-b"], ["aws-iso-e"], + ["aws-iso-f"] ] ) def test_when_apigw_edge_configuration_is_not_supported(self, partition): From b3215a5d4f0d0aaa39d37ffbb17454440be9964f Mon Sep 17 00:00:00 2001 From: Aayush Thapa Date: Wed, 29 May 2024 10:06:13 -0700 Subject: [PATCH 2/4] format fix --- samtranslator/region_configuration.py | 9 ++++++++- tests/unit/test_region_configuration.py | 11 +---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/samtranslator/region_configuration.py b/samtranslator/region_configuration.py index 42d6dcbde..a12750d11 100644 --- a/samtranslator/region_configuration.py +++ b/samtranslator/region_configuration.py @@ -18,7 +18,14 @@ 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", "aws-iso-e", "aws-iso-f"] + return ArnGenerator.get_partition_name() not in [ + "aws-us-gov", + "aws-iso", + "aws-iso-b", + "aws-cn", + "aws-iso-e", + "aws-iso-f", + ] @classmethod def is_service_supported(cls, service, region=None): # type: ignore[no-untyped-def] diff --git a/tests/unit/test_region_configuration.py b/tests/unit/test_region_configuration.py index efd53aa9b..9cbb10f66 100644 --- a/tests/unit/test_region_configuration.py +++ b/tests/unit/test_region_configuration.py @@ -20,16 +20,7 @@ def test_when_apigw_edge_configuration_supported(self, partition): self.assertTrue(RegionConfiguration.is_apigw_edge_configuration_supported()) - @parameterized.expand( - [ - ["aws-cn"], - ["aws-us-gov"], - ["aws-iso"], - ["aws-iso-b"], - ["aws-iso-e"], - ["aws-iso-f"] - ] - ) + @parameterized.expand([["aws-cn"], ["aws-us-gov"], ["aws-iso"], ["aws-iso-b"], ["aws-iso-e"], ["aws-iso-f"]]) def test_when_apigw_edge_configuration_is_not_supported(self, partition): with patch( "samtranslator.translator.arn_generator.ArnGenerator.get_partition_name" From 01d2771a77cc559b38167cead6c62ce4dd805be5 Mon Sep 17 00:00:00 2001 From: Aayush Thapa Date: Wed, 29 May 2024 10:26:57 -0700 Subject: [PATCH 3/4] fix static list --- samtranslator/region_configuration.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/samtranslator/region_configuration.py b/samtranslator/region_configuration.py index a12750d11..659300a5c 100644 --- a/samtranslator/region_configuration.py +++ b/samtranslator/region_configuration.py @@ -17,15 +17,10 @@ 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", - "aws-iso-e", - "aws-iso-f", - ] + partition = ArnGenerator.get_partition_name() + if partition.startswith('aws-iso') or partition in ["aws-us-gov", "aws-cn"]: + return False + return True @classmethod def is_service_supported(cls, service, region=None): # type: ignore[no-untyped-def] From 639a934f0e284564b5358bc018719a478d2a2d7a Mon Sep 17 00:00:00 2001 From: Aayush Thapa Date: Wed, 29 May 2024 10:28:46 -0700 Subject: [PATCH 4/4] format fix --- samtranslator/region_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samtranslator/region_configuration.py b/samtranslator/region_configuration.py index 659300a5c..2e6fa85b6 100644 --- a/samtranslator/region_configuration.py +++ b/samtranslator/region_configuration.py @@ -18,7 +18,7 @@ def is_apigw_edge_configuration_supported(cls) -> bool: :return: True, if API Gateway does not support Edge configuration """ partition = ArnGenerator.get_partition_name() - if partition.startswith('aws-iso') or partition in ["aws-us-gov", "aws-cn"]: + if partition.startswith("aws-iso") or partition in ["aws-us-gov", "aws-cn"]: return False return True