From 76a4ada567990e83b0fcdf96064e6736567dea35 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Thu, 6 Oct 2016 00:30:32 +0200
Subject: [PATCH] Upgrade to Vault 0.6.2.

Fixes gh-14
---
 .travis.yml                                            |  1 +
 .../springframework/vault/support/VaultTransitKey.java | 10 ++++++++++
 .../core/VaultTransitTemplateIntegrationTests.java     | 10 ++++++++--
 src/test/bash/install_vault.sh                         |  2 +-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1f118cad..286c4399 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ env:
     - VAULT_VER=0.5.2
     - VAULT_VER=0.6.0
     - VAULT_VER=0.6.1
+    - VAULT_VER=0.6.2
 
 install:
   - src/test/bash/start.sh
diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultTransitKey.java b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultTransitKey.java
index 44231206..04c2e040 100644
--- a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultTransitKey.java
+++ b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultTransitKey.java
@@ -28,6 +28,8 @@ public class VaultTransitKey {
 
 	@JsonProperty("cipher_mode") private String cipherMode;
 
+	@JsonProperty("type") private String type;
+
 	@JsonProperty("deletion_allowed") private boolean deletionAllowed;
 
 	private boolean derived;
@@ -95,4 +97,12 @@ public class VaultTransitKey {
 	public void setName(String name) {
 		this.name = name;
 	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
 }
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 1b289064..43f30992 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
@@ -67,7 +67,14 @@ public class VaultTransitTemplateIntegrationTests extends IntegrationTestSupport
 
 		VaultTransitKey mykey = transitOperations.getKey("mykey");
 
-		assertThat(mykey.getCipherMode()).isEqualTo("aes-gcm");
+		if (mykey.getCipherMode() != null) {
+			// <= Vault 0.6.1
+			assertThat(mykey.getCipherMode()).isEqualTo("aes-gcm");
+		} else {
+			// Vault 0.6.2+
+			assertThat(mykey.getType()).startsWith("aes256-gcm");
+		}
+
 		assertThat(mykey.getName()).isEqualTo("mykey");
 		assertThat(mykey.isDeletionAllowed()).isFalse();
 		assertThat(mykey.isDerived()).isFalse();
@@ -86,7 +93,6 @@ public class VaultTransitTemplateIntegrationTests extends IntegrationTestSupport
 
 		VaultTransitKey mykey = transitOperations.getKey("mykey");
 
-		assertThat(mykey.getCipherMode()).isEqualTo("aes-gcm");
 		assertThat(mykey.getName()).isEqualTo("mykey");
 		assertThat(mykey.isDeletionAllowed()).isFalse();
 		assertThat(mykey.isDerived()).isTrue();
diff --git a/src/test/bash/install_vault.sh b/src/test/bash/install_vault.sh
index 07f7f719..b1d911d2 100755
--- a/src/test/bash/install_vault.sh
+++ b/src/test/bash/install_vault.sh
@@ -6,7 +6,7 @@
 ###########################################################################
 
 
-VAULT_VER="${VAULT_VER:-0.6.1}"
+VAULT_VER="${VAULT_VER:-0.6.2}"
 UNAME=$(uname -s |  tr '[:upper:]' '[:lower:]')
 VAULT_ZIP="vault_${VAULT_VER}_${UNAME}_amd64.zip"
 IGNORE_CERTS="${IGNORE_CERTS:-no}"