Skip to content

test: update custom domain integration tests #3868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
valerena merged 3 commits into from
Jan 7, 2026
+17 −15
Merged

test: update custom domain integration tests #3868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9285e4f
test: update custom domain integration tests
valerena Jan 3, 2026
a5f2a31
test: fix lint
valerena Jan 5, 2026
19ddf08
Merge branch 'develop' into custom-domain-tests
valerena Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions integration/combination/test_custom_http_api_domains_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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"])
Expand Down
6 changes: 3 additions & 3 deletions integration/combination/test_custom_rest_api_domains.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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"]
Expand All @@ -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"])

Expand Down
2 changes: 2 additions & 0 deletions integration/helpers/base_internal_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

from integration.helpers.base_test import BaseTest

CUSTOM_DOMAIN_TOP_LEVEL = "tooling.lambda.aws.dev"


class BaseInternalTest(BaseTest):
"""
Expand Down
4 changes: 2 additions & 2 deletions integration/resources/expected/combination/api_with_custom_domains_edge.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
},
{
Expand Down
4 changes: 2 additions & 2 deletions integration/resources/expected/combination/api_with_custom_domains_regional.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"ResourceType": "AWS::ApiGateway::RestApi"
},
{
"LogicalResourceId": "RecordSetGroupddfc299be2",
"LogicalResourceId": "RecordSetGroup303b65d470",
"ResourceType": "AWS::Route53::RecordSetGroup"
},
{
Expand All @@ -28,7 +28,7 @@
"ResourceType": "AWS::ApiGateway::BasePathMapping"
},
{
"LogicalResourceId": "ApiGatewayDomainName7898169271",
"LogicalResourceId": "ApiGatewayDomainNamec65e226806",
"ResourceType": "AWS::ApiGateway::DomainName"
},
{
Expand Down
4 changes: 2 additions & 2 deletions ...sources/expected/combination/api_with_custom_domains_regional_ownership_verification.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"ResourceType": "AWS::ApiGateway::RestApi"
},
{
"LogicalResourceId": "RecordSetGroupddfc299be2",
"LogicalResourceId": "RecordSetGroup303b65d470",
"ResourceType": "AWS::Route53::RecordSetGroup"
},
{
Expand All @@ -28,7 +28,7 @@
"ResourceType": "AWS::ApiGateway::BasePathMapping"
},
{
"LogicalResourceId": "ApiGatewayDomainNamec6418178e6",
"LogicalResourceId": "ApiGatewayDomainName468109b572",
"ResourceType": "AWS::ApiGateway::DomainName"
},
{
Expand Down
4 changes: 2 additions & 2 deletions integration/resources/expected/combination/http_api_with_custom_domains_regional.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
{
Expand Down
4 changes: 2 additions & 2 deletions ...es/expected/combination/http_api_with_custom_domains_regional_ownership_verification.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
{
Expand Down
Loading