Multi datasource configuration does not work (#28050)
Fixes #27894 Signed-off-by: Martin Bartoš <mabartos@redhat.com> Co-authored-by: Steven Hawkins <shawkins@redhat.com>
This commit is contained in:
parent
6ede747871
commit
c916932cbf
4 changed files with 62 additions and 16 deletions
|
@ -52,9 +52,9 @@ public final class Database {
|
|||
return false;
|
||||
}
|
||||
|
||||
public static Optional<Vendor> getVendorByDbKind(String dbKind) {
|
||||
public static Optional<Vendor> getVendor(String vendor) {
|
||||
return Arrays.stream(Vendor.values())
|
||||
.filter(v -> v.isOfKind(dbKind))
|
||||
.filter(v -> v.isOfKind(vendor) || asList(v.aliases).contains(vendor))
|
||||
.findAny();
|
||||
}
|
||||
|
||||
|
|
|
@ -120,18 +120,31 @@ public class IgnoredArtifacts {
|
|||
.collect(Collectors.toUnmodifiableSet());
|
||||
|
||||
private static Set<String> jdbcDrivers() {
|
||||
final Database.Vendor vendor = Configuration.getOptionalValue("quarkus.datasource.db-kind")
|
||||
.flatMap(Database::getVendorByDbKind)
|
||||
.orElse(Database.Vendor.H2);
|
||||
final Set<Database.Vendor> vendorsOfAllDatasources = new HashSet<>();
|
||||
|
||||
final Set<String> jdbcArtifacts = switch (vendor) {
|
||||
case H2 -> JDBC_H2;
|
||||
case MYSQL -> JDBC_MYSQL;
|
||||
case MARIADB -> JDBC_MARIADB;
|
||||
case POSTGRES -> JDBC_POSTGRES;
|
||||
case MSSQL -> JDBC_MSSQL;
|
||||
case ORACLE -> JDBC_ORACLE;
|
||||
};
|
||||
Configuration.getConfig().getPropertyNames().forEach(p -> {
|
||||
if (p.startsWith("quarkus.datasource.") && p.endsWith(".db-kind")) {
|
||||
Configuration.getOptionalValue(p)
|
||||
.flatMap(Database::getVendor)
|
||||
.ifPresent(vendorsOfAllDatasources::add);
|
||||
}
|
||||
});
|
||||
|
||||
if (vendorsOfAllDatasources.isEmpty()) {
|
||||
vendorsOfAllDatasources.add(Database.Vendor.H2);
|
||||
}
|
||||
|
||||
final Set<String> jdbcArtifacts = vendorsOfAllDatasources.stream()
|
||||
.map(vendor -> switch (vendor) {
|
||||
case H2 -> JDBC_H2;
|
||||
case MYSQL -> JDBC_MYSQL;
|
||||
case MARIADB -> JDBC_MARIADB;
|
||||
case POSTGRES -> JDBC_POSTGRES;
|
||||
case MSSQL -> JDBC_MSSQL;
|
||||
case ORACLE -> JDBC_ORACLE;
|
||||
})
|
||||
.flatMap(Collection::stream)
|
||||
.collect(Collectors.toSet());
|
||||
|
||||
final Set<String> allJdbcDrivers = new HashSet<>(JDBC_DRIVERS);
|
||||
allJdbcDrivers.removeAll(jdbcArtifacts);
|
||||
|
|
|
@ -24,12 +24,16 @@ import org.keycloak.common.profile.PropertiesProfileConfigResolver;
|
|||
import org.keycloak.config.DatabaseOptions;
|
||||
import org.keycloak.config.HealthOptions;
|
||||
import org.keycloak.config.MetricsOptions;
|
||||
import org.keycloak.quarkus.runtime.configuration.Configuration;
|
||||
import org.keycloak.quarkus.runtime.configuration.IgnoredArtifacts;
|
||||
import org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
import java.util.Properties;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import static org.hamcrest.CoreMatchers.is;
|
||||
import static org.hamcrest.CoreMatchers.not;
|
||||
|
@ -94,16 +98,41 @@ public class IgnoredArtifactsTest {
|
|||
assertJdbc("postgres", JDBC_POSTGRES);
|
||||
}
|
||||
|
||||
// default ignored JDBC artifacts specified in quarkus.properties
|
||||
private static final Set<String> IGNORED_JDBC_FROM_PROPS = Stream.of(JDBC_MARIADB, JDBC_POSTGRES)
|
||||
.flatMap(Collection::stream)
|
||||
.collect(Collectors.toSet());
|
||||
|
||||
@Test
|
||||
public void multipleDatasources() {
|
||||
var defaultDS = Configuration.getOptionalValue("quarkus.datasource.db-kind");
|
||||
assertThat(defaultDS.isPresent(), is(true));
|
||||
assertThat(defaultDS.get(), is("h2"));
|
||||
|
||||
var dogStoreDS = Configuration.getOptionalValue("quarkus.datasource.dog-store.db-kind");
|
||||
assertThat(dogStoreDS.isPresent(), is(true));
|
||||
assertThat(dogStoreDS.get(), is("mariadb"));
|
||||
|
||||
var catStoreDS = Configuration.getOptionalValue("quarkus.datasource.cat-store.db-kind");
|
||||
assertThat(catStoreDS.isPresent(), is(true));
|
||||
assertThat(catStoreDS.get(), is("postgresql"));
|
||||
|
||||
assertJdbc("h2", JDBC_H2);
|
||||
}
|
||||
|
||||
private void assertJdbc(String vendor, Set<String> notIgnored) {
|
||||
var notIgnoredWithDefaults = new HashSet<>(notIgnored);
|
||||
notIgnoredWithDefaults.addAll(IGNORED_JDBC_FROM_PROPS);
|
||||
|
||||
System.setProperty(MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX + DatabaseOptions.DB.getKey(), vendor);
|
||||
try {
|
||||
final var resultArtifacts = IgnoredArtifacts.getDefaultIgnoredArtifacts();
|
||||
assertThat(String.format("Ignored artifacts does not comply with the specified artifacts for '%s' JDBC driver", vendor),
|
||||
resultArtifacts,
|
||||
not(CoreMatchers.hasItems(notIgnored.toArray(new String[0]))));
|
||||
not(CoreMatchers.hasItems(notIgnoredWithDefaults.toArray(new String[0]))));
|
||||
|
||||
final var includedArtifacts = new HashSet<>(IgnoredArtifacts.JDBC_DRIVERS);
|
||||
includedArtifacts.removeAll(notIgnored);
|
||||
includedArtifacts.removeAll(notIgnoredWithDefaults);
|
||||
assertThat("Ignored artifacts does not contain items for the other JDBC drivers",
|
||||
resultArtifacts,
|
||||
CoreMatchers.hasItems(includedArtifacts.toArray(new String[0])));
|
||||
|
|
|
@ -8,4 +8,8 @@ quarkus.log.category."org.infinispan.transaction.lookup.JBossStandaloneJTAManage
|
|||
|
||||
# For test nested properties
|
||||
quarkus.datasource.foo = jdbc:h2:file:${kc.home.dir:${kc.db.url.path:~}}/data/keycloakdb
|
||||
quarkus.datasource.bar = foo-${kc.prop3:${kc.prop4:${kc.prop5:def}-suffix}}
|
||||
quarkus.datasource.bar = foo-${kc.prop3:${kc.prop4:${kc.prop5:def}-suffix}}
|
||||
|
||||
# test multiple datasources db-kind
|
||||
quarkus.datasource.dog-store.db-kind=mariadb
|
||||
quarkus.datasource.cat-store.db-kind=postgresql
|
Loading…
Reference in a new issue