Skip to content

Commit 49d78f6

Browse files
committed
Update to Vault 1.6
Closes gh-604
1 parent 4783e24 commit 49d78f6

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ env:
2121
- VAULT_VER=1.2.4
2222
- VAULT_VER=1.3.4
2323
- VAULT_VER=1.5.3
24+
- VAULT_VER=1.6.0
2425
- EDITION=enterprise
2526

2627
before_install:

spring-vault-core/src/test/java/org/springframework/vault/core/VaultTransitTemplateIntegrationTests.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -548,12 +548,17 @@ void shouldBatchDecryptWithWrongContext() {
548548

549549
Ciphertext tampered = decryptedTwo.with(encryptedOne.getContext());
550550

551-
List<VaultDecryptionResult> decrypted = this.transitOperations.decrypt("mykey",
552-
Arrays.asList(encryptedOne, tampered));
551+
try {
552+
List<VaultDecryptionResult> decrypted = this.transitOperations.decrypt("mykey",
553+
Arrays.asList(encryptedOne, tampered));
553554

554-
assertThat(decrypted.get(0).get()).isEqualTo(one);
555-
assertThat(decrypted.get(1).isSuccessful()).isEqualTo(false);
556-
assertThat(decrypted.get(1).getCause()).isInstanceOf(VaultException.class);
555+
assertThat(decrypted.get(0).get()).isEqualTo(one);
556+
assertThat(decrypted.get(1).isSuccessful()).isEqualTo(false);
557+
assertThat(decrypted.get(1).getCause()).isInstanceOf(VaultException.class);
558+
}
559+
catch (VaultException e) {
560+
assertThat(e).hasMessageContaining("error"); // Vault 1.6 behavior is different
561+
}
557562
}
558563

559564
@Test

src/test/bash/install_vault.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
set -o errexit
99

1010
EDITION="${EDITION:-oss}"
11-
VAULT_OSS="${VAULT_OSS:-1.5.3}"
11+
VAULT_OSS="${VAULT_OSS:-1.6.0}"
1212
VAULT_ENT="${VAULT_ENT:-1.5.3}"
1313
UNAME=$(uname -s | tr '[:upper:]' '[:lower:]')
1414
VERBOSE=false

0 commit comments

Comments
 (0)