feat: Recognize provider.apiGateway.usagePlan

Author: medikoo

lib/deploy/events/apiGateway/usagePlan.js

@@ -5,7 +5,9 @@ const BbPromise = require('bluebird');
 
 module.exports = {
   compileUsagePlan() {
-    if (this.serverless.service.provider.usagePlan
+    const usagePlan = _.get(this.serverless.service.provider.apiGateway, 'usagePlan')
+      || this.serverless.service.provider.usagePlan;
+    if (usagePlan
       || _.get(this.serverless.service.provider.apiGateway, 'apiKeys')
       || this.serverless.service.provider.apiKeys) {
       this.apiGatewayUsagePlanLogicalId = this.provider.naming.getUsagePlanLogicalId();
@@ -29,28 +31,26 @@ module.exports = {
           },
         },
       });
-      if (_.has(this.serverless.service.provider, 'usagePlan.quota')
-        && this.serverless.service.provider.usagePlan.quota !== null) {
+      if (_.has(usagePlan, 'quota') && usagePlan.quota !== null) {
         _.merge(this.serverless.service.provider.compiledCloudFormationTemplate.Resources, {
           [this.apiGatewayUsagePlanLogicalId]: {
             Properties: {
               Quota: _.merge(
-                { Limit: this.serverless.service.provider.usagePlan.quota.limit },
-                { Offset: this.serverless.service.provider.usagePlan.quota.offset },
-                { Period: this.serverless.service.provider.usagePlan.quota.period },
+                { Limit: usagePlan.quota.limit },
+                { Offset: usagePlan.quota.offset },
+                { Period: usagePlan.quota.period },
               ),
             },
           },
         });
       }
-      if (_.has(this.serverless.service.provider, 'usagePlan.throttle')
-        && this.serverless.service.provider.usagePlan.throttle !== null) {
+      if (_.has(usagePlan, 'throttle') && usagePlan.throttle !== null) {
         _.merge(this.serverless.service.provider.compiledCloudFormationTemplate.Resources, {
           [this.apiGatewayUsagePlanLogicalId]: {
             Properties: {
               Throttle: _.merge(
-                { BurstLimit: this.serverless.service.provider.usagePlan.throttle.burstLimit },
-                { RateLimit: this.serverless.service.provider.usagePlan.throttle.rateLimit },
+                { BurstLimit: usagePlan.throttle.burstLimit },
+                { RateLimit: usagePlan.throttle.rateLimit },
               ),
             },
           },

lib/deploy/events/apiGateway/usagePlan.test.js

@@ -84,15 +84,17 @@ describe('#compileUsagePlan()', () => {
   });
 
   it('should compile custom usage plan resource', () => {
-    serverless.service.provider.usagePlan = {
-      quota: {
-        limit: 500,
-        offset: 10,
-        period: 'MONTH',
-      },
-      throttle: {
-        burstLimit: 200,
-        rateLimit: 100,
+    serverless.service.provider.apiGateway = {
+      usagePlan: {
+        quota: {
+          limit: 500,
+          offset: 10,
+          period: 'MONTH',
+        },
+        throttle: {
+          burstLimit: 200,
+          rateLimit: 100,
+        },
       },
     };