update to version v3.2.0

Author: G-Lenz

CHANGELOG.md

@@ -5,6 +5,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).
 
+## [3.2.0] - 2022-03-09
+
+### Added
+
+- Task limits based on on-demand vCPU quotas for the account along with currently running Fargate tasks.
+  - Table to the console when creating a test to visualize available Fargate quotas.
+- Auto-refresh functionality
+- eslint and prettier formatting
+
+### Fixed
+
+- Bug fix for [#115](https://github.com/aws-solutions/distributed-load-testing-on-aws/issues/115) where Step Functions hits a task execution limit.
+- Bug fix for [#115](https://github.com/aws-solutions/distributed-load-testing-on-aws/issues/115) where test does not cancel properly.
+- CloudWatch Dashboards link in console
+- Deletion of CloudWatch Dashboards on test deletion
+
+### Security
+
+- Updated to bootstrap 5
+- Updated to blazemeter/taurus version 1.16.9
+
 ## [3.1.1] - 2022-11-18
 
 ### Fixed

NOTICE.txt

@@ -13,6 +13,8 @@ This software includes third party software subject to the following copyrights:
 @aws-solutions-constructs/aws-cloudfront-s3 under the Apache License 2.0
 @types/jest under the Massachusetts Institute of Technology (MIT) License
 @types/node under the Massachusetts Institute of Technology (MIT) License
+@typescript-eslint/eslint-plugin under the Massachusetts Institute of Technology (MIT) license
+@typescript-eslint/parser under the BSD 2-Clause license
 aws-amplify under the Apache License Version 2.0
 aws-cdk under the Apache License Version 2.0
 aws-cdk-lib under the Apache License 2.0
@@ -25,6 +27,15 @@ brace under the Massachusetts Institute of Technology (MIT) license
 chart.js under the Massachusetts Institute of Technology (MIT) license
 chartjs-adapter-moment under the Massachusetts Institute of Technology (MIT) license
 constructs under the Apache License 2.0
+eslint under the Massachusetts Institute of Technology (MIT) license
+eslint-config-prettier under the Massachusetts Institute of Technology (MIT) license
+eslint-config-standard under the Massachusetts Institute of Technology (MIT) license
+eslint-plugin-header under the Massachusetts Institute of Technology (MIT) license
+eslint-plugin-import under the Massachusetts Institute of Technology (MIT) license
+eslint-plugin-jsdoc under the BSD 2-Clause license
+eslint-plugin-node under the Massachusetts Institute of Technology (MIT) license
+eslint-plugin-prettier under the Massachusetts Institute of Technology (MIT) license
+eslint-plugin-react under the Massachusetts Institute of Technology (MIT) license
 false under the Apache License Version 2.0
 jest under the Massachusetts Institute of Technology (MIT) license
 jetty-alpn-client under the Apache License Version 2.0 and the Eclipse Public License 1.0
@@ -35,6 +46,7 @@ jetty-io under the Apache License Version 2.0 and the Eclipse Public License 1.0
 jetty-util under the Apache License Version 2.0 and the Eclipse Public License 1.0
 js-yaml under the Massachusetts Institute of Technology (MIT) license
 moment under the Massachusetts Institute of Technology (MIT) license
+prettier under the Massachusetts Institute of Technology (MIT) license
 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

README.md

@@ -59,7 +59,7 @@ To make changes to the solution, download or clone this repository, update the s
 
 ### Prerequisites
 
-- Node.js 14.x or later
+- Node.js 16.x or later
 - S3 bucket that includes the AWS region as a suffix in the name. For example, `my-bucket-us-east-1`. The bucket and CloudFormation stack must be in the same region. The solution's CloudFormation template will expect the source code to be located in a bucket matching that name.
 
 ### Running unit tests for customization
@@ -91,7 +91,7 @@ export BUCKET_NAME=$BUCKET_PREFIX-$REGION # full bucket name where the code will
 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=v3.0.0 # replace with the container image tag if you want to use a different container image
+export PUBLIC_ECR_TAG=v3.2.0 # replace with the container image tag if you want to use a different container image
 ```
 
 - Build the distributable.

deployment/build-s3-dist.sh

@@ -1,4 +1,4 @@
-FROM blazemeter/taurus:1.16.11
+FROM blazemeter/taurus:1.16.19
 # taurus includes python and pip
 RUN /usr/bin/python3 -m pip install --upgrade pip
 RUN pip install --no-cache-dir awscli

deployment/ecr/distributed-load-testing-on-aws-load-tester/Dockerfile

@@ -37,25 +37,59 @@ run_tests() {
   echo "cd $component_path"
   cd $component_path
 
-  # install dependencies
-  npm run clean
-  npm install
-
   # run unit tests
   npm test
 
   # prepare coverage reports
   prepare_jest_coverage_report $component_name
-  rm -rf coverage node_modules package-lock.json
-}
 
-# Run unit tests
-echo "Running unit tests"
+  if [ $component_name = "solution-utils" ]
+  then
+    rm -rf coverage package-lock.json
+  else
+    rm -rf coverage node_modules package-lock.json
+  fi
+}
 
 # Get reference for source folder
 source_dir="$(cd $PWD/../source; pwd -P)"
 coverage_reports_top_path=$source_dir/test/coverage-reports
 
+#install dependencies
+cd $source_dir
+npm run clean:all
+npm run install:all
+
+#run prettier
+echo "Running prettier formatting check"
+npm run prettier-check
+if [ $? -eq 0 ]
+then
+  echo "Formatting check passed"
+else
+  echo "******************************************************************************"
+  echo "Test FAILED formatting check, run prettier-formatting on code"
+  echo "******************************************************************************"
+  exit 1
+fi
+
+#run linting check
+echo "Running linting check"
+npm run lint
+if [ $? -eq 0 ]
+then
+  echo "Formatting check passed"
+else
+  echo "******************************************************************************"
+  echo "Test FAILED linting check, run eslint on code and fix corresponding issues"
+  echo "******************************************************************************"
+  exit 1
+fi
+npm run clean
+
+# Run unit tests
+echo "Running unit tests"
+
 # Test packages
 declare -a packages=(
     "solution-utils"

deployment/run-unit-tests.sh

@@ -0,0 +1,7 @@
+**/infrastructure/*.js
+*.d.ts
+node_modules
+coverage
+**/test/*
+**/build/*
+**/assets/*

source/.eslintignore

@@ -0,0 +1,62 @@
+{
+  "root": true,
+  "extends": ["eslint:recommended"],
+  "env": {
+    "jest": true,
+    "node": true,
+    "es6": true
+  },
+  "ignorePatterns": ["**/node_modules/**"],
+  "parserOptions": {
+    "ecmaVersion": "latest"
+  },
+  "overrides": [
+    {
+      "files": ["**/*.ts", "**/*.tsx"],
+      "plugins": ["@typescript-eslint", "import", "header"],
+      "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended",
+        "plugin:import/recommended",
+        "plugin:import/typescript",
+        "standard",
+        "plugin:jsdoc/recommended",
+        "plugin:prettier/recommended"
+      ],
+      "parser": "@typescript-eslint/parser",
+      "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module",
+        "project": "**/tsconfig.json"
+      },
+      "rules": {
+        "@typescript-eslint/no-inferrable-types": ["off", { "ignoreParameters": true, "ignoreProperties": true }],
+        "@typescript-eslint/no-useless-constructor": ["off"],
+        "@typescript-eslint/no-unused-vars": ["error", { "args": "none", "argsIgnorePattern": "^_", "varsIgnorePattern": "^_" }],
+        "@typescript-eslint/no-throw-literal": ["error"],
+        "no-new": 0
+      }
+    },
+    {
+      "files": ["**/console/*.js"],
+      "extends": ["eslint:recommended", "plugin:react/recommended"],
+      "plugins": ["react"]
+    }
+  ],
+  "rules": {
+    "arrow-body-style": ["warn", "as-needed"],
+    "prefer-arrow-callback": ["warn"],
+    "no-inferrable-types": ["off", "ignore-params"],
+    "no-unused-vars": ["off"],
+    "no-useless-constructor": ["off"],
+    "no-throw-literal": ["off"],
+
+    "header/header": ["error", "line", [" Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.", " SPDX-License-Identifier: Apache-2.0"], 2],
+
+    "jsdoc/require-param-type": ["off"],
+    "jsdoc/require-returns-type": ["off"],
+    "jsdoc/newline-after-description": ["off"],
+
+    "import/no-unresolved": 1 // warn only on Unable to resolve path import/no-unresolved
+  }
+}

source/.eslintrc

@@ -0,0 +1,11 @@
+# .prettierrc or .prettierrc.yaml
+arrowParens: "always"
+bracketSpacing: true
+endOfLine: "lf"
+htmlWhitespaceSensitivity: "css"
+proseWrap: "preserve"
+trailingComma: "es5"
+tabWidth: 2
+semi: true
+quoteProps: "as-needed"
+printWidth: 120

source/.prettierrc.yml

@@ -1,8 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-const scenarios = require('./lib/scenarios/');
-const metrics = require('./lib/metrics/');
+const scenarios = require("./lib/scenarios/");
+const metrics = require("./lib/metrics/");
 
 exports.handler = async (event, context) => {
   console.log(JSON.stringify(event, null, 2));
@@ -17,81 +17,94 @@ exports.handler = async (event, context) => {
   let response = {
     headers: {
       "Access-Control-Allow-Origin": "*",
-      "Access-Control-Allow-Headers": "Origin, X-Requested-With, Content-Type, Accept"
+      "Access-Control-Allow-Headers": "Origin, X-Requested-With, Content-Type, Accept",
     },
-    statusCode: 200
+    statusCode: 200,
   };
 
   try {
     switch (resource) {
-      case '/regions': {
-        if (method === 'GET') {
-          data = { regions: await scenarios.getAllRegionConfigs() };
-          data.url = await scenarios.getCFUrl();
-        } else {
-          throw new Error(errMsg);
+      case "/regions":
+        {
+          if (method === "GET") {
+            data = { regions: await scenarios.getAllRegionConfigs() };
+            data.url = await scenarios.getCFUrl();
+          } else {
+            throw new Error(errMsg);
+          }
         }
-      }
         break;
-      case '/scenarios':
+      case "/scenarios":
         switch (method) {
-          case 'GET':
-            if (event.queryStringParameters && event.queryStringParameters.op === 'listRegions') {
+          case "GET":
+            if (event.queryStringParameters && event.queryStringParameters.op === "listRegions") {
               data = { regions: await scenarios.getAllRegionConfigs() };
               data.url = await scenarios.getCFUrl();
             } else {
               data = await scenarios.listTests();
             }
             break;
-          case 'POST':
+          case "POST":
             if (config.scheduleStep) {
               const contextValues = {
                 functionName: context.functionName,
-                functionArn: context.invokedFunctionArn
+                functionArn: context.invokedFunctionArn,
               };
-              data = await scenarios.scheduleTest({
-                resource: resource,
-                httpMethod: method,
-                body: event.body
-              },
-                contextValues);
-            }
-            else {
+              data = await scenarios.scheduleTest(
+                {
+                  resource: resource,
+                  httpMethod: method,
+                  body: event.body,
+                },
+                contextValues
+              );
+            } else {
               data = await scenarios.createTest(config);
             }
             //sending anonymous metrics (task Count) to aws
-            if (process.env.SEND_METRIC === 'Yes') {
-              await metrics.send({ testTaskConfigs: config.testTaskConfigs, testType: config.testType, fileType: config.fileType });
+            if (process.env.SEND_METRIC === "Yes") {
+              await metrics.send({
+                testTaskConfigs: config.testTaskConfigs,
+                testType: config.testType,
+                fileType: config.fileType,
+              });
             }
             break;
           default:
             throw new Error(errMsg);
         }
         break;
 
-      case '/scenarios/{testId}':
+      case "/scenarios/{testId}":
         testId = event.pathParameters.testId;
         switch (method) {
-          case 'GET':
+          case "GET":
             data = await scenarios.getTest(testId);
             break;
-          case 'POST':
+          case "POST":
             data = await scenarios.cancelTest(testId);
             break;
-          case 'DELETE':
+          case "DELETE":
             data = await scenarios.deleteTest(testId, context.functionName);
             break;
           default:
             throw new Error(errMsg);
         }
         break;
-      case '/tasks':
-        if (method === 'GET') {
+      case "/tasks":
+        if (method === "GET") {
           data = await scenarios.listTasks();
         } else {
           throw new Error(errMsg);
         }
         break;
+      case "/vCPUDetails":
+        if (method === "GET") {
+          data = await scenarios.getAccountFargatevCPUDetails();
+        } else {
+          throw new Error(errMsg);
+        }
+        break;
       default:
         throw new Error(errMsg);
     }

source/api-services/index.js

@@ -1,13 +1,9 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
 module.exports = {
-    roots: ['<rootDir>/lib'],
-    testMatch: ['**/*.spec.js'],
-    collectCoverageFrom: [
-        '**/*.js'
-    ],
-    coverageReporters: [
-        "text",
-        "clover",
-        "json",
-        ["lcov", { "projectRoot": "../../" }]
-    ]
-};
+  roots: ["<rootDir>/lib"],
+  testMatch: ["**/*.spec.js"],
+  collectCoverageFrom: ["**/*.js"],
+  coverageReporters: ["text", "clover", "json", ["lcov", { projectRoot: "../../" }]],
+};