Removed os list constant in favour of separate lists in places that u…

…se it (each place has own needs to the ordering).
elastic · Nov 30, 2020 · 39da5d1 · 39da5d1
1 parent 68973fe
commit 39da5d1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/x-pack/plugins/security_solution/common/endpoint/constants.ts b/x-pack/plugins/security_solution/common/endpoint/constants.ts
@@ -4,8 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { OperatingSystem } from './types';
-
 export const eventsIndexPattern = 'logs-endpoint.events.*';
 export const alertsIndexPattern = 'logs-endpoint.alerts-*';
 export const metadataIndexPattern = 'metrics-endpoint.metadata-*';
@@ -16,12 +14,6 @@ export const telemetryIndexPattern = 'metrics-endpoint.telemetry-*';
 export const LIMITED_CONCURRENCY_ENDPOINT_ROUTE_TAG = 'endpoint:limited-concurrency';
 export const LIMITED_CONCURRENCY_ENDPOINT_COUNT = 100;
 
-export const OPERATING_SYSTEMS: readonly OperatingSystem[] = [
-  OperatingSystem.LINUX,
-  OperatingSystem.MAC,
-  OperatingSystem.WINDOWS,
-];
-
 export const TRUSTED_APPS_LIST_API = '/api/endpoint/trusted_apps';
 export const TRUSTED_APPS_CREATE_API = '/api/endpoint/trusted_apps';
 export const TRUSTED_APPS_DELETE_API = '/api/endpoint/trusted_apps/{id}';

diff --git a/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.test.ts b/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.test.ts
@@ -6,7 +6,6 @@
 
 import { GetTrustedAppsRequestSchema, PostTrustedAppCreateRequestSchema } from './trusted_apps';
 import { ConditionEntryField, OperatingSystem } from '../types';
-import { OPERATING_SYSTEMS } from '../constants';
 
 describe('When invoking Trusted Apps Schema', () => {
   describe('for GET List', () => {
@@ -114,7 +113,7 @@ describe('When invoking Trusted Apps Schema', () => {
 
       expect(() => body.validate({ ...bodyMsg, os: 'winz' })).toThrow();
 
-      OPERATING_SYSTEMS.forEach((os) => {
+      [OperatingSystem.LINUX, OperatingSystem.MAC, OperatingSystem.WINDOWS].forEach((os) => {
         expect(() => body.validate({ ...bodyMsg, os })).not.toThrow();
       });
     });
@@ -156,7 +155,7 @@ describe('When invoking Trusted Apps Schema', () => {
       });
 
       it('should validate `entry.field` accepts hash field name for all os values', () => {
-        OPERATING_SYSTEMS.forEach((os) => {
+        [OperatingSystem.LINUX, OperatingSystem.MAC, OperatingSystem.WINDOWS].forEach((os) => {
           const bodyMsg3 = createNewTrustedApp({
             os,
             entries: [
@@ -172,7 +171,7 @@ describe('When invoking Trusted Apps Schema', () => {
       });
 
       it('should validate `entry.field` accepts path field name for all os values', () => {
-        OPERATING_SYSTEMS.forEach((os) => {
+        [OperatingSystem.LINUX, OperatingSystem.MAC, OperatingSystem.WINDOWS].forEach((os) => {
           const bodyMsg3 = createNewTrustedApp({
             os,
             entries: [

diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/test_utils/index.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/test_utils/index.ts
@@ -5,8 +5,7 @@
  */
 
 import { combineReducers, createStore } from 'redux';
-import { TrustedApp } from '../../../../../common/endpoint/types';
-import { OPERATING_SYSTEMS } from '../../../../../common/endpoint/constants';
+import { TrustedApp, OperatingSystem } from '../../../../../common/endpoint/types';
 import { RoutingAction } from '../../../../common/store/routing';
 
 import {
@@ -32,6 +31,12 @@ import {
 import { trustedAppsPageReducer } from '../store/reducer';
 import { TrustedAppsListResourceStateChanged } from '../store/action';
 
+const OPERATING_SYSTEMS: OperatingSystem[] = [
+  OperatingSystem.WINDOWS,
+  OperatingSystem.MAC,
+  OperatingSystem.LINUX,
+];
+
 const generate = <T>(count: number, generator: (i: number) => T) =>
   [...new Array(count).keys()].map(generator);
 

diff --git a/...solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.tsx b/...solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.tsx
@@ -15,7 +15,6 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { EuiFormProps } from '@elastic/eui/src/components/form/form';
-import { OPERATING_SYSTEMS } from '../../../../../../common/endpoint/constants';
 import { LogicalConditionBuilder } from './logical_condition';
 import {
   ConditionEntry,
@@ -31,6 +30,12 @@ import {
   isWindowsTrustedAppCondition,
 } from '../../state/type_guards';
 
+const OPERATING_SYSTEMS: readonly OperatingSystem[] = [
+  OperatingSystem.MAC,
+  OperatingSystem.WINDOWS,
+  OperatingSystem.LINUX,
+];
+
 const generateNewEntry = (): ConditionEntry<ConditionEntryField.HASH> => {
   return {
     field: ConditionEntryField.HASH,