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

Improve test skipping for Consul.

Browse Source 
See gh-273.
This commit is contained in:
Mark Paluch
2019-02-07 11:04:11 +01:00
parent c8a772e5ba
commit a0d24989fb
8 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/ClientAuthenticationFactory.java
View File

@@ -320,7 +320,8 @@ class ClientAuthenticationFactory {
Assert.hasText(this.vaultProperties.getToken(),
"Initial Token (spring.cloud.vault.token) for Cubbyhole authentication must not be empty");
CubbyholeAuthenticationOptions options = CubbyholeAuthenticationOptions.builder() //
CubbyholeAuthenticationOptions options = CubbyholeAuthenticationOptions
.builder() //
.wrapped() //
.initialToken(VaultToken.of(this.vaultProperties.getToken())) //
.build();

6
spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfiguration.java
View File

@@ -47,8 +47,8 @@ import org.springframework.vault.core.lease.SecretLeaseContainer;
*/
@Configuration
@ConditionalOnProperty(name = "spring.cloud.vault.enabled", matchIfMissing = true)
@EnableConfigurationProperties({ VaultGenericBackendProperties.class,
VaultKeyValueBackendProperties.class })
@EnableConfigurationProperties({VaultGenericBackendProperties.class,
VaultKeyValueBackendProperties.class})
@Order(Ordered.LOWEST_PRECEDENCE - 10)
public class VaultBootstrapPropertySourceConfiguration implements InitializingBean {
@@ -143,7 +143,7 @@ public class VaultBootstrapPropertySourceConfiguration implements InitializingBe
if (keyValueBackend instanceof VaultKeyValueBackendProperties
&& ((VaultKeyValueBackendProperties) keyValueBackend)
.getBackendVersion() == 2) {
.getBackendVersion() == 2) {
for (String context : contexts) {
secretBackendConfigurer.add(KeyValueSecretBackendMetadata

8
spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicator.java
View File

@@ -44,14 +44,10 @@ public class VaultHealthIndicator extends AbstractHealthIndicator {
if (!vaultHealthResponse.isInitialized()) {
builder.down().withDetail("state", "Vault uninitialized");
}
else
if (vaultHealthResponse.isSealed()) {
else if (vaultHealthResponse.isSealed()) {
builder.down().withDetail("state", "Vault sealed");
}
else
if (vaultHealthResponse.isStandby()) {
else if (vaultHealthResponse.isStandby()) {
builder.up().withDetail("state", "Vault in standby");
}
else {

4
spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfiguration.java
View File

@@ -39,8 +39,8 @@ import org.springframework.context.annotation.Import;
@ConditionalOnClass(HealthIndicator.class)
@ConditionalOnProperty(name = "spring.cloud.vault.enabled", matchIfMissing = true)
@AutoConfigureBefore(HealthIndicatorAutoConfiguration.class)
@Import({ VaultHealthIndicatorConfiguration.class,
VaultReactiveHealthIndicatorConfiguration.class })
@Import({VaultHealthIndicatorConfiguration.class,
VaultReactiveHealthIndicatorConfiguration.class})
public class VaultHealthIndicatorAutoConfiguration {
}

2
spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorConfiguration.java
View File

@@ -45,7 +45,7 @@ class VaultHealthIndicatorConfiguration extends
}
@Bean
@ConditionalOnMissingBean(name = { "vaultHealthIndicator" })
@ConditionalOnMissingBean(name = {"vaultHealthIndicator"})
public HealthIndicator vaultHealthIndicator() {
return this.createHealthIndicator(this.vaultTemplates);
}

6
spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfiguration.java
View File

@@ -70,9 +70,9 @@ import org.springframework.web.reactive.function.client.WebClient;
@Configuration
@ConditionalOnProperty(name = "spring.cloud.vault.enabled", matchIfMissing = true)
@ConditionalOnExpression("${spring.cloud.vault.reactive.enabled:true}")
@ConditionalOnClass({ Flux.class, WebClient.class, ReactiveVaultOperations.class,
HttpClient.class })
@EnableConfigurationProperties({ VaultProperties.class })
@ConditionalOnClass({Flux.class, WebClient.class, ReactiveVaultOperations.class,
HttpClient.class})
@EnableConfigurationProperties({VaultProperties.class})
@Order(Ordered.LOWEST_PRECEDENCE - 10)
public class VaultReactiveBootstrapConfiguration {

8
spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicator.java
View File

@@ -68,14 +68,10 @@ public class VaultReactiveHealthIndicator extends AbstractReactiveHealthIndicato
if (!vaultHealthResponse.isInitialized()) {
builder.withDetail("state", "Vault uninitialized");
}
else
if (vaultHealthResponse.isSealed()) {
else if (vaultHealthResponse.isSealed()) {
builder.down().withDetail("state", "Vault sealed");
}
else
if (vaultHealthResponse.isStandby()) {
else if (vaultHealthResponse.isStandby()) {
builder.up().withDetail("state", "Vault in standby");
}
else {

2
spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorConfiguration.java
View File

@@ -49,7 +49,7 @@ class VaultReactiveHealthIndicatorConfiguration extends
}
@Bean
@ConditionalOnMissingBean(name = { "vaultReactiveHealthIndicator" })
@ConditionalOnMissingBean(name = {"vaultReactiveHealthIndicator"})
ReactiveHealthIndicator vaultReactiveHealthIndicator() {
return this.createHealthIndicator(this.reactiveVaultTemplates);
}