Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fail hard if spring.profiles.include is used with new config processing

Browse Source 
Closes gh-22693
This commit is contained in:
Madhura Bhave
2020-08-05 14:41:32 -07:00
parent e719a246df
commit b9abcf1615
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/InvalidConfigDataPropertyException.java
View File

@@ -35,7 +35,7 @@ import org.springframework.boot.context.properties.source.ConfigurationPropertyS
*/
public class InvalidConfigDataPropertyException extends ConfigDataException {
private static final Map<ConfigurationPropertyName, ConfigurationPropertyName> ERROR = Collections.emptyMap();
private static final Map<ConfigurationPropertyName, ConfigurationPropertyName> ERROR;
private static final Map<ConfigurationPropertyName, ConfigurationPropertyName> WARNING;
static {
@@ -43,6 +43,10 @@ public class InvalidConfigDataPropertyException extends ConfigDataException {
warning.put(ConfigurationPropertyName.of("spring.profiles"),
ConfigurationPropertyName.of("spring.config.activate.on-profile"));
WARNING = Collections.unmodifiableMap(warning);
Map<ConfigurationPropertyName, ConfigurationPropertyName> error = new LinkedHashMap<>();
error.put(ConfigurationPropertyName.of("spring.profiles.include"),
ConfigurationPropertyName.of("spring.profiles.group"));
ERROR = Collections.unmodifiableMap(error);
}
private final ConfigurationProperty property;

11
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/InvalidConfigDataPropertyExceptionTests.java
View File

@@ -123,6 +123,17 @@ class InvalidConfigDataPropertyExceptionTests {
+ "'spring.config.activate.on-profile' [origin: \"spring.profiles\" from property source \"mockProperties\"]");
}
@Test
void throwOrWarnWhenHasErrorPropertyThrowsException() {
MockPropertySource propertySource = new MockPropertySource();
propertySource.setProperty("spring.profiles.include", "a");
ConfigDataEnvironmentContributor contributor = ConfigDataEnvironmentContributor.ofExisting(propertySource);
assertThatExceptionOfType(InvalidConfigDataPropertyException.class)
.isThrownBy(() -> InvalidConfigDataPropertyException.throwOrWarn(this.logger, contributor))
.withMessage("Property 'spring.profiles.include' is invalid and should be replaced with "
+ "'spring.profiles.group' [origin: \"spring.profiles.include\" from property source \"mockProperties\"]");
}
private static class TestConfigDataLocation extends ConfigDataLocation {
@Override