Merge pull request #420 from aws-solutions/develop

Update to version v5.1.2

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

NOTICE.txt

@@ -62,7 +62,6 @@ js-cache under the Massachusetts Institute of Technology (MIT) license
 jsdom under the Massachusetts Institute of Technology (MIT) license
 jsdom-global under the Massachusetts Institute of Technology (MIT) license
 jsdom-loader under the Massachusetts Institute of Technology (MIT) license
-js-xlsx under the Apache License Version 2.0
 jsheader under the Apache License Version 2.0
 json-parse-better-errors under the Massachusetts Institute of Technology (MIT) license
 json-stringify-pretty-compact under the Massachusetts Institute of Technology (MIT) license
@@ -93,7 +92,6 @@ quick-lru under the Massachusetts Institute of Technology (MIT) license
 range under the Massachusetts Institute of Technology (MIT) license
 raw-loader under the Massachusetts Institute of Technology (MIT) license
 raw-text under the Massachusetts Institute of Technology (MIT) license
-read-excel-file under the Massachusetts Institute of Technology (MIT) license
 recursive-readdir under the Massachusetts Institute of Technology (MIT) license
 require-dir under the Massachusetts Institute of Technology (MIT) license
 roboto-fontface under the Apache License Version 2.0

bin/check.js

@@ -11,7 +11,6 @@ var region=require('../config').region
 var cf=new aws.CloudFormation()
 var s3=new aws.S3()
 var name=require('./name')
-var chalk=require('chalk')
 
 module.exports=Promise.method(run)
 

bin/launch.js

@@ -10,14 +10,12 @@ var region=require('../config').region
 var _=require('lodash')
 var fs=require('fs')
 var cf=new aws.CloudFormation()
-var chalk=require('chalk')
 var build=require('./build')
 var check=require('./check')
 var argv=require('commander')
 var name=require('./name')
 var wait=require('./wait')
 var s3=new aws.S3()
-var ran
 
 if (require.main === module) {
     var args=argv.version('1.0')

bin/wait.js

@@ -3,7 +3,6 @@ var Promise=require('bluebird')
 process.env.AWS_PROFILE=require('../config').profile
 process.env.AWS_DEFAULT_REGION=require('../config').profile
 var aws=require('aws-sdk')
-var chalk=require('chalk')
 aws.config.setPromisesDependency(Promise)
 aws.config.region=require('../config').region
 var cf=new aws.CloudFormation()

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 "------------------------------------------------------------------------------"

lambda/cfn/test/setup.js

@@ -1,6 +1,5 @@
 #! /usr/bin/env node
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
-var chalk=require('chalk')
 var Promise=require('bluebird')
 var config=require('../../../config')