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

Ensures health indicator uses configured label.

Browse Source 
fixes gh-638

(cherry picked from commit 30a1f81)
This commit is contained in:
Spencer Gibb
2017-02-14 13:40:15 -07:00
parent 853f4d7853
commit 100be64192
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerHealthIndicator.java
View File

@@ -48,7 +48,7 @@ public class ConfigServerHealthIndicator extends AbstractHealthIndicator {
String profiles = repository.getProfiles(); String profiles = repository.getProfiles();
try { try {
Environment environment = this.environmentRepository.findOne(application, profiles, null); Environment environment = this.environmentRepository.findOne(application, profiles, repository.getLabel());
HashMap<String, Object> detail = new HashMap<>(); HashMap<String, Object> detail = new HashMap<>();
detail.put("name", environment.getName()); detail.put("name", environment.getName());

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

@@ -1,8 +1,6 @@
package org.springframework.cloud.config.server.config; package org.springframework.cloud.config.server.config;
import static org.junit.Assert.*; import java.util.Collections;
import static org.mockito.Mockito.*;
import static org.mockito.MockitoAnnotations.initMocks;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -10,9 +8,14 @@ import org.mockito.Answers;
import org.mockito.Mock; import org.mockito.Mock;
import org.springframework.boot.actuate.health.Status; import org.springframework.boot.actuate.health.Status;
import org.springframework.cloud.config.environment.Environment; import org.springframework.cloud.config.environment.Environment;
import org.springframework.cloud.config.server.config.ConfigServerHealthIndicator; import org.springframework.cloud.config.server.config.ConfigServerHealthIndicator.Repository;
import org.springframework.cloud.config.server.environment.EnvironmentRepository; import org.springframework.cloud.config.server.environment.EnvironmentRepository;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.when;
import static org.mockito.MockitoAnnotations.initMocks;
/** /**
* @author Spencer Gibb * @author Spencer Gibb
*/ */
@@ -44,4 +47,15 @@ public class ConfigServerHealthIndicatorTests {
when(repository.findOne(anyString(), anyString(), anyString())).thenThrow(new RuntimeException()); when(repository.findOne(anyString(), anyString(), anyString())).thenThrow(new RuntimeException());
assertEquals("wrong exception status", Status.DOWN, indicator.health().getStatus()); assertEquals("wrong exception status", Status.DOWN, indicator.health().getStatus());
} }
@Test
public void customLabelWorks() {
Repository repo = new Repository();
repo.setName("myname");
repo.setProfiles("myprofile");
repo.setLabel("mylabel");
this.indicator.setRepositories(Collections.singletonMap("myname", repo));
when(repository.findOne("myname", "myprofile", "mylabel")).thenReturn(environment);
assertEquals("wrong default status", Status.UP, indicator.health().getStatus());
}
} }