Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Alerting] Track deprecated configs #113015

Merged
26 changes: 25 additions & 1 deletion x-pack/plugins/actions/server/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const applyStackAlertDeprecations = (settings: Record<string, unknown> = {}) =>
const _config = {
[CONFIG_PATH]: settings,
};
const { config: migrated } = applyDeprecations(
const { config: migrated, changedPaths } = applyDeprecations(
_config,
deprecations.map((deprecation) => ({
deprecation,
Expand All @@ -27,6 +27,7 @@ const applyStackAlertDeprecations = (settings: Record<string, unknown> = {}) =>
return {
messages: deprecationMessages,
migrated,
changedPaths,
};
};

Expand All @@ -40,5 +41,28 @@ describe('index', () => {
]
`);
});

it('should properly unset deprecated configs', () => {
const { messages, changedPaths } = applyStackAlertDeprecations({
customHostSettings: [{ ssl: { rejectUnauthorized: false } }],
rejectUnauthorized: false,
proxyRejectUnauthorizedCertificates: false,
});
expect(changedPaths.unset).toStrictEqual([
'xpack.actions.customHostSettings.ssl.rejectUnauthorized',
'xpack.actions.rejectUnauthorized',
'xpack.actions.proxyRejectUnauthorizedCertificates',
]);
expect(messages.length).toBe(3);
expect(messages[0]).toBe(
'"xpack.actions.customHostSettings[<index>].ssl.rejectUnauthorized" is deprecated.Use "xpack.actions.customHostSettings[<index>].ssl.verificationMode" instead, with the setting "verificationMode:full" eql to "rejectUnauthorized:true", and "verificationMode:none" eql to "rejectUnauthorized:false".'
);
expect(messages[1]).toBe(
'"xpack.actions.rejectUnauthorized" is deprecated. Use "xpack.actions.verificationMode" instead, with the setting "verificationMode:full" eql to "rejectUnauthorized:true", and "verificationMode:none" eql to "rejectUnauthorized:false".'
);
expect(messages[2]).toBe(
'"xpack.actions.proxyRejectUnauthorizedCertificates" is deprecated. Use "xpack.actions.proxyVerificationMode" instead, with the setting "proxyVerificationMode:full" eql to "rejectUnauthorized:true",and "proxyVerificationMode:none" eql to "rejectUnauthorized:false".'
);
});
});
});
28 changes: 25 additions & 3 deletions x-pack/plugins/actions/server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ export const config: PluginConfigDescriptor<ActionsConfig> = {
if (
customHostSettings.find(
(customHostSchema: CustomHostSettings) =>
!!customHostSchema.ssl && !!customHostSchema.ssl.rejectUnauthorized
customHostSchema.hasOwnProperty('ssl') &&
customHostSchema.ssl?.hasOwnProperty('rejectUnauthorized')
)
) {
addDeprecation({
Expand All @@ -82,11 +83,18 @@ export const config: PluginConfigDescriptor<ActionsConfig> = {
],
},
});
return {
unset: [
{
path: `xpack.actions.customHostSettings.ssl.rejectUnauthorized`,
},
],
};
}
},
(settings, fromPath, addDeprecation) => {
const actions = get(settings, fromPath);
if (!!actions?.rejectUnauthorized) {
if (actions?.hasOwnProperty('rejectUnauthorized')) {
addDeprecation({
message:
`"xpack.actions.rejectUnauthorized" is deprecated. Use "xpack.actions.verificationMode" instead, ` +
Expand All @@ -101,11 +109,18 @@ export const config: PluginConfigDescriptor<ActionsConfig> = {
],
},
});
return {
unset: [
{
path: `xpack.actions.rejectUnauthorized`,
},
],
};
}
},
(settings, fromPath, addDeprecation) => {
const actions = get(settings, fromPath);
if (!!actions?.proxyRejectUnauthorizedCertificates) {
if (actions?.hasOwnProperty('proxyRejectUnauthorizedCertificates')) {
addDeprecation({
message:
`"xpack.actions.proxyRejectUnauthorizedCertificates" is deprecated. Use "xpack.actions.proxyVerificationMode" instead, ` +
Expand All @@ -120,6 +135,13 @@ export const config: PluginConfigDescriptor<ActionsConfig> = {
],
},
});
return {
unset: [
{
path: `xpack.actions.proxyRejectUnauthorizedCertificates`,
},
],
};
}
},
(settings, fromPath, addDeprecation) => {
Expand Down
3 changes: 3 additions & 0 deletions x-pack/plugins/task_manager/server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ export type {

export const config: PluginConfigDescriptor<TaskManagerConfig> = {
schema: configSchema,
exposeToUsage: {
max_workers: true,
},
deprecations: () => [
(settings, fromPath, addDeprecation) => {
const taskManager = get(settings, fromPath);
Expand Down