Renamed folder

elastic · May 24, 2024 · 27ed76b · 27ed76b
1 parent bd434de
commit 27ed76b
Show file tree

Hide file tree

Showing 31 changed files with 20 additions and 20 deletions.
diff --git a/...on/server/lib/detection_engine/prebuilt_rules/logic/rule_objects/create_prebuilt_rules.ts b/...on/server/lib/detection_engine/prebuilt_rules/logic/rule_objects/create_prebuilt_rules.ts
@@ -9,7 +9,7 @@ import { MAX_RULES_TO_UPDATE_IN_PARALLEL } from '../../../../../../common/consta
 import { initPromisePool } from '../../../../../utils/promise_pool';
 import { withSecuritySpan } from '../../../../../utils/with_security_span';
 import type { PrebuiltRuleAsset } from '../../model/rule_assets/prebuilt_rule_asset';
-import type { IRulesManagementClient } from '../../../rule_management/logic/crud/rules_management_client';
+import type { IRulesManagementClient } from '../../../rule_management/logic/rule_management/rules_management_client';
 
 export const createPrebuiltRules = (
   rulesManagementClient: IRulesManagementClient,

diff --git a/...n/server/lib/detection_engine/prebuilt_rules/logic/rule_objects/upgrade_prebuilt_rules.ts b/...n/server/lib/detection_engine/prebuilt_rules/logic/rule_objects/upgrade_prebuilt_rules.ts
@@ -9,7 +9,7 @@ import { MAX_RULES_TO_UPDATE_IN_PARALLEL } from '../../../../../../common/consta
 import { initPromisePool } from '../../../../../utils/promise_pool';
 import { withSecuritySpan } from '../../../../../utils/with_security_span';
 import type { PrebuiltRuleAsset } from '../../model/rule_assets/prebuilt_rule_asset';
-import type { IRulesManagementClient } from '../../../rule_management/logic/crud/rules_management_client';
+import type { IRulesManagementClient } from '../../../rule_management/logic/rule_management/rules_management_client';
 
 /**
  * Upgrades existing prebuilt rules given a set of rules and output index.

diff --git a/...plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts b/...plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts
@@ -38,7 +38,7 @@ import { riskEngineDataClientMock } from '../../../entity_analytics/risk_engine/
 import { riskScoreDataClientMock } from '../../../entity_analytics/risk_score/risk_score_data_client.mock';
 import { assetCriticalityDataClientMock } from '../../../entity_analytics/asset_criticality/asset_criticality_data_client.mock';
 import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
-import { rulesManagementClientMock } from '../../rule_management/logic/crud/__mocks__/rules_management_client';
+import { rulesManagementClientMock } from '../../rule_management/logic/rule_management/__mocks__/rules_management_client';
 
 export const createMockClients = () => {
   const core = coreMock.createRequestHandlerContext();

diff --git a/..._solution/server/lib/detection_engine/rule_exceptions/api/create_rule_exceptions/route.ts b/..._solution/server/lib/detection_engine/rule_exceptions/api/create_rule_exceptions/route.ts
@@ -37,13 +37,13 @@ import {
   CreateRuleExceptionsRequestParams,
 } from '../../../../../../common/api/detection_engine/rule_exceptions';
 
-import { readRules } from '../../../rule_management/logic/crud/read_rules';
+import { readRules } from '../../../rule_management/logic/rule_management/read_rules';
 import { checkDefaultRuleExceptionListReferences } from '../../../rule_management/logic/exceptions/check_for_default_rule_exception_list';
 import type { RuleParams } from '../../../rule_schema';
 import type { SecuritySolutionPluginRouter } from '../../../../../types';
 import { buildSiemResponse } from '../../../routes/utils';
 import { buildRouteValidation } from '../../../../../utils/build_validation/route_validation';
-import type { IRulesManagementClient } from '../../../rule_management/logic/crud/rules_management_client';
+import type { IRulesManagementClient } from '../../../rule_management/logic/rule_management/rules_management_client';
 
 export const createRuleExceptionsRoute = (router: SecuritySolutionPluginRouter) => {
   router.versioned

diff --git a/...ib/detection_engine/rule_management/api/rules/bulk_actions/fetch_rules_by_query_or_ids.ts b/...ib/detection_engine/rule_management/api/rules/bulk_actions/fetch_rules_by_query_or_ids.ts
@@ -11,7 +11,7 @@ import { MAX_RULES_TO_UPDATE_IN_PARALLEL } from '../../../../../../../common/con
 import type { PromisePoolOutcome } from '../../../../../../utils/promise_pool';
 import { initPromisePool } from '../../../../../../utils/promise_pool';
 import type { RuleAlertType } from '../../../../rule_schema';
-import { readRules } from '../../../logic/crud/read_rules';
+import { readRules } from '../../../logic/rule_management/read_rules';
 import { findRules } from '../../../logic/search/find_rules';
 import { MAX_RULES_TO_PROCESS_TOTAL } from './route';
 

diff --git a/...solution/server/lib/detection_engine/rule_management/api/rules/bulk_actions/route.test.ts b/...solution/server/lib/detection_engine/rule_management/api/rules/bulk_actions/route.test.ts
@@ -30,7 +30,7 @@ import {
   getBulkDisableRuleActionSchemaMock,
 } from '../../../../../../../common/api/detection_engine/rule_management/mocks';
 import { loggingSystemMock } from '@kbn/core/server/mocks';
-import { readRules } from '../../../logic/crud/read_rules';
+import { readRules } from '../../../logic/rule_management/read_rules';
 
 jest.mock('../../../../../machine_learning/authz');
 jest.mock('../../../logic/crud/read_rules', () => ({ readRules: jest.fn() }));

diff --git a/...solution/server/lib/detection_engine/rule_management/api/rules/bulk_create_rules/route.ts b/...solution/server/lib/detection_engine/rule_management/api/rules/bulk_create_rules/route.ts
@@ -16,7 +16,7 @@ import {
 } from '../../../../../../../common/api/detection_engine/rule_management';
 
 import type { SecuritySolutionPluginRouter } from '../../../../../../types';
-import { readRules } from '../../../logic/crud/read_rules';
+import { readRules } from '../../../logic/rule_management/read_rules';
 import { getDuplicates } from './get_duplicates';
 import { transformValidateBulkError } from '../../../utils/validate';
 import { buildRouteValidationWithZod } from '../../../../../../utils/build_validation/route_validation';

diff --git a/...solution/server/lib/detection_engine/rule_management/api/rules/bulk_delete_rules/route.ts b/...solution/server/lib/detection_engine/rule_management/api/rules/bulk_delete_rules/route.ts
@@ -24,7 +24,7 @@ import {
   createBulkErrorObject,
   transformBulkError,
 } from '../../../../routes/utils';
-import { readRules } from '../../../logic/crud/read_rules';
+import { readRules } from '../../../logic/rule_management/read_rules';
 import { getIdBulkError } from '../../../utils/utils';
 import { transformValidateBulkError } from '../../../utils/validate';
 import { getDeprecatedBulkEndpointHeader, logDeprecatedBulkEndpoint } from '../../deprecation';

diff --git a/..._solution/server/lib/detection_engine/rule_management/api/rules/bulk_patch_rules/route.ts b/..._solution/server/lib/detection_engine/rule_management/api/rules/bulk_patch_rules/route.ts
@@ -19,7 +19,7 @@ import type { SecuritySolutionPluginRouter } from '../../../../../../types';
 import { transformBulkError, buildSiemResponse } from '../../../../routes/utils';
 import { getIdBulkError } from '../../../utils/utils';
 import { transformValidateBulkError } from '../../../utils/validate';
-import { readRules } from '../../../logic/crud/read_rules';
+import { readRules } from '../../../logic/rule_management/read_rules';
 import { getDeprecatedBulkEndpointHeader, logDeprecatedBulkEndpoint } from '../../deprecation';
 import { validateRuleDefaultExceptionList } from '../../../logic/exceptions/validate_rule_default_exception_list';
 import { validateRulesWithDuplicatedDefaultExceptionsList } from '../../../logic/exceptions/validate_rules_with_duplicated_default_exceptions_list';

diff --git a/...solution/server/lib/detection_engine/rule_management/api/rules/bulk_update_rules/route.ts b/...solution/server/lib/detection_engine/rule_management/api/rules/bulk_update_rules/route.ts
@@ -24,7 +24,7 @@ import {
   buildSiemResponse,
   createBulkErrorObject,
 } from '../../../../routes/utils';
-import { readRules } from '../../../logic/crud/read_rules';
+import { readRules } from '../../../logic/rule_management/read_rules';
 import { getDeprecatedBulkEndpointHeader, logDeprecatedBulkEndpoint } from '../../deprecation';
 import { validateRuleDefaultExceptionList } from '../../../logic/exceptions/validate_rule_default_exception_list';
 import { validateRulesWithDuplicatedDefaultExceptionsList } from '../../../logic/exceptions/validate_rules_with_duplicated_default_exceptions_list';

diff --git a/...urity_solution/server/lib/detection_engine/rule_management/api/rules/create_rule/route.ts b/...urity_solution/server/lib/detection_engine/rule_management/api/rules/create_rule/route.ts
@@ -16,7 +16,7 @@ import { DETECTION_ENGINE_RULES_URL } from '../../../../../../../common/constant
 import type { SecuritySolutionPluginRouter } from '../../../../../../types';
 import { buildRouteValidationWithZod } from '../../../../../../utils/build_validation/route_validation';
 import { buildSiemResponse } from '../../../../routes/utils';
-import { readRules } from '../../../logic/crud/read_rules';
+import { readRules } from '../../../logic/rule_management/read_rules';
 import { checkDefaultRuleExceptionListReferences } from '../../../logic/exceptions/check_for_default_rule_exception_list';
 import { validateRuleDefaultExceptionList } from '../../../logic/exceptions/validate_rule_default_exception_list';
 import { transformValidate, validateResponseActionsPermissions } from '../../../utils/validate';

diff --git a/...urity_solution/server/lib/detection_engine/rule_management/api/rules/delete_rule/route.ts b/...urity_solution/server/lib/detection_engine/rule_management/api/rules/delete_rule/route.ts
@@ -16,7 +16,7 @@ import { DETECTION_ENGINE_RULES_URL } from '../../../../../../../common/constant
 import type { SecuritySolutionPluginRouter } from '../../../../../../types';
 import { buildRouteValidationWithZod } from '../../../../../../utils/build_validation/route_validation';
 import { buildSiemResponse } from '../../../../routes/utils';
-import { readRules } from '../../../logic/crud/read_rules';
+import { readRules } from '../../../logic/rule_management/read_rules';
 import { getIdError, transform } from '../../../utils/utils';
 
 export const deleteRuleRoute = (router: SecuritySolutionPluginRouter) => {

diff --git a/...curity_solution/server/lib/detection_engine/rule_management/api/rules/patch_rule/route.ts b/...curity_solution/server/lib/detection_engine/rule_management/api/rules/patch_rule/route.ts
@@ -16,7 +16,7 @@ import { DETECTION_ENGINE_RULES_URL } from '../../../../../../../common/constant
 import type { SecuritySolutionPluginRouter } from '../../../../../../types';
 import { buildRouteValidationWithZod } from '../../../../../../utils/build_validation/route_validation';
 import { buildSiemResponse } from '../../../../routes/utils';
-import { readRules } from '../../../logic/crud/read_rules';
+import { readRules } from '../../../logic/rule_management/read_rules';
 import { checkDefaultRuleExceptionListReferences } from '../../../logic/exceptions/check_for_default_rule_exception_list';
 import { validateRuleDefaultExceptionList } from '../../../logic/exceptions/validate_rule_default_exception_list';
 import { getIdError } from '../../../utils/utils';

diff --git a/...ecurity_solution/server/lib/detection_engine/rule_management/api/rules/read_rule/route.ts b/...ecurity_solution/server/lib/detection_engine/rule_management/api/rules/read_rule/route.ts
@@ -16,7 +16,7 @@ import { DETECTION_ENGINE_RULES_URL } from '../../../../../../../common/constant
 import type { SecuritySolutionPluginRouter } from '../../../../../../types';
 import { buildRouteValidationWithZod } from '../../../../../../utils/build_validation/route_validation';
 import { buildSiemResponse } from '../../../../routes/utils';
-import { readRules } from '../../../logic/crud/read_rules';
+import { readRules } from '../../../logic/rule_management/read_rules';
 import { getIdError, transform } from '../../../utils/utils';
 
 export const readRuleRoute = (router: SecuritySolutionPluginRouter, logger: Logger) => {

diff --git a/...urity_solution/server/lib/detection_engine/rule_management/api/rules/update_rule/route.ts b/...urity_solution/server/lib/detection_engine/rule_management/api/rules/update_rule/route.ts
@@ -16,7 +16,7 @@ import { DETECTION_ENGINE_RULES_URL } from '../../../../../../../common/constant
 import type { SecuritySolutionPluginRouter } from '../../../../../../types';
 import { buildRouteValidationWithZod } from '../../../../../../utils/build_validation/route_validation';
 import { buildSiemResponse } from '../../../../routes/utils';
-import { readRules } from '../../../logic/crud/read_rules';
+import { readRules } from '../../../logic/rule_management/read_rules';
 import { checkDefaultRuleExceptionListReferences } from '../../../logic/exceptions/check_for_default_rule_exception_list';
 import { validateRuleDefaultExceptionList } from '../../../logic/exceptions/validate_rule_default_exception_list';
 import { getIdError } from '../../../utils/utils';

diff --git a/...y_solution/server/lib/detection_engine/rule_management/logic/import/import_rules_utils.ts b/...y_solution/server/lib/detection_engine/rule_management/logic/import/import_rules_utils.ts
@@ -16,7 +16,7 @@ import type { RuleToImport } from '../../../../../../common/api/detection_engine
 import type { ImportRuleResponse } from '../../../routes/utils';
 import { createBulkErrorObject } from '../../../routes/utils';
 import { checkRuleExceptionReferences } from './check_rule_exception_references';
-import type { IRulesManagementClient } from '../crud/rules_management_client';
+import type { IRulesManagementClient } from '../rule_management/rules_management_client';
 
 export type PromiseFromStreams = RuleToImport | Error;
 export interface RuleExceptionsPromiseFromStreams {

diff --git a/...gement/logic/crud/__mocks__/read_rules.ts → ...c/rule_management/__mocks__/read_rules.ts b/...gement/logic/crud/__mocks__/read_rules.ts → ...c/rule_management/__mocks__/read_rules.ts
diff --git a/...crud/__mocks__/rules_management_client.ts → ...ment/__mocks__/rules_management_client.ts b/...crud/__mocks__/rules_management_client.ts → ...ment/__mocks__/rules_management_client.ts
diff --git a/...ustom_rule.rule_management_client.test.ts → ...ustom_rule.rule_management_client.test.ts b/...ustom_rule.rule_management_client.test.ts → ...ustom_rule.rule_management_client.test.ts
diff --git a/...built_rule.rule_management_client.test.ts → ...built_rule.rule_management_client.test.ts b/...built_rule.rule_management_client.test.ts → ...built_rule.rule_management_client.test.ts
diff --git a/...elete_rule.rule_management_client.test.ts → ...elete_rule.rule_management_client.test.ts b/...elete_rule.rule_management_client.test.ts → ...elete_rule.rule_management_client.test.ts
diff --git a/...mport_rule.rule_management_client.test.ts → ...mport_rule.rule_management_client.test.ts b/...mport_rule.rule_management_client.test.ts → ...mport_rule.rule_management_client.test.ts
diff --git a/...patch_rule.rule_management_client.test.ts → ...patch_rule.rule_management_client.test.ts b/...patch_rule.rule_management_client.test.ts → ...patch_rule.rule_management_client.test.ts
diff --git a/..._management/logic/crud/read_rules.test.ts → .../logic/rule_management/read_rules.test.ts b/..._management/logic/crud/read_rules.test.ts → .../logic/rule_management/read_rules.test.ts
diff --git a/.../rule_management/logic/crud/read_rules.ts → ...ement/logic/rule_management/read_rules.ts b/.../rule_management/logic/crud/read_rules.ts → ...ement/logic/rule_management/read_rules.ts
diff --git a/...ent/logic/crud/rules_management_client.ts → ...ule_management/rules_management_client.ts b/...ent/logic/crud/rules_management_client.ts → ...ule_management/rules_management_client.ts
diff --git a/...pdate_rule.rule_management_client.test.ts → ...pdate_rule.rule_management_client.test.ts b/...pdate_rule.rule_management_client.test.ts → ...pdate_rule.rule_management_client.test.ts
diff --git a/...built_rule.rule_management_client.test.ts → ...built_rule.rule_management_client.test.ts b/...built_rule.rule_management_client.test.ts → ...built_rule.rule_management_client.test.ts
diff --git a/...ion_engine/rule_monitoring/logic/detection_engine_health/rule_objects/fetch_rule_by_id.ts b/...ion_engine/rule_monitoring/logic/detection_engine_health/rule_objects/fetch_rule_by_id.ts
@@ -11,7 +11,7 @@ import type {
   RuleObjectId,
   RuleResponse,
 } from '../../../../../../../common/api/detection_engine/model/rule_schema';
-import { readRules } from '../../../../rule_management/logic/crud/read_rules';
+import { readRules } from '../../../../rule_management/logic/rule_management/read_rules';
 import { transform } from '../../../../rule_management/utils/utils';
 
 // TODO: https://github.com/elastic/kibana/issues/125642 Move to rule_management into a RuleManagementClient

diff --git a/x-pack/plugins/security_solution/server/request_context_factory.ts b/x-pack/plugins/security_solution/server/request_context_factory.ts
@@ -28,7 +28,7 @@ import type { EndpointAppContextService } from './endpoint/endpoint_app_context_
 import { RiskEngineDataClient } from './lib/entity_analytics/risk_engine/risk_engine_data_client';
 import { RiskScoreDataClient } from './lib/entity_analytics/risk_score/risk_score_data_client';
 import { AssetCriticalityDataClient } from './lib/entity_analytics/asset_criticality';
-import { createRulesManagementClient } from './lib/detection_engine/rule_management/logic/crud/rules_management_client';
+import { createRulesManagementClient } from './lib/detection_engine/rule_management/logic/rule_management/rules_management_client';
 
 export interface IRequestContextFactory {
   create(

diff --git a/x-pack/plugins/security_solution/server/types.ts b/x-pack/plugins/security_solution/server/types.ts
@@ -33,7 +33,7 @@ import type { EndpointInternalFleetServicesInterface } from './endpoint/services
 import type { RiskEngineDataClient } from './lib/entity_analytics/risk_engine/risk_engine_data_client';
 import type { RiskScoreDataClient } from './lib/entity_analytics/risk_score/risk_score_data_client';
 import type { AssetCriticalityDataClient } from './lib/entity_analytics/asset_criticality';
-import type { IRulesManagementClient } from './lib/detection_engine/rule_management/logic/crud/rules_management_client';
+import type { IRulesManagementClient } from './lib/detection_engine/rule_management/logic/rule_management/rules_management_client';
 export { AppClient };
 
 export interface SecuritySolutionApiRequestHandlerContext {