Merge branch 'main' of bitbucket.org:aarete/query-orchestration into feature/cognito

scripts/Taskfile.yml

@@ -85,3 +85,11 @@ tasks:
     cmds:
       - gomarkdoc --template-file file=docs/templates/root.gotxt ./cmd/...
   aws:login: aws sso login
+  aws:textract:credentials:
+    - |
+      sed -i '/^AWS_REGION_TEXTRACT\|^AWS_ACCESS_KEY_ID_TEXTRACT\|^AWS_SECRET_ACCESS_KEY_TEXTRACT\|^AWS_SESSION_TOKEN_TEXTRACT/d' .env
+      echo "AWS_REGION_TEXTRACT=$(aws configure get region --profile $AWS_PROFILE)" >> .env
+      CREDENTIALS_JSON=$(aws configure export-credentials --profile $AWS_PROFILE)
+      echo "AWS_ACCESS_KEY_ID_TEXTRACT=$(echo $CREDENTIALS_JSON | jq -r '.AccessKeyId')" >> .env
+      echo "AWS_SECRET_ACCESS_KEY_TEXTRACT=$(echo $CREDENTIALS_JSON | jq -r '.SecretAccessKey')" >> .env
+      echo "AWS_SESSION_TOKEN_TEXTRACT=$(echo $CREDENTIALS_JSON | jq -r '.SessionToken')" >> .env

scripts/local-deployments.yml

@@ -7,6 +7,7 @@ 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"
 
 tasks:
   build:test:
@@ -41,14 +42,25 @@ tasks:
       - task: up:cmd
         vars:
           COMPOSE_FILE: "{{.GENERATE_COMPOSE_FILE}}"
+  up:aws:
+    cmds:
+      - task deps:tidy
+      - task docker:build
+      - task: build
+      - task: up:cmd
+        vars:
+          COMPOSE_FILE: "{{.AWS_COMPOSE_FILE}}"
+      - task: init
   up:
     cmds:
+      - task deps:tidy
       - task docker:build
       - task: build
       - task: up:cmd
       - task: init
   refresh:
     cmds:
+      - task deps:tidy
       - task docker:build
       - task: build
       - task: down
@@ -73,7 +85,7 @@ tasks:
         --notification-configuration '{
             "QueueConfigurations": [{
                 "QueueArn": "arn:aws:sqs:us-east-1:000000000000:store_event",
-                "Events": ["s3:ObjectCreated:Put"]
+                "Events": ["s3:ObjectCreated:*"]
             }]
         }'
   down:test:
@@ -86,6 +98,11 @@ tasks:
       - task: down
         vars:
           COMPOSE_FILE: "{{.GENERATE_COMPOSE_FILE}}"
+  down:aws:
+    cmds:
+      - task: down
+        vars:
+          COMPOSE_FILE: "{{.AWS_COMPOSE_FILE}}"
   down:
     vars:
       COMPOSE_FILE: "{{.COMPOSE_FILE | default .LOCAL_COMPOSE_FILE}}"
@@ -100,6 +117,11 @@ tasks:
     cmds:
       - task: down:generate
       - docker volume rm -f deployments_generate-db-data
+  clean:aws:
+    run: once
+    cmds:
+      - task: down:aws
+      - docker volume rm -f deployments_aws-db-data
   clean:
     cmds:
       - task: down
@@ -113,8 +135,10 @@ tasks:
       - |
         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

scripts/tests.yml

@@ -9,7 +9,8 @@ vars:
   API: "./api/..."
   PKG: "./pkg/..."
   CMD: "./cmd/..."
-  PARALLEL: 1
+  UNIT_PARALLEL: 8
+  E2E_PARALLEL: 1
   # 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"
 
@@ -33,7 +34,7 @@ tasks:
       - task: mocks:generate
       - mkdir -p {{.OUT_DIR}}
       - |
-        go test -parallel {{.PARALLEL}} \
+        go test -parallel {{.UNIT_PARALLEL}} \
           {{.INTERNAL}} {{.API}} {{.CLI_ARGS}}
   unit:short:
     cmds:
@@ -98,4 +99,4 @@ tasks:
     deps:
       - docker:build
     cmds:
-      - go test -count=1 -parallel {{.PARALLEL}} ./test/...
+      - go test -count=1 -parallel {{.E2E_PARALLEL}} ./test/...