[Fleet] Fix agent policy change action migration (#79046) (#79185)

* Fix agent policy change action migration for encrypted `data` property * Parse & re-stringify `config`->`policy` data
elastic · Oct 1, 2020 · 3c20100 · 3c20100
1 parent 3bafe41
commit 3c20100
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 18 deletions.
diff --git a/x-pack/plugins/ingest_manager/server/plugin.ts b/x-pack/plugins/ingest_manager/server/plugin.ts
@@ -172,7 +172,7 @@ export class IngestManagerPlugin
  this.encryptedSavedObjectsSetup = deps.encryptedSavedObjects;
  this.cloud = deps.cloud;
 
- registerSavedObjects(core.savedObjects);
+ registerSavedObjects(core.savedObjects, deps.encryptedSavedObjects);
  registerEncryptedSavedObjects(deps.encryptedSavedObjects);
 
  // Register feature

diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/index.ts b/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
@@ -33,7 +33,9 @@ import {
  * Please update typings in `/common/types` as well as
  * schemas in `/server/types` if mappings are updated.
  */
-const savedObjectTypes: { [key: string]: SavedObjectsType } = {
+const getSavedObjectTypes = (
+ encryptedSavedObjects: EncryptedSavedObjectsPluginSetup
+): { [key: string]: SavedObjectsType } => ({
  [GLOBAL_SETTINGS_SAVED_OBJECT_TYPE]: {
  name: GLOBAL_SETTINGS_SAVED_OBJECT_TYPE,
  hidden: false,
@@ -111,7 +113,7 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
  },
  },
  migrations: {
- '7.10.0': migrateAgentActionToV7100,
+ '7.10.0': migrateAgentActionToV7100(encryptedSavedObjects),
  },
  },
  [AGENT_EVENT_SAVED_OBJECT_TYPE]: {
@@ -304,9 +306,13 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
  },
  },
  },
-};
+});
 
-export function registerSavedObjects(savedObjects: SavedObjectsServiceSetup) {
+export function registerSavedObjects(
+ savedObjects: SavedObjectsServiceSetup,
+ encryptedSavedObjects: EncryptedSavedObjectsPluginSetup
+) {
+ const savedObjectTypes = getSavedObjectTypes(encryptedSavedObjects);
  Object.values(savedObjectTypes).forEach((type) => {
  savedObjects.registerType(type);
  });

diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
@@ -4,7 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SavedObjectMigrationFn } from 'kibana/server';
+import { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { EncryptedSavedObjectsPluginSetup } from '../../../../encrypted_saved_objects/server';
 import {
  Agent,
  AgentEvent,
@@ -94,17 +95,42 @@ export const migrateSettingsToV7100: SavedObjectMigrationFn<
  return settingsDoc;
 };
 
-export const migrateAgentActionToV7100: SavedObjectMigrationFn<AgentAction, AgentAction> = (
- agentActionDoc
-) => {
- // @ts-expect-error
- if (agentActionDoc.attributes.type === 'CONFIG_CHANGE') {
- agentActionDoc.attributes.type = 'POLICY_CHANGE';
- if (agentActionDoc.attributes.data?.config) {
- agentActionDoc.attributes.data.policy = agentActionDoc.attributes.data.config;
- delete agentActionDoc.attributes.data.config;
+export const migrateAgentActionToV7100 = (
+ encryptedSavedObjects: EncryptedSavedObjectsPluginSetup
+): SavedObjectMigrationFn<AgentAction, AgentAction> => {
+ return encryptedSavedObjects.createMigration(
+ (agentActionDoc): agentActionDoc is SavedObjectUnsanitizedDoc<AgentAction> => {
+ // @ts-expect-error
+ return agentActionDoc.attributes.type === 'CONFIG_CHANGE';
+ },
+ (agentActionDoc) => {
+ let agentActionData;
+ try {
+ agentActionData = agentActionDoc.attributes.data
+ ? JSON.parse(agentActionDoc.attributes.data)
+ : undefined;
+ } catch (e) {
+ // Silently swallow JSON parsing error
+ }
+ if (agentActionData && agentActionData.config) {
+ const {
+ attributes: { data, ...restOfAttributes },
+ } = agentActionDoc;
+ const { config, ...restOfData } = agentActionData;
+ return {
+ ...agentActionDoc,
+ attributes: {
+ ...restOfAttributes,
+ type: 'POLICY_CHANGE',
+ data: JSON.stringify({
+ ...restOfData,
+ policy: config,
+ }),
+ },
+ };
+ } else {
+ return agentActionDoc;
+ }
  }
- }
-
- return agentActionDoc;
+ );
 };