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.

Sign up for GitHub

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

Jump to bottom

[Fleet] Make agent Policy input id unique #83101

Closed
wants to merge 2 commits into from
Closed

[Fleet] Make agent Policy input id unique #83101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87a3ce1
[Fleet] Make agent Policy input id unique
nchaulet Nov 10, 2020
9cce417
Migrate package policies
nchaulet Nov 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion x-pack/plugins/fleet/common/services/package_policies_to_agent_inputs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const storedPackagePoliciesToAgentInputs = (
}

const fullInput: FullAgentPolicyInput = {
id: packagePolicy.id || packagePolicy.name,
id: input.id || packagePolicy.id || packagePolicy.name,
revision: packagePolicy.revision,
name: packagePolicy.name,
type: input.type,
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/fleet/common/types/models/package_policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export interface NewPackagePolicyInput {
}

export interface PackagePolicyInput extends Omit<NewPackagePolicyInput, 'streams'> {
id?: string;
streams: PackagePolicyInputStream[];
}

Expand Down
7 changes: 5 additions & 2 deletions x-pack/plugins/fleet/server/saved_objects/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
*/

import { SavedObjectsServiceSetup, SavedObjectsType } from 'kibana/server';
import { flowRight } from 'lodash';
import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
import { migratePackagePolicyToV7110 } from '../../../security_solution/common';
import { migratePackagePolicyToV7110 as endpointMigratePackagePolicyToV7110 } from '../../../security_solution/common';
import {
OUTPUT_SAVED_OBJECT_TYPE,
AGENT_POLICY_SAVED_OBJECT_TYPE,
Expand All @@ -27,6 +28,7 @@ import {
migrateSettingsToV7100,
migrateAgentActionToV7100,
} from './migrations/to_v7_10_0';
import { migratePackagePolicyToV7110 } from './migrations/to_v7_11_0';

/*
* Saved object types and mappings
Expand Down Expand Up @@ -238,6 +240,7 @@ const getSavedObjectTypes = (
type: 'nested',
enabled: false,
properties: {
id: { type: 'keyword' },
type: { type: 'keyword' },
enabled: { type: 'boolean' },
vars: { type: 'flattened' },
Expand Down Expand Up @@ -269,7 +272,7 @@ const getSavedObjectTypes = (
},
migrations: {
'7.10.0': migratePackagePolicyToV7100,
'7.11.0': migratePackagePolicyToV7110,
'7.11.0': flowRight(migratePackagePolicyToV7110, endpointMigratePackagePolicyToV7110),
},
},
[PACKAGES_SAVED_OBJECT_TYPE]: {
Expand Down
19 changes: 19 additions & 0 deletions x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_11_0.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/

import { SavedObjectMigrationFn } from 'kibana/server';
import { PackagePolicy } from '../../types';

export const migratePackagePolicyToV7110: SavedObjectMigrationFn<PackagePolicy, PackagePolicy> = (
packagePolicyDoc
) => {
packagePolicyDoc.attributes.inputs = packagePolicyDoc.attributes.inputs.map((input) => ({
...input,
id: `${input.type}-${packagePolicyDoc.id}`,
}));

return packagePolicyDoc;
};
14 changes: 9 additions & 5 deletions x-pack/plugins/fleet/server/services/package_policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ class PackagePolicyService {
}
// Add ids to stream
const packagePolicyId = options?.id || uuid.v4();
let inputs: PackagePolicyInput[] = packagePolicy.inputs.map((input) =>
assignStreamIdToInput(packagePolicyId, input)
let inputs = packagePolicy.inputs.map((input) =>
assignIdsToInputAndStream(packagePolicyId, input)
);

// Make sure the associated package is installed
Expand Down Expand Up @@ -137,7 +137,7 @@ class PackagePolicyService {
const packagePolicyId = uuid.v4();

const inputs = packagePolicy.inputs.map((input) =>
assignStreamIdToInput(packagePolicyId, input)
assignIdsToInputAndStream(packagePolicyId, input)
);

return {
Expand Down Expand Up @@ -275,7 +275,7 @@ class PackagePolicyService {
}

let inputs = await restOfPackagePolicy.inputs.map((input) =>
assignStreamIdToInput(oldPackagePolicy.id, input)
assignIdsToInputAndStream(oldPackagePolicy.id, input)
);

if (packagePolicy.package?.name) {
Expand Down Expand Up @@ -387,9 +387,13 @@ class PackagePolicyService {
}
}

function assignStreamIdToInput(packagePolicyId: string, input: NewPackagePolicyInput) {
function assignIdsToInputAndStream(
packagePolicyId: string,
input: NewPackagePolicyInput
): PackagePolicyInput {
return {
...input,
id: `${input.type}-${packagePolicyId}`,
streams: input.streams.map((stream) => {
return { ...stream, id: `${input.type}-${stream.data_stream.dataset}-${packagePolicyId}` };
}),
Expand Down