[Fleet] Add packagePolicyPostDelete and packagePoliceDelete

Add tests

Rename `PackagePolicyPostCreateCallback` back to `PostPackagePolicyPostCreateCallback`

Rename `PackagePolicyCreateCallback` back to `PostPackagePolicyCreateCallback`

Add “Post” prefix

Use `packagePolicyService.getByIDs`

x-pack/plugins/cloud_security_posture/server/plugin.test.ts

@@ -29,7 +29,7 @@ import {
 import {
   ExternalCallback,
   FleetStartContract,
-  PostPackagePolicyDeleteCallback,
+  PostPackagePolicyPostDeleteCallback,
   PostPackagePolicyPostCreateCallback,
 } from '@kbn/fleet-plugin/server';
 import { CLOUD_SECURITY_POSTURE_PACKAGE_NAME } from '../common/constants';
@@ -298,9 +298,9 @@ describe('Cloud Security Posture Plugin', () => {
         const deletedPackagePolicyMock = deletePackagePolicyMock();
         deletedPackagePolicyMock[0].package!.name = CLOUD_SECURITY_POSTURE_PACKAGE_NAME;
 
-        const packagePolicyPostDeleteCallbacks: PostPackagePolicyDeleteCallback[] = [];
+        const packagePolicyPostDeleteCallbacks: PostPackagePolicyPostDeleteCallback[] = [];
         fleetMock.registerExternalCallback.mockImplementation((...args) => {
-          if (args[0] === 'postPackagePolicyDelete') {
+          if (args[0] === 'packagePolicyPostDelete') {
             packagePolicyPostDeleteCallbacks.push(args[1]);
           }
         });

x-pack/plugins/cloud_security_posture/server/plugin.ts

@@ -16,7 +16,7 @@ import type {
 } from '@kbn/core/server';
 import type { DeepReadonly } from 'utility-types';
 import type {
-  DeletePackagePoliciesResponse,
+  PostDeletePackagePoliciesResponse,
   PackagePolicy,
   NewPackagePolicy,
 } from '@kbn/fleet-plugin/common';
@@ -145,8 +145,8 @@ export class CspPlugin
       );
 
       plugins.fleet.registerExternalCallback(
-        'postPackagePolicyDelete',
-        async (deletedPackagePolicies: DeepReadonly<DeletePackagePoliciesResponse>) => {
+        'packagePolicyPostDelete',
+        async (deletedPackagePolicies: DeepReadonly<PostDeletePackagePoliciesResponse>) => {
           for (const deletedPackagePolicy of deletedPackagePolicies) {
             if (isCspPackage(deletedPackagePolicy.package?.name)) {
               const soClient = core.savedObjects.createInternalRepository();

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

@@ -95,7 +95,7 @@ export type {
   GetAgentPoliciesRequest,
   GetAgentPoliciesResponse,
   GetAgentPoliciesResponseItem,
-  DeletePackagePoliciesResponse,
+  PostDeletePackagePoliciesResponse,
   GetPackagesResponse,
   BulkInstallPackagesResponse,
   FleetErrorResponse,

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

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DeletePackagePoliciesResponse, NewPackagePolicy, PackagePolicy } from './types';
+import type { PostDeletePackagePoliciesResponse, NewPackagePolicy, PackagePolicy } from './types';
 import type { FleetAuthz } from './authz';
 import { ENDPOINT_PRIVILEGES } from './constants';
 
@@ -47,7 +47,7 @@ export const createPackagePolicyMock = (): PackagePolicy => {
   };
 };
 
-export const deletePackagePolicyMock = (): DeletePackagePoliciesResponse => {
+export const deletePackagePolicyMock = (): PostDeletePackagePoliciesResponse => {
   const newPackagePolicy = createNewPackagePolicyMock();
   return [
     {

x-pack/plugins/fleet/common/types/rest_spec/package_policy.ts

@@ -54,7 +54,9 @@ export interface DeletePackagePoliciesRequest {
   };
 }
 
-export type DeletePackagePoliciesResponse = Array<{
+export type DeletePackagePoliciesResponse = PackagePolicy[];
+
+export type PostDeletePackagePoliciesResponse = Array<{
   id: string;
   name?: string;
   success: boolean;

x-pack/plugins/fleet/public/hooks/use_request/package_policy.ts

@@ -14,7 +14,7 @@ import type {
 } from '../../types';
 import type {
   DeletePackagePoliciesRequest,
-  DeletePackagePoliciesResponse,
+  PostDeletePackagePoliciesResponse,
   GetPackagePoliciesRequest,
   GetPackagePoliciesResponse,
   GetOnePackagePolicyResponse,
@@ -44,7 +44,7 @@ export const sendUpdatePackagePolicy = (
 };
 
 export const sendDeletePackagePolicy = (body: DeletePackagePoliciesRequest['body']) => {
-  return sendRequest<DeletePackagePoliciesResponse>({
+  return sendRequest<PostDeletePackagePoliciesResponse>({
     path: packagePolicyRouteService.getDeletePath(),
     method: 'post',
     body: JSON.stringify(body),

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

@@ -27,7 +27,7 @@ export type { FleetSetupContract, FleetSetupDeps, FleetStartContract } from './p
 export type {
   ExternalCallback,
   PutPackagePolicyUpdateCallback,
-  PostPackagePolicyDeleteCallback,
+  PostPackagePolicyPostDeleteCallback,
   PostPackagePolicyCreateCallback,
   FleetRequestHandlerContext,
   PostPackagePolicyPostCreateCallback,

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

@@ -122,6 +122,7 @@ export const createPackagePolicyServiceMock = (): jest.Mocked<PackagePolicyClien
     bulkUpdate: jest.fn(),
     runExternalCallbacks: jest.fn(),
     runDeleteExternalCallbacks: jest.fn(),
+    runPostDeleteExternalCallbacks: jest.fn(),
     upgrade: jest.fn(),
     getUpgradeDryRunDiff: jest.fn(),
     getUpgradePackagePolicyInfo: jest.fn(),

x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts

@@ -98,7 +98,7 @@ jest.mock(
         update: jest.fn(),
         // @ts-ignore
         runExternalCallbacks: jest.fn((callbackType, packagePolicy, context, request) =>
-          callbackType === 'postPackagePolicyDelete'
+          callbackType === 'packagePolicyPostDelete'
             ? Promise.resolve(undefined)
             : Promise.resolve(packagePolicy)
         ),

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

@@ -37,7 +37,7 @@ import type {
 import type {
   BulkGetPackagePoliciesResponse,
   CreatePackagePolicyResponse,
-  DeletePackagePoliciesResponse,
+  PostDeletePackagePoliciesResponse,
   NewPackagePolicy,
   UpgradePackagePolicyDryRunResponse,
   UpgradePackagePolicyResponse,
@@ -50,6 +50,8 @@ import { simplifiedPackagePolicytoNewPackagePolicy } from '../../../common/servi
 
 import type { SimplifiedPackagePolicy } from '../../../common/services/simplified_package_policy_helper';
 
+export const isNotNull = <T>(value: T | null): value is T => value !== null;
+
 export const getPackagePoliciesHandler: FleetRequestHandler<
   undefined,
   TypeOf<typeof GetPackagePoliciesRequestSchema.query>
@@ -398,22 +400,43 @@ export const deletePackagePolicyHandler: RequestHandler<
   const soClient = coreContext.savedObjects.client;
   const esClient = coreContext.elasticsearch.client.asInternalUser;
   const user = appContextService.getSecurity()?.authc.getCurrentUser(request) || undefined;
+  const logger = appContextService.getLogger();
+
   try {
-    const body: DeletePackagePoliciesResponse = await packagePolicyService.delete(
+    try {
+      const packagePolicies = await packagePolicyService.getByIDs(
+        soClient,
+        request.body.packagePolicyIds,
+        { ignoreMissing: true }
+      );
+
+      if (packagePolicies) {
+        await packagePolicyService.runExternalCallbacks(
+          'packagePolicyDelete',
+          packagePolicies,
+          context,
+          request
+        );
+      }
+    } catch (error) {
+      logger.error(`An error occurred executing external callback: ${error}`);
+      logger.error(error);
+    }
+
+    const body: PostDeletePackagePoliciesResponse = await packagePolicyService.delete(
       soClient,
       esClient,
       request.body.packagePolicyIds,
       { user, force: request.body.force, skipUnassignFromAgentPolicies: request.body.force }
     );
     try {
       await packagePolicyService.runExternalCallbacks(
-        'postPackagePolicyDelete',
+        'packagePolicyPostDelete',
         body,
         context,
         request
       );
     } catch (error) {
-      const logger = appContextService.getLogger();
       logger.error(`An error occurred executing external callback: ${error}`);
       logger.error(error);
     }
@@ -434,7 +457,25 @@ export const deleteOnePackagePolicyHandler: RequestHandler<
   const soClient = coreContext.savedObjects.client;
   const esClient = coreContext.elasticsearch.client.asInternalUser;
   const user = appContextService.getSecurity()?.authc.getCurrentUser(request) || undefined;
+  const logger = appContextService.getLogger();
+
   try {
+    try {
+      const packagePolicy = await packagePolicyService.get(
+        soClient,
+        request.params.packagePolicyId
+      );
+      await packagePolicyService.runExternalCallbacks(
+        'packagePolicyDelete',
+        packagePolicy ? [packagePolicy] : [],
+        context,
+        request
+      );
+    } catch (error) {
+      logger.error(`An error occurred executing external callback: ${error}`);
+      logger.error(error);
+    }
+
     const res = await packagePolicyService.delete(
       soClient,
       esClient,
@@ -454,13 +495,12 @@ export const deleteOnePackagePolicyHandler: RequestHandler<
     }
     try {
       await packagePolicyService.runExternalCallbacks(
-        'postPackagePolicyDelete',
+        'packagePolicyPostDelete',
         res,
         context,
         request
       );
     } catch (error) {
-      const logger = appContextService.getLogger();
       logger.error(`An error occurred executing external callback: ${error}`);
       logger.error(error);
     }

x-pack/plugins/fleet/server/services/agent_policy.test.ts

@@ -171,7 +171,7 @@ describe('agent policy', () => {
 
     it('should run package policy delete external callbacks', async () => {
       await agentPolicyService.delete(soClient, esClient, 'mocked');
-      expect(packagePolicyService.runDeleteExternalCallbacks).toHaveBeenCalledWith([
+      expect(packagePolicyService.runPostDeleteExternalCallbacks).toHaveBeenCalledWith([
         { id: 'package-1' },
       ]);
     });
@@ -195,7 +195,7 @@ describe('agent policy', () => {
 
       await agentPolicyService.delete(soClient, esClient, 'mocked', { force: true });
 
-      expect(packagePolicyService.runDeleteExternalCallbacks).toHaveBeenCalledWith([
+      expect(packagePolicyService.runPostDeleteExternalCallbacks).toHaveBeenCalledWith([
         { id: 'package-1' },
       ]);
     });

x-pack/plugins/fleet/server/services/agent_policy.ts

@@ -51,7 +51,7 @@ import type {
   FleetServerPolicy,
   Installation,
   Output,
-  DeletePackagePoliciesResponse,
+  PostDeletePackagePoliciesResponse,
   PackageInfo,
 } from '../../common/types';
 import {
@@ -680,7 +680,10 @@ class AgentPolicyService {
           `Cannot delete agent policy ${id} that contains managed package policies`
         );
       }
-      const deletedPackagePolicies: DeletePackagePoliciesResponse =
+
+      await packagePolicyService.runDeleteExternalCallbacks(packagePolicies);
+
+      const deletedPackagePolicies: PostDeletePackagePoliciesResponse =
         await packagePolicyService.delete(
           soClient,
           esClient,
@@ -691,7 +694,7 @@ class AgentPolicyService {
           }
         );
       try {
-        await packagePolicyService.runDeleteExternalCallbacks(deletedPackagePolicies);
+        await packagePolicyService.runPostDeleteExternalCallbacks(deletedPackagePolicies);
       } catch (error) {
         const logger = appContextService.getLogger();
         logger.error(`An error occurred executing external callback: ${error}`);

x-pack/plugins/fleet/server/services/app_context.ts

@@ -35,8 +35,9 @@ import type { ExperimentalFeatures } from '../../common/experimental_features';
 import type {
   ExternalCallback,
   ExternalCallbacksStorage,
-  PostPackagePolicyCreateCallback,
   PostPackagePolicyDeleteCallback,
+  PostPackagePolicyCreateCallback,
+  PostPackagePolicyPostDeleteCallback,
   PostPackagePolicyPostCreateCallback,
   PutPackagePolicyUpdateCallback,
 } from '../types';
@@ -211,8 +212,10 @@ class AppContextService {
     | Set<
         T extends 'packagePolicyCreate'
           ? PostPackagePolicyCreateCallback
-          : T extends 'postPackagePolicyDelete'
+          : T extends 'packagePolicyDelete'
           ? PostPackagePolicyDeleteCallback
+          : T extends 'packagePolicyPostDelete'
+          ? PostPackagePolicyPostDeleteCallback
           : T extends 'packagePolicyPostCreate'
           ? PostPackagePolicyPostCreateCallback
           : PutPackagePolicyUpdateCallback
@@ -222,8 +225,10 @@ class AppContextService {
       return this.externalCallbacks.get(type) as Set<
         T extends 'packagePolicyCreate'
           ? PostPackagePolicyCreateCallback
-          : T extends 'postPackagePolicyDelete'
+          : T extends 'packagePolicyDelete'
           ? PostPackagePolicyDeleteCallback
+          : T extends 'packagePolicyPostDelete'
+          ? PostPackagePolicyPostDeleteCallback
           : T extends 'packagePolicyPostCreate'
           ? PostPackagePolicyPostCreateCallback
           : PutPackagePolicyUpdateCallback