Merge 3130e8b into backport/kubawi-peteski22/VAULT-1324/fix-control-g…

…roup-wrapping/constantly-many-newt
hashicorp · Sep 7, 2023 · 31cdef3 · 31cdef3
2 parents 4d4aac7 + 3130e8b
commit 31cdef3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/changelog/22818.txt b/changelog/22818.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+cli: Fix the CLI failing to return wrapping information for KV PUT and PATCH operations when format is set to `table`.
+```
diff --git a/command/kv_patch.go b/command/kv_patch.go
@@ -239,6 +239,11 @@ func (c *KVPatchCommand) Run(args []string) int {
 		return PrintRawField(c.UI, secret, c.flagField)
 	}
 
+	// If the secret is wrapped, return the wrapped response.
+	if secret.WrapInfo != nil && secret.WrapInfo.TTL != 0 {
+		return OutputSecret(c.UI, secret)
+	}
+
 	if Format(c.UI) == "table" {
 		outputPath(c.UI, fullPath, "Secret Path")
 		metadata := secret.Data

diff --git a/command/kv_put.go b/command/kv_put.go
@@ -216,6 +216,11 @@ func (c *KVPutCommand) Run(args []string) int {
 		return PrintRawField(c.UI, secret, c.flagField)
 	}
 
+	// If the secret is wrapped, return the wrapped response.
+	if secret.WrapInfo != nil && secret.WrapInfo.TTL != 0 {
+		return OutputSecret(c.UI, secret)
+	}
+
 	if Format(c.UI) == "table" {
 		outputPath(c.UI, fullPath, "Secret Path")
 		metadata := secret.Data