libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

KEYCLOAK-15910 Rename "cluster.enabled" to "clustered". Fix test and minor cleanup. Adding GH action for quarkus unit test

Browse source
This commit is contained in:
mposolda 2020-10-09 17:03:32 +02:00 committed by Pedro Igor
parent ff05072c16
commit 4fd1950f5c
5 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/ci-x.yml vendored
View file

@ -47,6 +47,8 @@ jobs:
- name: Extract Maven Repo
shell: bash
run: tar -xzvf maven-repo.tgz -C ~
- name: Run Quarkus unit tests
run: mvn clean install -B -Pquarkus -f quarkus/pom.xml
- name: Build testsuite
run: mvn clean install -B -Pquarkus,auth-server-quarkus -DskipTests -f testsuite/pom.xml
- name: Run base tests

2
quarkus/runtime/src/main/java/org/keycloak/configuration/PropertyMappers.java
View file

@ -161,7 +161,7 @@ public final class PropertyMappers {
}
private static void configureClustering() {
createWithDefault("cluster.enabled", "kc.spi.connections-infinispan.default.clustered", "placeholder", (value, context) -> {
createWithDefault("clustered", "kc.spi.connections-infinispan.default.clustered", "placeholder", (value, context) -> {
if ("true".equals(value) || "false".equals(value)) {
return value;
}

2
quarkus/runtime/src/main/java/org/keycloak/configuration/PropertyMappingInterceptor.java
View file

@ -46,7 +46,7 @@ public class PropertyMappingInterceptor implements ConfigSourceInterceptor {
}
return value.withValue(
StringPropertyReplacer.replaceProperties(PropertyMappers.getValue(context, name).getValue(),
StringPropertyReplacer.replaceProperties(value.getValue(),
property -> {
ConfigValue prop = context.proceed(property);

6
quarkus/runtime/src/main/java/org/keycloak/util/Environment.java
View file

@ -57,11 +57,7 @@ public final class Environment {
}
public static String getProfileOrDefault(String defaultProfile) {
String profile = System.getProperty("kc.profile");
if (profile == null) {
profile = System.getenv("KC_PROFILE");
}
String profile = getProfile();
if (profile == null) {
profile = defaultProfile;

24
quarkus/runtime/src/test/java/org/keycloak/provider/quarkus/ConfigurationTest.java
View file

@ -115,14 +115,14 @@ public class ConfigurationTest {
@Test
public void testSysPropPriorityOverEnvVar() {
putEnvVar("KC_HOSTNAME_DEFAULT_FRONTEND_URL", "http://envvar.com");
putEnvVar("KC_SPI_HOSTNAME_DEFAULT_FRONTEND_URL", "http://envvar.com");
System.setProperty("kc.spi.hostname.default.frontend-url", "http://propvar.com");
assertEquals("http://propvar.com", initConfig("hostname", "default").get("frontendUrl"));
}
@Test
public void testCLIPriorityOverSysVar() {
System.setProperty("kc.hostname.frontend-url", "http://propvar.com");
public void testCLIPriorityOverSysProp() {
System.setProperty("kc.spi.hostname.default.frontend-url", "http://propvar.com");
System.setProperty("kc.config.args", "--spi-hostname-default-frontend-url=http://cli.com");
assertEquals("http://cli.com", initConfig("hostname", "default").get("frontendUrl"));
}
@ -165,25 +165,19 @@ public class ConfigurationTest {
System.setProperty("kc.config.args", "--spi-action-token-handler-verify-email-some-property=test");
assertEquals("test", initConfig("action-token-handler", "verify-email").get("some-property"));
System.setProperty("kc.config.args", "--spi-action-token-handler-verify-email-some-property=test");
assertEquals("test", initConfig("action-token-handler", "verify-email").get("some-property"));
assertEquals("test", initConfig("actionTokenHandler", "verifyEmail").get("someProperty"));
// test multi-word SPI names using slashes
System.setProperty("kc.config.args", "--spi-client-registration-openid-connect-static-jwk-url=http://c.jwk.url");
assertEquals("http://c.jwk.url", initConfig("client-registration", "openid-connect").get("static-jwk-url"));
}
@Test
public void testSpiConfigurationUsingProperties() {
System.setProperty("kc.spi.hostname.default.frontend-url", "http://spifull.com");
assertEquals("http://spifull.com", initConfig("hostname", "default").get("frontendUrl"));
}
@Test
public void testPropertyMapping() {
System.setProperty("kc.config.args", "--db=mariadb,--db-url=jdbc:mariadb://localhost/keycloak");
SmallRyeConfig config = createConfig();
assertEquals(MariaDBDialect.class.getName(), config.getConfigValue("quarkus.hibernate-orm.dialect").getValue());
assertEquals("jdbc:mariadb://localhost/keycloak", config.getConfigValue("quarkus.datasource.url").getValue());
assertEquals("jdbc:mariadb://localhost/keycloak", config.getConfigValue("quarkus.datasource.jdbc.url").getValue());
}
@Test
@ -196,7 +190,7 @@ public class ConfigurationTest {
System.setProperty("kc.config.args", "--db=h2-mem");
config = createConfig();
assertEquals(QuarkusH2Dialect.class.getName(), config.getConfigValue("quarkus.hibernate-orm.dialect").getValue());
assertEquals("jdbc:h2:mem:keycloakdb", config.getConfigValue("quarkus.datasource.url").getValue());
assertEquals("jdbc:h2:mem:keycloakdb", config.getConfigValue("quarkus.datasource.jdbc.url").getValue());
}
@Test
@ -206,12 +200,12 @@ public class ConfigurationTest {
System.setProperty("kc.config.args", "--db=h2-file");
SmallRyeConfig config = createConfig();
assertEquals(QuarkusH2Dialect.class.getName(), config.getConfigValue("quarkus.hibernate-orm.dialect").getValue());
assertEquals("jdbc:h2:file:test-dir/data/keycloakdb;;test=test;test1=test1", config.getConfigValue("quarkus.datasource.url").getValue());
assertEquals("jdbc:h2:file:test-dir/data/keycloakdb;;test=test;test1=test1", config.getConfigValue("quarkus.datasource.jdbc.url").getValue());
System.setProperty("kc.db.url.properties", "?test=test&test1=test1");
System.setProperty("kc.config.args", "--db=mariadb");
config = createConfig();
assertEquals("jdbc:mariadb://localhost/keycloak?test=test&test1=test1", config.getConfigValue("quarkus.datasource.url").getValue());
assertEquals("jdbc:mariadb://localhost/keycloak?test=test&test1=test1", config.getConfigValue("quarkus.datasource.jdbc.url").getValue());
}
// KEYCLOAK-15632
@ -245,7 +239,7 @@ public class ConfigurationTest {
// If explicitly set, then it is always used regardless of the profile
System.clearProperty("kc.profile");
System.setProperty("kc.config.args", "--cluster-enabled=true");
System.setProperty("kc.config.args", "--clustered=true");
Assert.assertTrue(initConfig("connectionsInfinispan", "default").getBoolean("clustered"));
System.setProperty("kc.profile", "dev");