Release version 1.1.0

Author: Nightingale

CHANGELOG.md

@@ -4,6 +4,27 @@ 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).
 
-## [0.0.1] - 2019-08-28
+## [1.1.0] - 2020-09-30
+### Added
+- JMeter support with `jmx` script: [#3](https://github.com/awslabs/distributed-load-testing-on-aws/issues/3)
+- Add `START` button on details page
+- Add `CANCEL` button on create page
+- Add AWS Step Functions to run tasks and update result instead of Amazon DynamoDB and Amazon SQS
+- Add `BucketEncryption` for `ConsoleBucket`
+- Add API Gateway logging
+
+### Changed
+- Merge [#15](https://github.com/awslabs/distributed-load-testing-on-aws/pull/15/) by [@afittz](https://github.com/afittz)
+- Merge [#16](https://github.com/awslabs/distributed-load-testing-on-aws/pull/16/) by [@Patrick-56Bit](https://github.com/Patrick-56Bit)
+- Change `LAST RAN` to `STARTED AT` and add `ENDED AT` information when test is completed
+- Change CodeBuild image to `aws/codebuild/standard:4.0`
+- Update Node.js version from 10.x to 12.x
+- All Amazon S3 buckets do not allow public access.
+
+### Removed
+- Amazon SQS queue
+- Amazon DynamoDB Results table
+
+## [1.0.0] - 2019-11-14
 ### Added
 - CHANGELOG version 1.0.0 release

LICENSE

@@ -1,17 +1,5 @@
 Distributed Load Testing Reference Architecture
-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.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
 **********************
 THIRD PARTY COMPONENTS

NOTICE.txt

@@ -31,64 +31,72 @@ The Taurus DockerFile and bash script run at start of the test to download the t
 A NodeJS Lambda function used as a CloudFormation custom resource for configuring Amazon S3 bucket notifications and to send anonymous metrics.
 
 **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.
+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.
 
 **source/task-runner**<br/>
-A NodeJS Lambda function that Runs The Amaazon ECS task definition for each test.
+A NodeJS Lambda function that runs the Amaazon ECS task definition for each test.
 
+**source/task-status-checker**<br/>
+A NodeJS Lambda function that checks if the Amaazon ECS tasks are running or not.
 
 ## Creating a custom build
-The solution can be deployed through the CloudFormation template available on the solution home page: [Distributed Load Testing](https://aws.amazon.com/).
+The solution can be deployed through the CloudFormation template available on the solution home page: [Distributed Load Testing](https://aws.amazon.com/solutions/implementations/distributed-load-testing-on-aws/).
 To make changes to the solution, download or clone this repo, update the source code and then run the deployment/build-s3-dist.sh script to deploy the updated Lambda code to an Amazon S3 bucket in your account.
 
 ### Prerequisites:
 * [AWS Command Line Interface](https://aws.amazon.com/cli/)
-* Node.js 10.x or later
+* Node.js 12.x or later
 
-### 1. Running unit tests for customization
-Run unit tests to make sure added customization passes the tests:
+### 1. Clone the Distributed Load Testing on AWS solution repository
+Clone the ```distributed-load-testing-on-aws``` GitHub repositroy, then make the desired code changes.
+
+```bash
+git clone https://github.com/awslabs/distributed-load-testing-on-aws.git
 ```
+
+### 2. Run unit tests
+Run unit tests to make sure added customization passes the tests:
+```bash
 cd ./deployment
 chmod +x ./run-unit-tests.sh
 ./run-unit-tests.sh
 ```
 
-### 2. Create an Amazon S3 Bucket
-The CloudFormation template is configured to pull the Lambda deployment packages from Amazon S3 bucket in the region the template is being launched in. Create a bucket in the desired region with the region name appended to the name of the bucket. eg: for us-east-1 create a bucket named: ```my-bucket-us-east-1```
+### 3. Declare environment variables
+```bash
+export REGION=aws-region-code # the AWS region to launch the solution (e.g. us-east-1)
+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
 ```
-aws s3 mb s3://my-bucket-us-east-1
+
+### 4. Create an Amazon S3 Bucket
+The CloudFormation template is configured to pull the Lambda deployment packages from Amazon S3 bucket in the region the template is being launched in. Create a bucket in the desired region with the region name appended to the name of the bucket. eg: for us-east-1 create a bucket named: ```my-bucket-us-east-1```
+```bash
+aws s3 mb s3://$DIST_OUTPUT_BUCKET-$REGION --region $REGION
 ```
 
-### 3. Create the deployment packages
+### 5. Create the deployment packages
 Build the distributable:
-```
+```bash
 chmod +x ./build-s3-dist.sh
-./build-s3-dist.sh my-bucket video-on-demand-on-aws %%VERSION%%-custom
+./build-s3-dist.sh $DIST_OUTPUT_BUCKET $SOLUTION_NAME $VERSION
 ```
 
 > **Notes**: The _build-s3-dist_ script expects the bucket name as one of its parameters, and this value should not include the region suffix. In addition to that, the version parameter will be used to tag the npm packages, and therefore should be in the [Semantic Versioning format](https://semver.org/spec/v2.0.0.html).
 
+### 6. Upload deployment assets to your Amazon S3 bucket
 Deploy the distributable to the Amazon S3 bucket in your account:
-```
-aws s3 cp ./regional-s3-assets/ s3://my-bucket-us-east-1/video-on-demand-on-aws/%%VERSION%%-custom/ --recursive --acl bucket-owner-full-control
+```bash
+aws s3 cp ./regional-s3-assets/ s3://$DIST_OUTPUT_BUCKET-$REGION/$SOLUTION_NAME/$VERSION/ --recursive --acl bucket-owner-full-control
+aws s3 cp ./global-s3-assets/ s3://$DIST_OUTPUT_BUCKET-$REGION/$SOLUTION_NAME/$VERSION/ --recursive --acl bucket-owner-full-control
 ```
 
-### 4. Launch the CloudFormation template.
-* Get the link of the video-on-demand-on-aws.template uploaded to your Amazon S3 bucket.
-* Deploy the Video on Demand to your account by launching a new AWS CloudFormation stack using the link of the video-on-demand-on-aws.template.
+### 7. Launch the CloudFormation template.
+* 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`.
 
 ***
 
-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.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.<br />
+SPDX-License-Identifier: Apache-2.0

README.md

@@ -60,11 +60,10 @@ 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
 
-cd $source_dir
 echo "------------------------------------------------------------------------------"
 echo "Creating custom-resource deployment package"
 echo "------------------------------------------------------------------------------"
-cd custom-resource/
+cd $source_dir/custom-resource/
 rm -rf node_modules/
 npm install --production
 rm package-lock.json
@@ -73,7 +72,7 @@ zip -q -r9 ../../deployment/regional-s3-assets/custom-resource.zip *
 echo "------------------------------------------------------------------------------"
 echo "Creating api-services deployment package"
 echo "------------------------------------------------------------------------------"
-cd ../api-services
+cd $source_dir/api-services
 rm -rf node_modules/
 npm install --production
 rm package-lock.json
@@ -82,7 +81,7 @@ zip -q -r9 $build_dist_dir/api-services.zip *
 echo "------------------------------------------------------------------------------"
 echo "Creating results-parser deployment package"
 echo "------------------------------------------------------------------------------"
-cd ../results-parser
+cd $source_dir/results-parser
 rm -rf node_modules/
 npm install --production
 rm package-lock.json
@@ -91,27 +90,35 @@ zip -q -r9 $build_dist_dir/results-parser.zip *
 echo "------------------------------------------------------------------------------"
 echo "Creating task-runner deployment package"
 echo "------------------------------------------------------------------------------"
-cd ../task-runner
+cd $source_dir/task-runner
 rm -rf node_modules/
 npm install --production
 rm package-lock.json
 zip -q -r9 $build_dist_dir/task-runner.zip *
 
+echo "------------------------------------------------------------------------------"
+echo "Creating task-status-checker deployment package"
+echo "------------------------------------------------------------------------------"
+cd $source_dir/task-status-checker
+rm -rf node_modules/
+npm install --production
+rm package-lock.json
+zip -q -r9 $build_dist_dir/task-status-checker.zip *
+
 echo "------------------------------------------------------------------------------"
 echo "Creating container deployment package"
 echo "------------------------------------------------------------------------------"
-cd ../container
+cd $source_dir/container
 zip -q -r9 ../../deployment/regional-s3-assets/container.zip *
 cp container-manifest.json $build_dist_dir/
 
 echo "------------------------------------------------------------------------------"
-echo "Buildinbg console"
+echo "Building console"
 echo "------------------------------------------------------------------------------"
-cd ../console
+cd $source_dir/console
 [ -e build ] && rm -r build
 [ -e node_modules ] && rm -rf node_modules
 npm install
-touch public/aws_config.js
 npm run build
 mkdir $build_dist_dir/console
 cp -r ./build/* $build_dist_dir/console/