Fix CI issues

CAWilson94 · Oct 15, 2024 · a18cb9c · a18cb9c
1 parent 9379301
commit a18cb9c
Show file tree

Hide file tree

Showing 22 changed files with 10 additions and 109 deletions.
diff --git a/..._solution/server/lib/entity_analytics/asset_criticality/asset_criticality_service.mock.ts b/..._solution/server/lib/entity_analytics/asset_criticality/asset_criticality_service.mock.ts
@@ -9,7 +9,6 @@ import type { AssetCriticalityService } from './asset_criticality_service';
 
 const buildMockAssetCriticalityService = (): jest.Mocked<AssetCriticalityService> => ({
   getCriticalitiesByIdentifiers: jest.fn().mockResolvedValue([]),
-  isEnabled: jest.fn().mockReturnValue(true),
 });
 
 export const assetCriticalityServiceMock = {

diff --git a/...urity_solution/server/lib/entity_analytics/asset_criticality/asset_criticality_service.ts b/...urity_solution/server/lib/entity_analytics/asset_criticality/asset_criticality_service.ts
@@ -23,7 +23,6 @@ export interface AssetCriticalityService {
   getCriticalitiesByIdentifiers: (
     identifiers: CriticalityIdentifier[]
   ) => Promise<AssetCriticalityRecord[]>;
-  isEnabled: () => Promise<boolean>;
 }
 
 const isCriticalityIdentifierValid = (identifier: CriticalityIdentifier): boolean =>

diff --git a/...plugins/security_solution/server/lib/entity_analytics/risk_score/calculate_risk_scores.ts b/...plugins/security_solution/server/lib/entity_analytics/risk_score/calculate_risk_scores.ts
@@ -175,11 +175,6 @@ const processScores = async ({
     return [];
   }
 
-
-    return buckets.map((bucket) =>
-      formatForResponse({ bucket, now, identifierField, includeNewFields: false })
-    );
-
   const identifiers = buckets.map((bucket) => ({
     id_field: identifierField,
     id_value: bucket.key[identifierField],

diff --git a/...n_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/custom_query.ts b/...n_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/custom_query.ts
@@ -45,7 +45,6 @@ import {
   DETECTION_ENGINE_RULES_BULK_ACTION,
   DETECTION_ENGINE_RULES_URL,
   DETECTION_ENGINE_SIGNALS_STATUS_URL as DETECTION_ENGINE_ALERTS_STATUS_URL,
-  ENABLE_ASSET_CRITICALITY_SETTING,
 } from '@kbn/security-solution-plugin/common/constants';
 import { getMaxSignalsWarning as getMaxAlertsWarning } from '@kbn/security-solution-plugin/server/lib/detection_engine/rule_types/utils/utils';
 import { deleteAllExceptions } from '../../../../../lists_and_exception_lists/utils';
@@ -95,7 +94,6 @@ export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
   const es = getService('es');
   const log = getService('log');
-  const kibanaServer = getService('kibanaServer');
   const esDeleteAllIndices = getService('esDeleteAllIndices');
   // TODO: add a new service for loading archiver files similar to "getService('es')"
   const config = getService('config');
@@ -334,9 +332,6 @@ export default ({ getService }: FtrProviderContext) => {
     describe('with asset criticality', () => {
       before(async () => {
         await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
-        await kibanaServer.uiSettings.update({
-          [ENABLE_ASSET_CRITICALITY_SETTING]: true,
-        });
       });
 
       after(async () => {

diff --git a/.../detection_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/eql.ts b/.../detection_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/eql.ts
@@ -34,10 +34,7 @@ import {
   ALERT_GROUP_ID,
 } from '@kbn/security-solution-plugin/common/field_maps/field_names';
 import { getMaxSignalsWarning as getMaxAlertsWarning } from '@kbn/security-solution-plugin/server/lib/detection_engine/rule_types/utils/utils';
-import {
-  DETECTION_ENGINE_RULES_URL,
-  ENABLE_ASSET_CRITICALITY_SETTING,
-} from '@kbn/security-solution-plugin/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import {
   getEqlRuleForAlertTesting,
   getAlerts,
@@ -71,7 +68,6 @@ export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
   const es = getService('es');
   const log = getService('log');
-  const kibanaServer = getService('kibanaServer');
   const retry = getService('retry');
 
   // TODO: add a new service for loading archiver files similar to "getService('es')"
@@ -773,9 +769,6 @@ export default ({ getService }: FtrProviderContext) => {
     describe('with asset criticality', () => {
       before(async () => {
         await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
-        await kibanaServer.uiSettings.update({
-          [ENABLE_ASSET_CRITICALITY_SETTING]: true,
-        });
       });
 
       after(async () => {

diff --git a/...rule_execution_logic/trial_license_complete_tier/execution_logic/eql_alert_suppression.ts b/...rule_execution_logic/trial_license_complete_tier/execution_logic/eql_alert_suppression.ts
@@ -19,10 +19,7 @@ import {
   TIMESTAMP,
   ALERT_START,
 } from '@kbn/rule-data-utils';
-import {
-  DETECTION_ENGINE_SIGNALS_STATUS_URL as DETECTION_ENGINE_ALERTS_STATUS_URL,
-  ENABLE_ASSET_CRITICALITY_SETTING,
-} from '@kbn/security-solution-plugin/common/constants';
+import { DETECTION_ENGINE_SIGNALS_STATUS_URL as DETECTION_ENGINE_ALERTS_STATUS_URL } from '@kbn/security-solution-plugin/common/constants';
 import { getSuppressionMaxSignalsWarning as getSuppressionMaxAlertsWarning } from '@kbn/security-solution-plugin/server/lib/detection_engine/rule_types/utils/utils';
 import { RuleExecutionStatusEnum } from '@kbn/security-solution-plugin/common/api/detection_engine/rule_monitoring';
 import { ALERT_ORIGINAL_TIME } from '@kbn/security-solution-plugin/common/field_maps/field_names';
@@ -1702,14 +1699,9 @@ export default ({ getService }: FtrProviderContext) => {
       });
 
       describe('alert enrichment', () => {
-        const kibanaServer = getService('kibanaServer');
-
         before(async () => {
           await esArchiver.load('x-pack/test/functional/es_archives/entity/risks');
           await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
-          await kibanaServer.uiSettings.update({
-            [ENABLE_ASSET_CRITICALITY_SETTING]: true,
-          });
         });
 
         after(async () => {

diff --git a/...detection_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/esql.ts b/...detection_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/esql.ts
@@ -14,7 +14,6 @@ import { getCreateEsqlRulesSchemaMock } from '@kbn/security-solution-plugin/comm
 import { RuleExecutionStatusEnum } from '@kbn/security-solution-plugin/common/api/detection_engine/rule_monitoring';
 
 import { getMaxSignalsWarning as getMaxAlertsWarning } from '@kbn/security-solution-plugin/server/lib/detection_engine/rule_types/utils/utils';
-import { ENABLE_ASSET_CRITICALITY_SETTING } from '@kbn/security-solution-plugin/common/constants';
 import {
   getPreviewAlerts,
   previewRule,
@@ -40,7 +39,6 @@ export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
   const es = getService('es');
   const log = getService('log');
-  const kibanaServer = getService('kibanaServer');
   const utils = getService('securitySolutionUtils');
 
   const { indexEnhancedDocuments, indexListOfDocuments, indexGeneratedDocuments } =
@@ -915,9 +913,6 @@ export default ({ getService }: FtrProviderContext) => {
     describe('with asset criticality', () => {
       before(async () => {
         await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
-        await kibanaServer.uiSettings.update({
-          [ENABLE_ASSET_CRITICALITY_SETTING]: true,
-        });
       });
 
       after(async () => {

diff --git a/...gine/rule_execution_logic/trial_license_complete_tier/execution_logic/esql_suppression.ts b/...gine/rule_execution_logic/trial_license_complete_tier/execution_logic/esql_suppression.ts
@@ -25,7 +25,6 @@ import { ALERT_ORIGINAL_TIME } from '@kbn/security-solution-plugin/common/field_
 import { DETECTION_ENGINE_SIGNALS_STATUS_URL as DETECTION_ENGINE_ALERTS_STATUS_URL } from '@kbn/security-solution-plugin/common/constants';
 import { getSuppressionMaxSignalsWarning as getSuppressionMaxAlertsWarning } from '@kbn/security-solution-plugin/server/lib/detection_engine/rule_types/utils/utils';
 
-import { ENABLE_ASSET_CRITICALITY_SETTING } from '@kbn/security-solution-plugin/common/constants';
 import {
   getPreviewAlerts,
   previewRule,
@@ -48,7 +47,6 @@ export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
   const es = getService('es');
   const log = getService('log');
-  const kibanaServer = getService('kibanaServer');
   const { indexEnhancedDocuments, indexListOfDocuments, indexGeneratedDocuments } =
     dataGeneratorFactory({
       es,
@@ -2070,9 +2068,6 @@ export default ({ getService }: FtrProviderContext) => {
     describe('with asset criticality', () => {
       before(async () => {
         await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
-        await kibanaServer.uiSettings.update({
-          [ENABLE_ASSET_CRITICALITY_SETTING]: true,
-        });
       });
 
       after(async () => {

diff --git a/...ngine/rule_execution_logic/trial_license_complete_tier/execution_logic/indicator_match.ts b/...ngine/rule_execution_logic/trial_license_complete_tier/execution_logic/indicator_match.ts
@@ -40,7 +40,6 @@ import {
 } from '@kbn/security-solution-plugin/common/field_maps/field_names';
 import { RuleExecutionStatusEnum } from '@kbn/security-solution-plugin/common/api/detection_engine/rule_monitoring';
 import { getMaxSignalsWarning as getMaxAlertsWarning } from '@kbn/security-solution-plugin/server/lib/detection_engine/rule_types/utils/utils';
-import { ENABLE_ASSET_CRITICALITY_SETTING } from '@kbn/security-solution-plugin/common/constants';
 import {
   previewRule,
   getAlerts,
@@ -185,7 +184,6 @@ export default ({ getService }: FtrProviderContext) => {
   const supertest = getService('supertest');
   const es = getService('es');
   const log = getService('log');
-  const kibanaServer = getService('kibanaServer');
   // TODO: add a new service for loading archiver files similar to "getService('es')"
   const config = getService('config');
   const isServerless = config.get('serverless');
@@ -1654,9 +1652,6 @@ export default ({ getService }: FtrProviderContext) => {
     describe('with asset criticality', () => {
       before(async () => {
         await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
-        await kibanaServer.uiSettings.update({
-          [ENABLE_ASSET_CRITICALITY_SETTING]: true,
-        });
       });
 
       after(async () => {

diff --git a/...on_logic/trial_license_complete_tier/execution_logic/indicator_match_alert_suppression.ts b/...on_logic/trial_license_complete_tier/execution_logic/indicator_match_alert_suppression.ts
@@ -21,7 +21,6 @@ import {
 import { getSuppressionMaxSignalsWarning as getSuppressionMaxAlertsWarning } from '@kbn/security-solution-plugin/server/lib/detection_engine/rule_types/utils/utils';
 
 import { DETECTION_ENGINE_SIGNALS_STATUS_URL as DETECTION_ENGINE_ALERTS_STATUS_URL } from '@kbn/security-solution-plugin/common/constants';
-import { ENABLE_ASSET_CRITICALITY_SETTING } from '@kbn/security-solution-plugin/common/constants';
 
 import { ThreatMatchRuleCreateProps } from '@kbn/security-solution-plugin/common/api/detection_engine';
 import { RuleExecutionStatusEnum } from '@kbn/security-solution-plugin/common/api/detection_engine/rule_monitoring';
@@ -44,7 +43,6 @@ export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
   const es = getService('es');
   const log = getService('log');
-  const kibanaServer = getService('kibanaServer');
 
   const {
     indexListOfDocuments: indexListOfSourceDocuments,
@@ -2568,9 +2566,6 @@ export default ({ getService }: FtrProviderContext) => {
         describe('with asset criticality', () => {
           before(async () => {
             await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
-            await kibanaServer.uiSettings.update({
-              [ENABLE_ASSET_CRITICALITY_SETTING]: true,
-            });
           });
 
           after(async () => {

diff --git a/...gine/rule_execution_logic/trial_license_complete_tier/execution_logic/machine_learning.ts b/...gine/rule_execution_logic/trial_license_complete_tier/execution_logic/machine_learning.ts
@@ -29,10 +29,7 @@ import {
 } from '@kbn/security-solution-plugin/common/field_maps/field_names';
 import { getMaxSignalsWarning as getMaxAlertsWarning } from '@kbn/security-solution-plugin/server/lib/detection_engine/rule_types/utils/utils';
 import { expect } from 'expect';
-import {
-  DETECTION_ENGINE_RULES_URL,
-  ENABLE_ASSET_CRITICALITY_SETTING,
-} from '@kbn/security-solution-plugin/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import {
   createListsIndex,
   deleteAllExceptions,
@@ -63,7 +60,6 @@ export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
   const es = getService('es');
   const log = getService('log');
-  const kibanaServer = getService('kibanaServer');
   // TODO: add a new service for loading archiver files similar to "getService('es')"
   const config = getService('config');
   const request = supertestLib(url.format(config.get('servers.kibana')));
@@ -331,9 +327,6 @@ export default ({ getService }: FtrProviderContext) => {
     describe('with asset criticality', () => {
       before(async () => {
         await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
-        await kibanaServer.uiSettings.update({
-          [ENABLE_ASSET_CRITICALITY_SETTING]: true,
-        });
       });
 
       after(async () => {

diff --git a/...n_logic/trial_license_complete_tier/execution_logic/machine_learning_alert_suppression.ts b/...n_logic/trial_license_complete_tier/execution_logic/machine_learning_alert_suppression.ts
@@ -22,10 +22,7 @@ import {
   TIMESTAMP,
 } from '@kbn/rule-data-utils';
 import { ALERT_ORIGINAL_TIME } from '@kbn/security-solution-plugin/common/field_maps/field_names';
-import {
-  DETECTION_ENGINE_SIGNALS_STATUS_URL as DETECTION_ENGINE_ALERTS_STATUS_URL,
-  ENABLE_ASSET_CRITICALITY_SETTING,
-} from '@kbn/security-solution-plugin/common/constants';
+import { DETECTION_ENGINE_SIGNALS_STATUS_URL as DETECTION_ENGINE_ALERTS_STATUS_URL } from '@kbn/security-solution-plugin/common/constants';
 import { EsArchivePathBuilder } from '../../../../../../es_archive_path_builder';
 import { FtrProviderContext } from '../../../../../../ftr_provider_context';
 import {
@@ -1102,14 +1099,9 @@ export default ({ getService }: FtrProviderContext) => {
       });
 
       describe('with enrichments', () => {
-        const kibanaServer = getService('kibanaServer');
-
         before(async () => {
           await esArchiver.load('x-pack/test/functional/es_archives/entity/risks');
           await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
-          await kibanaServer.uiSettings.update({
-            [ENABLE_ASSET_CRITICALITY_SETTING]: true,
-          });
         });
 
         after(async () => {

diff --git a/...tion_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/new_terms.ts b/...tion_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/new_terms.ts
@@ -14,7 +14,7 @@ import { orderBy } from 'lodash';
 import { getCreateNewTermsRulesSchemaMock } from '@kbn/security-solution-plugin/common/api/detection_engine/model/rule_schema/mocks';
 
 import { getMaxSignalsWarning as getMaxAlertsWarning } from '@kbn/security-solution-plugin/server/lib/detection_engine/rule_types/utils/utils';
-import { ENABLE_ASSET_CRITICALITY_SETTING } from '@kbn/security-solution-plugin/common/constants';
+
 import {
   getAlerts,
   getPreviewAlerts,
@@ -43,7 +43,6 @@ export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
   const es = getService('es');
   const log = getService('log');
-  const kibanaServer = getService('kibanaServer');
   const { indexEnhancedDocuments } = dataGeneratorFactory({
     es,
     index: 'new_terms',
@@ -1066,9 +1065,6 @@ export default ({ getService }: FtrProviderContext) => {
       before(async () => {
         await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
         await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
-        await kibanaServer.uiSettings.update({
-          [ENABLE_ASSET_CRITICALITY_SETTING]: true,
-        });
       });
 
       after(async () => {

diff --git a/...xecution_logic/trial_license_complete_tier/execution_logic/new_terms_alert_suppression.ts b/...xecution_logic/trial_license_complete_tier/execution_logic/new_terms_alert_suppression.ts
@@ -18,7 +18,6 @@ import {
   TIMESTAMP,
   ALERT_START,
 } from '@kbn/rule-data-utils';
-import { ENABLE_ASSET_CRITICALITY_SETTING } from '@kbn/security-solution-plugin/common/constants';
 import { getSuppressionMaxSignalsWarning as getSuppressionMaxAlertsWarning } from '@kbn/security-solution-plugin/server/lib/detection_engine/rule_types/utils/utils';
 import { getCreateNewTermsRulesSchemaMock } from '@kbn/security-solution-plugin/common/api/detection_engine/model/rule_schema/mocks';
 import { NewTermsRuleCreateProps } from '@kbn/security-solution-plugin/common/api/detection_engine';
@@ -2250,15 +2249,11 @@ export default ({ getService }: FtrProviderContext) => {
       const isServerless = config.get('serverless');
       const dataPathBuilder = new EsArchivePathBuilder(isServerless);
       const path = dataPathBuilder.getPath('auditbeat/hosts');
-      const kibanaServer = getService('kibanaServer');
 
       before(async () => {
         await esArchiver.load('x-pack/test/functional/es_archives/entity/risks');
         await esArchiver.load(path);
         await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
-        await kibanaServer.uiSettings.update({
-          [ENABLE_ASSET_CRITICALITY_SETTING]: true,
-        });
       });
 
       after(async () => {

diff --git a/...tion_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/threshold.ts b/...tion_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/threshold.ts
@@ -26,7 +26,6 @@ import {
   ALERT_THRESHOLD_RESULT,
 } from '@kbn/security-solution-plugin/common/field_maps/field_names';
 import { getMaxSignalsWarning as getMaxAlertsWarning } from '@kbn/security-solution-plugin/server/lib/detection_engine/rule_types/utils/utils';
-import { ENABLE_ASSET_CRITICALITY_SETTING } from '@kbn/security-solution-plugin/common/constants';
 import {
   createRule,
   deleteAllRules,
@@ -50,7 +49,6 @@ export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
   const es = getService('es');
   const log = getService('log');
-  const kibanaServer = getService('kibanaServer');
   // TODO: add a new service for loading archiver files similar to "getService('es')"
   const config = getService('config');
   const isServerless = config.get('serverless');
@@ -446,9 +444,6 @@ export default ({ getService }: FtrProviderContext) => {
     describe('with asset criticality', () => {
       before(async () => {
         await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
-        await kibanaServer.uiSettings.update({
-          [ENABLE_ASSET_CRITICALITY_SETTING]: true,
-        });
       });
 
       after(async () => {

diff --git a/...xecution_logic/trial_license_complete_tier/execution_logic/threshold_alert_suppression.ts b/...xecution_logic/trial_license_complete_tier/execution_logic/threshold_alert_suppression.ts
@@ -21,7 +21,6 @@ import { DETECTION_ENGINE_SIGNALS_STATUS_URL as DETECTION_ENGINE_ALERTS_STATUS_U
 
 import { ThresholdRuleCreateProps } from '@kbn/security-solution-plugin/common/api/detection_engine';
 import { RuleExecutionStatusEnum } from '@kbn/security-solution-plugin/common/api/detection_engine/rule_monitoring';
-import { ENABLE_ASSET_CRITICALITY_SETTING } from '@kbn/security-solution-plugin/common/constants';
 
 import { ALERT_ORIGINAL_TIME } from '@kbn/security-solution-plugin/common/field_maps/field_names';
 import { AlertSuppression } from '@kbn/security-solution-plugin/common/api/detection_engine/model/rule_schema';
@@ -44,7 +43,6 @@ export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
   const es = getService('es');
   const log = getService('log');
-  const kibanaServer = getService('kibanaServer');
   // TODO: add a new service for loading archiver files similar to "getService('es')"
   const config = getService('config');
   const isServerless = config.get('serverless');
@@ -994,9 +992,6 @@ export default ({ getService }: FtrProviderContext) => {
     describe('with asset criticality', () => {
       before(async () => {
         await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
-        await kibanaServer.uiSettings.update({
-          [ENABLE_ASSET_CRITICALITY_SETTING]: true,
-        });
       });
 
       after(async () => {

diff --git a/...test_suites/entity_analytics/risk_engine/trial_license_complete_tier/asset_criticality.ts b/...test_suites/entity_analytics/risk_engine/trial_license_complete_tier/asset_criticality.ts
@@ -19,7 +19,6 @@ import {
   assetCriticalityRouteHelpersFactory,
   getAssetCriticalityDoc,
   getAssetCriticalityIndex,
-  enableAssetCriticalityAdvancedSetting,
   createAssetCriticalityRecords,
   riskEngineRouteHelpersFactory,
 } from '../../utils';
@@ -40,10 +39,6 @@ export default ({ getService }: FtrProviderContext) => {
       await cleanAssetCriticality({ log, es });
     });
 
-    beforeEach(async () => {
-      await enableAssetCriticalityAdvancedSetting(kibanaServer, log);
-    });
-
     afterEach(async () => {
       await riskEngineRoutes.cleanUp();
       await cleanAssetCriticality({ log, es });