Revert "Fix the order of importing properties in Secrets Manager inte…

…gration (#882)" (#991)

This reverts commit 294f91b

spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLocationResolver.java

@@ -24,7 +24,10 @@
 import java.util.List;
 import org.apache.commons.logging.Log;
 import org.springframework.boot.BootstrapContext;
-import org.springframework.boot.context.config.*;
+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.properties.bind.Bindable;
 import org.springframework.boot.context.properties.bind.Binder;
 import org.springframework.boot.logging.DeferredLogFactory;
@@ -59,9 +62,9 @@ protected String getPrefix() {
 	}
 
 	@Override
-	public List<SecretsManagerConfigDataResource> resolve(ConfigDataLocationResolverContext resolverContext,
-			ConfigDataLocation location)
-			throws ConfigDataLocationNotFoundException, ConfigDataResourceNotFoundException {
+	public List<SecretsManagerConfigDataResource> resolveProfileSpecific(
+			ConfigDataLocationResolverContext resolverContext, ConfigDataLocation location, Profiles profiles)
+			throws ConfigDataLocationNotFoundException {
 		registerBean(resolverContext, AwsProperties.class, loadAwsProperties(resolverContext.getBinder()));
 		registerBean(resolverContext, SecretsManagerProperties.class, loadProperties(resolverContext.getBinder()));
 		registerBean(resolverContext, CredentialsProperties.class,

spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLoaderIntegrationTests.java

@@ -169,16 +169,6 @@ 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);