Merged in feature/ecr (pull request #159)

Test

* tests

* tar

* go

* tmp

* test

* go

* go

* go

* config

* goup

* versioning

* order

* cleanup

* git

* smallopts

* flags

* lessisgood

* go

* order

* ordermatters

* order

* cc

* test

scripts/Taskfile.yml

@@ -26,14 +26,14 @@ includes:
 tasks:
   fullsuite:
     - task: build:deps
-    - task: build
-    - task: fullsuite:test
-  fullsuite:test:
+    - task: fullsuite:build
+    - task: test:functional
+  fullsuite:build:
     internal: true
     deps:
-      - task: test:functional
+      - task: build
       - task: lint
-  graph: psrecord "task fullsuite" --plot out/fullsuite.png --interval 0.1 --include-children
+  fullsuite:graph: psrecord "task fullsuite" --plot out/fullsuite.png --interval 0.1 --include-children
   precommit:
     - task: lint
   deps:tidy:
@@ -46,6 +46,7 @@ tasks:
       task: docker:build
   build:deps:
     internal: true
+    run: once
     cmds:
       - task: deps:tidy
       - task: generate

scripts/docker.yml

@@ -5,6 +5,10 @@ version: "3"
 
 vars:
   DOCKERFILE: "build/Dockerfile"
+  GIT_VERSION:
+    sh: git describe --tags --always --dirty
+  GIT_COMMIT:
+    sh: git rev-parse HEAD
 
 tasks:
   lint:
@@ -12,5 +16,8 @@ tasks:
       - hadolint {{.DOCKERFILE}} -t none
   build:
     run: once
-    cmds:
-      - docker build -t {{.IMAGE_NAME}} -f {{.DOCKERFILE}} .
+    cmd: |
+      docker build \
+        --build-arg "GIT_VERSION={{.GIT_VERSION}}" \
+        --build-arg "GIT_COMMIT={{.GIT_COMMIT}}" \
+        -t {{.IMAGE_NAME}} -f {{.DOCKERFILE}} .

scripts/tests.yml

@@ -25,10 +25,16 @@ vars:
       else
         echo "4"  # Default fallback value
       fi
-  TEST_PARALLEL:
+  THREAD_PARALLEL:
+    sh: echo $(( {{.CPU_COUNT}} * 2 ))
+  PKG_PARALLEL:
     sh: echo $(( {{.CPU_COUNT}} ))
+  TEST_PARALLEL:
+    sh: echo $(( {{.CPU_COUNT}} * 4 ))
   # 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"
+  # yamllint disable-line rule:line-length
+  TESTS: "./internal/database/repository ./test ./test/queryAPI ./test/... ./internal/serviceconfig/queue ./internal/server/... ./..."
 
 tasks:
   mocks:generate:
@@ -40,14 +46,28 @@ tasks:
     - mkdir -p {{.OUT_DIR}}
     - task: wait
     - |
-      GOMAXPROCS={{.TEST_PARALLEL}} go test -parallel {{.CPU_COUNT}} \
+      GOMAXPROCS={{.THREAD_PARALLEL}} go test \
+      -p {{.PKG_PARALLEL}} -parallel {{.TEST_PARALLEL}} \
       -coverpkg={{.INTERNAL}},{{.API}},{{.PKG}} \
-      -coverprofile={{.COVERAGE_FILE}} \
-      ./...
+      -coverprofile={{.COVERAGE_FILE}} {{.TESTS}}
     - task: coverage
-  race: GOMAXPROCS={{.TEST_PARALLEL}} go test -parallel {{.CPU_COUNT}} -race ./...
-  graph: psrecord "task test:functional" --plot out/test.png --interval 0.1 --include-children
-  wait: docker wait $(docker ps -q --filter "label=org.testcontainers.ryuk=true") 2>/dev/null || true
+  race:
+    - task: wait
+    - go test -race {{.TESTS}}
+  graph:
+    - task: wait
+    - psrecord "task test:functional" --plot out/test.png --interval 0.1 --include-children
+  timeline: |
+    GOMAXPROCS={{.THREAD_PARALLEL}} go test \
+    -p {{.PKG_PARALLEL}} -parallel {{.TEST_PARALLEL}} \
+    -json -count=1 {{.TESTS}} | go run github.com/roblaszczak/vgt@latest
+  wait:
+    cmds:
+      - docker wait $(docker ps -q --filter "label=org.testcontainers.ryuk=true") 2>/dev/null || true
+      - task: prune
+  prune:
+    - docker container prune -f
+    - docker volume prune -f
   mem:
     vars:
       NUM_RESULTS: 5
@@ -137,6 +157,7 @@ tasks:
     vars:
       NUM_RESULTS: 5
     cmds:
+      - task: wait
       - |
         GOMAXPROCS={{.TEST_PARALLEL}} go test -parallel {{.CPU_COUNT}} -count=1 -json ./... \
         > {{.TEST_FILE}}
@@ -162,6 +183,7 @@ tasks:
       TMP_FILE: "{{.OUT_DIR}}/coverage.tmp"
       FILTER_COVERAGE_FILE: "{{.OUT_DIR}}/filtered_coverage.out"
     cmds:
+      - task: wait
       - go test -run ^Benchmark -bench=. ./... > {{.BENCH_FILE}}
       - benchstat {{.BENCH_FILE}}
   unit:short:
@@ -169,6 +191,7 @@ tasks:
       - mocks:generate
     cmds:
       - mkdir -p {{.OUT_DIR}}
+      - task: wait
       - |
         go test -parallel {{.TEST_PARALLEL}} -short \
           {{.INTERNAL}} {{.API}} {{.CLI_ARGS}}