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

Polishing

Browse Source 
Add author tag. Improve documentation. Regenerate readme.

Original pull request: gh-36
This commit is contained in:
Mark Paluch
2016-09-21 19:07:19 +02:00
parent bc02b8d3ff
commit bfb0854e91
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.adoc
View File

@@ -191,6 +191,7 @@ for SSL certificate validation
Supported schemes are `http` and `https`. Supported schemes are `http` and `https`.
* `connection-timeout` sets the connection timeout in milliseconds * `connection-timeout` sets the connection timeout in milliseconds
* `read-timeout` sets the read timeout in milliseconds * `read-timeout` sets the read timeout in milliseconds
* `config.order` sets the order for the property source
Enabling further integrations requires additional dependencies and Enabling further integrations requires additional dependencies and
configuration. Depending on how you have set up Vault you might need configuration. Depending on how you have set up Vault you might need

3
docs/src/main/asciidoc/quickstart.adoc
View File

@@ -161,6 +161,8 @@ spring.cloud.vault:
scheme: https scheme: https
connection-timeout: 5000 connection-timeout: 5000
read-timeout: 15000 read-timeout: 15000
config:
order: -10
---- ----
* `host` sets the hostname of the Vault host. The host name will be used * `host` sets the hostname of the Vault host. The host name will be used
@@ -170,6 +172,7 @@ for SSL certificate validation
Supported schemes are `http` and `https`. Supported schemes are `http` and `https`.
* `connection-timeout` sets the connection timeout in milliseconds * `connection-timeout` sets the connection timeout in milliseconds
* `read-timeout` sets the read timeout in milliseconds * `read-timeout` sets the read timeout in milliseconds
* `config.order` sets the order for the property source
Enabling further integrations requires additional dependencies and Enabling further integrations requires additional dependencies and
configuration. Depending on how you have set up Vault you might need configuration. Depending on how you have set up Vault you might need

1
spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultPropertySourceLocator.java
View File

@@ -40,6 +40,7 @@ import static org.springframework.cloud.vault.config.SecureBackendAccessors.*;
* *
* @author Spencer Gibb * @author Spencer Gibb
* @author Mark Paluch * @author Mark Paluch
* @author Jean-Philippe Bélanger
*/ */
class VaultPropertySourceLocator implements PropertySourceLocator, PriorityOrdered { class VaultPropertySourceLocator implements PropertySourceLocator, PriorityOrdered {

7
spring-cloud-vault-core/src/main/java/org/springframework/cloud/vault/VaultProperties.java
View File

@@ -181,9 +181,12 @@ public class VaultProperties {
@Data @Data
public static class Config { public static class Config {
/** /**
* Used to force a PropertySourceLocator ordering. * Used to set a {@link org.springframework.core.env.PropertySource} priority.
* This is useful to use Vault as an override on consul properties; * This is useful to use Vault as an override on other property sources.
*
* @see org.springframework.core.PriorityOrdered
*/ */
private int order = 0; private int order = 0;
} }