From 5c35d6ee21c2be485d0967ddc909972cabf61657 Mon Sep 17 00:00:00 2001 From: Alireza Assadzadeh Date: Tue, 8 Mar 2022 17:49:43 -0500 Subject: [PATCH] Include package name in package-lock.json files --- CHANGELOG.md | 14 +++++++++++++- deployment/build-s3-dist.sh | 12 ++++++++++++ lambda/cfn-lambda-layer/package-lock.json | 1 + lambda/common-modules-layer/package-lock.json | 1 + lambda/fulfillment/package-lock.json | 1 + lambda/import/package-lock.json | 1 + lambda/js_lambda_hook_sdk/package-lock.json | 1 + lambda/lex-build/package-lock.json | 1 + lambda/proxy-es/package-lock.json | 1 + lambda/qnabot-common-layer/package-lock.json | 17 ++++++++++++++++- lambda/schema/package-lock.json | 1 + lambda/testall/package-lock.json | 1 + templates/examples/index.js | 1 - 13 files changed, 50 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 920251546..0dc846880 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,18 @@ 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). +## [5.1.2] - 2022-03-14 + +### Added + +- Logic to support Amazon Connect Interactive Messages +- New set of example questions to be imported for Genesys Cloud CX. + +### Changed +- Genesys Cloud CX Call Flow export wizard to use new session attributes referenced in example questions +- Policies in nested templates by further scoping down policies and adding cfn_nag suppressions as appropriate +- Node module dependencies for html-webpack-plugin(4.5.2), and chalk(3.2.0). Removed unused dependencies + for js-xlsx and read-excel-file. ## [5.1.1] - 2022-02-04 @@ -17,7 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Fixed Kendra Webcrawler data source sync issue by adding support to check for Kendra webcrawler data source {status} before initiating sync -- Fixed issue where the Kendra Webcrawler data source {settings} page in Kendra console was resulting in a blank page - by updating configuraton parameters for data source create and update steps +- Fixed issue where the Kendra Webcrawler data source {settings} page in Kendra console was resulting in a blank page - by updating configuration parameters for data source create and update steps ## [5.1.0] - 2021-12-09 diff --git a/deployment/build-s3-dist.sh b/deployment/build-s3-dist.sh index fa6a318b8..b57ad194b 100755 --- a/deployment/build-s3-dist.sh +++ b/deployment/build-s3-dist.sh @@ -93,10 +93,22 @@ echo "-------------------------------------------------------------------------- echo "[Init] Copying templates to global-s3-assets/" echo "------------------------------------------------------------------------------" +# Copying main templates to global assets directory cp build/templates/public.json $template_dist_dir/aws-qnabot-main.template cp build/templates/public-vpc-support.json $template_dist_dir/aws-qnabot-vpc.template cp build/templates/master.json $template_dist_dir/aws-qnabot-extended.template +# Copying nested templates to global assets directory for the benefit of cfn_nag finding the +# nested templates +# TODO: cfn_nag does not understand customer resources with properties with `.` (dot) which is valid. Example, "CR.botLocales". Plan to convert lex cutom resource +# to cloudformation lex resource. Due to cfn_nag limitation, we skip the `cp build/templates/examples.json $template_dist_dir/examples.template` which is just placed +# global-s3-assets folder for cfn_nag to find nested templates. Instead we run cfn_nag on examples.template manually locally after replace CR. with CR_ in +# next CloudFormation template. +cp build/templates/export.json $template_dist_dir/export.template +cp build/templates/import.json $template_dist_dir/import.template +cp build/templates/testall.json $template_dist_dir/testall.template +# 5th nested stack (LexV2CfnCr) is import from public SAR + echo "------------------------------------------------------------------------------" echo "[Init] Copying lambda assets to regional-s3-assets/" echo "------------------------------------------------------------------------------" diff --git a/lambda/cfn-lambda-layer/package-lock.json b/lambda/cfn-lambda-layer/package-lock.json index cffc62938..e40c040de 100644 --- a/lambda/cfn-lambda-layer/package-lock.json +++ b/lambda/cfn-lambda-layer/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "cfn-lambda-layer", "version": "1.0.0", "license": "ISC", "dependencies": { diff --git a/lambda/common-modules-layer/package-lock.json b/lambda/common-modules-layer/package-lock.json index a4a4b8034..163fd29b9 100644 --- a/lambda/common-modules-layer/package-lock.json +++ b/lambda/common-modules-layer/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "common-modules-layer", "version": "1.0.0", "license": "ISC", "dependencies": { diff --git a/lambda/fulfillment/package-lock.json b/lambda/fulfillment/package-lock.json index de57b4a5b..89d9e817a 100644 --- a/lambda/fulfillment/package-lock.json +++ b/lambda/fulfillment/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "fulfillment", "version": "1.0.0", "license": "ISC", "dependencies": { diff --git a/lambda/import/package-lock.json b/lambda/import/package-lock.json index ad0a7128e..2d5f57336 100644 --- a/lambda/import/package-lock.json +++ b/lambda/import/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "import", "version": "1.0.0", "license": "ISC", "dependencies": { diff --git a/lambda/js_lambda_hook_sdk/package-lock.json b/lambda/js_lambda_hook_sdk/package-lock.json index 2a0fd4332..269e3e85e 100644 --- a/lambda/js_lambda_hook_sdk/package-lock.json +++ b/lambda/js_lambda_hook_sdk/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "js_lambda_hook_sdk", "version": "1.0.0", "license": "ISC", "dependencies": { diff --git a/lambda/lex-build/package-lock.json b/lambda/lex-build/package-lock.json index 06650edd1..b0d0bbd2c 100644 --- a/lambda/lex-build/package-lock.json +++ b/lambda/lex-build/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "lex-build", "version": "1.0.0", "license": "ISC", "dependencies": { diff --git a/lambda/proxy-es/package-lock.json b/lambda/proxy-es/package-lock.json index e097415f8..1ec8f12ff 100644 --- a/lambda/proxy-es/package-lock.json +++ b/lambda/proxy-es/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "proxy-es", "version": "1.0.0", "license": "ISC", "dependencies": { diff --git a/lambda/qnabot-common-layer/package-lock.json b/lambda/qnabot-common-layer/package-lock.json index a8bc80469..54ddcaeea 100644 --- a/lambda/qnabot-common-layer/package-lock.json +++ b/lambda/qnabot-common-layer/package-lock.json @@ -5,8 +5,23 @@ "requires": true, "packages": { "": { + "name": "qnabot-common-layer", "version": "1.0.0", - "license": "ISC" + "dependencies": { + "lodash": "^4.17.21" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + } + }, + "dependencies": { + "lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" } } } diff --git a/lambda/schema/package-lock.json b/lambda/schema/package-lock.json index a3c7e555f..eefa1b451 100644 --- a/lambda/schema/package-lock.json +++ b/lambda/schema/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "schema", "version": "1.0.0", "license": "ISC" } diff --git a/lambda/testall/package-lock.json b/lambda/testall/package-lock.json index f518b9550..128a3723c 100644 --- a/lambda/testall/package-lock.json +++ b/lambda/testall/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "testall", "version": "1.0.0", "license": "ISC", "dependencies": { diff --git a/templates/examples/index.js b/templates/examples/index.js index 73c9b41d2..e50fd822d 100644 --- a/templates/examples/index.js +++ b/templates/examples/index.js @@ -11,7 +11,6 @@ var outputs=Object.assign(outputs1,outputs2,outputSNSTopic); module.exports={ "Resources":resources, - "Conditions": {}, "AWSTemplateFormatVersion": "2010-09-09", "Transform": "AWS::Serverless-2016-10-31", "Description": "(SO0189n-example) QnABot nested example resources",