Merge pull request #263 from aws-solutions/release/v4.0.1

Changes for release/v4.0.1

Author: ianwow

CHANGELOG.md

@@ -5,9 +5,20 @@ 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).
 
+## [4.0.1] - 2025-11-21
+
+### Security
+
+- Pin Amazon Linux base image to SHA256 hash in order to improve integrity, prevent tampering, and improve the reproducibility of builds across environments.
+
+### Fixed
+
+- Fix regression where load tests with zipped test scripts will fail to unzip when zipped without a parent directory.
+
 ## [4.0.0] - 2025-11-19
 
 ### Added
+
 - **MCP Server Integration** - Added the ability for AI agents to programmatically create, run, and analyze load tests through Amazon Bedrock AgentCore
 - **Live Data Visualization** - Added the ability to visualize live test data by region with auto-refresh functionality
 - **Test Results Comparison** - Added the ability to highlight differences between
@@ -16,13 +27,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **Downloadable Test Results** - Added the ability to download test results from the front-end
 
 ### Changed
+
 - **User Interface** - A complete frontend rewrite built on React, the Cloudscape design system, and Redux state management
 
 ### Fixed
+
 - **Cron Scheduling Issues** - Fixed cron expression parsing and validation
 - **Infinite Fetching** - Fixed infinite fetching of test results
 
 ### Security
+
 - **CloudFront Security Headers** - Added security headers policy with CSP, HSTS, Permissions-Policy, and CORP
 - **Resolved Vulnerabilities** - Resolved security vulnerabilities in multiple npm and Python dependencies
 

VERSION.txt

@@ -1 +1 @@
-4.0.0
+4.0.1

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

@@ -1,4 +1,4 @@
-FROM public.ecr.aws/amazonlinux/amazonlinux:2023-minimal
+FROM public.ecr.aws/amazonlinux/amazonlinux:2023-minimal@sha256:c69a151043b0e0e7d0362ab283299267580f5a5a4cf08131eb61b9528eaec882
 
 RUN dnf upgrade -y --refresh && \
     dnf install -y python3.11 python3.11-pip java-21-amazon-corretto bc procps jq findutils unzip && \
@@ -9,7 +9,7 @@ ENV PIP_INSTALL="pip3.11 install --no-cache-dir"
 
 # install bzt
 RUN $PIP_INSTALL --upgrade pip && \
-    $PIP_INSTALL --upgrade bzt awscli setuptools==78.1.1 h11 urllib3==2.2.2 && \
+    $PIP_INSTALL --upgrade bzt awscli setuptools==78.1.1 h11 && \
     $PIP_INSTALL --upgrade bzt
 COPY ./.bzt-rc /root/.bzt-rc
 RUN chmod 755 /root/.bzt-rc

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

@@ -79,8 +79,11 @@ if [ "$TEST_TYPE" != "simple" ]; then
     # Find the parent folder and copy its contents
     PARENT_FOLDER=$(find $TEMP_DIR -mindepth 1 -maxdepth 1 -type d | head -n 1)
     if [ -n "$PARENT_FOLDER" ]; then
