Merged in feature/testingopts (pull request #129)

Testing Options and Clean Up

* bitsandbobs

* lint

* healthchecks

* imgintests

* singlegenerate

* testclean

* network

* networkclean

* cmds

scripts/tests.yml

@@ -10,62 +10,42 @@ vars:
   API: "./api/..."
   PKG: "./pkg/..."
   CMD: "./cmd/..."
-  UNIT_PARALLEL: 32
-  E2E_PARALLEL: 1
+  TEST_PARALLEL: 32
   # yamllint disable-line rule:line-length
   EXCLUDED_FILES: ".gen.go|internal/serviceconfig/observability/prometheus/generator/main.go|internal/cognitoauth/middleware.go|internal/cognitoauth/token.go|internal/cognitoauth/auth.go|internal/cognitoauth/handler.go|internal/cognitoauth/models.go|api/queryAPI/authHandlers.go|api/queryAPI/homehandler.go"
 
-includes:
-  docker:
-    dir: "{{.CONTEXT}}"
-    taskfile: docker.yml
-    internal: true
-
 tasks:
   mocks:generate:
     run: once
     cmds:
       - rm -rf mocks/*
       - go tool mockery
-  unit:cmd:
-    internal: true
-    vars:
-      SKIP_GENERATE: false
+  functional:
     cmds:
-      - task: mocks:generate
       - mkdir -p {{.OUT_DIR}}
       - |
-        go test -parallel {{.UNIT_PARALLEL}} \
-          {{.INTERNAL}} {{.API}} {{.CLI_ARGS}}
-  unit:short:
-    cmds:
-      - task: unit:cmd
-        vars:
-          CLI_ARGS: -short
-          SKIP_GENERATE: true
-  unit:aws:
-    cmds:
-      - |
-        find ./internal -name "*.aws_test.go" -exec dirname {} \; | sort -u \
-        | xargs go test -short -tags aws
-  unit:
+        go test -count=1 -parallel {{.TEST_PARALLEL}} \
+        -coverpkg={{.INTERNAL}},{{.API}},{{.PKG}} \
+        -coverprofile={{.COVERAGE_FILE}} \
+        ./...
+      - task: coverage
+  bench:
     vars:
       TMP_FILE: "{{.OUT_DIR}}/coverage.tmp"
       FILTER_COVERAGE_FILE: "{{.OUT_DIR}}/filtered_coverage.out"
     cmds:
-      - task: unit:cmd
-        vars:
-          CLI_ARGS: |
-            -coverpkg={{.INTERNAL}},{{.API}} \
-            -coverprofile={{.COVERAGE_FILE}}
-      - task: coverage
-    silent: true
-  endtoend:
+      - go test -run ^Benchmark -bench=. ./... > {{.BENCH_FILE}}
+      - benchstat {{.BENCH_FILE}}
+  unit:short:
     deps:
-      - docker:build
+      - mocks:generate
     cmds:
-      - go test -count=1 -parallel {{.E2E_PARALLEL}} ./test/...
+      - mkdir -p {{.OUT_DIR}}
+      - |
+        go test -parallel {{.TEST_PARALLEL}} -short \
+          {{.INTERNAL}} {{.API}} {{.CLI_ARGS}}
   coverage:
+    internal: true
     vars:
       TMP_FILE: "{{.OUT_DIR}}/coverage.tmp"
       FILTER_COVERAGE_FILE: "{{.OUT_DIR}}/filtered_coverage.out"
@@ -107,19 +87,3 @@ tasks:
         fi
 
         echo "✅ All coverage checks passed!"
-  all:
-    cmds:
-      - mkdir -p {{.OUT_DIR}}
-      - |
-        go test -count=1 -parallel {{.UNIT_PARALLEL}} \
-        -coverpkg={{.INTERNAL}},{{.API}},{{.PKG}} \
-        -coverprofile={{.COVERAGE_FILE}} \
-        ./...
-      - task: coverage
-  bench:
-    vars:
-      TMP_FILE: "{{.OUT_DIR}}/coverage.tmp"
-      FILTER_COVERAGE_FILE: "{{.OUT_DIR}}/filtered_coverage.out"
-    cmds:
-      - go test -run ^Benchmark -bench=. ./... > {{.BENCH_FILE}}
-      - benchstat {{.BENCH_FILE}}