@freshworks/shiftleft-tools 1.1.14 → 1.1.16

package/templates/postman/scripts/runners/run-tests-local.sh

@@ -1,35 +1,21 @@
 #!/usr/bin/env bash
 
 ###############################################################################
-# Local Test Runner
+# Local Test Runner (generic)
 #
-# Runs API integration tests locally with optional JaCoCo coverage.
+# Runs Postman/Newman API integration tests against a locally-started Spring
+# Boot app, with optional JaCoCo coverage. LocalStack + WireMock are started if
+# the repo provides them (auto-skipped otherwise).
 #
 # Usage:
-#   ./run-tests-local.sh                    # Run all tests (V3 + V2 + Legacy)
-#   ./run-tests-local.sh --v3               # Run only V3 tests (CRUD + Files)
-#   ./run-tests-local.sh --v2               # Run only V2 tests (OAuth, Transfer)
-#   ./run-tests-local.sh --legacy           # Run only Legacy tests
-#   ./run-tests-local.sh --all              # Run all test suites
-#   ./run-tests-local.sh --coverage         # Run tests with JaCoCo coverage
-#   ./run-tests-local.sh --multi-product    # Run V3 tests across all products
-#   ./run-tests-local.sh --skip-services    # Skip starting LocalStack/WireMock/Spring
-#   ./run-tests-local.sh --help             # Show this help
+#   ./run-tests-local.sh                 # Run all collections
+#   ./run-tests-local.sh --coverage      # Run with JaCoCo coverage
+#   ./run-tests-local.sh --skip-services # Skip starting LocalStack/WireMock/Spring
+#   ./run-tests-local.sh --help          # Show this help
 #
-# Multi-Product Testing:
-#   Tests V3 APIs (CRUD + Files) across Freshdesk, Freshservice, and Freshworks CRM
-#   Requires product-specific environment files in postman/environments/:
-#     - local.postman_environment.json (Freshdesk)
-#     - local-freshservice.postman_environment.json
-#     - local-freshworks-crm.postman_environment.json
-#
-# Examples:
-#   ./run-tests-local.sh                         # Quick: run all API tests
-#   ./run-tests-local.sh --coverage              # Full: all tests + coverage
-#   ./run-tests-local.sh --v3                    # Dev: just test V3 changes
-#   ./run-tests-local.sh --multi-product         # Test all products locally
-#   ./run-tests-local.sh --all --multi-product   # All suites, all products
-#   ./run-tests-local.sh --skip-services         # Tests only (services running)
+# This runner ships generic. The /setup-api-tests skill fills the repo-specific
+# blocks below (marked `repo-specific`) and then runs `shiftleft protect` so
+# `shiftleft test` staging never overwrites your customizations.
 ###############################################################################
 
 set -e
@@ -46,36 +32,32 @@ POSTMAN_DIR="$PROJECT_ROOT/postman"
 REPORT_DIR="$POSTMAN_DIR/reports"
 TIMESTAMP=$(date +%Y%m%d-%H%M%S)
 
-# Application settings
-APP_PORT=8080
+# >>> repo-specific (set by /setup-api-tests) <<<
+# Spring Boot app under test.
+APP_PORT="${APP_PORT:-8080}"
+CONTEXT_PATH="${CONTEXT_PATH:-}"
+SPRING_PROFILE="${SPRING_PROFILE:-postman}"
+# Maven module holding the app, used as `mvn -pl <MAVEN_MODULE>`.
+# Leave empty for a single-module project.
+MAVEN_MODULE="${MAVEN_MODULE:-}"
+# Java version to select via SDKMAN/java_home (empty = use current java).
+JAVA_VERSION="${JAVA_VERSION:-}"
+# JaCoCo include pattern for coverage (your service's base package).
+COVERAGE_PACKAGE="${COVERAGE_PACKAGE:-com.freshworks.*}"
+# Directory the coverage report is generated from (module dir or project root).
+COVERAGE_MODULE_DIR="${COVERAGE_MODULE_DIR:-$PROJECT_ROOT}"
+# <<< repo-specific >>>
+
+COLLECTIONS_DIR="$POSTMAN_DIR/collections"
+ENVIRONMENT="$POSTMAN_DIR/environments/local.postman_environment.json"
+
 APP_PID_FILE="$SCRIPT_DIR/spring-boot-app.pid"
 APP_LOG_FILE="$SCRIPT_DIR/spring-boot-app.log"
 
-# Collection directories
-CRUD_COLLECTIONS_DIR="$POSTMAN_DIR/collections/crud"
-FILES_COLLECTIONS_DIR="$POSTMAN_DIR/collections/files"
-V2_COLLECTIONS_DIR="$POSTMAN_DIR/collections/v2"
-LEGACY_COLLECTIONS_DIR="$POSTMAN_DIR/collections/legacy"
-ENVIRONMENT="$POSTMAN_DIR/environments/local.postman_environment.json"
-
 # Coverage settings
 COVERAGE_DIR="$PROJECT_ROOT/coverage"
 COVERAGE_EXEC_FILE="$COVERAGE_DIR/jacoco-api-$TIMESTAMP.exec"
 
