npm - @aws-solutions-constructs/aws-apigateway-lambda - Versions diffs - 1.124.0 → 1.128.0 - Mend

@aws-solutions-constructs/aws-apigateway-lambda 1.124.0 → 1.128.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/.jsii +54 -29
package/README.md +1 -1
package/lib/index.d.ts +1 -1
package/lib/index.js +2 -2
package/package.json +16 -16
package/test/integ.deployFunction.expected.json +33 -45
package/test/integ.existingFunction.expected.json +36 -48
package/test/test.apigateway-lambda.test.js +2 -9

package/.jsii CHANGED Viewed

@@ -8,12 +8,12 @@
     "url": "https://aws.amazon.com"
   },
   "dependencies": {
-    "@aws-cdk/aws-apigateway": "1.124.0",
-    "@aws-cdk/aws-iam": "1.124.0",
-    "@aws-cdk/aws-lambda": "1.124.0",
-    "@aws-cdk/aws-logs": "1.124.0",
-    "@aws-cdk/core": "1.124.0",
-    "@aws-solutions-constructs/core": "1.124.0",
+    "@aws-cdk/aws-apigateway": "1.128.0",
+    "@aws-cdk/aws-iam": "1.128.0",
+    "@aws-cdk/aws-lambda": "1.128.0",
+    "@aws-cdk/aws-logs": "1.128.0",
+    "@aws-cdk/core": "1.128.0",
+    "@aws-solutions-constructs/core": "1.128.0",
     "constructs": "^3.2.0"
   },
   "dependencyClosure": {
@@ -181,12 +181,7 @@
     },
     "@aws-cdk/aws-cloudfront": {
       "submodules": {
-        "@aws-cdk/aws-cloudfront.experimental": {
-          "locationInModule": {
-            "filename": "lib/index.ts",
-            "line": 12
-          }
-        }
+        "@aws-cdk/aws-cloudfront.experimental": {}
       },
       "targets": {
         "dotnet": {
@@ -511,6 +506,33 @@
         }
       }
     },
