Fix the order of importing properties in Secrets Manager integration (#…

…882) Co-authored-by: Tomek Bielecki <Tomek.Bielecki@aus.com>
awspring · Dec 10, 2023 · 2d8fd9a · 2d8fd9a
1 parent 28e4f7f
commit 2d8fd9a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/...g/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLocationResolver.java b/...g/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLocationResolver.java
@@ -24,10 +24,7 @@
 import java.util.List;
 import org.apache.commons.logging.Log;
 import org.springframework.boot.BootstrapContext;
-import org.springframework.boot.context.config.ConfigDataLocation;
-import org.springframework.boot.context.config.ConfigDataLocationNotFoundException;
-import org.springframework.boot.context.config.ConfigDataLocationResolverContext;
-import org.springframework.boot.context.config.Profiles;
+import org.springframework.boot.context.config.*;
 import org.springframework.boot.context.properties.bind.Bindable;
 import org.springframework.boot.context.properties.bind.Binder;
 import org.springframework.boot.logging.DeferredLogFactory;
@@ -62,9 +59,9 @@ protected String getPrefix() {
 	}
 
 	@Override
-	public List<SecretsManagerConfigDataResource> resolveProfileSpecific(
-			ConfigDataLocationResolverContext resolverContext, ConfigDataLocation location, Profiles profiles)
-			throws ConfigDataLocationNotFoundException {
+	public List<SecretsManagerConfigDataResource> resolve(ConfigDataLocationResolverContext resolverContext,
+			ConfigDataLocation location)
+			throws ConfigDataLocationNotFoundException, ConfigDataResourceNotFoundException {
 		registerBean(resolverContext, AwsProperties.class, loadAwsProperties(resolverContext.getBinder()));
 		registerBean(resolverContext, SecretsManagerProperties.class, loadProperties(resolverContext.getBinder()));
 		registerBean(resolverContext, CredentialsProperties.class,

diff --git a/...d/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLoaderIntegrationTests.java b/...d/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLoaderIntegrationTests.java
@@ -44,6 +44,8 @@
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.env.PropertySource;
+import org.springframework.test.context.TestPropertySource;
 import org.testcontainers.containers.localstack.LocalStackContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
@@ -169,6 +171,17 @@ void resolvesPropertyFromSecretsManager_PlainTextSecret_WithoutSlashes() {
 		}
 	}
 
+	@Test
+	void respectsImportOrder() {
+		SpringApplication application = new SpringApplication(App.class);
+		application.setWebApplicationType(WebApplicationType.NONE);
+
+		try (ConfigurableApplicationContext context = runApplication(application,
+			"classpath:config.properties")) {
+			assertThat(context.getEnvironment().getProperty("another-parameter")).isEqualTo("from properties file");
+		}
+	}
+
 	@Test
 	void clientIsConfiguredWithConfigurerProvidedToBootstrapRegistry() {
 		SpringApplication application = new SpringApplication(App.class);

diff --git a/spring-cloud-aws-autoconfigure/src/test/resources/config.properties b/spring-cloud-aws-autoconfigure/src/test/resources/config.properties
@@ -0,0 +1 @@
+spring.config.import=aws-secretsmanager:/config/spring,classpath:config_second.properties
diff --git a/spring-cloud-aws-autoconfigure/src/test/resources/config_second.properties b/spring-cloud-aws-autoconfigure/src/test/resources/config_second.properties
@@ -0,0 +1 @@
+another-parameter=from properties file