Update to version v2.0.0

Author: beomseoklee

.gitignore

@@ -7,6 +7,7 @@ regional-s3-assets/
 open-source/
 console_new/
 **/aws_config.js
+deployment/ecr/*.jar
 
 .pnp
 .pnp.js

CHANGELOG.md

@@ -3,6 +3,31 @@ 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.0.0] - 2021-09-30
+⚠ BREAKING CHANGES
+Version 2.0.0 does not support upgrading from previous versions.
+### Added
+- Support to view complete data from previous test runs, including test configuration, test data, and Amazon CloudWatch dashboards
+  - Results History now has a `View details` link to display data from previous test runs
+- Support for an existing Amazon VPC
+- Launch Fargate tasks in multiple availability zones
+- Using AWS CDK source code to generate the AWS CloudFormation template
+
+### Changed
+- Results History displays:
+  - Run Time
+  - Task Count
+  - Concurrency
+  - Average Response Time
+  - Success %
+- Tags created in CloudFormation propagated to Fargate test tasks
+- Test ids only contain alphanumeric characters
+
+### Removed
+- Remove AWS CodePipeline, AWS CodeBuild, and Amazon ECR image repository resource creation by AWS CloudFormation stack
+  - The solution's container image is stored in a public ECR image repository managed by AWS
+- Remove `ECRChecker` lambda function and state machine stage
+
 ## [1.3.0] - 2021-04-30
 ### Added
 - Support for up to 1000 tasks

NOTICE.txt

@@ -28,9 +28,10 @@ react under the Massachusetts Institute of Technology (MIT) license
 react-ace under the Massachusetts Institute of Technology (MIT) license
 react-dom under the Massachusetts Institute of Technology (MIT) license
 react-router-dom under the Massachusetts Institute of Technology (MIT) license
+react-router-hash-link under the Massachusetts Institute of Technology (MIT) license
 react-scripts under the Massachusetts Institute of Technology (MIT) license
 reactstrap under the Massachusetts Institute of Technology (MIT) license
-shortid under the Massachusetts Institute of Technology (MIT) license
+nanoid under the Massachusetts Institute of Technology (MIT) license
 taurus under the Apache License Version 2.0
 uuid under the Massachusetts Institute of Technology (MIT) license
 xml-js under the Massachusetts Institute of Technology (MIT) license

README.md

@@ -24,15 +24,9 @@ A NodeJS Lambda function for the API microservices. Integrated with Amazon API G
 **source/console**<br/>
 ReactJS Single page application to provide a GUI to the solutions. Authenticated through Amazon Cognito this dashboard allows users to Create tests and view the final results.
 
-**source/container**<br/>
-The Taurus DockerFile and bash script run at start of the test to download the test definition from S3. This is the source file for the image pipeline to build and deploy the Docker image to Amazon ECR. Details on Taurus can be found [here](https://gettaurus.org/).
-
 **source/custom-resource**<br/>
 A NodeJS Lambda function used as a CloudFormation custom resource for configuring Amazon S3 bucket notifications and to send anonymous metrics.
 
-**source/ecr-checker**<br/>
-A NodeJS Lambda function that checks if the Amazon ECR is ready or not.
-
 **source/results-parser**<br/>
 A NodeJS Lambda function used to write the xml output from the docker images to Amazon DynamoDB and generate the final results for each test.
 
@@ -51,7 +45,7 @@ To make changes to the solution, download or clone this repo, update the source
 
 ### Prerequisites:
 * [AWS Command Line Interface](https://aws.amazon.com/cli/)
-* Node.js 12.x or later
+* Node.js 14.x or later
 
 ### 1. Clone the Distributed Load Testing on AWS solution repository
 Clone the ```distributed-load-testing-on-aws``` GitHub repository, then make the desired code changes.
@@ -74,6 +68,8 @@ export REGION=aws-region-code # the AWS region to launch the solution (e.g. us-e
 export DIST_OUTPUT_BUCKET=my-bucket-name # bucket where customized code will reside
 export SOLUTION_NAME=my-solution-name
 export VERSION=my-version # version number for the customized code
+export PUBLIC_ECR_REGISTRY=public.ecr.aws/awssolutions/distributed-load-testing-on-aws-load-tester # replace with the container registry and image if you want to use a different container image
+export PUBLIC_ECR_TAG=v2.0 # replace with the container image tag if you want to use a different container image
 ```
 
 ### 4. Create an Amazon S3 Bucket
@@ -102,11 +98,14 @@ aws s3 cp ./global-s3-assets/ s3://$DIST_OUTPUT_BUCKET-$REGION/$SOLUTION_NAME/$V
 * Get the link of the `distributed-load-testing-on-aws.template` uploaded to your Amazon S3 bucket.
 * Deploy the Distributed Load Testing on AWS solution to your account by launching a new AWS CloudFormation stack using the link of the `distributed-load-testing-on-aws.template`.
 
+## Creating a custom container build
+This solution uses a public Amazon Elastic Container Registry (Amazon ECR) image repository managed by AWS to store the solution container image that is used to run the configured tests. If you want to customize the container image, you can rebuild and push the image into an ECR image repository in your own AWS account.
+For details on how to customize the container image, please see the **Container image customization** section of the [implementation guide](https://docs.aws.amazon.com/solutions/latest/distributed-load-testing-on-aws/container-image.html).
 
 ## Collection of operational metrics
-This solution collects anonymous operational metrics to help AWS improve the quality and features of the solution. For more information, including how to disable this capability, please see the [implementation guide](https://docs.aws.amazon.com/solutions/latest/distributed-load-testing-on-aws/operational-metrics.html).
 
+This solution collects anonymous operational metrics to help AWS improve the quality and features of the solution. For more information, including how to disable this capability, please see the [implementation guide](https://docs.aws.amazon.com/solutions/latest/distributed-load-testing-on-aws/operational-metrics.html).
 ***
 
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.<br />
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: Apache-2.0

architecture.png

@@ -7,8 +7,8 @@
 # ./build-s3-dist.sh source-bucket-base-name trademarked-solution-name version-code
 #
 # Paramenters:
-#  - source-bucket-base-name: Name for the S3 bucket location where the AWS CloudFormation template will source the Lambda
-#    code from. The AWS Lambda code is contained in the zip files.  The template will append '-[region_name]' to this bucket name.
+#  - source-bucket-base-name: Name for the S3 bucket location where the AWS CloudFormation template will source the Lambda code from. 
+#    The AWS Lambda code is contained in the zip files. The template will append '-[region_name]' to this bucket name.
 #    For example: ./build-s3-dist.sh solutions my-solution v1.0.0
 #    The template will then expect the source code to be located in the solutions-[region_name] bucket
 #
@@ -46,8 +46,10 @@ mkdir -p $template_dist_dir $build_dist_dir
 echo "------------------------------------------------------------------------------"
 echo "CloudFormation Template"
 echo "------------------------------------------------------------------------------"
-cp $template_dir/distributed-load-testing-on-aws.yaml $template_dist_dir/distributed-load-testing-on-aws.template
 
+cd $source_dir/infrastructure
+npm install
+node_modules/aws-cdk/bin/cdk synth --asset-metadata false --path-metadata false > $template_dist_dir/distributed-load-testing-on-aws.template
 replace="s/CODE_BUCKET/$1/g"
 echo "sed -i -e $replace"
 sed -i -e $replace $template_dist_dir/distributed-load-testing-on-aws.template
@@ -57,6 +59,16 @@ sed -i -e $replace $template_dist_dir/distributed-load-testing-on-aws.template
 replace="s/CODE_VERSION/$3/g"
 echo "sed -i -e $replace"
 sed -i -e $replace $template_dist_dir/distributed-load-testing-on-aws.template
+
+echo "***** public ECR registry: $PUBLIC_ECR_REGISTRY"
+replace="s|PUBLIC_ECR_REGISTRY|$PUBLIC_ECR_REGISTRY|g"
+echo "sed -i -e $replace"
+sed -i -e $replace $template_dist_dir/distributed-load-testing-on-aws.template
+
+echo "***** public ECR tag: $PUBLIC_ECR_TAG"
+replace="s/PUBLIC_ECR_TAG/$PUBLIC_ECR_TAG/g"
+echo "sed -i -e $replace"
+sed -i -e $replace $template_dist_dir/distributed-load-testing-on-aws.template
 # remove tmp file for MACs
 [ -e $template_dist_dir/distributed-load-testing-on-aws.template-e ] && rm -r $template_dist_dir/distributed-load-testing-on-aws.template-e
 
@@ -114,29 +126,17 @@ npm install --production
 rm package-lock.json
 zip -q -r9 $build_dist_dir/task-status-checker.zip *
 
-echo "------------------------------------------------------------------------------"
-echo "Creating ecr-checker deployment package"
-echo "------------------------------------------------------------------------------"
-cd $source_dir/ecr-checker
-rm -rf node_modules/
-npm install --production
-rm package-lock.json
-zip -q -r9 $build_dist_dir/ecr-checker.zip *
-
 echo "------------------------------------------------------------------------------"
 echo "Creating container deployment package"
 echo "------------------------------------------------------------------------------"
-cd $source_dir/container
+cd $template_dir/ecr/distributed-load-testing-on-aws-load-tester
 # Downloading jetty 9.4.34.v20201102
 curl -O https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-alpn-client/9.4.34.v20201102/jetty-alpn-client-9.4.34.v20201102.jar
 curl -O https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-alpn-openjdk8-client/9.4.34.v20201102/jetty-alpn-openjdk8-client-9.4.34.v20201102.jar
 curl -O https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-client/9.4.34.v20201102/jetty-client-9.4.34.v20201102.jar
 curl -O https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http/9.4.34.v20201102/jetty-http-9.4.34.v20201102.jar
 curl -O https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io/9.4.34.v20201102/jetty-io-9.4.34.v20201102.jar
 curl -O https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/9.4.34.v20201102/jetty-util-9.4.34.v20201102.jar
-zip -q -r9 ../../deployment/regional-s3-assets/container.zip *
-cp container-manifest.json $build_dist_dir/
-rm -f *.jar
 
 echo "------------------------------------------------------------------------------"
 echo "Building console"
@@ -152,8 +152,8 @@ cp -r ./build/* $build_dist_dir/console/
 echo "------------------------------------------------------------------------------"
 echo "Generate console manifest file"
 echo "------------------------------------------------------------------------------"
-cd $build_dist_dir
-manifest=(`find console -type f | sed 's|^./||'`)
+cd $build_dist_dir/console
+manifest=(`find * -type f ! -iname ".DS_Store"`)
 manifest_json=$(IFS=,;printf "%s" "${manifest[*]}")
 echo "[\"$manifest_json\"]" | sed 's/,/","/g' > ./console-manifest.json