Merge pull request #1155 from awslabs/bump/2.63.0

chore(release): 2.63.0

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 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.63.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.62.0...v2.63.0) (2024-07-19)
+
+Built on CDK v2.147.3
+
+* **aws-apigatewayv2websockets-sqs:** New construct! ([#1140](https://github.com/awslabs/aws-solutions-constructs/pull/1140))
+
 ## [2.62.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.61.0...v2.62.0) (2024-07-16)
 
 Built on CDK v2.147.3

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

deployment/v2/bootstrap.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+#!/bin/bash
+set -euo pipefail
+
+starting_dir=$PWD
+deployment_dir=$(cd $(dirname $0) && pwd)
+source_dir="$deployment_dir/../../source"
+
+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:-}"
+
+npm install -g @aws-cdk/integ-runner
+npm install -g aws-cdk
+
+echo "============================================================================================="
+echo "installing..."
+yarn install --frozen-lockfile
+
+cd $starting_dir

deployment/v2/build-all.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+set -euo pipefail
+
+deployment_dir=$(cd $(dirname $0) && pwd)
+source_dir="$deployment_dir/../../source"
+
+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:-}"
+
+echo "============================================================================================="
+echo "building..."
+time lerna run $bail --stream $runtarget || fail
+
+echo "============================================================================================="
+echo "packaging..."
+time lerna run --bail --stream jsii-pacmak || fail
+
+echo "============================================================================================="
+echo "reverting back versions and updates to package.json for CDK v2..."
+/bin/bash $deployment_dir/align-version.sh revert

deployment/v2/build-patterns.sh

@@ -2,33 +2,7 @@
 set -euo pipefail
 
 deployment_dir=$(cd $(dirname $0) && pwd)
-source_dir="$deployment_dir/../../source"
 
-echo "============================================================================================="
-echo "aligning versions and updating package.json for CDK v2..."
-/bin/bash $deployment_dir/align-version.sh
+source $deployment_dir/bootstrap.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:-}"
-
- npm install -g @aws-cdk/integ-runner
-
-echo "============================================================================================="
-echo "installing..."
-yarn install --frozen-lockfile
-
-echo "============================================================================================="
-echo "building..."
-time lerna run $bail --stream $runtarget || fail
-
-echo "============================================================================================="
-echo "packaging..."
-time lerna run --bail --stream jsii-pacmak || fail
-
-echo "============================================================================================="
-echo "reverting back versions and updates to package.json for CDK v2..."
-/bin/bash $deployment_dir/align-version.sh revert
+source $deployment_dir/build-all.sh

deployment/v2/refresh-multiple-tests.sh

@@ -92,6 +92,7 @@ aws-wafwebacl-alb
 aws-wafwebacl-apigateway
 aws-wafwebacl-appsync
 aws-wafwebacl-cloudfront
+aws-apigatewayv2websocket-sqs
 resources
 "
 

source/lerna.json

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

source/package.json

@@ -24,8 +24,8 @@
     "eslint-plugin-license-header": "^0.2.0",
     "fs-extra": "^8.1.0",
     "jest": "^27.4.0",
-    "jsii": "^1.92.0",
-    "jsii-rosetta": "^1.92.0",
+    "jsii": "~5.4.26",
+    "jsii-rosetta": "~5.4.25",
     "jsii-pacmak": "^1.92.0",
     "tslint": "^5.20.1",
     "typescript": "4.7.4",

source/patterns/@aws-solutions-constructs/aws-apigatewayv2websocket-sqs/.eslintignore

