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
2024-07-23 10:34:53 +00:00
parent c1e60f94f9
commit 2872adf32e
156 changed files with 1648 additions and 1300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-cloud-config-sample/src/test/java/sample/ApplicationFailFastTests.java
View File

@@ -34,21 +34,22 @@ public class ApplicationFailFastTests {
@Test
public void bootstrapContextFails() {
assertThatThrownBy(() -> {
new SpringApplicationBuilder().sources(Application.class).run("--spring.config.use-legacy-processing=true",
"--server.port=0", "--spring.cloud.config.enabled=true", "--spring.cloud.config.fail-fast=true",
"--spring.cloud.config.uri=http://serverhostdoesnotexist:1234");
new SpringApplicationBuilder().sources(Application.class)
.run("--spring.config.use-legacy-processing=true", "--server.port=0",
"--spring.cloud.config.enabled=true", "--spring.cloud.config.fail-fast=true",
"--spring.cloud.config.uri=http://serverhostdoesnotexist:1234");
}).as("Exception not caused by fail fast").hasMessageContaining("fail fast");
}
@Test
public void configDataContextFailsFast(CapturedOutput output) {
assertThatThrownBy(() -> {
new SpringApplicationBuilder().sources(Application.class, PropertyInjectionConfiguration.class).run(
"--server.port=0", "--spring.cloud.config.enabled=true", "--spring.cloud.config.fail-fast=true",
"--spring.config.import=optional:configserver:http://serverhostdoesnotexist:1234",
"--spring.cloud.config.server.enabled=false", "--logging.level.org.springframework.retry=TRACE",
"--logging.level.org.springframework.cloud.config=TRACE",
"--logging.level.org.springframework.boot.context.config=TRACE");
new SpringApplicationBuilder().sources(Application.class, PropertyInjectionConfiguration.class)
.run("--server.port=0", "--spring.cloud.config.enabled=true", "--spring.cloud.config.fail-fast=true",
"--spring.config.import=optional:configserver:http://serverhostdoesnotexist:1234",
"--spring.cloud.config.server.enabled=false", "--logging.level.org.springframework.retry=TRACE",
"--logging.level.org.springframework.cloud.config=TRACE",
"--logging.level.org.springframework.boot.context.config=TRACE");
}).as("Exception not caused by fail fast").hasMessageContaining("fail fast");
assertThat(output).contains("Retry: count=5").doesNotContain("Could not resolve placeholder");
}

20
spring-cloud-config-sample/src/test/java/sample/ConfigDataCustomMediaTypeIntegrationTests.java
View File

@@ -82,15 +82,17 @@ public class ConfigDataCustomMediaTypeIntegrationTests {
@SuppressWarnings("unchecked")
public void noOriginWithMediaTypeApplicationJson() {
MutablePropertySources sources = env.getPropertySources();
sources.stream().filter(propertySource -> propertySource.getName().startsWith("configserver:")).findFirst()
.ifPresent(propertySource -> {
if (propertySource instanceof OriginLookup) {
OriginLookup<String> originLookup = (OriginLookup) propertySource;
Origin origin = originLookup.getOrigin("info.foo");
// because media-type was set as application/json, no origin
assertThat(origin).as("origin was not null").isNull();
}
});
sources.stream()
.filter(propertySource -> propertySource.getName().startsWith("configserver:"))
.findFirst()
.ifPresent(propertySource -> {
if (propertySource instanceof OriginLookup) {
OriginLookup<String> originLookup = (OriginLookup) propertySource;
Origin origin = originLookup.getOrigin("info.foo");
// because media-type was set as application/json, no origin
assertThat(origin).as("origin was not null").isNull();
}
});
assertThat(env.getProperty("info.foo")).isEqualTo("bar");
}

2
spring-cloud-config-sample/src/test/java/sample/ConfigDataOrderingIntegrationTests.java
View File

@@ -75,7 +75,7 @@ public class ConfigDataOrderingIntegrationTests {
@SuppressWarnings({ "unchecked", "rawtypes" })
public void contextLoads() {
ResponseEntity<Map> response = new TestRestTemplate()
.getForEntity("http://localhost:" + this.port + BASE_PATH + "/env/my.prop", Map.class);
.getForEntity("http://localhost:" + this.port + BASE_PATH + "/env/my.prop", Map.class);
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
Map res = response.getBody();
assertThat(res).containsKey("propertySources");

5
spring-cloud-config-sample/src/test/java/sample/ConfigDataOrderingVaultIntegrationTests.java
View File

@@ -54,8 +54,9 @@ public class ConfigDataOrderingVaultIntegrationTests {
@Container
public static VaultContainer vaultContainer = new VaultContainer<>(DockerImageName.parse("vault:1.13.3"))
.withVaultToken("my-root-token").withClasspathResourceMapping("vaultordering/vault_test_policy.txt",
"/tmp/vault_test_policy.txt", BindMode.READ_ONLY);
.withVaultToken("my-root-token")
.withClasspathResourceMapping("vaultordering/vault_test_policy.txt", "/tmp/vault_test_policy.txt",
BindMode.READ_ONLY);
@BeforeAll
public static void startConfigServer() throws IOException, InterruptedException, JSONException {