[8.x] [Cloud Security] Agentless integration deletion flow (elastic#1…

…91557) (elastic#194629) # Backport This will backport the following commits from `main` to `8.x`: - [[Cloud Security] Agentless integration deletion flow (elastic#191557)](elastic#191557)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Lola <[email protected]>
kibanamachine · Oct 1, 2024 · 5ef7bb7 · 5ef7bb7
1 parent cef7801
commit 5ef7bb7
Show file tree

Hide file tree

Showing 33 changed files with 712 additions and 277 deletions.
diff --git a/...ns/fleet/public/applications/fleet/sections/agent_policy/components/actions_menu.test.tsx b/...ns/fleet/public/applications/fleet/sections/agent_policy/components/actions_menu.test.tsx
@@ -109,6 +109,39 @@ describe('AgentPolicyActionMenu', () => {
       const deleteButton = result.getByTestId('agentPolicyActionMenuDeleteButton');
       expect(deleteButton).toHaveAttribute('disabled');
     });
+
+    it('is disabled when agent policy support agentless  is true', () => {
+      const testRenderer = createFleetTestRendererMock();
+      const agentlessPolicy: AgentPolicy = {
+        ...baseAgentPolicy,
+        supports_agentless: true,
+        package_policies: [
+          {
+            id: 'test-package-policy',
+            is_managed: false,
+            created_at: new Date().toISOString(),
+            created_by: 'test',
+            enabled: true,
+            inputs: [],
+            name: 'test-package-policy',
+            namespace: 'default',
+            policy_id: 'test',
+            policy_ids: ['test'],
+            revision: 1,
+            updated_at: new Date().toISOString(),
+            updated_by: 'test',
+          },
+        ],
+      };
+
+      const result = testRenderer.render(<AgentPolicyActionMenu agentPolicy={agentlessPolicy} />);
+
+      const agentActionsButton = result.getByTestId('agentActionsBtn');
+      agentActionsButton.click();
+
+      const deleteButton = result.getByTestId('agentPolicyActionMenuDeleteButton');
+      expect(deleteButton).not.toHaveAttribute('disabled');
+    });
   });
 
   describe('add agent', () => {
@@ -176,6 +209,39 @@ describe('AgentPolicyActionMenu', () => {
       const addButton = result.getByTestId('agentPolicyActionMenuAddAgentButton');
       expect(addButton).toHaveAttribute('disabled');
     });
+
+    it('should remove add agent button when agent policy support agentless  is true', () => {
+      const testRenderer = createFleetTestRendererMock();
+      const agentlessPolicy: AgentPolicy = {
+        ...baseAgentPolicy,
+        supports_agentless: true,
+        package_policies: [
+          {
+            id: 'test-package-policy',
+            is_managed: false,
+            created_at: new Date().toISOString(),
+            created_by: 'test',
+            enabled: true,
+            inputs: [],
+            name: 'test-package-policy',
+            namespace: 'default',
+            policy_id: 'test',
+            policy_ids: ['test'],
+            revision: 1,
+            updated_at: new Date().toISOString(),
+            updated_by: 'test',
+          },
+        ],
+      };
+
+      const result = testRenderer.render(<AgentPolicyActionMenu agentPolicy={agentlessPolicy} />);
+
+      const agentActionsButton = result.getByTestId('agentActionsBtn');
+      agentActionsButton.click();
+
+      const addAgentActionButton = result.queryByTestId('agentPolicyActionMenuAddAgentButton');
+      expect(addAgentActionButton).toBeNull();
+    });
   });
 
   describe('add fleet server', () => {

diff --git a/...plugins/fleet/public/applications/fleet/sections/agent_policy/components/actions_menu.tsx b/...plugins/fleet/public/applications/fleet/sections/agent_policy/components/actions_menu.tsx
@@ -100,82 +100,106 @@ export const AgentPolicyActionMenu = memo<{
             </EuiContextMenuItem>
           );
 
-          const menuItems = agentPolicy?.is_managed
-            ? [viewPolicyItem]
-            : [
+          const deletePolicyItem = (
+            <AgentPolicyDeleteProvider
+              hasFleetServer={policyHasFleetServer(agentPolicy as AgentPolicy)}
+              key="deletePolicy"
+              agentPolicy={agentPolicy}
+              packagePolicies={agentPolicy.package_policies}
+            >
+              {(deleteAgentPolicyPrompt) => (
                 <EuiContextMenuItem
-                  icon="plusInCircle"
-                  disabled={
-                    (isFleetServerPolicy && !authz.fleet.addFleetServers) ||
-                    (!isFleetServerPolicy && !authz.fleet.addAgents)
+                  data-test-subj="agentPolicyActionMenuDeleteButton"
+                  disabled={!authz.fleet.allAgentPolicies || hasManagedPackagePolicy}
+                  toolTipContent={
+                    hasManagedPackagePolicy ? (
+                      <FormattedMessage
+                        id="xpack.fleet.policyForm.deletePolicyActionText.disabled"
+                        defaultMessage="Agent policy with managed package policies cannot be deleted."
+                        data-test-subj="agentPolicyActionMenuDeleteButtonDisabledTooltip"
+                      />
+                    ) : undefined
                   }
-                  data-test-subj="agentPolicyActionMenuAddAgentButton"
-                  onClick={() => {
-                    setIsContextMenuOpen(false);
-                    setIsEnrollmentFlyoutOpen(true);
-                  }}
-                  key="enrollAgents"
-                >
-                  {isFleetServerPolicy ? (
-                    <FormattedMessage
-                      id="xpack.fleet.agentPolicyActionMenu.addFleetServerActionText"
-                      defaultMessage="Add Fleet Server"
-                    />
-                  ) : (
-                    <FormattedMessage
-                      id="xpack.fleet.agentPolicyActionMenu.enrollAgentActionText"
-                      defaultMessage="Add agent"
-                    />
-                  )}
-                </EuiContextMenuItem>,
-                viewPolicyItem,
-                <EuiContextMenuItem
-                  disabled={!authz.integrations.writeIntegrationPolicies}
-                  icon="copy"
+                  icon="trash"
                   onClick={() => {
-                    setIsContextMenuOpen(false);
-                    copyAgentPolicyPrompt(agentPolicy, onCopySuccess);
+                    deleteAgentPolicyPrompt(agentPolicy.id);
                   }}
-                  key="copyPolicy"
                 >
                   <FormattedMessage
-                    id="xpack.fleet.agentPolicyActionMenu.copyPolicyActionText"
-                    defaultMessage="Duplicate policy"
+                    id="xpack.fleet.agentPolicyActionMenu.deletePolicyActionText"
+                    defaultMessage="Delete policy"
                   />
-                </EuiContextMenuItem>,
-                <AgentPolicyDeleteProvider
-                  hasFleetServer={policyHasFleetServer(agentPolicy as AgentPolicy)}
-                  key="deletePolicy"
-                  packagePolicies={agentPolicy.package_policies}
-                >
-                  {(deleteAgentPolicyPrompt) => (
-                    <EuiContextMenuItem
-                      data-test-subj="agentPolicyActionMenuDeleteButton"
-                      disabled={!authz.fleet.allAgentPolicies || hasManagedPackagePolicy}
-                      toolTipContent={
-                        hasManagedPackagePolicy ? (
-                          <FormattedMessage
-                            id="xpack.fleet.policyForm.deletePolicyActionText.disabled"
-                            defaultMessage="Agent policy with managed package policies cannot be deleted."
-                            data-test-subj="agentPolicyActionMenuDeleteButtonDisabledTooltip"
-                          />
-                        ) : undefined
-                      }
-                      icon="trash"
-                      onClick={() => {
-                        deleteAgentPolicyPrompt(agentPolicy.id);
-                      }}
-                    >
-                      <FormattedMessage
-                        id="xpack.fleet.agentPolicyActionMenu.deletePolicyActionText"
-                        defaultMessage="Delete policy"
-                      />
-                    </EuiContextMenuItem>
-                  )}
-                </AgentPolicyDeleteProvider>,
-              ];
+                </EuiContextMenuItem>
+              )}
+            </AgentPolicyDeleteProvider>
+          );
+
+          const copyPolicyItem = (
+            <EuiContextMenuItem
+              data-test-subj="agentPolicyActionMenuCopyButton"
+              disabled={!authz.integrations.writeIntegrationPolicies}
+              icon="copy"
+              onClick={() => {
+                setIsContextMenuOpen(false);
+                copyAgentPolicyPrompt(agentPolicy, onCopySuccess);
+              }}
+              key="copyPolicy"
+            >
+              <FormattedMessage
+                id="xpack.fleet.agentPolicyActionMenu.copyPolicyActionText"
+                defaultMessage="Duplicate policy"
+              />
+            </EuiContextMenuItem>
+          );
+
+          const managedMenuItems = [viewPolicyItem];
+          const agentBasedMenuItems = [
+            <EuiContextMenuItem
+              icon="plusInCircle"
+              disabled={
+                (isFleetServerPolicy && !authz.fleet.addFleetServers) ||
+                (!isFleetServerPolicy && !authz.fleet.addAgents)
+              }
+              data-test-subj="agentPolicyActionMenuAddAgentButton"
+              onClick={() => {
+                setIsContextMenuOpen(false);
+                setIsEnrollmentFlyoutOpen(true);
+              }}
+              key="enrollAgents"
+            >
+              {isFleetServerPolicy ? (
+                <FormattedMessage
+                  id="xpack.fleet.agentPolicyActionMenu.addFleetServerActionText"
+                  defaultMessage="Add Fleet Server"
+                />
+              ) : (
+                <FormattedMessage
+                  id="xpack.fleet.agentPolicyActionMenu.enrollAgentActionText"
+                  defaultMessage="Add agent"
+                />
+              )}
+            </EuiContextMenuItem>,
+            viewPolicyItem,
+            copyPolicyItem,
+            deletePolicyItem,
+          ];
+          const agentlessMenuItems = [viewPolicyItem, deletePolicyItem];
+
+          let menuItems;
+
+          if (agentPolicy?.is_managed) {
+            menuItems = managedMenuItems;
+          } else if (agentPolicy?.supports_agentless) {
+            menuItems = agentlessMenuItems;
+          } else {
+            menuItems = agentBasedMenuItems;
+          }
 
-          if (authz.fleet.allAgents && !agentPolicy?.is_managed) {
+          if (
+            authz.fleet.allAgents &&
+            !agentPolicy?.is_managed &&
+            !agentPolicy?.supports_agentless
+          ) {
             menuItems.push(
               <EuiContextMenuItem
                 icon="refresh"
@@ -193,7 +217,12 @@ export const AgentPolicyActionMenu = memo<{
             );
           }
 
-          if (authz.fleet.allAgents && agentTamperProtectionEnabled && !agentPolicy?.is_managed) {
+          if (
+            authz.fleet.allAgents &&
+            agentTamperProtectionEnabled &&
+            !agentPolicy?.is_managed &&
+            !agentPolicy?.supports_agentless
+          ) {
             menuItems.push(
               <EuiContextMenuItem
                 icon="minusInCircle"

diff --git a/...pplications/fleet/sections/agent_policy/components/agent_policy_advanced_fields/index.tsx b/...pplications/fleet/sections/agent_policy/components/agent_policy_advanced_fields/index.tsx
@@ -121,6 +121,8 @@ export const AgentPolicyAdvancedOptionsContent: React.FunctionComponent<Props> =
   const licenseService = useLicense();
   const [isUninstallCommandFlyoutOpen, setIsUninstallCommandFlyoutOpen] = useState(false);
   const policyHasElasticDefend = useMemo(() => hasElasticDefend(agentPolicy), [agentPolicy]);
+  const isManagedorAgentlessPolicy =
+    agentPolicy.is_managed === true || agentPolicy?.supports_agentless === true;
 
   const AgentTamperProtectionSectionContent = useMemo(
     () => (
@@ -196,7 +198,12 @@ export const AgentPolicyAdvancedOptionsContent: React.FunctionComponent<Props> =
   );
 
   const AgentTamperProtectionSection = useMemo(() => {
-    if (agentTamperProtectionEnabled && licenseService.isPlatinum() && !agentPolicy.is_managed) {
+    if (
+      agentTamperProtectionEnabled &&
+      licenseService.isPlatinum() &&
+      !agentPolicy.is_managed &&
+      !agentPolicy.supports_agentless
+    ) {
       if (AgentTamperProtectionWrapper) {
         return (
           <Suspense fallback={null}>
@@ -214,6 +221,7 @@ export const AgentPolicyAdvancedOptionsContent: React.FunctionComponent<Props> =
     agentPolicy.is_managed,
     AgentTamperProtectionWrapper,
     AgentTamperProtectionSectionContent,
+    agentPolicy.supports_agentless,
   ]);
 
   return (
@@ -405,7 +413,7 @@ export const AgentPolicyAdvancedOptionsContent: React.FunctionComponent<Props> =
       >
         <EuiSpacer size="l" />
         <EuiCheckboxGroup
-          disabled={disabled || agentPolicy.is_managed === true}
+          disabled={disabled || isManagedorAgentlessPolicy}
           options={[
             {
               id: `${dataTypes.Logs}_${monitoringCheckboxIdSuffix}`,
@@ -541,7 +549,7 @@ export const AgentPolicyAdvancedOptionsContent: React.FunctionComponent<Props> =
         >
           <EuiFieldNumber
             fullWidth
-            disabled={disabled || agentPolicy.is_managed === true}
+            disabled={disabled || isManagedorAgentlessPolicy}
             value={agentPolicy.inactivity_timeout || ''}
             min={0}
             onChange={(e) => {
@@ -582,7 +590,7 @@ export const AgentPolicyAdvancedOptionsContent: React.FunctionComponent<Props> =
           isInvalid={Boolean(touchedFields.fleet_server_host_id && validation.fleet_server_host_id)}
         >
           <EuiSuperSelect
-            disabled={disabled || agentPolicy.is_managed === true}
+            disabled={disabled || isManagedorAgentlessPolicy}
             valueOfSelected={agentPolicy.fleet_server_host_id || DEFAULT_SELECT_VALUE}
             fullWidth
             isLoading={isLoadingFleetServerHostsOption}
@@ -623,7 +631,7 @@ export const AgentPolicyAdvancedOptionsContent: React.FunctionComponent<Props> =
           isDisabled={disabled}
         >
           <EuiSuperSelect
-            disabled={disabled || agentPolicy.is_managed === true}
+            disabled={disabled || isManagedorAgentlessPolicy}
             valueOfSelected={agentPolicy.data_output_id || DEFAULT_SELECT_VALUE}
             fullWidth
             isLoading={isLoadingOptions}
@@ -664,7 +672,7 @@ export const AgentPolicyAdvancedOptionsContent: React.FunctionComponent<Props> =
           isDisabled={disabled}
         >
           <EuiSuperSelect
-            disabled={disabled || agentPolicy.is_managed === true}
+            disabled={disabled || isManagedorAgentlessPolicy}
             valueOfSelected={agentPolicy.monitoring_output_id || DEFAULT_SELECT_VALUE}
             fullWidth
             isLoading={isLoadingOptions}
@@ -706,7 +714,7 @@ export const AgentPolicyAdvancedOptionsContent: React.FunctionComponent<Props> =
           isDisabled={disabled}
         >
           <EuiSuperSelect
-            disabled={disabled}
+            disabled={disabled || agentPolicy?.supports_agentless === true}
             valueOfSelected={agentPolicy.download_source_id || DEFAULT_SELECT_VALUE}
             fullWidth
             isLoading={isLoadingDownloadSources}
@@ -739,7 +747,7 @@ export const AgentPolicyAdvancedOptionsContent: React.FunctionComponent<Props> =
       >
         <EuiFormRow fullWidth isDisabled={disabled}>
           <EuiRadioGroup
-            disabled={disabled}
+            disabled={disabled || agentPolicy?.supports_agentless === true}
             options={[
               {
                 id: 'hostname',
@@ -834,7 +842,7 @@ export const AgentPolicyAdvancedOptionsContent: React.FunctionComponent<Props> =
         >
           <EuiFieldNumber
             fullWidth
-            disabled={disabled || agentPolicy.is_managed === true}
+            disabled={disabled || isManagedorAgentlessPolicy}
             value={agentPolicy.unenroll_timeout || ''}
             min={0}
             onChange={(e) => {