SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sets spring.config.all-locations-optional=true for config server.

Browse Source
This commit is contained in:
spencergibb
2020-08-27 10:34:02 -04:00
parent 34e1220520
commit d4d640dfac
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java
View File

@@ -219,6 +219,7 @@ public class NativeEnvironmentRepository
// map.put("encrypt.failOnError=" + this.failOnError);
map.put("spring.config.location", StringUtils.arrayToCommaDelimitedString(
getLocations(application, profile, label).getLocations()));
map.put("spring.config.all-locations-optional", true);
environment.getPropertySources()
.addFirst(new MapPropertySource("config-data-setup", map));
return environment;

12
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/TransportConfigurationIntegrationTests.java
View File

@@ -57,7 +57,7 @@ public class TransportConfigurationIntegrationTests {
classes = { ConfigServerApplication.class, SshPropertyValidator.class },
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
properties = {
"spring.config.additional-location=file:/ssh/,classpath:/ssh/",
"spring.config.additional-location=optional:file:/ssh/,optional:classpath:/ssh/",
"spring.config.name:ssh-private-key-block" })
@ActiveProfiles({ "test", "git" })
public static class StaticTest {
@@ -80,7 +80,7 @@ public class TransportConfigurationIntegrationTests {
classes = { ConfigServerApplication.class, SshPropertyValidator.class },
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
properties = {
"spring.config.additional-location=file:/ssh/,classpath:/ssh/",
"spring.config.additional-location=optional:file:/ssh/,optional:classpath:/ssh/",
"spring.config.name:ssh-private-key-block-list" })
@ActiveProfiles({ "test", "composite" })
public static class ListTest {
@@ -107,7 +107,7 @@ public class TransportConfigurationIntegrationTests {
classes = { ConfigServerApplication.class, SshPropertyValidator.class },
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
properties = {
"spring.config.additional-location=file:/ssh/,classpath:/ssh/",
"spring.config.additional-location=optional:file:/ssh/,optional:classpath:/ssh/",
"spring.config.name:ssh-private-key-newline" })
@ActiveProfiles({ "test", "git" })
public static class StaticTest {
@@ -134,7 +134,7 @@ public class TransportConfigurationIntegrationTests {
classes = { ConfigServerApplication.class, SshPropertyValidator.class },
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
properties = {
"spring.config.additional-location=file:/ssh/,classpath:/ssh/",
"spring.config.additional-location=optional:file:/ssh/,optional:classpath:/ssh/",
"spring.config.name:ssh-private-key-newline-list" })
@ActiveProfiles({ "test", "composite" })
public static class ListTest {
@@ -165,7 +165,7 @@ public class TransportConfigurationIntegrationTests {
classes = { ConfigServerApplication.class, SshPropertyValidator.class },
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
properties = {
"spring.config.additional-location=file:/ssh/,classpath:/ssh/",
"spring.config.additional-location=optional:file:/ssh/,optional:classpath:/ssh/",
"spring.config.name:ssh-nested-settings" })
@ActiveProfiles({ "test", "git" })
public static class StaticTest {
@@ -198,7 +198,7 @@ public class TransportConfigurationIntegrationTests {
classes = { ConfigServerApplication.class, SshPropertyValidator.class },
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
properties = {
"spring.config.additional-location=file:/ssh/,classpath:/ssh/",
"spring.config.additional-location=optional:file:/ssh/,optional:classpath:/ssh/",
"spring.config.name:ssh-nested-settings-list" })
@ActiveProfiles({ "test", "composite" })
public static class ListTest {