Skip to content

Commit e6bf58e

Browse files
Add missing unpack support for HTTPTransportSettings.Auth
1 parent 2c8b125 commit e6bf58e

2 files changed

Lines changed: 18 additions & 3 deletions

File tree

transport/httpcommon/httpcommon.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,10 @@ func DefaultHTTPTransportSettings() HTTPTransportSettings {
197197
// Unpack reads a config object into the settings.
198198
func (settings *HTTPTransportSettings) Unpack(cfg *config.C) error {
199199
tmp := struct {
200-
TLS *tlscommon.Config `config:"ssl"`
201-
Timeout time.Duration `config:"timeout"`
202-
IdleConnTimeout time.Duration `config:"idle_connection_timeout"`
200+
TLS *tlscommon.Config `config:"ssl"`
201+
Timeout time.Duration `config:"timeout"`
202+
IdleConnTimeout time.Duration `config:"idle_connection_timeout"`
203+
Auth *HTTPAuthorization `config:"auth"`
203204
}{
204205
Timeout: settings.Timeout,
205206
IdleConnTimeout: settings.IdleConnTimeout,
@@ -223,6 +224,7 @@ func (settings *HTTPTransportSettings) Unpack(cfg *config.C) error {
223224

224225
*settings = HTTPTransportSettings{
225226
TLS: tmp.TLS,
227+
Auth: tmp.Auth,
226228
Timeout: tmp.Timeout,
227229
Proxy: proxy,
228230
IdleConnTimeout: tmp.IdleConnTimeout,

transport/httpcommon/httpcommon_test.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,19 @@ ssl:
8383
Timeout: 5 * time.Second,
8484
},
8585
},
86+
"includes auth": {
87+
input: `
88+
auth:
89+
api_key: test-key
90+
timeout: 5s
91+
`,
92+
expected: HTTPTransportSettings{
93+
Auth: &HTTPAuthorization{
94+
APIKey: "test-key",
95+
},
96+
Timeout: 5 * time.Second,
97+
},
98+
},
8699
}
87100
for name, tc := range tests {
88101
t.Run(name, func(t *testing.T) {

0 commit comments

Comments
 (0)