From a1cf4e916651f7c87ae8efd9aa183cfb2945a877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Barto=C5=A1?= Date: Wed, 13 Sep 2023 15:15:26 +0200 Subject: [PATCH 1/3] Keystore location does not work for Windows Fixes #22185 --- .../mappers/ConfigKeystorePropertyMappers.java | 10 +++++----- .../runtime/configuration/test/ConfigurationTest.java | 11 ++++++++++- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ConfigKeystorePropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ConfigKeystorePropertyMappers.java index ec20345cb61a..711c384a25bc 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ConfigKeystorePropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ConfigKeystorePropertyMappers.java @@ -6,7 +6,6 @@ import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.Optional; import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; @@ -50,11 +49,12 @@ private static Optional validatePath(Optional option, ConfigSour throw new IllegalArgumentException("config-keystore-password must be specified"); } - Optional realPath = Optional.of(String.valueOf(Paths.get(path.getValue()).toAbsolutePath().normalize())); - if (!Files.exists(Path.of(realPath.get()))) { - throw new IllegalArgumentException("config-keystore path does not exist: " + realPath.get()); + final Path realPath = Path.of(path.getValue()).toAbsolutePath().normalize(); + if (!Files.exists(realPath)) { + throw new IllegalArgumentException("config-keystore path does not exist: " + realPath); } - return realPath; + + return Optional.of(realPath.toUri().toString()); } private static Optional validatePassword(Optional option, ConfigSourceInterceptorContext context) { diff --git a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/test/ConfigurationTest.java b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/test/ConfigurationTest.java index a85077d4694c..c4030a2d1ce3 100644 --- a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/test/ConfigurationTest.java +++ b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/test/ConfigurationTest.java @@ -20,10 +20,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import static org.keycloak.quarkus.runtime.Environment.isWindows; import static org.keycloak.quarkus.runtime.configuration.ConfigArgsConfigSource.CLI_ARGS; import java.io.File; import java.lang.reflect.Field; +import java.nio.file.Path; import java.util.HashMap; import java.util.Map; import java.util.Properties; @@ -266,7 +268,14 @@ public void testDatabaseDefaults() { System.setProperty(CLI_ARGS, "--db=dev-file"); SmallRyeConfig config = createConfig(); assertEquals(H2Dialect.class.getName(), config.getConfigValue("kc.db-dialect").getValue()); - assertEquals("jdbc:h2:file:" + System.getProperty("user.home") + File.separator + "data" + File.separator + "h2" + File.separator + "keycloakdb;;AUTO_SERVER=TRUE;NON_KEYWORDS=VALUE", config.getConfigValue("quarkus.datasource.jdbc.url").getValue()); + + // JDBC location treated as file:// URI + final String userHomeUri = Path.of(System.getProperty("user.home")) + .toUri() + .toString() + .replaceFirst(isWindows() ? "file:///" : "file://", ""); + + assertEquals("jdbc:h2:file:" + userHomeUri + "data/h2/keycloakdb;;AUTO_SERVER=TRUE;NON_KEYWORDS=VALUE", config.getConfigValue("quarkus.datasource.jdbc.url").getValue()); System.setProperty(CLI_ARGS, "--db=dev-mem"); config = createConfig(); From cff0116dac371e180dfe98cd38a088b19384043d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Barto=C5=A1?= Date: Wed, 13 Sep 2023 15:07:27 +0200 Subject: [PATCH 2/3] Enable Quarkus UT for Windows Closes #23208 --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1a76446f304d..989984c02b7a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,7 +126,10 @@ jobs: name: Quarkus UT needs: build timeout-minutes: 15 - runs-on: ubuntu-latest + strategy: + matrix: + os: [ ubuntu-latest, windows-latest ] + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 From 4e0b3f1dbb7cb00c23d2cda0e94d6ae56ec2bda0 Mon Sep 17 00:00:00 2001 From: Anhanguera <1473421439@qq.com> Date: Thu, 27 Jul 2023 14:03:49 +0800 Subject: [PATCH 3/3] Replace Windows separator with Unix separator (#20472) * Replace Windows separator with Unix separator Replace Windows separator with Unix separator to avoid building failure on Windows. Closes #20471 * Use '/' directly instead of File.separate to then replace back to '/' --------- Co-authored-by: Stian Thorgersen --- .../runtime/configuration/test/ConfigurationTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/test/ConfigurationTest.java b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/test/ConfigurationTest.java index c4030a2d1ce3..161936e80705 100644 --- a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/test/ConfigurationTest.java +++ b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/test/ConfigurationTest.java @@ -23,7 +23,6 @@ import static org.keycloak.quarkus.runtime.Environment.isWindows; import static org.keycloak.quarkus.runtime.configuration.ConfigArgsConfigSource.CLI_ARGS; -import java.io.File; import java.lang.reflect.Field; import java.nio.file.Path; import java.util.HashMap; @@ -352,13 +351,13 @@ public void testDatabaseProperties() { System.setProperty(CLI_ARGS, "--db=dev-file"); SmallRyeConfig config = createConfig(); assertEquals(H2Dialect.class.getName(), config.getConfigValue("kc.db-dialect").getValue()); - assertEquals("jdbc:h2:file:test-dir" + File.separator + "data" + File.separator + "h2" + File.separator + "keycloakdb;;test=test;test1=test1;NON_KEYWORDS=VALUE", config.getConfigValue("quarkus.datasource.jdbc.url").getValue()); + assertEquals("jdbc:h2:file:test-dir/data/h2/keycloakdb;;test=test;test1=test1;NON_KEYWORDS=VALUE", config.getConfigValue("quarkus.datasource.jdbc.url").getValue()); assertEquals("xa", config.getConfigValue("quarkus.datasource.jdbc.transactions").getValue()); System.setProperty(CLI_ARGS, ""); config = createConfig(); assertEquals(H2Dialect.class.getName(), config.getConfigValue("kc.db-dialect").getValue()); - assertEquals("jdbc:h2:file:test-dir" + File.separator + "data" + File.separator + "h2" + File.separator + "keycloakdb;;test=test;test1=test1;NON_KEYWORDS=VALUE", config.getConfigValue("quarkus.datasource.jdbc.url").getValue()); + assertEquals("jdbc:h2:file:test-dir/data/h2/keycloakdb;;test=test;test1=test1;NON_KEYWORDS=VALUE", config.getConfigValue("quarkus.datasource.jdbc.url").getValue()); System.setProperty("kc.db-url-properties", "?test=test&test1=test1"); System.setProperty(CLI_ARGS, "--db=mariadb");