Fix bad merge

x-pack/plugins/ingest_manager/server/services/epm/archive/index.ts

@@ -6,7 +6,13 @@
 
 import { ArchivePackage } from '../../../../common/types';
 import { PackageInvalidArchiveError, PackageUnsupportedMediaTypeError } from '../../../errors';
-import { cacheSet, setArchiveFilelist } from './cache';
+import {
+  cacheSet,
+  cacheDelete,
+  getArchiveFilelist,
+  setArchiveFilelist,
+  deleteArchiveFilelist,
+} from './cache';
 import { ArchiveEntry, getBufferExtractor } from '../registry/extract';
 import { parseAndVerifyArchive } from './validation';
 
@@ -66,3 +72,15 @@ export async function unpackArchiveToCache(
   }
   return paths;
 }
+
+export const deletePackageCache = (name: string, version: string) => {
+  // get cached archive filelist
+  const paths = getArchiveFilelist(name, version);
+
+  // delete cached archive filelist
+  deleteArchiveFilelist(name, version);
+
+  // delete cached archive files
+  // this has been populated in unpackRegistryPackageToCache()
+  paths?.forEach((path) => cacheDelete(path));
+};

x-pack/plugins/ingest_manager/server/services/epm/packages/remove.ts

@@ -21,7 +21,8 @@ import { deletePipeline } from '../elasticsearch/ingest_pipeline/';
 import { installIndexPatterns } from '../kibana/index_pattern/install';
 import { deleteTransforms } from '../elasticsearch/transform/remove';
 import { packagePolicyService, appContextService } from '../..';
-import { splitPkgKey, deletePackageCache } from '../registry';
+import { splitPkgKey } from '../registry';
+import { deletePackageCache } from '../archive';
 
 export async function removeInstallation(options: {
   savedObjectsClient: SavedObjectsClientContract;