Merge branch 'master' into fold-into-getarchivepackage

x-pack/plugins/ingest_manager/server/services/epm/registry/cache.ts → x-pack/plugins/ingest_manager/server/services/epm/archive/cache.ts

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { pkgToPkgKey } from './index';
+import { pkgToPkgKey } from '../registry/index';
 
 const cache: Map<string, Buffer> = new Map();
 export const cacheGet = (key: string) => cache.get(key);

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

@@ -6,10 +6,18 @@
 
 import { ArchivePackage } from '../../../../common/types';
 import { PackageInvalidArchiveError, PackageUnsupportedMediaTypeError } from '../../../errors';
-import { cacheSet, setArchiveFilelist } from '../registry/cache';
+import {
+  cacheSet,
+  cacheDelete,
+  getArchiveFilelist,
+  setArchiveFilelist,
+  deleteArchiveFilelist,
+} from './cache';
 import { ArchiveEntry, getBufferExtractor } from '../registry/extract';
 import { parseAndVerifyArchive } from './validation';
 
+export * from './cache';
+
 export async function loadArchivePackage({
   archiveBuffer,
   contentType,
@@ -64,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 unpackArchiveToCache()
+  paths?.forEach((path) => cacheDelete(path));
+};

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

@@ -16,7 +16,7 @@ import {
 } from '../../../../common/types';
 import { PackageInvalidArchiveError } from '../../../errors';
 import { pkgToPkgKey } from '../registry';
-import { cacheGet } from '../registry/cache';
+import { cacheGet } from './cache';
 
 // TODO: everything below performs verification of manifest.yml files, and hence duplicates functionality already implemented in the
 // package registry. At some point this should probably be replaced (or enhanced) with verification based on

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

@@ -6,9 +6,9 @@
 
 import { InstallablePackage } from '../../../types';
 import { getAssets } from './assets';
-import { getArchiveFilelist } from '../registry/cache';
+import { getArchiveFilelist } from '../archive/cache';
 
-jest.mock('../registry/cache', () => {
+jest.mock('../archive/cache', () => {
   return {
     getArchiveFilelist: jest.fn(),
   };

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

@@ -6,7 +6,7 @@
 
 import { InstallablePackage } from '../../../types';
 import * as Registry from '../registry';
-import { getArchiveFilelist } from '../registry/cache';
+import { getArchiveFilelist } from '../archive/cache';
 
 // paths from RegistryPackage are routes to the assets on EPR
 // e.g. `/package/nginx/1.2.0/data_stream/access/fields/fields.yml`

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;

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

@@ -19,13 +19,7 @@ import {
   RegistrySearchResult,
 } from '../../../types';
 import { unpackArchiveToCache } from '../archive';
-import {
-  cacheGet,
-  cacheDelete,
-  getArchiveFilelist,
-  setArchiveFilelist,
-  deleteArchiveFilelist,
-} from './cache';
+import { cacheGet, getArchiveFilelist, setArchiveFilelist } from '../archive';
 import { fetchUrl, getResponse, getResponseStream } from './requests';
 import { streamToBuffer } from './streams';
 import { getRegistryUrl } from './registry_url';
@@ -237,15 +231,3 @@ export function groupPathsByService(paths: string[]): AssetsGroupedByServiceByTy
     // elasticsearch: assets.elasticsearch,
   };
 }
-
-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));
-};