Update to Version v3.3.3 (#221)

CHANGELOG.md

@@ -5,6 +5,21 @@ 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.3.3] - 2024-11-22
+
+### Security
+
+- Update `cross-spawn` to mitigate [CVE-2024-21538]
+- Update `Werzeug` to mitigate [CVE-2024-49767]
+
+### Fixed
+
+- Update tika-core to v3.0.0 to resolve [https://github.com/aws-solutions/distributed-load-testing-on-aws/issues/214]
+
+### Updated
+
+- Updates on metrics collection process
+
 ## [3.3.2] - 2024-11-01
 
 ### Security

VERSION.txt

@@ -1 +1 @@
-3.3.2
+3.3.3

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

@@ -2,7 +2,7 @@ FROM blazemeter/taurus:1.16.34
 # taurus includes python and pip
 RUN /usr/bin/python3 -m pip install --upgrade pip
 RUN pip install --no-cache-dir awscli
-RUN apt-get -y install --no-install-recommends xmlstarlet bc procps
+RUN apt-get -y install --no-install-recommends xmlstarlet bc procps jq
 
 # Removing selenium and gatling from our image as they are not supported in DLT
 RUN rm -rf /root/.bzt/selenium-taurus
@@ -32,7 +32,7 @@ RUN rm -rf /root/.bzt/python-packages/3.10.12/urllib3*
 RUN cp -r /usr/local/lib/python3.10/dist-packages/urllib3* /root/.bzt/python-packages/3.10.12/
 
 # Replacing Werkzeug with more stable version to resolve vulnerabilities
-RUN pip install Werkzeug==3.0.3
+RUN pip install Werkzeug==3.0.6
 RUN rm -rf /root/.bzt/python-packages/3.10.12/werkzeug*
 RUN cp -r /usr/local/lib/python3.10/dist-packages/werkzeug* /root/.bzt/python-packages/3.10.12/
 

deployment/ecr/distributed-load-testing-on-aws-load-tester/jar_updater.py

@@ -17,7 +17,7 @@
     * batik-transcoder v1.14 will be replaced with v1.17
     * lets-plot-batik v2.2.1 will be replaced with 4.2.0
     * commons-net v3.8.0 will be replaced with v3.9.0
-    * tika-core v1.28.3 will be replaced with v2.9.2
+    * tika-core v1.28.3 will be replaced with v3.0.0
     * json-path v2.7.0 will be replaced with v2.9.0
     * dnsjava v2.1.9 will be replaced with v3.6.1
 
@@ -35,7 +35,7 @@
     "batik-transcoder": "org/apache/xmlgraphics/batik-transcoder/1.17/batik-transcoder-1.17.jar",
     "lets-plot-batik":  "org/jetbrains/lets-plot/lets-plot-batik/4.2.0/lets-plot-batik-4.2.0.jar",
     "commons-net": "commons-net/commons-net/3.9.0/commons-net-3.9.0.jar",
-    "tika-core": "org/apache/tika/tika-core/2.9.2/tika-core-2.9.2.jar",
+    "tika-core": "org/apache/tika/tika-core/3.0.0/tika-core-3.0.0.jar",
     "json-path": "com/jayway/jsonpath/json-path/2.9.0/json-path-2.9.0.jar",
     "dnsjava": "dnsjava/dnsjava/3.6.1/dnsjava-3.6.1.jar"
 }

deployment/ecr/distributed-load-testing-on-aws-load-tester/load-test.sh

@@ -12,6 +12,10 @@ echo "UUID:: ${UUID}"
 echo "LIVE_DATA_ENABLED:: ${LIVE_DATA_ENABLED}"
 echo "MAIN_STACK_REGION:: ${MAIN_STACK_REGION}"
 