+    "@aws-cdk/aws-elasticloadbalancingv2-targets": {
+      "targets": {
+        "dotnet": {
+          "iconUrl": "https://raw.githubusercontent.com/aws/aws-cdk/master/logo/default-256-dark.png",
+          "namespace": "Amazon.CDK.AWS.ElasticLoadBalancingV2.Targets",
+          "packageId": "Amazon.CDK.AWS.ElasticLoadBalancingV2.Targets"
+        },
+        "java": {
+          "maven": {
+            "artifactId": "elasticloadbalancingv2-targets",
+            "groupId": "software.amazon.awscdk"
+          },
+          "package": "software.amazon.awscdk.services.elasticloadbalancingv2.targets"
+        },
+        "js": {
+          "npm": "@aws-cdk/aws-elasticloadbalancingv2-targets"
+        },
+        "python": {
+          "classifiers": [
+            "Framework :: AWS CDK",
+            "Framework :: AWS CDK :: 1"
+          ],
+          "distName": "aws-cdk.aws-elasticloadbalancingv2-targets",
+          "module": "aws_cdk.aws_elasticloadbalancingv2_targets"
+        }
+      }
+    },
     "@aws-cdk/aws-elasticsearch": {
       "targets": {
         "dotnet": {
@@ -1427,7 +1449,7 @@
   },
   "description": "CDK constructs for defining an interaction between an API Gateway and a Lambda function.",
   "homepage": "https://github.com/awslabs/aws-solutions-constructs.git",
-  "jsiiVersion": "1.35.0 (build 6ebef96)",
+  "jsiiVersion": "1.46.0 (build cd08c55)",
   "keywords": [
     "aws",
     "cdk",
@@ -1446,7 +1468,7 @@
   },
   "name": "@aws-solutions-constructs/aws-apigateway-lambda",
   "readme": {
-    "markdown": "# aws-apigateway-lambda module\n<!--BEGIN STABILITY BANNER-->\n\n---\n\n![Stability: Stable](https://img.shields.io/badge/cfn--resources-stable-success.svg?style=for-the-badge)\n\n---\n<!--END STABILITY BANNER-->\n\n| **Reference Documentation**:| <span style=\"font-weight: normal\">https://docs.aws.amazon.com/solutions/latest/constructs/</span>|\n|:-------------|:-------------|\n<div style=\"height:8px\"></div>\n\n| **Language**     | **Package**        |\n|:-------------|-----------------|\n|![Python Logo](https://docs.aws.amazon.com/cdk/api/latest/img/python32.png) Python|`aws_solutions_constructs.aws_apigateway_lambda`|\n|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@aws-solutions-constructs/aws-apigateway-lambda`|\n|![Java Logo](https://docs.aws.amazon.com/cdk/api/latest/img/java32.png) Java|`software.amazon.awsconstructs.services.apigatewaylambda`|\n\n## Overview\n\nThis AWS Solutions Construct implements an Amazon API Gateway REST API connected to an AWS Lambda function pattern.\n\nHere is a minimal deployable pattern definition in Typescript:\n\n``` typescript\nimport { ApiGatewayToLambda } from '@aws-solutions-constructs/aws-apigateway-lambda';\n\nnew ApiGatewayToLambda(this, 'ApiGatewayToLambdaPattern', {\n    lambdaFunctionProps: {\n        runtime: lambda.Runtime.NODEJS_10_X,\n        handler: 'index.handler',\n        code: lambda.Code.fromAsset(`${__dirname}/lambda`)\n    }\n});\n\n```\n\n## Initializer\n\n``` text\nnew ApiGatewayToLambda(scope: Construct, id: string, props: ApiGatewayToLambdaProps);\n```\n\n_Parameters_\n\n* scope [`Construct`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_core.Construct.html)\n* id `string`\n* props [`ApiGatewayToLambdaProps`](#pattern-construct-props)\n\n## Pattern Construct Props\n\n| **Name**     | **Type**        | **Description** |\n|:-------------|:----------------|-----------------|\n|existingLambdaObj?|[`lambda.Function`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-lambda.Function.html)|Existing instance of Lambda Function object, providing both this and `lambdaFunctionProps` will cause an error.|\n|lambdaFunctionProps?|[`lambda.FunctionProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-lambda.FunctionProps.html)|User provided props to override the default props for the Lambda function.|\n|apiGatewayProps?|[`api.LambdaRestApiProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-apigateway.LambdaRestApi.html)|Optional user-provided props to override the default props for the API.|\n|logGroupProps?|[`logs.LogGroupProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-logs.LogGroupProps.html)|User provided props to override the default props for for the CloudWatchLogs LogGroup.|\n\n## Pattern Properties\n\n| **Name**     | **Type**        | **Description** |\n|:-------------|:----------------|-----------------|\n|lambdaFunction|[`lambda.Function`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-lambda.Function.html)|Returns an instance of the Lambda function created by the pattern.|\n|apiGateway|[`api.LambdaRestApi`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-apigateway.LambdaRestApi.html)|Returns an instance of the API Gateway REST API created by the pattern.|\n|apiGatewayCloudWatchRole|[`iam.Role`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-iam.Role.html)|Returns an instance of the iam.Role created by the construct for API Gateway for CloudWatch access.|\n|apiGatewayLogGroup|[`logs.LogGroup`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-logs.LogGroup.html)|Returns an instance of the LogGroup created by the construct for API Gateway access logging to CloudWatch.|\n\n## Default settings\n\nOut of the box implementation of the Construct without any override will set the following defaults:\n\n### Amazon API Gateway\n* Deploy an edge-optimized API endpoint\n* Enable CloudWatch logging for API Gateway\n* Configure least privilege access IAM role for API Gateway\n* Set the default authorizationType for all API methods to IAM\n* Enable X-Ray Tracing\n\n### AWS Lambda Function\n* Configure limited privilege access IAM role for Lambda function\n* Enable reusing connections with Keep-Alive for NodeJs Lambda function\n* Enable X-Ray Tracing\n* Set Environment Variables\n  * AWS_NODEJS_CONNECTION_REUSE_ENABLED (for Node 10.x and higher functions)\n\n## Architecture\n![Architecture Diagram](architecture.png)\n\n***\n&copy; Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved."
+    "markdown": "# aws-apigateway-lambda module\n<!--BEGIN STABILITY BANNER-->\n\n---\n\n![Stability: Stable](https://img.shields.io/badge/cfn--resources-stable-success.svg?style=for-the-badge)\n\n---\n<!--END STABILITY BANNER-->\n\n| **Reference Documentation**:| <span style=\"font-weight: normal\">https://docs.aws.amazon.com/solutions/latest/constructs/</span>|\n|:-------------|:-------------|\n<div style=\"height:8px\"></div>\n\n| **Language**     | **Package**        |\n|:-------------|-----------------|\n|![Python Logo](https://docs.aws.amazon.com/cdk/api/latest/img/python32.png) Python|`aws_solutions_constructs.aws_apigateway_lambda`|\n|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@aws-solutions-constructs/aws-apigateway-lambda`|\n|![Java Logo](https://docs.aws.amazon.com/cdk/api/latest/img/java32.png) Java|`software.amazon.awsconstructs.services.apigatewaylambda`|\n\n## Overview\n\nThis AWS Solutions Construct implements an Amazon API Gateway REST API connected to an AWS Lambda function pattern.\n\nHere is a minimal deployable pattern definition in Typescript:\n\n``` typescript\nimport { ApiGatewayToLambda } from '@aws-solutions-constructs/aws-apigateway-lambda';\n\nnew ApiGatewayToLambda(this, 'ApiGatewayToLambdaPattern', {\n    lambdaFunctionProps: {\n        runtime: lambda.Runtime.NODEJS_10_X,\n        handler: 'index.handler',\n        code: lambda.Code.fromAsset(`${__dirname}/lambda`)\n    }\n});\n\n```\n\n## Initializer\n\n``` text\nnew ApiGatewayToLambda(scope: Construct, id: string, props: ApiGatewayToLambdaProps);\n```\n\n_Parameters_\n\n* scope [`Construct`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_core.Construct.html)\n* id `string`\n* props [`ApiGatewayToLambdaProps`](#pattern-construct-props)\n\n## Pattern Construct Props\n\n| **Name**     | **Type**        | **Description** |\n|:-------------|:----------------|-----------------|\n|existingLambdaObj?|[`lambda.Function`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-lambda.Function.html)|Existing instance of Lambda Function object, providing both this and `lambdaFunctionProps` will cause an error.|\n|lambdaFunctionProps?|[`lambda.FunctionProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-lambda.FunctionProps.html)|User provided props to override the default props for the Lambda function.|\n|apiGatewayProps?|[`api.LambdaRestApiProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-apigateway.LambdaRestApi.html)|Optional user-provided props to override the default props for the API.|\n|logGroupProps?|[`logs.LogGroupProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-logs.LogGroupProps.html)|User provided props to override the default props for for the CloudWatchLogs LogGroup.|\n\n## Pattern Properties\n\n| **Name**     | **Type**        | **Description** |\n|:-------------|:----------------|-----------------|\n|lambdaFunction|[`lambda.Function`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-lambda.Function.html)|Returns an instance of the Lambda function created by the pattern.|\n|apiGateway|[`api.LambdaRestApi`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-apigateway.LambdaRestApi.html)|Returns an instance of the API Gateway REST API created by the pattern.|\n|apiGatewayCloudWatchRole?|[`iam.Role`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-iam.Role.html)|Returns an instance of the iam.Role created by the construct for API Gateway for CloudWatch access.|\n|apiGatewayLogGroup|[`logs.LogGroup`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-logs.LogGroup.html)|Returns an instance of the LogGroup created by the construct for API Gateway access logging to CloudWatch.|\n\n## Default settings\n\nOut of the box implementation of the Construct without any override will set the following defaults:\n\n### Amazon API Gateway\n* Deploy an edge-optimized API endpoint\n* Enable CloudWatch logging for API Gateway\n* Configure least privilege access IAM role for API Gateway\n* Set the default authorizationType for all API methods to IAM\n* Enable X-Ray Tracing\n\n### AWS Lambda Function\n* Configure limited privilege access IAM role for Lambda function\n* Enable reusing connections with Keep-Alive for NodeJs Lambda function\n* Enable X-Ray Tracing\n* Set Environment Variables\n  * AWS_NODEJS_CONNECTION_REUSE_ENABLED (for Node 10.x and higher functions)\n\n## Architecture\n![Architecture Diagram](architecture.png)\n\n***\n&copy; Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved."
   },
   "repository": {
     "directory": "source/patterns/@aws-solutions-constructs/aws-apigateway-lambda",
@@ -1457,8 +1479,8 @@
   "targets": {
     "dotnet": {
       "iconUrl": "https://raw.githubusercontent.com/aws/aws-cdk/master/logo/default-256-dark.png",
-      "namespace": "Amazon.Constructs.AWS.ApiGatewayLambda",
-      "packageId": "Amazon.Constructs.AWS.ApiGatewayLambda",
+      "namespace": "Amazon.SolutionsConstructs.AWS.ApiGatewayLambda",
+      "packageId": "Amazon.SolutionsConstructs.AWS.ApiGatewayLambda",
       "signAssembly": true
     },
     "java": {
@@ -1550,36 +1572,38 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 58
+            "line": 59
           },
-          "name": "apiGatewayCloudWatchRole",
+          "name": "apiGatewayLogGroup",
           "type": {
-            "fqn": "@aws-cdk/aws-iam.Role"
+            "fqn": "@aws-cdk/aws-logs.LogGroup"
           }
         },
         {
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 59
+            "line": 60
           },
-          "name": "apiGatewayLogGroup",
+          "name": "lambdaFunction",
           "type": {
-            "fqn": "@aws-cdk/aws-logs.LogGroup"
+            "fqn": "@aws-cdk/aws-lambda.Function"
           }
         },
         {
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 60
+            "line": 58
           },
-          "name": "lambdaFunction",
+          "name": "apiGatewayCloudWatchRole",
+          "optional": true,
           "type": {
-            "fqn": "@aws-cdk/aws-lambda.Function"
+            "fqn": "@aws-cdk/aws-iam.Role"
           }
         }
-      ]
+      ],
+      "symbolId": "lib/index:ApiGatewayToLambda"
     },
     "@aws-solutions-constructs/aws-apigateway-lambda.ApiGatewayToLambdaProps": {
       "assembly": "@aws-solutions-constructs/aws-apigateway-lambda",
@@ -1663,9 +1687,10 @@
             "fqn": "@aws-cdk/aws-logs.LogGroupProps"
           }
         }
