From a0d24989fb7414c5a8de97ef2b1721d0b4fd7b38 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 7 Feb 2019 11:04:11 +0100 Subject: [PATCH] Improve test skipping for Consul. See gh-273. --- .../cloud/vault/config/ClientAuthenticationFactory.java | 3 ++- .../config/VaultBootstrapPropertySourceConfiguration.java | 6 +++--- .../cloud/vault/config/VaultHealthIndicator.java | 8 ++------ .../config/VaultHealthIndicatorAutoConfiguration.java | 4 ++-- .../vault/config/VaultHealthIndicatorConfiguration.java | 2 +- .../vault/config/VaultReactiveBootstrapConfiguration.java | 6 +++--- .../cloud/vault/config/VaultReactiveHealthIndicator.java | 8 ++------ .../config/VaultReactiveHealthIndicatorConfiguration.java | 2 +- 8 files changed, 16 insertions(+), 23 deletions(-) diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/ClientAuthenticationFactory.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/ClientAuthenticationFactory.java index 7e8fe77f..15fabecd 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/ClientAuthenticationFactory.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/ClientAuthenticationFactory.java @@ -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(); diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfiguration.java index c0dfce25..047ddd9d 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfiguration.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfiguration.java @@ -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 diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicator.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicator.java index aa34d925..f14aa609 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicator.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicator.java @@ -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 { diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfiguration.java index 8a6a1989..9e074fde 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfiguration.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfiguration.java @@ -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 { } diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorConfiguration.java index 65990b4f..ae498cb4 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorConfiguration.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorConfiguration.java @@ -45,7 +45,7 @@ class VaultHealthIndicatorConfiguration extends } @Bean - @ConditionalOnMissingBean(name = { "vaultHealthIndicator" }) + @ConditionalOnMissingBean(name = {"vaultHealthIndicator"}) public HealthIndicator vaultHealthIndicator() { return this.createHealthIndicator(this.vaultTemplates); } diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfiguration.java index 3e03f134..5563be35 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfiguration.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfiguration.java @@ -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 { diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicator.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicator.java index d73f55a1..09bcafc7 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicator.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicator.java @@ -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 { diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorConfiguration.java index d5753717..f770039e 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorConfiguration.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorConfiguration.java @@ -49,7 +49,7 @@ class VaultReactiveHealthIndicatorConfiguration extends } @Bean - @ConditionalOnMissingBean(name = { "vaultReactiveHealthIndicator" }) + @ConditionalOnMissingBean(name = {"vaultReactiveHealthIndicator"}) ReactiveHealthIndicator vaultReactiveHealthIndicator() { return this.createHealthIndicator(this.reactiveVaultTemplates); }