Upgrade Vault to 0.10.1 in tests

kelseyhightower · May 3, 2018 · 060d95a · 060d95a
1 parent 42006c8
commit 060d95a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ go:
   - 1.x
   - tip
 env:
-  - VAULT_ADDR='http://127.0.0.1:8200' CONSUL_VERSION=0.9.3 ETCD_VERSION=3.3.1 DYNAMODB_VERSION=2017-02-16 VAULT_VERSION=0.8.1 ZOOKEEPER_VERSION=3.4.10 RANCHER_VERSION=0.6.0
+  - VAULT_ADDR='http://127.0.0.1:8200' CONSUL_VERSION=0.9.3 ETCD_VERSION=3.3.1 DYNAMODB_VERSION=2017-02-16 VAULT_VERSION=0.10.1 ZOOKEEPER_VERSION=3.4.10 RANCHER_VERSION=0.6.0
 services:
   - redis
 before_install:

diff --git a/integration/vault-path/test.sh b/integration/vault-path/test.sh
@@ -1,9 +1,12 @@
 #!/bin/bash
 
-vault mount -path database generic
-vault mount -path key generic
-vault mount -path upstream generic
-vault mount -path nested generic
+export HOSTNAME="localhost"
+export ROOT_TOKEN="$(vault read -field id auth/token/lookup-self)"
+
+vault secrets enable -path database kv
+vault secrets enable -path key kv
+vault secrets enable -path upstream kv
+vault secrets enable -path nested kv
 
 vault write key value=foobar
 vault write database/host value=127.0.0.1
@@ -22,7 +25,7 @@ echo 'path "*" {
 
 vault write sys/policy/my-policy [email protected]
 
-vault write auth/test/role/my-role secret_id_ttl=120m token_num_uses=1000 token_ttl=60m token_max_ttl=120m secret_id_num_uses=10000
+vault write auth/test/role/my-role secret_id_ttl=120m token_num_uses=1000 token_ttl=60m token_max_ttl=120m secret_id_num_uses=10000 policies=my-policy
 
 export ROLE_ID=$(vault read -field=role_id auth/test/role/my-role/role-id)
 export SECRET_ID=$(vault write -f -field=secret_id auth/test/role/my-role/secret-id)

diff --git a/integration/vault/test.sh b/integration/vault/test.sh
@@ -3,10 +3,10 @@
 export HOSTNAME="localhost"
 export ROOT_TOKEN="$(vault read -field id auth/token/lookup-self)"
 
-vault mount -path database generic
-vault mount -path key generic
-vault mount -path upstream generic
-vault mount -path nested generic
+vault secrets enable -path database kv
+vault secrets enable -path key kv
+vault secrets enable -path upstream kv
+vault secrets enable -path nested kv
 
 vault write key value=foobar
 vault write database/host value=127.0.0.1