Fix aas repository registry integration tests

Author: geso02

basyx.aasrepository/basyx.aasrepository-feature-registry-integration/src/test/java/org/eclipse/digitaltwin/basyx/aasrepository/feature/registry/integration/AuthorizedAasRepositoryRegistryLinkTest.java

@@ -51,7 +51,7 @@
 public class AuthorizedAasRepositoryRegistryLinkTest extends AasRepositoryRegistryLinkTestSuite {
 
 	private static final String AAS_REPO_URL = "http://localhost:8081";
-	private static final String AAS_REGISTRY_BASE_URL = "http://localhost:8051";
+	private static final String AAS_REGISTRY_BASE_URL = "http://localhost:8052";
 	private static ConfigurableApplicationContext appContext;
 	private static AasRepositoryRegistryLink aasRepositoryRegistryLink;
 

basyx.aasrepository/basyx.aasrepository-feature-registry-integration/src/test/resources/application-authregistry.properties

@@ -36,7 +36,7 @@ basyx.externalurl=http://localhost:8081
 
 # Authorized registry integration
 basyx.aasrepository.feature.registryintegration.authorization.enabled=true
-basyx.aasrepository.feature.registryintegration.authorization.token-endpoint=http://localhost:9097/realms/BaSyx/protocol/openid-connect/token
+basyx.aasrepository.feature.registryintegration.authorization.token-endpoint=http://localhost/realms/BaSyx/protocol/openid-connect/token
 basyx.aasrepository.feature.registryintegration.authorization.grant-type = CLIENT_CREDENTIALS
 basyx.aasrepository.feature.registryintegration.authorization.client-id=workstation-1
 basyx.aasrepository.feature.registryintegration.authorization.client-secret=nY0mjyECF60DGzNmQUjL81XurSl8etom

ci/docker-compose.yml

@@ -1,5 +1,19 @@
 version: "3.9"
 services:
+
+  nginx-proxy:
+    image: nginxproxy/nginx-proxy:1.6.0-alpine
+    container_name: proxy
+    restart: always
+    ports:
+      - "80:80"
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+    environment:
+      DEFAULT_HOST: keycloak.basyx.localhost
+    networks:
+      - basyx-java-server-sdk
+
   mongo:
     image: mongo:5.0.10
     # Provide mongo config
@@ -96,6 +110,8 @@ services:
   secured-aas-registry-log-mem:
     image: eclipsebasyx/aas-registry-log-mem:$BASYX_VERSION
     container_name: secured-aas-registry-log-mem
+    extra_hosts:
+      - "keycloak.basyx.localhost:host-gateway" 
     ports:
       - "8051:8080"
     environment:
@@ -105,7 +121,7 @@ services:
       BASYX_FEATURE_AUTHORIZATION_ENABLED: true
       BASYX_FEATURE_AUTHORIZATION_TYPE: rbac
       BASYX_FEATURE_AUTHORIZATION_JWTBEARERTOKENPROVIDER: keycloak
-      SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: http://keycloak-fixed:8080/realms/BaSyx
+      SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: http://keycloak.basyx.localhost/realms/BaSyx
       BASYX_FEATURE_AUTHORIZATION_RBAC_FILE: file:/rbac/rbac_rules.json
     volumes:
       - ./keycloak/rules/rbac_rules-aas-registry.json:/rbac/rbac_rules.json:ro
@@ -116,14 +132,16 @@ services:
   secured-sm-registry-log-mem:
     image: eclipsebasyx/submodel-registry-log-mem:$BASYX_VERSION
     container_name: secured-sm-registry-log-mem
+    extra_hosts:
+      - "keycloak.basyx.localhost:host-gateway" 
     environment:
       SERVER_SERVLET_CONTEXT_PATH: /
       BASYX_CORS_ALLOWED_ORIGINS: '*'
       BASYX_CORS_ALLOWED_METHODS: GET,POST,PATCH,DELETE,PUT,OPTIONS,HEAD
       BASYX_FEATURE_AUTHORIZATION_ENABLED: true
       BASYX_FEATURE_AUTHORIZATION_TYPE: rbac
       BASYX_FEATURE_AUTHORIZATION_JWTBEARERTOKENPROVIDER: keycloak
-      SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: http://keycloak-fixed:8080/realms/BaSyx
+      SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: http://keycloak.basyx.localhost:8080/realms/BaSyx
       BASYX_FEATURE_AUTHORIZATION_RBAC_FILE: file:/rbac/rbac_rules.json
     volumes:
       - ./keycloak/rules/rbac_rules-sm-registry.json:/rbac/rbac_rules.json:ro
@@ -158,6 +176,62 @@ services:
       networks:
         - basyx-java-server-sdk
 
+  keycloak-localhost:
+    image: keycloak/keycloak:24.0.4
+    container_name: keycloak-localhost
+    environment:
+      KC_HOSTNAME: localhost
+      KEYCLOAK_ADMIN: admin
+      KEYCLOAK_ADMIN_PASSWORD: keycloak-admin
+      KC_HTTP_ENABLED: "true"
+      KC_HTTPS_ENABLED: "false"
+      KC_HEALTH_ENABLED: "true"
+      KC_IMPORT: /opt/keycloak/data/import/
+    command: ["start-dev", "--import-realm"]
+    volumes:
+      - ./keycloak/realm:/opt/keycloak/data/import
+    ports:
+      - 9098:8080
+    networks:
+      - basyx-java-server-sdk
+
+
+  keycloak-nginx:
+    image: keycloak/keycloak:24.0.4
+    container_name: keycloak-nginx
+    environment:
+      VIRTUAL_HOST: keycloak.basyx.localhost
+      VIRTUAL_PORT: "8080"
+      KC_HOSTNAME: keycloak.basyx.localhost
+      KEYCLOAK_ADMIN: admin
+      KEYCLOAK_ADMIN_PASSWORD: keycloak-admin
+      KC_HTTP_ENABLED: "true"
+      KC_HTTPS_ENABLED: "false"
+      KC_HEALTH_ENABLED: "true"
+      KC_IMPORT: /opt/keycloak/data/import/
+    command: ["start-dev", "--import-realm"]
+    volumes:
+      - ./keycloak/realm:/opt/keycloak/data/import
+    ports:
+      - 9099:8080
+    networks:
+      - basyx-java-server-sdk
+
+  keycloak-healthcheck:
+    image: curlimages/curl:latest
+    container_name: keycloak-healthcheck
+    command: >
+      sh -c "
+        echo 'Waiting for Keycloak to become ready...';
+        until curl -sf http://keycloak-nginx:8080/health/ready; do
+          sleep 5;
+        done;
+        echo 'Keycloak is ready!'"
+    depends_on:
+      - keycloak
+    networks:
+      - basyx-java-server-sdk
+
   # keycloak-fixed-uri:
   #   image: eclipsebasyx/keycloak:0.0.1
   #   build:

examples/BaSyxSecured/docker-compose.yaml

@@ -1,18 +1,18 @@
 services:
 
   # nginx reverse proxy to support dns lookup
-  # nginx-proxy:
-  #   image: nginxproxy/nginx-proxy:1.6.0-alpine
-  #   container_name: proxy
-  #   restart: always
-  #   ports:
-  #     - "80:80"
-  #   volumes:
-  #     - /var/run/docker.sock:/tmp/docker.sock:ro
-  #   environment:
-  #     DEFAULT_HOST: aasgui.basyx.localhost
-  #   networks:
-  #     - basyx-java-server-sdk
+  nginx-proxy:
+    image: nginxproxy/nginx-proxy:1.6.0-alpine
+    container_name: proxy
+    restart: always
+    ports:
+      - "80:80"
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+    environment:
+      DEFAULT_HOST: aasgui.basyx.localhost
+    networks:
+      - basyx-java-server-sdk
 
   # AAS Environment
   aas-env: