Merge pull request #1173 from awslabs/bump/2.65.0

chore(release): 2.65.0

.viperlightignore

@@ -161,23 +161,23 @@ source/patterns/@aws-solutions-constructs/aws-alb-lambda/README.md:85
 source/patterns/@aws-solutions-constructs/aws-route53-alb/README.md:60
 source/patterns/@aws-solutions-constructs/aws-wafwebacl-alb/README.md:68
 # ELB Log Reporting Account Incidents
-source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.albfar-all-new-public-http.js.snapshot/albfar-all-new-public-http.template.json:1007
+source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.albfar-all-new-public-http.js.snapshot/albfar-all-new-public-http.template.json:1022
 source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.albfar-all-new-public-http.js.snapshot/tree.json:1335
-source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.albfar-all-new-two-targets.js.snapshot/albfar-all-new-two-targets.template.json:1034
+source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.albfar-all-new-two-targets.js.snapshot/albfar-all-new-two-targets.template.json:1049
 source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.albfar-all-new-two-targets.js.snapshot/tree.json:1380
-source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-privateApiExistingResources.js.snapshot/alblam-privateApiExistingResources.template.json:1083
+source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-privateApiExistingResources.js.snapshot/alblam-privateApiExistingResources.template.json:1095
 source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-privateApiExistingResources.js.snapshot/tree.json:1400
 source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-privateApiNewResources.js.snapshot/alblam-privateApiNewResources.template.json:221
 source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-privateApiNewResources.js.snapshot/tree.json:254
-source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-publicApiExistingResources.js.snapshot/alblam-publicApiExistingResources.template.json:1083
+source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-publicApiExistingResources.js.snapshot/alblam-publicApiExistingResources.template.json:1095
 source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-publicApiExistingResources.js.snapshot/tree.json:1400
 source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-publicApiNewResources.js.snapshot/alblam-publicApiNewResources.template.json:225
 source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-publicApiNewResources.js.snapshot/tree.json:254
 source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-twoTargets.js.snapshot/alblam-twoTargets.template.json:225
 source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-twoTargets.js.snapshot/tree.json:254
 source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployPrivateApi.js.snapshot/r53alb-deployPrivateApi.template.json:218
 source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployPrivateApi.js.snapshot/tree.json:277
