Merge branch 'develop' into lmi-integration-tests

vicheey · web-flow · commit 60a0c256354c · 2026-01-08T09:55:00.000-08:00
diff --git 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
@@ -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
@@ -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
@@ -1,14 +1,14 @@
 [
   {
-    "LogicalResourceId": "RecordSetGroup1b7eeb359e",
+    "LogicalResourceId": "RecordSetGroup303b65d470",
     "ResourceType": "AWS::Route53::RecordSetGroup"
   },
   {
     "LogicalResourceId": "MyApiDeployment",
     "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
@@ -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
@@ -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
@@ -20,15 +20,15 @@
     "ResourceType": "AWS::ApiGatewayV2::Api"
   },
   {
-    "LogicalResourceId": "RecordSetGroupddfc299be2",
+    "LogicalResourceId": "RecordSetGroup303b65d470",
     "ResourceType": "AWS::Route53::RecordSetGroup"
   },
   {
     "LogicalResourceId": "MyApiProdStage",
     "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
@@ -20,15 +20,15 @@
     "ResourceType": "AWS::ApiGatewayV2::Api"
   },
   {
-    "LogicalResourceId": "RecordSetGroupddfc299be2",
+    "LogicalResourceId": "RecordSetGroup303b65d470",
     "ResourceType": "AWS::Route53::RecordSetGroup"
   },
   {
     "LogicalResourceId": "MyApiProdStage",
     "ResourceType": "AWS::ApiGatewayV2::Stage"
   },
   {
-    "LogicalResourceId": "ApiGatewayDomainNameV2804ee5e222",
+    "LogicalResourceId": "ApiGatewayDomainNameV23c498a5924",
     "ResourceType": "AWS::ApiGatewayV2::DomainName"
   },
   {

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`		`- "LogicalResourceId": "RecordSetGroup1b7eeb359e",`
	`3`	`+ "LogicalResourceId": "RecordSetGroup303b65d470",`
`4`	`4`	`"ResourceType": "AWS::Route53::RecordSetGroup"`
`5`	`5`	`},`
`6`	`6`	`{`
`7`	`7`	`"LogicalResourceId": "MyApiDeployment",`
`8`	`8`	`"ResourceType": "AWS::ApiGateway::Deployment"`
`9`	`9`	`},`
`10`	`10`	`{`
`11`		`- "LogicalResourceId": "ApiGatewayDomainName1101a94567",`
	`11`	`+ "LogicalResourceId": "ApiGatewayDomainNameed93f7bdb0",`
`12`	`12`	`"ResourceType": "AWS::ApiGateway::DomainName"`
`13`	`13`	`},`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`"ResourceType": "AWS::ApiGateway::RestApi"`
`17`	`17`	`},`
`18`	`18`	`{`
`19`		`- "LogicalResourceId": "RecordSetGroupddfc299be2",`
	`19`	`+ "LogicalResourceId": "RecordSetGroup303b65d470",`
`20`	`20`	`"ResourceType": "AWS::Route53::RecordSetGroup"`
`21`	`21`	`},`
`22`	`22`	`{`
`@@ -28,7 +28,7 @@`
`28`	`28`	`"ResourceType": "AWS::ApiGateway::BasePathMapping"`
`29`	`29`	`},`
`30`	`30`	`{`
`31`		`- "LogicalResourceId": "ApiGatewayDomainName7898169271",`
	`31`	`+ "LogicalResourceId": "ApiGatewayDomainNamec65e226806",`
`32`	`32`	`"ResourceType": "AWS::ApiGateway::DomainName"`
`33`	`33`	`},`
`34`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,15 +20,15 @@`
`20`	`20`	`"ResourceType": "AWS::ApiGatewayV2::Api"`
`21`	`21`	`},`
`22`	`22`	`{`
`23`		`- "LogicalResourceId": "RecordSetGroupddfc299be2",`
	`23`	`+ "LogicalResourceId": "RecordSetGroup303b65d470",`
`24`	`24`	`"ResourceType": "AWS::Route53::RecordSetGroup"`
`25`	`25`	`},`
`26`	`26`	`{`
`27`	`27`	`"LogicalResourceId": "MyApiProdStage",`
`28`	`28`	`"ResourceType": "AWS::ApiGatewayV2::Stage"`
`29`	`29`	`},`
`30`	`30`	`{`
`31`		`- "LogicalResourceId": "ApiGatewayDomainNameV2e7a0af471b",`
	`31`	`+ "LogicalResourceId": "ApiGatewayDomainNameV213a98a57a3",`
`32`	`32`	`"ResourceType": "AWS::ApiGatewayV2::DomainName"`
`33`	`33`	`},`
`34`	`34`	`{`