[8.7] Introduce CLEANUP_UNKNOWN_AND_EXCLUDED step (#149931)

packages/core/root/core-root-server-internal/index.ts

@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export { Server, Root, bootstrap } from './src';
+export { Server, registerServiceConfig, Root, bootstrap } from './src';

packages/core/root/core-root-server-internal/src/index.ts

@@ -7,5 +7,6 @@
  */
 
 export { Server } from './server';
+export { registerServiceConfig } from './register_service_config';
 export { bootstrap } from './bootstrap';
 export { Root } from './root';

packages/core/root/core-root-server-internal/src/register_service_config.ts

@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { config as pathConfig } from '@kbn/utils';
+import { ConfigService } from '@kbn/config';
+import type { ServiceConfigDescriptor } from '@kbn/core-base-server-internal';
+import { config as loggingConfig } from '@kbn/core-logging-server-internal';
+import { coreDeprecationProvider } from '@kbn/core-config-server-internal';
+import { nodeConfig } from '@kbn/core-node-server-internal';
+import { pidConfig } from '@kbn/core-environment-server-internal';
+import { executionContextConfig } from '@kbn/core-execution-context-server-internal';
+import { config as httpConfig, cspConfig, externalUrlConfig } from '@kbn/core-http-server-internal';
+import { config as elasticsearchConfig } from '@kbn/core-elasticsearch-server-internal';
+import { opsConfig } from '@kbn/core-metrics-server-internal';
+import {
+  savedObjectsConfig,
+  savedObjectsMigrationConfig,
+} from '@kbn/core-saved-objects-base-server-internal';
+import { config as i18nConfig } from '@kbn/core-i18n-server-internal';
+import { config as deprecationConfig } from '@kbn/core-deprecations-server-internal';
+import { statusConfig } from '@kbn/core-status-server-internal';
+import { uiSettingsConfig } from '@kbn/core-ui-settings-server-internal';
+
+import { config as pluginsConfig } from '@kbn/core-plugins-server-internal';
+import { elasticApmConfig } from './root/elastic_config';
+
+const rootConfigPath = '';
+
+export function registerServiceConfig(configService: ConfigService) {
+  const configDescriptors: Array<ServiceConfigDescriptor<unknown>> = [
+    cspConfig,
+    deprecationConfig,
+    elasticsearchConfig,
+    elasticApmConfig,
+    executionContextConfig,
+    externalUrlConfig,
+    httpConfig,
+    i18nConfig,
+    loggingConfig,
+    nodeConfig,
+    opsConfig,
+    pathConfig,
+    pidConfig,
+    pluginsConfig,
+    savedObjectsConfig,
+    savedObjectsMigrationConfig,
+    statusConfig,
+    uiSettingsConfig,
+  ];
+
+  configService.addDeprecationProvider(rootConfigPath, coreDeprecationProvider);
+  for (const descriptor of configDescriptors) {
+    if (descriptor.deprecations) {
+      configService.addDeprecationProvider(descriptor.path, descriptor.deprecations);
+    }
+    configService.setSchema(descriptor.path, descriptor.schema);
+  }
+}

packages/core/root/core-root-server-internal/src/server.ts

@@ -7,57 +7,30 @@
  */
 
 import apm from 'elastic-apm-node';
-import { config as pathConfig } from '@kbn/utils';
 import { reportPerformanceMetricEvent } from '@kbn/ebt-tools';
 import type { Logger, LoggerFactory } from '@kbn/logging';
 import { ConfigService, Env, RawConfigurationProvider } from '@kbn/config';
-import type { ServiceConfigDescriptor } from '@kbn/core-base-server-internal';
 import { DocLinksService } from '@kbn/core-doc-links-server-internal';
-import {
-  LoggingService,
-  ILoggingSystem,
-  config as loggingConfig,
-} from '@kbn/core-logging-server-internal';
-import {
-  coreDeprecationProvider,
-  ensureValidConfiguration,
-} from '@kbn/core-config-server-internal';
-import { NodeService, nodeConfig } from '@kbn/core-node-server-internal';
+import { LoggingService, ILoggingSystem } from '@kbn/core-logging-server-internal';
+import { ensureValidConfiguration } from '@kbn/core-config-server-internal';
+import { NodeService } from '@kbn/core-node-server-internal';
 import { AnalyticsService } from '@kbn/core-analytics-server-internal';
 import type { AnalyticsServiceSetup, AnalyticsServiceStart } from '@kbn/core-analytics-server';
-import { EnvironmentService, pidConfig } from '@kbn/core-environment-server-internal';
-import {
-  ExecutionContextService,
-  executionContextConfig,
-} from '@kbn/core-execution-context-server-internal';
+import { EnvironmentService } from '@kbn/core-environment-server-internal';
+import { ExecutionContextService } from '@kbn/core-execution-context-server-internal';
 import { PrebootService } from '@kbn/core-preboot-server-internal';
 import { ContextService } from '@kbn/core-http-context-server-internal';
-import {
-  HttpService,
-  config as httpConfig,
-  cspConfig,
-  externalUrlConfig,
-} from '@kbn/core-http-server-internal';
-import {
-  ElasticsearchService,
-  config as elasticsearchConfig,
-} from '@kbn/core-elasticsearch-server-internal';
-import { MetricsService, opsConfig } from '@kbn/core-metrics-server-internal';
+import { HttpService } from '@kbn/core-http-server-internal';
+import { ElasticsearchService } from '@kbn/core-elasticsearch-server-internal';
+import { MetricsService } from '@kbn/core-metrics-server-internal';
 import { CapabilitiesService } from '@kbn/core-capabilities-server-internal';
 import type { SavedObjectsServiceStart } from '@kbn/core-saved-objects-server';
-import {
-  savedObjectsConfig,
-  savedObjectsMigrationConfig,
-} from '@kbn/core-saved-objects-base-server-internal';
 import { SavedObjectsService } from '@kbn/core-saved-objects-server-internal';
-import { I18nService, config as i18nConfig } from '@kbn/core-i18n-server-internal';
-import {
-  DeprecationsService,
-  config as deprecationConfig,
-} from '@kbn/core-deprecations-server-internal';
+import { I18nService } from '@kbn/core-i18n-server-internal';
+import { DeprecationsService } from '@kbn/core-deprecations-server-internal';
 import { CoreUsageDataService } from '@kbn/core-usage-data-server-internal';
-import { StatusService, statusConfig } from '@kbn/core-status-server-internal';
-import { UiSettingsService, uiSettingsConfig } from '@kbn/core-ui-settings-server-internal';
+import { StatusService } from '@kbn/core-status-server-internal';
+import { UiSettingsService } from '@kbn/core-ui-settings-server-internal';
 import { CustomBrandingService } from '@kbn/core-custom-branding-server-internal';
 import {
   CoreRouteHandlerContext,
@@ -75,16 +48,11 @@ import type {
   InternalCoreSetup,
   InternalCoreStart,
 } from '@kbn/core-lifecycle-server-internal';
-import {
-  DiscoveredPlugins,
-  PluginsService,
-  config as pluginsConfig,
-} from '@kbn/core-plugins-server-internal';
+import { DiscoveredPlugins, PluginsService } from '@kbn/core-plugins-server-internal';
 import { CoreAppsService } from '@kbn/core-apps-server-internal';
-import { elasticApmConfig } from './root/elastic_config';
+import { registerServiceConfig } from './register_service_config';
 
 const coreId = Symbol('core');
-const rootConfigPath = '';
 const KIBANA_STARTED_EVENT = 'kibana_started';
 
 /** @internal */
@@ -465,34 +433,7 @@ export class Server {
   }
 
   public setupCoreConfig() {
-    const configDescriptors: Array<ServiceConfigDescriptor<unknown>> = [
-      cspConfig,
-      deprecationConfig,
-      elasticsearchConfig,
-      elasticApmConfig,
-      executionContextConfig,
-      externalUrlConfig,
-      httpConfig,
-      i18nConfig,
-      loggingConfig,
-      nodeConfig,
-      opsConfig,
-      pathConfig,
-      pidConfig,
-      pluginsConfig,
-      savedObjectsConfig,
-      savedObjectsMigrationConfig,
-      statusConfig,
-      uiSettingsConfig,
-    ];
-
-    this.configService.addDeprecationProvider(rootConfigPath, coreDeprecationProvider);
-    for (const descriptor of configDescriptors) {
-      if (descriptor.deprecations) {
-        this.configService.addDeprecationProvider(descriptor.path, descriptor.deprecations);
-      }
-      this.configService.setSchema(descriptor.path, descriptor.schema);
-    }
+    registerServiceConfig(this.configService);
   }
 
   /**

packages/core/saved-objects/core-saved-objects-migration-server-internal/index.ts

@@ -9,7 +9,11 @@
 export { DocumentMigrator, KibanaMigrator, buildActiveMappings, mergeTypes } from './src';
 export type { KibanaMigratorOptions } from './src';
 export { getAggregatedTypesDocuments } from './src/actions/check_for_unknown_docs';
-export { addExcludedTypesToBoolQuery } from './src/model/helpers';
+export {
+  addExcludedTypesToBoolQuery,
+  createBulkIndexOperationTuple,
+  createBulkDeleteOperationBody,
+} from './src/model/helpers';
 
 // these are only used for integration tests
 export {

packages/core/saved-objects/core-saved-objects-migration-server-internal/src/README.md

@@ -369,9 +369,9 @@ completed this step:
  - temp index has a write block
  - temp index is not found
 ### New control state
-1. If `currentBatch` is the last batch in `transformedDocBatches`
+1. If `currentBatch` is the last batch in `bulkOperationBatches`
   → `REINDEX_SOURCE_TO_TEMP_READ`
-2. If there are more batches left in `transformedDocBatches`
+2. If there are more batches left in `bulkOperationBatches`
   → `REINDEX_SOURCE_TO_TEMP_INDEX_BULK`
 
 ## REINDEX_SOURCE_TO_TEMP_CLOSE_PIT