Merge pull request #607 from code0-tech/604-add-aquila-config-to-config-generator

Add aquila config to config-generator

Author: Taucher2003

.gitlab/ci/container-boot.gitlab-ci.yml

@@ -54,6 +54,16 @@ container:boot:sagittarius:grpc:
     - support/grpc_check_health --host docker:50051 --service liveness --retries 20
     - support/grpc_check_health --host docker:50051 --service readiness --retries 20
 
+.container:boot:sagittarius-grpc-preparation:
+  - bundle install
+  - docker compose up postgres -d
+  - docker compose up sagittarius-grpc -d
+  - docker ps --all
+  - docker compose logs sagittarius-grpc -f &
+  - support/grpc_check_health --host docker:50051 --service readiness --retries 20
+  - >
+    docker compose exec sagittarius-grpc bin/rails runner 'Runtime.create!(name: "Boot Test Runtime", token: "runtime_token")'
+
 container:boot:aquila:
   extends:
     - .container:boot
@@ -64,15 +74,8 @@ container:boot:aquila:
   variables:
     SAGITTARIUS_VARIANT: ce
   script:
-    - bundle install
-    - docker compose up postgres -d
+    - !reference [.container:boot:sagittarius-grpc-preparation]
     - docker compose up nats -d
-    - docker compose up sagittarius-grpc -d
-    - docker ps --all
-    - docker compose logs sagittarius-grpc -f &
-    - support/grpc_check_health --host docker:50051 --service readiness --retries 20
-    - >
-      docker compose exec sagittarius-grpc bin/rails runner 'Runtime.create!(name: "Boot Test Runtime", token: "runtime_token")'
     - docker compose up aquila -d
     - docker compose logs aquila -f &
     - support/grpc_check_health --host docker:8081 --service liveness --retries 20
@@ -83,10 +86,15 @@ container:boot:taurus:
     - .container:boot
   needs:
     - generate-environment
+    - manifest:aquila
+    - manifest:sagittarius
     - manifest:taurus
+  variables:
+    SAGITTARIUS_VARIANT: ce
   script:
-    - bundle install
+    - !reference [.container:boot:sagittarius-grpc-preparation]
     - docker compose up nats -d
+    - docker compose up aquila -d
     - docker compose up taurus -d
     - docker compose logs taurus -f &
     - support/grpc_check_health --host docker:8082 --service liveness --retries 20
@@ -97,7 +105,12 @@ container:boot:draco:
     - .container:boot
   needs:
     - generate-environment
+    - manifest:aquila
+    - manifest:sagittarius
+    - manifest:taurus
     - manifest:draco
+  variables:
+    SAGITTARIUS_VARIANT: ce
   parallel:
     matrix:
       - DRACO_VARIANT:
@@ -107,8 +120,10 @@ container:boot:draco:
           - amd64
           - arm64
   script:
-    - bundle install
+    - !reference [.container:boot:sagittarius-grpc-preparation]
     - docker compose up nats -d
+    - docker compose up aquila -d
+    - docker compose up taurus -d
     - docker compose up draco -d
     - docker compose logs draco -f &
     - support/grpc_check_health --host docker:8083 --service liveness --retries 20

container/config-generator/templates/aquila.service.configuration.json.erb

@@ -0,0 +1,16 @@
+{
+  "runtimes": [
+    {
+      "identifier": "taurus",
+      "token": "<%= env('TAURUS_AQUILA_TOKEN') %>"
+    },
+    {
+      "identifier": "draco-rest",
+      "token": "<%= env('DRACO_REST_AQUILA_TOKEN') %>"
+    },
+    {
+      "identifier": "draco-cron",
+      "token": "<%= env('DRACO_CRON_AQUILA_TOKEN') %>"
+    }
+  ]
+}

docker-compose/.env

@@ -14,6 +14,10 @@ AQUILA_SAGITTARIUS_URL=http://nginx:80
 AQUILA_SAGITTARIUS_TOKEN=
 DRACO_REST_PORT=8084
 
