github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Fleet] Delete non existing streams in overrideInputs (#116998) (#117114)

Browse source 
Co-authored-by: Nicolas Chaulet <nicolas.chaulet@elastic.co>
This commit is contained in:
Kibana Machine 2021-11-02 10:45:23 -04:00 • committed by GitHub
parent 0f41bdd18d
commit 80db29a1c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 113 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

94
x-pack/plugins/fleet/server/services/package_policy.test.ts
View file

@ -1843,6 +1843,100 @@ describe('Package policy service', () => {
expect(logfileStream?.enabled).toBe(false);
});
});
describe('when a datastream is deleted from an input', () => {
it('it remove the non existing datastream', () => {
const basePackagePolicy: NewPackagePolicy = {
name: 'base-package-policy',
description: 'Base Package Policy',
namespace: 'default',
enabled: true,
policy_id: 'xxxx',
output_id: 'xxxx',
package: {
name: 'test-package',
title: 'Test Package',
version: '0.0.1',
},
inputs: [
{
type: 'logs',
policy_template: 'template_1',
enabled: true,
vars: {
path: {
type: 'text',
value: ['/var/log/logfile.log'],
},
},
streams: [
{
enabled: true,
data_stream: { dataset: 'dataset.test123', type: 'log' },
},
],
},
],
};
const packageInfo: PackageInfo = {
name: 'test-package',
description: 'Test Package',
title: 'Test Package',
version: '0.0.1',
latestVersion: '0.0.1',
release: 'experimental',
format_version: '1.0.0',
owner: { github: 'elastic/fleet' },
policy_templates: [
{
name: 'template_1',
title: 'Template 1',
description: 'Template 1',
inputs: [
{
type: 'logs',
title: 'Log',
description: 'Log Input',
vars: [
{
name: 'path',
type: 'text',
},
],
},
],
},
],
// @ts-ignore
assets: {},
};
const inputsOverride: NewPackagePolicyInput[] = [
{
type: 'logs',
enabled: true,
streams: [],
vars: {
path: {
type: 'text',
value: '/var/log/new-logfile.log',
},
},
},
];
const result = overridePackageInputs(
basePackagePolicy,
packageInfo,
// TODO: Update this type assertion when the `InputsOverride` type is updated such
// that it no longer causes unresolvable type errors when used directly
inputsOverride as InputsOverride[],
false
);
expect(result.inputs[0]?.vars?.path.value).toEqual(['/var/log/logfile.log']);
});
});
});
});

21
x-pack/plugins/fleet/server/services/package_policy.ts
View file

@ -404,6 +404,7 @@ class PackagePolicyService {
pkgName: packagePolicy.package.name,
pkgVersion: packagePolicy.package.version,
});
const registryPkgInfo = await Registry.fetchInfo(pkgInfo.name, pkgInfo.version);
inputs = await this._compilePackagePolicyInputs(
registryPkgInfo,
@ -1111,7 +1112,9 @@ export function overridePackageInputs(
}
if (override.vars) {
originalInput = deepMergeVars(originalInput, override) as NewPackagePolicyInput;
const indexOfInput = inputs.indexOf(originalInput);
inputs[indexOfInput] = deepMergeVars(originalInput, override) as NewPackagePolicyInput;
originalInput = inputs[indexOfInput];
}
if (override.streams) {
@ -1130,10 +1133,24 @@ export function overridePackageInputs(
}
if (stream.vars) {
originalStream = deepMergeVars(originalStream, stream as InputsOverride);
const indexOfStream = originalInput.streams.indexOf(originalStream);
originalInput.streams[indexOfStream] = deepMergeVars(
originalStream,
stream as InputsOverride
);
originalStream = originalInput.streams[indexOfStream];
}
}
}
// Filter all stream that have been removed from the input
originalInput.streams = originalInput.streams.filter((originalStream) => {
return (
override.streams?.some(
(s) => s.data_stream.dataset === originalStream.data_stream.dataset
) ?? false
);
});
}
const resultingPackagePolicy: NewPackagePolicy = {