From 22fcbcfa2febda0bfd7e07ace9f15fbcbcd9064f Mon Sep 17 00:00:00 2001 From: "lalit@lalitadithya.com" Date: Mon, 18 Jan 2021 19:52:43 +0530 Subject: [PATCH] Append headers instead of replacing them when headers is not nil Signed-off-by: lalit@lalitadithya.com --- pkg/internal/vault/vault.go | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkg/internal/vault/vault.go b/pkg/internal/vault/vault.go index f0cdcb293..224ef35fe 100644 --- a/pkg/internal/vault/vault.go +++ b/pkg/internal/vault/vault.go @@ -111,9 +111,13 @@ func (v *Vault) Sign(csrPEM []byte, duration time.Duration) (cert []byte, ca []b request := v.client.NewRequest("POST", url) if vaultIssuer.Namespace != "" { - vaultReqHeaders := http.Header{} - vaultReqHeaders.Add("X-VAULT-NAMESPACE", vaultIssuer.Namespace) - request.Headers = vaultReqHeaders + if request.Headers != nil { + request.Headers.Add("X-VAULT-NAMESPACE", vaultIssuer.Namespace) + } else { + vaultReqHeaders := http.Header{} + vaultReqHeaders.Add("X-VAULT-NAMESPACE", vaultIssuer.Namespace) + request.Headers = vaultReqHeaders + } } if err := request.SetJSONBody(parameters); err != nil { @@ -261,9 +265,13 @@ func (v *Vault) requestTokenWithAppRoleRef(client Client, appRole *v1.VaultAppRo vaultIssuer := v.issuer.GetSpec().Vault if vaultIssuer.Namespace != "" { - vaultReqHeaders := http.Header{} - vaultReqHeaders.Add("X-VAULT-NAMESPACE", vaultIssuer.Namespace) - request.Headers = vaultReqHeaders + if request.Headers != nil { + request.Headers.Add("X-VAULT-NAMESPACE", vaultIssuer.Namespace) + } else { + vaultReqHeaders := http.Header{} + vaultReqHeaders.Add("X-VAULT-NAMESPACE", vaultIssuer.Namespace) + request.Headers = vaultReqHeaders + } } resp, err := client.RawRequest(request)