Pass explicit arguments instead of full config

elastic · Jul 20, 2021 · 8f9eb82 · 8f9eb82
1 parent c0e4e03
commit 8f9eb82
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 13 deletions.
diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
@@ -389,6 +389,8 @@ kibana_vars=(
  xpack.securitySolution.maxTimelineImportExportSize
  xpack.securitySolution.maxTimelineImportPayloadBytes
  xpack.securitySolution.packagerTaskInterval
+ xpack.securitySolution.prebuiltRulesFromFileSystem
+ xpack.securitySolution.prebuiltRulesFromSavedObjects
  xpack.spaces.enabled
  xpack.spaces.maxSpaces
  xpack.task_manager.enabled

diff --git a/...ity_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.test.ts b/...ity_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.test.ts
@@ -297,14 +297,16 @@ describe('add_prepackaged_rules_route', () => {
  getExceptionListClient: jest.fn(),
  getListClient: jest.fn(),
  };
+ const config = createMockConfig();
 
  await createPrepackagedRules(
  context,
  siemMockClient,
  clients.alertsClient,
  {} as FrameworkRequest,
  1200,
- createMockConfig(),
+ config.prebuiltRulesFromFileSystem,
+ config.prebuiltRulesFromSavedObjects,
  mockExceptionsClient
  );
 
@@ -314,14 +316,16 @@ describe('add_prepackaged_rules_route', () => {
 
  test('uses passed in exceptions list client when lists client not available in context', async () => {
  const { lists, ...myContext } = context;
+ const config = createMockConfig();
 
  await createPrepackagedRules(
  myContext,
  siemMockClient,
  clients.alertsClient,
  {} as FrameworkRequest,
  1200,
- createMockConfig(),
+ config.prebuiltRulesFromFileSystem,
+ config.prebuiltRulesFromSavedObjects,
  mockExceptionsClient
  );
 

diff --git a/...security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts b/...security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts
@@ -78,7 +78,8 @@ export const addPrepackedRulesRoute = (
  alertsClient,
  frameworkRequest,
  config.maxTimelineImportExportSize,
- config
+ config.prebuiltRulesFromFileSystem,
+ config.prebuiltRulesFromSavedObjects
  );
  return response.ok({ body: validated ?? {} });
  } catch (err) {
@@ -105,8 +106,9 @@ export const createPrepackagedRules = async (
  siemClient: AppClient,
  alertsClient: AlertsClient,
  frameworkRequest: FrameworkRequest,
- maxTimelineImportExportSize: number,
- config: ConfigType,
+ maxTimelineImportExportSize: ConfigType['maxTimelineImportExportSize'],
+ prebuiltRulesFromFileSystem: ConfigType['prebuiltRulesFromFileSystem'],
+ prebuiltRulesFromSavedObjects: ConfigType['prebuiltRulesFromSavedObjects'],
  exceptionsClient?: ExceptionListClient
 ): Promise<PrePackagedRulesAndTimelinesSchema | null> => {
  const esClient = context.core.elasticsearch.client;
@@ -123,7 +125,11 @@ export const createPrepackagedRules = async (
  await exceptionsListClient.createEndpointList();
  }
 
- const latestPrepackagedRules = await getLatestPrepackagedRules(ruleAssetsClient, config);
+ const latestPrepackagedRules = await getLatestPrepackagedRules(
+ ruleAssetsClient,
+ prebuiltRulesFromFileSystem,
+ prebuiltRulesFromSavedObjects
+ );
  const prepackagedRules = await getExistingPrepackagedRules({ alertsClient });
  const rulesToInstall = getRulesToInstall(latestPrepackagedRules, prepackagedRules);
  const rulesToUpdate = getRulesToUpdate(latestPrepackagedRules, prepackagedRules);

diff --git a/...y_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.ts b/...y_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.ts
@@ -53,7 +53,11 @@ export const getPrepackagedRulesStatusRoute = (
  }
 
  try {
- const latestPrepackagedRules = await getLatestPrepackagedRules(ruleAssetsClient, config);
+ const latestPrepackagedRules = await getLatestPrepackagedRules(
+ ruleAssetsClient,
+ config.prebuiltRulesFromFileSystem,
+ config.prebuiltRulesFromSavedObjects
+ );
  const customRules = await findRules({
  alertsClient,
  perPage: 1,

diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_prepackaged_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_prepackaged_rules.ts
@@ -105,17 +105,15 @@ export const getPrepackagedRules = (
 
 export const getLatestPrepackagedRules = async (
  client: RuleAssetSavedObjectsClient,
- config: ConfigType
+ prebuiltRulesFromFileSystem: ConfigType['prebuiltRulesFromFileSystem'],
+ prebuiltRulesFromSavedObjects: ConfigType['prebuiltRulesFromSavedObjects']
 ): Promise<AddPrepackagedRulesSchemaDecoded[]> => {
  // build a map of the most recent version of each rule
- const fromFS = config.prebuiltRulesFromFileSystem;
- const fromFleet = config.prebuiltRulesFromSavedObjects;
-
- const prepackaged = fromFS ? getPrepackagedRules() : [];
+ const prepackaged = prebuiltRulesFromFileSystem ? getPrepackagedRules() : [];
  const ruleMap = new Map(prepackaged.map((r) => [r.rule_id, r]));
 
  // check the rules installed via fleet and create/update if the version is newer
- if (fromFleet) {
+ if (prebuiltRulesFromSavedObjects) {
  const fleetRules = await getFleetInstalledRules(client);
  const fleetUpdates = fleetRules.filter((r) => {
  const rule = ruleMap.get(r.rule_id);