[Cloud Security] Allow force install package policy to agentless agent policy

x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/form.tsx

@@ -46,6 +46,7 @@ import { SelectedPolicyTab } from '../../components';
 import { useOnSaveNavigate } from '../../hooks';
 import { prepareInputPackagePolicyDataset } from '../../services/prepare_input_pkg_policy_dataset';
 import { getCloudFormationPropsFromPackagePolicy } from '../../../../../services';
+import { AGENTLESS_POLICY_ID } from './setup_technology';
 
 async function createAgentPolicy({
   packagePolicy,
@@ -298,12 +299,15 @@ export function useOnSubmit({
         }
       }
 
+      const agentPolicyIdToSave = createdPolicy?.id ?? packagePolicy.policy_id;
+      const forceInstall = force || agentPolicyIdToSave === AGENTLESS_POLICY_ID;
+
       setFormState('LOADING');
       // passing pkgPolicy with policy_id here as setPackagePolicy doesn't propagate immediately
       const { error, data } = await savePackagePolicy({
         ...packagePolicy,
-        policy_id: createdPolicy?.id ?? packagePolicy.policy_id,
-        force,
+        policy_id: agentPolicyIdToSave,
+        force: forceInstall,
       });
 
       const hasAzureArmTemplate = data?.item
@@ -373,9 +377,11 @@ export function useOnSubmit({
       } else {
         if (isVerificationError(error)) {
           setFormState('VALID'); // don't show the add agent modal
-          const forceInstall = await confirmForceInstall(packagePolicy.package!);
+          const forceInstallUnverifiedIntegration = await confirmForceInstall(
+            packagePolicy.package!
+          );
 
-          if (forceInstall) {
+          if (forceInstallUnverifiedIntegration) {
             // skip creating the agent policy because it will have already been successfully created
             onSubmit({ overrideCreatedAgentPolicy: createdPolicy, force: true });
           }

x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/setup_technology.ts

@@ -13,7 +13,7 @@ import { SetupTechnology } from '../../../../../types';
 import { sendGetOneAgentPolicy, useStartServices } from '../../../../../hooks';
 import { SelectedPolicyTab } from '../../components';
 
-const AGENTLESS_POLICY_ID = 'agentless';
+export const AGENTLESS_POLICY_ID = 'agentless';
 
 export function useSetupTechnology({
   updateNewAgentPolicy,

x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.test.tsx

@@ -18,8 +18,10 @@ import {
   sendCreatePackagePolicy,
   sendCreateAgentPolicy,
   sendGetAgentStatus,
+  sendGetOneAgentPolicy,
   useIntraAppState,
   useStartServices,
+  useGetAgentPolicies,
   useGetPackageInfoByKeyQuery,
 } from '../../../../hooks';
 
@@ -95,6 +97,7 @@ jest.mock('react-router-dom', () => ({
 }));
 
 import { CreatePackagePolicySinglePage } from '.';
+import { AGENTLESS_POLICY_ID } from './hooks/setup_technology';
 
 // mock console.debug to prevent noisy logs from console.debugs in ./index.tsx
 let consoleDebugMock: any;
@@ -290,6 +293,7 @@ describe('when on the package policy create page', () => {
       expect(sendCreatePackagePolicy as jest.MockedFunction<any>).toHaveBeenCalledWith({
         ...newPackagePolicy,
         policy_id: 'agent-policy-1',
+        force: false,
       });
       expect(sendCreateAgentPolicy as jest.MockedFunction<any>).not.toHaveBeenCalled();
 
@@ -441,6 +445,7 @@ describe('when on the package policy create page', () => {
         expect(sendCreatePackagePolicy as jest.MockedFunction<any>).toHaveBeenCalledWith({
           ...newPackagePolicy,
           policy_id: 'agent-policy-2',
+          force: false,
         });
 
         await waitFor(() => {
@@ -503,6 +508,7 @@ describe('when on the package policy create page', () => {
           expect(sendCreatePackagePolicy as jest.MockedFunction<any>).toHaveBeenCalledWith({
             ...newPackagePolicy,
             policy_id: 'agent-policy-1',
+            force: false,
           });
 
           await waitFor(() => {
@@ -573,10 +579,52 @@ describe('when on the package policy create page', () => {
                 ],
               },
             ],
+            force: false,
           });
         });
       });
     });
+
+    describe('with agentless policy available', () => {
+      beforeEach(async () => {
+        (sendGetOneAgentPolicy as jest.MockedFunction<any>).mockResolvedValue({
+          data: { item: { id: AGENTLESS_POLICY_ID, name: 'Agentless CSPM', namespace: 'default' } },
+        });
+        (useGetAgentPolicies as jest.MockedFunction<any>).mockReturnValue({
+          data: {
+            items: [{ id: AGENTLESS_POLICY_ID, name: 'Agentless CSPM', namespace: 'default' }],
+          },
+          error: undefined,
+          isLoading: false,
+          resendRequest: jest.fn(),
+        });
+
+        await act(async () => {
+          render();
+        });
+      });
+
+      test('should force create package policy', async () => {
+        await act(async () => {
+          fireEvent.click(renderResult.getByText('Existing hosts')!);
+        });
+
+        await act(async () => {
+          fireEvent.click(renderResult.getByText(/Save and continue/).closest('button')!);
+        });
+
+        expect(sendCreateAgentPolicy as jest.MockedFunction<any>).not.toHaveBeenCalled();
+        expect(sendCreatePackagePolicy as jest.MockedFunction<any>).toHaveBeenCalledWith({
+          ...newPackagePolicy,
+          force: true,
+          policy_id: AGENTLESS_POLICY_ID,
+        });
+
+        await waitFor(() => {
+          expect(renderResult.getByText('Nginx integration added')).toBeInTheDocument();
+        });
+      });
+    });
   });
 });