Upgrade to version v2.1.7

### Security
- Upgraded image-size to `1.2.1`
- Upgraded aws-cdk-lib to `2.187.0`
- Upgraded vite to `5.4.17`

### Fixed
- Stack deployment failures performed through cdk deploy

Author: tabdunabi

CHANGELOG.md

@@ -10,7 +10,7 @@ information to effectively respond to your bug report or contribution.
 
 We welcome you to use the GitHub issue tracker to report bugs or suggest features.
 
-When filing an issue, please check [existing open](https://github.com/aws-solutions/generative-ai-application-builder-on-aws/issues), or [recently closed](https://github.com/aws-solutions/generative-ai-application-builder-on-aws/issues?q=is%3Aissue+is%3Aclosed), issues to make sure somebody else hasn't already
+When filing an issue, please check [existing open](https://github.com/aws-solutions/generative-ai-application-builder-on-aws/issues), or [recently closed](https://github.com/aws-solutions/generative-ai-application-builder-on-aws/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already
 reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
 
 - A reproducible test case or series of steps
@@ -56,4 +56,4 @@ If you discover a potential security issue in this project we ask that you notif
 
 See the [LICENSE](https://github.com/aws-solutions/generative-ai-application-builder-on-aws/blob/main/LICENSE.txt) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
 
-We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.
+We may ask you to sign a [Contributor License Agreement (CLA)](https://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.

CONTRIBUTING.md

@@ -1011,7 +1011,7 @@ jest-util under the MIT license.
 jest-validate under the MIT license.
 jest-watcher under the MIT license.
 jest-worker under the MIT license.
-Jinja2 under the 0BSD license.
+jinja2 under the 0BSD license.
 jiti under the MIT license.
 jmespath under the MIT license.
 joi under the BSD-3-Clause license.
@@ -1080,7 +1080,7 @@ make-error under the ISC license.
 makeerror under the BSD-3-Clause license.
 map-obj under the MIT license.
 markdown-table under the MIT license.
-MarkupSafe under the 0BSD license.
+markupsafe under the 0BSD license.
 marky under the Apache-2.0 license.
 mdast-util-find-and-replace under the MIT license.
 mdast-util-from-markdown under the MIT license.
@@ -1262,7 +1262,7 @@ pytest under the MIT license.
 pytest-cov under the MIT license.
 pytest-env under the MIT license.
 python-dateutil under the Dual License license(s).
-PyYAML under the MIT license.
+pyyaml under the MIT license.
 qrcode under the MIT license.
 querystring under the MIT license.
 querystringify under the MIT license.
@@ -1365,7 +1365,7 @@ source-map-js under the BSD-3-Clause license.
 source-map-support under the MIT license.
 space-separated-tokens under the MIT license.
 sprintf-js under the BSD-3-Clause license.
-SQLAlchemy under the MIT license.
+sqlalchemy under the MIT license.
 stack-chain under the MIT license.
 stack-utils under the MIT license.
 stackback under the MIT license.
@@ -1482,7 +1482,7 @@ webidl-conversions under the BSD-2-Clause license.
 webpack under the MIT license.
 webpack-sources under the MIT license.
 weekstart under the MIT license.
-Werkzeug under the 0BSD license.
+werkzeug under the 0BSD license.
 whatwg-encoding under the MIT license.
 whatwg-fetch under the MIT license.
 whatwg-mimetype under the MIT license.
@@ -1517,6 +1517,7 @@ yocto-queue under the MIT license.
 zen-observable under the MIT license.
 zen-observable-ts under the MIT license.
 zen-push under the MIT license.
+zstandard under the BSD license.
 zwitch under the MIT license.
 
 
@@ -1529,6 +1530,7 @@ Apache-2.0 - https://spdx.org/licenses/Apache-2.0.html
 BlueOak-1.0.0 - https://spdx.org/licenses/BlueOak-1.0.0.html
 BSD-2-Clause - https://spdx.org/licenses/BSD-2-Clause.html
 BSD-3-Clause - https://spdx.org/licenses/BSD-3-Clause.html
+CC0-1.0 - https://spdx.org/licenses/CC0-1.0.html
 CC-BY-4.0 - https://spdx.org/licenses/CC-BY-4.0.html
 ISC - https://spdx.org/licenses/ISC.html
 MIT - https://spdx.org/licenses/MIT.html

NOTICE.txt

@@ -0,0 +1,64 @@
+jackspeak
+3.4.3 <https://github.com/isaacs/jackspeak>
+
+package-json-from-dist
+1.0.0 / 1.0.1 <https://github.com/isaacs/package-json-from-dist>
+
+path-scurry
+1.11.1 <https://github.com/isaacs/path-scurry>
+
+# BlueOak-1.0.0 License
+
+Version 1.0.0
+
+## Purpose
+
+This license gives everyone as much permission to work with
+this software as possible, while protecting contributors
+from liability.
+
+## Acceptance
+
+In order to receive this license, you must agree to its
+rules. The rules of this license are both obligations
+under that agreement and conditions to your license.
+You must not do anything with this software that triggers
+a rule that you cannot or will not follow.
+
+## Copyright
+
+Each contributor licenses you to do everything with this
+software that would otherwise infringe that contributor's
+copyright in it.
+
+## Notices
+
+You must ensure that everyone who gets a copy of
+any part of this software from you, with or without
+changes, also gets the text of this license or a link to
+<https://blueoakcouncil.org/license/1.0.0>.
+
+## Excuse
+
+If anyone notifies you in writing that you have not
+complied with [Notices](#notices), you can keep your
+license by taking all practical steps to comply within 30
+days after the notice. If you do not do so, your license
+ends immediately.
+
+## Patent
+
+Each contributor licenses you to do everything with this
+software that would otherwise infringe any patent claims
+they can license or become able to license.
+
+## Reliability
+
+No contributor can revoke this license.
+
+## No Liability
+
+**_As far as the law allows, this software comes as is,
+without any warranty or condition, and no contributor
+will be liable to anyone for any damages related to this
+software or this license, under any kind of legal claim._**

THIRD_PARTY_LICENSES.txt

@@ -30,7 +30,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.6 template-bucket-name"
+    echo "For example: ./build-s3-dist.sh solutions trademarked-solution-name v2.1.7 template-bucket-name"
     exit 1
 fi
 
@@ -66,7 +66,7 @@ echo "--------------------------------------------------------------------------
 cd $source_dir/infrastructure
 
 # Important: CDK global version number
-cdk_version=$(node ../../deployment/get-cdk-version.js) # Note: grabs from node_modules/aws-cdk-lib/package.json
+cdk_version=$(node ../../deployment/get-cdk-version.js) # Note: grabs from node_modules/aws-cdk/package.json
 
 echo "------------------------------------------------------------------------------"
 echo "[Install] Installing CDK $cdk_version"

deployment/build-s3-dist.sh

@@ -1,5 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-const pkg = require("../source/infrastructure/node_modules/aws-cdk-lib/package.json");
+const pkg = require("../source/infrastructure/node_modules/aws-cdk/package.json");
 console.log(pkg.version);

deployment/get-cdk-version.js

@@ -77,7 +77,7 @@ function createStack(stack: typeof BaseStack, props?: BaseStackProps, isUseCase?
 function getDefaultBaseStackProps(stack: typeof BaseStack, isUseCase?: boolean): BaseStackProps {
     return {
         description: isUseCase
-            ? `(${solutionID})-${stack.name} - ${solutionName} - ${stack.name} - Version ${version}`
+            ? `(${solutionID}) - ${stack.name} - ${solutionName} - ${stack.name} - Version ${version}`
             : `(${solutionID}) - ${solutionName} - ${stack.name} - Version ${version}`,
         synthesizer: new cdk.DefaultStackSynthesizer({
             generateBootstrapVersionRule: false

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

@@ -63,7 +63,7 @@
     "@custom-bundler/unit-test": false,
     "solution_id": "SO0276",
     "solution_name": "generative-ai-application-builder-on-aws",
-    "solution_version": "v2.1.2",
+    "solution_version": "v2.1.7",
     "app_registry_name": "GAAB",
     "application_type": "AWS-Solutions",
     "application_trademark_name": "Generative AI Application Builder on AWS",

source/infrastructure/cdk.json

@@ -25,7 +25,9 @@ export abstract class BaseNestedStack extends cdk.NestedStack {
     public readonly accessLoggingBucket: string;
 
     constructor(scope: Construct, id: string, props?: cdk.NestedStackProps) {
-        super(scope, id, props);
+        const solutionID = process.env.SOLUTION_ID ?? scope.node.tryGetContext('solution_id');
+        const solutionName = process.env.SOLUTION_NAME ?? scope.node.tryGetContext('solution_name');
+        super(scope, id, {...props, description: `(${solutionID}-Nested) - ${solutionName} - ${props?.description || ''}`});
         const stack = cdk.Stack.of(this);
         this.customResourceLambdaArn = new cdk.CfnParameter(stack, 'CustomResourceLambdaArn', {
             type: 'String',