-      ]
+      ],
+      "symbolId": "lib/index:ApiGatewayToLambdaProps"
     }
   },
-  "version": "1.124.0",
-  "fingerprint": "axvOl/Ljd+rC9tZqb2ReN3lU83zB26UA8pibLvfDBJM="
+  "version": "1.128.0",
+  "fingerprint": "M0eP4Ze5bSzp/0vn9ktxkworPCugvZPt64WHjb0i59Q="
 }

package/README.md CHANGED Viewed

@@ -64,7 +64,7 @@ _Parameters_
 |:-------------|:----------------|-----------------|
 |lambdaFunction|[`lambda.Function`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-lambda.Function.html)|Returns an instance of the Lambda function created by the pattern.|
 |apiGateway|[`api.LambdaRestApi`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-apigateway.LambdaRestApi.html)|Returns an instance of the API Gateway REST API created by the pattern.|
-|apiGatewayCloudWatchRole|[`iam.Role`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-iam.Role.html)|Returns an instance of the iam.Role created by the construct for API Gateway for CloudWatch access.|
+|apiGatewayCloudWatchRole?|[`iam.Role`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-iam.Role.html)|Returns an instance of the iam.Role created by the construct for API Gateway for CloudWatch access.|
 |apiGatewayLogGroup|[`logs.LogGroup`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-logs.LogGroup.html)|Returns an instance of the LogGroup created by the construct for API Gateway access logging to CloudWatch.|
 ## Default settings

package/lib/index.d.ts CHANGED Viewed

