Fix circular ref. Move the code & tests into Fleet

elastic · Mar 9, 2021 · 1f25c2f · 1f25c2f
1 parent 35d01f5
commit 1f25c2f
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 24 deletions.
diff --git a/x-pack/plugins/fleet/server/saved_objects/index.ts b/x-pack/plugins/fleet/server/saved_objects/index.ts
@@ -21,11 +21,7 @@ import {
   GLOBAL_SETTINGS_SAVED_OBJECT_TYPE,
 } from '../constants';
 
-import {
-  migratePackagePolicyToV7110,
-  migratePackagePolicyToV7120,
-  // @ts-expect-error
-} from './security_solution';
+import { migratePackagePolicyToV7110, migratePackagePolicyToV7120 } from './security_solution';
 import {
   migrateAgentToV7100,
   migrateAgentEventToV7100,

diff --git a/.../endpoint/policy/migrations/to_v7_11_0.ts → ...jects/migrations/migrations/to_v7_11_0.ts b/.../endpoint/policy/migrations/to_v7_11_0.ts → ...jects/migrations/migrations/to_v7_11_0.ts
@@ -5,8 +5,10 @@
  * 2.0.
  */
 
-import { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from 'kibana/server';
 import { cloneDeep } from 'lodash';
+
+import { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from 'kibana/server';
+
 import { PackagePolicy } from '../../../../../fleet/common';
 
 export const migratePackagePolicyToV7110: SavedObjectMigrationFn<PackagePolicy, PackagePolicy> = (

diff --git a/...server/saved_objects/security_solution.js → .../saved_objects/security_solution/index.ts b/...server/saved_objects/security_solution.js → .../saved_objects/security_solution/index.ts
@@ -5,7 +5,5 @@
  * 2.0.
  */
 
-export {
-  migratePackagePolicyToV7110,
-  migratePackagePolicyToV7120,
-} from '../../../security_solution/common';
+export { migratePackagePolicyToV7110 } from './to_v7_11_0';
+export { migratePackagePolicyToV7120 } from './to_v7_12_0';
diff --git a/...oint/policy/migrations/to_v7_11_0.test.ts → ...ects/security_solution/to_v7_11_0.test.ts b/...oint/policy/migrations/to_v7_11_0.test.ts → ...ects/security_solution/to_v7_11_0.test.ts
@@ -6,7 +6,9 @@
  */
 
 import { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from 'kibana/server';
-import { PackagePolicy } from '../../../../../fleet/common';
+
+import { PackagePolicy } from '../../../common';
+
 import { migratePackagePolicyToV7110 } from './to_v7_11_0';
 
 describe('7.11.0 Endpoint Package Policy migration', () => {

diff --git a/x-pack/plugins/fleet/server/saved_objects/security_solution/to_v7_11_0.ts b/x-pack/plugins/fleet/server/saved_objects/security_solution/to_v7_11_0.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { cloneDeep } from 'lodash';
+
+import { PackagePolicy } from '../../../common';
+
+export const migratePackagePolicyToV7110: SavedObjectMigrationFn<PackagePolicy, PackagePolicy> = (
+  packagePolicyDoc
+) => {
+  const updatedPackagePolicyDoc: SavedObjectUnsanitizedDoc<PackagePolicy> = cloneDeep(
+    packagePolicyDoc
+  );
+  if (packagePolicyDoc.attributes.package?.name === 'endpoint') {
+    const input = updatedPackagePolicyDoc.attributes.inputs[0];
+    const popup = {
+      malware: {
+        message: '',
+        enabled: false,
+      },
+    };
+    if (input && input.config) {
+      const policy = input.config.policy.value;
+
+      policy.windows.antivirus_registration = policy.windows.antivirus_registration || {
+        enabled: false,
+      };
+      policy.windows.popup = popup;
+      policy.mac.popup = popup;
+    }
+  }
+
+  return updatedPackagePolicyDoc;
+};
diff --git a/...oint/policy/migrations/to_v7_12_0.test.ts → ...ects/security_solution/to_v7_12_0.test.ts b/...oint/policy/migrations/to_v7_12_0.test.ts → ...ects/security_solution/to_v7_12_0.test.ts
@@ -6,14 +6,15 @@
  */
 
 import { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from 'kibana/server';
-import { PackagePolicy } from '../../../../../fleet/common';
-import { PolicyData, ProtectionModes } from '../../types';
+
+import { PackagePolicy } from '../../../common';
+
 import { migratePackagePolicyToV7120 } from './to_v7_12_0';
 
 describe('7.12.0 Endpoint Package Policy migration', () => {
   const migration = migratePackagePolicyToV7120;
   it('adds ransomware option and notification customization', () => {
-    const doc: SavedObjectUnsanitizedDoc<PolicyData> = {
+    const doc = {
       id: 'mock-saved-object-id',
       attributes: {
         name: 'Some Policy Name',
@@ -41,7 +42,6 @@ describe('7.12.0 Endpoint Package Policy migration', () => {
               policy: {
                 value: {
                   windows: {
-                    // @ts-expect-error
                     popup: {
                       malware: {
                         message: '',
@@ -58,9 +58,7 @@ describe('7.12.0 Endpoint Package Policy migration', () => {
       type: ' nested',
     };
 
-    expect(
-      migration(doc, {} as SavedObjectMigrationContext) as SavedObjectUnsanitizedDoc<PolicyData>
-    ).toEqual({
+    expect(migration(doc, {} as SavedObjectMigrationContext)).toEqual({
       attributes: {
         name: 'Some Policy Name',
         package: {
@@ -88,7 +86,7 @@ describe('7.12.0 Endpoint Package Policy migration', () => {
                 value: {
                   windows: {
                     ransomware: {
-                      mode: ProtectionModes.off,
+                      mode: 'off',
                     },
                     popup: {
                       malware: {

diff --git a/.../endpoint/policy/migrations/to_v7_12_0.ts → ...d_objects/security_solution/to_v7_12_0.ts b/.../endpoint/policy/migrations/to_v7_12_0.ts → ...d_objects/security_solution/to_v7_12_0.ts
@@ -7,8 +7,8 @@
 
 import { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from 'kibana/server';
 import { cloneDeep } from 'lodash';
-import { PackagePolicy } from '../../../../../fleet/common';
-import { ProtectionModes } from '../../types';
+
+import type { PackagePolicy } from '../../../common';
 
 export const migratePackagePolicyToV7120: SavedObjectMigrationFn<PackagePolicy, PackagePolicy> = (
   packagePolicyDoc
@@ -19,7 +19,7 @@ export const migratePackagePolicyToV7120: SavedObjectMigrationFn<PackagePolicy,
   if (packagePolicyDoc.attributes.package?.name === 'endpoint') {
     const input = updatedPackagePolicyDoc.attributes.inputs[0];
     const ransomware = {
-      mode: ProtectionModes.off,
+      mode: 'off',
     };
     const ransomwarePopup = {
       message: '',

diff --git a/x-pack/plugins/security_solution/common/shared_exports.ts b/x-pack/plugins/security_solution/common/shared_exports.ts
@@ -17,6 +17,4 @@ export { exactCheck } from './exact_check';
 export { getPaths, foldLeftRight, removeExternalLinkText } from './test_utils';
 export { validate, validateEither } from './validate';
 export { formatErrors } from './format_errors';
-export { migratePackagePolicyToV7110 } from './endpoint/policy/migrations/to_v7_11_0';
-export { migratePackagePolicyToV7120 } from './endpoint/policy/migrations/to_v7_12_0';
 export { addIdToItem, removeIdFromItem } from './add_remove_id_to_item';