fix(aws-apigateway): api gateway usage plan (#19023)

API Gateway allows decimals and integers for rate limits. This PR fixes an error thrown when entering a decimal.

To fix this, I created a new method `validateDouble()` in `utils.ts` based off `validateInteger()` and updated the caller as seen in the commit.

This also fixes #18994.

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*

Author: HariboDev

packages/@aws-cdk/aws-apigateway/lib/usage-plan.ts

@@ -6,7 +6,7 @@ import { CfnUsagePlan, CfnUsagePlanKey } from './apigateway.generated';
 import { Method } from './method';
 import { IRestApi } from './restapi';
 import { Stage } from './stage';
-import { validateInteger } from './util';
+import { validateDouble, validateInteger } from './util';
 
 /**
  * Container for defining throttling parameters to API stages or methods.
@@ -316,7 +316,7 @@ export class UsagePlan extends UsagePlanBase {
       const burstLimit = props.burstLimit;
       validateInteger(burstLimit, 'Throttle burst limit');
       const rateLimit = props.rateLimit;
-      validateInteger(rateLimit, 'Throttle rate limit');
+      validateDouble(rateLimit, 'Throttle rate limit');
 
       ret = {
         burstLimit: burstLimit,

packages/@aws-cdk/aws-apigateway/lib/util.ts

@@ -78,6 +78,12 @@ export function validateInteger(property: number | undefined, messagePrefix: str
   }
 }
 
+export function validateDouble(property: number | undefined, messagePrefix: string) {
+  if (property && isNaN(property) && isNaN(parseFloat(property.toString()))) {
+    throw new Error(`${messagePrefix} should be an double`);
+  }
+}
+
 export class JsonSchemaMapper {
   /**
    * Transforms naming of some properties to prefix with a $, where needed

packages/@aws-cdk/aws-apigateway/test/usage-plan.test.ts

@@ -27,13 +27,13 @@ describe('usage plan', () => {
     });
   });
 
-  test('usage plan with throttling limits', () => {
+  test('usage plan with integer throttling limits', () => {
     // GIVEN
     const stack = new cdk.Stack();
     const api = new apigateway.RestApi(stack, 'my-api', { cloudWatchRole: false, deploy: true, deployOptions: { stageName: 'test' } });
     const method: apigateway.Method = api.root.addMethod('GET'); // Need at least one method on the api
     const usagePlanName = 'Basic';
-    const usagePlanDescription = 'Basic Usage Plan with throttling limits';
+    const usagePlanDescription = 'Basic Usage Plan with integer throttling limits';
 
     // WHEN
     new apigateway.UsagePlan(stack, 'my-usage-plan', {
@@ -78,6 +78,57 @@ describe('usage plan', () => {
     });
   });
 
+  test('usage plan with integer and float throttling limits', () => {
+    // GIVEN
+    const stack = new cdk.Stack();
+    const api = new apigateway.RestApi(stack, 'my-api', { cloudWatchRole: false, deploy: true, deployOptions: { stageName: 'test' } });
+    const method: apigateway.Method = api.root.addMethod('GET'); // Need at least one method on the api
+    const usagePlanName = 'Basic';
+    const usagePlanDescription = 'Basic Usage Plan with integer and float throttling limits';
+
+    // WHEN
+    new apigateway.UsagePlan(stack, 'my-usage-plan', {
+      name: usagePlanName,
+      description: usagePlanDescription,
+      apiStages: [
+        {
+          stage: api.deploymentStage,
+          throttle: [
+            {
+              method,
+              throttle: {
+                burstLimit: 20,
+                rateLimit: 10.5,
+              },
+            },
+          ],
+        },
+      ],
+    });
+
+    // THEN
+    Template.fromStack(stack).hasResourceProperties(RESOURCE_TYPE, {
+      UsagePlanName: usagePlanName,
+      Description: usagePlanDescription,
+      ApiStages: [
+        {
+          ApiId: {
+            Ref: 'myapi4C7BF186',
+          },
+          Stage: {
+            Ref: 'myapiDeploymentStagetest4A4AB65E',
+          },
+          Throttle: {
+            '//GET': {
+              BurstLimit: 20,
+              RateLimit: 10.5,
+            },
+          },
+        },
+      ],
+    });
+  });
+
   test('usage plan with blocked methods', () => {
     // GIVEN
     const stack = new cdk.Stack();