Skip to content

Commit a6b0ffc

Browse files
committed
Bring back support for Authorization.CredentialsFile.
Signed-off-by: Peter Štibraný <[email protected]>
1 parent 38e4e82 commit a6b0ffc

File tree

2 files changed

+37
-1
lines changed

2 files changed

+37
-1
lines changed

pkg/alertmanager/api.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,9 @@ func validateReceiverHTTPConfig(cfg commoncfg.HTTPClientConfig) error {
296296
if cfg.BasicAuth != nil && cfg.BasicAuth.PasswordFile != "" {
297297
return errPasswordFileNotAllowed
298298
}
299+
if cfg.Authorization != nil && cfg.Authorization.CredentialsFile != "" {
300+
return errPasswordFileNotAllowed
301+
}
299302
if cfg.BearerTokenFile != "" {
300303
return errPasswordFileNotAllowed
301304
}

pkg/alertmanager/api_test.go

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,22 @@ alertmanager_config: |
253253
http_config:
254254
bearer_token_file: /secrets
255255
256+
route:
257+
receiver: 'default-receiver'
258+
receivers:
259+
- name: default-receiver
260+
`,
261+
err: errors.Wrap(errPasswordFileNotAllowed, "error validating Alertmanager config"),
262+
},
263+
{
264+
name: "Should return error if global HTTP credentials_file is set",
265+
cfg: `
266+
alertmanager_config: |
267+
global:
268+
http_config:
269+
authorization:
270+
credentials_file: /secrets
271+
256272
route:
257273
receiver: 'default-receiver'
258274
receivers:
@@ -288,6 +304,23 @@ alertmanager_config: |
288304
http_config:
289305
bearer_token_file: /secrets
290306
307+
route:
308+
receiver: 'default-receiver'
309+
`,
310+
err: errors.Wrap(errPasswordFileNotAllowed, "error validating Alertmanager config"),
311+
},
312+
{
313+
name: "Should return error if receiver's HTTP credentials_file is set",
314+
cfg: `
315+
alertmanager_config: |
316+
receivers:
317+
- name: default-receiver
318+
webhook_configs:
319+
- url: http://localhost
320+
http_config:
321+
authorization:
322+
credentials_file: /secrets
323+
291324
route:
292325
receiver: 'default-receiver'
293326
`,
@@ -480,7 +513,7 @@ func TestValidateAlertmanagerConfig(t *testing.T) {
480513
for testName, testData := range tests {
481514
t.Run(testName, func(t *testing.T) {
482515
err := validateAlertmanagerConfig(testData.input)
483-
assert.True(t, errors.Is(err, testData.expected))
516+
assert.ErrorIs(t, err, testData.expected)
484517
})
485518
}
486519
}

0 commit comments

Comments
 (0)