fix(AWS API Gateway): Correctly set throttle when quota missing

serverless · Jan 20, 2021 · 4a30bb1 · 4a30bb1
1 parent 4ba4b81
commit 4a30bb1
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 29 deletions.
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.js
@@ -82,7 +82,7 @@ function createUsagePlanResource(that, name) {
       }
       return accum;
     }, {});
-    if (Object.keys(quotaProperties).length) {
+    if (Object.keys(throttleProperties).length) {
       _.merge(template, {
         Properties: {
           Throttle: _.merge(

diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js
@@ -332,54 +332,70 @@ describe('UsagePlan', () => {
     },
   };
 
-  it('Should have values for throttle', () => {
+  it('Should have values for throttle', async () => {
     serverlessConfigurationExtension.provider.apiGateway = { usagePlan: { throttle } };
-    return runServerless({
+    const { cfTemplate } = await runServerless({
       fixture: 'apiGateway',
       configExt: serverlessConfigurationExtension,
       cliArgs: ['package'],
-    }).then(({ cfTemplate }) => {
-      const cfResources = cfTemplate.Resources;
-
-      expect(cfResources.ApiGatewayUsagePlan.Properties.Throttle.BurstLimit).to.be.equal(
-        burstLimit
-      );
-      expect(cfResources.ApiGatewayUsagePlan.Properties.Throttle.RateLimit).to.be.equal(rateLimit);
     });
+
+    expect(cfTemplate.Resources.ApiGatewayUsagePlan.Properties.Throttle.BurstLimit).to.be.equal(
+      burstLimit
+    );
+    expect(cfTemplate.Resources.ApiGatewayUsagePlan.Properties.Throttle.RateLimit).to.be.equal(
+      rateLimit
+    );
   });
 
-  it('Should have values for quota', () => {
+  it('Should have values for quota', async () => {
     serverlessConfigurationExtension.provider.apiGateway = { usagePlan: { quota } };
-    return runServerless({
+    const { cfTemplate } = await runServerless({
       fixture: 'apiGateway',
       configExt: serverlessConfigurationExtension,
       cliArgs: ['package'],
-    }).then(({ cfTemplate }) => {
-      const cfResources = cfTemplate.Resources;
+    });
 
-      expect(cfResources.ApiGatewayUsagePlan.Properties.Quota.Limit).to.be.equal(limit);
-      expect(cfResources.ApiGatewayUsagePlan.Properties.Quota.Offset).to.be.equal(offset);
-      expect(cfResources.ApiGatewayUsagePlan.Properties.Quota.Period).to.be.equal(period);
+    expect(cfTemplate.Resources.ApiGatewayUsagePlan.Properties.Quota.Limit).to.be.equal(limit);
+    expect(cfTemplate.Resources.ApiGatewayUsagePlan.Properties.Quota.Offset).to.be.equal(offset);
+    expect(cfTemplate.Resources.ApiGatewayUsagePlan.Properties.Quota.Period).to.be.equal(period);
+  });
+
+  it('Should have values for throttle and not quota', async () => {
+    serverlessConfigurationExtension.provider.apiGateway = { usagePlan: { throttle } };
+    const { cfTemplate } = await runServerless({
+      fixture: 'apiGateway',
+      configExt: serverlessConfigurationExtension,
+      cliArgs: ['package'],
     });
+
+    expect(cfTemplate.Resources.ApiGatewayUsagePlan.Properties.Throttle.BurstLimit).to.be.equal(
+      burstLimit
+    );
+    expect(cfTemplate.Resources.ApiGatewayUsagePlan.Properties.Throttle.RateLimit).to.be.equal(
+      rateLimit
+    );
+
+    expect(cfTemplate.Resources.ApiGatewayUsagePlan.Properties).to.not.have.property('quota');
   });
 
-  it('Should have values for quota and throttle', () => {
+  it('Should have values for quota and throttle', async () => {
     serverlessConfigurationExtension.provider.apiGateway = { usagePlan: { throttle, quota } };
-    return runServerless({
+    const { cfTemplate } = await runServerless({
       fixture: 'apiGateway',
       configExt: serverlessConfigurationExtension,
       cliArgs: ['package'],
-    }).then(({ cfTemplate }) => {
-      const cfResources = cfTemplate.Resources;
+    });
 
-      expect(cfResources.ApiGatewayUsagePlan.Properties.Throttle.BurstLimit).to.be.equal(
-        burstLimit
-      );
-      expect(cfResources.ApiGatewayUsagePlan.Properties.Throttle.RateLimit).to.be.equal(rateLimit);
+    expect(cfTemplate.Resources.ApiGatewayUsagePlan.Properties.Throttle.BurstLimit).to.be.equal(
+      burstLimit
+    );
+    expect(cfTemplate.Resources.ApiGatewayUsagePlan.Properties.Throttle.RateLimit).to.be.equal(
+      rateLimit
+    );
 
-      expect(cfResources.ApiGatewayUsagePlan.Properties.Quota.Limit).to.be.equal(limit);
-      expect(cfResources.ApiGatewayUsagePlan.Properties.Quota.Offset).to.be.equal(offset);
-      expect(cfResources.ApiGatewayUsagePlan.Properties.Quota.Period).to.be.equal(period);
-    });
+    expect(cfTemplate.Resources.ApiGatewayUsagePlan.Properties.Quota.Limit).to.be.equal(limit);
+    expect(cfTemplate.Resources.ApiGatewayUsagePlan.Properties.Quota.Offset).to.be.equal(offset);
+    expect(cfTemplate.Resources.ApiGatewayUsagePlan.Properties.Quota.Period).to.be.equal(period);
   });
 });