SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bumping versions

Browse Source
This commit is contained in:
buildmaster
2022-03-08 02:41:11 +00:00
parent 0021fd14bd
commit 488b5181a4
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/src/main/asciidoc/_configprops.adoc
View File

@@ -9,6 +9,7 @@
|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.multiple-uri-strategy | | The strategy to use when call to server fails and there are multiple URLs configured on the uri property (default {@link MultipleUriStrategy#ALWAYS}).
|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.

3
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/config/ConfigServerHealthIndicatorTests.java
View File

@@ -74,11 +74,10 @@ public class ConfigServerHealthIndicatorTests {
public void exceptionDownStatusMayBeCustomized() {
ReflectionTestUtils.setField(this.indicator, "downHealthStatus", "CUSTOM");
when(this.repository.findOne(anyString(), anyString(), Mockito.<String>isNull(), anyBoolean()))
.thenThrow(new RuntimeException());
.thenThrow(new RuntimeException());
assertThat(this.indicator.health().getStatus()).as("wrong exception status").isEqualTo(new Status(("CUSTOM")));
}
@Test
public void customLabelWorks() {
Repository repo = new Repository();

17
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfigurationTests.java
View File

@@ -71,14 +71,15 @@ public class EnvironmentRepositoryConfigurationTests {
@Test
public void configServerActuatorConfigurationWithCustomHealthStatus() {
new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(EnvironmentRepositoryConfigurationTests.EnableConfigurationPropertiesBeans.class,
EnvironmentRepositoryConfiguration.ConfigServerActuatorConfiguration.class))
.withPropertyValues("spring.cloud.config.server.health.down-health-status=CUSTOMIZED")
.run((context) -> {
ConfigServerHealthIndicator healthIndicator = context.getBean(ConfigServerHealthIndicator.class);
assertThat(ReflectionTestUtils.getField(healthIndicator, "downHealthStatus"))
.isEqualTo("CUSTOMIZED");
});
.withConfiguration(AutoConfigurations.of(
EnvironmentRepositoryConfigurationTests.EnableConfigurationPropertiesBeans.class,
EnvironmentRepositoryConfiguration.ConfigServerActuatorConfiguration.class))
.withPropertyValues("spring.cloud.config.server.health.down-health-status=CUSTOMIZED")
.run((context) -> {
ConfigServerHealthIndicator healthIndicator = context.getBean(ConfigServerHealthIndicator.class);
assertThat(ReflectionTestUtils.getField(healthIndicator, "downHealthStatus"))
.isEqualTo("CUSTOMIZED");
});
}
@TestConfiguration