-# Multi-product configuration
-PRODUCTS="freshdesk freshservice freshworks-crm"
-declare -A PRODUCT_CONFIG=(
-    ["freshdesk_id"]="1"
-    ["freshdesk_env"]="local.postman_environment.json"
-    ["freshdesk_display"]="Freshdesk"
-    ["freshservice_id"]="3"
-    ["freshservice_env"]="local-freshservice.postman_environment.json"
-    ["freshservice_display"]="Freshservice"
-    ["freshworks-crm_id"]="39"
-    ["freshworks-crm_env"]="local-freshworks-crm.postman_environment.json"
-    ["freshworks-crm_display"]="Freshworks CRM"
-)
-
 #==============================================================================
 # STATE TRACKING
 #==============================================================================
@@ -86,77 +68,27 @@ declare -a RESULTS
 declare -A COLLECTION_STATUS
 declare -A COLLECTION_PASSED
 declare -A COLLECTION_FAILED
-declare -A PRODUCT_STATUS
-
-# Initialize collection status
-for key in V3_CRUD V3_FILES V2 LEGACY; do
-    COLLECTION_STATUS["$key"]="Not Run"
-    COLLECTION_PASSED["$key"]=0
-    COLLECTION_FAILED["$key"]=0
-done
-
-# Initialize product status
-for product in $PRODUCTS; do
-    PRODUCT_STATUS["$product"]="Not Run"
-done
 
 #==============================================================================
 # ARGUMENT PARSING
 #==============================================================================
 
-RUN_V3=false
-RUN_V2=false
-RUN_LEGACY=false
 RUN_COVERAGE=false
-MULTI_PRODUCT=false
 SKIP_SERVICES=false
 SHOW_HELP=false
-RUN_ALL=true
 
 parse_arguments() {
     for arg in "$@"; do
         case $arg in
-            --v3)
-                RUN_V3=true
-                RUN_ALL=false
-                ;;
-            --v2)
-                RUN_V2=true
-                RUN_ALL=false
-                ;;
-            --legacy)
-                RUN_LEGACY=true
-                RUN_ALL=false
-                ;;
-            --all)
-                RUN_ALL=true
-                ;;
-            --coverage)
-                RUN_COVERAGE=true
-                ;;
-            --multi-product)
-                MULTI_PRODUCT=true
-                RUN_V3=true
-                ;;
-            --skip-services)
-                SKIP_SERVICES=true
-                ;;
-            --help|-h)
-                SHOW_HELP=true
-                ;;
+            --coverage)      RUN_COVERAGE=true ;;
+            --skip-services) SKIP_SERVICES=true ;;
+            --help|-h)       SHOW_HELP=true ;;
         esac
     done
-
-    # If running all, enable all test suites
-    if [ "$RUN_ALL" = true ]; then
-        RUN_V3=true
-        RUN_V2=true
-        RUN_LEGACY=true
-    fi
 }
 
 show_help() {
-    head -32 "$0" | tail -29
+    head -19 "$0" | tail -16
     exit 0
 }
 
