fix: Fix load generator not completing orders (#915)

Author: niallthomson

.github/workflows/e2e-test.yml

@@ -53,18 +53,11 @@ jobs:
         shell: devenv shell bash -- -e {0}
         run: |
           cd src/load-generator
-          bash scripts/run-docker.sh -n app_default -t 'http://ui:8080' -d 30 -o /tmp/test.json
-
-          result=$(jq '.aggregate.counters."vusers.failed" == 0' /tmp/test.json)
-
-          if [ "$result" = "false" ]; then
-            echo "Check failed: vusers.failed is not 0"
-            exit 1
-          fi
+          bash scripts/run-test.sh
       - name: Compose down
         shell: devenv shell bash -- -e {0}
         run: |
-          DB_PASSWORD='test123' yarn nx compose:up
+          DB_PASSWORD='test123' yarn nx compose:down
 
   kubernetes:
     name: Kubernetes E2E Tests

src/load-generator/README.md

@@ -11,7 +11,7 @@ A convenience script is provided to make it easier to run the load generator on
 Run the following command for usage instructions:
 
 ```bash
-bash scripts/run.sh --help
+bash scripts/run-docker.sh --help
 ```
 
 ### Kubernetes
@@ -40,7 +40,7 @@ spec:
       mountPath: /scripts
   initContainers:
   - name: setup
-    image: public.ecr.aws/aws-containers/retail-store-sample-utils:load-gen.0.3.0
+    image: public.ecr.aws/aws-containers/retail-store-sample-utils:load-gen.1.2.1 <!-- x-release-please-version -->
     command:
     - bash
     args:

src/load-generator/scenario.yml

@@ -35,13 +35,13 @@ scenarios:
             streetAddress: 100 Main Street
             city: Anytown
             state: CA
-            zip: 11111
+            zipCode: 11111
       - post:
           url: "/checkout/delivery"
           form:
             token: priority-mail
       - post:
-          url: "/checkout/confirm"
+          url: "/checkout/payment"
           form:
             cardHolder: John Doe
             cardNumber: "1234567890123456"

src/load-generator/scripts/run-test.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+set -e
+
+script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P)
+
+outfile=$(mktemp)
+
+bash $script_dir/run-docker.sh -n app_default -t 'http://ui:8080' -d 30 -o $outfile
+
+result=$(jq '.aggregate.counters."vusers.failed" == 0' $outfile)
+
+if [ "$result" = "false" ]; then
+  echo "Check failed: vusers.failed is not 0"
+  exit 1
+fi
+
+result_200=$(jq '(.aggregate.counters."http.codes.200" // 0) > 0' $outfile)
+
+if [ "$result_200" = "false" ]; then
+  echo "Check failed: http.codes.200 is 0"
+  exit 1
+fi
+
+result_404=$(jq '(.aggregate.counters."http.codes.404" // 0) == 0' $outfile)
+
+if [ "$result_404" = "false" ]; then
+  echo "Check failed: http.codes.404 is not 0"
+  exit 1
+fi