Merge branch 'main' into main

elastic · Jan 25, 2023 · 9293ad8 · 9293ad8
2 parents 082f3cd + 181950a
commit 9293ad8
Show file tree

Hide file tree

Showing 175 changed files with 2,154 additions and 501 deletions.
diff --git a/.buildkite/scripts/post_build_kibana.sh b/.buildkite/scripts/post_build_kibana.sh
@@ -3,10 +3,18 @@
 set -euo pipefail
 
 if [[ ! "${DISABLE_CI_STATS_SHIPPING:-}" ]]; then
+  cmd=(
+    "node" "scripts/ship_ci_stats"
+      "--metrics" "target/optimizer_bundle_metrics.json"
+      "--metrics" "build/kibana/node_modules/@kbn/ui-shared-deps-src/shared_built_assets/metrics.json"
+  )
+
+  if [ "$BUILDKITE_PIPELINE_SLUG" == "kibana-on-merge" ]; then
+    cmd+=("--validate")
+  fi
+
   echo "--- Ship Kibana Distribution Metrics to CI Stats"
-  node scripts/ship_ci_stats \
-    --metrics target/optimizer_bundle_metrics.json \
-    --metrics build/kibana/node_modules/@kbn/ui-shared-deps-src/shared_built_assets/metrics.json
+  "${cmd[@]}"
 fi
 
 echo "--- Upload Build Artifacts"

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -901,6 +901,7 @@ packages/kbn-chart-icons @elastic/kibana-visualizations
 packages/kbn-ci-stats-core @elastic/kibana-operations
 packages/kbn-ci-stats-performance-metrics @elastic/kibana-operations
 packages/kbn-ci-stats-reporter @elastic/kibana-operations
+packages/kbn-ci-stats-shipper-cli @elastic/kibana-operations
 packages/kbn-cli-dev-mode @elastic/kibana-operations
 packages/kbn-coloring @elastic/kibana-visualizations
 packages/kbn-config @elastic/kibana-core

diff --git a/docs/management/cases/images/cases.png b/docs/management/cases/images/cases.png
diff --git a/package.json b/package.json
@@ -764,6 +764,7 @@
     "@kbn/ci-stats-core": "link:packages/kbn-ci-stats-core",
     "@kbn/ci-stats-performance-metrics": "link:packages/kbn-ci-stats-performance-metrics",
     "@kbn/ci-stats-reporter": "link:packages/kbn-ci-stats-reporter",
+    "@kbn/ci-stats-shipper-cli": "link:packages/kbn-ci-stats-shipper-cli",
     "@kbn/cli-dev-mode": "link:packages/kbn-cli-dev-mode",
     "@kbn/core-test-helpers-kbn-server": "link:packages/core/test-helpers/core-test-helpers-kbn-server",
     "@kbn/cypress-config": "link:packages/kbn-cypress-config",

diff --git a/packages/core/apps/core-apps-server-internal/src/core_app.ts b/packages/core/apps/core-apps-server-internal/src/core_app.ts
@@ -179,7 +179,9 @@ export class CoreAppsService {
         }
 
         const querystring = query ? stringify(query) : undefined;
