Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

If we get a 405 doing an HTTP PATCH, assume the server is pre-1.9 and… #13615

Merged
merged 2 commits into from Jan 11, 2022
Merged

If we get a 405 doing an HTTP PATCH, assume the server is pre-1.9 and… #13615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4c4e44
If we get a 405 doing an HTTP PATCH, assume the server is pre-1.9 and…
ncabatoff Jan 10, 2022
ade3cd4
Add CL
ncabatoff Jan 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelog/13615.txt
View file
Open in desktop
@@ -0,0 +1,3 @@
```release-note:bug
cli: Fix using kv patch with older server versions that don't support HTTP PATCH.
```
7 changes: 7 additions & 0 deletions command/kv_patch.go
View file
Open in desktop
Expand Up @@ -281,6 +281,13 @@ func (c *KVPatchCommand) mergePatch(client *api.Client, path string, newData map

secret, err := client.Logical().JSONMergePatch(context.Background(), path, data)
if err != nil {
// If it's a 405, that probably means the server is running a pre-1.9
// Vault version that doesn't support the HTTP PATCH method.
// Fall back to the old way of doing it if the user didn't specify a -method.
// If they did, and it was "patch", then just error.
if re, ok := err.(*api.ResponseError); ok && re.StatusCode == 405 && rwFallback {
return c.readThenWrite(client, path, newData)
}
// If it's a 403, that probably means they don't have the patch capability in their policy. Fall back to
// the old way of doing it if the user didn't specify a -method. If they did, and it was "patch", then just error.
if re, ok := err.(*api.ResponseError); ok && re.StatusCode == 403 && rwFallback {
Expand Down