tweak: Remove unused variants in insecure-bank, tidy k6 .sh commands

Author: ddyurchenko

benchmark/load/insecure-bank/k6.js

@@ -20,15 +20,6 @@ const variants = {
   "iast_FULL": {
     "APP_URL": 'http://localhost:8085',
   },
-  "iast_INACTIVE": {
-    "APP_URL": 'http://localhost:8086',
-  },
-  "iast_TELEMETRY_OFF": {
-    "APP_URL": 'http://localhost:8087',
-  },
-  "iast_HARDCODED_SECRET_DISABLED": {
-    "APP_URL": 'http://localhost:8088',
-  },
 }
 
 export const options = function (variants) {

benchmark/load/insecure-bank/start-servers.sh

@@ -24,8 +24,5 @@ start_server "profiling" "-javaagent:${TRACER} -Ddd.profiling.enabled=true -Dser
 start_server "iast" "-javaagent:${TRACER} -Ddd.iast.enabled=true -Dserver.port=8083" "taskset -c 44 " &
 start_server "iast_GLOBAL" "-javaagent:${TRACER} -Ddd.iast.enabled=true -Ddd.iast.context.mode=GLOBAL -Dserver.port=8084" "taskset -c 43 " &
 start_server "iast_FULL" "-javaagent:${TRACER} -Ddd.iast.enabled=true -Ddd.iast.detection.mode=FULL -Dserver.port=8085" "taskset -c 42 " &
-start_server "iast_INACTIVE" "-javaagent:${TRACER} -Ddd.iast.enabled=inactive -Dserver.port=8086" "taskset -c 41 " &
-start_server "iast_TELEMETRY_OFF" "-javaagent:${TRACER} -Ddd.iast.enabled=true -Ddd.iast.telemetry.verbosity=OFF -Dserver.port=8087" "taskset -c 40 " &
-start_server "iast_HARDCODED_SECRET_DISABLED" "-javaagent:${TRACER} -Ddd.iast.enabled=true -Ddd.iast.hardcoded-secret.enabled=false -Dserver.port=8088" "taskset -c 39 " &
 
 wait

benchmark/load/run.sh

@@ -55,19 +55,21 @@ for app in *; do
   for i in $(seq 1 $REPETITIONS_COUNT); do
     bash -c "${UTILS_DIR}/../${type}/${app}/start-servers.sh" &
 
+    echo "Waiting for serves to start..."
     if [ "${app}" == "petclinic" ]; then
       for port in $(seq 8080 8085); do
         healthcheck http://localhost:$port
       done
     elif [ "${app}" == "insecure-bank" ]; then
-      for port in $(seq 8080 8088); do
+      for port in $(seq 8080 8085); do
         healthcheck http://localhost:$port/login
       done
     fi
+    echo "Servers are up!"
 
     (
       cd ${app} &&
-      bash -c "${CPU_AFFINITY_K6}${UTILS_DIR}/run-k6-load-test.sh ${HEALTHCHECK_URL} 'pkill java'"
+      bash -c "${CPU_AFFINITY_K6}${UTILS_DIR}/run-k6-load-test.sh 'pkill java'"
     )
   done
 

benchmark/utils/run-k6-load-test.sh

@@ -1,8 +1,7 @@
 #!/usr/bin/env bash
 set -eu
 
-url=$1
-command=$2
+command=$1
 exit_code=0
 
 cleanup() {
@@ -13,16 +12,10 @@ cleanup() {
 
 trap cleanup EXIT ERR INT TERM
 
-echo "Waiting for the HTTP server on ${url} to be up"
-while true; do
-  if [[ $(curl -fso /dev/null -w "%{http_code}" "${url}") = 200 ]]; then
-    break
-  fi
-done
-echo "Server is up! Starting k6 load test, log is in ${LOGS_DIR}/k6.log..."
+echo "Starting k6 load test, logs are recorded into ${LOGS_DIR}/k6.log..."
 
 # run the k6 benchmark and store the result as JSON
 k6 run k6.js --out "json=${OUTPUT_DIR}/k6_$(date +%s).json" > "${LOGS_DIR}/k6.log" 2>&1
 exit_code=$?
 
-echo "k6 load test done!"
+echo "k6 load test done !!!"