Merge branch 'main' into aws-apigwv2websocket-sqs

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.61.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.60.0...v2.61.0) (2024-07-05)
+
+Built on CDK v2.147.3
+
+### Maintenance
+
+* Updated all javascript to Node.js 20
+
 ## [2.60.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.59.0...v2.60.0) (2024-06-11)
 
 Built on CDK v2.145.0

DEVELOPER_GUIDE.md

@@ -17,7 +17,7 @@ Disk image size: 60 GB
 | Using the Fork button at the upper right, Fork the repo into your github account. | While we can give some advice on what github and git commands to use, we will not attempt to be a git tutorial. Some git/github expertise is assumed.|
 | Clone forked repo to your local development environment | If you wish to work off a branch in your repository, create that branch now and clone that branch. You will create a PR back to Main in aws-solutions-constructs eventually, you can do that from fork/main or fork/*branch* |
 | `cd aws-solutions-constructs` | This is the home directory of the repo, this is where you will open your text editor, run full builds, etc.|
-| `docker run -u root --rm --net=host -it -v $PWD:$PWD -w $PWD jsii/superchain:1-buster-slim-node16` | This command downloads the Docker image (if necessary) and starts the container in which you will do all builds. The container will stay open in terminal mode, allowing you to edit/build repeatedly until your code is ready.|
+| `docker run -u root --rm --net=host -it -v $PWD:$PWD -w $PWD jsii/superchain:1-bullseye-slim` | This command downloads the Docker image (if necessary) and starts the container in which you will do all builds. The container will stay open in terminal mode, allowing you to edit/build repeatedly until your code is ready.|
 | Optional - Open a second terminal window to the aws-solutions-constructs directory. | The docker container mounts your local drive, so shares the Solutions Constructs source code tree with the host. You may find it advantageous to maintain a second terminal not running the Docker container to run git commands, your text editor, etc. |
 | `./deployment/v2/build-patterns.sh` | This command will build the entire repo, which is required prior to developing constructs. Some of the steps include: Installing the correct version of tools required in the build process, setting up environment variables, running JSII in each construct, and running all integration and unit tests. Commands executed across each construct are managed via yarn, so multiple commands are running in parallel most of the time. It's because of this that adding more resources to your Docker container can greatly reduce the build time (suggested values are discussed above). |
 | In the top level aws-solutions-constructs folder: `./deployment/v2/align-version.sh revert` | This will reset all the version numbers back to 0.0.0. You need to do this before adding/committing code - you can't submit package.json files with version numbers. It's common to do a full build ./deployment/v2/build-patterns.sh after coding to ensure all tests still pass - if you do this it will revert all the version numbers for you.|
@@ -29,7 +29,7 @@ The build-patterns.sh script sets everything up to build constructs, builds ever
 | Action | Explanation |
 | :------------------------------------------------ | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | (optional)<br/>`git checkout -b your-branch-name` | If you're working in a different branch than main in your forked repo and haven't changed your local branch, now is a good time to do so. |
-| `source ./deployment/v2/allow-partial-builds.sh ` | This aligns the versions and sets up environment variables |
+| `source ./deployment/v2/allow-partial-builds.sh ` | This aligns the versions and sets up environment variables. IMPORTANT - build-patterns.sh performs some initialization of the image (installing software, etc.) so must be run at least once before you can start working with partial builds. |
 | `cd your-construct-name` | Change directory to the folder where you want to change code (this might also be `cd core`). |
 | *Do all your code editing* | Open your code editor and and create the construct or perform your edits on an existing construct (or core). |
 | `npm run build+lint+test` | This is the build command for a construct (or core). It will build, lint and run the unit and integration tests. If you make any substantive changes to the code, you will almost certainly see some or all of the tests fail. The next section will describe how testing works in AWS Solutions Constructs and how to write, refresh and execute tests. In the meantime, you can at least check if your code transpiles correctly without running the tests by running `npm run build`. If you've edited any modules in /core in addition to a construct, be sure to build /core before building your construct. |

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.145.0';
+const awsCdkLibVersion = '2.147.3';
 
 for (const file of process.argv.splice(4)) {
  const pkg = JSON.parse(fs.readFileSync(file).toString());

deployment/v2/refresh-multiple-tests.sh

@@ -32,6 +32,7 @@ aws-cloudfront-apigateway-lambda
 aws-cloudfront-mediastore
 aws-cloudfront-s3
 aws-cognito-apigateway-lambda
+aws-constructs-factories
 aws-dynamodbstreams-lambda
 aws-dynamodbstreams-lambda-elasticsearch-kibana
 aws-eventbridge-kinesisfirehose-s3
@@ -91,6 +92,7 @@ aws-wafwebacl-alb
 aws-wafwebacl-apigateway
 aws-wafwebacl-appsync
 aws-wafwebacl-cloudfront
+resources
 "
 
 deployment_dir=$(cd $(dirname $0) && pwd)

source/lerna.json

@@ -6,5 +6,5 @@
  "./patterns/@aws-solutions-constructs/*"
  ],
  "rejectCycles": "true",
- "version": "2.60.0"
+ "version": "2.61.0"
 }

source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.albfar-all-existing-private-http.js.snapshot/albfar-all-existing-private-http.assets.json

@@ -15,15 +15,15 @@
  }
  }
  },
- "b38a900620cf991e9952361a75d7508506c554c7a7b9d9e8e24d04c0356d80ba": {
+ "cf4b149b0b48c28b8c995c18a3ca09f74b8fac53d219d344e54c9e77da481f91": {
  "source": {
  "path": "albfar-all-existing-private-http.template.json",
  "packaging": "file"
  },
  "destinations": {
  "current_account-us-east-1": {
  "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1",
- "objectKey": "b38a900620cf991e9952361a75d7508506c554c7a7b9d9e8e24d04c0356d80ba.json",
+ "objectKey": "cf4b149b0b48c28b8c995c18a3ca09f74b8fac53d219d344e54c9e77da481f91.json",
  "region": "us-east-1",
  "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-us-east-1"
  }

source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.albfar-all-existing-private-http.js.snapshot/albfar-all-existing-private-http.template.json

@@ -715,7 +715,7 @@
  "Arn"
  ]
  },
- "Runtime": "nodejs18.x",
+ "Runtime": "nodejs20.x",
  "Description": "Lambda function for removing all inbound/outbound rules from the VPC default security group"
  },
  "DependsOn": [

source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.albfar-all-existing-private-http.js.snapshot/manifest.json

@@ -66,7 +66,7 @@
  "validateOnSynth": false,
  "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-us-east-1",
  "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-us-east-1",
- "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1/b38a900620cf991e9952361a75d7508506c554c7a7b9d9e8e24d04c0356d80ba.json",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1/cf4b149b0b48c28b8c995c18a3ca09f74b8fac53d219d344e54c9e77da481f91.json",
  "requiresBootstrapStackVersion": 6,
  "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
  "additionalDependencies": [