scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-01 11:08:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't clone OutputCurlString value (#14968)

Browse Source 
* Don't clone OutputCurlString value, add flag to docs

* Add changelog
This commit is contained in:
VAL
2022-04-08 09:58:50 -07:00
committed by GitHub
parent 33e5b32dd5
commit ec1a3cfbed
4 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
api/client.go
View File

@@ -588,7 +588,6 @@ func (c *Client) CloneConfig() *Config {
newConfig.CheckRetry = c.config.CheckRetry newConfig.CheckRetry = c.config.CheckRetry
newConfig.Logger = c.config.Logger newConfig.Logger = c.config.Logger
newConfig.Limiter = c.config.Limiter newConfig.Limiter = c.config.Limiter
newConfig.OutputCurlString = c.config.OutputCurlString
newConfig.SRVLookup = c.config.SRVLookup newConfig.SRVLookup = c.config.SRVLookup
newConfig.CloneHeaders = c.config.CloneHeaders newConfig.CloneHeaders = c.config.CloneHeaders
newConfig.CloneToken = c.config.CloneToken newConfig.CloneToken = c.config.CloneToken
@@ -1002,22 +1001,21 @@ func (c *Client) clone(cloneHeaders bool) (*Client, error) {
defer config.modifyLock.RUnlock() defer config.modifyLock.RUnlock()
newConfig := &Config{ newConfig := &Config{
Address: config.Address, Address: config.Address,
HttpClient: config.HttpClient, HttpClient: config.HttpClient,
MinRetryWait: config.MinRetryWait, MinRetryWait: config.MinRetryWait,
MaxRetryWait: config.MaxRetryWait, MaxRetryWait: config.MaxRetryWait,
MaxRetries: config.MaxRetries, MaxRetries: config.MaxRetries,
Timeout: config.Timeout, Timeout: config.Timeout,
Backoff: config.Backoff, Backoff: config.Backoff,
CheckRetry: config.CheckRetry, CheckRetry: config.CheckRetry,
Logger: config.Logger, Logger: config.Logger,
Limiter: config.Limiter, Limiter: config.Limiter,
OutputCurlString: config.OutputCurlString, AgentAddress: config.AgentAddress,
AgentAddress: config.AgentAddress, SRVLookup: config.SRVLookup,
SRVLookup: config.SRVLookup, CloneHeaders: config.CloneHeaders,
CloneHeaders: config.CloneHeaders, CloneToken: config.CloneToken,
CloneToken: config.CloneToken, ReadYourWrites: config.ReadYourWrites,
ReadYourWrites: config.ReadYourWrites,
} }
client, err := NewClient(newConfig) client, err := NewClient(newConfig)
if err != nil { if err != nil {

4
api/client_test.go
View File

@@ -526,8 +526,8 @@ func TestClone(t *testing.T) {
if parent.MaxRetries() != clone.MaxRetries() { if parent.MaxRetries() != clone.MaxRetries() {
t.Fatalf("maxRetries don't match: %v vs %v", parent.MaxRetries(), clone.MaxRetries()) t.Fatalf("maxRetries don't match: %v vs %v", parent.MaxRetries(), clone.MaxRetries())
} }
if parent.OutputCurlString() != clone.OutputCurlString() { if parent.OutputCurlString() == clone.OutputCurlString() {
t.Fatalf("outputCurlString doesn't match: %v vs %v", parent.OutputCurlString(), clone.OutputCurlString()) t.Fatalf("outputCurlString was copied over when it shouldn't have been: %v and %v", parent.OutputCurlString(), clone.OutputCurlString())
} }
if parent.SRVLookup() != clone.SRVLookup() { if parent.SRVLookup() != clone.SRVLookup() {
t.Fatalf("SRVLookup doesn't match: %v vs %v", parent.SRVLookup(), clone.SRVLookup()) t.Fatalf("SRVLookup doesn't match: %v vs %v", parent.SRVLookup(), clone.SRVLookup())

3
changelog/14968.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:bug
api: Fixes bug where OutputCurlString field was unintentionally being copied over during client cloning
```

5
website/content/docs/commands/index.mdx
View File

@@ -37,6 +37,11 @@ To get help for a subcommand, run:
$ vault <subcommand> -h $ vault <subcommand> -h
``` ```
To see the equivalent API call required to perform the same operation, use the `-output-curl-string` flag after the subcommand.
```shell-session
vault auth enable -output-curl-string approle
```
## CLI Command Structure ## CLI Command Structure
There are a number of command and subcommand options available: HTTP options, There are a number of command and subcommand options available: HTTP options,