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

Merge pull request #80 from bpgray/master

Browse Source 
* pull80:
  add support for acl tokens in discovery and config
This commit is contained in:
Spencer Gibb
2015-09-08 08:45:28 -06:00
parent 10788d6827 5154b91855
commit 16a2872b9e
5 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigProperties.java
View File

@@ -37,4 +37,6 @@ public class ConsulConfigProperties {
@NotEmpty
private String profileSeparator = ",";
private String aclToken;
}

12
spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySource.java
View File

@@ -37,12 +37,14 @@ import com.ecwid.consul.v1.kv.model.GetValue;
public class ConsulPropertySource extends EnumerablePropertySource<ConsulClient> {
private String context;
private String aclToken;
private Map<String, String> properties = new LinkedHashMap<>();
public ConsulPropertySource(String context, ConsulClient source) {
public ConsulPropertySource(String context, ConsulClient source, String aclToken) {
super(context, source);
this.context = context;
this.aclToken = aclToken;
if (!this.context.endsWith("/")) {
this.context = this.context + "/";
@@ -50,8 +52,12 @@ public class ConsulPropertySource extends EnumerablePropertySource<ConsulClient>
}
public void init() {
Response<List<GetValue>> response = source.getKVValues(context,
QueryParams.DEFAULT);
Response<List<GetValue>> response;
if (aclToken == null) {
response = source.getKVValues(context, QueryParams.DEFAULT);
} else {
response = source.getKVValues(context, aclToken, QueryParams.DEFAULT);
}
List<GetValue> values = response.getValue();
if (values != null) {

2
spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocator.java
View File

@@ -77,7 +77,7 @@ public class ConsulPropertySourceLocator implements PropertySourceLocator {
}
private ConsulPropertySource create(String context) {
return new ConsulPropertySource(context, consul);
return new ConsulPropertySource(context, consul, properties.getAclToken());
}
private void addProfiles(List<String> contexts, String baseContext,

2
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java
View File

@@ -45,6 +45,8 @@ public class ConsulDiscoveryProperties {
@Setter(AccessLevel.PRIVATE)
private String[] hostInfo = initHostInfo();
private String aclToken;
private List<String> tags = new ArrayList<>();
private boolean enabled = true;

6
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulLifecycle.java
View File

@@ -127,7 +127,11 @@ public class ConsulLifecycle extends AbstractDiscoveryLifecycle {
protected void register(NewService newService) {
log.info("Registering service with consul: {}", newService.toString());
client.agentServiceRegister(newService);
if (properties.getAclToken() == null) {
client.agentServiceRegister(newService);
} else {
client.agentServiceRegister(newService, properties.getAclToken());
}
if (ttlConfig.isEnabled() && ttlScheduler != null) {
ttlScheduler.add(newService);
}