Skip to content

vault: clone the client and set headers #28101

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

Open
allisonlarson wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −2
Open

vault: clone the client and set headers #28101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions client/vaultclient/vaultclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,24 @@ func NewVaultClient(config *config.VaultConfig, logger hclog.Logger) (*vaultClie
return c, nil
}

// Clone returns a cloned vaultapi.Client with the same headers that we have set on our main client. The vault API config exposes a setting for cloning the client with headers, but we always want these headers to be set and to not be configurable.
func (c *vaultClient) Clone() (*vaultapi.Client, error) {
cc, err := c.client.Clone()
if err != nil {
return nil, err
}
useragent.SetHeaders(cc)

if c.config.Namespace != "" {
cc.SetNamespace(c.config.Namespace)
}

return cc, nil
}

// DeriveTokenWithJWT returns a Vault ACL token using the JWT login endpoint.
func (c *vaultClient) DeriveTokenWithJWT(ctx context.Context, req JWTLoginRequest) (string, bool, int, error) {
cc, err := c.client.Clone()
cc, err := c.Clone()
if err != nil {
return "", false, 0, err
}
Expand Down Expand Up @@ -158,7 +173,7 @@ func (c *vaultClient) DeriveTokenWithJWT(ctx context.Context, req JWTLoginReques
}

func (c *vaultClient) Renew(ctx context.Context, token string, lease int) (duration time.Duration, err error) {
cc, err := c.client.Clone()
cc, err := c.Clone()
if err != nil {
return 0, err
}
Expand Down
Loading