Upgrade to version v2.1.1

### Changed

- AWS Lambda runtime for Nodejs from 20.x to 22.x
- Updated pyproject.toml spec updated to use python 3.12 or higher
- AWS SDK (boto3 and Javascript SDK) version updates
- Updated warnings and references documentation when selecting 'BYO Cognito user pool'.

### Fixed

- An issue with RAG based deployment, specifically when using Anthropic Claude 3.5 v2 under Amazon Bedrock that caused incorrect prompt to be associated with the configuration.
- An issue related to streaming responses in use case deployments, specifically when using Llama 3.2 under Amazon Bedrock.

### Security

- Updated node library versions to address security vulnerabilities

Author: tabdunabi

.gitignore

@@ -58,3 +58,7 @@ bak.*
 _bandit_temp.json
 RapidAi.code-workspace
 source/scripts/v2_migration/poetry.lock
+
+.temp_redpencil
+bom.json
+bom.xml

CHANGELOG.md

@@ -5,6 +5,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.1.1] - 2024-12-17
+
+### Changed
+
+-   AWS Lambda runtime for Nodejs from 20.x to 22.x
+-   Updated `pyproject.toml` spec updated to use python 3.12 or higher
+-   AWS SDK (boto3 and Javascript SDK) version updates
+-   Updated warnings and references documentation when selecting 'BYO Cognito user pool'.
+
+### Fixed
+
+-   An issue with RAG based deployment, specifically when using Anthropic Claude 3.5 v2 under Amazon Bedrock that caused incorrect prompt to be associated with the configuration.
+-   An issue related to streaming responses in use case deployments, specifically when using Llama 3.2 under Amazon Bedrock.
+
+### Security
+
+-   Updated node library versions to address security vulnerabilities
+
 ## [2.1.0] - 2024-11-20
 
 ### Added
@@ -243,4 +261,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
--   Initial Release
+-   Initial Release

NOTICE.txt

@@ -40,7 +40,7 @@ set -e
 # Check to see if input has been provided:
 if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ] || [ -z "$4" ]; then
     echo "Please provide all required parameters for the build script"
-    echo "For example: ./build-s3-dist.sh solutions trademarked-solution-name v2.1.0 template-bucket-name"
+    echo "For example: ./build-s3-dist.sh solutions trademarked-solution-name v2.1.1 template-bucket-name"
     exit 1
 fi
 

deployment/build-s3-dist.sh

@@ -22,6 +22,7 @@ import { BaseStack, BaseStackProps } from '../lib/framework/base-stack';
 import { SageMakerChat } from '../lib/sagemaker-chat-stack';
 import { AppRegistry } from '../lib/utils/app-registry-aspects';
 import { LambdaAspects } from '../lib/utils/lambda-aspect';
+import { LambdaVersionCDKNagSuppression } from '../lib/utils/lambda-version-cdk-nag-suppression';
 import { LogGroupRetentionCheckAspect } from '../lib/utils/log-group-retention-check-aspect';
 
 const app = new cdk.App();
