[Fleet] Remove field package_policies from agent policy (#138677)

x-pack/plugins/apm/server/deprecations/deprecations.test.ts

@@ -54,7 +54,7 @@ describe('getDeprecations', () => {
               get: () =>
                 ({
                   id: 'foo',
-                  package_policies: [''],
+                  package_policies: [{ package: { name: 'system' } }],
                 } as AgentPolicy),
             },
           }),

x-pack/plugins/cloud_security_posture/server/lib/fleet_util.ts

@@ -58,7 +58,10 @@ export const getCspAgentPolicies = async (
   packagePolicies: PackagePolicy[],
   agentPolicyService: AgentPolicyServiceInterface
 ): Promise<AgentPolicy[]> =>
-  agentPolicyService.getByIds(soClient, uniq(map(packagePolicies, 'policy_id')));
+  agentPolicyService.getByIds(soClient, uniq(map(packagePolicies, 'policy_id')), {
+    withPackagePolicies: true,
+    ignoreMissing: true,
+  });
 
 export const getCspPackagePolicies = (
   soClient: SavedObjectsClientContract,

x-pack/plugins/cloud_security_posture/server/routes/benchmarks/benchmarks.ts

@@ -111,11 +111,12 @@ const createBenchmarks = (
   );
   return Promise.all(
     agentPolicies.flatMap((agentPolicy) => {
-      const cspPackagesOnAgent = agentPolicy.package_policies
-        .map((pckPolicyId) => {
-          if (typeof pckPolicyId === 'string') return cspPackagePoliciesMap.get(pckPolicyId);
-        })
-        .filter(isNonNullable);
+      const cspPackagesOnAgent =
+        agentPolicy.package_policies
+          ?.map(({ id: pckPolicyId }) => {
+            return cspPackagePoliciesMap.get(pckPolicyId);
+          })
+          .filter(isNonNullable) ?? [];
       const benchmarks = cspPackagesOnAgent.map(async (cspPackage) => {
         const cspRulesStatus = await addPackagePolicyCspRules(soClient, cspPackage);
         const agentPolicyStatus = {

x-pack/plugins/fleet/common/index.ts

@@ -101,6 +101,8 @@ export type {
   UpgradePackagePolicyResponseItem,
   UpgradePackagePolicyBaseResponse,
   UpgradePackagePolicyDryRunResponseItem,
+  BulkGetPackagePoliciesResponse,
+  BulkGetAgentPoliciesResponse,
   // Models
   Agent,
   AgentStatus,

x-pack/plugins/fleet/common/services/limited_package.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PackageInfo, AgentPolicy, PackagePolicy } from '../types';
+import type { PackageInfo, AgentPolicy } from '../types';
 
 export const isPackageLimited = (packageInfo: PackageInfo): boolean => {
   return (packageInfo.policy_templates || []).some(
@@ -17,10 +17,10 @@ export const doesAgentPolicyAlreadyIncludePackage = (
   agentPolicy: AgentPolicy,
   packageName: string
 ): boolean => {
-  if (agentPolicy.package_policies.length && typeof agentPolicy.package_policies[0] === 'string') {
+  if (!agentPolicy.package_policies) {
     throw new Error('Unable to read full package policy information');
   }
-  return (agentPolicy.package_policies as PackagePolicy[])
+  return agentPolicy.package_policies
     .map((packagePolicy) => packagePolicy.package?.name || '')
     .includes(packageName);
 };

x-pack/plugins/fleet/common/services/routes.ts

@@ -118,6 +118,10 @@ export const agentPolicyRouteService = {
     return AGENT_POLICY_API_ROUTES.LIST_PATTERN;
   },
 
+  getBulkGetPath: () => {
+    return AGENT_POLICY_API_ROUTES.BULK_GET_PATTERN;
+  },
+
   getInfoPath: (agentPolicyId: string) => {
     return AGENT_POLICY_API_ROUTES.INFO_PATTERN.replace('{agentPolicyId}', agentPolicyId);
   },

x-pack/plugins/fleet/common/types/models/agent_policy.ts

@@ -35,7 +35,7 @@ export interface NewAgentPolicy {
 export interface AgentPolicy extends Omit<NewAgentPolicy, 'id'> {
   id: string;
   status: ValueOf<AgentPolicyStatus>;
-  package_policies: string[] | PackagePolicy[];
+  package_policies?: PackagePolicy[];
   is_managed: boolean; // required for created policy
   updated_at: string;
   updated_by: string;

x-pack/plugins/fleet/cypress/tasks/fleet.ts

@@ -15,9 +15,15 @@ import {
 } from '../screens/fleet';
 
 export function createAgentPolicy() {
+  cy.intercept({
+    url: '/api/fleet/agent_policies?sys_monitoring=true',
+    method: 'POST',
+  }).as('postAgentPolicy');
   cy.getBySel(ADD_AGENT_BUTTON_TOP).click();
   cy.getBySel(STANDALONE_TAB).click();
   cy.getBySel(CREATE_POLICY_BUTTON).click();
+
+  cy.wait('@postAgentPolicy');
   cy.getBySel(AGENT_FLYOUT_CLOSE_BUTTON).click();
 }
 

x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/components/package_policies/index.tsx

@@ -7,7 +7,7 @@
 
 import React, { memo } from 'react';
 
-import type { AgentPolicy, PackagePolicy } from '../../../../../types';
+import type { AgentPolicy } from '../../../../../types';
 import { useBreadcrumbs } from '../../../../../hooks';
 
 import { NoPackagePolicies } from './no_package_policies';
@@ -16,14 +16,14 @@ import { PackagePoliciesTable } from './package_policies_table';
 export const PackagePoliciesView = memo<{ agentPolicy: AgentPolicy }>(({ agentPolicy }) => {
   useBreadcrumbs('policy_details', { policyName: agentPolicy.name });
 
-  if (agentPolicy.package_policies.length === 0) {
+  if (!agentPolicy.package_policies || agentPolicy.package_policies.length === 0) {
     return <NoPackagePolicies policyId={agentPolicy.id} />;
   }
 
   return (
     <PackagePoliciesTable
       agentPolicy={agentPolicy}
-      packagePolicies={(agentPolicy.package_policies || []) as PackagePolicy[]}
+      packagePolicies={agentPolicy.package_policies}
     />
   );
 });

x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/list_page/index.tsx

@@ -89,6 +89,7 @@ export const AgentPolicyListPage: React.FunctionComponent<{}> = () => {
     sortField: sorting?.field,
     sortOrder: sorting?.direction,
     kuery: search,
+    full: true,
   });
 
   // Some policies retrieved, set up table props

x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.tsx

@@ -19,7 +19,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, FormattedRelative } from '@kbn/i18n-react';
 
-import type { Agent, AgentPolicy, PackagePolicy, SimplifiedAgentStatus } from '../../../types';
+import type { Agent, AgentPolicy, SimplifiedAgentStatus } from '../../../types';
 import {
   usePagination,
   useAuthz,
@@ -35,8 +35,12 @@ import {
   sendGetAgentTags,
 } from '../../../hooks';
 import { AgentEnrollmentFlyout, AgentPolicySummaryLine } from '../../../components';
-import { AgentStatusKueryHelper, isAgentUpgradeable } from '../../../services';
-import { AGENTS_PREFIX, FLEET_SERVER_PACKAGE, SO_SEARCH_LIMIT } from '../../../constants';
+import {
+  AgentStatusKueryHelper,
+  isAgentUpgradeable,
+  policyHasFleetServer,
+} from '../../../services';
+import { AGENTS_PREFIX, SO_SEARCH_LIMIT } from '../../../constants';
 import {
   AgentReassignAgentPolicyModal,
   AgentHealth,
@@ -389,10 +393,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
       return false;
     }
 
-    return agentPolicy.package_policies.some(
-      (ap: string | PackagePolicy) =>
-        typeof ap !== 'string' && ap.package?.name === FLEET_SERVER_PACKAGE
-    );
+    return policyHasFleetServer(agentPolicy);
   }, [agentToUnenroll, agentPoliciesIndexedById]);
 
   // Fleet server unhealthy status

x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.test.tsx

@@ -717,11 +717,7 @@ On Windows, the module was tested with Nginx installed from the Chocolatey repos
         namespace: 'default',
         description: 'Default agent policy created by Kibana',
         status: 'active',
-        package_policies: [
-          '4d09bd78-b0ad-4238-9fa3-d87d3c887c73',
-          '2babac18-eb8e-4ce4-b53b-4b7c5f507019',
-          'e8a37031-2907-44f6-89d2-98bd493f60dc',
-        ],
+        package_policies: [],
         is_managed: false,
         monitoring_enabled: ['logs', 'metrics'],
         revision: 6,
@@ -735,7 +731,7 @@ On Windows, the module was tested with Nginx installed from the Chocolatey repos
         namespace: 'default',
         description: 'Protect EU from COVID',
         status: 'active',
-        package_policies: ['e8a37031-2907-44f6-89d2-98bd493f60cd'],
+        package_policies: [],
         is_managed: false,
         monitoring_enabled: ['logs', 'metrics'],
         revision: 2,

x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/use_package_policies_with_agent_policy.ts

@@ -14,7 +14,6 @@ import type {
   GetPackagePoliciesResponse,
 } from '../../../../../types';
 import { agentPolicyRouteService } from '../../../../../services';
-import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '../../../../../constants';
 import { useGetPackagePolicies, useConditionalRequest } from '../../../../../hooks';
 import type { SendConditionalRequestConfig } from '../../../../../hooks';
 
@@ -52,37 +51,31 @@ export const usePackagePoliciesWithAgentPolicy = (
     resendRequest,
   } = useGetPackagePolicies(query);
 
-  const agentPoliciesFilter = useMemo<string>(() => {
+  const agentPoliciesIds = useMemo<string[]>(() => {
     if (!packagePoliciesData?.items.length) {
-      return '';
+      return [];
     }
 
     // Build a list of package_policies for which we need Agent Policies for. Since some package
     // policies can exist within the same Agent Policy, we don't need to (in some cases) include
     // the entire list of package_policy ids.
-    const includedAgentPolicies = new Set<string>();
-
-    return `${AGENT_POLICY_SAVED_OBJECT_TYPE}.package_policies: (${packagePoliciesData.items
-      .filter((packagePolicy) => {
-        if (includedAgentPolicies.has(packagePolicy.policy_id)) {
-          return false;
-        }
-        includedAgentPolicies.add(packagePolicy.policy_id);
-        return true;
-      })
-      .map((packagePolicy) => packagePolicy.id)
-      .join(' or ')}) `;
+    return Array.from(
+      new Set<string>(
+        packagePoliciesData.items.map((packagePolicy) => packagePolicy.policy_id)
+      ).values()
+    );
   }, [packagePoliciesData]);
 
   const { data: agentPoliciesData, isLoading: isLoadingAgentPolicies } =
     useConditionalRequest<GetAgentPoliciesResponse>({
-      path: agentPolicyRouteService.getListPath(),
-      method: 'get',
-      query: {
-        perPage: 100,
-        kuery: agentPoliciesFilter,
+      path: agentPolicyRouteService.getBulkGetPath(),
+      method: 'post',
+      body: {
+        ids: agentPoliciesIds,
+        full: true,
+        ignoreMissing: true,
       },
-      shouldSendRequest: !!packagePoliciesData?.items.length,
+      shouldSendRequest: agentPoliciesIds.length > 0,
     } as SendConditionalRequestConfig);
 
   const [enrichedData, setEnrichedData] = useState<GetPackagePoliciesWithAgentPolicy | undefined>();

x-pack/plugins/fleet/public/hooks/use_package_installations.tsx

@@ -52,8 +52,8 @@ export const usePackageInstallations = () => {
   const updatableIntegrations = useMemo<Map<string, UpdatableIntegration>>(
     () =>
       (agentPolicyData?.items || []).reduce((result, policy) => {
-        policy.package_policies.forEach((pkgPolicy: PackagePolicy | string) => {
-          if (typeof pkgPolicy === 'string' || !pkgPolicy.package) return false;
+        policy.package_policies?.forEach((pkgPolicy: PackagePolicy) => {
+          if (!pkgPolicy.package) return false;
           const { name, version } = pkgPolicy.package;
           const installedPackage = allInstalledPackages.find(
             (installedPkg) =>

x-pack/plugins/fleet/public/services/has_fleet_server.ts

@@ -9,8 +9,11 @@ import { FLEET_SERVER_PACKAGE } from '../constants';
 import type { AgentPolicy, PackagePolicy } from '../types';
 
 export function policyHasFleetServer(agentPolicy: AgentPolicy) {
-  return agentPolicy.package_policies?.some(
-    (ap: string | PackagePolicy) =>
-      typeof ap !== 'string' && ap.package?.name === FLEET_SERVER_PACKAGE
+  if (!agentPolicy.package_policies) {
+    return false;
+  }
+
+  return agentPolicy.package_policies.some(
+    (ap: PackagePolicy) => ap.package?.name === FLEET_SERVER_PACKAGE
   );
 }

x-pack/plugins/fleet/server/integration_tests/reset_preconfiguration.test.ts

@@ -248,9 +248,7 @@ describe('Fleet preconfiguration reset', () => {
     it('Works if the preconfigured policies already exists with a missing package policy', async () => {
       const soClient = kbnServer.coreStart.savedObjects.createInternalRepository();
 
-      await soClient.update('ingest-agent-policies', POLICY_ID, {
-        package_policies: [],
-      });
+      await soClient.update('ingest-agent-policies', POLICY_ID, {});
 
       const resetAPI = getSupertestWithAdminUser(
         kbnServer.root,
@@ -268,7 +266,6 @@ describe('Fleet preconfiguration reset', () => {
         expect.arrayContaining([
           expect.objectContaining({
             name: 'Elastic Cloud agent policy 0001',
-            package_policies: expect.arrayContaining([expect.stringMatching(/.*/)]),
           }),
           expect.objectContaining({
             name: 'Second preconfigured policy',

x-pack/plugins/fleet/server/mocks/index.ts

@@ -121,6 +121,7 @@ export const createPackagePolicyServiceMock = (): jest.Mocked<PackagePolicyServi
     getUpgradeDryRunDiff: jest.fn(),
     getUpgradePackagePolicyInfo: jest.fn(),
     enrichPolicyWithDefaultsFromPackage: jest.fn(),
+    findAllForAgentPolicy: jest.fn(),
   };
 };
 

x-pack/plugins/fleet/server/routes/agent_policy/handlers.ts

@@ -75,6 +75,7 @@ export const getAgentPoliciesHandler: FleetRequestHandler<
       withPackagePolicies,
       ...restOfQuery,
     });
+
     const body: GetAgentPoliciesResponse = {
       items,
       total,

x-pack/plugins/fleet/server/saved_objects/index.ts

@@ -45,6 +45,7 @@ import {
   migrateAgentPolicyToV840,
   migratePackagePolicyToV840,
 } from './migrations/to_v8_4_0';
+import { migrateAgentPolicyToV850 } from './migrations/to_v8_5_0';
 
 /*
  * Saved object types and mappings
@@ -91,7 +92,6 @@ const getSavedObjectTypes = (
         is_default: { type: 'boolean' },
         is_default_fleet_server: { type: 'boolean' },
         status: { type: 'keyword' },
-        package_policies: { type: 'keyword' },
         unenroll_timeout: { type: 'integer' },
         updated_at: { type: 'date' },
         updated_by: { type: 'keyword' },
@@ -107,6 +107,7 @@ const getSavedObjectTypes = (
       '7.10.0': migrateAgentPolicyToV7100,
       '7.12.0': migrateAgentPolicyToV7120,
       '8.4.0': migrateAgentPolicyToV840,
+      '8.5.0': migrateAgentPolicyToV850,
     },
   },
   [OUTPUT_SAVED_OBJECT_TYPE]: {

x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_10_0.ts

@@ -10,10 +10,13 @@ import type { SavedObjectMigrationFn } from '@kbn/core/server';
 import type { AgentPolicy, PackagePolicy, Settings } from '../../types';
 
 export const migrateAgentPolicyToV7100: SavedObjectMigrationFn<
-  Exclude<AgentPolicy, 'package_policies'> & {
-    package_configs: string[] | PackagePolicy[];
+  Omit<AgentPolicy, 'package_policies'> & {
+    package_configs: string[];
+    package_policies?: string[];
   },
-  AgentPolicy
+  Omit<AgentPolicy, 'package_policies'> & {
+    package_policies?: string[];
+  }
 > = (agentPolicyDoc) => {
   agentPolicyDoc.attributes.package_policies = agentPolicyDoc.attributes.package_configs;
   // @ts-expect-error

x-pack/plugins/fleet/server/saved_objects/migrations/to_v8_5_0.ts

@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
+
+import type { AgentPolicy } from '../../types';
+
+export const migrateAgentPolicyToV850: SavedObjectMigrationFn<
+  Exclude<AgentPolicy, 'download_source_id'> & {
+    package_policies: string[];
+  },
+  AgentPolicy
+> = (agentPolicyDoc) => {
+  // @ts-expect-error
+  delete agentPolicyDoc.attributes.package_policies;
+
+  return agentPolicyDoc;
+};

x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_permissions.test.ts

@@ -31,8 +31,10 @@ describe('storedPackagePoliciesToAgentPermissions()', () => {
     expect(permissions).toBeUndefined();
   });
 
-  it('Throw an error for string package policies', async () => {
-    await expect(() => storedPackagePoliciesToAgentPermissions(soClient, ['foo'])).rejects.toThrow(
+  it('Throw an error if package policies is not an array', async () => {
+    await expect(() =>
+      storedPackagePoliciesToAgentPermissions(soClient, undefined)
+    ).rejects.toThrow(
       /storedPackagePoliciesToAgentPermissions should be called with a PackagePolicy/
     );
   });