Modify the type of extendedSavedObjectsMappings

Signed-off-by: gaobinlong <gbinlong@amazon.com>

src/core/server/saved_objects/migrations/core/build_active_mappings.ts

@@ -48,13 +48,15 @@ import {
  */
 export function buildActiveMappings(
   typeDefinitions: SavedObjectsTypeMappingDefinitions | SavedObjectsMappingProperties,
-  extendedMappings?: SavedObjectsMappingProperties
+  extendedMappings?: SavedObjectsMappingProperties[]
 ): IndexMapping {
   const mapping = defaultMapping();
 
   let mergedProperties = validateAndMerge(mapping.properties, typeDefinitions);
   if (extendedMappings) {
-    mergedProperties = validateAndMerge(mergedProperties, extendedMappings);
+    extendedMappings.forEach(
+      (mappings) => (mergedProperties = validateAndMerge(mergedProperties, mappings))
+    );
   }
 
   return cloneDeep({

src/core/server/saved_objects/migrations/opensearch_dashboards/opensearch_dashboards_migrator.ts

@@ -58,7 +58,7 @@ export interface OpenSearchDashboardsMigratorOptions {
   opensearchDashboardsConfig: OpenSearchDashboardsConfigType;
   opensearchDashboardsVersion: string;
   logger: Logger;
-  extendedSavedObjectsMappings?: SavedObjectsMappingProperties;
+  extendedSavedObjectsMappings?: SavedObjectsMappingProperties[];
 }
 
 export type IOpenSearchDashboardsMigrator = Pick<
@@ -88,7 +88,7 @@ export class OpenSearchDashboardsMigrator {
     status: 'waiting',
   });
   private readonly activeMappings: IndexMapping;
-  private readonly extendedMappingProperties?: SavedObjectsMappingProperties;
+  private readonly extendedMappingProperties?: SavedObjectsMappingProperties[];
 
   /**
    * Creates an instance of OpenSearchDashboardsMigrator.

src/core/server/saved_objects/saved_objects_service.ts

@@ -188,7 +188,7 @@ export interface SavedObjectsServiceSetup {
   /**
    * Allow a plugin to add extended saved objects mappings
    */
-  addExtendedSavedObjectsMappings: (mappings: SavedObjectsMappingProperties) => void;
+  addExtendedSavedObjectsMappings: (mappings: SavedObjectsMappingProperties[]) => void;
 }
 
 /**
@@ -320,7 +320,7 @@ export class SavedObjectsService
     level: ServiceStatusLevels.unavailable,
     summary: `waiting`,
   });
-  private extendedSavedObjectsMappings?: SavedObjectsMappingProperties;
+  private extendedSavedObjectsMappings?: SavedObjectsMappingProperties[];
 
   constructor(private readonly coreContext: CoreContext) {
     this.logger = coreContext.logger.get('savedobjects-service');
@@ -396,8 +396,12 @@ export class SavedObjectsService
         }
         this.savedObjectServiceCustomStatus$ = status$;
       },
-      addExtendedSavedObjectsMappings: (mappings: SavedObjectsMappingProperties) => {
-        this.extendedSavedObjectsMappings = mappings;
+      addExtendedSavedObjectsMappings: (mappings: SavedObjectsMappingProperties[]) => {
+        if (!this.extendedSavedObjectsMappings) {
+          this.extendedSavedObjectsMappings = mappings;
+        } else {
+          this.extendedSavedObjectsMappings = [...this.extendedSavedObjectsMappings, ...mappings];
+        }
       },
     };
   }
@@ -557,7 +561,7 @@ export class SavedObjectsService
     opensearchDashboardsConfig: OpenSearchDashboardsConfigType,
     savedObjectsConfig: SavedObjectsMigrationConfigType,
     client: IClusterClient,
-    extendedSavedObjectsMappings?: SavedObjectsMappingProperties,
+    extendedSavedObjectsMappings?: SavedObjectsMappingProperties[],
     migrationsRetryDelay?: number
   ): IOpenSearchDashboardsMigrator {
     return new OpenSearchDashboardsMigrator({

src/plugins/workspace/server/plugin.ts

@@ -115,7 +115,7 @@ export class WorkspacePlugin implements Plugin<{}, {}> {
       };
     }
 
-    core.savedObjects.addExtendedSavedObjectsMappings(extendedSavedObjectsMappings);
+    core.savedObjects.addExtendedSavedObjectsMappings([extendedSavedObjectsMappings]);
 
     this.proxyWorkspaceTrafficToRealHandler(core);