@@ -49,7 +49,7 @@ export interface ApiGatewayToLambdaProps {
  */
 export declare class ApiGatewayToLambda extends Construct {
     readonly apiGateway: api.RestApi;
-    readonly apiGatewayCloudWatchRole: iam.Role;
+    readonly apiGatewayCloudWatchRole?: iam.Role;
     readonly apiGatewayLogGroup: logs.LogGroup;
     readonly lambdaFunction: lambda.Function;
     /**

package/lib/index.js CHANGED Viewed

@@ -33,5 +33,5 @@ class ApiGatewayToLambda extends core_1.Construct {
 }
 exports.ApiGatewayToLambda = ApiGatewayToLambda;
 _a = JSII_RTTI_SYMBOL_1;
-ApiGatewayToLambda[_a] = { fqn: "@aws-solutions-constructs/aws-apigateway-lambda.ApiGatewayToLambda", version: "1.124.0" };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQWtCQSwyREFBMkQ7QUFDM0Qsd0ZBQXdGO0FBQ3hGLHdDQUEwQzs7OztBQWUxQyxNQUFhLGtCQUFtQixTQUFRLGdCQUFTOzs7Ozs7Ozs7SUFPL0MsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUE4QjtRQUN0RSxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ2pCLFFBQVEsQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFM0IsNEJBQTRCO1FBQzVCLElBQUksQ0FBQyxjQUFjLEdBQUcsUUFBUSxDQUFDLG1CQUFtQixDQUFDLElBQUksRUFBRTtZQUN2RCxpQkFBaUIsRUFBRSxLQUFLLENBQUMsaUJBQWlCO1lBQzFDLG1CQUFtQixFQUFFLEtBQUssQ0FBQyxtQkFBbUI7U0FDL0MsQ0FBQyxDQUFDO1FBRUgsd0JBQXdCO1FBQ3hCLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsd0JBQXdCO1lBQzdDLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxHQUFHLFFBQVEsQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLGNBQWMsRUFBRSxLQUFLLENBQUMsZUFBZSxFQUFFLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUNuSSxDQUFDOztBQXBCSCxnREFxQkMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqICBDb3B5cmlnaHQgMjAyMSBBbWF6b24uY29tLCBJbmMuIG9yIGl0cyBhZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqICBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgXCJMaWNlbnNlXCIpLiBZb3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlXG4gKiAgd2l0aCB0aGUgTGljZW5zZS4gQSBjb3B5IG9mIHRoZSBMaWNlbnNlIGlzIGxvY2F0ZWQgYXRcbiAqXG4gKiAgICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMFxuICpcbiAqICBvciBpbiB0aGUgJ2xpY2Vuc2UnIGZpbGUgYWNjb21wYW55aW5nIHRoaXMgZmlsZS4gVGhpcyBmaWxlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICdBUyBJUycgQkFTSVMsIFdJVEhPVVQgV0FSUkFOVElFU1xuICogIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGV4cHJlc3Mgb3IgaW1wbGllZC4gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zXG4gKiAgYW5kIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLlxuICovXG5cbi8vIEltcG9ydHNcbmltcG9ydCAqIGFzIGFwaSBmcm9tICdAYXdzLWNkay9hd3MtYXBpZ2F0ZXdheSc7XG5pbXBvcnQgKiBhcyBsYW1iZGEgZnJvbSAnQGF3cy1jZGsvYXdzLWxhbWJkYSc7XG5pbXBvcnQgKiBhcyBpYW0gZnJvbSAnQGF3cy1jZGsvYXdzLWlhbSc7XG5pbXBvcnQgKiBhcyBsb2dzIGZyb20gJ0Bhd3MtY2RrL2F3cy1sb2dzJztcbmltcG9ydCAqIGFzIGRlZmF1bHRzIGZyb20gJ0Bhd3Mtc29sdXRpb25zLWNvbnN0cnVjdHMvY29yZSc7XG4vLyBOb3RlOiBUbyBlbnN1cmUgQ0RLdjIgY29tcGF0aWJpbGl0eSwga2VlcCB0aGUgaW1wb3J0IHN0YXRlbWVudCBmb3IgQ29uc3RydWN0IHNlcGFyYXRlXG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tICdAYXdzLWNkay9jb3JlJztcblxuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbmV4cG9ydCBpbnRlcmZhY2UgQXBpR2F0ZXdheVRvTGFtYmRhUHJvcHMge1xuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuICByZWFkb25seSBleGlzdGluZ0xhbWJkYU9iaj86IGxhbWJkYS5GdW5jdGlvbixcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiAgcmVhZG9ubHkgbGFtYmRhRnVuY3Rpb25Qcm9wcz86IGxhbWJkYS5GdW5jdGlvblByb3BzLFxuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuICByZWFkb25seSBhcGlHYXRld2F5UHJvcHM/OiBhcGkuTGFtYmRhUmVzdEFwaVByb3BzIHwgYW55LFxuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiAgcmVhZG9ubHkgbG9nR3JvdXBQcm9wcz86IGxvZ3MuTG9nR3JvdXBQcm9wc1xufVxuXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG5leHBvcnQgY2xhc3MgQXBpR2F0ZXdheVRvTGFtYmRhIGV4dGVuZHMgQ29uc3RydWN0IHtcbiAgcHVibGljIHJlYWRvbmx5IGFwaUdhdGV3YXk6IGFwaS5SZXN0QXBpO1xuICBwdWJsaWMgcmVhZG9ubHkgYXBpR2F0ZXdheUNsb3VkV2F0Y2hSb2xlOiBpYW0uUm9sZTtcbiAgcHVibGljIHJlYWRvbmx5IGFwaUdhdGV3YXlMb2dHcm91cDogbG9ncy5Mb2dHcm91cDtcbiAgcHVibGljIHJlYWRvbmx5IGxhbWJkYUZ1bmN0aW9uOiBsYW1iZGEuRnVuY3Rpb247XG5cbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBBcGlHYXRld2F5VG9MYW1iZGFQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCk7XG4gICAgZGVmYXVsdHMuQ2hlY2tQcm9wcyhwcm9wcyk7XG5cbiAgICAvLyBTZXR1cCB0aGUgTGFtYmRhIGZ1bmN0aW9uXG4gICAgdGhpcy5sYW1iZGFGdW5jdGlvbiA9IGRlZmF1bHRzLmJ1aWxkTGFtYmRhRnVuY3Rpb24odGhpcywge1xuICAgICAgZXhpc3RpbmdMYW1iZGFPYmo6IHByb3BzLmV4aXN0aW5nTGFtYmRhT2JqLFxuICAgICAgbGFtYmRhRnVuY3Rpb25Qcm9wczogcHJvcHMubGFtYmRhRnVuY3Rpb25Qcm9wc1xuICAgIH0pO1xuXG4gICAgLy8gU2V0dXAgdGhlIEFQSSBHYXRld2F5XG4gICAgW3RoaXMuYXBpR2F0ZXdheSwgdGhpcy5hcGlHYXRld2F5Q2xvdWRXYXRjaFJvbGUsXG4gICAgICB0aGlzLmFwaUdhdGV3YXlMb2dHcm91cF0gPSBkZWZhdWx0cy5HbG9iYWxMYW1iZGFSZXN0QXBpKHRoaXMsIHRoaXMubGFtYmRhRnVuY3Rpb24sIHByb3BzLmFwaUdhdGV3YXlQcm9wcywgcHJvcHMubG9nR3JvdXBQcm9wcyk7XG4gIH1cbn0iXX0=
+ApiGatewayToLambda[_a] = { fqn: "@aws-solutions-constructs/aws-apigateway-lambda.ApiGatewayToLambda", version: "1.128.0" };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQWtCQSwyREFBMkQ7QUFDM0Qsd0ZBQXdGO0FBQ3hGLHdDQUEwQzs7OztBQWUxQyxNQUFhLGtCQUFtQixTQUFRLGdCQUFTOzs7Ozs7Ozs7SUFPL0MsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUE4QjtRQUN0RSxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ2pCLFFBQVEsQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFM0IsNEJBQTRCO1FBQzVCLElBQUksQ0FBQyxjQUFjLEdBQUcsUUFBUSxDQUFDLG1CQUFtQixDQUFDLElBQUksRUFBRTtZQUN2RCxpQkFBaUIsRUFBRSxLQUFLLENBQUMsaUJBQWlCO1lBQzFDLG1CQUFtQixFQUFFLEtBQUssQ0FBQyxtQkFBbUI7U0FDL0MsQ0FBQyxDQUFDO1FBRUgsd0JBQXdCO1FBQ3hCLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsd0JBQXdCO1lBQzdDLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxHQUFHLFFBQVEsQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLGNBQWMsRUFBRSxLQUFLLENBQUMsZUFBZSxFQUFFLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUNuSSxDQUFDOztBQXBCSCxnREFxQkMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqICBDb3B5cmlnaHQgMjAyMSBBbWF6b24uY29tLCBJbmMuIG9yIGl0cyBhZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqICBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgXCJMaWNlbnNlXCIpLiBZb3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlXG4gKiAgd2l0aCB0aGUgTGljZW5zZS4gQSBjb3B5IG9mIHRoZSBMaWNlbnNlIGlzIGxvY2F0ZWQgYXRcbiAqXG4gKiAgICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMFxuICpcbiAqICBvciBpbiB0aGUgJ2xpY2Vuc2UnIGZpbGUgYWNjb21wYW55aW5nIHRoaXMgZmlsZS4gVGhpcyBmaWxlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICdBUyBJUycgQkFTSVMsIFdJVEhPVVQgV0FSUkFOVElFU1xuICogIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGV4cHJlc3Mgb3IgaW1wbGllZC4gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zXG4gKiAgYW5kIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLlxuICovXG5cbi8vIEltcG9ydHNcbmltcG9ydCAqIGFzIGFwaSBmcm9tICdAYXdzLWNkay9hd3MtYXBpZ2F0ZXdheSc7XG5pbXBvcnQgKiBhcyBsYW1iZGEgZnJvbSAnQGF3cy1jZGsvYXdzLWxhbWJkYSc7XG5pbXBvcnQgKiBhcyBpYW0gZnJvbSAnQGF3cy1jZGsvYXdzLWlhbSc7XG5pbXBvcnQgKiBhcyBsb2dzIGZyb20gJ0Bhd3MtY2RrL2F3cy1sb2dzJztcbmltcG9ydCAqIGFzIGRlZmF1bHRzIGZyb20gJ0Bhd3Mtc29sdXRpb25zLWNvbnN0cnVjdHMvY29yZSc7XG4vLyBOb3RlOiBUbyBlbnN1cmUgQ0RLdjIgY29tcGF0aWJpbGl0eSwga2VlcCB0aGUgaW1wb3J0IHN0YXRlbWVudCBmb3IgQ29uc3RydWN0IHNlcGFyYXRlXG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tICdAYXdzLWNkay9jb3JlJztcblxuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbmV4cG9ydCBpbnRlcmZhY2UgQXBpR2F0ZXdheVRvTGFtYmRhUHJvcHMge1xuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuICByZWFkb25seSBleGlzdGluZ0xhbWJkYU9iaj86IGxhbWJkYS5GdW5jdGlvbixcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiAgcmVhZG9ubHkgbGFtYmRhRnVuY3Rpb25Qcm9wcz86IGxhbWJkYS5GdW5jdGlvblByb3BzLFxuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuICByZWFkb25seSBhcGlHYXRld2F5UHJvcHM/OiBhcGkuTGFtYmRhUmVzdEFwaVByb3BzIHwgYW55LFxuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiAgcmVhZG9ubHkgbG9nR3JvdXBQcm9wcz86IGxvZ3MuTG9nR3JvdXBQcm9wc1xufVxuXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG5leHBvcnQgY2xhc3MgQXBpR2F0ZXdheVRvTGFtYmRhIGV4dGVuZHMgQ29uc3RydWN0IHtcbiAgcHVibGljIHJlYWRvbmx5IGFwaUdhdGV3YXk6IGFwaS5SZXN0QXBpO1xuICBwdWJsaWMgcmVhZG9ubHkgYXBpR2F0ZXdheUNsb3VkV2F0Y2hSb2xlPzogaWFtLlJvbGU7XG4gIHB1YmxpYyByZWFkb25seSBhcGlHYXRld2F5TG9nR3JvdXA6IGxvZ3MuTG9nR3JvdXA7XG4gIHB1YmxpYyByZWFkb25seSBsYW1iZGFGdW5jdGlvbjogbGFtYmRhLkZ1bmN0aW9uO1xuXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogQXBpR2F0ZXdheVRvTGFtYmRhUHJvcHMpIHtcbiAgICBzdXBlcihzY29wZSwgaWQpO1xuICAgIGRlZmF1bHRzLkNoZWNrUHJvcHMocHJvcHMpO1xuXG4gICAgLy8gU2V0dXAgdGhlIExhbWJkYSBmdW5jdGlvblxuICAgIHRoaXMubGFtYmRhRnVuY3Rpb24gPSBkZWZhdWx0cy5idWlsZExhbWJkYUZ1bmN0aW9uKHRoaXMsIHtcbiAgICAgIGV4aXN0aW5nTGFtYmRhT2JqOiBwcm9wcy5leGlzdGluZ0xhbWJkYU9iaixcbiAgICAgIGxhbWJkYUZ1bmN0aW9uUHJvcHM6IHByb3BzLmxhbWJkYUZ1bmN0aW9uUHJvcHNcbiAgICB9KTtcblxuICAgIC8vIFNldHVwIHRoZSBBUEkgR2F0ZXdheVxuICAgIFt0aGlzLmFwaUdhdGV3YXksIHRoaXMuYXBpR2F0ZXdheUNsb3VkV2F0Y2hSb2xlLFxuICAgICAgdGhpcy5hcGlHYXRld2F5TG9nR3JvdXBdID0gZGVmYXVsdHMuR2xvYmFsTGFtYmRhUmVzdEFwaSh0aGlzLCB0aGlzLmxhbWJkYUZ1bmN0aW9uLCBwcm9wcy5hcGlHYXRld2F5UHJvcHMsIHByb3BzLmxvZ0dyb3VwUHJvcHMpO1xuICB9XG59Il19

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@aws-solutions-constructs/aws-apigateway-lambda",
-  "version": "1.124.0",
+  "version": "1.128.0",
   "description": "CDK constructs for defining an interaction between an API Gateway and a Lambda function.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -41,8 +41,8 @@
         }
       },
       "dotnet": {
-        "namespace": "Amazon.Constructs.AWS.ApiGatewayLambda",
-        "packageId": "Amazon.Constructs.AWS.ApiGatewayLambda",
+        "namespace": "Amazon.SolutionsConstructs.AWS.ApiGatewayLambda",
+        "packageId": "Amazon.SolutionsConstructs.AWS.ApiGatewayLambda",
         "signAssembly": true,
         "iconUrl": "https://raw.githubusercontent.com/aws/aws-cdk/master/logo/default-256-dark.png"
       },
@@ -53,16 +53,16 @@
     }
   },
   "dependencies": {
-    "@aws-cdk/aws-apigateway": "1.124.0",
-    "@aws-cdk/aws-lambda": "1.124.0",
-    "@aws-cdk/aws-logs": "1.124.0",
-    "@aws-cdk/core": "1.124.0",
-    "@aws-cdk/aws-iam": "1.124.0",
-    "@aws-solutions-constructs/core": "1.124.0",
+    "@aws-cdk/aws-apigateway": "1.128.0",
+    "@aws-cdk/aws-lambda": "1.128.0",
+    "@aws-cdk/aws-logs": "1.128.0",
+    "@aws-cdk/core": "1.128.0",
+    "@aws-cdk/aws-iam": "1.128.0",
+    "@aws-solutions-constructs/core": "1.128.0",
     "constructs": "^3.2.0"
   },
   "devDependencies": {
-    "@aws-cdk/assert": "1.124.0",
+    "@aws-cdk/assert": "1.128.0",
     "@types/jest": "^26.0.22",
     "@types/node": "^10.3.0"
   },
@@ -81,13 +81,13 @@
     ]
   },
   "peerDependencies": {
-    "@aws-cdk/aws-apigateway": "1.124.0",
-    "@aws-cdk/aws-lambda": "1.124.0",
-    "@aws-cdk/aws-logs": "1.124.0",
-    "@aws-cdk/core": "1.124.0",
-    "@aws-solutions-constructs/core": "1.124.0",
+    "@aws-cdk/aws-apigateway": "1.128.0",
+    "@aws-cdk/aws-lambda": "1.128.0",
+    "@aws-cdk/aws-logs": "1.128.0",
+    "@aws-cdk/core": "1.128.0",
+    "@aws-solutions-constructs/core": "1.128.0",
     "constructs": "^3.2.0",
-    "@aws-cdk/aws-iam": "1.124.0"
+    "@aws-cdk/aws-iam": "1.128.0"
   },
   "keywords": [
     "aws",

package/test/integ.deployFunction.expected.json CHANGED Viewed

@@ -95,41 +95,9 @@
       "Properties": {
         "Code": {
           "S3Bucket": {
-            "Ref": "AssetParameters8efd3dd9643a4d64a128ad582cab718a1e464bcc719bbbcf0e7b0481188a0420S3Bucket749AC458"
+            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
           },
-          "S3Key": {
-            "Fn::Join": [
-              "",
-              [
-                {
-                  "Fn::Select": [
-                    0,
-                    {
-                      "Fn::Split": [
-                        "||",
-                        {
-                          "Ref": "AssetParameters8efd3dd9643a4d64a128ad582cab718a1e464bcc719bbbcf0e7b0481188a0420S3VersionKeyFF5CC16D"
-                        }
-                      ]
-                    }
-                  ]
-                },
-                {
-                  "Fn::Select": [
-                    1,
-                    {
-                      "Fn::Split": [
-                        "||",
-                        {
-                          "Ref": "AssetParameters8efd3dd9643a4d64a128ad582cab718a1e464bcc719bbbcf0e7b0481188a0420S3VersionKeyFF5CC16D"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ]
-            ]
-          }
+          "S3Key": "8efd3dd9643a4d64a128ad582cab718a1e464bcc719bbbcf0e7b0481188a0420.zip"
         },
         "Role": {
           "Fn::GetAtt": [
@@ -628,17 +596,37 @@
     }
   },
   "Parameters": {
-    "AssetParameters8efd3dd9643a4d64a128ad582cab718a1e464bcc719bbbcf0e7b0481188a0420S3Bucket749AC458": {
-      "Type": "String",
-      "Description": "S3 bucket for asset \"8efd3dd9643a4d64a128ad582cab718a1e464bcc719bbbcf0e7b0481188a0420\""
-    },
-    "AssetParameters8efd3dd9643a4d64a128ad582cab718a1e464bcc719bbbcf0e7b0481188a0420S3VersionKeyFF5CC16D": {
-      "Type": "String",
-      "Description": "S3 key for asset version \"8efd3dd9643a4d64a128ad582cab718a1e464bcc719bbbcf0e7b0481188a0420\""
-    },
-    "AssetParameters8efd3dd9643a4d64a128ad582cab718a1e464bcc719bbbcf0e7b0481188a0420ArtifactHashA71E92AD": {
-      "Type": "String",
-      "Description": "Artifact hash for asset \"8efd3dd9643a4d64a128ad582cab718a1e464bcc719bbbcf0e7b0481188a0420\""
+    "BootstrapVersion": {
+      "Type": "AWS::SSM::Parameter::Value<String>",
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store."
+    }
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5"
+                  ],
+                  {
+                    "Ref": "BootstrapVersion"
+                  }
+                ]
+              }
+            ]
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+        }
+      ]
     }
   }
 }

package/test/integ.existingFunction.expected.json CHANGED Viewed

@@ -95,41 +95,9 @@
       "Properties": {
         "Code": {
           "S3Bucket": {
-            "Ref": "AssetParameters8efd3dd9643a4d64a128ad582cab718a1e464bcc719bbbcf0e7b0481188a0420S3Bucket749AC458"
+            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
           },
-          "S3Key": {
-            "Fn::Join": [
-              "",
-              [
-                {
-                  "Fn::Select": [
-                    0,
-                    {
-                      "Fn::Split": [
-                        "||",
-                        {
-                          "Ref": "AssetParameters8efd3dd9643a4d64a128ad582cab718a1e464bcc719bbbcf0e7b0481188a0420S3VersionKeyFF5CC16D"
-                        }
-                      ]
-                    }
-                  ]
-                },
-                {
-                  "Fn::Select": [
-                    1,
-                    {
-                      "Fn::Split": [
-                        "||",
-                        {
-                          "Ref": "AssetParameters8efd3dd9643a4d64a128ad582cab718a1e464bcc719bbbcf0e7b0481188a0420S3VersionKeyFF5CC16D"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ]
-            ]
-          }
+          "S3Key": "8efd3dd9643a4d64a128ad582cab718a1e464bcc719bbbcf0e7b0481188a0420.zip"
         },
         "Role": {
           "Fn::GetAtt": [
@@ -599,20 +567,6 @@
       ]
     }
   },
-  "Parameters": {
-    "AssetParameters8efd3dd9643a4d64a128ad582cab718a1e464bcc719bbbcf0e7b0481188a0420S3Bucket749AC458": {
-      "Type": "String",
-      "Description": "S3 bucket for asset \"8efd3dd9643a4d64a128ad582cab718a1e464bcc719bbbcf0e7b0481188a0420\""
-    },
-    "AssetParameters8efd3dd9643a4d64a128ad582cab718a1e464bcc719bbbcf0e7b0481188a0420S3VersionKeyFF5CC16D": {
-      "Type": "String",
-      "Description": "S3 key for asset version \"8efd3dd9643a4d64a128ad582cab718a1e464bcc719bbbcf0e7b0481188a0420\""
-    },
-    "AssetParameters8efd3dd9643a4d64a128ad582cab718a1e464bcc719bbbcf0e7b0481188a0420ArtifactHashA71E92AD": {
-      "Type": "String",
-      "Description": "Artifact hash for asset \"8efd3dd9643a4d64a128ad582cab718a1e464bcc719bbbcf0e7b0481188a0420\""
-    }
-  },
   "Outputs": {
     "testapigatewaylambdaLambdaRestApiEndpoint2EF0B753": {
       "Value": {
@@ -640,5 +594,39 @@
         ]
       }
     }
+  },
+  "Parameters": {
+    "BootstrapVersion": {
+      "Type": "AWS::SSM::Parameter::Value<String>",
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store."
+    }
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5"
+                  ],
+                  {
+                    "Ref": "BootstrapVersion"
+                  }
+                ]
+              }
+            ]
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+        }
+      ]
+    }
   }
 }

package/test/test.apigateway-lambda.test.js CHANGED Viewed

@@ -137,13 +137,6 @@ test('Test deployment ApiGateway override cloudWatchRole = false', () => {
         }
     });
     // Assertion 1
-    expect(stack).toHaveResourceLike("AWS::ApiGateway::Account", {
-        CloudWatchRoleArn: {
-            "Fn::GetAtt": [
-                "apigatewaylambdaLambdaRestApiCloudWatchRoleA759E8AC",
-                "Arn"
-            ]
-        }
-    });
+    expect(stack).not.toHaveResource("AWS::ApiGateway::Account", {});
 });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"test.apigateway-lambda.test.js","sourceRoot":"","sources":["test.apigateway-lambda.test.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n *  Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n *\n *  Licensed under the Apache License, Version 2.0 (the \"License\"). You may not use this file except in compliance\n *  with the License. A copy of the License is located at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n *  or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES\n *  OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions\n *  and limitations under the License.\n */\n\n// Imports\nimport { Stack } from \"@aws-cdk/core\";\nimport { ApiGatewayToLambda, ApiGatewayToLambdaProps } from \"../lib\";\nimport * as lambda from '@aws-cdk/aws-lambda';\nimport * as api from '@aws-cdk/aws-apigateway';\nimport '@aws-cdk/assert/jest';\n\n// --------------------------------------------------------------\n// Test for error with existingLambdaObj=undefined (not supplied by user).\n// --------------------------------------------------------------\ntest('Error on existingLambdaObj=undefined', () => {\n  // Initial Setup\n  const stack = new Stack();\n  const props: ApiGatewayToLambdaProps = {\n  };\n  const app = () => {\n    new ApiGatewayToLambda(stack, 'test-apigateway-lambda', props);\n  };\n    // Assertion 1\n  expect(app).toThrowError();\n});\n\n// --------------------------------------------------------------\n// Test with lambdaFunctionProps.\n// --------------------------------------------------------------\ntest('Test with lambdaFunctionProps', () => {\n  // Initial Setup\n  const stack = new Stack();\n  const props: ApiGatewayToLambdaProps = {\n    lambdaFunctionProps: {\n      runtime: lambda.Runtime.NODEJS_10_X,\n      handler: 'index.handler',\n      code: lambda.Code.fromAsset(`${__dirname}/lambda`),\n      environment: {\n        OVERRIDE_STATUS: 'true'\n      }\n    },\n    apiGatewayProps: {\n      description: \"sampleApiProp\"\n    }\n  };\n  new ApiGatewayToLambda(stack, 'test-apigateway-lambda', props);\n\n  expect(stack).toHaveResource('AWS::Lambda::Function', {\n    Environment: {\n      Variables: {\n        OVERRIDE_STATUS: \"true\",\n        AWS_NODEJS_CONNECTION_REUSE_ENABLED: \"1\"\n      }\n    }\n  });\n});\n\n// --------------------------------------------------------------\n// Test getter methods\n// --------------------------------------------------------------\ntest('Test properties', () => {\n  // Initial Setup\n  const stack = new Stack();\n  const props: ApiGatewayToLambdaProps = {\n    lambdaFunctionProps: {\n      runtime: lambda.Runtime.NODEJS_10_X,\n      handler: 'index.handler',\n      code: lambda.Code.fromAsset(`${__dirname}/lambda`)\n    }\n  };\n  const app = new ApiGatewayToLambda(stack, 'test-apigateway-lambda', props);\n  // Assertion 1\n  expect(app.lambdaFunction !== null);\n  // Assertion 2\n  expect(app.apiGateway !== null);\n  expect(app.apiGatewayCloudWatchRole !== null);\n  expect(app.apiGatewayLogGroup !== null);\n});\n\n// --------------------------------------------------------------\n// Test for error with lambdaFunctionProps=undefined (not supplied by user).\n// --------------------------------------------------------------\ntest('Error on lambdaFunctionProps=undefined', () => {\n  // Initial Setup\n  const stack = new Stack();\n  const props: ApiGatewayToLambdaProps = {\n  };\n  const app = () => {\n    new ApiGatewayToLambda(stack, 'test-apigateway-lambda', props);\n  };\n    // Assertion 1\n  expect(app).toThrowError();\n});\n\n// -----------------------------------------------------------------\n// Test deployment for override ApiGateway AuthorizationType to NONE\n// -----------------------------------------------------------------\ntest('Test deployment ApiGateway AuthorizationType override', () => {\n  // Stack\n  const stack = new Stack();\n  // Helper declaration\n  new ApiGatewayToLambda(stack, 'api-gateway-lambda', {\n    apiGatewayProps: {\n      defaultMethodOptions: {\n        authorizationType: api.AuthorizationType.NONE\n      }\n    },\n    lambdaFunctionProps: {\n      runtime: lambda.Runtime.NODEJS_10_X,\n      handler: 'index.handler',\n      code: lambda.Code.fromAsset(`${__dirname}/lambda`)\n    }\n  });\n  // Assertion 1\n  expect(stack).toHaveResourceLike(\"AWS::ApiGateway::Method\", {\n    HttpMethod: \"ANY\",\n    AuthorizationType: \"NONE\"\n  });\n});\n\n// -----------------------------------------------------------------\n// Test deployment for override ApiGateway cloudWatchRole = false\n// -----------------------------------------------------------------\ntest('Test deployment ApiGateway override cloudWatchRole = false', () => {\n  // Stack\n  const stack = new Stack();\n  // Helper declaration\n  new ApiGatewayToLambda(stack, 'api-gateway-lambda', {\n    apiGatewayProps: {\n      cloudWatchRole: false\n    },\n    lambdaFunctionProps: {\n      runtime: lambda.Runtime.NODEJS_10_X,\n      handler: 'index.handler',\n      code: lambda.Code.fromAsset(`${__dirname}/lambda`)\n    }\n  });\n  // Assertion 1\n  expect(stack).toHaveResourceLike(\"AWS::ApiGateway::Account\", {\n    CloudWatchRoleArn: {\n      \"Fn::GetAtt\": [\n        \"apigatewaylambdaLambdaRestApiCloudWatchRoleA759E8AC\",\n        \"Arn\"\n      ]\n    }\n  });\n});"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"test.apigateway-lambda.test.js","sourceRoot":"","sources":["test.apigateway-lambda.test.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n *  Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n *\n *  Licensed under the Apache License, Version 2.0 (the \"License\"). You may not use this file except in compliance\n *  with the License. A copy of the License is located at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n *  or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES\n *  OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions\n *  and limitations under the License.\n */\n\n// Imports\nimport { Stack } from \"@aws-cdk/core\";\nimport { ApiGatewayToLambda, ApiGatewayToLambdaProps } from \"../lib\";\nimport * as lambda from '@aws-cdk/aws-lambda';\nimport * as api from '@aws-cdk/aws-apigateway';\nimport '@aws-cdk/assert/jest';\n\n// --------------------------------------------------------------\n// Test for error with existingLambdaObj=undefined (not supplied by user).\n// --------------------------------------------------------------\ntest('Error on existingLambdaObj=undefined', () => {\n  // Initial Setup\n  const stack = new Stack();\n  const props: ApiGatewayToLambdaProps = {\n  };\n  const app = () => {\n    new ApiGatewayToLambda(stack, 'test-apigateway-lambda', props);\n  };\n    // Assertion 1\n  expect(app).toThrowError();\n});\n\n// --------------------------------------------------------------\n// Test with lambdaFunctionProps.\n// --------------------------------------------------------------\ntest('Test with lambdaFunctionProps', () => {\n  // Initial Setup\n  const stack = new Stack();\n  const props: ApiGatewayToLambdaProps = {\n    lambdaFunctionProps: {\n      runtime: lambda.Runtime.NODEJS_10_X,\n      handler: 'index.handler',\n      code: lambda.Code.fromAsset(`${__dirname}/lambda`),\n      environment: {\n        OVERRIDE_STATUS: 'true'\n      }\n    },\n    apiGatewayProps: {\n      description: \"sampleApiProp\"\n    }\n  };\n  new ApiGatewayToLambda(stack, 'test-apigateway-lambda', props);\n\n  expect(stack).toHaveResource('AWS::Lambda::Function', {\n    Environment: {\n      Variables: {\n        OVERRIDE_STATUS: \"true\",\n        AWS_NODEJS_CONNECTION_REUSE_ENABLED: \"1\"\n      }\n    }\n  });\n});\n\n// --------------------------------------------------------------\n// Test getter methods\n// --------------------------------------------------------------\ntest('Test properties', () => {\n  // Initial Setup\n  const stack = new Stack();\n  const props: ApiGatewayToLambdaProps = {\n    lambdaFunctionProps: {\n      runtime: lambda.Runtime.NODEJS_10_X,\n      handler: 'index.handler',\n      code: lambda.Code.fromAsset(`${__dirname}/lambda`)\n    }\n  };\n  const app = new ApiGatewayToLambda(stack, 'test-apigateway-lambda', props);\n  // Assertion 1\n  expect(app.lambdaFunction !== null);\n  // Assertion 2\n  expect(app.apiGateway !== null);\n  expect(app.apiGatewayCloudWatchRole !== null);\n  expect(app.apiGatewayLogGroup !== null);\n});\n\n// --------------------------------------------------------------\n// Test for error with lambdaFunctionProps=undefined (not supplied by user).\n// --------------------------------------------------------------\ntest('Error on lambdaFunctionProps=undefined', () => {\n  // Initial Setup\n  const stack = new Stack();\n  const props: ApiGatewayToLambdaProps = {\n  };\n  const app = () => {\n    new ApiGatewayToLambda(stack, 'test-apigateway-lambda', props);\n  };\n    // Assertion 1\n  expect(app).toThrowError();\n});\n\n// -----------------------------------------------------------------\n// Test deployment for override ApiGateway AuthorizationType to NONE\n// -----------------------------------------------------------------\ntest('Test deployment ApiGateway AuthorizationType override', () => {\n  // Stack\n  const stack = new Stack();\n  // Helper declaration\n  new ApiGatewayToLambda(stack, 'api-gateway-lambda', {\n    apiGatewayProps: {\n      defaultMethodOptions: {\n        authorizationType: api.AuthorizationType.NONE\n      }\n    },\n    lambdaFunctionProps: {\n      runtime: lambda.Runtime.NODEJS_10_X,\n      handler: 'index.handler',\n      code: lambda.Code.fromAsset(`${__dirname}/lambda`)\n    }\n  });\n  // Assertion 1\n  expect(stack).toHaveResourceLike(\"AWS::ApiGateway::Method\", {\n    HttpMethod: \"ANY\",\n    AuthorizationType: \"NONE\"\n  });\n});\n\n// -----------------------------------------------------------------\n// Test deployment for override ApiGateway cloudWatchRole = false\n// -----------------------------------------------------------------\ntest('Test deployment ApiGateway override cloudWatchRole = false', () => {\n  // Stack\n  const stack = new Stack();\n  // Helper declaration\n  new ApiGatewayToLambda(stack, 'api-gateway-lambda', {\n    apiGatewayProps: {\n      cloudWatchRole: false\n    },\n    lambdaFunctionProps: {\n      runtime: lambda.Runtime.NODEJS_10_X,\n      handler: 'index.handler',\n      code: lambda.Code.fromAsset(`${__dirname}/lambda`)\n    }\n  });\n  // Assertion 1\n  expect(stack).not.toHaveResource(\"AWS::ApiGateway::Account\", {});\n});"]}