IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Fix edit / view of webhook contact point when no authorization is set (#71965)

Browse Source
This commit is contained in:
Gilles De Mey 2023-07-19 19:24:14 +02:00 committed by GitHub
parent 63346674e6
commit 6d1ff7f416
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/features/alerting/unified/components/receivers/form/util.test.ts
View File

@ -34,6 +34,11 @@ describe('normalizeFormValues', () => {
expect(normalizeFormValues(config)).toEqual(createContactPoint({ bearer_token_file: 'file' }));
});
it('should normalize even if authorization is not defined', () => {
const config = createContactPoint({});
expect(normalizeFormValues(config)).toEqual(createContactPoint({}));
});
});
function createContactPoint(httpConfig: DeprecatedAuthHTTPConfig | HTTPAuthConfig) {

6
public/app/features/alerting/unified/components/receivers/form/util.ts
View File

@ -8,7 +8,7 @@ export interface DeprecatedAuthHTTPConfig {
}
export interface HTTPAuthConfig {
authorization: {
authorization?: {
type: string;
credentials?: string;
credentials_file?: string;
@ -42,8 +42,8 @@ function normalizeHTTPConfig(config: HTTPAuthConfig | DeprecatedAuthHTTPConfig):
return {
...omit(config, 'authorization'),
bearer_token: config.authorization.credentials,
bearer_token_file: config.authorization.credentials_file,
bearer_token: config.authorization?.credentials,
bearer_token_file: config.authorization?.credentials_file,
};
}