From 4f6dcd0de82b6c616dc1a01cd2a4abe5d8f3c0ff Mon Sep 17 00:00:00 2001 From: Tommy Ludwig Date: Sat, 21 Oct 2017 05:20:15 +0900 Subject: [PATCH] Include TransportConfiguration for server bootstrap case (#812) Previously, taking SSH configuration from properties (as opposed to the default SSH configuration files) was only possible when not bootstrapping the Config Server itself. This includes the `TransportationConfiguration` for the bootstrap case as well. Related to gh-741 --- .../server/bootstrap/ConfigServerBootstrapConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/bootstrap/ConfigServerBootstrapConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/bootstrap/ConfigServerBootstrapConfiguration.java index dc8b611a..388144c0 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/bootstrap/ConfigServerBootstrapConfiguration.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/bootstrap/ConfigServerBootstrapConfiguration.java @@ -21,6 +21,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.cloud.config.client.ConfigClientProperties; import org.springframework.cloud.config.server.config.ConfigServerProperties; import org.springframework.cloud.config.server.config.EnvironmentRepositoryConfiguration; +import org.springframework.cloud.config.server.config.TransportConfiguration; import org.springframework.cloud.config.server.environment.EnvironmentRepository; import org.springframework.cloud.config.server.environment.EnvironmentRepositoryPropertySourceLocator; import org.springframework.context.annotation.Bean; @@ -44,7 +45,7 @@ import org.springframework.util.StringUtils; public class ConfigServerBootstrapConfiguration { @EnableConfigurationProperties(ConfigServerProperties.class) - @Import(EnvironmentRepositoryConfiguration.class) + @Import({ EnvironmentRepositoryConfiguration.class, TransportConfiguration.class }) protected static class LocalPropertySourceLocatorConfiguration { @Autowired