From 4064b79b172b03eea266a78ca0502006a12cb750 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 30 Nov 2023 13:48:53 +0000 Subject: [PATCH 1/2] Bumping versions --- ...retsManagerEnvironmentRepositoryTests.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/AwsSecretsManagerEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/AwsSecretsManagerEnvironmentRepositoryTests.java index 3b8bfe65..51dacbd1 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/AwsSecretsManagerEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/AwsSecretsManagerEnvironmentRepositoryTests.java @@ -88,9 +88,11 @@ public class AwsSecretsManagerEnvironmentRepositoryTests { private final AwsSecretsManagerEnvironmentRepository labeledRepository = new AwsSecretsManagerEnvironmentRepository( smClient, configServerProperties, labeledEnvironmentProperties); - private final AwsSecretsManagerEnvironmentProperties ignoreLabelEnvironmentProperties = new AwsSecretsManagerEnvironmentProperties() {{ - setIgnoreLabel(true); - }}; + private final AwsSecretsManagerEnvironmentProperties ignoreLabelEnvironmentProperties = new AwsSecretsManagerEnvironmentProperties() { + { + setIgnoreLabel(true); + } + }; private final AwsSecretsManagerEnvironmentRepository ignoreLabelRepository = new AwsSecretsManagerEnvironmentRepository( smClient, configServerProperties, ignoreLabelEnvironmentProperties); @@ -1849,24 +1851,23 @@ public class AwsSecretsManagerEnvironmentRepositoryTests { String fooDefaultPropertiesName = "aws:secrets:/secret/foo-default/"; PropertySource fooDefaultProperties = new PropertySource(fooDefaultPropertiesName, - getFooDefaultReleaseProperties()); + getFooDefaultReleaseProperties()); String applicationProdPropertiesName = "aws:secrets:/secret/application-prod/"; PropertySource applicationProdProperties = new PropertySource(applicationProdPropertiesName, - getApplicationProdReleaseProperties()); + getApplicationProdReleaseProperties()); String applicationDefaultPropertiesName = "aws:secrets:/secret/application-default/"; PropertySource applicationDefaultProperties = new PropertySource(applicationDefaultPropertiesName, - getApplicationDefaultReleaseProperties()); + getApplicationDefaultReleaseProperties()); String applicationPropertiesName = "aws:secrets:/secret/application/"; PropertySource applicationProperties = new PropertySource(applicationPropertiesName, - getApplicationReleaseProperties()); + getApplicationReleaseProperties()); Environment expectedEnv = new Environment(application, profiles, null, null, null); - expectedEnv.addAll(Arrays.asList( - fooProdProperties, applicationProdProperties, fooDefaultProperties, - applicationDefaultProperties, fooProperties, applicationProperties)); + expectedEnv.addAll(Arrays.asList(fooProdProperties, applicationProdProperties, fooDefaultProperties, + applicationDefaultProperties, fooProperties, applicationProperties)); putSecrets(expectedEnv); From c0d08515e0b44d048fa6f336d2c88744d79a5877 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Wed, 10 Jan 2024 16:30:34 -0500 Subject: [PATCH 2/2] Clarify where to place override properties. Fixes #2372 --- docs/src/main/asciidoc/spring-cloud-config.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/main/asciidoc/spring-cloud-config.adoc b/docs/src/main/asciidoc/spring-cloud-config.adoc index 6be14a2f..c41e2463 100644 --- a/docs/src/main/asciidoc/spring-cloud-config.adoc +++ b/docs/src/main/asciidoc/spring-cloud-config.adoc @@ -1383,8 +1383,8 @@ You can change the priority of all overrides in the client to be more like defau ==== Using Bootstrap To Override Properties -If you enable <>, you can allow client applications to override configuration from the config server by placing two properties within -the applications configuration coming from the config server. +If you enable <>, you can let client settings override configuration from the config server by placing two properties within +the application's configuration that reside in the external environment repository (for example, Git, Vault, SVN, and others) used by the config server. [source,properties] ----