From 06714906db6d2073ec8a060f762c37e827c4e8ea Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 16 Mar 2021 10:51:07 +0100 Subject: [PATCH] Guard tests against versions not supporting versioned k/v backend. --- .../core/lease/RotatingGenericSecretsIntegrationTests.java | 5 ++++- .../org/springframework/vault/util/VaultInitializer.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/lease/RotatingGenericSecretsIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/lease/RotatingGenericSecretsIntegrationTests.java index 40924c0f..3c44cd60 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/lease/RotatingGenericSecretsIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/lease/RotatingGenericSecretsIntegrationTests.java @@ -32,6 +32,7 @@ import org.springframework.vault.util.PrepareVault; import org.springframework.vault.util.VaultInitializer; import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assumptions.*; /** * Integration tests for rotating generic secrets. @@ -41,7 +42,7 @@ import static org.assertj.core.api.Assertions.*; @ExtendWith(SpringExtension.class) @SpringJUnitConfig( classes = { VaultIntegrationTestConfiguration.class, RotatingGenericSecretsIntegrationTestConfiguration.class }) -public class RotatingGenericSecretsIntegrationTests extends IntegrationTestSupport { +class RotatingGenericSecretsIntegrationTests extends IntegrationTestSupport { @BeforeAll static void beforeAll() { @@ -51,6 +52,8 @@ public class RotatingGenericSecretsIntegrationTests extends IntegrationTestSuppo initializer.initialize(); PrepareVault prepare = initializer.prepare(); + assumeThat(prepare.getVersion()).isGreaterThanOrEqualTo(VaultInitializer.VERSIONING_INTRODUCED_WITH); + VaultKeyValueOperations versioned = prepare.getVaultOperations().opsForKeyValue("versioned", VaultKeyValueOperationsSupport.KeyValueBackend.KV_2); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/util/VaultInitializer.java b/spring-vault-core/src/test/java/org/springframework/vault/util/VaultInitializer.java index c9b34c92..67ccbdd6 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/util/VaultInitializer.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/util/VaultInitializer.java @@ -40,7 +40,7 @@ public class VaultInitializer { public static final String VERSIONING_INTRODUCED_WITH_VALUE = "0.10.0"; - private static final Version VERSIONING_INTRODUCED_WITH = Version.parse(VERSIONING_INTRODUCED_WITH_VALUE); + public static final Version VERSIONING_INTRODUCED_WITH = Version.parse(VERSIONING_INTRODUCED_WITH_VALUE); private final VaultEndpoint vaultEndpoint;