add option to override supported import types

elastic · Nov 22, 2021 · 1f48e6e · 1f48e6e
1 parent b34e2e1
commit 1f48e6e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/src/core/server/saved_objects/import/import_saved_objects.ts b/src/core/server/saved_objects/import/import_saved_objects.ts
@@ -44,6 +44,8 @@ export interface ImportSavedObjectsOptions {
  namespace?: string;
  /** If true, will create new copies of import objects, each with a random `id` and undefined `originId`. */
  createNewCopies: boolean;
+ /** Optional list of supported import types, any type not in this list won't be imported */
+ supportedTypesOverride?: string[];
 }
 
 /**
@@ -61,9 +63,12 @@ export async function importSavedObjectsFromStream({
  typeRegistry,
  importHooks,
  namespace,
+ supportedTypesOverride,
 }: ImportSavedObjectsOptions): Promise<SavedObjectsImportResponse> {
  let errorAccumulator: SavedObjectsImportFailure[] = [];
- const supportedTypes = typeRegistry.getImportableAndExportableTypes().map((type) => type.name);
+ const supportedTypes =
+ supportedTypesOverride ||
+ typeRegistry.getImportableAndExportableTypes().map((type) => type.name);
 
  // Get the objects to import
  const collectSavedObjectsResult = await collectSavedObjects({

diff --git a/src/core/server/saved_objects/import/saved_objects_importer.ts b/src/core/server/saved_objects/import/saved_objects_importer.ts
@@ -66,12 +66,14 @@ export class SavedObjectsImporter {
  createNewCopies,
  namespace,
  overwrite,
+ supportedTypesOverride,
  }: SavedObjectsImportOptions): Promise<SavedObjectsImportResponse> {
  return importSavedObjectsFromStream({
  readStream,
  createNewCopies,
  namespace,
  overwrite,
+ supportedTypesOverride,
  objectLimit: this.#importSizeLimit,
  savedObjectsClient: this.#savedObjectsClient,
  typeRegistry: this.#typeRegistry,

diff --git a/src/core/server/saved_objects/import/types.ts b/src/core/server/saved_objects/import/types.ts
@@ -159,6 +159,8 @@ export interface SavedObjectsImportOptions {
  namespace?: string;
  /** If true, will create new copies of import objects, each with a random `id` and undefined `originId`. */
  createNewCopies: boolean;
+ /** Optional list of supported import types, any type not in this list won't be imported */
+ supportedTypesOverride?: string[];
 }
 
 /**

diff --git a/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts b/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts
@@ -175,6 +175,7 @@ async function installKibanaSavedObjects({
  overwrite: true,
  readStream: createListStream(toBeSavedObjects),
  createNewCopies: false,
+ supportedTypesOverride: Object.values(KibanaSavedObjectTypeMapping),
  });
 
  if (errors?.length) {