Update to version v1.5.0

Author: aassadza

.gitignore

@@ -11,4 +11,5 @@
 venv/
 __pycache__/
 .pytest_cache
-geckodriver.log
+geckodriver.log
+.eslintcache

CHANGELOG.md

@@ -5,6 +5,19 @@ 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).
 
+## [1.5.0] - 2021-2-8
+
+### Added
+
+- Implementation to use [Amazon Lex](https://aws.amazon.com/lex/) as the processing module of the chatbot.
+- Parameter to choose between the existing custom ML model or Amazon Lex as the processing module of the chatbot.
+- Sample interaction for the chatbot application when Amazon Lex is chosen.
+
+### Changed
+
+- Architecture diagram depicting the structure of AWS services to include Amazon Lex.
+- Implementation Guide document to provide context for customers on using Amazon Lex.
+
 ## [1.4.0] - 2020-11-23
 
 ### Added

NOTICE.txt

@@ -1,15 +1,15 @@
 Serverless Bot Framework
 
-Copyright 2019 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/                                                                               
-                                                                                                                   
-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.                                                                                
+Copyright 2019 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/
+
+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.
 
 
 **********************
@@ -20,20 +20,24 @@ This software includes third party software subject to the following copyrights:
 adm-zip under the Massachusetts Institute of Technology (MIT) license
 aws-amplify under the Apache License Version 2.0 license
 AWS SDK under the Apache License Version 2.0
+aws-sdk-mock under the Apache License Version 2.0
 axios under the Massachusetts Institute of Technology (MIT) license
 bluebird under the Massachusetts Institute of Technology (MIT) license
 bluebird-as under the Massachusetts Institute of Technology (MIT) license
 boto3 under the Apache License Version 2.0
 crhelper under the Apache License Version 2.0
 dateformat under the Massachusetts Institute of Technology (MIT) license
 dispatcherjs under the Massachusetts Institute of Technology (MIT) license
+dotenv under BSD-2-clause License
 events under the Massachusetts Institute of Technology (MIT) license
 fuzzysearch-js under the Massachusetts Institute of Technology (MIT) license
+jest under the Massachusetts Institute of Technology (MIT) license
 js-combinatorics under the Massachusetts Institute of Technology (MIT) license
 mocha under the Massachusetts Institute of Technology (MIT) license
 moment under the Massachusetts Institute of Technology (MIT) license
 multilabelsvm under the  Internet Systems Consortium (ISC) license
 natural under the Massachusetts Institute of Technology (MIT) license
+order-id under the Massachusetts Institute of Technology (MIT) license
 path under the Massachusetts Institute of Technology (MIT) license
 react under the Massachusetts Institute of Technology (MIT) license
 react-testing-library under the Massachusetts Institute of Technology (MIT) license
@@ -46,6 +50,5 @@ underscore.string under the Massachusetts Institute of Technology (MIT) license
 util under the Massachusetts Institute of Technology (MIT) license
 uuid under the Massachusetts Institute of Technology (MIT) license
 winston under the Massachusetts Institute of Technology (MIT) license
-order-id under the Massachusetts Institute of Technology (MIT) license
 
 The licenses for these third party components are included in LICENSE.txt

README.md

@@ -89,9 +89,13 @@ aws s3 sync ./regional-s3-assets s3://$ARTIFACT_BUCKET-us-east-1/$SOLUTION_NAME/
 - Get the link of the serverless-bot-framework.template uploaded to your Amazon S3 bucket.
 - Deploy the serverless bot framework to your account by launching a new AWS CloudFormation stack using the link of the serverless-bot-framework.template.
 
+## Known Behavior
+
+When you choose Amazon Lex for the `BotBrain` parameter, updating the CloudFormation stack will not update the chatbot in Amazon Lex.
+
 ---
 
-Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright 2020-2021 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.

deployment/architecture.png

@@ -13,7 +13,7 @@
 set -e
 
 # Important: CDK global version number
-cdk_version=1.73.0
+cdk_version=1.84.0
 
 # Check to see if input has been provided:
 if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then
@@ -97,6 +97,11 @@ echo "--------------------------------------------------------------------------
 cd $source_dir/services/solution-helper
 pip3 install -r requirements.txt --target .
 echo ""
+echo "------------------------------------------------------------------------------"
+echo "[Packing] Lex Bot"
+echo "------------------------------------------------------------------------------"
+cd $source_dir/services/lex-bot
+pip3 install -r requirements.txt --target .
 echo ""
 echo "------------------------------------------------------------------------------"
 echo "[Packing] Order Pizza"

deployment/build-s3-dist.sh

@@ -10,37 +10,14 @@ echo "Running unit tests"
 # Get reference for source folder
 source_dir="$PWD/../source"
 
-echo "cd $source_dir/modules/b2.core"
-cd $source_dir/modules/b2.core
-npm ci
-# npm test
-
-echo "cd $source_dir/services/core"
-cd $source_dir/services/core
-npm ci
-# npm test
-
-echo "cd $source_dir/services/polly-service"
-cd $source_dir/services/polly-service
-npm ci
-# npm test
-
-echo "cd $source_dir/services/train-model"
-cd $source_dir/services/train-model
-npm ci
-# npm test
-
 echo "cd $source_dir/samples/bot-weather-forecast"
 cd $source_dir/samples/bot-weather-forecast
 python3 setup.py install
 pip3 install -r requirements.txt --target .
 pip3 install -r dev-requirements.txt
 python3 test.py
 
-echo "cd $source_dir/samples/leave-feedback"
-cd $source_dir/samples/leave-feedback
-# npm test
-
 echo "cd $source_dir/samples/order-pizza"
 cd $source_dir/samples/order-pizza
-# npm test
+npm ci
+npm test

deployment/run-unit-tests.sh

@@ -45,7 +45,7 @@ export class BrainS3ToTrainModelLambda extends Construct {
       }
     );
 
-    /** Grane TrainModel Lambda permissions on Brain Bucket */
+    /** Grant TrainModel Lambda permissions on Brain Bucket */
     brainS3ToTrainModelLambda.lambdaFunction.addToRolePolicy(
       new PolicyStatement({
         effect: Effect.ALLOW,

source/infrastructure/lib/brain-s3bucket-train-model-lambda-construct.ts

@@ -13,6 +13,7 @@
 
 import { Construct, Aws } from '@aws-cdk/core';
 import { Function } from '@aws-cdk/aws-lambda';
+import { CfnLogGroup } from '@aws-cdk/aws-logs';
 import { CfnAuthorizer, RestApi } from '@aws-cdk/aws-apigateway';
 import {
   LambdaIntegration,

source/infrastructure/lib/cognito-api-lambdas-construct.ts

@@ -0,0 +1,28 @@
+/*********************************************************************************************************************
+ *  Copyright 2020 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 { IAspect, IConstruct, CfnCondition, CfnResource } from '@aws-cdk/core';
+
+
+export class ConditionalResource implements IAspect {
+  private readonly condition: CfnCondition;
+  constructor(condition: CfnCondition) {
+    this.condition = condition;
+  }
+  /** Modifying the visit function of IAspect */
+  public visit(node: IConstruct): void {
+    const resource = (node as CfnResource);
+    if (resource.cfnOptions) {
+      resource.cfnOptions.condition = this.condition;
+    }
+  }
+}