Bump katta-server:1.5.0-SNAPSHOT according to https://github.com/cryptomator/hub/releases/tag/1.4.0 using chipotle realm of testing.katta.cloud for hybrid testing.

Author: chenkins

hub/src/test/java/cloud/katta/testsetup/AbstractHubTest.java

@@ -67,7 +67,7 @@ public abstract class AbstractHubTest extends VaultTest {
     public static final HubTestConfig.Setup.DockerConfig LOCAL_DOCKER_CONFIG;
 
     static {
-        LOCAL_DOCKER_CONFIG = new HubTestConfig.Setup.DockerConfig("/docker-compose-minio-localhost-hub.yml", "/.local.env", "local", "admin", "admin", "syncer");
+        LOCAL_DOCKER_CONFIG = new HubTestConfig.Setup.DockerConfig("/docker-compose-minio-localhost-hub.yml", "/.local.env", "local", "admin", "admin", "top-secret");
         LOCAL = new HubTestConfig.Setup()
                 .withHubURL("http://localhost:8280")
                 .withUserConfig(new HubTestConfig.Setup.UserConfig("alice", "asd", staticSetupCode()))

hub/src/test/java/cloud/katta/testsetup/HubTestConfig.java

@@ -66,16 +66,16 @@ public static class DockerConfig {
             public final String profile;
             public final String hubAdminUser;
             public final String hubAdminPassword;
-            public final String hubKeycloakSyncerPassword;
+            public final String hubKeycloakSystemClientSecret;
 
 
-            public DockerConfig(final String composeFile, final String envFile, final String profile, final String hubAdminUser, final String hubAdminPassword, final String hubKeycloakSyncerPassword) {
+            public DockerConfig(final String composeFile, final String envFile, final String profile, final String hubAdminUser, final String hubAdminPassword, final String hubKeycloakSystemClientSecret) {
                 this.composeFile = composeFile;
                 this.envFile = envFile;
                 this.profile = profile;
                 this.hubAdminUser = hubAdminUser;
                 this.hubAdminPassword = hubAdminPassword;
-                this.hubKeycloakSyncerPassword = hubKeycloakSyncerPassword;
+                this.hubKeycloakSystemClientSecret = hubKeycloakSystemClientSecret;
             }
         }
 

hub/src/test/java/cloud/katta/testsetup/HubTestSetupDockerExtension.java

@@ -10,9 +10,7 @@
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.testcontainers.containers.ComposeContainer;
-import org.testcontainers.containers.wait.strategy.DockerHealthcheckWaitStrategy;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
-import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
 
 import java.io.File;
 import java.io.IOException;
@@ -54,7 +52,7 @@ protected void setupDocker(final HubTestConfig.Setup.DockerConfig configuration)
                 ));
         env.put("HUB_ADMIN_USER", configuration.hubAdminUser);
         env.put("HUB_ADMIN_PASSWORD", configuration.hubAdminPassword);
-        env.put("HUB_KEYCLOAK_SYNCER_PASSWORD", configuration.hubKeycloakSyncerPassword);
+        env.put("HUB_KEYCLOAK_SYSTEM_CLIENT_SECRET", configuration.hubKeycloakSystemClientSecret);
         this.compose = new ComposeContainer(
                 new File(HubTestSetupDockerExtension.class.getResource(configuration.composeFile).toURI()))
                 .withLocalCompose(true)

hub/src/test/resources/.env

@@ -1,9 +1,9 @@
-KATTA_SERVER_IMAGE=ghcr.io/shift7-ch/katta-server:latest
+KATTA_SERVER_IMAGE=ghcr.io/shift7-ch/katta-server:1.5.0-SNAPSHOT-ci
 HUB_PORT=8080
 HUB_KEYCLOAK_URL=http://localhost:8180
 HUB_KEYCLOAK_BASEPATH=
 HUB_KEYCLOAK_REALM=cryptomator
-HUB_KEYCLOAK_SYNCER_PASSWORD=syncer
+HUB_KEYCLOAK_SYSTEM_CLIENT_SECRET=top-secret
 
 HUB_ADMIN_USER=admin
 HUB_ADMIN_PASSWORD=admin
@@ -12,7 +12,7 @@ MINIO_HOSTNAME=localhost
 MINIO_PORT=9000
 MINIO_CONSOLE_PORT=9001
 
-KATTA_KEYCLOAK_IMAGE=ghcr.io/shift7-ch/keycloak:25.0.1
+KATTA_KEYCLOAK_IMAGE=ghcr.io/shift7-ch/keycloak:26.1.5
 KEYCLOAK_HOSTNAME=localhost
 KEYCLOAK_HTTP_PORT=8180
 KEYCLOAK_HTTPS_PORT=8443

hub/src/test/resources/.hybrid.env

@@ -1,9 +1,9 @@
-KATTA_SERVER_IMAGE=ghcr.io/shift7-ch/katta-server:latest
+KATTA_SERVER_IMAGE=ghcr.io/shift7-ch/katta-server:1.5.0-SNAPSHOT-ci
 HUB_PORT=8280
 HUB_KEYCLOAK_URL=https://testing.katta.cloud
 HUB_KEYCLOAK_BASEPATH=/kc
 HUB_KEYCLOAK_REALM=chipotle
-#HUB_KEYCLOAK_SYNCER_PASSWORD=
+#HUB_KEYCLOAK_SYSTEM_CLIENT_SECRET=
 
 #HUB_ADMIN_USER=
 #HUB_ADMIN_PASSWORD=

hub/src/test/resources/.local.env

@@ -1,9 +1,9 @@
-KATTA_SERVER_IMAGE=ghcr.io/shift7-ch/katta-server:latest
+KATTA_SERVER_IMAGE=ghcr.io/shift7-ch/katta-server:1.5.0-SNAPSHOT-ci
 HUB_PORT=8280
 HUB_KEYCLOAK_URL=http://localhost:8380
 HUB_KEYCLOAK_BASEPATH=
 HUB_KEYCLOAK_REALM=cryptomator
-HUB_KEYCLOAK_SYNCER_PASSWORD=syncer
+HUB_KEYCLOAK_SYSTEM_CLIENT_SECRET=top-secret
 
 HUB_ADMIN_USER=admin
 HUB_ADMIN_PASSWORD=admin
@@ -12,7 +12,7 @@ MINIO_HOSTNAME=localhost
 MINIO_PORT=9100
 MINIO_CONSOLE_PORT=9101
 
-KATTA_KEYCLOAK_IMAGE=ghcr.io/shift7-ch/keycloak:25.0.1
+KATTA_KEYCLOAK_IMAGE=ghcr.io/shift7-ch/keycloak:26.1.5
 KEYCLOAK_HOSTNAME=localhost
 KEYCLOAK_HTTP_PORT=8380
 KEYCLOAK_HTTPS_PORT=8443

hub/src/test/resources/docker-compose-minio-localhost-hub.yml

@@ -17,7 +17,8 @@ services:
       KC_HTTPS_CERTIFICATE_FILE: /opt/keycloak/dev/certs/keycloak-server.crt.pem
       KC_HTTPS_CERTIFICATE_KEY_FILE: /opt/keycloak/dev/certs/keycloak-server.key.pem
     volumes:
-      - ./keycloak/dev-realm.json:/opt/keycloak/data/import/keycloak-realm.json
+      # renamed because of https://github.com/keycloak/keycloak/issues/37569 for Keycloak 26.1.5
+      - ./keycloak/dev-realm.json:/opt/keycloak/data/import/keycloak.json
       - ./certs:/opt/keycloak/dev/certs
     # hub to Keycloak communication inside Docker network (http://keycloak:8180) goes to the container internal port! Therefore, we need to start keycloak with the same port `--http-port 8180`
     command: start-dev --import-realm --db=dev-mem --health-enabled=true --hostname ${KEYCLOAK_HOSTNAME} --http-port ${KEYCLOAK_HTTP_PORT} --features=token-exchange,admin-fine-grained-authz
@@ -264,7 +265,8 @@ services:
       HUB_KEYCLOAK_PUBLIC_URL: ${HUB_KEYCLOAK_URL}${HUB_KEYCLOAK_BASEPATH}
       HUB_KEYCLOAK_LOCAL_URL: ${HUB_KEYCLOAK_URL}${HUB_KEYCLOAK_BASEPATH}
       HUB_KEYCLOAK_REALM: ${HUB_KEYCLOAK_REALM}
-      HUB_KEYCLOAK_SYNCER_PASSWORD: ${HUB_KEYCLOAK_SYNCER_PASSWORD}
+      HUB_KEYCLOAK_SYSTEM_CLIENT_ID: cryptomatorhub-system
+      HUB_KEYCLOAK_SYSTEM_CLIENT_SECRET: ${HUB_KEYCLOAK_SYSTEM_CLIENT_SECRET}
       HUB_KEYCLOAK_OIDC_CRYPTOMATOR_CLIENT_ID: cryptomator
       AWS_REGION: us-east-1
     ports:
@@ -289,7 +291,7 @@ services:
           # reload and verify configuration
           nginx -t
           # start reverse proxy to keycloak and minio
-          systemctl start nginx.service
+          nginx
           # verify reverse proxy
           curl --fail http://localhost:${KEYCLOAK_HTTP_PORT}/realms/cryptomator/.well-known/openid-configuration
           curl --fail http://127.0.0.1:${KEYCLOAK_HTTP_PORT}/realms/cryptomator/.well-known/openid-configuration
@@ -306,7 +308,7 @@ services:
         # reload and verify configuration
         nginx -t
         # start reverse proxy to keycloak and minio
-        systemctl restart nginx.service
+        nginx -s reload || nginx
         # skip verify reverse proxy (MinIO might not be up yet).
         #        curl --fail http://localhost:${MINIO_PORT}/minio/health/ready
         #        curl --fail http://127.0.0.1:${MINIO_PORT}/minio/health/ready

hub/src/test/resources/docker/hub/Dockerfile

@@ -1,4 +1,5 @@
 ARG KATTA_SERVER_IMAGE
 FROM ${KATTA_SERVER_IMAGE}
 
-RUN apt-get update && apt-get -y install curl wget telnet net-tools nginx systemctl  gettext-base && systemctl start nginx
+USER root
+RUN microdnf update -y && microdnf -y install wget net-tools nginx gettext && microdnf clean all -y && systemctl enable nginx