fix: Raise Invalid Resource When DisableExecuteApiEndpoint: False And Has No DefinitionBody (#2285)

* Added Python3 Support for Translate CLI

* Fixed disable_execute_api_endpoint: false Case

* Formatted with Black

* Added Fix for HttpApi

* Added Unit Tests

* Removed Function from Test Template

* Updated Executable to be Python 3 Only

Author: CoshUS

bin/sam-translate.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """Convert SAM templates to CloudFormation templates.
 
@@ -26,7 +26,9 @@
 import sys
 
 import boto3
+
 from docopt import docopt
+from functools import reduce
 
 my_path = os.path.dirname(os.path.abspath(__file__))
 sys.path.insert(0, my_path + "/..")

samtranslator/model/api/api_generator.py

@@ -304,7 +304,7 @@ def _add_endpoint_extension(self):
         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 irrespective of origin of DefinitionBody.
         """
-        if self.disable_execute_api_endpoint and not self.definition_body:
+        if self.disable_execute_api_endpoint is not None and not self.definition_body:
             raise InvalidResourceException(
                 self.logical_id, "DisableExecuteApiEndpoint works only within 'DefinitionBody' property."
             )

samtranslator/model/api/http_api_generator.py

@@ -141,7 +141,7 @@ def _add_endpoint_configuration(self):
         For this reason, we always put DisableExecuteApiEndpoint into openapi object.
 
         """
-        if self.disable_execute_api_endpoint and not self.definition_body:
+        if self.disable_execute_api_endpoint is not None and not self.definition_body:
             raise InvalidResourceException(
                 self.logical_id, "DisableExecuteApiEndpoint works only within 'DefinitionBody' property."
             )

tests/translator/input/error_api_with_disable_api_execute_endpoint_false.yaml

@@ -0,0 +1,7 @@
+Resources:
+  ApiGatewayApi:
+    Type: AWS::Serverless::Api
+    Properties:
+      StageName: prod
+      DisableExecuteApiEndpoint: False
+      DefinitionUri: s3://sam-demo-bucket/webpage_swagger.json

tests/translator/input/error_http_api_with_disable_api_execute_endpoint_false.yaml

@@ -0,0 +1,7 @@
+Resources:
+  ApiGatewayApi:
+    Type: AWS::Serverless::HttpApi
+    Properties:
+      StageName: prod
+      DisableExecuteApiEndpoint: False
+      DefinitionUri: s3://sam-demo-bucket/webpage_swagger.json

tests/translator/output/error_api_with_disable_api_execute_endpoint_false.json

@@ -0,0 +1,3 @@
+{
+  "errorMessage": "Invalid Serverless Application Specification document. Number of errors found: 1. Resource with id [ApiGatewayApi] is invalid. DisableExecuteApiEndpoint works only within 'DefinitionBody' property."
+}

tests/translator/output/error_http_api_with_disable_api_execute_endpoint_false.json

@@ -0,0 +1,3 @@
+{
+  "errorMessage": "Invalid Serverless Application Specification document. Number of errors found: 1. Resource with id [ApiGatewayApi] is invalid. DisableExecuteApiEndpoint works only within 'DefinitionBody' property."
+}