Update Uri to BodyS3Location

samcli/commands/local/lib/sam_api_provider.py

@@ -136,18 +136,7 @@ def _extract_from_serverless_api(self, logical_id, api_resource, collector):
             LOG.debug("Skipping resource '%s'. Swagger document not found in DefinitionBody and DefinitionUri",
                       logical_id)
             return
-
-        reader = SamSwaggerReader(definition_body=body,
-                                  definition_uri=uri,
-                                  working_dir=self.cwd)
-        swagger = reader.read()
-        parser = SwaggerParser(swagger)
-        apis = parser.get_apis()
-        LOG.debug("Found '%s' APIs in resource '%s'", len(apis), logical_id)
-
-        collector.add_apis(logical_id, apis)
-        collector.add_binary_media_types(logical_id, parser.get_binary_media_types())  # Binary media from swagger
-        collector.add_binary_media_types(logical_id, binary_media)  # Binary media specified on resource in template
+        self._extract_swagger_api(logical_id, body, uri, binary_media, collector)
 
     def _extract_cloud_formation_api(self, logical_id, api_resource, collector):
         """
@@ -167,14 +156,17 @@ def _extract_cloud_formation_api(self, logical_id, api_resource, collector):
         """
         properties = api_resource.get("Properties", {})
         body = properties.get("Body")
-        uri = properties.get("Uri")
+        s3_location = properties.get("BodyS3Location")
         binary_media = properties.get("BinaryMediaTypes", [])
 
-        if not body and not uri:
+        if not body and not s3_location:
             # Swagger is not found anywhere.
-            LOG.debug("Skipping resource '%s'. Swagger document not found in DefinitionBody and DefinitionUri",
+            LOG.debug("Skipping resource '%s'. Swagger document not found in Body and BodyS3Location",
                       logical_id)
             return
+        self._extract_swagger_api(logical_id, body, s3_location, binary_media, collector)
+
+    def _extract_swagger_api(self, logical_id, body, uri, binary_media, collector):
 
         reader = SamSwaggerReader(definition_body=body,
                                   definition_uri=uri,

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

@@ -1,9 +1,5 @@
----
 AWSTemplateFormatVersion: '2010-09-09'
-Globals:
-  Api:
-    BinaryMediaTypes:
-    - image~1png
+
 Resources:
   Base64ResponseFunction:
     Properties:
@@ -70,7 +66,7 @@ Resources:
                   Fn::Sub: arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${MyNonServerlessLambdaFunction.Arn}/invocations
         swagger: '2.0'
         x-amazon-apigateway-binary-media-types:
-        - image/gif
+          - image/gif
       StageName: prod
     Type: AWS::ApiGateway::RestApi
   MyLambdaFunction:

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

@@ -974,7 +974,6 @@ def test_with_no_apis(self):
                 "Api1": {
                     "Type": "AWS::ApiGateway::RestApi",
                     "Properties": {
-                        "StageName": "Prod"
                     },
 
                 }
@@ -983,7 +982,6 @@ def test_with_no_apis(self):
 
         provider = SamApiProvider(template)
 
-        self.assertEquals(len(provider.apis), 0)
         self.assertEquals(provider.apis, [])
 
     def test_with_inline_swagger_apis(self):
@@ -993,7 +991,6 @@ def test_with_inline_swagger_apis(self):
                 "Api1": {
                     "Type": "AWS::ApiGateway::RestApi",
                     "Properties": {
-                        "StageName": "Prod",
                         "Body": make_swagger(self.input_apis)
                     }
                 }
@@ -1017,8 +1014,7 @@ def test_with_swagger_as_local_file(self):
                     "Api1": {
                         "Type": "AWS::ApiGateway::RestApi",
                         "Properties": {
-                            "StageName": "Prod",
-                            "Uri": filename
+                            "BodyS3Location": filename
                         }
                     }
                 }
@@ -1038,8 +1034,7 @@ def test_with_swagger_as_both_body_and_uri(self, SamSwaggerReaderMock):
                 "Api1": {
                     "Type": "AWS::ApiGateway::RestApi",
                     "Properties": {
-                        "StageName": "Prod",
-                        "Uri": filename,
+                        "BodyS3Location": filename,
                         "Body": body
                     }
                 }
@@ -1073,7 +1068,6 @@ def test_swagger_with_any_method(self):
                 "Api1": {
                     "Type": "AWS::ApiGateway::RestApi",
                     "Properties": {
-                        "StageName": "Prod",
                         "Body": make_swagger(apis)
                     }
                 }
@@ -1090,7 +1084,6 @@ def test_with_binary_media_types(self):
                 "Api1": {
                     "Type": "AWS::ApiGateway::RestApi",
                     "Properties": {
-                        "StageName": "Prod",
                         "Body": make_swagger(self.input_apis, binary_media_types=self.binary_types)
                     }
                 }
@@ -1129,7 +1122,6 @@ def test_with_binary_media_types_in_swagger_and_on_resource(self):
                     "Type": "AWS::ApiGateway::RestApi",
                     "Properties": {
                         "BinaryMediaTypes": extra_binary_types,
-                        "StageName": "Prod",
                         "Body": make_swagger(input_apis, binary_media_types=self.binary_types)
                     }
                 }