Skip to content

Fix: Skip App Configuration validation when feature is disabled #47588

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

Merged
rujche merged 6 commits into from
Dec 30, 2025
+51 −1
Merged

Fix: Skip App Configuration validation when feature is disabled #47588

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
81a16a4
Initial plan
Copilot Dec 22, 2025
6e4a881
Fix: Skip App Configuration validation when enabled is false
Copilot Dec 22, 2025
4226065
Update CHANGELOG.md with bug fix entry
Copilot Dec 22, 2025
360dd80
Merge branch 'main' into copilot/fix-app-configuration-validation
rujche Dec 30, 2025
9a6808d
Move changelog entry to 6.2.0-beta.1 (Unreleased) section
Copilot Dec 30, 2025
688120b
Add issue link to changelog entry
Copilot Dec 30, 2025
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
10 changes: 9 additions & 1 deletion ...ring/cloud/appconfiguration/config/implementation/AzureAppConfigDataLocationResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,16 @@ public boolean isResolvable(ConfigDataLocationResolverContext context, ConfigDat
return false;
}

Binder binder = context.getBinder();

// Check if Azure App Configuration is enabled
Boolean enabled = binder.bind(AppConfigurationProperties.CONFIG_PREFIX + ".enabled", Boolean.class).orElse(true);
if (!enabled) {
return false;
}

// Check if the configuration properties for Azure App Configuration are present
return hasValidStoreConfiguration(context.getBinder());
return hasValidStoreConfiguration(binder);
}

/**
Expand Down
35 changes: 35 additions & 0 deletions .../cloud/appconfiguration/config/implementation/AzureAppConfigDataLocationResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ class AzureAppConfigDataLocationResolverTest {
@Mock
BindResult<String> validResult;

@Mock
BindResult<Boolean> enabledTrueResult;

@Mock
BindResult<Boolean> enabledFalseResult;

private static final String PREFIX = "azureAppConfiguration:";
private static final String INVALID_PREFIX = "someOtherPrefix:";

Expand Down Expand Up @@ -80,6 +86,9 @@ void testIsResolvableWithCorrectPrefix() {
ConfigDataLocation location = ConfigDataLocation.of(PREFIX);

when(mockContext.getBinder()).thenReturn(mockBinder);
when(mockBinder.bind("spring.cloud.azure.appconfiguration.enabled", Boolean.class))
.thenReturn(enabledTrueResult);
when(enabledTrueResult.orElse(true)).thenReturn(true);
when(mockBinder.bind("spring.cloud.azure.appconfiguration.stores[0].endpoint", String.class))
.thenReturn(validResult);
when(validResult.orElse("")).thenReturn("https://test.config.io");
Expand All @@ -95,6 +104,9 @@ void testIsResolvableWithValidConnectionStringConfiguration() {
ConfigDataLocation location = ConfigDataLocation.of("azureAppConfiguration:");

when(mockContext.getBinder()).thenReturn(mockBinder);
when(mockBinder.bind("spring.cloud.azure.appconfiguration.enabled", Boolean.class))
.thenReturn(enabledTrueResult);
when(enabledTrueResult.orElse(true)).thenReturn(true);
when(mockBinder.bind("spring.cloud.azure.appconfiguration.stores[0].endpoint", String.class))
.thenReturn(emptyResult);
when(emptyResult.orElse("")).thenReturn("");
Expand All @@ -108,11 +120,28 @@ void testIsResolvableWithValidConnectionStringConfiguration() {
assertTrue(result, "Resolver should accept locations with valid connection-string configuration");
}

@Test
void testIsResolvableWhenAppConfigurationIsDisabled() {
ConfigDataLocation location = ConfigDataLocation.of("azureAppConfiguration:");

when(mockContext.getBinder()).thenReturn(mockBinder);
when(mockBinder.bind("spring.cloud.azure.appconfiguration.enabled", Boolean.class))
.thenReturn(enabledFalseResult);
when(enabledFalseResult.orElse(true)).thenReturn(false);

boolean result = resolver.isResolvable(mockContext, location);

assertFalse(result, "Resolver should reject locations when App Configuration is disabled");
}

@Test
void testIsResolvableWithValidEndpointsConfiguration() {
ConfigDataLocation location = ConfigDataLocation.of("azureAppConfiguration:");

when(mockContext.getBinder()).thenReturn(mockBinder);
when(mockBinder.bind("spring.cloud.azure.appconfiguration.enabled", Boolean.class))
.thenReturn(enabledTrueResult);
when(enabledTrueResult.orElse(true)).thenReturn(true);
when(mockBinder.bind("spring.cloud.azure.appconfiguration.stores[0].endpoint", String.class))
.thenReturn(emptyResult);
when(emptyResult.orElse("")).thenReturn("");
Expand All @@ -134,6 +163,9 @@ void testIsResolvableWithValidConnectionStringsConfiguration() {
ConfigDataLocation location = ConfigDataLocation.of("azureAppConfiguration:");

when(mockContext.getBinder()).thenReturn(mockBinder);
when(mockBinder.bind("spring.cloud.azure.appconfiguration.enabled", Boolean.class))
.thenReturn(enabledTrueResult);
when(enabledTrueResult.orElse(true)).thenReturn(true);
when(mockBinder.bind("spring.cloud.azure.appconfiguration.stores[0].endpoint", String.class))
.thenReturn(emptyResult);
when(mockBinder.bind("spring.cloud.azure.appconfiguration.stores[0].connection-string", String.class))
Expand All @@ -156,6 +188,9 @@ void testIsResolvableWithNoValidConfiguration() {
ConfigDataLocation location = ConfigDataLocation.of("azureAppConfiguration:");

when(mockContext.getBinder()).thenReturn(mockBinder);
when(mockBinder.bind("spring.cloud.azure.appconfiguration.enabled", Boolean.class))
.thenReturn(enabledTrueResult);
when(enabledTrueResult.orElse(true)).thenReturn(true);
when(mockBinder.bind("spring.cloud.azure.appconfiguration.stores[0].endpoint", String.class))
.thenReturn(emptyResult);
when(mockBinder.bind("spring.cloud.azure.appconfiguration.stores[0].connection-string", String.class))
Expand Down
Loading