Support KVv2

doomsday-project · May 21, 2019 · f9b9fc1 · f9b9fc1
1 parent 7b0dfdf
commit f9b9fc1
Show file tree

Hide file tree

Showing 24 changed files with 5,335 additions and 2,107 deletions.
diff --git a/server/static.go b/server/static.go
diff --git a/storage/vault.go b/storage/vault.go
@@ -12,7 +12,7 @@ import (
 )
 
 type VaultAccessor struct {
-	client   *vaultkv.Client
+	client   *vaultkv.KV
 	basePath string
 }
 
@@ -44,7 +44,7 @@ func newVaultAccessor(conf VaultConfig) (*VaultAccessor, error) {
 	}
 
 	return &VaultAccessor{
-		client: &vaultkv.Client{
+		client: (&vaultkv.Client{
 			VaultURL:  u,
 			AuthToken: conf.Auth.Token,
 			Client: &http.Client{
@@ -55,7 +55,7 @@ func newVaultAccessor(conf VaultConfig) (*VaultAccessor, error) {
 				},
 			},
 			//Trace: os.Stdout,
-		},
+		}).NewKV(),
 		basePath: conf.BasePath,
 	}, nil
 
@@ -65,7 +65,7 @@ func newVaultAccessor(conf VaultConfig) (*VaultAccessor, error) {
 // return it as a map.
 func (v *VaultAccessor) Get(path string) (map[string]string, error) {
 	ret := make(map[string]string)
-	err := v.client.Get(path, &ret)
+	_, err := v.client.Get(path, &ret, nil)
 	return ret, err
 }
 

diff --git a/vendor/github.com/cloudfoundry-community/vaultkv/README.md b/vendor/github.com/cloudfoundry-community/vaultkv/README.md
diff --git a/vendor/github.com/cloudfoundry-community/vaultkv/auth.go b/vendor/github.com/cloudfoundry-community/vaultkv/auth.go
diff --git a/vendor/github.com/cloudfoundry-community/vaultkv/auth_test.go b/vendor/github.com/cloudfoundry-community/vaultkv/auth_test.go
diff --git a/vendor/github.com/cloudfoundry-community/vaultkv/badstate_test.go b/vendor/github.com/cloudfoundry-community/vaultkv/badstate_test.go