Merge pull request #1212 from awslabs/bump/2.71.0

chore(release): 2.71.0

Author: biffgaut

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

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());

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

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"
 }

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",

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('*')
       });