@@ -175,10 +107,10 @@ get_env_value() {
 parse_newman_results() {
     local output_file="$1"
     local assertions_line=$(grep "assertions" "$output_file" 2>/dev/null | head -1)
-    
+
     NEWMAN_EXECUTED=$(echo "$assertions_line" | awk -F'│' '{gsub(/[^0-9]/,"",$3); print $3}')
     NEWMAN_FAILED=$(echo "$assertions_line" | awk -F'│' '{gsub(/[^0-9]/,"",$4); print $4}')
-    
+
     NEWMAN_EXECUTED=${NEWMAN_EXECUTED:-0}
     NEWMAN_FAILED=${NEWMAN_FAILED:-0}
     NEWMAN_PASSED=$((NEWMAN_EXECUTED > 0 ? NEWMAN_EXECUTED - NEWMAN_FAILED : 0))
@@ -204,81 +136,56 @@ print_status() {
 #==============================================================================
 
 setup_java() {
-    echo "Detecting Java 11..."
+    [ -z "$JAVA_VERSION" ] && return 0
+    echo "Selecting Java $JAVA_VERSION..."
 
-    # Try SDKMAN first
+    # Try SDKMAN
     export SDKMAN_DIR="$HOME/.sdkman"
     if [ -s "$SDKMAN_DIR/bin/sdkman-init.sh" ]; then
         source "$SDKMAN_DIR/bin/sdkman-init.sh"
-        # Try to use any Java 11 version available
-        local java11=$(sdk list java 2>/dev/null | grep -o '11\.[0-9.]*-[a-z]*' | head -1)
-        if [ -n "$java11" ]; then
-            sdk use java "$java11" 2>/dev/null || true
-        fi
+        local sdk_java=$(sdk list java 2>/dev/null | grep -o "${JAVA_VERSION}\.[0-9.]*-[a-z]*" | head -1)
+        [ -n "$sdk_java" ] && sdk use java "$sdk_java" 2>/dev/null || true
     fi
 
     # Try java_home (macOS)
     if command -v /usr/libexec/java_home >/dev/null 2>&1; then
-        local java_11_home=$(/usr/libexec/java_home -v 11 2>/dev/null)
-        if [ -n "$java_11_home" ]; then
-            export JAVA_HOME="$java_11_home"
-            export PATH="$JAVA_HOME/bin:$PATH"
-        fi
-    fi
-
-    # Fallback to common installation paths
-    if [ -z "$JAVA_HOME" ] || [ ! -d "$JAVA_HOME" ]; then
-        for java_path in \
-            "/Library/Java/JavaVirtualMachines/amazon-corretto-11.jdk/Contents/Home" \
-            "$HOME/.sdkman/candidates/java/current" \
-            "/usr/lib/jvm/java-11-openjdk" \
-            "/usr/lib/jvm/java-11"; do
-            if [ -d "$java_path" ]; then
-                export JAVA_HOME="$java_path"
-                export PATH="$JAVA_HOME/bin:$PATH"
-                break
-            fi
-        done
+        local jh=$(/usr/libexec/java_home -v "$JAVA_VERSION" 2>/dev/null || true)
+        [ -n "$jh" ] && export JAVA_HOME="$jh"
     fi
 
-    # Verify Java version
-    local java_version=$(java -version 2>&1 | head -1 | grep -oE '[0-9]+' | head -1)
-    if [ "$java_version" != "11" ]; then
-        echo "Warning: Java 11 not detected. Current version: $(java -version 2>&1 | head -1)"
-        echo "Please set JAVA_HOME to Java 11 or run: export JAVA_HOME=\$(/usr/libexec/java_home -v 11)"
-    else
-        print_status "success" "Java 11 detected: $(java -version 2>&1 | head -1)"
-    fi
+    local detected=$(java -version 2>&1 | head -1)
+    echo "  Java: $detected"
 }
 
 #==============================================================================
 # SERVICE MANAGEMENT
 #==============================================================================
 
-# Source container runtime detection
-source "$SCRIPT_DIR/../infra/container-runtime.sh"
-
 start_services() {
     if [ "$SKIP_SERVICES" = true ]; then
         echo "Skipping service startup (--skip-services)"
         return 0
     fi
 
-    # Step 1: Start LocalStack
-    echo ""
-    echo "========================================="
-    echo "Step 1: Starting LocalStack"
-    echo "========================================="
-    "$SCRIPT_DIR/../infra/setup-localstack.sh" || echo "Warning: LocalStack setup issues"
+    # Step 1: LocalStack (optional — self-skips if no compose file / runtime)
+    if [ -x "$SCRIPT_DIR/../infra/setup-localstack.sh" ]; then
+        echo ""
+        echo "========================================="
+        echo "Step 1: Starting LocalStack"
+        echo "========================================="
+        "$SCRIPT_DIR/../infra/setup-localstack.sh" || echo "Warning: LocalStack setup issues"
+    fi
 
-    # Step 2: Start WireMock
-    echo ""
-    echo "========================================="
-    echo "Step 2: Starting WireMock"
-    echo "========================================="
-    "$SCRIPT_DIR/../infra/start-mocks.sh"
+    # Step 2: WireMock (optional)
+    if [ -x "$SCRIPT_DIR/../infra/start-mocks.sh" ]; then
+        echo ""
+        echo "========================================="
+        echo "Step 2: Starting WireMock"
+        echo "========================================="
+        "$SCRIPT_DIR/../infra/start-mocks.sh"
+    fi
 
-    # Step 3: Start Spring Boot
+    # Step 3: Spring Boot
     echo ""
     echo "========================================="
     echo "Step 3: Starting Spring Boot"
@@ -293,26 +200,33 @@ start_spring_boot() {
     fi
 
     cd "$PROJECT_ROOT"
-    echo "Starting Spring Boot with integration profile..."
-    
+    echo "Starting Spring Boot (profile: $SPRING_PROFILE)..."
+
     local jvm_args="-Dserver.port=$APP_PORT"
-    
+
     if [ "$RUN_COVERAGE" = true ]; then
         local jacoco_jar="$HOME/.m2/repository/org/jacoco/org.jacoco.agent/0.8.11/org.jacoco.agent-0.8.11-runtime.jar"
         if [ -f "$jacoco_jar" ]; then
             mkdir -p "$COVERAGE_DIR"
-            jvm_args="-javaagent:$jacoco_jar=destfile=$COVERAGE_EXEC_FILE,includes=com.freshworks.marketplace.installation.* $jvm_args"
+            jvm_args="-javaagent:$jacoco_jar=destfile=$COVERAGE_EXEC_FILE,includes=$COVERAGE_PACKAGE $jvm_args"
             echo "JaCoCo coverage enabled"
         else
             echo "Warning: JaCoCo agent not found. Run 'mvn dependency:resolve' first."
         fi
     fi
 
-    nohup mvn -pl installation spring-boot:run \
-        -Dspring-boot.run.profiles=integration \
+    # >>> repo-specific (set by /setup-api-tests): app start command <<<
+    # Default: `mvn spring-boot:run`. For a submodule set MAVEN_MODULE.
+    # If H2_SCOPE=test prevents spring-boot:run, replace this block with a
+    # `java -cp <test-classpath>` launch (see /setup-api-tests SKILL 2.3).
+    local module_args=""
+    [ -n "$MAVEN_MODULE" ] && module_args="-pl $MAVEN_MODULE"
+    nohup mvn $module_args spring-boot:run \
+        -Dspring-boot.run.profiles="$SPRING_PROFILE" \
         -Dspring-boot.run.jvmArguments="$jvm_args" \
         -Dmaven.test.skip=true -Dcheckstyle.skip=true \
         > "$APP_LOG_FILE" 2>&1 &
+    # <<< repo-specific >>>
 
     local app_pid=$!
     echo "$app_pid" > "$APP_PID_FILE"
@@ -320,7 +234,8 @@ start_spring_boot() {
     # Wait for startup
     local max_wait=120
     local waited=0
-    while ! curl -s "http://localhost:$APP_PORT/actuator/health" > /dev/null 2>&1; do
+    local health_url="http://localhost:$APP_PORT${CONTEXT_PATH}/actuator/health"
+    while ! curl -s "$health_url" > /dev/null 2>&1; do
         if [ $waited -ge $max_wait ]; then
             echo "Error: Application failed to start"
             tail -30 "$APP_LOG_FILE"
@@ -351,15 +266,9 @@ stop_services() {
         rm -f "$APP_PID_FILE"
     fi
 
-    # Stop WireMock
-    "$SCRIPT_DIR/../infra/stop-mocks.sh" 2>/dev/null || true
-
-    # Stop LocalStack
-    if $CONTAINER_CMD ps 2>/dev/null | grep -q mp-installation-localstack; then
-        echo "Stopping LocalStack..."
-        $CONTAINER_COMPOSE_CMD -f "$PROJECT_ROOT/docker-compose-localstack.yml" down > /dev/null 2>&1 || true
-        print_status "success" "LocalStack stopped"
-    fi
+    # Stop WireMock + LocalStack (runtime auto-detected inside the scripts)
+    [ -x "$SCRIPT_DIR/../infra/stop-mocks.sh" ]      && "$SCRIPT_DIR/../infra/stop-mocks.sh" 2>/dev/null || true
+    [ -x "$SCRIPT_DIR/../infra/stop-localstack.sh" ] && "$SCRIPT_DIR/../infra/stop-localstack.sh" 2>/dev/null || true
 
     # Generate coverage report if enabled
     generate_coverage_report
@@ -376,142 +285,60 @@ generate_coverage_report() {
     echo "========================================="
     echo "Generating Coverage Report"
     echo "========================================="
-    
+
     local coverage_html_dir="$COVERAGE_DIR/html-report-$TIMESTAMP"
     mkdir -p "$coverage_html_dir"
-    
-    cd "$PROJECT_ROOT/installation"
-    
+
+    cd "$COVERAGE_MODULE_DIR"
+
     echo "Generating JaCoCo report..."
     mvn jacoco:report -q 2>/dev/null || true
-    
+
     if [ -d "target/site/jacoco" ]; then
         cp -r target/site/jacoco/* "$coverage_html_dir/" 2>/dev/null || true
-        
         echo ""
-        echo "========================================="
-        echo "COVERAGE REPORT GENERATED"
-        echo "========================================="
-        echo "Timestamped Report: $coverage_html_dir/index.html"
-        echo "Latest Report:      installation/target/site/jacoco/index.html"
-        echo "Raw Data:           $COVERAGE_EXEC_FILE"
-        echo ""
-        echo "To view: open $coverage_html_dir/index.html"
+        echo "Coverage report: $coverage_html_dir/index.html"
     else
         echo "Warning: Coverage report generation failed"
     fi
 }
 
-#==============================================================================
-# CLEANUP FUNCTIONS
-#==============================================================================
-
-# Cleanup all installations across ALL products before running tests
-cleanup_all_installations() {
-    echo ""
-    echo "  → Cleaning up existing installations..."
-
-    local base_url="http://localhost:8080/api/v3"
-    local total_count=0
-    local product
-
-    for product in $PRODUCTS; do
-        local env_key="${product}_env"
-        local env_file="$POSTMAN_DIR/environments/${PRODUCT_CONFIG[$env_key]}"
-        
-        if [ ! -f "$env_file" ]; then
-            continue
-        fi
-        
-        local auth_token=$(get_env_value "$env_file" "auth_token")
-        local product_id=$(get_env_value "$env_file" "product_id")
-        local account_id=$(get_env_value "$env_file" "account_id")
-        
-        if [ -z "$auth_token" ]; then
-            continue
-        fi
-        
-        # List all installations (types: 1=extension, 4=bundle, 6=custom)
-        local list_response=$(curl -s -X GET "${base_url}/installations?type=1,4,6" \
-            -H "Authorization: Bearer ${auth_token}" \
-            -H "x-mp-product-id: ${product_id}" \
-            -H "x-mp-account-id: ${account_id}" \
-            -H "X-MP-USER-ROLE: admin" \
-            -H "Content-Type: application/json" 2>/dev/null)
-        
-        # Extract and delete installation IDs
-        local installation_ids=$(echo "$list_response" | python3 -c "
-import json, sys
-try:
-    data = json.load(sys.stdin)
-    if isinstance(data, list):
-        ids = [str(item.get('installed_extension_id', '')) for item in data if item.get('installed_extension_id')]
-    else:
-        ids = []
-    print(' '.join(ids))
-except:
-    print('')
-" 2>/dev/null)
-        
-        if [ -n "$installation_ids" ] && [ "$installation_ids" != "" ]; then
-            for inst_id in $installation_ids; do
-                curl -s -X DELETE "${base_url}/installations/${inst_id}" \
-                    -H "Authorization: Bearer ${auth_token}" \
-                    -H "x-mp-product-id: ${product_id}" \
-                    -H "x-mp-account-id: ${account_id}" \
-                    -H "X-MP-USER-ROLE: admin" \
-                    -H "Content-Type: application/json" >/dev/null 2>&1
-                total_count=$((total_count + 1))
-            done
-        fi
-    done
-    
-    if [ $total_count -gt 0 ]; then
-        print_status "success" "Cleaned up $total_count installation(s)"
-    else
-        print_status "success" "No existing installations to clean up"
-    fi
-    
-    sleep 1
-}
-
 #==============================================================================
 # TEST EXECUTION
 #==============================================================================
 
-# Run all collections in a directory
+# Run all collections in a directory, in filename order, chaining the env.
 run_collection_dir() {
     local dir_name="$1"
     local collections_dir="$2"
     local report_prefix="$3"
     local collection_key="$4"
-    
+
     echo "========================================="
     echo "Running: $dir_name"
     echo "========================================="
-    
+
     local dir_passed=0
     local dir_failed=0
     local all_passed=true
     local newman_tmp="/tmp/newman-output-${TIMESTAMP}-$$.txt"
-    
-    # Create working environment copy
+
     local working_env="/tmp/newman-env-${collection_key}-${TIMESTAMP}.json"
     cp "$ENVIRONMENT" "$working_env"
-    
-    # Run collections in order
+
+    shopt -s nullglob
     for collection_file in "$collections_dir"/*.json; do
         [ ! -f "$collection_file" ] && continue
-        
+
         local basename=$(basename "$collection_file" .json)
         local html_report="$REPORT_DIR/${report_prefix}-${basename}-$TIMESTAMP.html"
         local json_report="$REPORT_DIR/json/${report_prefix}-${basename}-$TIMESTAMP.json"
         local env_export="/tmp/newman-env-export-${collection_key}-${basename}.json"
-        
+
         echo ""
         echo "  → Running: $basename"
         echo ""
-        
+
         "$POSTMAN_DIR/node_modules/.bin/newman" run "$collection_file" \
             --environment "$working_env" \
             --reporters cli,htmlextra,json \
@@ -520,15 +347,15 @@ run_collection_dir() {
             --export-environment "$env_export" \
             --timeout-request 30000 \
             --delay-request 100 2>&1 | tee "$newman_tmp"
-        
+
         parse_newman_results "$newman_tmp"
-        
+
         dir_passed=$((dir_passed + NEWMAN_PASSED))
         dir_failed=$((dir_failed + NEWMAN_FAILED))
-        
+
         # Chain environment for next collection
         [ -f "$env_export" ] && cp "$env_export" "$working_env"
-        
+
         if [ "$NEWMAN_FAILED" -gt 0 ]; then
             all_passed=false
             print_status "error" "$basename: FAILED ($NEWMAN_PASSED passed, $NEWMAN_FAILED failed)"
@@ -536,11 +363,10 @@ run_collection_dir() {
             print_status "success" "$basename: PASSED ($NEWMAN_PASSED passed, $NEWMAN_FAILED failed)"
         fi
     done
-    
-    # Cleanup temp files
+    shopt -u nullglob
+
     rm -f "$working_env" /tmp/newman-env-export-${collection_key}-*.json "$newman_tmp"
-    
-    # Update status
+
     if [ "$all_passed" = true ] && [ "$dir_failed" -eq 0 ]; then
         COLLECTION_STATUS["$collection_key"]="✓ PASSED"
         RESULTS+=("$dir_name: ✓ PASSED ($dir_passed passed, $dir_failed failed)")
@@ -552,200 +378,28 @@ run_collection_dir() {
         echo ""
         print_status "error" "$dir_name: SOME FAILED"
     fi
-    
+
     COLLECTION_PASSED["$collection_key"]=$dir_passed
     COLLECTION_FAILED["$collection_key"]=$dir_failed
     TOTAL_PASSED=$((TOTAL_PASSED + dir_passed))
     TOTAL_FAILED=$((TOTAL_FAILED + dir_failed))
-    
-    [ "$all_passed" = true ] && [ "$dir_failed" -eq 0 ]
-}
-
-# Run tests for a single product (multi-product mode)
-run_product_tests() {
-    local product="$1"
-    local display_name="${PRODUCT_CONFIG[${product}_display]}"
-    local env_file="$POSTMAN_DIR/environments/${PRODUCT_CONFIG[${product}_env]}"
-    
-    echo ""
-    echo "========================================="
-    echo "Testing Product: $display_name"
-    echo "========================================="
-    
-    if [ ! -f "$env_file" ]; then
-        echo "Warning: Environment file not found: $env_file"
-        echo "Skipping $product"
-        PRODUCT_STATUS["$product"]="⚠ SKIPPED"
-        return 1
-    fi
-    
-    # Clean up installations before testing this product
-    cleanup_all_installations
-    
-    local product_passed=true
-    local newman_tmp="/tmp/newman-output-${product}-${TIMESTAMP}-$$.txt"
-
-    # Each product gets its own report subdirectory to avoid cross-product overwrites
-    local product_report_dir="$REPORT_DIR/${product}"
-    local product_json_dir="$REPORT_DIR/json/${product}"
-    mkdir -p "$product_report_dir" "$product_json_dir"
-
-    # Create working environment copy
-    local working_env="/tmp/newman-env-${product}-${TIMESTAMP}.json"
-    cp "$env_file" "$working_env"
-
-    # Run CRUD tests
-    local crud_key="${product}_CRUD"
-    COLLECTION_STATUS["$crud_key"]="Not Run"
-    COLLECTION_PASSED["$crud_key"]=0
-    COLLECTION_FAILED["$crud_key"]=0
-
-    echo ""
-    echo "Running CRUD API tests for $display_name..."
-
-    local crud_passed=0 crud_failed=0 crud_all_passed=true
-
-    for collection_file in "$CRUD_COLLECTIONS_DIR"/*.json; do
-        [ ! -f "$collection_file" ] && continue
-
-        local basename=$(basename "$collection_file" .json)
-        local html_report="$product_report_dir/crud-${basename}-$TIMESTAMP.html"
-        local json_report="$product_json_dir/crud-${basename}-$TIMESTAMP.json"
-        local env_export="/tmp/newman-env-export-${product}-crud-${basename}.json"
-        
-        "$POSTMAN_DIR/node_modules/.bin/newman" run "$collection_file" \
-            --environment "$working_env" \
-            --reporters cli,htmlextra,json \
-            --reporter-htmlextra-export "$html_report" \
-            --reporter-htmlextra-title "${REPORT_LOGO} - $display_name - CRUD - $basename (Local)" \
-            --reporter-htmlextra-darkTheme \
-            --reporter-json-export "$json_report" \
-            --export-environment "$env_export" \
-            --timeout-request 30000 \
-            --delay-request 100 2>&1 | tee "$newman_tmp"
-        
-        parse_newman_results "$newman_tmp"
-        
-        crud_passed=$((crud_passed + NEWMAN_PASSED))
-        crud_failed=$((crud_failed + NEWMAN_FAILED))
-        
-        [ -f "$env_export" ] && cp "$env_export" "$working_env"
-        [ "$NEWMAN_FAILED" -gt 0 ] && crud_all_passed=false
-    done
-    
-    if [ "$crud_all_passed" = true ] && [ "$crud_failed" -eq 0 ]; then
-        print_status "success" "CRUD tests passed for $display_name"
-        COLLECTION_STATUS["$crud_key"]="✓ PASSED"
-    else
-        print_status "error" "CRUD tests failed for $display_name"
-        COLLECTION_STATUS["$crud_key"]="✗ FAILED"
-        product_passed=false
-    fi
-    
-    COLLECTION_PASSED["$crud_key"]=$crud_passed
-    COLLECTION_FAILED["$crud_key"]=$crud_failed
-    TOTAL_PASSED=$((TOTAL_PASSED + crud_passed))
-    TOTAL_FAILED=$((TOTAL_FAILED + crud_failed))
-    
-    # Run Files tests (using environment from CRUD tests)
-    local files_key="${product}_FILES"
-    COLLECTION_STATUS["$files_key"]="Not Run"
-    COLLECTION_PASSED["$files_key"]=0
-    COLLECTION_FAILED["$files_key"]=0
-    
-    echo ""
-    echo "Running Files API tests for $display_name..."
-    
-    local files_passed=0 files_failed=0 files_all_passed=true
-    
-    for collection_file in "$FILES_COLLECTIONS_DIR"/*.json; do
-        [ ! -f "$collection_file" ] && continue
-        
-        local basename=$(basename "$collection_file" .json)
-        local html_report="$product_report_dir/files-${basename}-$TIMESTAMP.html"
-        local json_report="$product_json_dir/files-${basename}-$TIMESTAMP.json"
-        local env_export="/tmp/newman-env-export-${product}-files-${basename}.json"
-        
-        "$POSTMAN_DIR/node_modules/.bin/newman" run "$collection_file" \
-            --environment "$working_env" \
-            --reporters cli,htmlextra,json \
-            --reporter-htmlextra-export "$html_report" \
-            --reporter-htmlextra-title "${REPORT_LOGO} - $display_name - Files - $basename (Local)" \
-            --reporter-htmlextra-darkTheme \
-            --reporter-json-export "$json_report" \
-            --export-environment "$env_export" \
-            --timeout-request 30000 \
-            --delay-request 100 2>&1 | tee "$newman_tmp"
-        
-        parse_newman_results "$newman_tmp"
-        
-        files_passed=$((files_passed + NEWMAN_PASSED))
-        files_failed=$((files_failed + NEWMAN_FAILED))
-        
-        [ -f "$env_export" ] && cp "$env_export" "$working_env"
-        [ "$NEWMAN_FAILED" -gt 0 ] && files_all_passed=false
-    done
-    
-    # Cleanup temp files for this product
-    rm -f "$working_env" /tmp/newman-env-export-${product}-*.json "$newman_tmp"
-    
-    if [ "$files_all_passed" = true ] && [ "$files_failed" -eq 0 ]; then
-        print_status "success" "Files tests passed for $display_name"
-        COLLECTION_STATUS["$files_key"]="✓ PASSED"
-    else
-        print_status "error" "Files tests failed for $display_name"
-        COLLECTION_STATUS["$files_key"]="✗ FAILED"
-        product_passed=false
-    fi
-    
-    COLLECTION_PASSED["$files_key"]=$files_passed
-    COLLECTION_FAILED["$files_key"]=$files_failed
-    TOTAL_PASSED=$((TOTAL_PASSED + files_passed))
-    TOTAL_FAILED=$((TOTAL_FAILED + files_failed))
-    
-    # Update product status
-    if [ "$product_passed" = true ]; then
-        PRODUCT_STATUS["$product"]="✓ PASSED"
-    else
-        PRODUCT_STATUS["$product"]="✗ FAILED"
-    fi
 }
 
 run_tests() {
     echo ""
-    
-    if [ "$MULTI_PRODUCT" = true ]; then
-        # Multi-product mode: run V3 (CRUD + Files) across all products
-        for product in $PRODUCTS; do
-            run_product_tests "$product"
-        done
-        # Also run V2 and Legacy once (single-product) if --all was specified
-        if [ "$RUN_V2" = true ]; then
-            run_collection_dir "V2 API" "$V2_COLLECTIONS_DIR" "v2" "V2" || true
-            echo ""
-        fi
-        if [ "$RUN_LEGACY" = true ]; then
-            run_collection_dir "Legacy API" "$LEGACY_COLLECTIONS_DIR" "legacy" "LEGACY" || true
-            echo ""
-        fi
+    # Generic single-suite run. Repos with versioned suites or multi-product
+    # testing extend this via /setup-api-tests (see the optional add-on section).
+    if compgen -G "$COLLECTIONS_DIR/*.json" >/dev/null 2>&1; then
+        run_collection_dir "API" "$COLLECTIONS_DIR" "api" "API" || true
     else
-        # Single product mode
-        if [ "$RUN_V3" = true ]; then
-            run_collection_dir "V3 CRUD API" "$CRUD_COLLECTIONS_DIR" "crud" "V3_CRUD" || true
-            echo ""
-            run_collection_dir "V3 Files API" "$FILES_COLLECTIONS_DIR" "files" "V3_FILES" || true
+        # Each immediate subdirectory of collections/ is a suite.
+        shopt -s nullglob
+        for suite_dir in "$COLLECTIONS_DIR"/*/; do
+            local suite=$(basename "$suite_dir")
+            run_collection_dir "$suite" "${suite_dir%/}" "$suite" "$suite" || true
             echo ""
-        fi
-
-        if [ "$RUN_V2" = true ]; then
-            run_collection_dir "V2 API" "$V2_COLLECTIONS_DIR" "v2" "V2" || true
-            echo ""
-        fi
-
-        if [ "$RUN_LEGACY" = true ]; then
-            run_collection_dir "Legacy API" "$LEGACY_COLLECTIONS_DIR" "legacy" "LEGACY" || true
-            echo ""
-        fi
+        done
+        shopt -u nullglob
     fi
 }
 
@@ -756,49 +410,14 @@ run_tests() {
 print_summary() {
     echo ""
     echo "========================================="
-    if [ "$MULTI_PRODUCT" = true ]; then
-        echo "Multi-Product Test Results"
-    else
-        echo "Test Results Summary"
-    fi
+    echo "Test Results Summary"
     echo "========================================="
     echo ""
-
-    if [ "$MULTI_PRODUCT" = true ]; then
-        echo "Product Results:"
-        for product in $PRODUCTS; do
-            local status="${PRODUCT_STATUS[$product]}"
-            local display_name="${PRODUCT_CONFIG[${product}_display]}"
-            local crud_key="${product}_CRUD"
-            local files_key="${product}_FILES"
-            
-            if [ "$status" != "Not Run" ]; then
-                echo "  $display_name: $status"
-                if [ "${COLLECTION_STATUS[$crud_key]}" != "Not Run" ]; then
-                    echo "    - CRUD API:  ${COLLECTION_STATUS[$crud_key]} (${COLLECTION_PASSED[$crud_key]} passed, ${COLLECTION_FAILED[$crud_key]} failed)"
-                fi
-                if [ "${COLLECTION_STATUS[$files_key]}" != "Not Run" ]; then
-                    echo "    - Files API: ${COLLECTION_STATUS[$files_key]} (${COLLECTION_PASSED[$files_key]} passed, ${COLLECTION_FAILED[$files_key]} failed)"
-                fi
-            fi
-        done
-    else
-        echo "Collection Results:"
-        for collection_key in V3_CRUD V3_FILES V2 LEGACY; do
-            local status="${COLLECTION_STATUS[$collection_key]}"
-            local passed="${COLLECTION_PASSED[$collection_key]}"
-            local failed="${COLLECTION_FAILED[$collection_key]}"
-            
-            if [ "$status" != "Not Run" ]; then
-                case $collection_key in
-                    V3_CRUD)  echo "  V3 CRUD API:  $status ($passed passed, $failed failed)" ;;
-                    V3_FILES) echo "  V3 Files API: $status ($passed passed, $failed failed)" ;;
-                    V2)       echo "  V2 API:       $status ($passed passed, $failed failed)" ;;
-                    LEGACY)   echo "  Legacy API:   $status ($passed passed, $failed failed)" ;;
-                esac
-            fi
-        done
-    fi
+    echo "Collection Results:"
+    local key
+    for key in "${!COLLECTION_STATUS[@]}"; do
+        echo "  $key: ${COLLECTION_STATUS[$key]} (${COLLECTION_PASSED[$key]} passed, ${COLLECTION_FAILED[$key]} failed)"
+    done
 
     echo ""
     echo "Overall Total: $TOTAL_PASSED passed, $TOTAL_FAILED failed"
@@ -807,27 +426,16 @@ print_summary() {
 }
 
 generate_consolidated_report() {
-    # Calculate passed/failed collections
     local passed_collections=0
     local failed_collections=0
-    
-    if [ "$MULTI_PRODUCT" = true ]; then
-        for product in $PRODUCTS; do
-            if [ "${PRODUCT_STATUS[$product]}" = "✓ PASSED" ]; then
-                passed_collections=$((passed_collections + 1))
-            elif [ "${PRODUCT_STATUS[$product]}" != "Not Run" ]; then
-                failed_collections=$((failed_collections + 1))
-            fi
-        done
-    else
-        for collection_key in V3_CRUD V3_FILES V2 LEGACY; do
-            if [ "${COLLECTION_STATUS[$collection_key]}" = "✓ PASSED" ]; then
-                passed_collections=$((passed_collections + 1))
-            elif [ "${COLLECTION_STATUS[$collection_key]}" != "Not Run" ]; then
-                failed_collections=$((failed_collections + 1))
-            fi
-        done
-    fi
+    local key
+    for key in "${!COLLECTION_STATUS[@]}"; do
+        if [ "${COLLECTION_STATUS[$key]}" = "✓ PASSED" ]; then
+            passed_collections=$((passed_collections + 1))
+        else
+            failed_collections=$((failed_collections + 1))
+        fi
+    done
 
     local test_result=0
     [ $TOTAL_FAILED -gt 0 ] && test_result=1
@@ -844,83 +452,49 @@ generate_consolidated_report() {
 
 main() {
     parse_arguments "$@"
-    
+
     [ "$SHOW_HELP" = true ] && show_help
-    
-    # Display banner
+
     echo "========================================="
-    if [ "$MULTI_PRODUCT" = true ]; then
-        echo "${REPORT_LOGO} API Integration Tests (Multi-Product)"
-    else
-        echo "${REPORT_LOGO} API Integration Tests"
-    fi
+    echo "${REPORT_LOGO} API Integration Tests (Local)"
     echo "========================================="
     echo ""
-    
-    if [ "$MULTI_PRODUCT" = true ]; then
-        echo "Mode: Multi-Product Testing (Local)"
-        echo "Products:"
-        for product in $PRODUCTS; do
-            local display="${PRODUCT_CONFIG[${product}_display]}"
-            local id="${PRODUCT_CONFIG[${product}_id]}"
-            echo "  - $display (product_id: $id)"
-        done
-        echo ""
-        echo "Test Suites: V3 API (CRUD + Files) for each product"
-    else
-        echo "Test Suites:"
-        [ "$RUN_V3" = true ] && echo "  ✓ V3 API (CRUD + Files)"
-        [ "$RUN_V2" = true ] && echo "  ✓ V2 API (OAuth, Transfer)"
-        [ "$RUN_LEGACY" = true ] && echo "  ✓ Legacy API"
-    fi
-    [ "$RUN_COVERAGE" = true ] && echo "  ✓ Coverage: Enabled"
+    [ "$RUN_COVERAGE" = true ]  && echo "  ✓ Coverage: Enabled"
     [ "$SKIP_SERVICES" = true ] && echo "  ⚠ Services: Skipped (--skip-services)"
     echo ""
-    
-    # Setup
+
     setup_java
-    
+
     echo ""
     echo "Checking prerequisites..."
     command -v java >/dev/null 2>&1 || { echo "Error: Java required" >&2; exit 1; }
-    command -v mvn >/dev/null 2>&1 || { echo "Error: Maven required" >&2; exit 1; }
+    command -v mvn  >/dev/null 2>&1 || { echo "Error: Maven required" >&2; exit 1; }
     command -v node >/dev/null 2>&1 || { echo "Error: Node.js required" >&2; exit 1; }
-    check_container_runtime || exit 1
     print_status "success" "Prerequisites OK"
-    
-    # Setup cleanup trap
+
     trap stop_services EXIT INT TERM
-    
-    # Start services
+
     start_services
-    
-    # Install Newman and setup git hooks
+
     echo ""
     echo "========================================="
-    echo "Step 4: Installing Newman"
+    echo "Installing Newman"
     echo "========================================="
     cd "$POSTMAN_DIR"
     npm ci --ignore-scripts --silent 2>/dev/null || npm install --ignore-scripts --silent
     print_status "success" "Newman ready"
-    
-    # Setup git hooks for auto-formatting (runs once, idempotent)
+
     if [ -d "$POSTMAN_DIR/.husky" ]; then
         cd "$PROJECT_ROOT"
         git config core.hooksPath postman/.husky/_ 2>/dev/null || true
     fi
-    
+
     mkdir -p "$REPORT_DIR" "$REPORT_DIR/json"
-    
-    # Run tests
+
     run_tests
-    
-    # Print summary
     print_summary
-    
-    # Generate consolidated report
     generate_consolidated_report
-    
-    # Exit with appropriate code
+
     if [ $TOTAL_FAILED -gt 0 ]; then
         echo ""
         echo "❌ Some tests failed"
@@ -932,5 +506,4 @@ main() {
     fi
 }
 
-# Run main
 main "$@"