Propagate prebuiltRulesFrom{FileSystem,SavedObjects} from configs

elastic · Jul 20, 2021 · 4ddc48a · 4ddc48a
1 parent 91d87c9
commit 4ddc48a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts b/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts
@@ -94,6 +94,8 @@ export class EndpointAppContextService {
           this.manifestManager,
           dependencies.appClientFactory,
           dependencies.config.maxTimelineImportExportSize,
+          dependencies.config.prebuiltRulesFromFileSystem,
+          dependencies.config.prebuiltRulesFromSavedObjects,
           dependencies.security,
           dependencies.alerting,
           dependencies.licenseService,

diff --git a/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts b/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts
@@ -42,6 +42,8 @@ describe('ingest_integration tests ', () => {
   let ctx: SecuritySolutionRequestHandlerContext;
   const exceptionListClient: ExceptionListClient = getExceptionListClientMock();
   const maxTimelineImportExportSize = createMockConfig().maxTimelineImportExportSize;
+  const prebuiltRulesFromFileSystem = createMockConfig().prebuiltRulesFromFileSystem;
+  const prebuiltRulesFromSavedObjects = createMockConfig().prebuiltRulesFromSavedObjects;
   let licenseEmitter: Subject<ILicense>;
   let licenseService: LicenseService;
   const Platinum = licenseMock.createLicense({ license: { type: 'platinum', mode: 'platinum' } });
@@ -80,6 +82,8 @@ describe('ingest_integration tests ', () => {
         manifestManager,
         endpointAppContextMock.appClientFactory,
         maxTimelineImportExportSize,
+        prebuiltRulesFromFileSystem,
+        prebuiltRulesFromSavedObjects,
         endpointAppContextMock.security,
         endpointAppContextMock.alerting,
         licenseService,

diff --git a/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.ts b/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.ts
@@ -34,6 +34,8 @@ export const getPackagePolicyCreateCallback = (
   manifestManager: ManifestManager,
   appClientFactory: AppClientFactory,
   maxTimelineImportExportSize: number,
+  prebuiltRulesFromFileSystem: boolean,
+  prebuiltRulesFromSavedObjects: boolean,
   securityStart: SecurityPluginStart,
   alerts: AlertsStartContract,
   licenseService: LicenseService,
@@ -61,6 +63,8 @@ export const getPackagePolicyCreateCallback = (
           securityStart,
           alerts,
           maxTimelineImportExportSize,
+          prebuiltRulesFromFileSystem,
+          prebuiltRulesFromSavedObjects,
           exceptionsClient,
         }),
 

diff --git a/.../plugins/security_solution/server/fleet_integration/handlers/install_prepackaged_rules.ts b/.../plugins/security_solution/server/fleet_integration/handlers/install_prepackaged_rules.ts
@@ -22,6 +22,8 @@ export interface InstallPrepackagedRulesProps {
   securityStart: SecurityPluginStart;
   alerts: AlertsStartContract;
   maxTimelineImportExportSize: number;
+  prebuiltRulesFromFileSystem: boolean;
+  prebuiltRulesFromSavedObjects: boolean;
   exceptionsClient: ExceptionListClient;
 }
 
@@ -37,6 +39,8 @@ export const installPrepackagedRules = async ({
   securityStart,
   alerts,
   maxTimelineImportExportSize,
+  prebuiltRulesFromFileSystem,
+  prebuiltRulesFromSavedObjects,
   exceptionsClient,
 }: InstallPrepackagedRulesProps): Promise<void> => {
   // prep for detection rules creation
@@ -70,8 +74,8 @@ export const installPrepackagedRules = async ({
       alerts.getAlertsClientWithRequest(request),
       frameworkRequest,
       maxTimelineImportExportSize,
-      /* prebuiltRulesFromFileSystem: */ true,
-      /* prebuiltRulesFromSavedObjects: */ false,
+      prebuiltRulesFromFileSystem,
+      prebuiltRulesFromSavedObjects,
       exceptionsClient
     );
   } catch (err) {