(feat) CloudFormation AWS::ApiGateway::RestApi support

tests/integration/local/start_api/start_api_integ_base.py

@@ -33,9 +33,9 @@ def setUpClass(cls):
 
     @classmethod
     def start_api(cls):
-        command = "sam"
-        if os.getenv("SAM_CLI_DEV"):
-            command = "samdev"
+        # command = "sam"
+        # if os.getenv("SAM_CLI_DEV"):
+        command = "samdev"
 
         cls.start_api_process = Popen([command, "local", "start-api", "-t", cls.template, "-p", cls.port, "--debug"])
         # we need to wait some time for start-api to start, hence the sleep

tests/integration/local/start_api/test_start_api.py

@@ -362,12 +362,6 @@ def test_function_not_defined_in_template(self):
         self.assertEquals(response.status_code, 502)
         self.assertEquals(response.json(), {"message": "No function defined for resource method"})
 
-    def test_function_with_no_api_event_is_reachable(self):
-        response = requests.get(self.url + "/functionwithnoapievent")
-
-        self.assertEquals(response.status_code, 200)
-        self.assertEquals(response.json(), {'hello': 'world'})
-
     def test_lambda_function_resource_is_reachable(self):
         response = requests.get(self.url + "/nonserverlessfunction")
 

tests/integration/testdata/start_api/swagger-rest-api-template.yaml

@@ -3,7 +3,7 @@ AWSTemplateFormatVersion: '2010-09-09'
 Resources:
   Base64ResponseFunction:
     Properties:
-      CodeUri: "."
+      Code: "."
       Handler: main.base64_response
       Runtime: python3.6
     Type: AWS::Lambda::Function
@@ -27,7 +27,7 @@ Resources:
                 responses: {}
                 type: aws_proxy
                 uri:
-                  Fn::Sub: arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${MyLambdaFunction.Arn}/invocations
+                  Fn::Sub: arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${MyNonServerlessLambdaFunction.Arn}/invocations
           "/base64response":
             get:
               x-amazon-apigateway-integration:
@@ -42,14 +42,6 @@ Resources:
                 type: aws_proxy
                 uri:
                   Fn::Sub: arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${EchoBase64EventBodyFunction.Arn}/invocations
-          "/functionwithnoapievent":
-            get:
-              x-amazon-apigateway-integration:
-                httpMethod: POST
-                responses: {}
-                type: aws_proxy
-                uri:
-                  Fn::Sub: arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${NoApiEventFunction.Arn}/invocations
           "/nofunctionfound":
             get:
               x-amazon-apigateway-integration:
@@ -69,29 +61,9 @@ Resources:
           - image/gif
       StageName: prod
     Type: AWS::ApiGateway::RestApi
-  MyLambdaFunction:
-    Properties:
-      CodeUri: "."
-      Events:
-        GetApi:
-          Properties:
-            Method: GET
-            Path: "/get"
-            RestApiId:
-              Ref: MyApi
-          Type: Api
-      Handler: main.handler
-      Runtime: python3.6
-    Type: AWS::Lambda::Function
   MyNonServerlessLambdaFunction:
     Properties:
-      CodeUri: "."
-      Handler: main.handler
-      Runtime: python3.6
-    Type: AWS::Lambda::Function
-  NoApiEventFunction:
-    Properties:
-      CodeUri: "."
+      Code: "."
       Handler: main.handler
       Runtime: python3.6
     Type: AWS::Lambda::Function

tests/unit/commands/local/lib/test_api_provider.py

@@ -3,7 +3,9 @@
 
 from mock import patch
 
-from samcli.commands.local.lib.api_provider import ApiProvider, SamApiProvider, CfnApiProvider
+from samcli.commands.local.lib.api_provider import ApiProvider
+from samcli.commands.local.lib.sam_api_provider import SamApiProvider
+from samcli.commands.local.lib.cfn_api_provider import CfnApiProvider
 
 
 class TestApiProvider_init(TestCase):
@@ -25,6 +27,37 @@ def test_provider_with_valid_template(self, SamBaseProviderMock, extract_api_moc
 
 
 class TestApiProviderSelection(TestCase):
+    def test_default_provider(self):
+        resources = {
+            "TestApi": {
+                "Type": "AWS::UNKNOWN_TYPE",
+                "Properties": {
+                    "StageName": "dev",
+                    "DefinitionBody": {
+                        "paths": {
+                            "/path": {
+                                "get": {
+                                    "x-amazon-apigateway-integration": {
+                                        "httpMethod": "POST",
+                                        "type": "aws_proxy",
+                                        "uri": {
+                                            "Fn::Sub": "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31"
+                                                       "/functions/${NoApiEventFunction.Arn}/invocations",
+                                        },
+                                        "responses": {},
+                                    },
+                                }
+                            }
+
+                        }
+                    }
+                }
+            }
+        }
+
+        provider = ApiProvider.find_api_provider(resources)
+        self.assertTrue(isinstance(provider, SamApiProvider))
+
     def test_api_provider_sam_api(self):
         resources = {
             "TestApi": {

tests/unit/commands/local/lib/test_cfn_api_provider.py

@@ -10,7 +10,7 @@
 from tests.unit.commands.local.lib.test_sam_api_provider import make_swagger
 
 
-class TestSamApiProviderwithApiGatewayRestApi(TestCase):
+class TestApiProviderWithApiGatewayRestApi(TestCase):
 
     def setUp(self):
         self.binary_types = ["image/png", "image/jpg"]
@@ -102,7 +102,7 @@ def test_body_with_swagger_as_local_file_expect_fail(self):
             self.assertRaises(Exception, ApiProvider, template)
 
     @patch("samcli.commands.local.lib.cfn_base_api_provider.SamSwaggerReader")
-    def test_with_swagger_as_both_body_and_uri(self, SamSwaggerReaderMock):
+    def test_with_swagger_as_both_body_and_uri_called(self, SamSwaggerReaderMock):
         body = {"some": "body"}
         filename = "somefile.txt"
 

tests/unit/commands/local/lib/test_sam_api_provider.py

@@ -475,7 +475,7 @@ def test_with_swagger_as_local_file(self):
             assertCountEqual(self, self.input_apis, provider.apis)
 
     @patch("samcli.commands.local.lib.cfn_base_api_provider.SamSwaggerReader")
-    def test_with_swagger_as_both_body_and_uri(self, SamSwaggerReaderMock):
+    def test_with_swagger_as_both_body_and_uri_called(self, SamSwaggerReaderMock):
         body = {"some": "body"}
         filename = "somefile.txt"