@@ -0,0 +1,8 @@
+lib/*.js
+test/*.js
+*.d.ts
+coverage
+test/integ.*.js.snapshot/
+test/cdk-integ.out.integ.*.snapshot
+test/lambda/connect.js
+test/lambda/disconnect.js

source/patterns/@aws-solutions-constructs/aws-apigatewayv2websocket-sqs/.gitignore

@@ -0,0 +1,15 @@
+lib/*.js
+test/*.js
+*.js.map
+*.d.ts
+node_modules
+*.generated.ts
+dist
+.jsii
+
+.LAST_BUILD
+.nyc_output
+coverage
+.nycrc
+.LAST_PACKAGE
+*.snk

source/patterns/@aws-solutions-constructs/aws-apigatewayv2websocket-sqs/.npmignore

@@ -0,0 +1,21 @@
+# Exclude typescript source and config
+*.ts
+tsconfig.json
+coverage
+.nyc_output
+*.tgz
+*.snk
+*.tsbuildinfo
+
+# Include javascript files and typescript declarations
+!*.js
+!*.d.ts
+
+# Exclude jsii outdir
+dist
+
+# Include .jsii
+!.jsii
+
+# Include .jsii
+!.jsii

source/patterns/@aws-solutions-constructs/aws-apigatewayv2websocket-sqs/README.md

@@ -0,0 +1,142 @@
+# aws-apigatewayv2websocket-sqs module
+<!--BEGIN STABILITY BANNER-->
+
+---
+
+![Stability: Stable](https://img.shields.io/badge/cfn--resources-stable-success.svg?style=for-the-badge)
+
+---
+<!--END STABILITY BANNER-->
+
+| **Reference Documentation**:| <span style="font-weight: normal">https://docs.aws.amazon.com/solutions/latest/constructs/</span>|
+|:-------------|:-------------|
+<div style="height:8px"></div>
+
+| **Language**     | **Package**        |
+|:-------------|-----------------|
+|![Python Logo](https://docs.aws.amazon.com/cdk/api/latest/img/python32.png) Python|`aws_solutions_constructs.aws_apigatewayv2websocket_sqs`|
+|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@aws-solutions-constructs/aws-apigatewayv2websocket-sqs`|
+|![Java Logo](https://docs.aws.amazon.com/cdk/api/latest/img/java32.png) Java|`software.amazon.awsconstructs.services.apigatewayv2websocketsqs`|
+
+## Overview
+
+This AWS Solutions Construct implements an Amazon API Gateway WebSocket connected to an Amazon SQS queue pattern.
+
+Here is a minimal deployable pattern definition:
+
+Typescript
+``` typescript
+import { Construct } from "constructs";
+import { Stack, StackProps } from "aws-cdk-lib";
+import {
+	ApiGatewayV2WebSocketToSqs,
+	ApiGatewayV2WebSocketToSqsProps,
+} from "@aws-solutions-constructs/aws-apigatewayv2websocket-sqs";
+import { WebSocketLambdaAuthorizer } from 'aws-cdk-lib/aws-apigatewayv2-authorizers';
+
+const authorizer = new WebSocketLambdaAuthorizer('Authorizer', authHandler);
+
+new ApiGateApiGatewayV2WebSocketToSqswayToSqs(this, "ApiGatewayV2WebSocketToSqsPattern", {
+	webSocketApiProps: {
+		connectRouteOptions: {
+			integration: new WebSocketLambdaIntegration("ConnectIntegration", connectLambda),
+			authorizer: authorizer,
+		},
+		disconnectRouteOptions: {
+			integration: new WebSocketLambdaIntegration("DisconnectIntegration", disconnectLambda),
+		},
+	},
+        createDefaultRoute: true
+});
+```
+
+Python
+``` python
+from aws_solutions_constructs.aws_apigateway_sqs import ApiGatewayV2WebSocketToSqs
+from aws_cdk.aws_apigatewayv2_authorizers import WebSocketLambdaAuthorizer
+from aws_cdk import Stack
+from constructs import Construct
+
+authorizer = WebSocketLambdaAuthorizer("Authorizer", auth_handler)
+
+ApiGatewayV2WebSocketToSqs(self, 'ApiGatewayV2WebSocketToSqsPattern', 
+    connect_route_options=apigwv2.WebSocketRouteOptions(
+        integration=WebSocketLambdaIntegration("ConnectIntegration", connect_lambda),
+        authorizer=authorizer
+    ),
+    disconnect_route_options=apigwv2.WebSocketRouteOptions(
+        integration=WebSocketLambdaIntegration("DisConnectIntegration", disconnect_lambda),
+    ),
+    create_default_route=True
+)
+```
+
+Java
+``` java
+import software.constructs.Construct;
+
+import software.amazon.awscdk.Stack;
+import software.amazon.awscdk.StackProps;
+import software.amazon.awscdk.aws_apigatewayv2_authorizers.*;
+import software.amazon.awscdk.aws_apigatewayv2_integrations.*;
+import software.amazon.awsconstructs.services.apigatewaysqs.*;
+
+new ApiGatewayV2WebSocketToSqs(this, "ApiGatewayV2WebSocketToSqsPattern", new ApiGatewayV2WebSocketToSqsProps.Builder()
+        .webSocketApiProps(new WebSocketApiProps.Builder()
+                .connectRouteOptions(new WebSocketRouteOptions.builder()
+                        .integration(new WebSocketLambdaIntegration("ConnectIntegration", connect_lambda)))
+                .disconnectRouteOptions(new WebSocketRouteOptions.builder()
+                        .integration(new WebSocketLambdaIntegration("DisConnectIntegration", disconnect_lambda)))
+                .createDefaultRoute(true)
+        .build());
+```
+
+## Pattern Construct Props
+
+| **Name**     | **Type**        | **Description** |
+|:-------------|:----------------|-----------------|
+|existingWebSocketApi?|[`apigwv2.WebSocketApi`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_apigatewayv2.WebSocketApi.html)|Optional API Gateway WebSocket instance. Providing both existingWebSocketApi and webSocketApiProps will cause an error.|
+|webSocketApiProps?|[`apigwv2.WebSocketApiProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_apigatewayv2.WebSocketApiProps.html)|Optional user-provided props to override the default props for the API Gateway. Providing both existingWebSocketApi and webSocketApiProps will cause an error.|
+|queueProps?|[`sqs.QueueProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_sqs.QueueProps.html)|Optional user-provided props to override the default props for the queue. Providing both existingQueueObj and queueProps will cause an error.|
+|existingQueueObj?|[`sqs.Queue`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_sqs.Queue.html)|Optional existing instance of SQS Queue. Providing both existingQueueObj and queueProps will cause an error.|
+|deployDeadLetterQueue?|`boolean`|Whether to deploy a secondary queue to be used as a dead letter queue. Defaults to `true`.|
+|deadLetterQueueProps?|[`sqs.QueueProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_sqs.QueueProps.html)|Optional properties to use for creating dead letter queue. Note that if you are creating a FIFO Queue, the dead letter queue should also be FIFO.|
+|maxReceiveCount|`number`|The number of times a message can be unsuccessfully dequeued before being moved to the dead-letter queue.|
+|createDefaultRoute?|`boolean`|Whether to create a default route. At least one of createDefaultRoute or customRouteName must be provided. If set to true, then it will use the value supplied with `defaultRouteRequestTemplate`.|
+|defaultRouteRequestTemplate?|`{ [contentType: string]: string }`|Optional user provided API Gateway Request Template for the default route and/ or customRoute (if customRouteName is provided). This property will only be used if createDefaultRoute is `true`. If createDefaultRoute is `true` and this property is not provided, the construct will create the default route with the following VTL mapping `"Action=SendMessage&MessageGroupId=$input.path('$.MessageGroupId')&MessageDeduplicationId=$context.requestId&MessageAttribute.1.Name=connectionId&MessageAttribute.1.Value.StringValue=$context.connectionId&MessageAttribute.1.Value.DataType=String&MessageAttribute.2.Name=requestId&MessageAttribute.2.Value.StringValue=$context.requestId&MessageAttribute.2.Value.DataType=String&MessageBody=$util.urlEncode($input.json($util.escapeJavaScript('$').replaceAll(\"\\\\'\",\"'\")))"`.|
+|defaultIamAuthorization?|`boolean`|Add IAM authorization to the $connect path by default. Only set this to false if: 1) If plan to provide an authorizer with the `$connect` route; or 2) The API should be open (no authorization) (AWS recommends against deploying unprotected APIs). If an authorizer is specified in connectRouteOptions, this parameter is ignored and no default IAM authorizer will be created. |
+|customRouteName?|`string`|The name of the route that will be sent through WebSocketApiProps.routeSelectionExpression when invoking the WebSocket endpoint. At least one of createDefaultRoute or customRouteName must be provided. |
+
+
+
+## Pattern Properties
+
+| **Name**     | **Type**        | **Description** |
+|:-------------|:----------------|-----------------|
+|webSocketApi|[`apigwv2.WebSocketApi`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_apigatewayv2.WebSocketApi.html)|Returns an instance of the API Gateway WebSocket API created by the pattern.|
+|apiGatewayRole|[`iam.Role`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_iam.Role.html)|Returns an instance of the iam.Role created by the construct for API Gateway.|
+|webSocketStage|[`apigwv2.WebSocketStage`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_apigatewayv2.WebSocketStage.html)|Returns an instance of the WebSocketStage created by the construct.|
+|apiGatewayLogGroup|[`logs.LogGroup`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_logs.LogGroup.html)|Returns an instance of the LogGroup created by the construct for API Gateway access logging to CloudWatch.|
+|sqsQueue|[`sqs.Queue`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_sqs.Queue.html)|Returns an instance of the SQS queue created by the pattern.|
+|deadLetterQueue?|[`sqs.DeadLetterQueue`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_sqs.DeadLetterQueue.html)|Returns an instance of the DeadLetterQueue created by the pattern.|
+
+## Default settings
+
+Out of the box implementation of the Construct without any override will set the following defaults:
+
+### Amazon API Gateway
+* Deploy a WebSocket endpoint
+* Enable CloudWatch logging for API Gateway
+* Configure least privilege access IAM role for API Gateway
+* Enable X-Ray Tracing
+
+### Amazon SQS Queue
+* Deploy SQS dead-letter queue for the source SQS Queue
+* Enable server-side encryption for source SQS Queue using AWS Managed KMS Key
+* Enforce encryption of data in transit
+
+## Architecture
+![Architecture Diagram](architecture.png)
+
+***
+&copy; Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.

source/patterns/@aws-solutions-constructs/aws-apigatewayv2websocket-sqs/integ.config.json

@@ -0,0 +1,7 @@
+{
+  "parallelRegions": [
+    "us-east-1"
+  ],
+  "disable-update-workflow": true,
+  "update-on-failed": false
+}