Merge pull request #1354 from hashicorp/issue-1350-versioned-brains

fix bug looking up versioned vault secrets
hashicorp · Mar 6, 2020 · 708f789 · 708f789
2 parents d1aa181 + d94fe0e
commit 708f789
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/dependency/vault_read.go b/dependency/vault_read.go
@@ -122,6 +122,9 @@ func (d *VaultReadQuery) Stop() {
 
 // String returns the human-friendly version of this dependency.
 func (d *VaultReadQuery) String() string {
+	if v := d.queryValues["version"]; len(v) > 0 {
+		return fmt.Sprintf("vault.read(%s.v%s)", d.rawPath, v[0])
+	}
 	return fmt.Sprintf("vault.read(%s)", d.rawPath)
 }
 

diff --git a/template/template_test.go b/template/template_test.go
@@ -458,6 +458,34 @@ func TestTemplate_Execute(t *testing.T) {
 			"zap",
 			false,
 		},
+		{
+			"func_secret_read_versions",
+			&NewTemplateInput{
+				Contents: `{{with secret "secret/foo"}}{{.Data.zip}}{{end}}:{{with secret "secret/foo?version=1"}}{{.Data.zip}}{{end}}`,
+			},
+			&ExecuteInput{
+				Brain: func() *Brain {
+					b := NewBrain()
+					d, err := dep.NewVaultReadQuery("secret/foo")
+					if err != nil {
+						t.Fatal(err)
+					}
+					b.Remember(d, &dep.Secret{
+						Data: map[string]interface{}{"zip": "zap"},
+					})
+					d1, err := dep.NewVaultReadQuery("secret/foo?version=1")
+					if err != nil {
+						t.Fatal(err)
+					}
+					b.Remember(d1, &dep.Secret{
+						Data: map[string]interface{}{"zip": "zed"},
+					})
+					return b
+				}(),
+			},
+			"zap:zed",
+			false,
+		},
 		{
 			"func_secret_read_no_exist",
 			&NewTemplateInput{