-      echo "Copying contents from $PARENT_FOLDER"
+      echo "Copying contents from parent folder: $PARENT_FOLDER"
       cp -r $PARENT_FOLDER/* ./
+    else
+      echo "No parent folder found, copying all contents from temp directory"
+      cp -r $TEMP_DIR/* ./
     fi
 
     # Cleanup temp directory

solution-manifest.yaml

@@ -1,6 +1,6 @@
 id: SO0062 
 name: distributed-load-testing-on-aws
-version: v4.0.0
+version: v4.0.1
 cloudformation_templates:
   - template: distributed-load-testing-on-aws.template
     main_template: true 
@@ -9,4 +9,4 @@ cloudformation_templates:
 build_environment:
     build_image: 'aws/codebuild/standard:7.0'
 container_images:
-  - distributed-load-testing-on-aws-load-tester
+  - distributed-load-testing-on-aws-load-tester

source/api-services/lib/scenarios/index.spec.js

@@ -1432,7 +1432,7 @@ describe("#SCENARIOS API:: ", () => {
         {
           CreationTime: new Date("2025-09-09T19:40:22Z"),
           StackId: "arn:aws:cloudformation:us-west-2:123456789012:stack/test-stack/12345",
-          Tags: [{ Key: "SolutionVersion", Value: "v4.0.0" }],
+          Tags: [{ Key: "SolutionVersion", Value: "v4.0.1" }],
         },
       ],
     };
@@ -1442,7 +1442,7 @@ describe("#SCENARIOS API:: ", () => {
     expect(response).toEqual({
       created_time: "2025-09-09T19:40:22.000Z",
       region: "us-west-2",
-      version: "v4.0.0",
+      version: "v4.0.1",
     });
   });
 
@@ -1468,7 +1468,7 @@ describe("#SCENARIOS API:: ", () => {
         {
           CreationTime: new Date("2025-09-09T19:40:22Z"),
           StackId: "arn:aws:cloudformation:us-east-1:123456789012:stack/test-stack/12345",
-          Description: "Distributed Load Testing Solution v4.0.0 - Creates infrastructure for load testing",
+          Description: "Distributed Load Testing Solution v4.0.1 - Creates infrastructure for load testing",
           Tags: [{ Key: "OtherTag", Value: "value" }],
         },
       ],
@@ -1479,7 +1479,7 @@ describe("#SCENARIOS API:: ", () => {
     expect(response).toEqual({
       created_time: "2025-09-09T19:40:22.000Z",
       region: "us-east-1",
-      version: "v4.0.0",
+      version: "v4.0.1",
     });
   });
 

source/api-services/lib/validation/schemas.spec.ts

@@ -385,11 +385,17 @@ describe("Validation Schemas", () => {
 
     it("should validate cron expressions", () => {
       const validCronExpressions = [
-        "0 * * * *", // every hour
-        "0 9 * * 1", // 9 AM every Monday
+        "0 0 * * *", // Midnight daily
         "30 14 * * 5", // 2:30 PM every Friday
-        "0 0 1 * *", // midnight on 1st of every month
-        "15 6 * * 0", // 6:15 AM every Sunday
+        "0 9 * * 1", // 9 AM every Monday
+        "0 */4 * * *", // Every 4 hours at minute 0
+        "0 */6 * * 1-5", // Every 6 hours on weekdays
+        "30 9 * * 1-5", // 9:30 AM weekdays
+        "0 0 * * 0-6", // Midnight every day (range)
+        "0 9,12,15 * * *", // 9 AM, 12 PM, 3 PM daily
+        "30 8,17 * * 1-5", // 8:30 AM and 5:30 PM weekdays
+        "0 5,22 * * 1,2,3", // 5 AM and 10 PM on Mon/Tue/Wed
+        "15 6,18 * * 1,3,5", // 6:15 AM and 6:15 PM on Mon/Wed/Fri
       ];
 
       validCronExpressions.forEach((cronValue) => {

source/api-services/lib/validation/schemas.ts

@@ -27,10 +27,14 @@ const isoDateString = z
 
 /**
  * Validates cron expression (Linux format: min hour day month dayOfWeek)
+ * Supports hour step values and comma lists, day-of-week ranges and lists
  */
+const CRON_EXPRESSION_REGEX =
+  /^([0-5]?\d) (\*|\*\/\d+|([01]?\d|2[0-3])(,([01]?\d|2[0-3]))*) (\*|[0-2]?\d|3[01]) (\*|[1-9]|1[0-2]) (\*|[0-6]([-,][0-6])*)$/; // NOSONAR
+
 const cronExpressionSchema = z.string().regex(
-  /^(\*|([0-5]?\d)) (\*|([01]?\d|2[0-3])) (\*|([0-2]?\d|3[01])) (\*|([1-9]|1[0-2])) (\*|[0-7])$/, // NOSONAR
-  "Invalid cron expression format. Expected 5 field cron expression (example: * * * * *)."
+  CRON_EXPRESSION_REGEX, // NOSONAR
+  "Invalid cron expression format. Hours support step values and lists. Day-of-week supports ranges and lists."
 );
 
 /**

source/api-services/package-lock.json

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