aws
diff --git a/‎samtranslator/__init__.py‎
Lines changed: 1 addition & 1 deletion b/‎samtranslator/__init__.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎samtranslator/model/api/http_api_generator.py‎
Lines changed: 39 additions & 8 deletions b/‎samtranslator/model/api/http_api_generator.py‎
Lines changed: 39 additions & 8 deletions
diff --git a/‎samtranslator/model/lambda_.py‎
Lines changed: 1 addition & 0 deletions b/‎samtranslator/model/lambda_.py‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎samtranslator/model/sam_resources.py‎
Lines changed: 3 additions & 0 deletions b/‎samtranslator/model/sam_resources.py‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎samtranslator/open_api/open_api.py‎
Lines changed: 31 additions & 0 deletions b/‎samtranslator/open_api/open_api.py‎
Lines changed: 31 additions & 0 deletions
diff --git a/‎samtranslator/plugins/globals/globals.py‎
Lines changed: 1 addition & 0 deletions b/‎samtranslator/plugins/globals/globals.py‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎tests/model/api/test_http_api_generator.py‎
Lines changed: 2 additions & 2 deletions b/‎tests/model/api/test_http_api_generator.py‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎tests/translator/input/api_with_basic_custom_domain_intrinsics_http.yaml‎
Lines changed: 1 addition & 0 deletions b/‎tests/translator/input/api_with_basic_custom_domain_intrinsics_http.yaml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎tests/translator/input/error_http_api_invalid_disable_execute_api_endpoint.yaml‎
Lines changed: 14 additions & 0 deletions b/‎tests/translator/input/error_http_api_invalid_disable_execute_api_endpoint.yaml‎
Lines changed: 14 additions & 0 deletions
diff --git a/‎tests/translator/input/error_implicit_http_api_auth_any_method.yaml‎
Lines changed: 24 additions & 0 deletions b/‎tests/translator/input/error_implicit_http_api_auth_any_method.yaml‎
Lines changed: 24 additions & 0 deletions
@@ -1 +1 @@
-__version__ = "1.30.1"
+__version__ = "1.31.0"
@@ -49,7 +49,7 @@ def __init__(
         domain=None,
         fail_on_warnings=False,
         description=None,
-        disable_execute_api_endpoint=False,
+        disable_execute_api_endpoint=None,
     ):
         """Constructs an API Generator class that generates API Gateway resources
 
@@ -109,8 +109,8 @@ def _construct_http_api(self):
         if self.fail_on_warnings:
             http_api.FailOnWarnings = self.fail_on_warnings
 
-        if self.disable_execute_api_endpoint:
-            http_api.DisableExecuteApiEndpoint = self.disable_execute_api_endpoint
+        if self.disable_execute_api_endpoint is not None:
+            self._add_endpoint_configuration()
 
         if self.definition_uri:
             http_api.BodyS3Location = self._construct_body_s3_dict()
@@ -129,6 +129,32 @@ def _construct_http_api(self):
 
         return http_api
 
+    def _add_endpoint_configuration(self):
+        """Add disableExecuteApiEndpoint if it is set in SAM
+        HttpApi doesn't have vpcEndpointIds
+
+        Note:
+        DisableExecuteApiEndpoint as a property of AWS::ApiGatewayV2::Api needs both DefinitionBody and
+        DefinitionUri to be None. However, if neither DefinitionUri nor DefinitionBody are specified,
+        SAM will generate a openapi definition body based on template configuration.
+        https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-api.html#sam-api-definitionbody
+        For this reason, we always put DisableExecuteApiEndpoint into openapi object.
+
+        """
+        if self.disable_execute_api_endpoint and not self.definition_body:
+            raise InvalidResourceException(
+                self.logical_id, "DisableExecuteApiEndpoint works only within 'DefinitionBody' property."
+            )
+        editor = OpenApiEditor(self.definition_body)
+
+        # if DisableExecuteApiEndpoint is set in both definition_body and as a property,
+        # SAM merges and overrides the disableExecuteApiEndpoint in definition_body with headers of
+        # "x-amazon-apigateway-endpoint-configuration"
+        editor.add_endpoint_config(self.disable_execute_api_endpoint)
+
+        # Assign the OpenApi back to template
+        self.definition_body = editor.openapi
+
     def _add_cors(self):
         """
         Add CORS configuration if CORSConfiguration property is set in SAM.
@@ -314,11 +340,16 @@ def _construct_basepath_mappings(self, basepaths, http_api):
                 invalid_regex = r"[^0-9a-zA-Z\/\-\_]+"
                 if re.search(invalid_regex, path) is not None:
                     raise InvalidResourceException(self.logical_id, "Invalid Basepath name provided.")
