Merged in feature/testwithlogs (pull request #65)

Query Version Sync Runner

* testing

* queryversiosyncworking

* update

* tests

* fixtests

deployments/compose.local.yaml

@@ -1,4 +1,3 @@
-# compose.local.yaml
 ---
 services:
   doc_init_runner:
@@ -195,6 +194,7 @@ services:
     environment:
       LOG_LEVEL: DEBUG
       JOB_SYNC_URL: ${JOB_SYNC_URL}
+      QUERY_VERSION_SYNC_URL: ${QUERY_VERSION_SYNC_URL}
       AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
       AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
       AWS_SESSION_TOKEN: ${AWS_SESSION_TOKEN}
@@ -241,12 +241,49 @@ services:
     networks:
       - server-network
 
+  query_version_sync_runner:
+    image: queryorchestration:latest
+    command: ["./queryVersionSyncRunner"]
+    depends_on:
+      localstack:
+        condition: service_healthy
+      db:
+        condition: service_healthy
+    ports:
+      - "8088:8080"
+    expose:
+      - 8080
+    environment:
+      LOG_LEVEL: DEBUG
+      QUEUE_URL: ${QUERY_VERSION_SYNC_URL}
+      JOB_SYNC_URL: ${JOB_SYNC_URL}
+      AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
+      AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
+      AWS_SESSION_TOKEN: ${AWS_SESSION_TOKEN}
+      AWS_REGION: ${AWS_REGION}
+      DB_USER: ${DB_USER}
+      DB_PASS: ${DB_PASS}
+      DB_HOST: db
+      DB_PORT: 5432
+      DB_NAME: ${DB_NAME}
+      DB_NOSSL: ${DB_NOSSL}
+      AWS_ENDPOINT_URL: "http://localstack:4566"
+      AWS_S3_USE_PATH_STYLE: true
+    networks:
+      - server-network
+
   prometheus:
     image: prom/prometheus:latest
     ports:
       - "9091:9090"
     volumes:
       - ./prometheus.allmetrics.yaml:/etc/prometheus/prometheus.yml
+    healthcheck:
+      test: ["CMD", "wget", "--spider", "-q", "http://localhost:9090/-/healthy"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 30s
     networks:
       - server-network
 

deployments/compose.test.yaml

@@ -26,13 +26,17 @@ services:
       - "9090:9090"
     volumes:
       - ./prometheus.localservice.yaml:/etc/prometheus/prometheus.yml
+    healthcheck:
+      test: ["CMD", "wget", "--spider", "-q", "http://localhost:9090/-/healthy"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 30s
     networks:
       - test-server-network
     extra_hosts:
       - "host.docker.internal:host-gateway"
-
 volumes:
   test-db-data:
-
 networks:
   test-server-network:

deployments/prometheus.allmetrics.yaml

@@ -39,3 +39,15 @@ scrape_configs:
       - targets:
           - 'query_service:8080'
     metrics_path: '/metrics'
+
+  - job_name: 'job_sync_runner'
+    static_configs:
+      - targets:
+          - 'job_sync_runner:8080'
+    metrics_path: '/metrics'
+
+  - job_name: 'query_version_sync_runner'
+    static_configs:
+      - targets:
+          - 'query_version_sync_runner:8080'
+    metrics_path: '/metrics'