+cat /proc/self/cgroup
+TASK_ID=$(cat /proc/self/cgroup | grep -oE '[a-f0-9]{32}' | head -n 1)
+echo $TASK_ID
+
 sigterm_handler() {
   if [ $pypid -ne 0 ]; then
     echo "container received SIGTERM."
@@ -146,6 +150,23 @@ if [ "$TEST_TYPE" != "simple" ]; then
 fi
 
 if [ -f /tmp/artifacts/results.xml ]; then
+
+  # Insert the Task ID at the same level as <FinalStatus>
+  curl -s $ECS_CONTAINER_METADATA_URI_V4/task
+  Task_CPU=$(curl -s $ECS_CONTAINER_METADATA_URI_V4/task | jq '.Limits.CPU')
+  Task_Memory=$(curl -s $ECS_CONTAINER_METADATA_URI_V4/task | jq '.Limits.Memory')
+  START_TIME=$(curl -s "$ECS_CONTAINER_METADATA_URI_V4/task" | jq -r '.Containers[0].StartedAt')
+  # Convert start time to seconds since epoch
+  START_TIME_EPOCH=$(date -d "$START_TIME" +%s)
+  # Calculate elapsed time in seconds
+  CURRENT_TIME_EPOCH=$(date +%s)
+  ECS_DURATION=$((CURRENT_TIME_EPOCH - START_TIME_EPOCH))
+
+  xmlstarlet ed -P -L -s "/FinalStatus" -t elem -n "TaskId" -v "$TASK_ID" /tmp/artifacts/results.xml
+  xmlstarlet ed -P -L -s "/FinalStatus" -t elem -n "TaskCPU" -v "$Task_CPU" /tmp/artifacts/results.xml
+  xmlstarlet ed -P -L -s "/FinalStatus" -t elem -n "TaskMemory" -v "$Task_Memory" /tmp/artifacts/results.xml
+  xmlstarlet ed -P -L -s "/FinalStatus" -t elem -n "ECSDuration" -v "$ECS_DURATION" /tmp/artifacts/results.xml
+
   echo "Validating Test Duration"
   TEST_DURATION=`xmlstarlet sel -t -v "/FinalStatus/TestDuration" /tmp/artifacts/results.xml`
 

source/api-services/index.js

@@ -28,6 +28,26 @@ class APIHandler {
     throw this.errorMsg;
   }
 
+  async sendMetrics(config, data) {
+    if (process.env.SEND_METRIC === "Yes") {
+      let taskCountObj = {};
+      for (const testTaskConfig of config.testTaskConfigs) {
+        taskCountObj[testTaskConfig.region] = testTaskConfig.taskCount;
+      }
+      await utils.sendMetric({
+        Type: "TestCreate",
+        TestType: config.testType,
+        FileType: config.fileType || (config.testType === "simple" ? "none" : "script"),
+        TaskCountPerRegion: taskCountObj,
+        TestId: data.testId,
+        TestScheduleStep: config.scheduleStep,
+        HoldFor: config.testScenario.execution[0]["hold-for"],
+        RampUp: config.testScenario.execution[0]["ramp-up"],
+        CronValue: config.cronValue,
+        TestEventBridgeScheduled: config.eventBridge,
+      });
+    }
+  }
   // Handle the /scenarios endpoint
   async handleScenarios(config, queryParams, body, functionName, functionArn) {
     let data;
@@ -53,18 +73,7 @@ class APIHandler {
         }
         // Handle creating test
         else data = await scenarios.createTest(config, functionName);
-        if (process.env.SEND_METRIC === "Yes") {
-          await utils.sendMetric({
-            Type: "TaskCreate",
-            TestType: config.testType,
-            FileType: config.fileType || (config.testType === "simple" ? "none" : "script"),
-            TaskCount: config.taskCount,
-            TestId: data.testId,
-            TestScheduleStep: config.scheduleStep,
-            CronValue: config.cronValue,
-            TestEventBridgeScheduled: config.eventBridge,
-          });
-        }
+        await this.sendMetrics(config, data);
         return data;
       default:
         throw this.errorMsg;

source/api-services/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api-services",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "REST API micro services",
   "repository": {
     "type": "git",

source/console/package.json

@@ -1,6 +1,6 @@
 {
   "name": "distributed-load-testing-on-aws-ui",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "private": true,
   "license": "Apache-2.0",
   "author": {

source/custom-resource/package.json

@@ -1,6 +1,6 @@
 {
   "name": "custom-resource",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "cfn custom resources for distributed load testing on AWS workflow",
   "repository": {
     "type": "git",

source/infrastructure/lib/back-end/step-functions.ts

@@ -15,6 +15,7 @@ import {
   WaitTime,
   JsonPath,
   DefinitionBody,
+  TaskInput,
 } from "aws-cdk-lib/aws-stepfunctions";
 import { LambdaInvoke } from "aws-cdk-lib/aws-stepfunctions-tasks";
 import { Aws, CfnResource, Duration } from "aws-cdk-lib";
@@ -61,6 +62,16 @@ export class TaskRunnerStepFunctionConstruct extends Construct {
     const mapEnd = new Pass(this, "Map End");
     const parseResult = new LambdaInvoke(this, "Parse result", {
       lambdaFunction: props.resultsParser,
+      payload: TaskInput.fromObject({
+        "testTaskConfig.$": "$.testTaskConfig",
+        "testId.$": "$.testId",
+        "testType.$": "$.testType",
+        "fileType.$": "$.fileType",
+        "showLive.$": "$.showLive",
+        "testDuration.$": "$.testDuration",
+        "prefix.$": "$.prefix",
+        "executionStart.$": "$$.Execution.StartTime",
+      }),
     });
     parseResult.next(done);
 

source/infrastructure/package.json

@@ -1,6 +1,6 @@
 {
   "name": "distributed-load-testing-on-aws-infrastructure",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "author": {
     "name": "Amazon Web Services",
     "url": "https://aws.amazon.com/solutions"

source/infrastructure/test/__snapshots__/distributed-load-testing-on-aws-stack.test.ts.snap

@@ -4600,7 +4600,7 @@ exports[`Distributed Load Testing stack test 1`] = `
                   "Arn",
                 ],
               },
-              "","Payload.$":"$"}},"Done":{"Type":"Succeed"}}}",
+              "","Payload":{"testTaskConfig.$":"$.testTaskConfig","testId.$":"$.testId","testType.$":"$.testType","fileType.$":"$.fileType","showLive.$":"$.showLive","testDuration.$":"$.testDuration","prefix.$":"$.prefix","executionStart.$":"$$.Execution.StartTime"}}},"Done":{"Type":"Succeed"}}}",
             ],
           ],
         },

source/infrastructure/test/__snapshots__/step-functions.test.ts.snap

@@ -121,7 +121,7 @@ exports[`DLT API Test 1`] = `
                   "Arn",
                 ],
               },
-              "","Payload.$":"$"}},"Done":{"Type":"Succeed"}}}",
+              "","Payload":{"testTaskConfig.$":"$.testTaskConfig","testId.$":"$.testId","testType.$":"$.testType","fileType.$":"$.fileType","showLive.$":"$.showLive","testDuration.$":"$.testDuration","prefix.$":"$.prefix","executionStart.$":"$$.Execution.StartTime"}}},"Done":{"Type":"Succeed"}}}",
             ],
           ],
         },