From 49d78f6b766da74974edf4eacd7498d6ffd1ba14 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Thu, 10 Dec 2020 10:57:09 +0100
Subject: [PATCH] Update to Vault 1.6

Closes gh-604
---
 .travis.yml                                       |  1 +
 .../VaultTransitTemplateIntegrationTests.java     | 15 ++++++++++-----
 src/test/bash/install_vault.sh                    |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a5a1c75c..3cc166ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,7 @@ env:
     - VAULT_VER=1.2.4
     - VAULT_VER=1.3.4
     - VAULT_VER=1.5.3
+    - VAULT_VER=1.6.0
     - EDITION=enterprise
 
 before_install:
diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTransitTemplateIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTransitTemplateIntegrationTests.java
index b6309d60..1e668ba9 100644
--- a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTransitTemplateIntegrationTests.java
+++ b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTransitTemplateIntegrationTests.java
@@ -548,12 +548,17 @@ class VaultTransitTemplateIntegrationTests extends IntegrationTestSupport {
 
 		Ciphertext tampered = decryptedTwo.with(encryptedOne.getContext());
 
-		List<VaultDecryptionResult> decrypted = this.transitOperations.decrypt("mykey",
-				Arrays.asList(encryptedOne, tampered));
+		try {
+			List<VaultDecryptionResult> decrypted = this.transitOperations.decrypt("mykey",
+					Arrays.asList(encryptedOne, tampered));
 
-		assertThat(decrypted.get(0).get()).isEqualTo(one);
-		assertThat(decrypted.get(1).isSuccessful()).isEqualTo(false);
-		assertThat(decrypted.get(1).getCause()).isInstanceOf(VaultException.class);
+			assertThat(decrypted.get(0).get()).isEqualTo(one);
+			assertThat(decrypted.get(1).isSuccessful()).isEqualTo(false);
+			assertThat(decrypted.get(1).getCause()).isInstanceOf(VaultException.class);
+		}
+		catch (VaultException e) {
+			assertThat(e).hasMessageContaining("error"); // Vault 1.6 behavior is different
+		}
 	}
 
 	@Test
diff --git a/src/test/bash/install_vault.sh b/src/test/bash/install_vault.sh
index 8c3c46e4..525a3b83 100755
--- a/src/test/bash/install_vault.sh
+++ b/src/test/bash/install_vault.sh
@@ -8,7 +8,7 @@
 set -o errexit
 
 EDITION="${EDITION:-oss}"
-VAULT_OSS="${VAULT_OSS:-1.5.3}"
+VAULT_OSS="${VAULT_OSS:-1.6.0}"
 VAULT_ENT="${VAULT_ENT:-1.5.3}"
 UNAME=$(uname -s | tr '[:upper:]' '[:lower:]')
 VERBOSE=false