Merge pull request #7039 from serverless/fix-custom-rest-api-id-handling

Fix resolution of user configured APIGW
serverless · Dec 3, 2019 · 44115aa · 44115aa
2 parents d28ac9d + ad59d22
commit 44115aa
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js
@@ -99,7 +99,7 @@ function resolveAccountInfo() {
 function resolveApiGatewayResource(resources) {
   if (resources.ApiGatewayRestApi) return resources.ApiGatewayRestApi;
   const apiGatewayResources = _.values(resources).filter(
-    resource => resource.Type === 'AWS::ApiGateway::Resource'
+    resource => resource.Type === 'AWS::ApiGateway::RestApi'
   );
   if (apiGatewayResources.length === 1) return apiGatewayResources[0];
   // None, or more than one API Gateway found (currently there's no support for multiple APIGW's)

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
@@ -41,7 +41,7 @@ describe('#updateStage()', () => {
     serverless.service.provider.compiledCloudFormationTemplate = {
       Resources: {
         ApiGatewayRestApi: {
-          Type: 'AWS::ApiGateway::Resource',
+          Type: 'AWS::ApiGateway::RestApi',
           Properties: {
             Name: 'dev-my-service',
           },
@@ -65,6 +65,7 @@ describe('#updateStage()', () => {
         items: [
           { name: 'dev-my-service', id: 'devRestApiId' },
           { name: 'prod-my-service', id: 'prodRestApiId' },
+          { name: 'custom-rest-api-name', id: 'customRestApiId' },
         ],
       });
     providerRequestStub
@@ -87,6 +88,16 @@ describe('#updateStage()', () => {
           old: 'tag',
         },
       });
+    providerRequestStub
+      .withArgs('APIGateway', 'getStage', {
+        restApiId: 'customRestApiId',
+        stageName: 'dev',
+      })
+      .resolves({
+        tags: {
+          old: 'tag',
+        },
+      });
 
     providerRequestStub
       .withArgs('CloudWatchLogs', 'deleteLogGroup', {
@@ -480,8 +491,9 @@ describe('#updateStage()', () => {
     const resources = context.serverless.service.provider.compiledCloudFormationTemplate.Resources;
     resources.CustomApiGatewayRestApi = resources.ApiGatewayRestApi;
     delete resources.ApiGatewayRestApi;
+    resources.CustomApiGatewayRestApi.Properties.Name = 'custom-rest-api-name';
     return updateStage.call(context).then(() => {
-      expect(context.apiGatewayRestApiId).to.equal('devRestApiId');
+      expect(context.apiGatewayRestApiId).to.equal('customRestApiId');
     });
   });