+TAURUS_AQUILA_TOKEN=taurus
+DRACO_REST_AQUILA_TOKEN=draco-rest
+DRACO_CRON_AQUILA_TOKEN=draco-cron
+
 # Active services
 COMPOSE_PROFILES=ide,runtime
 

docker-compose/docker-compose.yml

@@ -10,6 +10,7 @@ services:
     restart: "no"
     profiles:
       - ide
+      - runtime
 
   postgres:
     image: postgres:16.1
@@ -129,7 +130,10 @@ services:
 
   aquila:
     depends_on:
-      - nats
+      config-generator:
+        condition: service_completed_successfully
+      nats:
+        condition: service_started
     image: ${IMAGE_REGISTRY}/aquila:${IMAGE_TAG}
     environment:
       MODE: dynamic
@@ -138,6 +142,13 @@ services:
       GRPC_HOST: 0.0.0.0
       SAGITTARIUS_URL: "${AQUILA_SAGITTARIUS_URL}"
       RUNTIME_TOKEN: "${AQUILA_SAGITTARIUS_TOKEN}"
+    volumes:
+      - generated-configs:/tmp/generated-configs:ro
+    entrypoint: |
+      sh -c "
+        cp /tmp/generated-configs/aquila.service.configuration.json /service.configuration.json
+        exec /aquila
+      "
     restart: unless-stopped
     profiles:
       - runtime
@@ -152,6 +163,7 @@ services:
       AQUILA_URL: 'http://aquila:8081'
       NATS_URL: nats://nats:4222
       DEFINITION_PATH: '/definitions'
+      AQUILA_TOKEN: "${TAURUS_AQUILA_TOKEN}"
     restart: unless-stopped
     profiles:
       - runtime
@@ -168,6 +180,7 @@ services:
       DEFINITION_PATH: '/definitions'
       HTTP_SERVER_PORT: 8084
       HTTP_SERVER_HOST: "0.0.0.0"
+      AQUILA_TOKEN: "${DRACO_REST_AQUILA_TOKEN}"
     ports:
       - "${DRACO_REST_PORT}:8084"
     restart: unless-stopped
@@ -184,6 +197,7 @@ services:
       NATS_URL: nats://nats:4222
       NATS_BUCKET: 'flow_store'
       DEFINITION_PATH: '/definitions'
+      AQUILA_TOKEN: "${DRACO_CRON_AQUILA_TOKEN}"
     restart: unless-stopped
     profiles:
       - runtime

support/config/aquila.actions.json

@@ -0,0 +1,12 @@
+{
+  "runtimes": [
+    {
+      "identifier": "taurus",
+      "token": "taurus"
+    },
+    {
+      "identifier": "draco",
+      "token": "draco"
+    }
+  ]
+}

support/config/aquila.service.configuration.json

@@ -62,7 +62,7 @@ services:
       SAGITTARIUS_URL: http://sagittarius-grpc:50051
       RUNTIME_TOKEN: runtime_token
     volumes:
-      - ./config/aquila.actions.json:/action.configuration.json
+      - ./config/aquila.service.configuration.json:/service.configuration.json
     ports:
       - "8081:8081"
 
@@ -71,6 +71,10 @@ services:
     networks:
       - boot
     environment:
+      MODE: dynamic
+      AQUILA_URL: 'http://aquila:8081'
+      AQUILA_TOKEN: taurus
+      DEFINITION_PATH: '/definitions'
       NATS_URL: nats://nats:4222
       WITH_HEALTH_SERVICE: "true"
       GRPC_HOST: 0.0.0.0
@@ -83,6 +87,10 @@ services:
     networks:
       - boot
     environment:
+      MODE: dynamic
+      AQUILA_URL: 'http://aquila:8081'
+      AQUILA_TOKEN: draco
+      DEFINITION_PATH: '/definitions'
       NATS_URL: nats://nats:4222
       WITH_HEALTH_SERVICE: "true"
       GRPC_HOST: 0.0.0.0