-        const url = `${requestBasePath}/${rewrittenPath}${querystring ? `?${querystring}` : ''}`;
+        const url = `${requestBasePath}/${encodeURIComponent(rewrittenPath)}${
+          querystring ? `?${querystring}` : ''
+        }`;
 
         return res.redirected({
           headers: {

diff --git a/...ects/core-saved-objects-api-server-internal/src/lib/collect_multi_namespace_references.ts b/...ects/core-saved-objects-api-server-internal/src/lib/collect_multi_namespace_references.ts
@@ -7,7 +7,7 @@
  */
 
 import { isNotFoundFromUnsupportedServer } from '@kbn/core-elasticsearch-server-internal';
-import type { SavedObject } from '@kbn/core-saved-objects-common';
+import type { SavedObject } from '@kbn/core-saved-objects-server';
 import type {
   SavedObjectsCollectMultiNamespaceReferencesObject,
   SavedObjectsCollectMultiNamespaceReferencesOptions,

diff --git a/...aved-objects/core-saved-objects-api-server-internal/src/lib/internal_bulk_resolve.test.ts b/...aved-objects/core-saved-objects-api-server-internal/src/lib/internal_bulk_resolve.test.ts
@@ -13,7 +13,7 @@ import {
 } from './internal_bulk_resolve.test.mock';
 
 import { elasticsearchClientMock } from '@kbn/core-elasticsearch-client-server-mocks';
-import type { SavedObject } from '@kbn/core-saved-objects-common';
+import type { SavedObject } from '@kbn/core-saved-objects-server';
 import type {
   SavedObjectsBulkResolveObject,
   SavedObjectsBaseOptions,

diff --git a/...ore/saved-objects/core-saved-objects-api-server-internal/src/lib/internal_bulk_resolve.ts b/...ore/saved-objects/core-saved-objects-api-server-internal/src/lib/internal_bulk_resolve.ts
@@ -9,7 +9,7 @@
 import type { MgetResponseItem } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import { isNotFoundFromUnsupportedServer } from '@kbn/core-elasticsearch-server-internal';
-import type { SavedObject } from '@kbn/core-saved-objects-common';
+import type { SavedObject } from '@kbn/core-saved-objects-server';
 import type {
   SavedObjectsBaseOptions,
   SavedObjectsBulkResolveObject,

diff --git a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/internal_utils.ts b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/internal_utils.ts
@@ -7,7 +7,7 @@
  */
 
 import type { Payload } from '@hapi/boom';
-import type { SavedObject } from '@kbn/core-saved-objects-common';
+import type { SavedObject } from '@kbn/core-saved-objects-server';
 import type {
   ISavedObjectTypeRegistry,
   SavedObjectsRawDoc,

diff --git a/...ects/core-saved-objects-api-server-internal/src/lib/repository.security_extension.test.ts b/...ects/core-saved-objects-api-server-internal/src/lib/repository.security_extension.test.ts
@@ -20,7 +20,7 @@ import { estypes } from '@elastic/elasticsearch';
 import { elasticsearchClientMock } from '@kbn/core-elasticsearch-client-server-mocks';
 import { SavedObjectsBulkUpdateObject } from '@kbn/core-saved-objects-api-server';
 import { SavedObjectsSerializer } from '@kbn/core-saved-objects-base-server-internal';
-import { SavedObject } from '@kbn/core-saved-objects-common';
+import { SavedObject } from '@kbn/core-saved-objects-server';
 import {
   ISavedObjectsSecurityExtension,
   AuditAction,

diff --git a/...bjects/core-saved-objects-api-server-internal/src/lib/repository.spaces_extension.test.ts b/...bjects/core-saved-objects-api-server-internal/src/lib/repository.spaces_extension.test.ts
@@ -27,7 +27,7 @@ import {
   SavedObjectsBulkUpdateObject,
 } from '@kbn/core-saved-objects-api-server';
 import { SavedObjectsSerializer } from '@kbn/core-saved-objects-base-server-internal';
-import { SavedObject } from '@kbn/core-saved-objects-common';
+import { SavedObject } from '@kbn/core-saved-objects-server';
 import {
   ISavedObjectsSpacesExtension,
   ISavedObjectsSecurityExtension,

diff --git a/...ages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/repository.test.ts b/...ages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/repository.test.ts
@@ -23,7 +23,7 @@ import {
 import type { Payload } from '@hapi/boom';
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { SavedObject, SavedObjectReference } from '@kbn/core-saved-objects-common';
+import type { SavedObject, SavedObjectReference } from '@kbn/core-saved-objects-server';
 import type {
   SavedObjectsBaseOptions,
   SavedObjectsFindOptions,

diff --git a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/repository.ts b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/repository.ts
@@ -17,7 +17,7 @@ import {
   isSupportedEsServer,
   isNotFoundFromUnsupportedServer,
 } from '@kbn/core-elasticsearch-server-internal';
-import type { SavedObject } from '@kbn/core-saved-objects-common';
+import type { SavedObject } from '@kbn/core-saved-objects-server';
 import type {
   SavedObjectsBaseOptions,
   SavedObjectsIncrementCounterOptions,

diff --git a/...ore/saved-objects/core-saved-objects-api-server-internal/src/lib/update_objects_spaces.ts b/...ore/saved-objects/core-saved-objects-api-server-internal/src/lib/update_objects_spaces.ts
@@ -34,7 +34,7 @@ import type {
   IndexMapping,
   SavedObjectsSerializer,
 } from '@kbn/core-saved-objects-base-server-internal';
-import type { SavedObject } from '@kbn/core-saved-objects-common';
+import type { SavedObject } from '@kbn/core-saved-objects-server';
 import {
   getBulkOperationError,
   getExpectedVersionProperties,

diff --git a/...ges/core/saved-objects/core-saved-objects-api-server-internal/src/saved_objects_client.ts b/...ges/core/saved-objects/core-saved-objects-api-server-internal/src/saved_objects_client.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObject } from '@kbn/core-saved-objects-common';
+import type { SavedObject } from '@kbn/core-saved-objects-server';
 import type {
   SavedObjectsClientContract,
   ISavedObjectsRepository,

diff --git a/...objects/core-saved-objects-api-server-internal/src/test_helpers/repository.test.common.ts b/...objects/core-saved-objects-api-server-internal/src/test_helpers/repository.test.common.ts
@@ -20,7 +20,7 @@ import {
   SavedObjectsType,
   SavedObjectsTypeMappingDefinition,
 } from '@kbn/core-saved-objects-server';
-import { SavedObject, SavedObjectReference } from '@kbn/core-saved-objects-common';
+import { SavedObject, SavedObjectReference } from '@kbn/core-saved-objects-server';
 import {
   SavedObjectsBaseOptions,
   SavedObjectsBulkCreateObject,

diff --git a/packages/core/saved-objects/core-saved-objects-api-server/src/apis/create.ts b/packages/core/saved-objects/core-saved-objects-api-server/src/apis/create.ts
@@ -6,10 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type {
-  SavedObjectsMigrationVersion,
-  SavedObjectReference,
-} from '@kbn/core-saved-objects-common';
+import type { SavedObjectsMigrationVersion } from '@kbn/core-saved-objects-common';
+import type { SavedObjectReference } from '@kbn/core-saved-objects-common';
 import type { MutatingOperationRefreshSetting, SavedObjectsBaseOptions } from './base';
 
 /**

diff --git a/packages/core/saved-objects/core-saved-objects-api-server/tsconfig.json b/packages/core/saved-objects/core-saved-objects-api-server/tsconfig.json
@@ -11,7 +11,7 @@
     "**/*.ts"
   ],
   "kbn_references": [
-    "@kbn/core-saved-objects-common"
+    "@kbn/core-saved-objects-common",
   ],
   "exclude": [
     "target/**/*",

diff --git a/packages/core/saved-objects/core-saved-objects-common/src/saved_objects.ts b/packages/core/saved-objects/core-saved-objects-common/src/saved_objects.ts
@@ -51,30 +51,30 @@ export interface SavedObjectError {
 
 /**
  * @public
- * @deprecated See https://github.com/elastic/kibana/issues/149098
+ * @deprecated See https://github.com/elastic/kibana/issues/149098. Import this type from @kbn/core/server instead.
  */
 export type SavedObjectAttributeSingle = serverTypes.SavedObjectAttributeSingle;
 
 /**
  * @public
- * @deprecated See https://github.com/elastic/kibana/issues/149098
+ * @deprecated See https://github.com/elastic/kibana/issues/149098. Import this type from @kbn/core/server instead.
  */
 export type SavedObjectAttribute = serverTypes.SavedObjectAttribute;
 
 /**
  * @public
- * @deprecated See https://github.com/elastic/kibana/issues/149098
+ * @deprecated See https://github.com/elastic/kibana/issues/149098. Import this type from @kbn/core/server instead.
  */
 export type SavedObjectAttributes = serverTypes.SavedObjectAttributes;
 
 /**
  * @public
- * @deprecated See https://github.com/elastic/kibana/issues/149098
+ * @deprecated See https://github.com/elastic/kibana/issues/149098. Import this type from @kbn/core/server instead.
  */
 export type SavedObjectReference = serverTypes.SavedObjectReference;
 
 /**
  * @public
- * @deprecated See https://github.com/elastic/kibana/issues/149098
+ * @deprecated See https://github.com/elastic/kibana/issues/149098. Import this type from @kbn/core/server instead.
  */
 export type SavedObject<T = unknown> = serverTypes.SavedObject<T>;
diff --git a/...re-saved-objects-import-export-server-internal/src/export/apply_export_transforms.test.ts b/...re-saved-objects-import-export-server-internal/src/export/apply_export_transforms.test.ts
@@ -8,7 +8,7 @@
 
 import { CoreKibanaRequest } from '@kbn/core-http-router-server-internal';
 import { httpServerMock } from '@kbn/core-http-server-mocks';
-import type { SavedObject } from '@kbn/core-saved-objects-common';
+import type { SavedObject } from '@kbn/core-saved-objects-server';
 import type { SavedObjectsExportTransform } from '@kbn/core-saved-objects-server';
 import { applyExportTransforms } from './apply_export_transforms';
 

diff --git a/...e-saved-objects-import-export-server-internal/src/export/collect_exported_objects.test.ts b/...e-saved-objects-import-export-server-internal/src/export/collect_exported_objects.test.ts
@@ -7,7 +7,8 @@
  */
 
 import { httpServerMock } from '@kbn/core-http-server-mocks';
-import type { SavedObject, SavedObjectError } from '@kbn/core-saved-objects-common';
+import type { SavedObjectError } from '@kbn/core-saved-objects-common';
+import type { SavedObject } from '@kbn/core-saved-objects-server';
 import type {
   SavedObjectsExportTransform,
   SavedObjectsExportablePredicate,

diff --git a/...s/core-saved-objects-import-export-server-internal/src/export/collect_exported_objects.ts b/...s/core-saved-objects-import-export-server-internal/src/export/collect_exported_objects.ts
@@ -8,7 +8,7 @@
 
 import type { Logger } from '@kbn/logging';
 import type { KibanaRequest } from '@kbn/core-http-server';
-import type { SavedObject } from '@kbn/core-saved-objects-common';
+import type { SavedObject } from '@kbn/core-saved-objects-server';
 import type { SavedObjectsClientContract } from '@kbn/core-saved-objects-api-server';
 import type {
   SavedObjectsExportablePredicate,

diff --git a/.../core/saved-objects/core-saved-objects-import-export-server-internal/src/export/errors.ts b/.../core/saved-objects/core-saved-objects-import-export-server-internal/src/export/errors.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObject } from '@kbn/core-saved-objects-common';
+import type { SavedObject } from '@kbn/core-saved-objects-server';
 
 /**
  * @public

diff --git a/...ore-saved-objects-import-export-server-internal/src/export/saved_objects_exporter.test.ts b/...ore-saved-objects-import-export-server-internal/src/export/saved_objects_exporter.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { httpServerMock } from '@kbn/core-http-server-mocks';
-import type { SavedObject } from '@kbn/core-saved-objects-common';
+import type { SavedObject } from '@kbn/core-saved-objects-server';
 import { SavedObjectTypeRegistry } from '@kbn/core-saved-objects-base-server-internal';
 import { SavedObjectsExporter } from './saved_objects_exporter';
 import { savedObjectsClientMock } from '@kbn/core-saved-objects-api-server-mocks';

diff --git a/...cts/core-saved-objects-import-export-server-internal/src/export/saved_objects_exporter.ts b/...cts/core-saved-objects-import-export-server-internal/src/export/saved_objects_exporter.ts
@@ -9,7 +9,7 @@
 import type { Readable } from 'stream';
 import { createListStream } from '@kbn/utils';
 import type { Logger } from '@kbn/logging';
-import type { SavedObject } from '@kbn/core-saved-objects-common';
+import type { SavedObject } from '@kbn/core-saved-objects-server';
 import type {
   SavedObjectsClientContract,
   SavedObjectsFindResult,

diff --git a/...-objects/core-saved-objects-import-export-server-internal/src/export/sort_objects.test.ts b/...-objects/core-saved-objects-import-export-server-internal/src/export/sort_objects.test.ts
@@ -8,7 +8,7 @@
 
 import { range } from 'lodash';
 import { sortObjects } from './sort_objects';
-import type { SavedObject } from '@kbn/core-saved-objects-common';
+import type { SavedObject } from '@kbn/core-saved-objects-server';
 
 describe('sortObjects()', () => {
   test('should return on empty array', () => {

diff --git a/...saved-objects/core-saved-objects-import-export-server-internal/src/export/sort_objects.ts b/...saved-objects/core-saved-objects-import-export-server-internal/src/export/sort_objects.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObject } from '@kbn/core-saved-objects-common';
+import type { SavedObject } from '@kbn/core-saved-objects-server';
 
 const getId = (object: { type: string; id: string }) => `${object.type}:${object.id}`;
 

diff --git a/...e/saved-objects/core-saved-objects-import-export-server-internal/src/export/utils.test.ts b/...e/saved-objects/core-saved-objects-import-export-server-internal/src/export/utils.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObject } from '@kbn/core-saved-objects-common';
+import type { SavedObject } from '@kbn/core-saved-objects-server';
 import { byIdAscComparator, getPreservedOrderComparator } from './utils';
 
 const createObj = (id: string): SavedObject => ({

diff --git a/...s/core/saved-objects/core-saved-objects-import-export-server-internal/src/export/utils.ts b/...s/core/saved-objects/core-saved-objects-import-export-server-internal/src/export/utils.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObject } from '@kbn/core-saved-objects-common';
+import type { SavedObject } from '@kbn/core-saved-objects-server';
 
 export type SavedObjectComparator = (a: SavedObject, b: SavedObject) => number;
 

diff --git a/.../core-saved-objects-import-export-server-internal/src/import/import_saved_objects.test.ts b/.../core-saved-objects-import-export-server-internal/src/import/import_saved_objects.test.ts
@@ -20,10 +20,10 @@ import {
 import { Readable } from 'stream';
 import { v4 as uuidv4 } from 'uuid';
 import type {
-  SavedObject,
   SavedObjectsImportFailure,
   SavedObjectsImportWarning,
 } from '@kbn/core-saved-objects-common';
+import type { SavedObject } from '@kbn/core-saved-objects-server';
 import type { SavedObjectsClientContract } from '@kbn/core-saved-objects-api-server';
 import type {
   SavedObjectsType,

diff --git a/...s/core-saved-objects-import-export-server-internal/src/import/lib/check_conflicts.test.ts b/...s/core-saved-objects-import-export-server-internal/src/import/lib/check_conflicts.test.ts
@@ -7,11 +7,8 @@
  */
 
 import { savedObjectsClientMock } from '@kbn/core-saved-objects-api-server-mocks';
-import type {
-  SavedObject,
-  SavedObjectReference,
-  SavedObjectsImportRetry,
-} from '@kbn/core-saved-objects-common';
+import type { SavedObjectsImportRetry } from '@kbn/core-saved-objects-common';
+import type { SavedObject, SavedObjectReference } from '@kbn/core-saved-objects-server';
 import type { SavedObjectsClientContract } from '@kbn/core-saved-objects-api-server';
 import { SavedObjectsErrorHelpers } from '@kbn/core-saved-objects-utils-server';
 import { checkConflicts } from './check_conflicts';

diff --git a/...bjects/core-saved-objects-import-export-server-internal/src/import/lib/check_conflicts.ts b/...bjects/core-saved-objects-import-export-server-internal/src/import/lib/check_conflicts.ts
@@ -8,11 +8,11 @@
 
 import { v4 as uuidv4 } from 'uuid';
 import type {
-  SavedObject,
   SavedObjectsImportFailure,
   SavedObjectError,
   SavedObjectsImportRetry,
 } from '@kbn/core-saved-objects-common';
+import type { SavedObject } from '@kbn/core-saved-objects-server';
 import type { SavedObjectsClientContract } from '@kbn/core-saved-objects-api-server';
 import type { ImportStateMap } from './types';
 

diff --git a/...saved-objects-import-export-server-internal/src/import/lib/check_origin_conflicts.test.ts b/...saved-objects-import-export-server-internal/src/import/lib/check_origin_conflicts.test.ts
@@ -9,13 +9,15 @@
 import { mockCreateOriginQuery } from './check_reference_origins.test.mock';
 
 import type {
-  SavedObjectReference,
-  SavedObject,
   SavedObjectsImportFailure,
   SavedObjectsImportRetry,
 } from '@kbn/core-saved-objects-common';
 import type { SavedObjectsClientContract } from '@kbn/core-saved-objects-api-server';
-import type { ISavedObjectTypeRegistry } from '@kbn/core-saved-objects-server';
+import type {
+  ISavedObjectTypeRegistry,
+  SavedObject,
+  SavedObjectReference,
+} from '@kbn/core-saved-objects-server';
 import { typeRegistryMock } from '@kbn/core-saved-objects-base-server-mocks';
 import { savedObjectsClientMock } from '@kbn/core-saved-objects-api-server-mocks';
 import { checkOriginConflicts } from './check_origin_conflicts';

diff --git a/...core-saved-objects-import-export-server-internal/src/import/lib/check_origin_conflicts.ts b/...core-saved-objects-import-export-server-internal/src/import/lib/check_origin_conflicts.ts
@@ -9,12 +9,11 @@
 import pMap from 'p-map';
 import { v4 as uuidv4 } from 'uuid';
 import type {
-  SavedObject,
   SavedObjectsImportFailure,
   SavedObjectsImportRetry,
 } from '@kbn/core-saved-objects-common';
 import type { SavedObjectsClientContract } from '@kbn/core-saved-objects-api-server';
-import type { ISavedObjectTypeRegistry } from '@kbn/core-saved-objects-server';
+import type { ISavedObjectTypeRegistry, SavedObject } from '@kbn/core-saved-objects-server';
 import { getObjectKey } from '@kbn/core-saved-objects-base-server-internal';
 import type { ImportStateMap } from './types';
 import { createOriginQuery } from './utils';

diff --git a/.../core-saved-objects-import-export-server-internal/src/import/lib/collect_saved_objects.ts b/.../core-saved-objects-import-export-server-internal/src/import/lib/collect_saved_objects.ts
@@ -14,7 +14,8 @@ import {
   createPromiseFromStreams,
 } from '@kbn/utils';
 
-import type { SavedObject, SavedObjectsImportFailure } from '@kbn/core-saved-objects-common';
+import type { SavedObjectsImportFailure } from '@kbn/core-saved-objects-common';
+import type { SavedObject } from '@kbn/core-saved-objects-server';
 import { SavedObjectsImportError } from '../errors';
 import { getNonUniqueEntries } from './get_non_unique_entries';
 import { createLimitStream } from './create_limit_stream';

diff --git a/.../core-saved-objects-import-export-server-internal/src/import/lib/create_objects_filter.ts b/.../core-saved-objects-import-export-server-internal/src/import/lib/create_objects_filter.ts
@@ -6,7 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObject, SavedObjectsImportRetry } from '@kbn/core-saved-objects-common';
+import type { SavedObjectsImportRetry } from '@kbn/core-saved-objects-common';
+import type { SavedObject } from '@kbn/core-saved-objects-server';
 
 export function createObjectsFilter(retries: SavedObjectsImportRetry[]) {
   const retryKeys = new Set<string>(retries.map((retry) => `${retry.type}:${retry.id}`));

diff --git a/...e-saved-objects-import-export-server-internal/src/import/lib/create_saved_objects.test.ts b/...e-saved-objects-import-export-server-internal/src/import/lib/create_saved_objects.test.ts
@@ -7,7 +7,8 @@
  */
 
 import { savedObjectsClientMock } from '@kbn/core-saved-objects-api-server-mocks';
-import type { SavedObject, SavedObjectsImportFailure } from '@kbn/core-saved-objects-common';
+import type { SavedObjectsImportFailure } from '@kbn/core-saved-objects-common';
+import type { SavedObject } from '@kbn/core-saved-objects-server';
 import type { SavedObjectsClientContract } from '@kbn/core-saved-objects-api-server';
 import { SavedObjectsErrorHelpers } from '@kbn/core-saved-objects-utils-server';
 import { createSavedObjects } from './create_saved_objects';