Merge pull request #6285 from joetravis/apiKeys-stackName

Use naming to get stackName

Author: pmuens

lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.js

@@ -9,7 +9,7 @@ module.exports = {
 
     if (apiKeys && apiKeys.length) {
       this.serverless.cli.log('Removing usage plan association...');
-      const stackName = `${this.serverless.service.service}-${this.provider.getStage()}`;
+      const stackName = `${this.provider.naming.getStackName()}`;
       return BbPromise.all([
         this.provider.request('CloudFormation',
           'describeStackResource',

lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.test.js

@@ -69,7 +69,7 @@ describe('#disassociateUsagePlan()', () => {
         'CloudFormation',
         'describeStackResource',
         {
-          StackName: `${serverless.service.service}-${awsProvider.getStage()}`,
+          StackName: `${awsProvider.naming.getStackName()}`,
           LogicalResourceId: 'ApiGatewayRestApi',
         }
       )).to.be.equal(true);