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

Add error body with info when none of labels found (#1461)

Browse Source
This commit is contained in:
Jakub Klebek
2019-09-16 16:57:56 +02:00
committed by Spencer Gibb
parent 6d64def1ae
commit ef14f4abc5
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java
View File

@@ -130,6 +130,7 @@ public class ConfigServicePropertySourceLocator implements PropertySourceLocator
return composite;
}
}
errorBody = String.format("None of labels %s found", Arrays.toString(labels));
}
catch (HttpServerErrorException e) {
error = e;
@@ -147,8 +148,7 @@ public class ConfigServicePropertySourceLocator implements PropertySourceLocator
+ (errorBody == null ? "" : ": " + errorBody),
error);
}
logger.warn("Could not locate PropertySource: " + (errorBody == null
? error == null ? "label not found" : error.getMessage() : errorBody));
logger.warn("Could not locate PropertySource: " + (error != null ? error.getMessage() : errorBody));
return null;
}

19
spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java
View File

@@ -111,12 +111,29 @@ public class ConfigServicePropertySourceLocatorTests {
@Test
public void sunnyDayWithNoSuchLabel() {
mockRequestResponseWithLabel(
new ResponseEntity<Void>((Void) null, HttpStatus.NOT_FOUND),
new ResponseEntity<>((Void) null, HttpStatus.NOT_FOUND),
"nosuchlabel");
this.locator.setRestTemplate(this.restTemplate);
assertThat(this.locator.locate(this.environment)).isNull();
}
@Test
public void sunnyDayWithNoSuchLabelAndFailFast() {
ConfigClientProperties defaults = new ConfigClientProperties(this.environment);
defaults.setFailFast(true);
this.locator = new ConfigServicePropertySourceLocator(defaults);
mockRequestResponseWithLabel(
new ResponseEntity<>((Void) null, HttpStatus.NOT_FOUND),
"release(_)v1.0.0");
this.locator.setRestTemplate(this.restTemplate);
TestPropertyValues.of("spring.cloud.config.label:release/v1.0.1")
.applyTo(this.environment);
this.expected.expect(IsInstanceOf.instanceOf(IllegalStateException.class));
this.expected.expectMessage(
"Could not locate PropertySource and the fail fast property is set, failing: None of labels [release/v1.0.1] found");
this.locator.locate(this.environment);
}
@Test
public void failsQuietly() {
mockRequestResponseWithoutLabel(