Added SCL Auto Alignment Service and updated existing backend.

Signed-off-by: Dennis Labordus <[email protected]>

Author: Dennis Labordus

compas/docker-compose-basex.yml

@@ -39,7 +39,7 @@ services:
   scl-data-service:
     labels:
       compas: true
-    image: "lfenergy/compas-scl-data-service:0.9.0-basex"
+    image: "lfenergy/compas-scl-data-service:0.9.1-basex"
     environment:
       - BASEX_HOST=basex
       - BASEX_PORT=1984
@@ -67,7 +67,7 @@ services:
   cim-mapping:
     labels:
       compas: true
-    image: "lfenergy/compas-cim-mapping:0.7.6"
+    image: "lfenergy/compas-cim-mapping:0.7.7"
     environment:
       - JWT_VERIFY_KEY=http://keycloak:8080/auth/realms/compas/protocol/openid-connect/certs
       - JWT_VERIFY_ISSUER=http://${COMPAS_HOSTNAME}/auth/realms/compas
@@ -86,6 +86,28 @@ services:
     depends_on:
       - keycloak
 
+  scl-auto-alignment:
+    labels:
+      compas: true
+    image: "lfenergy/compas-scl-auto-alignment:0.0.2"
+    environment:
+      - JWT_VERIFY_KEY=http://keycloak:8080/auth/realms/compas/protocol/openid-connect/certs
+      - JWT_VERIFY_ISSUER=http://${COMPAS_HOSTNAME}/auth/realms/compas
+      - JWT_VERIFY_CLIENT_ID=scl-auto-alignment
+      - JWT_GROUPS_PATH=resource_access/scl-auto-alignment/roles
+      - USERINFO_WHO_CLAIMNAME=name
+    deploy:
+      restart_policy:
+        condition: on-failure
+        max_attempts: 3
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8080/compas-scl-auto-alignment/q/health/ready"]
+      interval: 15s
+      timeout: 10s
+      retries: 5
+    depends_on:
+      - keycloak
+
   open-scd:
     labels:
       compas: true

compas/docker-compose-postgresql.yml

@@ -46,7 +46,7 @@ services:
   scl-data-service:
     labels:
       compas: true
-    image: "lfenergy/compas-scl-data-service:0.9.0-postgresql"
+    image: "lfenergy/compas-scl-data-service:0.9.1-postgresql"
     environment:
       - POSTGRESQL_HOST=postgresql
       - POSTGRESQL_DB=compas
@@ -74,7 +74,7 @@ services:
   cim-mapping:
     labels:
       compas: true
-    image: "lfenergy/compas-cim-mapping:0.7.6"
+    image: "lfenergy/compas-cim-mapping:0.7.7"
     environment:
       - JWT_VERIFY_KEY=http://keycloak:8080/auth/realms/compas/protocol/openid-connect/certs
       - JWT_VERIFY_ISSUER=http://${COMPAS_HOSTNAME}/auth/realms/compas
@@ -93,6 +93,28 @@ services:
     depends_on:
       - keycloak
 
+  scl-auto-alignment:
+    labels:
+      compas: true
+    image: "lfenergy/compas-scl-auto-alignment:0.0.2"
+    environment:
+      - JWT_VERIFY_KEY=http://keycloak:8080/auth/realms/compas/protocol/openid-connect/certs
+      - JWT_VERIFY_ISSUER=http://${COMPAS_HOSTNAME}/auth/realms/compas
+      - JWT_VERIFY_CLIENT_ID=scl-auto-alignment
+      - JWT_GROUPS_PATH=resource_access/scl-auto-alignment/roles
+      - USERINFO_WHO_CLAIMNAME=name
+    deploy:
+      restart_policy:
+        condition: on-failure
+        max_attempts: 3
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8080/compas-scl-auto-alignment/q/health/ready"]
+      interval: 15s
+      timeout: 10s
+      retries: 5
+    depends_on:
+      - keycloak
+
   open-scd:
     labels:
       compas: true

compas/reverse-proxy/nginx.conf

@@ -106,6 +106,26 @@ http {
        proxy_redirect off;
      }
 
+     # Forwarding to the SCL Auto Alignment Service container.
+     location /compas-scl-auto-alignment/ {
+       include /etc/nginx/include/authenticate.include;
+
+       proxy_set_header X-Real-IP         $remote_addr;
+       proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
+       proxy_set_header X-Forwarded-Proto $scheme;
+       proxy_set_header X-Forwarded-Port  $server_port;
+       proxy_set_header Authorization     "Bearer ${access_token}";
+
+       # Added Header back to browser to get JWT Content for Debugging, should not do this in production.
+       add_header X-Debug-Bearer "Bearer ${access_token}" always;
+
+       proxy_pass http://scl-auto-alignment:8080/compas-scl-auto-alignment/;
+
+       proxy_set_header Host $http_host;
+       proxy_cache_bypass $http_upgrade;
+       proxy_redirect off;
+     }
+
      # redirect server error pages to the static page /40x.html
      error_page 404 /404.html;
        location = /40x.html {