From d4d640dfaca045e949c0fee0b04c76a45f85d43d Mon Sep 17 00:00:00 2001 From: spencergibb Date: Thu, 27 Aug 2020 10:34:02 -0400 Subject: [PATCH] Sets spring.config.all-locations-optional=true for config server. --- .../environment/NativeEnvironmentRepository.java | 1 + .../TransportConfigurationIntegrationTests.java | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java index 6260e60c..ea8f3da4 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java @@ -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; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/TransportConfigurationIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/TransportConfigurationIntegrationTests.java index bddbf709..e06d80a1 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/TransportConfigurationIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/TransportConfigurationIntegrationTests.java @@ -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 {