-source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployPrivateApiExistingZone.js.snapshot/r53alb-deployPrivateApiExistingZone.template.json:868
+source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployPrivateApiExistingZone.js.snapshot/r53alb-deployPrivateApiExistingZone.template.json:873
 source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployPrivateApiExistingZone.js.snapshot/tree.json:1153
 source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployPublicApiNewAlb.js.snapshot/r53alb-deployPublicApiNewAlb.template.json:214
 source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployPublicApiNewAlb.js.snapshot/tree.json:269

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 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.65.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.64.0...v2.65.0) (2024-08-11)
+
+Built on CDK v2.150.0
+
+### Bug Fixes
+* **aws-apiv2gatewaywebsockets-sqs:** fix for custom websocket route not mapping to request template ([#1171](https://github.com/awslabs/aws-solutions-constructs/issues/1171))
+
+* **aws-cloudfront-s3:** observe props.logCloudFrontAccessLog ([#1170](https://github.com/awslabs/aws-solutions-constructs/issues/1170)) ([b2b8201](https://github.com/awslabs/aws-solutions-constructs/commit/b2b8201930326fe7de93d7eadf808f899fa8aa25))
+
 ## [2.64.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.63.0...v2.64.0) (2024-07-31)
 
 Built on CDK v2.150.0

CONTRIBUTING.md

@@ -208,7 +208,7 @@ Additional scripts that take part in the versioning mechanism:
 
 ```console
 $ cd <root-of-aws-solutions-constructs-repo>
-$ docker run -u root --rm --net=host -it -v $PWD:$PWD -w $PWD jsii/superchain:1-buster-slim-node16
+$ docker run -u root --rm --net=host -it -v $PWD:$PWD -w $PWD public.ecr.aws/jsii/superchain:1-bookworm-slim
 # The build-patterns.sh command can take along time, be sure to allocate enough resources in the Docker dashboard
 # (6 CPUs is good)
 docker$ ./deployment/v2/build-patterns.sh
@@ -224,7 +224,7 @@ build and test individual constructs by following the steps below.
 
 ```console
 $ cd <root-of-aws-solutions-constructs-repo>
-$ docker run -u root --rm --net=host -it -v $PWD:$PWD -w $PWD jsii/superchain:1-buster-slim-node16
+$ docker run -u root --rm --net=host -it -v $PWD:$PWD -w $PWD public.ecr.aws/jsii/superchain:1-bookworm-slim
 docker$ source ./deployment/v2/allow-partial-builds.sh
 docker$ cd my-module
 docker$ npm run build+lint+test

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-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.|
+| `docker run -u root --rm --net=host -it -v $PWD:$PWD -w $PWD public.ecr.aws/jsii/superchain:1-bookworm-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.|

deployment/v2/bootstrap.sh

@@ -6,20 +6,32 @@ starting_dir=$PWD
 deployment_dir=$(cd $(dirname $0) && pwd)
 source_dir="$deployment_dir/../../source"
 
+# Required to update node_modules correctly
 echo "============================================================================================="
 echo "aligning versions and updating package.json for CDK v2..."
 /bin/bash $deployment_dir/align-version.sh
 
-bail="--bail"
-runtarget="build+lint+test"
 cd $source_dir/
 
 export PATH=$source_dir/node_modules/.bin:$PATH
 export NODE_OPTIONS="--max-old-space-size=4096 ${NODE_OPTIONS:-}"
 
+# Install CDK Integration Test Tool
 npm install -g @aws-cdk/integ-runner
 npm install -g aws-cdk
 
+# Install cfn-guard and rules
+export RULE_BUCKET=solutions-build-assets
+export RULE_FILE_NAME=aws-solutions-constructs.guard
+
+mkdir -p  ~/.guard
+mkdir -p ~/.guard/bin
+mkdir -p ~/.guard/rules
+curl -tlsv1.3 -sSf https://$RULE_BUCKET.s3.amazonaws.com/cfn-guard/latest/cfn-guard -o ~/.guard/bin/cfn-guard
+chmod +x  ~/.guard/bin/cfn-guard
+# Why no PATH update? Because it would be lost when the script exits
+curl -tlsv1.3 -sSf https://$RULE_BUCKET.s3.amazonaws.com/cfn-guard-rules/latest/$RULE_FILE_NAME -o ~/.guard/rules/aws-solutions.guard
+
 echo "============================================================================================="
 echo "installing..."
 yarn install --frozen-lockfile

deployment/v2/build-all.sh

@@ -19,6 +19,10 @@ echo "==========================================================================
 echo "building..."
 time lerna run $bail --stream $runtarget || fail
 
+echo "============================================================================================="
+echo "running cfn-guard..."
+~/.guard/bin/cfn-guard validate -r ~/.guard/rules/aws-solutions.guard -d **/**/**/test/**/*.template.json
+
 echo "============================================================================================="
 echo "packaging..."
 time lerna run --bail --stream jsii-pacmak || fail

source/lerna.json

@@ -6,5 +6,5 @@
     "./patterns/@aws-solutions-constructs/*"
   ],
   "rejectCycles": "true",
-  "version": "2.64.0"
+  "version": "2.65.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 @@
         }
       }
     },
-    "cf4b149b0b48c28b8c995c18a3ca09f74b8fac53d219d344e54c9e77da481f91": {
+    "fe3c2e10f51dcf0161644b408a64a35da94b177ad7a04b79e063f8fe9612deb2": {
       "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": "cf4b149b0b48c28b8c995c18a3ca09f74b8fac53d219d344e54c9e77da481f91.json",
+          "objectKey": "fe3c2e10f51dcf0161644b408a64a35da94b177ad7a04b79e063f8fe9612deb2.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

@@ -695,6 +695,11 @@
       }
      }
     ]
+   },
+   "Metadata": {
+    "guard": {
+     "SuppressedRules": []
+    }
    }
   },
   "CustomVpcRestrictDefaultSGCustomResourceProviderHandlerDC833E5E": {
@@ -1091,6 +1096,11 @@
        "reason": "Rule does not apply for ELB."
       }
      ]
+    },
+    "guard": {
+     "SuppressedRules": [
+      "SECURITY_GROUP_MISSING_EGRESS_RULE"
+     ]
     }
    }
   },
@@ -1143,6 +1153,11 @@
        "reason": "All integration tests must be HTTP because of certificate limitations."
       }
      ]
+    },
+    "guard": {
+     "SuppressedRules": [
+      "ELBV2_LISTENER_SSL_POLICY_RULE"
+     ]
     }
    }
   },

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/cf4b149b0b48c28b8c995c18a3ca09f74b8fac53d219d344e54c9e77da481f91.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1/fe3c2e10f51dcf0161644b408a64a35da94b177ad7a04b79e063f8fe9612deb2.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [