[Cloud Security] Default CSPM integration to use Agentless as the set…

…up technology. (elastic#205965) (cherry picked from commit c30212f) # Conflicts: # x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/setup_technology.ts
seanrathier · Jan 21, 2025 · 03b4fcc · 03b4fcc
1 parent 662c19b
commit 03b4fcc
Show file tree

Hide file tree

Showing 10 changed files with 235 additions and 164 deletions.
diff --git a/x-pack/platform/plugins/shared/fleet/common/constants/agentless.ts b/x-pack/platform/plugins/shared/fleet/common/constants/agentless.ts
@@ -5,6 +5,10 @@
  * 2.0.
  */
 
+import type { MonitoringType } from '../types';
+
+export const AGENTLESS_AGENT_POLICY_INACTIVITY_TIMEOUT = 3600;
+export const AGENTLESS_AGENT_POLICY_MONITORING: MonitoringType = ['logs', 'metrics'];
 export const AGENTLESS_GLOBAL_TAG_NAME_ORGANIZATION = 'organization';
 export const AGENTLESS_GLOBAL_TAG_NAME_DIVISION = 'division';
 export const AGENTLESS_GLOBAL_TAG_NAME_TEAM = 'team';
diff --git a/.../fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/form.tsx b/.../fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/form.tsx
@@ -191,9 +191,6 @@ export function useOnSubmit({
       if (packageInfo) {
         setHasAgentPolicyError(false);
       }
-
-      // eslint-disable-next-line no-console
-      console.debug('Agent policy updated', updatedAgentPolicies);
     },
     [packageInfo, agentPolicies]
   );
@@ -208,8 +205,6 @@ export function useOnSubmit({
           spaceSettings
         );
         setValidationResults(newValidationResult);
-        // eslint-disable-next-line no-console
-        console.debug('Package policy validation results', newValidationResult);
 
         return newValidationResult;
       }
@@ -225,8 +220,6 @@ export function useOnSubmit({
       };
       setPackagePolicy(newPackagePolicy);
 
-      // eslint-disable-next-line no-console
-      console.debug('Package policy updated', newPackagePolicy);
       const newValidationResults = updatePackagePolicyValidation(newPackagePolicy);
       const hasPackage = newPackagePolicy.package;
       const hasValidationErrors = newValidationResults

diff --git a/...agent_policy/create_package_policy_page/single_page_layout/hooks/setup_technology.test.ts b/...agent_policy/create_package_policy_page/single_page_layout/hooks/setup_technology.test.ts
@@ -246,12 +246,11 @@ describe('useSetupTechnology', () => {
       })
     );
 
-    expect(generateNewAgentPolicyWithDefaults).toHaveBeenCalled();
-
     act(() => {
       result.current.handleSetupTechnologyChange(SetupTechnology.AGENTLESS);
     });
     await waitFor(() => {
+      expect(generateNewAgentPolicyWithDefaults).toHaveBeenCalled();
       expect(updatePackagePolicyMock).toHaveBeenCalledWith({ supports_agentless: true });
       expect(result.current.selectedSetupTechnology).toBe(SetupTechnology.AGENTLESS);
       expect(setNewAgentPolicy).toHaveBeenCalledWith({
@@ -290,13 +289,12 @@ describe('useSetupTechnology', () => {
       initialProps,
     });
 
-    expect(generateNewAgentPolicyWithDefaults).toHaveBeenCalled();
-
     act(() => {
       result.current.handleSetupTechnologyChange(SetupTechnology.AGENTLESS);
     });
 
     expect(result.current.selectedSetupTechnology).toBe(SetupTechnology.AGENTLESS);
+    expect(generateNewAgentPolicyWithDefaults).toHaveBeenCalled();
     expect(updatePackagePolicyMock).toHaveBeenCalledWith({ supports_agentless: true });
     expect(setNewAgentPolicy).toHaveBeenCalledWith({
       inactivity_timeout: 3600,
@@ -450,6 +448,7 @@ describe('useSetupTechnology', () => {
         updateAgentPolicies: updateAgentPoliciesMock,
         setSelectedPolicyTab: setSelectedPolicyTabMock,
         packagePolicy: packagePolicyMock,
+        packageInfo: packageInfoMock,
         updatePackagePolicy: updatePackagePolicyMock,
       })
     );
@@ -469,6 +468,11 @@ describe('useSetupTechnology', () => {
         name: 'Agentless policy for endpoint-1',
         supports_agentless: true,
         inactivity_timeout: 3600,
+        global_data_tags: [
+          { name: 'organization', value: 'org' },
+          { name: 'division', value: 'div' },
+          { name: 'team', value: 'team' },
+        ],
       });
       expect(updatePackagePolicyMock).toHaveBeenCalledWith({ supports_agentless: true });
     });
@@ -512,7 +516,7 @@ describe('useSetupTechnology', () => {
     );
 
     act(() => {
-      result.current.handleSetupTechnologyChange(SetupTechnology.AGENTLESS, 'cspm');
+      result.current.handleSetupTechnologyChange(SetupTechnology.AGENTLESS);
     });
 
     await waitFor(() => {
@@ -544,23 +548,48 @@ describe('useSetupTechnology', () => {
       },
     });
 
+    const packageInfoWithoutGlobalDataTags = {
+      policy_templates: [
+        {
+          name: 'cspm',
+          title: 'Template 1',
+          description: '',
+          deployment_modes: {
+            default: {
+              enabled: true,
+            },
+            agentless: {
+              enabled: true,
+            },
+          },
+        },
+        {
+          name: 'not-cspm',
+          title: 'Template 2',
+          description: '',
+          deployment_modes: {
+            default: {
+              enabled: true,
+            },
+          },
+        },
+      ] as RegistryPolicyTemplate[],
+    } as PackageInfo;
+
     const { result } = renderHook(() =>
       useSetupTechnology({
         setNewAgentPolicy,
         newAgentPolicy: newAgentPolicyMock,
         updateAgentPolicies: updateAgentPoliciesMock,
         setSelectedPolicyTab: setSelectedPolicyTabMock,
         packagePolicy: packagePolicyMock,
-        packageInfo: packageInfoMock,
+        packageInfo: packageInfoWithoutGlobalDataTags,
         updatePackagePolicy: updatePackagePolicyMock,
       })
     );
 
     act(() => {
-      result.current.handleSetupTechnologyChange(
-        SetupTechnology.AGENTLESS,
-        'never-gonna-give-you-up'
-      );
+      result.current.handleSetupTechnologyChange(SetupTechnology.AGENTLESS);
     });
 
     await waitFor(() => {
@@ -594,14 +623,42 @@ describe('useSetupTechnology', () => {
       },
     });
 
+    const packageInfoWithoutGlobalDataTags = {
+      policy_templates: [
+        {
+          name: 'cspm',
+          title: 'Template 1',
+          description: '',
+          deployment_modes: {
+            default: {
+              enabled: true,
+            },
+            agentless: {
+              enabled: true,
+            },
+          },
+        },
+        {
+          name: 'not-cspm',
+          title: 'Template 2',
+          description: '',
+          deployment_modes: {
+            default: {
+              enabled: true,
+            },
+          },
+        },
+      ] as RegistryPolicyTemplate[],
+    } as PackageInfo;
+
     const { result } = renderHook(() =>
       useSetupTechnology({
         setNewAgentPolicy,
         newAgentPolicy: newAgentPolicyMock,
         updateAgentPolicies: updateAgentPoliciesMock,
         setSelectedPolicyTab: setSelectedPolicyTabMock,
         packagePolicy: packagePolicyMock,
-        packageInfo: packageInfoMock,
+        packageInfo: packageInfoWithoutGlobalDataTags,
         updatePackagePolicy: updatePackagePolicyMock,
       })
     );
@@ -653,7 +710,7 @@ describe('useSetupTechnology', () => {
     );
 
     act(() => {
-      result.current.handleSetupTechnologyChange(SetupTechnology.AGENTLESS, 'cspm');
+      result.current.handleSetupTechnologyChange(SetupTechnology.AGENTLESS);
     });
 
     await waitFor(() => {
@@ -700,10 +757,11 @@ describe('useSetupTechnology', () => {
     );
 
     act(() => {
-      result.current.handleSetupTechnologyChange(SetupTechnology.AGENTLESS, 'cspm');
+      result.current.handleSetupTechnologyChange(SetupTechnology.AGENTLESS);
     });
 
     await waitFor(() => {
+      expect(result.current.selectedSetupTechnology).toBe(SetupTechnology.AGENTLESS);
       expect(setNewAgentPolicy).toHaveBeenCalledWith(
         expect.objectContaining({
           supports_agentless: true,
@@ -721,6 +779,7 @@ describe('useSetupTechnology', () => {
     });
 
     await waitFor(() => {
+      expect(result.current.selectedSetupTechnology).toBe(SetupTechnology.AGENT_BASED);
       expect(setNewAgentPolicy).toHaveBeenCalledWith(newAgentPolicyMock);
       expect(setNewAgentPolicy).not.toHaveBeenCalledWith({
         global_data_tags: [