Skip to content

Commit 0a3484d

Browse files
authored
set global headers earlier when preparing request (#3000)
1 parent 54e85d8 commit 0a3484d

2 files changed

Lines changed: 14 additions & 8 deletions

File tree

.generator/src/generator/templates/client.j2

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,13 @@ func (c *APIClient) PrepareRequest(
232232

233233
var body *bytes.Buffer
234234

235+
// Apply default headers unless they are overridden
236+
for header, value := range c.Cfg.DefaultHeader {
237+
if _, exists := headerParams[header]; !exists {
238+
headerParams[header] = value
239+
}
240+
}
241+
235242
// Detect postBody type and post.
236243
if postBody != nil {
237244
contentType := headerParams["Content-Type"]
@@ -401,10 +408,6 @@ func (c *APIClient) PrepareRequest(
401408
}
402409
}
403410

404-
for header, value := range c.Cfg.DefaultHeader {
405-
localVarRequest.Header.Add(header, value)
406-
}
407-
408411
if !c.Cfg.Compress {
409412
// gzip is on by default, so disable it by setting encoding to identity
410413
localVarRequest.Header.Add("Accept-Encoding", "identity")

api/datadog/client.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,13 @@ func (c *APIClient) PrepareRequest(
232232

233233
var body *bytes.Buffer
234234

235+
// Apply default headers unless they are overridden
236+
for header, value := range c.Cfg.DefaultHeader {
237+
if _, exists := headerParams[header]; !exists {
238+
headerParams[header] = value
239+
}
240+
}
241+
235242
// Detect postBody type and post.
236243
if postBody != nil {
237244
contentType := headerParams["Content-Type"]
@@ -401,10 +408,6 @@ func (c *APIClient) PrepareRequest(
401408
}
402409
}
403410

404-
for header, value := range c.Cfg.DefaultHeader {
405-
localVarRequest.Header.Add(header, value)
406-
}
407-
408411
if !c.Cfg.Compress {
409412
// gzip is on by default, so disable it by setting encoding to identity
410413
localVarRequest.Header.Add("Accept-Encoding", "identity")

0 commit comments

Comments
 (0)