From 12e882e41ced0edfa0fb5aa0fc6f6eb0f66d7d56 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 4 Aug 2022 10:52:23 -0400 Subject: [PATCH 01/30] Fixing AWS test --- .../AwsParameterStoreEnvironmentRepositoryTests.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/AwsParameterStoreEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/AwsParameterStoreEnvironmentRepositoryTests.java index 02454927..f63dca7e 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/AwsParameterStoreEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/AwsParameterStoreEnvironmentRepositoryTests.java @@ -808,6 +808,8 @@ public class AwsParameterStoreEnvironmentRepositoryTests { AwsParameterStoreEnvironmentRepositoryFactory factory = new AwsParameterStoreEnvironmentRepositoryFactory( new ConfigServerProperties()); AwsParameterStoreEnvironmentProperties properties = new AwsParameterStoreEnvironmentProperties(); + properties.setRegion("us-east-1"); + properties.setEndpoint("https://myawsendpoint/"); properties.setOrder(expectedOrder); AwsParameterStoreEnvironmentRepository repository = factory.build(properties); int actualOrder = repository.getOrder(); From ea606a4628d91a07a583725d2f86db7a8273a44a Mon Sep 17 00:00:00 2001 From: ts-schu <109224314+ts-schu@users.noreply.github.com> Date: Tue, 16 Aug 2022 17:45:08 +0200 Subject: [PATCH 02/30] Fix access to redirected git repositories (#2128) * Don't provide a custom HttpClient if not needed * Disable redirect handling * Fix unit test * Add comment why to disable redirect handling * Remove trailing whitespace * Rearrange code and add comment --- ...ttpClientConfigurableHttpConnectionFactory.java | 14 ++++++++++---- .../config/server/support/HttpClientSupport.java | 4 ++++ ...lientConfigurableHttpConnectionFactoryTest.java | 6 ++---- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactory.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactory.java index 76d8ec0d..47f4e656 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactory.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactory.java @@ -32,7 +32,6 @@ import java.util.stream.Collectors; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.impl.client.HttpClients; import org.eclipse.jgit.transport.http.HttpConnection; import org.eclipse.jgit.transport.http.apache.HttpClientConnection; @@ -70,7 +69,14 @@ public class HttpClientConfigurableHttpConnectionFactory implements Configurable @Override public HttpConnection create(URL url, Proxy proxy) throws IOException { - return new HttpClientConnection(url.toString(), null, lookupHttpClientBuilder(url).build()); + HttpClientBuilder builder = lookupHttpClientBuilder(url); + if (builder != null) { + return new HttpClientConnection(url.toString(), null, builder.build()); + } + else { + /* No matching builder found: let jGit handle the creation of the HttpClient */ + return new HttpClientConnection(url.toString()); + } } private void addHttpClient(JGitEnvironmentProperties properties) throws GeneralSecurityException { @@ -99,7 +105,7 @@ public class HttpClientConfigurableHttpConnectionFactory implements Configurable if (builderMap.isEmpty()) { this.log.warn(String.format("No custom http config found for URL: %s", url)); - return HttpClients.custom(); + return null; } if (builderMap.size() > 1) { /* @@ -118,7 +124,7 @@ public class HttpClientConfigurableHttpConnectionFactory implements Configurable "More than one git repo URL template matched URL:" + " %s, proxy and skipSslValidation config won't be applied. Matched templates: %s", url, builderMap.keySet().stream().collect(Collectors.joining(", ")))); - return HttpClients.custom(); + return null; } return new ArrayList<>(builderMap.values()).get(0); } diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/HttpClientSupport.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/HttpClientSupport.java index 35195109..e5b3933f 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/HttpClientSupport.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/HttpClientSupport.java @@ -65,6 +65,10 @@ public final class HttpClientSupport { httpClientBuilder.setDefaultCredentialsProvider(new SystemDefaultCredentialsProvider()); } + /* According to https://git.eclipse.org/c/jgit/jgit.git/commit/?id=e17bfc96f293744cc5c0cef306e100f53d63bb3d + jGit does its own redirect handling and disables HttpClient's redirect handing. */ + httpClientBuilder.disableRedirectHandling(); + int timeout = environmentProperties.getTimeout() * 1000; return httpClientBuilder.setSSLContext(sslContextBuilder.build()).setDefaultRequestConfig( RequestConfig.custom().setSocketTimeout(timeout).setConnectTimeout(timeout).build()); diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactoryTest.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactoryTest.java index ea2b4f4d..43948763 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactoryTest.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactoryTest.java @@ -198,10 +198,8 @@ public class HttpClientConfigurableHttpConnectionFactoryTest { HttpConnection actualConnection = this.connectionFactory.create( new URL(properties2.getUri().replace("{placeholder1}", "value1").replace("{placeholder2}", "value2"))); - HttpClientBuilder expectedHttpClientBuilder = this.connectionFactory.httpClientBuildersByUri - .get(properties2.getUri()); - HttpClientBuilder actualHttpClientBuilder = getActualHttpClientBuilder(actualConnection); - assertThat(actualHttpClientBuilder).isNotSameAs(expectedHttpClientBuilder); + HttpClient actualHttpClient = getActualHttpClient(actualConnection); + assertThat(actualHttpClient).isNull(); } @Test From 6be6a682165510cd74894ae52068ac00e53b09f4 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 17 Aug 2022 00:29:50 +0000 Subject: [PATCH 03/30] Bumping versions --- .../HttpClientConfigurableHttpConnectionFactory.java | 4 +++- .../cloud/config/server/support/HttpClientSupport.java | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactory.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactory.java index 47f4e656..c9ad4205 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactory.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactory.java @@ -74,7 +74,9 @@ public class HttpClientConfigurableHttpConnectionFactory implements Configurable return new HttpClientConnection(url.toString(), null, builder.build()); } else { - /* No matching builder found: let jGit handle the creation of the HttpClient */ + /* + * No matching builder found: let jGit handle the creation of the HttpClient + */ return new HttpClientConnection(url.toString()); } } diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/HttpClientSupport.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/HttpClientSupport.java index e5b3933f..bcd310b1 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/HttpClientSupport.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/HttpClientSupport.java @@ -65,8 +65,11 @@ public final class HttpClientSupport { httpClientBuilder.setDefaultCredentialsProvider(new SystemDefaultCredentialsProvider()); } - /* According to https://git.eclipse.org/c/jgit/jgit.git/commit/?id=e17bfc96f293744cc5c0cef306e100f53d63bb3d - jGit does its own redirect handling and disables HttpClient's redirect handing. */ + /* + * According to https://git.eclipse.org/c/jgit/jgit.git/commit/?id= + * e17bfc96f293744cc5c0cef306e100f53d63bb3d jGit does its own redirect handling + * and disables HttpClient's redirect handing. + */ httpClientBuilder.disableRedirectHandling(); int timeout = environmentProperties.getTimeout() * 1000; From a058f4dd9e68cde5a4b87cf1a852e032ea3dde69 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 17 Aug 2022 02:51:11 +0000 Subject: [PATCH 04/30] Bumping versions --- .../HttpClientConfigurableHttpConnectionFactory.java | 4 +++- .../cloud/config/server/support/HttpClientSupport.java | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactory.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactory.java index 47f4e656..c9ad4205 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactory.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactory.java @@ -74,7 +74,9 @@ public class HttpClientConfigurableHttpConnectionFactory implements Configurable return new HttpClientConnection(url.toString(), null, builder.build()); } else { - /* No matching builder found: let jGit handle the creation of the HttpClient */ + /* + * No matching builder found: let jGit handle the creation of the HttpClient + */ return new HttpClientConnection(url.toString()); } } diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/HttpClientSupport.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/HttpClientSupport.java index e5b3933f..bcd310b1 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/HttpClientSupport.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/HttpClientSupport.java @@ -65,8 +65,11 @@ public final class HttpClientSupport { httpClientBuilder.setDefaultCredentialsProvider(new SystemDefaultCredentialsProvider()); } - /* According to https://git.eclipse.org/c/jgit/jgit.git/commit/?id=e17bfc96f293744cc5c0cef306e100f53d63bb3d - jGit does its own redirect handling and disables HttpClient's redirect handing. */ + /* + * According to https://git.eclipse.org/c/jgit/jgit.git/commit/?id= + * e17bfc96f293744cc5c0cef306e100f53d63bb3d jGit does its own redirect handling + * and disables HttpClient's redirect handing. + */ httpClientBuilder.disableRedirectHandling(); int timeout = environmentProperties.getTimeout() * 1000; From 0823b5d3434c4103cb0ea7fdf268c06e54c417d9 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 24 Aug 2022 13:18:41 -0400 Subject: [PATCH 05/30] Updates to new redis prefix --- .../RedisEnvironmentRepositoryIntegrationTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/RedisEnvironmentRepositoryIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/RedisEnvironmentRepositoryIntegrationTests.java index 1dc19b69..e4203eca 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/RedisEnvironmentRepositoryIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/RedisEnvironmentRepositoryIntegrationTests.java @@ -49,8 +49,8 @@ public class RedisEnvironmentRepositoryIntegrationTests { @DynamicPropertySource static void containerProperties(DynamicPropertyRegistry registry) { - registry.add("spring.redis.host", redisContainer::getContainerIpAddress); - registry.add("spring.redis.port", redisContainer::getFirstMappedPort); + registry.add("spring.data.redis.host", redisContainer::getHost); + registry.add("spring.data.redis.port", redisContainer::getFirstMappedPort); } @Test From 281f137e7cd44167b46899804ab31589d77445cb Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 24 Aug 2022 13:19:34 -0400 Subject: [PATCH 06/30] Updates to testcontainers to 1.17.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fadd52b0..94bf8561 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ 4.0.0-SNAPSHOT 2.17.195 v1-rev20201112-1.30.10 - 1.16.2 + 1.17.3 2.31.0 1.10.0-M3 1.0.0-M6 From 8de4b27ee3497d27680d5533a547eb7ca415e3f7 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Wed, 24 Aug 2022 14:18:40 -0400 Subject: [PATCH 07/30] Migrate to new autoconfiguration (#2137) --- .../src/main/resources/META-INF/spring.factories | 3 --- ...ingframework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/META-INF/spring.factories | 3 --- ...ingframework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/META-INF/spring.factories | 5 ----- ...ingframework.boot.autoconfigure.AutoConfiguration.imports | 3 +++ 6 files changed, 5 insertions(+), 11 deletions(-) create mode 100644 spring-cloud-config-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 spring-cloud-config-monitor/src/main/resources/META-INF/spring.factories create mode 100644 spring-cloud-config-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 spring-cloud-config-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/spring-cloud-config-client/src/main/resources/META-INF/spring.factories b/spring-cloud-config-client/src/main/resources/META-INF/spring.factories index 190b4ce0..e9918536 100644 --- a/spring-cloud-config-client/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-config-client/src/main/resources/META-INF/spring.factories @@ -1,6 +1,3 @@ -# Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.config.client.ConfigClientAutoConfiguration # Bootstrap components org.springframework.cloud.bootstrap.BootstrapConfiguration=\ org.springframework.cloud.config.client.ConfigServiceBootstrapConfiguration,\ diff --git a/spring-cloud-config-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-config-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..e96d07d5 --- /dev/null +++ b/spring-cloud-config-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.springframework.cloud.config.client.ConfigClientAutoConfiguration diff --git a/spring-cloud-config-monitor/src/main/resources/META-INF/spring.factories b/spring-cloud-config-monitor/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 66f23537..00000000 --- a/spring-cloud-config-monitor/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -# Autoconfiguration -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.config.monitor.EnvironmentMonitorAutoConfiguration diff --git a/spring-cloud-config-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-config-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..dd290615 --- /dev/null +++ b/spring-cloud-config-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.springframework.cloud.config.monitor.EnvironmentMonitorAutoConfiguration diff --git a/spring-cloud-config-server/src/main/resources/META-INF/spring.factories b/spring-cloud-config-server/src/main/resources/META-INF/spring.factories index 31eb4d95..a2cb54dd 100644 --- a/spring-cloud-config-server/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-config-server/src/main/resources/META-INF/spring.factories @@ -7,10 +7,5 @@ org.springframework.cloud.config.server.config.EncryptionAutoConfiguration org.springframework.boot.env.EnvironmentPostProcessor=\ org.springframework.cloud.config.server.bootstrap.ConfigServerBootstrapApplicationListener -# Autoconfiguration -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.config.server.config.ConfigServerAutoConfiguration,\ -org.springframework.cloud.config.server.config.EncryptionAutoConfiguration,\ -org.springframework.cloud.config.server.config.VaultEncryptionAutoConfiguration org.springframework.boot.diagnostics.FailureAnalyzer=\ org.springframework.cloud.config.server.diagnostics.GitUriFailureAnalyzer diff --git a/spring-cloud-config-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-config-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..b8ba3745 --- /dev/null +++ b/spring-cloud-config-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +org.springframework.cloud.config.server.config.ConfigServerAutoConfiguration +org.springframework.cloud.config.server.config.EncryptionAutoConfiguration +org.springframework.cloud.config.server.config.VaultEncryptionAutoConfiguration From 587b4f1c84fe1ceb47cc2529d1c830bf989a123f Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Wed, 31 Aug 2022 17:07:46 -0400 Subject: [PATCH 08/30] specifying which server to mock the request for --- .../cloud/config/server/support/HttpClientSupportTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java index b22fff21..ecf9606e 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java @@ -77,7 +77,7 @@ public class HttpClientSupportTest { wireMockProxyServer.start(); wireMockServer.start(); WireMock.configureFor("https", "localhost", wireMockServer.httpsPort()); - stubFor(get("/test/proxy").willReturn(aResponse().withStatus(200))); + wireMockServer.stubFor(get("/test/proxy").willReturn(aResponse().withStatus(200))); JGitEnvironmentProperties properties = new JGitEnvironmentProperties(); Map proxy = new HashMap<>(); From 7434ff895b9af62ab41ab492193f170023a8c542 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Wed, 31 Aug 2022 19:17:32 -0400 Subject: [PATCH 09/30] Fixing checkstyle --- .../cloud/config/server/support/HttpClientSupportTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java index ecf9606e..1050c953 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java @@ -45,7 +45,6 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.get; import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor; -import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static com.github.tomakehurst.wiremock.client.WireMock.verify; import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; From 3cd38b04f24d602c024efc2858d1108a6bef68f6 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 2 Sep 2022 11:35:51 -0400 Subject: [PATCH 10/30] Disables test failing with boot 2.6.11 and managed jetty version See gh-2142 --- .../cloud/config/server/support/HttpClientSupportTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java index 1050c953..0f90d840 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java @@ -28,6 +28,7 @@ import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledOnJre; import org.junit.jupiter.api.condition.JRE; @@ -69,6 +70,7 @@ public class HttpClientSupportTest { @Test @EnabledOnJre(JRE.JAVA_8) + @Disabled // https://github.com/spring-cloud/spring-cloud-config/issues/2142 public void httpsProxy() throws GeneralSecurityException, IOException { WireMockServer wireMockProxyServer = new WireMockServer( options().httpDisabled(true).dynamicHttpsPort().enableBrowserProxying(true).trustAllProxyTargets(true)); From eb91900671fbb588db1ec1d0c8b65256ba9efdb6 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 2 Sep 2022 23:34:59 +0000 Subject: [PATCH 11/30] Update SNAPSHOT to 3.1.4 --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-config-client-tls-tests/pom.xml | 2 +- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 4 ++-- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 10c0aaec..282d21f0 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.4 .. diff --git a/pom.xml b/pom.xml index 0b9501c2..38e3aa22 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.4 pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.4-SNAPSHOT + 3.1.4 @@ -27,7 +27,7 @@ config - 3.1.4-SNAPSHOT + 3.1.4 1.11.911 v1-rev20201112-1.30.10 1.16.2 diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index 823356c8..75cb8db0 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.4 .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index d9667232..6f1e5a40 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.4 .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 96a4bac0..786c2ee2 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.4 spring-cloud-config-dependencies - 3.1.4-SNAPSHOT + 3.1.4 pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index c572dde4..f2e7c623 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.4 .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 3.1.3-SNAPSHOT + 3.1.2 diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 7bdc5b08..509d2766 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.4 .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 895fd710..5587bfad 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.4 .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index b9a796b4..25e2c80e 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.4 spring-cloud-starter-config - 3.1.4-SNAPSHOT + 3.1.4 spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From 2c5c998e3257924e18e8e8755521db61c6514445 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 2 Sep 2022 23:37:00 +0000 Subject: [PATCH 12/30] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-config-client-tls-tests/pom.xml | 2 +- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 4 ++-- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 282d21f0..10c0aaec 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4 + 3.1.4-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 38e3aa22..0b9501c2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 3.1.4 + 3.1.4-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.4 + 3.1.4-SNAPSHOT @@ -27,7 +27,7 @@ config - 3.1.4 + 3.1.4-SNAPSHOT 1.11.911 v1-rev20201112-1.30.10 1.16.2 diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index 75cb8db0..823356c8 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4 + 3.1.4-SNAPSHOT .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 6f1e5a40..d9667232 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4 + 3.1.4-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 786c2ee2..96a4bac0 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.4 + 3.1.4-SNAPSHOT spring-cloud-config-dependencies - 3.1.4 + 3.1.4-SNAPSHOT pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index f2e7c623..c572dde4 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4 + 3.1.4-SNAPSHOT .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 3.1.2 + 3.1.3-SNAPSHOT diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 509d2766..7bdc5b08 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4 + 3.1.4-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 5587bfad..895fd710 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4 + 3.1.4-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 25e2c80e..b9a796b4 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-config - 3.1.4 + 3.1.4-SNAPSHOT spring-cloud-starter-config - 3.1.4 + 3.1.4-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From 5b3624134b24b900cf60e26439d1c9110a591945 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 2 Sep 2022 23:37:01 +0000 Subject: [PATCH 13/30] Bumping versions to 3.1.5-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-config-client-tls-tests/pom.xml | 2 +- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 2 +- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 10c0aaec..7599b3b2 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 0b9501c2..2053c87a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT @@ -27,7 +27,7 @@ config - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT 1.11.911 v1-rev20201112-1.30.10 1.16.2 diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index 823356c8..5980da4e 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index d9667232..29305b7d 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 96a4bac0..61dc7bee 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT spring-cloud-config-dependencies - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index c572dde4..5d683423 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT .. spring-cloud-config-monitor diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 7bdc5b08..feebbc2c 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 895fd710..6552e99c 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index b9a796b4..8c042e8a 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT spring-cloud-starter-config - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From d7b7955ab1e5183ebd05666c19c1ce6cd2035e6b Mon Sep 17 00:00:00 2001 From: buildmaster Date: Sat, 3 Sep 2022 00:30:46 +0000 Subject: [PATCH 14/30] Bumping versions --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-config-client-tls-tests/pom.xml | 2 +- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 2 +- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 7599b3b2..10c0aaec 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 3.1.5-SNAPSHOT + 3.1.4-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 2053c87a..0b9501c2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 3.1.5-SNAPSHOT + 3.1.4-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.5-SNAPSHOT + 3.1.4-SNAPSHOT @@ -27,7 +27,7 @@ config - 3.1.5-SNAPSHOT + 3.1.4-SNAPSHOT 1.11.911 v1-rev20201112-1.30.10 1.16.2 diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index 5980da4e..823356c8 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 3.1.5-SNAPSHOT + 3.1.4-SNAPSHOT .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 29305b7d..d9667232 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 3.1.5-SNAPSHOT + 3.1.4-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 61dc7bee..96a4bac0 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.5-SNAPSHOT + 3.1.4-SNAPSHOT spring-cloud-config-dependencies - 3.1.5-SNAPSHOT + 3.1.4-SNAPSHOT pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index 5d683423..c572dde4 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 3.1.5-SNAPSHOT + 3.1.4-SNAPSHOT .. spring-cloud-config-monitor diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index feebbc2c..7bdc5b08 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 3.1.5-SNAPSHOT + 3.1.4-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 6552e99c..895fd710 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 3.1.5-SNAPSHOT + 3.1.4-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 8c042e8a..b9a796b4 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-config - 3.1.5-SNAPSHOT + 3.1.4-SNAPSHOT spring-cloud-starter-config - 3.1.5-SNAPSHOT + 3.1.4-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From 996a7c209075921eb1f8d5941b83059b23b0019d Mon Sep 17 00:00:00 2001 From: buildmaster Date: Sun, 4 Sep 2022 00:29:04 +0000 Subject: [PATCH 15/30] Bumping versions --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-config-client-tls-tests/pom.xml | 2 +- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 2 +- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 10c0aaec..7599b3b2 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 0b9501c2..2053c87a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT @@ -27,7 +27,7 @@ config - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT 1.11.911 v1-rev20201112-1.30.10 1.16.2 diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index 823356c8..5980da4e 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index d9667232..29305b7d 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 96a4bac0..61dc7bee 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT spring-cloud-config-dependencies - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index c572dde4..5d683423 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT .. spring-cloud-config-monitor diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 7bdc5b08..feebbc2c 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 895fd710..6552e99c 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index b9a796b4..8c042e8a 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-config - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT spring-cloud-starter-config - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From 298e4337ec654b62624f154c46a17493d8ec58b4 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 6 Sep 2022 20:11:05 +0000 Subject: [PATCH 16/30] Update SNAPSHOT to 3.1.4 --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-config-client-tls-tests/pom.xml | 2 +- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 4 ++-- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 7599b3b2..282d21f0 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 3.1.5-SNAPSHOT + 3.1.4 .. diff --git a/pom.xml b/pom.xml index 2053c87a..38e3aa22 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 3.1.5-SNAPSHOT + 3.1.4 pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.5-SNAPSHOT + 3.1.4 @@ -27,7 +27,7 @@ config - 3.1.5-SNAPSHOT + 3.1.4 1.11.911 v1-rev20201112-1.30.10 1.16.2 diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index 5980da4e..75cb8db0 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 3.1.5-SNAPSHOT + 3.1.4 .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 29305b7d..6f1e5a40 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 3.1.5-SNAPSHOT + 3.1.4 .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 61dc7bee..786c2ee2 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.5-SNAPSHOT + 3.1.4 spring-cloud-config-dependencies - 3.1.5-SNAPSHOT + 3.1.4 pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index 5d683423..f2e7c623 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 3.1.5-SNAPSHOT + 3.1.4 .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 3.1.3-SNAPSHOT + 3.1.2 diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index feebbc2c..509d2766 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 3.1.5-SNAPSHOT + 3.1.4 .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 6552e99c..5587bfad 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 3.1.5-SNAPSHOT + 3.1.4 .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 8c042e8a..25e2c80e 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-config - 3.1.5-SNAPSHOT + 3.1.4 spring-cloud-starter-config - 3.1.5-SNAPSHOT + 3.1.4 spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From 0e7479ccf06f54a30cc7cced1cda56d69834b75e Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 6 Sep 2022 20:13:10 +0000 Subject: [PATCH 17/30] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-config-client-tls-tests/pom.xml | 2 +- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 4 ++-- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 282d21f0..7599b3b2 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4 + 3.1.5-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 38e3aa22..2053c87a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 3.1.4 + 3.1.5-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.4 + 3.1.5-SNAPSHOT @@ -27,7 +27,7 @@ config - 3.1.4 + 3.1.5-SNAPSHOT 1.11.911 v1-rev20201112-1.30.10 1.16.2 diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index 75cb8db0..5980da4e 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4 + 3.1.5-SNAPSHOT .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 6f1e5a40..29305b7d 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4 + 3.1.5-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 786c2ee2..61dc7bee 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.4 + 3.1.5-SNAPSHOT spring-cloud-config-dependencies - 3.1.4 + 3.1.5-SNAPSHOT pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index f2e7c623..5d683423 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4 + 3.1.5-SNAPSHOT .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 3.1.2 + 3.1.3-SNAPSHOT diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 509d2766..feebbc2c 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4 + 3.1.5-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 5587bfad..6552e99c 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 3.1.4 + 3.1.5-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 25e2c80e..8c042e8a 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-config - 3.1.4 + 3.1.5-SNAPSHOT spring-cloud-starter-config - 3.1.4 + 3.1.5-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From f1bb2623f2509849879292d287ce4c848feae8c6 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 6 Sep 2022 20:13:11 +0000 Subject: [PATCH 18/30] Bumping versions to 3.1.5-SNAPSHOT after release --- spring-cloud-config-monitor/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index 5d683423..41ed8038 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 3.1.3-SNAPSHOT + 3.1.2 From 1c6b17655f7e9269e565996256827ac45dd45ac7 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 8 Sep 2022 13:06:49 -0400 Subject: [PATCH 19/30] Fixing breakages with Boot snapshots --- pom.xml | 16 ---------------- .../java/sample/ApplicationBootstrapTests.java | 3 ++- .../src/test/java/sample/ApplicationTests.java | 2 +- .../java/sample/ConfigDataIntegrationTests.java | 3 ++- .../ConfigDataOrderingIntegrationTests.java | 2 +- .../sample/ConfigDataRetryIntegrationTests.java | 2 +- .../environment/DocumentedConfigObservation.java | 8 ++++---- ...vironmentRepositoryObservationConvention.java | 2 +- 8 files changed, 12 insertions(+), 26 deletions(-) diff --git a/pom.xml b/pom.xml index 94bf8561..eabfccdb 100644 --- a/pom.xml +++ b/pom.xml @@ -32,8 +32,6 @@ v1-rev20201112-1.30.10 1.17.3 2.31.0 - 1.10.0-M3 - 1.0.0-M6 true true @@ -106,20 +104,6 @@ pom import - - io.micrometer - micrometer-bom - ${micrometer.version} - pom - import - - - io.micrometer - micrometer-tracing-bom - ${micrometer-tracing.version} - pom - import - com.github.tomakehurst wiremock-jre8 diff --git a/spring-cloud-config-sample/src/test/java/sample/ApplicationBootstrapTests.java b/spring-cloud-config-sample/src/test/java/sample/ApplicationBootstrapTests.java index 9a7887e4..4e2a1dc1 100644 --- a/spring-cloud-config-sample/src/test/java/sample/ApplicationBootstrapTests.java +++ b/spring-cloud-config-sample/src/test/java/sample/ApplicationBootstrapTests.java @@ -53,7 +53,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen // config // server on the classpath we need to set it explicitly properties = { "spring.cloud.config.enabled:true", "", "spring.config.use-legacy-processing=true", - "management.security.enabled=false", "management.endpoints.web.exposure.include=*" }, + "management.security.enabled=false", "management.endpoints.web.exposure.include=*", + "management.endpoint.env.show-values=ALWAYS" }, webEnvironment = RANDOM_PORT) public class ApplicationBootstrapTests { diff --git a/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java b/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java index 2354d156..bffe0d89 100644 --- a/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java +++ b/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java @@ -44,7 +44,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen properties = { "spring.cloud.config.enabled:true", // FIXME: configdata why is this needed here? "spring.config.use-legacy-processing=true", "management.security.enabled=false", - "management.endpoints.web.exposure.include=*" }, + "management.endpoints.web.exposure.include=*", "management.endpoint.env.show-values=ALWAYS" }, webEnvironment = RANDOM_PORT) public class ApplicationTests { diff --git a/spring-cloud-config-sample/src/test/java/sample/ConfigDataIntegrationTests.java b/spring-cloud-config-sample/src/test/java/sample/ConfigDataIntegrationTests.java index 1877428e..eedfd2ca 100644 --- a/spring-cloud-config-sample/src/test/java/sample/ConfigDataIntegrationTests.java +++ b/spring-cloud-config-sample/src/test/java/sample/ConfigDataIntegrationTests.java @@ -42,7 +42,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen // Normally spring.cloud.config.enabled:true is the default but since we have the // config server on the classpath we need to set it explicitly properties = { "spring.cloud.config.enabled=true", "spring.config.import=configserver:", - "management.security.enabled=false", "management.endpoints.web.exposure.include=*" }, + "management.security.enabled=false", "management.endpoints.web.exposure.include=*", + "management.endpoint.env.show-values=ALWAYS" }, webEnvironment = RANDOM_PORT) public class ConfigDataIntegrationTests { diff --git a/spring-cloud-config-sample/src/test/java/sample/ConfigDataOrderingIntegrationTests.java b/spring-cloud-config-sample/src/test/java/sample/ConfigDataOrderingIntegrationTests.java index 5996741a..c9e5f5a9 100644 --- a/spring-cloud-config-sample/src/test/java/sample/ConfigDataOrderingIntegrationTests.java +++ b/spring-cloud-config-sample/src/test/java/sample/ConfigDataOrderingIntegrationTests.java @@ -45,7 +45,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen // hence no spring.config.import here and config name change properties = { "spring.application.name=profilesample", "spring.cloud.config.enabled=true", "spring.config.name=orderingtest", "management.security.enabled=false", "spring.profiles.active=dev", - "management.endpoints.web.exposure.include=*" }, + "management.endpoints.web.exposure.include=*", "management.endpoint.env.show-values=ALWAYS" }, webEnvironment = RANDOM_PORT) public class ConfigDataOrderingIntegrationTests { diff --git a/spring-cloud-config-sample/src/test/java/sample/ConfigDataRetryIntegrationTests.java b/spring-cloud-config-sample/src/test/java/sample/ConfigDataRetryIntegrationTests.java index 195c6cdf..f608fa81 100644 --- a/spring-cloud-config-sample/src/test/java/sample/ConfigDataRetryIntegrationTests.java +++ b/spring-cloud-config-sample/src/test/java/sample/ConfigDataRetryIntegrationTests.java @@ -53,7 +53,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen properties = { "spring.application.name=retryapp", "spring.cloud.config.fail-fast=true", "spring.cloud.config.enabled=true", "spring.config.import=configserver:", "management.security.enabled=false", "management.endpoints.web.exposure.include=*", - "logging.level.org.springframework.retry=TRACE" }, + "logging.level.org.springframework.retry=TRACE", "management.endpoint.env.show-values=ALWAYS" }, webEnvironment = RANDOM_PORT) public class ConfigDataRetryIntegrationTests { diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/DocumentedConfigObservation.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/DocumentedConfigObservation.java index ce6bac53..d881e615 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/DocumentedConfigObservation.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/DocumentedConfigObservation.java @@ -54,7 +54,7 @@ enum DocumentedConfigObservation implements DocumentedObservation { */ ENVIRONMENT_CLASS { @Override - public String getKeyName() { + public String asString() { return "spring.cloud.config.environment.class"; } }, @@ -64,7 +64,7 @@ enum DocumentedConfigObservation implements DocumentedObservation { */ PROFILE { @Override - public String getKeyName() { + public String asString() { return "spring.cloud.config.environment.profile"; } }, @@ -74,7 +74,7 @@ enum DocumentedConfigObservation implements DocumentedObservation { */ LABEL { @Override - public String getKeyName() { + public String asString() { return "spring.cloud.config.environment.label"; } }, @@ -84,7 +84,7 @@ enum DocumentedConfigObservation implements DocumentedObservation { */ APPLICATION { @Override - public String getKeyName() { + public String asString() { return "spring.cloud.config.environment.application"; } } diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/ObservationEnvironmentRepositoryObservationConvention.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/ObservationEnvironmentRepositoryObservationConvention.java index 894c9015..9eb983c3 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/ObservationEnvironmentRepositoryObservationConvention.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/ObservationEnvironmentRepositoryObservationConvention.java @@ -46,7 +46,7 @@ class ObservationEnvironmentRepositoryObservationConvention private KeyValues appendIfPresent(KeyValues keyValues, KeyName profile, String value) { if (StringUtils.hasText(value)) { - keyValues = keyValues.and(profile.of(value)); + keyValues = keyValues.and(profile.withValue(value)); } return keyValues; } From 3a3af768b5f1291bab52ba2b2b53e1bb99142ced Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 8 Sep 2022 15:28:33 -0400 Subject: [PATCH 20/30] Use wiremock standalone jar. Fixes #2142 --- pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- .../cloud/config/server/support/HttpClientSupportTest.java | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 2053c87a..031e37ca 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ com.github.tomakehurst - wiremock-jre8 + wiremock-jre8-standalone ${wiremock.version} diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 6552e99c..dba4ebc4 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -170,7 +170,7 @@ com.github.tomakehurst - wiremock-jre8 + wiremock-jre8-standalone test diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java index 0f90d840..1050c953 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java @@ -28,7 +28,6 @@ import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; import org.assertj.core.api.Assertions; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledOnJre; import org.junit.jupiter.api.condition.JRE; @@ -70,7 +69,6 @@ public class HttpClientSupportTest { @Test @EnabledOnJre(JRE.JAVA_8) - @Disabled // https://github.com/spring-cloud/spring-cloud-config/issues/2142 public void httpsProxy() throws GeneralSecurityException, IOException { WireMockServer wireMockProxyServer = new WireMockServer( options().httpDisabled(true).dynamicHttpsPort().enableBrowserProxying(true).trustAllProxyTargets(true)); From 7efb64ab2f884acaa3bafa7169994b185c6530fe Mon Sep 17 00:00:00 2001 From: erabii Date: Sat, 10 Sep 2022 02:32:39 +0300 Subject: [PATCH 21/30] fix micrometer dependency changes (#2144) --- .../config/server/environment/DocumentedConfigObservation.java | 3 ++- .../ObservationEnvironmentRepositoryObservationConvention.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/DocumentedConfigObservation.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/DocumentedConfigObservation.java index d881e615..f1e6a348 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/DocumentedConfigObservation.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/DocumentedConfigObservation.java @@ -18,6 +18,7 @@ package org.springframework.cloud.config.server.environment; import io.micrometer.common.docs.KeyName; import io.micrometer.observation.Observation; +import io.micrometer.observation.ObservationConvention; import io.micrometer.observation.docs.DocumentedObservation; enum DocumentedConfigObservation implements DocumentedObservation { @@ -27,7 +28,7 @@ enum DocumentedConfigObservation implements DocumentedObservation { */ ENVIRONMENT_REPOSITORY { @Override - public Class> getDefaultConvention() { + public Class> getDefaultConvention() { return ObservationEnvironmentRepositoryObservationConvention.class; } diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/ObservationEnvironmentRepositoryObservationConvention.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/ObservationEnvironmentRepositoryObservationConvention.java index 9eb983c3..855848bc 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/ObservationEnvironmentRepositoryObservationConvention.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/ObservationEnvironmentRepositoryObservationConvention.java @@ -19,6 +19,7 @@ package org.springframework.cloud.config.server.environment; import io.micrometer.common.KeyValues; import io.micrometer.common.docs.KeyName; import io.micrometer.observation.Observation; +import io.micrometer.observation.ObservationConvention; import org.springframework.util.StringUtils; @@ -29,7 +30,7 @@ import org.springframework.util.StringUtils; * @since 4.0.0 */ class ObservationEnvironmentRepositoryObservationConvention - implements Observation.ObservationConvention { + implements ObservationConvention { @Override public KeyValues getLowCardinalityKeyValues(ObservationEnvironmentRepositoryContext context) { From d7e20d81a55bdc15a8dfcb64bc01881aeaa0b790 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 12 Sep 2022 02:50:31 +0000 Subject: [PATCH 22/30] Bumping versions --- .../environment/EnvironmentController.java | 16 +++++----- .../VaultKvAccessStrategyFactory.java | 12 +++---- ...gleSecretManagerAccessStrategyFactory.java | 31 ++++++++++--------- ...ringVaultEnvironmentRepositoryFactory.java | 12 +++---- 4 files changed, 36 insertions(+), 35 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java index fc043cec..f54662a4 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java @@ -464,14 +464,14 @@ public class EnvironmentController { } else { switch (this.propertyKey.charAt(this.currentPos)) { - case '.': - this.valueType = NodeType.MAP; - break; - case '[': - this.valueType = NodeType.ARRAY; - break; - default: - throw new IllegalArgumentException("Invalid key: " + this.propertyKey); + case '.': + this.valueType = NodeType.MAP; + break; + case '[': + this.valueType = NodeType.ARRAY; + break; + default: + throw new IllegalArgumentException("Invalid key: " + this.propertyKey); } } return index; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/VaultKvAccessStrategyFactory.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/VaultKvAccessStrategyFactory.java index 75b50154..579ededd 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/VaultKvAccessStrategyFactory.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/VaultKvAccessStrategyFactory.java @@ -46,12 +46,12 @@ public final class VaultKvAccessStrategyFactory { public static VaultKvAccessStrategy forVersion(RestOperations rest, String baseUrl, int version, String pathToKey) { switch (version) { - case 1: - return new V1VaultKvAccessStrategy(baseUrl, rest); - case 2: - return new V2VaultKvAccessStrategy(baseUrl, pathToKey, rest); - default: - throw new IllegalArgumentException("No support for given Vault k/v backend version " + version); + case 1: + return new V1VaultKvAccessStrategy(baseUrl, rest); + case 2: + return new V2VaultKvAccessStrategy(baseUrl, pathToKey, rest); + default: + throw new IllegalArgumentException("No support for given Vault k/v backend version " + version); } } diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/secretmanager/GoogleSecretManagerAccessStrategyFactory.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/secretmanager/GoogleSecretManagerAccessStrategyFactory.java index 030bf834..2b3c8ee2 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/secretmanager/GoogleSecretManagerAccessStrategyFactory.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/secretmanager/GoogleSecretManagerAccessStrategyFactory.java @@ -32,16 +32,17 @@ public final class GoogleSecretManagerAccessStrategyFactory { GoogleSecretManagerEnvironmentProperties properties) { switch (properties.getVersion()) { - case 1: - try { - return new GoogleSecretManagerV1AccessStrategy(rest, configProvider, properties.getServiceAccount()); - } - catch (Exception e) { - throw new RepositoryException("Cannot create service client", e); - } - default: - throw new IllegalArgumentException( - "No support for given Google Secret manager backend version " + properties.getVersion()); + case 1: + try { + return new GoogleSecretManagerV1AccessStrategy(rest, configProvider, + properties.getServiceAccount()); + } + catch (Exception e) { + throw new RepositoryException("Cannot create service client", e); + } + default: + throw new IllegalArgumentException( + "No support for given Google Secret manager backend version " + properties.getVersion()); } } @@ -50,11 +51,11 @@ public final class GoogleSecretManagerAccessStrategyFactory { GoogleSecretManagerEnvironmentProperties properties, SecretManagerServiceClient client) { switch (properties.getVersion()) { - case 1: - return new GoogleSecretManagerV1AccessStrategy(rest, configProvider, client); - default: - throw new IllegalArgumentException( - "No support for given Google Secret manager backend version " + properties.getVersion()); + case 1: + return new GoogleSecretManagerV1AccessStrategy(rest, configProvider, client); + default: + throw new IllegalArgumentException( + "No support for given Google Secret manager backend version " + properties.getVersion()); } } diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/vault/SpringVaultEnvironmentRepositoryFactory.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/vault/SpringVaultEnvironmentRepositoryFactory.java index 4ed6550c..a1cfdb96 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/vault/SpringVaultEnvironmentRepositoryFactory.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/vault/SpringVaultEnvironmentRepositoryFactory.java @@ -61,12 +61,12 @@ public class SpringVaultEnvironmentRepositoryFactory int version = vaultProperties.getKvVersion(); switch (version) { - case 1: - return vaultTemplate.opsForKeyValue(backend, VaultKeyValueOperationsSupport.KeyValueBackend.KV_1); - case 2: - return vaultTemplate.opsForKeyValue(backend, VaultKeyValueOperationsSupport.KeyValueBackend.KV_2); - default: - throw new IllegalArgumentException("No support for given Vault k/v backend version " + version); + case 1: + return vaultTemplate.opsForKeyValue(backend, VaultKeyValueOperationsSupport.KeyValueBackend.KV_1); + case 2: + return vaultTemplate.opsForKeyValue(backend, VaultKeyValueOperationsSupport.KeyValueBackend.KV_2); + default: + throw new IllegalArgumentException("No support for given Vault k/v backend version " + version); } } From 15f26c0040649b22e9982f73a8672c4e0407ed48 Mon Sep 17 00:00:00 2001 From: kid Date: Tue, 13 Sep 2022 20:38:26 +0800 Subject: [PATCH 23/30] Update PropertyPathEndpoint to ignore profiles - Fixes gh-2138 (#2139) --- .../config/monitor/PropertyPathEndpoint.java | 18 ++++++------------ .../monitor/PropertyPathEndpointTests.java | 6 +++--- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/PropertyPathEndpoint.java b/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/PropertyPathEndpoint.java index e8920b19..b17c71a9 100644 --- a/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/PropertyPathEndpoint.java +++ b/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/PropertyPathEndpoint.java @@ -108,22 +108,16 @@ public class PropertyPathEndpoint implements ApplicationEventPublisherAware { String stem = StringUtils.stripFilenameExtension(StringUtils.getFilename(StringUtils.cleanPath(path))); // TODO: correlate with service registry int index = stem.indexOf("-"); - while (index >= 0) { - String name = stem.substring(0, index); - String profile = stem.substring(index + 1); - if ("application".equals(name)) { - services.add("*:" + profile); - } - else if (!name.startsWith("application")) { - services.add(name + ":" + profile); - } - index = stem.indexOf("-", index + 1); - } String name = stem; + if (index > 0) { + name = stem.substring(0, index); + } + // foo.properties is targeted at the foo application, + // while application.properties is targeted at all applications if ("application".equals(name)) { services.add("*"); } - else if (!name.startsWith("application")) { + else { services.add(name); } } diff --git a/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/PropertyPathEndpointTests.java b/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/PropertyPathEndpointTests.java index b69151a7..8ac55a7a 100644 --- a/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/PropertyPathEndpointTests.java +++ b/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/PropertyPathEndpointTests.java @@ -72,7 +72,7 @@ public class PropertyPathEndpointTests { public void testNotifyAllWithProfile() { assertThat(this.endpoint .notifyByPath(new HttpHeaders(), Collections.singletonMap("path", "application-local.yml")).toString()) - .isEqualTo("[*:local]"); + .isEqualTo("[*]"); } @Test @@ -92,13 +92,13 @@ public class PropertyPathEndpointTests { @Test public void testNotifyOneWithProfile() { assertThat(this.endpoint.notifyByPath(new HttpHeaders(), Collections.singletonMap("path", "foo-local.yml")) - .toString()).isEqualTo("[foo:local, foo-local]"); + .toString()).isEqualTo("[foo]"); } @Test public void testNotifyMultiDash() { assertThat(this.endpoint.notifyByPath(new HttpHeaders(), Collections.singletonMap("path", "foo-local-dev.yml")) - .toString()).isEqualTo("[foo:local-dev, foo-local:dev, foo-local-dev]"); + .toString()).isEqualTo("[foo]"); } } From a0b76c1c966d19f2a2c588a6224c6d99bdde0f06 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 15 Sep 2022 09:56:52 -0400 Subject: [PATCH 24/30] Support files with yaml extension in S3. Fixes #2146 (#2150) --- .../AwsS3EnvironmentRepository.java | 25 ++++++++++++------- .../AwsS3EnvironmentRepositoryTests.java | 9 +++++++ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AwsS3EnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AwsS3EnvironmentRepository.java index b3a52831..d23bce78 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AwsS3EnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AwsS3EnvironmentRepository.java @@ -132,30 +132,37 @@ public class AwsS3EnvironmentRepository implements EnvironmentRepository, Ordere private S3ConfigFile getS3ConfigFile(S3ObjectIdBuilder s3ObjectIdBuilder, String keyPrefix) { try { - final S3Object properties = s3Client - .getObject(new GetObjectRequest(s3ObjectIdBuilder.withKey(keyPrefix + ".properties").build())); + final S3Object properties = getObject(s3ObjectIdBuilder, keyPrefix + ".properties"); return new PropertyS3ConfigFile(properties.getObjectMetadata().getVersionId(), properties.getObjectContent()); } catch (Exception eProperties) { try { - final S3Object yaml = s3Client - .getObject(new GetObjectRequest(s3ObjectIdBuilder.withKey(keyPrefix + ".yml").build())); + final S3Object yaml = getObject(s3ObjectIdBuilder, keyPrefix + ".yaml"); return new YamlS3ConfigFile(yaml.getObjectMetadata().getVersionId(), yaml.getObjectContent()); } catch (Exception eYaml) { try { - final S3Object json = s3Client - .getObject(new GetObjectRequest(s3ObjectIdBuilder.withKey(keyPrefix + ".json").build())); - return new JsonS3ConfigFile(json.getObjectMetadata().getVersionId(), json.getObjectContent()); + final S3Object json = getObject(s3ObjectIdBuilder, keyPrefix + ".yml"); + return new YamlS3ConfigFile(json.getObjectMetadata().getVersionId(), json.getObjectContent()); } - catch (Exception eJson) { - return null; + catch (Exception eYml) { + try { + final S3Object json = getObject(s3ObjectIdBuilder, keyPrefix + ".json"); + return new JsonS3ConfigFile(json.getObjectMetadata().getVersionId(), json.getObjectContent()); + } + catch (Exception eJson) { + return null; + } } } } } + private S3Object getObject(S3ObjectIdBuilder s3ObjectIdBuilder, String key) throws Exception { + return s3Client.getObject(new GetObjectRequest(s3ObjectIdBuilder.withKey(key).build())); + } + @Override public Locations getLocations(String application, String profiles, String label) { String baseLocation = AWS_S3_RESOURCE_SCHEME + bucketName + PATH_SEPARATOR + application; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/AwsS3EnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/AwsS3EnvironmentRepositoryTests.java index d1213a19..505a30a8 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/AwsS3EnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/AwsS3EnvironmentRepositoryTests.java @@ -113,6 +113,15 @@ public class AwsS3EnvironmentRepositoryTests { @Test public void findYamlObject() throws UnsupportedEncodingException { + setupS3("foo-bar.yaml", yamlContent); + + final Environment env = envRepo.findOne("foo", "bar", null); + + assertExpectedEnvironment(env, "foo", null, null, 1, "bar"); + } + + @Test + public void findYmlObject() throws UnsupportedEncodingException { setupS3("foo-bar.yml", yamlContent); final Environment env = envRepo.findOne("foo", "bar", null); From 5e162cb8f1c595891daede3d8dd1a1bbbc98ee8c Mon Sep 17 00:00:00 2001 From: woshikid Date: Wed, 21 Sep 2022 22:39:10 +0800 Subject: [PATCH 25/30] Exact match of branch names in JGitEnvironmentRepository - Fixes gh-2133 (#2147) --- .../JGitEnvironmentRepository.java | 2 +- .../JGitEnvironmentRepositoryTests.java | 22 ++++++++++++++---- .../resources/branch-with-slash-repo/bar.yml | 1 + .../branch-with-slash-repo/git/COMMIT_EDITMSG | 1 + .../resources/branch-with-slash-repo/git/HEAD | 1 + .../branch-with-slash-repo/git/config | 5 ++++ .../branch-with-slash-repo/git/description | 1 + .../branch-with-slash-repo/git/index | Bin 0 -> 137 bytes .../branch-with-slash-repo/git/logs/HEAD | 3 +++ .../git/logs/refs/heads/feature/foo | 1 + .../git/logs/refs/heads/master | 3 +++ .../08/eb9e67a7225c302e3906a63cb9544e619fc804 | Bin 0 -> 153 bytes .../0d/706a8f14e7ec2b9abf99c603f3f5467d2d38ff | Bin 0 -> 51 bytes .../54/8298f39d0c5a84a1ada7a2b03ef54aad1fffa2 | Bin 0 -> 36 bytes .../5c/19df95639519f2286fc6d39182f271ee8c0b6b | Bin 0 -> 39 bytes .../6e/067728a52e959f60788121b4046e5b27793e61 | Bin 0 -> 39 bytes .../7a/9804f8901709bdcf794c553805d5bc5188f821 | 2 ++ .../91/5bd24aaf815120f2755ef4fc66404f5d37b383 | Bin 0 -> 152 bytes .../ae/c5d43644133593483b7c243f851606aa2c0128 | Bin 0 -> 52 bytes .../fa/c65b3a4678430e2b86e3b28510b37c5a7942a7 | Bin 0 -> 52 bytes .../git/refs/heads/feature/foo | 1 + .../git/refs/heads/master | 1 + .../branch-with-slash-repo/git/refs/tags/foo | 1 + 23 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 spring-cloud-config-server/src/test/resources/branch-with-slash-repo/bar.yml create mode 100644 spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/COMMIT_EDITMSG create mode 100644 spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/HEAD create mode 100644 spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/config create mode 100644 spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/description create mode 100644 spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/index create mode 100644 spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/logs/HEAD create mode 100644 spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/logs/refs/heads/feature/foo create mode 100644 spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/logs/refs/heads/master create mode 100644 spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/objects/08/eb9e67a7225c302e3906a63cb9544e619fc804 create mode 100644 spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/objects/0d/706a8f14e7ec2b9abf99c603f3f5467d2d38ff create mode 100644 spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/objects/54/8298f39d0c5a84a1ada7a2b03ef54aad1fffa2 create mode 100644 spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/objects/5c/19df95639519f2286fc6d39182f271ee8c0b6b create mode 100644 spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/objects/6e/067728a52e959f60788121b4046e5b27793e61 create mode 100644 spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/objects/7a/9804f8901709bdcf794c553805d5bc5188f821 create mode 100644 spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/objects/91/5bd24aaf815120f2755ef4fc66404f5d37b383 create mode 100644 spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/objects/ae/c5d43644133593483b7c243f851606aa2c0128 create mode 100644 spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/objects/fa/c65b3a4678430e2b86e3b28510b37c5a7942a7 create mode 100644 spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/refs/heads/feature/foo create mode 100644 spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/refs/heads/master create mode 100644 spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/refs/tags/foo diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java index 987c46d7..b4518ea6 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java @@ -721,7 +721,7 @@ public class JGitEnvironmentRepository extends AbstractScmEnvironmentRepository } List branches = command.call(); for (Ref ref : branches) { - if (ref.getName().endsWith("/" + label)) { + if (ref.getName().equals("refs/heads/" + label) || ref.getName().equals("refs/remotes/origin/" + label)) { return true; } } diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java index 336c598d..47a852a9 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java @@ -228,6 +228,20 @@ public class JGitEnvironmentRepositoryTests { assertThat(this.repository.getUri()).isEqualTo("git://localhost/foo"); } + @Test + public void testBranchEndsWithTag() throws IOException { + String uri = ConfigServerTestUtils.prepareLocalRepo("branch-with-slash-repo"); + this.repository.setUri(uri); + + // exists branch "feature/foo" + Environment environment = this.repository.findOne("bar", "staging", "feature/foo"); + assertVersion(environment); + + // try tag "foo" + environment = this.repository.findOne("bar", "staging", "foo"); + assertThat(environment.getPropertySources().get(0).getSource().get("key")).isEqualTo("value from tag"); + } + @Test public void afterPropertiesSet_CloneOnStartTrue_CloneAndFetchCalled() throws Exception { Git mockGit = mock(Git.class); @@ -740,7 +754,7 @@ public class JGitEnvironmentRepositoryTests { when(checkoutCommand.call()).thenReturn(ref); when(listBranchCommand.call()).thenReturn(Arrays.asList(branch1Ref)); when(fetchCommand.call()).thenReturn(fetchResult); - when(branch1Ref.getName()).thenReturn("origin/master"); + when(branch1Ref.getName()).thenReturn("refs/remotes/origin/master"); when(status.isClean()).thenReturn(true); JGitEnvironmentRepository repo = new JGitEnvironmentRepository(this.environment, @@ -1203,12 +1217,12 @@ public class JGitEnvironmentRepositoryTests { // Mock master branch Ref mockMasterRef = mock(Ref.class); repositoryRefsList.add(mockMasterRef); - when(mockMasterRef.getName()).thenReturn("/master"); + when(mockMasterRef.getName()).thenReturn("refs/remotes/origin/master"); // Mock release branch. Ref mockReleaseRef = mock(Ref.class); repositoryRefsList.add(mockReleaseRef); - when(mockReleaseRef.getName()).thenReturn("/release"); + when(mockReleaseRef.getName()).thenReturn("refs/remotes/origin/release"); // Mock calls on list and checkout commands when(mockListBranchCommand.call()).thenReturn(repositoryRefsList); @@ -1257,7 +1271,7 @@ public class JGitEnvironmentRepositoryTests { // Mock master branch Ref mockMasterRef = mock(Ref.class); repositoryRefsList.add(mockMasterRef); - when(mockMasterRef.getName()).thenReturn("/master"); + when(mockMasterRef.getName()).thenReturn("refs/remotes/origin/master"); // Mock calls on list and checkout commands when(mockListBranchCommand.call()).thenReturn(repositoryRefsList); diff --git a/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/bar.yml b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/bar.yml new file mode 100644 index 00000000..5c19df95 --- /dev/null +++ b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/bar.yml @@ -0,0 +1 @@ +key: value from master diff --git a/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/COMMIT_EDITMSG b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/COMMIT_EDITMSG new file mode 100644 index 00000000..1f7391f9 --- /dev/null +++ b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/COMMIT_EDITMSG @@ -0,0 +1 @@ +master diff --git a/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/HEAD b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/HEAD new file mode 100644 index 00000000..cb089cd8 --- /dev/null +++ b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/config b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/config new file mode 100644 index 00000000..515f4836 --- /dev/null +++ b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/config @@ -0,0 +1,5 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true diff --git a/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/description b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/description new file mode 100644 index 00000000..498b267a --- /dev/null +++ b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/index b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/index new file mode 100644 index 0000000000000000000000000000000000000000..9490d0bb7121377a4d69206a9b43f417fd64f95a GIT binary patch literal 137 zcmZ?q402{*U|<4b#$*jMW5W-QZ@_eemjhUw(cmisL*o(#2IdzK%pe{kd4Fp1RLM^o z`Nu9#Z2DCAu7^9Dfjud)NUt(C2dF6|$ki1{NirBJ7;vpSdd18|*mSaob&ZOBs~FoV d9Y&2m^Lg%W@YfBz%UE+V{Qb!*_nr5i1ppHsEHnTB literal 0 HcmV?d00001 diff --git a/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/logs/HEAD b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/logs/HEAD new file mode 100644 index 00000000..ad8d64c9 --- /dev/null +++ b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/logs/HEAD @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 7a9804f8901709bdcf794c553805d5bc5188f821 woshikid 1663579538 +0800 commit (initial): tag +7a9804f8901709bdcf794c553805d5bc5188f821 915bd24aaf815120f2755ef4fc66404f5d37b383 woshikid 1663579645 +0800 commit: branch +915bd24aaf815120f2755ef4fc66404f5d37b383 08eb9e67a7225c302e3906a63cb9544e619fc804 woshikid 1663579718 +0800 commit: master diff --git a/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/logs/refs/heads/feature/foo b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/logs/refs/heads/feature/foo new file mode 100644 index 00000000..cb5b1757 --- /dev/null +++ b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/logs/refs/heads/feature/foo @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 915bd24aaf815120f2755ef4fc66404f5d37b383 woshikid 1663579678 +0800 branch: Created from master diff --git a/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/logs/refs/heads/master b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/logs/refs/heads/master new file mode 100644 index 00000000..ad8d64c9 --- /dev/null +++ b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/logs/refs/heads/master @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 7a9804f8901709bdcf794c553805d5bc5188f821 woshikid 1663579538 +0800 commit (initial): tag +7a9804f8901709bdcf794c553805d5bc5188f821 915bd24aaf815120f2755ef4fc66404f5d37b383 woshikid 1663579645 +0800 commit: branch +915bd24aaf815120f2755ef4fc66404f5d37b383 08eb9e67a7225c302e3906a63cb9544e619fc804 woshikid 1663579718 +0800 commit: master diff --git a/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/objects/08/eb9e67a7225c302e3906a63cb9544e619fc804 b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/objects/08/eb9e67a7225c302e3906a63cb9544e619fc804 new file mode 100644 index 0000000000000000000000000000000000000000..b0e4abb3b862509e2e8ac3ebd65809268c145df2 GIT binary patch literal 153 zcmV;K0A~Mq0hNwh3c@fD0R7G>@-LKZb~i~u#H(!cutj5}jd*=?1^U+*wa^ytlhyamiq=1W$maqf{XPk(Q25eAo+4HOG8F)#SL`nb#Yl`*ExloDDk)gr~ z{el6NeEQmU{cXp(J+`DTFR6JNbh}sCo>Oe~s=+yAKYIxJY=SXr*s<61-=V5ec literal 0 HcmV?d00001 diff --git a/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/objects/0d/706a8f14e7ec2b9abf99c603f3f5467d2d38ff b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/objects/0d/706a8f14e7ec2b9abf99c603f3f5467d2d38ff new file mode 100644 index 0000000000000000000000000000000000000000..145568772cab86c78996e0d5512de5b2e7d78195 GIT binary patch literal 51 zcmb2m5Ggm$UKC2HL literal 0 HcmV?d00001 diff --git a/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/objects/6e/067728a52e959f60788121b4046e5b27793e61 b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/objects/6e/067728a52e959f60788121b4046e5b27793e61 new file mode 100644 index 0000000000000000000000000000000000000000..3b5608da0d1772966f4c39439d5bba2b7fd81e08 GIT binary patch literal 39 vcmb*?ttcp{JbG_aYGqDy zuT??`;0amT8fw-lQsNl12g8P)^`YoukXgKFuiKP?B7$X%paR5HGKXlha|Xc`m$Flc zj9Ll$%ysPYJKk%1v?4DX^|~B%yLW2OC69iU%6sEN^w!BUAb>dRu{Z1Ap-4Mzc@;lc GY(l!oc}R@_ literal 0 HcmV?d00001 diff --git a/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/objects/ae/c5d43644133593483b7c243f851606aa2c0128 b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/objects/ae/c5d43644133593483b7c243f851606aa2c0128 new file mode 100644 index 0000000000000000000000000000000000000000..74009400e68bd3d83d5a81de109cbf5dbf242bbe GIT binary patch literal 52 zcmV-40L%Y)0V^p=O;s>9WiT`_Ff%bxNJ=cytIW+|h>^TMHF>J!Cyo4LmnSxTDty<& Koecmo!VtgeiWIZ} literal 0 HcmV?d00001 diff --git a/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/objects/fa/c65b3a4678430e2b86e3b28510b37c5a7942a7 b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/objects/fa/c65b3a4678430e2b86e3b28510b37c5a7942a7 new file mode 100644 index 0000000000000000000000000000000000000000..911f6976df3e7302dab391f66c989fa258943abb GIT binary patch literal 52 zcmV-40L%Y)0V^p=O;s>9WiT`_Ff%bxNJ=cytIW+|2x*$}c`i>>%fhwG7j3Zn>a|w> K{~`c5WD!>O^cBni literal 0 HcmV?d00001 diff --git a/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/refs/heads/feature/foo b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/refs/heads/feature/foo new file mode 100644 index 00000000..0edf4bff --- /dev/null +++ b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/refs/heads/feature/foo @@ -0,0 +1 @@ +915bd24aaf815120f2755ef4fc66404f5d37b383 diff --git a/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/refs/heads/master b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/refs/heads/master new file mode 100644 index 00000000..490b6d00 --- /dev/null +++ b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/refs/heads/master @@ -0,0 +1 @@ +08eb9e67a7225c302e3906a63cb9544e619fc804 diff --git a/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/refs/tags/foo b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/refs/tags/foo new file mode 100644 index 00000000..b5ce360d --- /dev/null +++ b/spring-cloud-config-server/src/test/resources/branch-with-slash-repo/git/refs/tags/foo @@ -0,0 +1 @@ +7a9804f8901709bdcf794c553805d5bc5188f821 From 10546f52ab5ae9a4c7017d57dce8a5ec509cfc32 Mon Sep 17 00:00:00 2001 From: woshikid Date: Fri, 23 Sep 2022 21:09:11 +0800 Subject: [PATCH 26/30] Simplify regex in EnvironmentController (#2132) --- .../config/server/environment/EnvironmentController.java | 4 ++-- .../config/server/environment/EnvironmentControllerTests.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java index 196a116d..a239053d 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java @@ -104,13 +104,13 @@ public class EnvironmentController { this.acceptEmpty = acceptEmpty; } - @GetMapping(path = "/{name}/{profiles:(?!.*\\b\\.(?:ya?ml|properties|json)\\b).*}", + @GetMapping(path = "/{name}/{profiles:[^\\.]*}", produces = MediaType.APPLICATION_JSON_VALUE) public Environment defaultLabel(@PathVariable String name, @PathVariable String profiles) { return getEnvironment(name, profiles, null, false); } - @GetMapping(path = "/{name}/{profiles:(?!.*\\b\\.(?:ya?ml|properties|json)\\b).*}", + @GetMapping(path = "/{name}/{profiles:[^\\.]*}", produces = EnvironmentMediaType.V2_JSON) public Environment defaultLabelIncludeOrigin(@PathVariable String name, @PathVariable String profiles) { return getEnvironment(name, profiles, null, true); diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/EnvironmentControllerTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/EnvironmentControllerTests.java index ccf15c84..cb2cfff8 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/EnvironmentControllerTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/EnvironmentControllerTests.java @@ -643,11 +643,11 @@ class EnvironmentControllerTests { @Test public void handleEnvironmentException() throws Exception { - when(EnvironmentControllerTests.this.repository.findOne(eq("exception"), eq("bad_syntax.ext"), any(), + when(EnvironmentControllerTests.this.repository.findOne(eq("exception"), eq("bad_syntax"), any(), eq(false))) .thenThrow(new FailedToConstructEnvironmentException("Cannot construct", new RuntimeException("underlier"))); - MvcResult result = this.mvc.perform(MockMvcRequestBuilders.get("/exception/bad_syntax.ext")) + MvcResult result = this.mvc.perform(MockMvcRequestBuilders.get("/exception/bad_syntax")) .andExpect(MockMvcResultMatchers.status().is(500)).andReturn(); assertThat(result.getResponse().getErrorMessage()).isEqualTo("Cannot construct"); } From 2a9730c95b4905f515831fdbaa84808969cec531 Mon Sep 17 00:00:00 2001 From: woshikid Date: Fri, 23 Sep 2022 23:00:25 +0800 Subject: [PATCH 27/30] Fix path problem on Windows - Fixes gh-2155 (#2160) --- .../config/server/environment/NativeEnvironmentRepository.java | 2 ++ 1 file changed, 2 insertions(+) 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 a9a309da..a56ce406 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 @@ -264,6 +264,8 @@ public class NativeEnvironmentRepository implements EnvironmentRepository, Searc locations = new String[] { matcher.group(2) }; } } + name = name.replace("\\", "/"); // change windows path '\' into '/' + name = name.replaceAll("\\[(?=\\w:)", "[/"); // change [D:/path] into [/D:/path] name = name.replace("applicationConfig: [", ""); name = name.replace("file [", "file:"); name = name.replace("class path resource [", "classpath:/"); From 579a3cd8e850729af0b5ce61f70d3e81ef46751d Mon Sep 17 00:00:00 2001 From: buildmaster Date: Sat, 24 Sep 2022 00:29:18 +0000 Subject: [PATCH 28/30] Bumping versions --- .../config/server/environment/EnvironmentController.java | 6 ++---- .../server/environment/NativeEnvironmentRepository.java | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java index a239053d..8d9955e0 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java @@ -104,14 +104,12 @@ public class EnvironmentController { this.acceptEmpty = acceptEmpty; } - @GetMapping(path = "/{name}/{profiles:[^\\.]*}", - produces = MediaType.APPLICATION_JSON_VALUE) + @GetMapping(path = "/{name}/{profiles:[^\\.]*}", produces = MediaType.APPLICATION_JSON_VALUE) public Environment defaultLabel(@PathVariable String name, @PathVariable String profiles) { return getEnvironment(name, profiles, null, false); } - @GetMapping(path = "/{name}/{profiles:[^\\.]*}", - produces = EnvironmentMediaType.V2_JSON) + @GetMapping(path = "/{name}/{profiles:[^\\.]*}", produces = EnvironmentMediaType.V2_JSON) public Environment defaultLabelIncludeOrigin(@PathVariable String name, @PathVariable String profiles) { return getEnvironment(name, profiles, null, true); } 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 a56ce406..07e2382a 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 @@ -265,7 +265,8 @@ public class NativeEnvironmentRepository implements EnvironmentRepository, Searc } } name = name.replace("\\", "/"); // change windows path '\' into '/' - name = name.replaceAll("\\[(?=\\w:)", "[/"); // change [D:/path] into [/D:/path] + name = name.replaceAll("\\[(?=\\w:)", "[/"); // change [D:/path] into + // [/D:/path] name = name.replace("applicationConfig: [", ""); name = name.replace("file [", "file:"); name = name.replace("class path resource [", "classpath:/"); From ff87826a1fe740e394218c7c000825f2985fdfda Mon Sep 17 00:00:00 2001 From: buildmaster Date: Sat, 24 Sep 2022 02:41:06 +0000 Subject: [PATCH 29/30] Bumping versions --- .../config/server/environment/EnvironmentController.java | 6 ++---- .../server/environment/NativeEnvironmentRepository.java | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java index 5d0298ed..fbf79907 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java @@ -103,14 +103,12 @@ public class EnvironmentController { this.acceptEmpty = acceptEmpty; } - @GetMapping(path = "/{name}/{profiles:[^\\.]*}", - produces = MediaType.APPLICATION_JSON_VALUE) + @GetMapping(path = "/{name}/{profiles:[^\\.]*}", produces = MediaType.APPLICATION_JSON_VALUE) public Environment defaultLabel(@PathVariable String name, @PathVariable String profiles) { return getEnvironment(name, profiles, null, false); } - @GetMapping(path = "/{name}/{profiles:[^\\.]*}", - produces = EnvironmentMediaType.V2_JSON) + @GetMapping(path = "/{name}/{profiles:[^\\.]*}", produces = EnvironmentMediaType.V2_JSON) public Environment defaultLabelIncludeOrigin(@PathVariable String name, @PathVariable String profiles) { return getEnvironment(name, profiles, null, true); } 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 67e5656d..50760546 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 @@ -271,7 +271,8 @@ public class NativeEnvironmentRepository implements EnvironmentRepository, Searc } } name = name.replace("\\", "/"); // change windows path '\' into '/' - name = name.replaceAll("\\[(?=\\w:)", "[/"); // change [D:/path] into [/D:/path] + name = name.replaceAll("\\[(?=\\w:)", "[/"); // change [D:/path] into + // [/D:/path] name = name.replace("applicationConfig: [", ""); name = name.replace("file [", "file:"); name = name.replace("class path resource [", "classpath:/"); From 11e213c71c33276d6b5712ead0292e9cc9a11d52 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Tue, 27 Sep 2022 19:38:25 -0400 Subject: [PATCH 30/30] Clarify where to set encrypt.key. Fixes #2164 --- docs/src/main/asciidoc/spring-cloud-config.adoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/spring-cloud-config.adoc b/docs/src/main/asciidoc/spring-cloud-config.adoc index 17008b92..3c498ee4 100644 --- a/docs/src/main/asciidoc/spring-cloud-config.adoc +++ b/docs/src/main/asciidoc/spring-cloud-config.adoc @@ -1430,10 +1430,12 @@ NOTE: The `--key` argument is mandatory (despite having a `--` prefix). === Key Management The Config Server can use a symmetric (shared) key or an asymmetric one (RSA key pair). -The asymmetric choice is superior in terms of security, but it is often more convenient to use a symmetric key since it is a single property value to configure in the `bootstrap.properties`. +The asymmetric choice is superior in terms of security, but it is often more convenient to use a symmetric key since it is a single property value to configure in the `application.properties`. To configure a symmetric key, you need to set `encrypt.key` to a secret String (or use the `ENCRYPT_KEY` environment variable to keep it out of plain-text configuration files). +NOTE: If you include `spring-cloud-starter-bootstrap` on the classpath or set `spring.cloud.bootstrap.enabled=true` as a system property, you will need to set `encrypt.key` in `bootstrap.properties`. + NOTE: You cannot configure an asymmetric key using `encrypt.key`. To configure an asymmetric key use a keystore (e.g. as