-                # ignore leading and trailing `/` in the path name
-                m = re.search(r"[a-zA-Z0-9]+[\-\_]?[a-zA-Z0-9]+", path)
-                path = m.string[m.start(0) : m.end(0)]
-                if path is None:
-                    raise InvalidResourceException(self.logical_id, "Invalid Basepath name provided.")
+
+                if path == "/":
+                    path = ""
+                else:
+                    # ignore leading and trailing `/` in the path name
+                    m = re.search(r"[a-zA-Z0-9]+[\-\_]?[a-zA-Z0-9]+", path)
+                    path = m.string[m.start(0) : m.end(0)]
+                    if path is None:
+                        raise InvalidResourceException(self.logical_id, "Invalid Basepath name provided.")
+
                 logical_id = "{}{}{}".format(self.logical_id, re.sub(r"[\-\_]+", "", path), "ApiMapping")
                 basepath_mapping = ApiGatewayV2ApiMapping(logical_id, attributes=self.passthrough_resource_attributes)
                 basepath_mapping.DomainName = ref(self.domain.get("ApiDomainName"))
 
@@ -23,6 +23,7 @@ class LambdaFunction(Resource):
         "Layers": PropertyType(False, list_of(one_of(is_str(), is_type(dict)))),
         "ReservedConcurrentExecutions": PropertyType(False, any_type()),
         "FileSystemConfigs": PropertyType(False, list_of(is_type(dict))),
+        "CodeSigningConfigArn": PropertyType(False, is_str()),
     }
 
     runtime_attrs = {"name": lambda self: ref(self.logical_id), "arn": lambda self: fnGetAtt(self.logical_id, "Arn")}
 
@@ -82,6 +82,7 @@ class SamFunction(SamResourceMacro):
         "VersionDescription": PropertyType(False, is_str()),
         "ProvisionedConcurrencyConfig": PropertyType(False, is_type(dict)),
         "FileSystemConfigs": PropertyType(False, list_of(is_type(dict))),
