8000 fix: hide runtime defaults during Quarkus dev mode augmentation by sachinnn99 · Pull Request #47743 · keycloak/keycloak · GitHub
[go: up one dir, main page]
Skip to content

fix: hide runtime defaults during Quarkus dev mode augmentation #47743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sachinnn99 wants to merge 1 commit into from
Closed

fix: hide runtime defaults during Quarkus dev mode augmentation #47743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...ime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMappers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.keycloak.quarkus.runtime.configuration.NestedPropertyMappingInterceptor;
import org.keycloak.quarkus.runtime.configuration.PersistedConfigSource;

import io.quarkus.runtime.LaunchMode;
import io.smallrye.config.ConfigSourceInterceptorContext;
import io.smallrye.config.ConfigValue;
import io.smallrye.config.Expressions;
Expand Down Expand Up @@ -89,6 +90,11 @@ public static ConfigValue getValue(ConfigSourceInterceptorContext context, Strin
return ConfigValue.builder().withName(name).build();
}

// In Quarkus dev mode, also hide runtime defaults during augmentation probing (fixes #47659)
if (LaunchMode.current() == LaunchMode.DEVELOPMENT && !Expressions.isEnabled() && isKeycloakRuntime(name, mapper)) {
return ConfigValue.builder().withName(name).build();
}

if (mapper == null) {
return context.proceed(name);
}
Expand Down
16 changes: 16 additions & 0 deletions ...s/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/ConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import org.keycloak.spi.infinispan.CacheEmbeddedConfigProviderSpi;
import org.keycloak.spi.infinispan.impl.embedded.DefaultCacheEmbeddedConfigProviderFactory;

import io.quarkus.runtime.LaunchMode;
import io.smallrye.config.ConfigValue;
import io.smallrye.config.Expressions;
import io.smallrye.config.PropertiesConfigSource;
Expand Down Expand Up @@ -108,6 +109,21 @@ public void testKeycloakConfPlaceholder() {
assertNull(Expressions.withoutExpansion(() -> Configuration.getConfigValue("kc.log-level")).getValue());
}

@Test
public void testDevModeAugmentationHidesRuntimeDefaults() {
ConfigArgsConfigSource.setCliArgs("--log-console-output=default");
createConfig();
LaunchMode.set(LaunchMode.DEVELOPMENT);
try {
// runtime values should be hidden when Quarkus probes for defaults during dev-mode augmentation
assertNull(Expressions.withoutExpansion(() -> Configuration.getConfigValue("kc.log-console-output")).getValue());
// but visible during normal dev-mode runtime (expressions enabled)
assertNotNull(Configuration.getConfigValue("kc.log-console-output").getValue());
} finally {
LaunchMode.set(LaunchMode.NORMAL);
}
}

@Test
public void testEnvVarAvailableFromPropertyNames() {
putEnvVar("KC_VAULT_DIR", "/foo/bar");
Expand Down
0