@@ -43,6 +44,7 @@ createStack(DeploymentPlatformStack, getDefaultBaseStackProps(DeploymentPlatform
 // adding cdk-nag checks
 cdk.Aspects.of(app).add(new AwsSolutionsChecks());
 cdk.Aspects.of(app).add(new LogGroupRetentionCheckAspect());
+cdk.Aspects.of(app).add(new LambdaVersionCDKNagSuppression());
 
 app.synth();
 

source/infrastructure/bin/gen-ai-app-builder.ts

@@ -1,7 +1,9 @@
 {
   "app": "../pre-build-lambda-layers.sh && npx ts-node --prefer-ts-exts bin/gen-ai-app-builder.ts",
   "watch": {
-    "include": ["**"],
+    "include": [
+      "**"
+    ],
     "exclude": [
       "README.md",
       "cdk*.json",
@@ -17,7 +19,10 @@
   "context": {
     "@aws-cdk/aws-lambda:recognizeLayerVersion": true,
     "@aws-cdk/core:checkSecretUsage": true,
-    "@aws-cdk/core:target-partitions": ["aws", "aws-cn"],
+    "@aws-cdk/core:target-partitions": [
+      "aws",
+      "aws-cn"
+    ],
     "@aws-cdk-containers/ecs-service-extensions:enableDefaultLogDriver": true,
     "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true,
     "@aws-cdk/aws-ecs:arnFormatIncludesClusterName": true,
@@ -58,10 +63,10 @@
     "@custom-bundler/unit-test": false,
     "solution_id": "SO0276",
     "solution_name": "generative-ai-application-builder-on-aws",
-    "solution_version": "v2.1.0",
+    "solution_version": "v2.1.1",
     "app_registry_name": "GAAB",
     "application_type": "AWS-Solutions",
     "application_trademark_name": "Generative AI Application Builder on AWS",
     "cdk-asset-bucket": "cdk-hnb659fds-assets-123456789012-us-east-1"
   }
-}
+}

source/infrastructure/cdk.json

@@ -286,7 +286,7 @@ export class UseCaseManagement extends BaseNestedStack {
         }
 
         const lambdaDlq = new sqs.Queue(this, 'UseCaseManagementDLQ', {
-            encryption: sqs.QueueEncryption.SQS_MANAGED,
+            encryption: sqs.QueueEncryption.KMS_MANAGED,
             enforceSSL: true
         });
 

source/infrastructure/lib/use-case-management/management-stack.ts

@@ -23,16 +23,16 @@ export const INTERNAL_EMAIL_DOMAIN = 'amazon';
 export const LAMBDA_TIMEOUT_MINS = 15;
 export const API_GATEWAY_THROTTLING_RATE_LIMIT = 5;
 export const API_GATEWAY_THROTTLING_BURST_LIMIT = 5;
-export const COMMERCIAL_REGION_LAMBDA_NODE_RUNTIME: lambda.Runtime = lambda.Runtime.NODEJS_20_X;
+export const COMMERCIAL_REGION_LAMBDA_NODE_RUNTIME: lambda.Runtime = lambda.Runtime.NODEJS_22_X;
 export const GOV_CLOUD_REGION_LAMBDA_NODE_RUNTIME: lambda.Runtime = lambda.Runtime.NODEJS_18_X;
 export const COMMERCIAL_REGION_LAMBDA_PYTHON_RUNTIME: lambda.Runtime = lambda.Runtime.PYTHON_3_12;
 export const COMMERCIAL_REGION_LAMBDA_LAYER_PYTHON_RUNTIME: string = 'python_lambda_layer_3_12';
 export const LANGCHAIN_LAMBDA_PYTHON_RUNTIME: lambda.Runtime = lambda.Runtime.PYTHON_3_12;
 export const CHAT_LAMBDA_PYTHON_RUNTIME: string = 'python_lambda_3_12_with_args';
 export const LANGCHAIN_LAMBDA_LAYER_PYTHON_RUNTIME: string = 'langchain_python_3_12_with_args';
-export const COMMERCIAL_REGION_LAMBDA_NODE_TS_LAYER_RUNTIME: string = 'node_ts_lambda_20_x_layer';
-export const COMMERCIAL_REGION_LAMBDA_JS_LAYER_RUNTIME: string = 'node_js_lambda_20_x_layer';
-export const GOV_CLOUD_REGION_LAMBDA_PYTHON_RUNTIME: lambda.Runtime = lambda.Runtime.PYTHON_3_10;
+export const COMMERCIAL_REGION_LAMBDA_NODE_TS_LAYER_RUNTIME: string = 'node_ts_lambda_22_x_layer';
+export const COMMERCIAL_REGION_LAMBDA_JS_LAYER_RUNTIME: string = 'node_js_lambda_22_x_layer';
+export const GOV_CLOUD_REGION_LAMBDA_PYTHON_RUNTIME: lambda.Runtime = lambda.Runtime.PYTHON_3_11;
 export const COMMERCIAL_REGION_LAMBDA_JAVA_RUNTIME: lambda.Runtime = lambda.Runtime.JAVA_21;
 export const GOV_CLOUD_REGION_LAMBDA_JAVA_RUNTIME: lambda.Runtime = lambda.Runtime.JAVA_17;
 export const SERVICE_NAME = 'UseCaseManagement';

source/infrastructure/lib/utils/constants.ts

@@ -0,0 +1,36 @@
+#!/usr/bin/env node
+/**********************************************************************************************************************
+ *  Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.                                                *
+ *                                                                                                                    *
+ *  Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance    *
+ *  with the License. A copy of the License is located at                                                             *
+ *                                                                                                                    *
+ *      http://www.apache.org/licenses/LICENSE-2.0                                                                    *
+ *                                                                                                                    *
+ *  or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES *
+ *  OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions    *
+ *  and limitations under the License.                                                                                *
+ *********************************************************************************************************************/
+
+import * as cdk from 'aws-cdk-lib';
+import * as lambda from 'aws-cdk-lib/aws-lambda';
+import { NagSuppressions } from 'cdk-nag';
+import { IConstruct } from 'constructs';
+
+/**
+ * cdk-nag suppression class for lambda versioning
+ */
+export class LambdaVersionCDKNagSuppression implements cdk.IAspect {
+    public visit(node: IConstruct): void {
+        if (node instanceof lambda.Function) {
+            if (node.runtime.toString().toLowerCase().includes('python3.12')) {
+                NagSuppressions.addResourceSuppressions(node, [
+                    {
+                        id: 'AwsSolutions-L1',
+                        reason: 'The lambda function is using Python 3.12. Current version of the application is only tested until Python 3.12'
+                    }
+                ]);
+            }
+        }
+    }
+}