+        "CodeSigningConfigArn": PropertyType(False, is_str()),
     }
     event_resolver = ResourceTypeResolver(
         samtranslator.model.eventsources,
@@ -412,6 +413,8 @@ def _construct_lambda_function(self):
         if self.DeadLetterQueue:
             lambda_function.DeadLetterConfig = {"TargetArn": self.DeadLetterQueue["TargetArn"]}
 
+        lambda_function.CodeSigningConfigArn = self.CodeSigningConfigArn
+
         return lambda_function
 
     def _add_event_invoke_managed_policy(self, dest_config, logical_id, condition, dest_arn):
 
@@ -20,6 +20,8 @@ class OpenApiEditor(object):
     _X_APIGW_INTEGRATION = "x-amazon-apigateway-integration"
     _X_APIGW_TAG_VALUE = "x-amazon-apigateway-tag-value"
     _X_APIGW_CORS = "x-amazon-apigateway-cors"
+    _X_APIGW_ENDPOINT_CONFIG = "x-amazon-apigateway-endpoint-configuration"
+    _SERVERS = "servers"
     _CONDITIONAL_IF = "Fn::If"
     _X_ANY_METHOD = "x-amazon-apigateway-any-method"
     _ALL_HTTP_METHODS = ["OPTIONS", "GET", "HEAD", "POST", "PUT", "DELETE", "PATCH"]
@@ -334,6 +336,14 @@ def set_path_default_authorizer(self, path, default_authorizer, authorizers, api
             if normalized_method_name != "options":
                 normalized_method_name = self._normalize_method_name(method_name)
                 # It is possible that the method could have two definitions in a Fn::If block.
+                if normalized_method_name not in self.get_path(path):
+                    raise InvalidDocumentException(
+                        [
+                            InvalidTemplateException(
+                                "Could not find {} in {} within DefinitionBody.".format(normalized_method_name, path)
+                            )
+                        ]
+                    )
                 for method_definition in self.get_method_contents(self.get_path(path)[normalized_method_name]):
                     # If no integration given, then we don't need to process this definition (could be AWS::NoValue)
                     if not self.method_definition_has_integration(method_definition):
@@ -427,6 +437,27 @@ def add_tags(self, tags):
                 tag = {"name": name, self._X_APIGW_TAG_VALUE: value}
                 self.tags.append(tag)
 
+    def add_endpoint_config(self, disable_execute_api_endpoint):
+        """Add endpoint configuration to _X_APIGW_ENDPOINT_CONFIG header in open api definition
+
+        Following this guide:
+        https://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-swagger-extensions-endpoint-configuration.html
+        https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-api.html#cfn-apigatewayv2-api-disableexecuteapiendpoint
+
+        :param boolean disable_execute_api_endpoint: Specifies whether clients can invoke your API by using the default execute-api endpoint.
+
+        """
+
+        DISABLE_EXECUTE_API_ENDPOINT = "disableExecuteApiEndpoint"
+
+        servers_configurations = self._doc.get(self._SERVERS, [{}])
+        for config in servers_configurations:
+            endpoint_configuration = config.get(self._X_APIGW_ENDPOINT_CONFIG, dict())
+            endpoint_configuration[DISABLE_EXECUTE_API_ENDPOINT] = disable_execute_api_endpoint
+            config[self._X_APIGW_ENDPOINT_CONFIG] = endpoint_configuration
+
+        self._doc[self._SERVERS] = servers_configurations
+
     def add_cors(
         self,
         allow_origins,
 
@@ -41,6 +41,7 @@ class Globals(object):
             "AssumeRolePolicyDocument",
             "EventInvokeConfig",
             "FileSystemConfigs",
+            "CodeSigningConfigArn",
         ],
         # Everything except
         #   DefinitionBody: because its hard to reason about merge of Swagger dictionaries
 
@@ -237,14 +237,14 @@ def test_basepaths(self):
         self.kwargs["domain"] = {
             "DomainName": "example.com",
             "CertificateArn": "some-url",
-            "BasePath": ["one-1", "two_2", "three"],
+            "BasePath": ["one-1", "two_2", "three", "/"],
             "Route53": {"HostedZoneId": "xyz", "HostedZoneName": "abc", "IpV6": True},
         }
         http_api = HttpApiGenerator(**self.kwargs)._construct_http_api()
         domain, basepath, route = HttpApiGenerator(**self.kwargs)._construct_api_domain(http_api)
         self.assertIsNotNone(domain, None)
         self.assertIsNotNone(basepath, None)
-        self.assertEqual(len(basepath), 3)
+        self.assertEqual(len(basepath), 4)
         self.assertIsNotNone(route, None)
         self.assertEqual(route.HostedZoneName, None)
         self.assertEqual(route.HostedZoneId, "xyz")
 
@@ -53,6 +53,7 @@ Resources:
     Type: AWS::Serverless::HttpApi
     Properties:
       StageName: Prod
+      DisableExecuteApiEndpoint: False
       Domain:
         DomainName: !Sub 'example-${AWS::Region}.com'
         CertificateArn: !Ref MyDomainCert
 
@@ -0,0 +1,14 @@
+Resources:
+  MyApi:
+    Type: AWS::Serverless::HttpApi
+    Properties:
+      DisableExecuteApiEndpoint: String
+      StageName: Prod
+      Domain:
+        DomainName: "sam-example.com"
+        CertificateArn: "arn:aws:acm:us-east-1:123455353535:certificate/6c911401-620d-4d41-b89e-366c238bb2f3"
+        EndpointConfiguration: REGIONAL
+        SecurityPolicy: TLS_1_2
+        BasePath: ["/basic", "/begin-here"]
+        Route53:
+          HostedZoneName: sam-example.com.
@@ -0,0 +1,24 @@
+Resources:
+  SomeHttpApi:
+    Type: AWS::Serverless::HttpApi
+    Properties:
+      DefinitionBody:
+        paths:
+          "/{domain}":
+            any:
+              responses: {}
+          "/{domain/}{id}":
+            any:
+              responses: {}
+        openapi: 3.0.1
+      Auth:
+        Authorizers:
+          OAuth2Authorizer:
+            AuthorizationScopes:
+            - email
+            JwtConfiguration:
+              audience:
+              - randomnumber
+              issuer: https://some/issuer
+            IdentitySource: "$request.headers.Authorization"
+        DefaultAuthorizer: OAuth2Authorizer
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = "1.30.1"`
	`1`	`+__version__ = "1.31.0"`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ class LambdaFunction(Resource):`
`23`	`23`	`"Layers": PropertyType(False, list_of(one_of(is_str(), is_type(dict)))),`
`24`	`24`	`"ReservedConcurrentExecutions": PropertyType(False, any_type()),`
`25`	`25`	`"FileSystemConfigs": PropertyType(False, list_of(is_type(dict))),`
	`26`	`+ "CodeSigningConfigArn": PropertyType(False, is_str()),`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`runtime_attrs = {"name": lambda self: ref(self.logical_id), "arn": lambda self: fnGetAtt(self.logical_id, "Arn")}`