fix lint issues

Author: mbfreder

samtranslator/model/api/api_generator.py

@@ -612,7 +612,7 @@ def _construct_api_domain(  # noqa: PLR0912, PLR0915
 
         return ApiDomainResponse(domain, basepath_resource_list, record_set_group)
 
-    def _construct_api_domain_v2(
+    def _construct_api_domain_v2(  # noqa: PLR0912, PLR0915
         self, rest_api: ApiGatewayRestApi, route53_record_set_groups: Any
     ) -> ApiDomainResponseV2:
         """
@@ -671,12 +671,7 @@ def _construct_api_domain_v2(
 
         basepath_resource_list: List[ApiGatewayBasePathMappingV2] = []
         if basepaths is None:
-            basepath_mapping = ApiGatewayBasePathMappingV2(
-                self.logical_id + "BasePathMapping", attributes=self.passthrough_resource_attributes
-            )
-            basepath_mapping.DomainNameArn = ref(domain_name_arn)
-            basepath_mapping.RestApiId = ref(rest_api.logical_id)
-            basepath_mapping.Stage = ref(rest_api.logical_id + ".Stage")
+            basepath_mapping = self._create_basepath_mapping(domain_name_arn, rest_api)
             basepath_resource_list.extend([basepath_mapping])
         else:
             sam_expect(basepaths, self.logical_id, "Domain.BasePath").to_be_a_list_of(ExpectedType.STRING)
@@ -723,18 +718,22 @@ def _construct_api_domain_v2(
                 )
 
             if not record_set_group:
-                record_set_group = Route53RecordSetGroup(logical_id, attributes=self.passthrough_resource_attributes)
-                if "HostedZoneId" in route53:
-                    record_set_group.HostedZoneId = route53.get("HostedZoneId")
-                if "HostedZoneName" in route53:
-                    record_set_group.HostedZoneName = route53.get("HostedZoneName")
-                record_set_group.RecordSets = []
+                record_set_group = self._get_record_set_group(logical_id, route53)
                 route53_record_set_groups[logical_id] = record_set_group
 
             record_set_group.RecordSets += self._construct_record_sets_for_domain(self.domain, domain_name, route53)
 
         return ApiDomainResponseV2(domain, basepath_resource_list, record_set_group)
 
+    def _get_record_set_group(self, logical_id: str, route53: Dict[str, Any]) -> Route53RecordSetGroup:
+        record_set_group = Route53RecordSetGroup(logical_id, attributes=self.passthrough_resource_attributes)
+        if "HostedZoneId" in route53:
+            record_set_group.HostedZoneId = route53.get("HostedZoneId")
+        if "HostedZoneName" in route53:
+            record_set_group.HostedZoneName = route53.get("HostedZoneName")
+        record_set_group.RecordSets = []
+        return record_set_group
+
     def _construct_single_record_set_group(
         self, domain: Dict[str, Any], api_domain_name: str, route53: Any
     ) -> Route53RecordSetGroup:
@@ -799,6 +798,17 @@ def _construct_alias_target(self, domain: Dict[str, Any], api_domain_name: str,
             alias_target["DNSName"] = route53.get("DistributionDomainName")
         return alias_target
 
+    def _create_basepath_mapping(
+        self, domain_name_arn: PassThrough, rest_api: ApiGatewayRestApi
+    ) -> ApiGatewayBasePathMappingV2:
+        basepath_mapping = ApiGatewayBasePathMappingV2(
+            self.logical_id + "BasePathMapping", attributes=self.passthrough_resource_attributes
+        )
+        basepath_mapping.DomainNameArn = ref(domain_name_arn)
+        basepath_mapping.RestApiId = ref(rest_api.logical_id)
+        basepath_mapping.Stage = ref(rest_api.logical_id + ".Stage")
+        return basepath_mapping
+
     @cw_timer(prefix="Generator", name="Api")
     def to_cloudformation(
         self, redeploy_restapi_parameters: Optional[Any], route53_record_set_groups: Dict[str, Route53RecordSetGroup]
@@ -808,8 +818,11 @@ def to_cloudformation(
         :returns: a tuple containing the RestApi, Deployment, and Stage for an empty Api.
         :rtype: tuple
         """
+        api_domain_response: ApiDomainResponseV2 | ApiDomainResponse
+        domain: Resource | None
+        basepath_mapping: List[ApiGatewayBasePathMapping] | List[ApiGatewayBasePathMappingV2] | None
         rest_api = self._construct_rest_api()
-        if self.endpoint_configuration == "PRIVATE":
+        if self.endpoint_configuration and self.endpoint_configuration.get("Type") == "PRIVATE":
             api_domain_response = self._construct_api_domain_v2(rest_api, route53_record_set_groups)
             domain = api_domain_response.domain
             basepath_mapping = api_domain_response.apigw_basepath_mapping_list
@@ -840,7 +853,9 @@ def to_cloudformation(
                 List[Resource],
                 Tuple[Resource],
                 List[LambdaPermission],
+                List[Resource],
                 List[ApiGatewayBasePathMapping],
+                List[ApiGatewayBasePathMappingV2],
             ],
         ] = []
 

tests/translator/input/api_with_custom_domains_private.yaml

@@ -44,12 +44,12 @@ Resources:
         Types:
         - PRIVATE
       SecurityPolicy: TLS_1_2
-      RegionalCertificateArn: !Ref CertificateArn
+      CertificateArn: !Ref CertificateArn
 
   ApiMapping:
     Type: AWS::ApiGateway::BasePathMappingV2
     Properties:
-      DomainName: !Ref ApiDomainName
+      DomainNameArn: !Ref ApiDomainName
       RestApiId: !Ref MyApi
       Stage: prod
 

tests/translator/output/api_with_custom_domains_private.json

@@ -33,6 +33,9 @@
   "Resources": {
     "ApiDomainName": {
       "Properties": {
+        "CertificateArn": {
+          "Ref": "CertificateArn"
+        },
         "DomainName": {
           "Ref": "DomainName"
         },
@@ -41,16 +44,13 @@
             "PRIVATE"
           ]
         },
-        "RegionalCertificateArn": {
-          "Ref": "CertificateArn"
-        },
         "SecurityPolicy": "TLS_1_2"
       },
       "Type": "AWS::ApiGateway::DomainNameV2"
     },
     "ApiMapping": {
       "Properties": {
-        "DomainName": {
+        "DomainNameArn": {
           "Ref": "ApiDomainName"
         },
         "RestApiId": {

tests/translator/output/aws-cn/api_with_custom_domains_private.json

@@ -33,6 +33,9 @@
   "Resources": {
     "ApiDomainName": {
       "Properties": {
+        "CertificateArn": {
+          "Ref": "CertificateArn"
+        },
         "DomainName": {
           "Ref": "DomainName"
         },
@@ -41,16 +44,13 @@
             "PRIVATE"
           ]
         },
-        "RegionalCertificateArn": {
-          "Ref": "CertificateArn"
-        },
         "SecurityPolicy": "TLS_1_2"
       },
       "Type": "AWS::ApiGateway::DomainNameV2"
     },
     "ApiMapping": {
       "Properties": {
-        "DomainName": {
+        "DomainNameArn": {
           "Ref": "ApiDomainName"
         },
         "RestApiId": {

tests/translator/output/aws-us-gov/api_with_custom_domains_private.json

@@ -33,6 +33,9 @@
   "Resources": {
     "ApiDomainName": {
       "Properties": {
+        "CertificateArn": {
+          "Ref": "CertificateArn"
+        },
         "DomainName": {
           "Ref": "DomainName"
         },
@@ -41,16 +44,13 @@
             "PRIVATE"
           ]
         },
-        "RegionalCertificateArn": {
-          "Ref": "CertificateArn"
-        },
         "SecurityPolicy": "TLS_1_2"
       },
       "Type": "AWS::ApiGateway::DomainNameV2"
     },
     "ApiMapping": {
       "Properties": {
-        "DomainName": {
+        "DomainNameArn": {
           "Ref": "ApiDomainName"
         },
         "RestApiId": {