From fbeee0b07b1c415d329c89b57511598dbff2ef0d Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 26 May 2022 12:08:09 -0400 Subject: [PATCH 1/6] don't upload docs to maven central --- docs/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/pom.xml b/docs/pom.xml index d385b484..007820d5 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -19,6 +19,8 @@ spring-cloud-config ${basedir}/.. deploy + + none spring.cloud.config.* From 77252fa878eb6b272105e3cf35e737ee458ba4a9 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 26 May 2022 20:14:30 +0000 Subject: [PATCH 2/6] Update SNAPSHOT to 3.1.3 --- 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 007820d5..386b0281 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 3.1.3-SNAPSHOT + 3.1.3 .. diff --git a/pom.xml b/pom.xml index cd6ffc5d..8a997a42 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 3.1.3-SNAPSHOT + 3.1.3 pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.3-SNAPSHOT + 3.1.3 @@ -27,7 +27,7 @@ config - 3.1.3-SNAPSHOT + 3.1.3 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 ae8d4fc7..a8660b55 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.3-SNAPSHOT + 3.1.3 .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index fa49b755..c7515094 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.3-SNAPSHOT + 3.1.3 .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 071a0954..e7e981d8 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.3-SNAPSHOT + 3.1.3 spring-cloud-config-dependencies - 3.1.3-SNAPSHOT + 3.1.3 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 02ee789e..f0494b97 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.3-SNAPSHOT + 3.1.3 .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 3.1.0 + 3.1.2 diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 5ae28cf5..01086aaa 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.3-SNAPSHOT + 3.1.3 .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 63cce804..0ef86667 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.3-SNAPSHOT + 3.1.3 .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 3f75181f..c5404bd3 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.3-SNAPSHOT + 3.1.3 spring-cloud-starter-config - 3.1.3-SNAPSHOT + 3.1.3 spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From 4ac04a6e6482bf68250431b79273edb34ab054ac Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 27 May 2022 12:48:19 -0400 Subject: [PATCH 3/6] Bumps to next snapshot version --- 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 386b0281..10c0aaec 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 3.1.3 + 3.1.4-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 8a997a42..0b9501c2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 3.1.3 + 3.1.4-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.3 + 3.1.4-SNAPSHOT @@ -27,7 +27,7 @@ config - 3.1.3 + 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 a8660b55..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.3 + 3.1.4-SNAPSHOT .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index c7515094..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.3 + 3.1.4-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index e7e981d8..6d35ace6 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.3 + 3.1.4-SNAPSHOT spring-cloud-config-dependencies - 3.1.3 + 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 f0494b97..04f1f4cb 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.3 + 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 01086aaa..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.3 + 3.1.4-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 0ef86667..b0781d42 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.3 + 3.1.4-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index c5404bd3..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.3 + 3.1.4-SNAPSHOT spring-cloud-starter-config - 3.1.3 + 3.1.4-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From ebb9c7e1504ed5320956376907ccd8c714ede4f4 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 15 Jun 2022 00:30:04 +0000 Subject: [PATCH 4/6] Bumping versions --- 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 04f1f4cb..c572dde4 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.2 + 3.1.3-SNAPSHOT From f9a811cc74070149b0244818ba866601ca48478e Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 30 Jun 2022 00:30:05 +0000 Subject: [PATCH 5/6] Bumping versions --- docs/src/main/asciidoc/_configprops.adoc | 32 ++++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 3ad76cdb..ee6db0e2 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -1,29 +1,29 @@ |=== |Name | Default | Description -|spring.cloud.config.allow-override | `true` | Flag to indicate that {@link #isOverrideSystemProperties() systemPropertiesOverride} can be used. Set to false to prevent users from changing the default accidentally. Default true. -|spring.cloud.config.discovery.enabled | `false` | Flag to indicate that config server discovery is enabled (config server URL will be looked up via discovery). -|spring.cloud.config.discovery.service-id | `configserver` | Service id to locate config server. -|spring.cloud.config.enabled | `true` | Flag to say that remote configuration is enabled. Default true; -|spring.cloud.config.fail-fast | `false` | Flag to indicate that failure to connect to the server is fatal (default false). +|spring.cloud.config.allow-override | `+++true+++` | Flag to indicate that {@link #isOverrideSystemProperties() systemPropertiesOverride} can be used. Set to false to prevent users from changing the default accidentally. Default true. +|spring.cloud.config.discovery.enabled | `+++false+++` | Flag to indicate that config server discovery is enabled (config server URL will be looked up via discovery). +|spring.cloud.config.discovery.service-id | `+++configserver+++` | Service id to locate config server. +|spring.cloud.config.enabled | `+++true+++` | Flag to say that remote configuration is enabled. Default true; +|spring.cloud.config.fail-fast | `+++false+++` | Flag to indicate that failure to connect to the server is fatal (default false). |spring.cloud.config.headers | | Additional headers used to create the client request. |spring.cloud.config.label | | The label name to use to pull remote configuration properties. The default is set on the server (generally "master" for a git based server). |spring.cloud.config.media-type | | The Accept header media type to send to config server. |spring.cloud.config.name | | Name of application used to fetch remote properties. -|spring.cloud.config.override-none | `false` | Flag to indicate that when {@link #setAllowOverride(boolean) allowOverride} is true, external properties should take lowest priority and should not override any existing property sources (including local config files). Default false. -|spring.cloud.config.override-system-properties | `true` | Flag to indicate that the external properties should override system properties. Default true. +|spring.cloud.config.override-none | `+++false+++` | Flag to indicate that when {@link #setAllowOverride(boolean) allowOverride} is true, external properties should take lowest priority and should not override any existing property sources (including local config files). Default false. +|spring.cloud.config.override-system-properties | `+++true+++` | Flag to indicate that the external properties should override system properties. Default true. |spring.cloud.config.password | | The password to use (HTTP Basic) when contacting the remote server. -|spring.cloud.config.profile | `default` | The default profile to use when fetching remote configuration (comma-separated). Default is "default". -|spring.cloud.config.request-connect-timeout | `0` | timeout on waiting to connect to the Config Server. -|spring.cloud.config.request-read-timeout | `0` | timeout on waiting to read data from the Config Server. -|spring.cloud.config.retry.initial-interval | `1000` | Initial retry interval in milliseconds. -|spring.cloud.config.retry.max-attempts | `6` | Maximum number of attempts. -|spring.cloud.config.retry.max-interval | `2000` | Maximum interval for backoff. -|spring.cloud.config.retry.multiplier | `1.1` | Multiplier for next interval. -|spring.cloud.config.send-state | `true` | Flag to indicate whether to send state. Default true. +|spring.cloud.config.profile | `+++default+++` | The default profile to use when fetching remote configuration (comma-separated). Default is "default". +|spring.cloud.config.request-connect-timeout | `+++0+++` | timeout on waiting to connect to the Config Server. +|spring.cloud.config.request-read-timeout | `+++0+++` | timeout on waiting to read data from the Config Server. +|spring.cloud.config.retry.initial-interval | `+++1000+++` | Initial retry interval in milliseconds. +|spring.cloud.config.retry.max-attempts | `+++6+++` | Maximum number of attempts. +|spring.cloud.config.retry.max-interval | `+++2000+++` | Maximum interval for backoff. +|spring.cloud.config.retry.multiplier | `+++1.1+++` | Multiplier for next interval. +|spring.cloud.config.send-state | `+++true+++` | Flag to indicate whether to send state. Default true. |spring.cloud.config.tls | | TLS properties. |spring.cloud.config.token | | Security Token passed thru to underlying environment repository. -|spring.cloud.config.uri | `[http://localhost:8888]` | The URI of the remote server (default http://localhost:8888). +|spring.cloud.config.uri | `+++[http://localhost:8888]+++` | The URI of the remote server (default http://localhost:8888). |spring.cloud.config.username | | The username to use (HTTP Basic) when contacting the remote server. |=== \ No newline at end of file From 45ac6552755561c9336666a9127c3d259c340e5c Mon Sep 17 00:00:00 2001 From: Vineet JP Date: Fri, 15 Jul 2022 02:23:22 +0700 Subject: [PATCH 6/6] Ordering support for AWSParameterStore. Fixes gm-2117 (#2119) * Ordering support for AWSParameterStore. Fixes gm-2117 * gm-2117 Added test for codecoverage --- .../AwsParameterStoreEnvironmentRepository.java | 11 ++++++++++- ...AwsParameterStoreEnvironmentRepositoryTests.java | 13 +++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AwsParameterStoreEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AwsParameterStoreEnvironmentRepository.java index 5bb5f082..e638d122 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AwsParameterStoreEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AwsParameterStoreEnvironmentRepository.java @@ -34,6 +34,7 @@ import com.amazonaws.services.simplesystemsmanagement.model.Parameter; import org.springframework.cloud.config.environment.Environment; import org.springframework.cloud.config.environment.PropertySource; import org.springframework.cloud.config.server.config.ConfigServerProperties; +import org.springframework.core.Ordered; import org.springframework.util.StringUtils; import static org.springframework.cloud.config.server.environment.AwsParameterStoreEnvironmentProperties.DEFAULT_PATH_SEPARATOR; @@ -41,7 +42,7 @@ import static org.springframework.cloud.config.server.environment.AwsParameterSt /** * @author Iulian Antohe */ -public class AwsParameterStoreEnvironmentRepository implements EnvironmentRepository { +public class AwsParameterStoreEnvironmentRepository implements EnvironmentRepository, Ordered { private final AWSSimpleSystemsManagement awsSsmClient; @@ -49,12 +50,15 @@ public class AwsParameterStoreEnvironmentRepository implements EnvironmentReposi private final AwsParameterStoreEnvironmentProperties environmentProperties; + private final int order; + public AwsParameterStoreEnvironmentRepository(AWSSimpleSystemsManagement awsSsmClient, ConfigServerProperties configServerProperties, AwsParameterStoreEnvironmentProperties environmentProperties) { this.awsSsmClient = awsSsmClient; this.configServerProperties = configServerProperties; this.environmentProperties = environmentProperties; + this.order = environmentProperties.getOrder(); } @Override @@ -165,4 +169,9 @@ public class AwsParameterStoreEnvironmentRepository implements EnvironmentReposi } } + @Override + public int getOrder() { + return order; + } + } 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 f6bf2dda..02454927 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 @@ -40,6 +40,7 @@ import org.junit.Test; import org.springframework.cloud.config.environment.Environment; import org.springframework.cloud.config.environment.PropertySource; import org.springframework.cloud.config.server.config.ConfigServerProperties; +import org.springframework.core.Ordered; import org.springframework.util.StringUtils; import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; @@ -801,4 +802,16 @@ public class AwsParameterStoreEnvironmentRepositoryTests { return Base64.getEncoder().encodeToString(random.getBytes(StandardCharsets.UTF_8)); } + @Test + public void testOrderPopulation() { + int expectedOrder = Ordered.HIGHEST_PRECEDENCE; + AwsParameterStoreEnvironmentRepositoryFactory factory = new AwsParameterStoreEnvironmentRepositoryFactory( + new ConfigServerProperties()); + AwsParameterStoreEnvironmentProperties properties = new AwsParameterStoreEnvironmentProperties(); + properties.setOrder(expectedOrder); + AwsParameterStoreEnvironmentRepository repository = factory.build(properties); + int actualOrder = repository.getOrder(); + assertThat(actualOrder).isEqualTo(expectedOrder); + } + }