diff --git a/integration/combination/test_custom_http_api_domains_test.py b/integration/combination/test_custom_http_api_domains_test.py index 688389953..8711ba83b 100644 --- a/integration/combination/test_custom_http_api_domains_test.py +++ b/integration/combination/test_custom_http_api_domains_test.py @@ -1,7 +1,7 @@ from unittest.case import skipIf from integration.config.service_names import CUSTOM_DOMAIN -from integration.helpers.base_internal_test import BaseInternalTest +from integration.helpers.base_internal_test import CUSTOM_DOMAIN_TOP_LEVEL, BaseInternalTest from integration.helpers.base_test import nonblocking from integration.helpers.resource import current_region_not_included @@ -26,7 +26,7 @@ def test_custom_http_api_domains_regional(self): if "FeatureToggle" in self.pipeline_prefix: self.assertEqual("httpapi.ftl.sam-gamma-regional.com", result["DomainName"]) else: - self.assertEqual("httpapi.sam-gamma-regional.com", result["DomainName"]) + self.assertEqual(f"httpapi-sam-gamma-regional.{CUSTOM_DOMAIN_TOP_LEVEL}", result["DomainName"]) mtls_auth_config = result["MutualTlsAuthentication"] self.assertEqual(self.file_to_s3_uri_map["MTLSCert.pem"]["uri"], mtls_auth_config["TruststoreUri"]) diff --git a/integration/combination/test_custom_rest_api_domains.py b/integration/combination/test_custom_rest_api_domains.py index 26b8a7176..e931f7245 100644 --- a/integration/combination/test_custom_rest_api_domains.py +++ b/integration/combination/test_custom_rest_api_domains.py @@ -1,7 +1,7 @@ from unittest.case import skipIf from integration.config.service_names import CUSTOM_DOMAIN -from integration.helpers.base_internal_test import BaseInternalTest +from integration.helpers.base_internal_test import CUSTOM_DOMAIN_TOP_LEVEL, BaseInternalTest from integration.helpers.base_test import nonblocking from integration.helpers.resource import current_region_not_included @@ -25,7 +25,7 @@ def test_custom_rest_api_domains_edge(self): if "FeatureToggle" in self.pipeline_prefix: self.assertEqual("ftl.sam-gamma-edge.com", result["domainName"]) else: - self.assertEqual("sam-gamma-edge.com", result["domainName"]) + self.assertEqual(f"sam-gamma-edge.{CUSTOM_DOMAIN_TOP_LEVEL}", result["domainName"]) end_point_config = result["endpointConfiguration"] end_point_types = end_point_config["types"] @@ -46,7 +46,7 @@ def test_custom_rest_api_domains_regional(self): if "FeatureToggle" in self.pipeline_prefix: self.assertEqual("ftl.sam-gamma-regional.com", result["domainName"]) else: - self.assertEqual("sam-gamma-regional.com", result["domainName"]) + self.assertEqual(f"sam-gamma-regional.{CUSTOM_DOMAIN_TOP_LEVEL}", result["domainName"]) self.assertEqual("TLS_1_2", result["securityPolicy"]) diff --git a/integration/helpers/base_internal_test.py b/integration/helpers/base_internal_test.py index 44be48c5a..0651ca21e 100644 --- a/integration/helpers/base_internal_test.py +++ b/integration/helpers/base_internal_test.py @@ -4,6 +4,8 @@ from integration.helpers.base_test import BaseTest +CUSTOM_DOMAIN_TOP_LEVEL = "tooling.lambda.aws.dev" + class BaseInternalTest(BaseTest): """ diff --git a/integration/resources/expected/combination/api_with_custom_domains_edge.json b/integration/resources/expected/combination/api_with_custom_domains_edge.json index ff3d53996..2fee6e3bc 100644 --- a/integration/resources/expected/combination/api_with_custom_domains_edge.json +++ b/integration/resources/expected/combination/api_with_custom_domains_edge.json @@ -1,6 +1,6 @@ [ { - "LogicalResourceId": "RecordSetGroup1b7eeb359e", + "LogicalResourceId": "RecordSetGroup303b65d470", "ResourceType": "AWS::Route53::RecordSetGroup" }, { @@ -8,7 +8,7 @@ "ResourceType": "AWS::ApiGateway::Deployment" }, { - "LogicalResourceId": "ApiGatewayDomainName1101a94567", + "LogicalResourceId": "ApiGatewayDomainNameed93f7bdb0", "ResourceType": "AWS::ApiGateway::DomainName" }, { diff --git a/integration/resources/expected/combination/api_with_custom_domains_regional.json b/integration/resources/expected/combination/api_with_custom_domains_regional.json index eec0647ef..bbb996283 100644 --- a/integration/resources/expected/combination/api_with_custom_domains_regional.json +++ b/integration/resources/expected/combination/api_with_custom_domains_regional.json @@ -16,7 +16,7 @@ "ResourceType": "AWS::ApiGateway::RestApi" }, { - "LogicalResourceId": "RecordSetGroupddfc299be2", + "LogicalResourceId": "RecordSetGroup303b65d470", "ResourceType": "AWS::Route53::RecordSetGroup" }, { @@ -28,7 +28,7 @@ "ResourceType": "AWS::ApiGateway::BasePathMapping" }, { - "LogicalResourceId": "ApiGatewayDomainName7898169271", + "LogicalResourceId": "ApiGatewayDomainNamec65e226806", "ResourceType": "AWS::ApiGateway::DomainName" }, { diff --git a/integration/resources/expected/combination/api_with_custom_domains_regional_ownership_verification.json b/integration/resources/expected/combination/api_with_custom_domains_regional_ownership_verification.json index fec74ff5e..a5bfc9ae7 100644 --- a/integration/resources/expected/combination/api_with_custom_domains_regional_ownership_verification.json +++ b/integration/resources/expected/combination/api_with_custom_domains_regional_ownership_verification.json @@ -16,7 +16,7 @@ "ResourceType": "AWS::ApiGateway::RestApi" }, { - "LogicalResourceId": "RecordSetGroupddfc299be2", + "LogicalResourceId": "RecordSetGroup303b65d470", "ResourceType": "AWS::Route53::RecordSetGroup" }, { @@ -28,7 +28,7 @@ "ResourceType": "AWS::ApiGateway::BasePathMapping" }, { - "LogicalResourceId": "ApiGatewayDomainNamec6418178e6", + "LogicalResourceId": "ApiGatewayDomainName468109b572", "ResourceType": "AWS::ApiGateway::DomainName" }, { diff --git a/integration/resources/expected/combination/http_api_with_custom_domains_regional.json b/integration/resources/expected/combination/http_api_with_custom_domains_regional.json index c069daf32..a5f4eccc8 100644 --- a/integration/resources/expected/combination/http_api_with_custom_domains_regional.json +++ b/integration/resources/expected/combination/http_api_with_custom_domains_regional.json @@ -20,7 +20,7 @@ "ResourceType": "AWS::ApiGatewayV2::Api" }, { - "LogicalResourceId": "RecordSetGroupddfc299be2", + "LogicalResourceId": "RecordSetGroup303b65d470", "ResourceType": "AWS::Route53::RecordSetGroup" }, { @@ -28,7 +28,7 @@ "ResourceType": "AWS::ApiGatewayV2::Stage" }, { - "LogicalResourceId": "ApiGatewayDomainNameV2e7a0af471b", + "LogicalResourceId": "ApiGatewayDomainNameV213a98a57a3", "ResourceType": "AWS::ApiGatewayV2::DomainName" }, { diff --git a/integration/resources/expected/combination/http_api_with_custom_domains_regional_ownership_verification.json b/integration/resources/expected/combination/http_api_with_custom_domains_regional_ownership_verification.json index a2cfab55a..614bb79b2 100644 --- a/integration/resources/expected/combination/http_api_with_custom_domains_regional_ownership_verification.json +++ b/integration/resources/expected/combination/http_api_with_custom_domains_regional_ownership_verification.json @@ -20,7 +20,7 @@ "ResourceType": "AWS::ApiGatewayV2::Api" }, { - "LogicalResourceId": "RecordSetGroupddfc299be2", + "LogicalResourceId": "RecordSetGroup303b65d470", "ResourceType": "AWS::Route53::RecordSetGroup" }, { @@ -28,7 +28,7 @@ "ResourceType": "AWS::ApiGatewayV2::Stage" }, { - "LogicalResourceId": "ApiGatewayDomainNameV2804ee5e222", + "LogicalResourceId": "ApiGatewayDomainNameV23c498a5924", "ResourceType": "AWS::ApiGatewayV2::DomainName" }, {