Merged in feature/testingopts (pull request #129)

Testing Options and Clean Up

* bitsandbobs

* lint

* healthchecks

* imgintests

* singlegenerate

* testclean

* network

* networkclean

* cmds

scripts/local-deployments.yml

@@ -4,10 +4,10 @@
 version: "3"
 
 vars:
-  LOCAL_COMPOSE_FILE: "deployments/compose.local.yaml"
-  TEST_COMPOSE_FILE: "deployments/compose.test.yaml"
-  GENERATE_COMPOSE_FILE: "deployments/compose.generate.yaml"
-  AWS_COMPOSE_FILE: "deployments/compose.aws.yaml"
+  LOCAL_COMPOSE_FILE: "{{.CONTEXT}}/deployments/compose.local.yaml"
+  TEST_COMPOSE_FILE: "{{.CONTEXT}}/deployments/compose.test.yaml"
+  GENERATE_COMPOSE_FILE: "{{.CONTEXT}}/deployments/compose.generate.yaml"
+  AWS_COMPOSE_FILE: "{{.CONTEXT}}/deployments/compose.aws.yaml"
 
 tasks:
   build:test:
@@ -38,10 +38,9 @@ tasks:
           COMPOSE_FILE: "{{.TEST_COMPOSE_FILE}}"
   up:generate:
     run: once
-    cmds:
-      - task: up:cmd
-        vars:
-          COMPOSE_FILE: "{{.GENERATE_COMPOSE_FILE}}"
+    cmd: |
+      docker compose -f {{.GENERATE_COMPOSE_FILE}} up \
+      --force-recreate --renew-anon-volumes --wait -d
   up:aws:
     cmds:
       - task deps:tidy
@@ -67,6 +66,7 @@ tasks:
       - task: up:cmd
       - task: init
   init:
+    internal: true
     cmds:
       - aws s3 mb s3://$BUCKET_IN
       - aws sqs create-queue --queue-name $QNAME_STORE_EVENT
@@ -93,11 +93,6 @@ tasks:
       - task: down
         vars:
           COMPOSE_FILE: "{{.TEST_COMPOSE_FILE}}"
-  down:generate:
-    cmds:
-      - task: down
-        vars:
-          COMPOSE_FILE: "{{.GENERATE_COMPOSE_FILE}}"
   down:aws:
     cmds:
       - task: down
@@ -108,37 +103,39 @@ tasks:
       COMPOSE_FILE: "{{.COMPOSE_FILE | default .LOCAL_COMPOSE_FILE}}"
     cmds:
       - docker compose -f {{.COMPOSE_FILE}} down
+  clean:
+    vars:
+      COMPOSE_FILE: "{{.COMPOSE_FILE | default .LOCAL_COMPOSE_FILE}}"
+    cmds:
+      - docker compose -f {{.COMPOSE_FILE}} down -v
   clean:test:
     cmds:
-      - task: down:test
-      - docker volume rm -f deployments_test-db-data
-  clean:generate:
-    run: once
-    cmds:
-      - task: down:generate
-      - docker volume rm -f deployments_generate-db-data
+      - task: clean
+        vars:
+          COMPOSE_FILE: "{{.TEST_COMPOSE_FILE}}"
   clean:aws:
     run: once
     cmds:
-      - task: down:aws
-      - docker volume rm -f deployments_aws-db-data
-  clean:
+      - task: clean
+        vars:
+          COMPOSE_FILE: "{{.AWS_COMPOSE_FILE}}"
+  lint:cmd:
+    internal: true
+    vars:
+      COMPOSE_FILE: "{{.COMPOSE_FILE | default .LOCAL_COMPOSE_FILE}}"
     cmds:
-      - task: down
-      - docker volume rm -f deployments_db-data
+      - docker compose -f {{.COMPOSE_FILE}} config -q
   lint:
-    cmds:
-      - docker compose -f {{.LOCAL_COMPOSE_FILE}} config -q
-      - |
-        docker compose -f {{.TEST_COMPOSE_FILE}} config -q \
-        --resolve-image-digests
-      - |
-        docker compose -f {{.GENERATE_COMPOSE_FILE}} config -q \
-        --resolve-image-digests
-      - docker compose -f {{.AWS_COMPOSE_FILE}} config -q
-  lint:short:
-    cmds:
-      - docker compose -f {{.LOCAL_COMPOSE_FILE}} config -q
-      - docker compose -f {{.TEST_COMPOSE_FILE}} config -q
-      - docker compose -f {{.GENERATE_COMPOSE_FILE}} config -q
-      - docker compose -f {{.AWS_COMPOSE_FILE}} config -q
+    deps:
+      - task: lint:cmd
+        vars:
+          COMPOSE_FILE: "{{.AWS_COMPOSE_FILE}}"
+      - task: lint:cmd
+        vars:
+          COMPOSE_FILE: "{{.LOCAL_COMPOSE_FILE}}"
+      - task: lint:cmd
+        vars:
+          COMPOSE_FILE: "{{.GENERATE_COMPOSE_FILE}}"
+      - task: lint:cmd
+        vars:
+          COMPOSE_FILE: "{{.TEST_COMPOSE_FILE}}"