Merge pull request #1212 from awslabs/bump/2.71.0

chore(release): 2.71.0
awslabs · Sep 27, 2024 · 88a0530 · 88a0530
2 parents c8d3738 + 6c33bd7
commit 88a0530
Show file tree

Hide file tree

Showing 92 changed files with 636 additions and 3,483 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.71.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.70.0...v2.71.0) (2024-09-27)
+
+Build on CDK v2.160.0
+
+### Bug Fixes
+* **aws-openapigateway-lambda:** add id to permission resource id ([#1211](https://github.com/awslabs/aws-solutions-constructs/pull/1211))
+
+
 ## [2.70.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.69.0...v2.70.0) (2024-09-18)
 
 Built on CDK v2.154.1

diff --git a/deployment/v2/align-version.js b/deployment/v2/align-version.js
@@ -10,7 +10,7 @@ const nullVersionMarker = process.argv[2];
 const targetSolutionsConstructsVersion = process.argv[3];
 
 // these versions need to be sourced from a config file
-const awsCdkLibVersion = '2.154.1';
+const awsCdkLibVersion = '2.160.0';
 
 for (const file of process.argv.splice(4)) {
   const pkg = JSON.parse(fs.readFileSync(file).toString());

diff --git a/deployment/v2/bootstrap.sh b/deployment/v2/bootstrap.sh
@@ -22,7 +22,8 @@ npm install -g aws-cdk
 
 # Install cfn-guard and rules
 export RULE_BUCKET=solutions-build-assets
-export RULE_FILE_NAME=aws-solutions-constructs.guard
+# export RULE_FILE_NAME=aws-solutions-constructs.guard
+export RULE_FILE_NAME=aws-solutions.guard
 
 mkdir -p  ~/.guard
 mkdir -p ~/.guard/bin

diff --git a/source/lerna.json b/source/lerna.json
@@ -1,10 +1,9 @@
 {
-  "lerna": "3.15.0",
+  "lerna": "8.1.8",
   "npmClient": "yarn",
-  "useWorkspaces": true,
   "packages": [
-    "./patterns/@aws-solutions-constructs/*"
+    "patterns/@aws-solutions-constructs/*"
   ],
   "rejectCycles": "true",
-  "version": "2.70.0"
+  "version": "2.71.0"
 }
diff --git a/source/package.json b/source/package.json
@@ -32,13 +32,13 @@
     "constructs": "^10.0.0"
   },
   "devDependencies": {
-    "lerna": "^3.22.1",
+    "lerna": "8.1.8",
     "constructs": "^10.0.0",
     "aws-cdk-lib": "0.0.0"
   },
   "workspaces": {
     "packages": [
-      "./patterns/@aws-solutions-constructs/*"
+      "patterns/@aws-solutions-constructs/*"
     ],
     "nohoist": [
       "**/deepmerge",

diff --git a/source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/lib/index.ts
@@ -158,7 +158,7 @@ export class OpenApiGatewayToLambda extends Construct {
       // Redeploy the API any time one of the lambda functions changes
       this.apiGateway.latestDeployment?.addToLogicalId(apiLambdaFunction.lambdaFunction.functionArn);
       // Grant APIGW invocation rights for each lambda function
-      apiLambdaFunction.lambdaFunction.addPermission('PermitAPIGInvocation', {
+      apiLambdaFunction.lambdaFunction.addPermission(`${id}PermitAPIGInvocation`, {
         principal: new iam.ServicePrincipal('apigateway.amazonaws.com'),
         sourceArn: this.apiGateway.arnForExecuteApi('*')
       });

diff --git a/...a891284c958187dafbf9ee36b/cfn-response.js → ...eb3d9442eca3b85bdb1a20b1e/cfn-response.js b/...a891284c958187dafbf9ee36b/cfn-response.js → ...eb3d9442eca3b85bdb1a20b1e/cfn-response.js
diff --git a/...e45c20a891284c958187dafbf9ee36b/consts.js → ...eb6f91eb3d9442eca3b85bdb1a20b1e/consts.js b/...e45c20a891284c958187dafbf9ee36b/consts.js → ...eb6f91eb3d9442eca3b85bdb1a20b1e/consts.js
diff --git a/...pshot/asset.4dc48ffba382f93077a1e6824599bbd4ceb6f91eb3d9442eca3b85bdb1a20b1e/framework.js b/...pshot/asset.4dc48ffba382f93077a1e6824599bbd4ceb6f91eb3d9442eca3b85bdb1a20b1e/framework.js
diff --git a/...5c20a891284c958187dafbf9ee36b/outbound.js → ...6f91eb3d9442eca3b85bdb1a20b1e/outbound.js b/...5c20a891284c958187dafbf9ee36b/outbound.js → ...6f91eb3d9442eca3b85bdb1a20b1e/outbound.js
diff --git a/...c6e45c20a891284c958187dafbf9ee36b/util.js → ...4ceb6f91eb3d9442eca3b85bdb1a20b1e/util.js b/...c6e45c20a891284c958187dafbf9ee36b/util.js → ...4ceb6f91eb3d9442eca3b85bdb1a20b1e/util.js
diff --git a/...pshot/asset.d9861ea7a45affd23e47a614acb2fddc6e45c20a891284c958187dafbf9ee36b/framework.js b/...pshot/asset.d9861ea7a45affd23e47a614acb2fddc6e45c20a891284c958187dafbf9ee36b/framework.js
diff --git a/...igateway-lambda/test/integ.opilam-apiFromAssetExistingLambdaFunctions.js.snapshot/cdk.out b/...igateway-lambda/test/integ.opilam-apiFromAssetExistingLambdaFunctions.js.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"36.0.0"}
+{"version":"38.0.1"}
diff --git a/...teway-lambda/test/integ.opilam-apiFromAssetExistingLambdaFunctions.js.snapshot/integ.json b/...teway-lambda/test/integ.opilam-apiFromAssetExistingLambdaFunctions.js.snapshot/integ.json
@@ -1,5 +1,5 @@
 {
-  "version": "36.0.0",
+  "version": "38.0.1",
   "testCases": {
     "opilam-apiFromAssetExistingLambdaFunctions/Integ/DefaultTest": {
       "stacks": [

diff --git a/...ay-lambda/test/integ.opilam-apiFromAssetExistingLambdaFunctions.js.snapshot/manifest.json b/...ay-lambda/test/integ.opilam-apiFromAssetExistingLambdaFunctions.js.snapshot/manifest.json
@@ -1,5 +1,5 @@
 {
-  "version": "36.0.0",
+  "version": "38.0.1",
   "artifacts": {
     "opilamapiFromAssetExistingLambdaFunctionsIntegDefaultTestDeployAssertF0801F72.assets": {
       "type": "cdk:asset-manifest",
@@ -16,6 +16,7 @@
         "templateFile": "opilamapiFromAssetExistingLambdaFunctionsIntegDefaultTestDeployAssertF0801F72.template.json",
         "terminationProtection": false,
         "validateOnSynth": false,
+        "notificationArns": [],
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
         "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
@@ -64,9 +65,10 @@
         "templateFile": "opilam-apiFromAssetExistingLambdaFunctions.template.json",
         "terminationProtection": false,
         "validateOnSynth": false,
+        "notificationArns": [],
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/2bdc18dae70e061f5e53157f71d8fbde1d944a33f071b533f25022bc44680eba.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/df5244d59e9cb656a7d8d367445b78ea709c1e96ebc76b6f722390037f87be8d.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
@@ -100,10 +102,10 @@
             "data": "LambdaFunctionBF21E41F"
           }
         ],
-        "/opilam-apiFromAssetExistingLambdaFunctions/LambdaFunction/PermitAPIGInvocation": [
+        "/opilam-apiFromAssetExistingLambdaFunctions/LambdaFunction/OpenApiGatewayToLambdaPermitAPIGInvocation": [
           {
             "type": "aws:cdk:logicalId",
-            "data": "LambdaFunctionPermitAPIGInvocation805898E4"
+            "data": "LambdaFunctionOpenApiGatewayToLambdaPermitAPIGInvocation9D043C93"
           }
         ],
         "/opilam-apiFromAssetExistingLambdaFunctions/PhotosLambdaTestFromAssetServiceRole/Resource": [
@@ -124,10 +126,10 @@
             "data": "PhotosLambdaTestFromAssetB776E3C5"
           }
         ],
-        "/opilam-apiFromAssetExistingLambdaFunctions/PhotosLambdaTestFromAsset/PermitAPIGInvocation": [
+        "/opilam-apiFromAssetExistingLambdaFunctions/PhotosLambdaTestFromAsset/OpenApiGatewayToLambdaPermitAPIGInvocation": [
           {
             "type": "aws:cdk:logicalId",
-            "data": "PhotosLambdaTestFromAssetPermitAPIGInvocation323F8FF0"
+            "data": "PhotosLambdaTestFromAssetOpenApiGatewayToLambdaPermitAPIGInvocationA0D5D04E"
           }
         ],
         "/opilam-apiFromAssetExistingLambdaFunctions/OpenApiGatewayToLambda/LambdaFunctionServiceRole/Resource": [
@@ -243,6 +245,24 @@
             "type": "aws:cdk:logicalId",
             "data": "CheckBootstrapVersion"
           }
+        ],
+        "LambdaFunctionPermitAPIGInvocation805898E4": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "LambdaFunctionPermitAPIGInvocation805898E4",
+            "trace": [
+              "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
+            ]
+          }
+        ],
+        "PhotosLambdaTestFromAssetPermitAPIGInvocation323F8FF0": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "PhotosLambdaTestFromAssetPermitAPIGInvocation323F8FF0",
+            "trace": [
+              "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
+            ]
+          }
         ]
       },
       "displayName": "opilam-apiFromAssetExistingLambdaFunctions"

diff --git a/...xistingLambdaFunctions.js.snapshot/opilam-apiFromAssetExistingLambdaFunctions.assets.json b/...xistingLambdaFunctions.js.snapshot/opilam-apiFromAssetExistingLambdaFunctions.assets.json
@@ -1,5 +1,5 @@
 {
-  "version": "36.0.0",
+  "version": "38.0.1",
   "files": {
     "c2b362b5f0d6d8f56ac2c011288aebd095499d839b130a932427f74232de2a32": {
       "source": {
@@ -66,28 +66,28 @@
         }
       }
     },
-    "d9861ea7a45affd23e47a614acb2fddc6e45c20a891284c958187dafbf9ee36b": {
+    "4dc48ffba382f93077a1e6824599bbd4ceb6f91eb3d9442eca3b85bdb1a20b1e": {
       "source": {
-        "path": "asset.d9861ea7a45affd23e47a614acb2fddc6e45c20a891284c958187dafbf9ee36b",
+        "path": "asset.4dc48ffba382f93077a1e6824599bbd4ceb6f91eb3d9442eca3b85bdb1a20b1e",
         "packaging": "zip"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "d9861ea7a45affd23e47a614acb2fddc6e45c20a891284c958187dafbf9ee36b.zip",
+          "objectKey": "4dc48ffba382f93077a1e6824599bbd4ceb6f91eb3d9442eca3b85bdb1a20b1e.zip",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }
     },
-    "2bdc18dae70e061f5e53157f71d8fbde1d944a33f071b533f25022bc44680eba": {
+    "df5244d59e9cb656a7d8d367445b78ea709c1e96ebc76b6f722390037f87be8d": {
       "source": {
         "path": "opilam-apiFromAssetExistingLambdaFunctions.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "2bdc18dae70e061f5e53157f71d8fbde1d944a33f071b533f25022bc44680eba.json",
+          "objectKey": "df5244d59e9cb656a7d8d367445b78ea709c1e96ebc76b6f722390037f87be8d.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...stingLambdaFunctions.js.snapshot/opilam-apiFromAssetExistingLambdaFunctions.template.json b/...stingLambdaFunctions.js.snapshot/opilam-apiFromAssetExistingLambdaFunctions.template.json
@@ -146,7 +146,7 @@
     }
    }
   },
-  "LambdaFunctionPermitAPIGInvocation805898E4": {
+  "LambdaFunctionOpenApiGatewayToLambdaPermitAPIGInvocation9D043C93": {
    "Type": "AWS::Lambda::Permission",
    "Properties": {
     "Action": "lambda:InvokeFunction",
@@ -329,7 +329,7 @@
     }
    }
   },
-  "PhotosLambdaTestFromAssetPermitAPIGInvocation323F8FF0": {
+  "PhotosLambdaTestFromAssetOpenApiGatewayToLambdaPermitAPIGInvocationA0D5D04E": {
    "Type": "AWS::Lambda::Permission",
    "Properties": {
     "Action": "lambda:InvokeFunction",
@@ -649,7 +649,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "d9861ea7a45affd23e47a614acb2fddc6e45c20a891284c958187dafbf9ee36b.zip"
+     "S3Key": "4dc48ffba382f93077a1e6824599bbd4ceb6f91eb3d9442eca3b85bdb1a20b1e.zip"
     },
     "Description": "AWS CDK resource provider framework - onEvent (opilam-apiFromAssetExistingLambdaFunctions/OpenApiGatewayToLambda/ApiTemplateWriterProvider)",
     "Environment": {

diff --git a/...opilamapiFromAssetExistingLambdaFunctionsIntegDefaultTestDeployAssertF0801F72.assets.json b/...opilamapiFromAssetExistingLambdaFunctionsIntegDefaultTestDeployAssertF0801F72.assets.json
@@ -1,5 +1,5 @@
 {
-  "version": "36.0.0",
+  "version": "38.0.1",
   "files": {
     "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
       "source": {