Fixed the order of importing properties

[tomek82]

📢 Type of change

• Bugfix
• New feature
• Enhancement
• Refactoring

📜 Description

Change the Secrets Manager resolver to use resolve instead of resolveProfileSpecific to fix the import order bug.

💡 Motivation and Context

#881

💚 How did you test it?

Build locally and run application with
spring.config.import=aws-secretsmanager:${ENV}/config,optional:classpath:config.properties
and verified that the properties are overridden correctly. Also tested with profile-specific application-local.properties.

📝 Checklist

• I reviewed submitted code
• I added tests to verify changes
• I updated reference documentation to reflect the change
• All tests passing
• No breaking changes

🔮 Next steps

[maciejwalkowiak]

Thanks @tomek82. Good catch. Can you add a test for this change?

[tomek82]

@maciejwalkowiak What is a good way to test it? My attempts with adding a classpath source to command line in io.awspring.cloud.autoconfigure.config.secretsmanager.SecretsManagerConfigDataLoaderIntegrationTests fail as it seems to be working without this change and I can't get a separate @propertysource to work either (it does load the file but doesn't process the secrets import).

[maciejwalkowiak]

You can test it like this.

Add test to SecretsManagerConfigDataLoaderIntegrationTests:

@Test
void respectsImportOrder() {
	SpringApplication application = new SpringApplication(App.class);
	application.setWebApplicationType(WebApplicationType.NONE);

	try (ConfigurableApplicationContext context = runApplication(application,
		"aws-secretsmanager:/config/spring,classpath:config.properties")) {
		assertThat(context.getEnvironment().getProperty("another-parameter")).isEqualTo("from properties file");
	}
}

and config.properties file in src/test/resources:

another-parameter=from properties file

The test passes without your changes too, so I am a bit puzzled. Perhaps this bug exists only in 2.x?

[tomek82]

I've added a test with one more level of indirection, without my fix this fails to load the properties in the right order.

[maciejwalkowiak]

Thanks! Because it may have surprising side effects we will release it with 3.1.0