Upgrade to Vault 0.6.2.

Fixes gh-14
This commit is contained in:
Mark Paluch
2016-10-06 00:30:32 +02:00
parent 50f90122af
commit 76a4ada567
4 changed files with 20 additions and 3 deletions

View File

@@ -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

View File

@@ -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;
}
}

View File

@@ -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();

View File

@@ -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}"