github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Saved Objects] Import SO types from server rather than common to avoid deprecation (#149289)

Browse source 
## Summary

After merging https://github.com/elastic/kibana/pull/148979 there are a
number of imports that can be fixed immediately to address our new
deprecation notice.

## To Core reviewers

The package `core-saved-objects-server` is using types from
`core-saved-objects-api-server` which creates a circular dependency when
using `SavedObject` type from it's new home in
`core-saved-object-server`:

`core-saved-objects-server` -> `core-saved-objects-api-server` ->
`core-saved-objects-server`

One solution is that we can create a new package
`packages/core/saved-objects/core-saved-objects-server-shared` that will
only hold the `SavedObject` type and a select few others. I'm not sure
what the best approach here is. I have left
`core-saved-objects-api-server` unchanged for now (i.e., it is still
importing `SavedObject` from `common` which is deprecated).

Any input would be greatly appreciated!

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Jean-Louis Leysens 2023-01-25 13:38:05 +01:00 • committed by GitHub
parent a04a03b438
commit 631675ba39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
81 changed files with 98 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/collect_multi_namespace_references.ts
View file

@ -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,

2
packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/internal_bulk_resolve.test.ts
View file

@ -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,

2
packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/internal_bulk_resolve.ts
View file

@ -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,

2
packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/internal_utils.ts
View file

@ -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,

2
packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/repository.security_extension.test.ts
View file

@ -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,

2
packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/repository.spaces_extension.test.ts
View file

@ -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,

2
packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/repository.test.ts
View file

@ -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,

2
packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/repository.ts
View file

@ -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,

2
packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/update_objects_spaces.ts
View file

@ -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,

2
packages/core/saved-objects/core-saved-objects-api-server-internal/src/saved_objects_client.ts
View file

@ -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,

2
packages/core/saved-objects/core-saved-objects-api-server-internal/src/test_helpers/repository.test.common.ts
View file

@ -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,

6
packages/core/saved-objects/core-saved-objects-api-server/src/apis/create.ts
View file

@ -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';
/**

2
packages/core/saved-objects/core-saved-objects-api-server/tsconfig.json
View file

@ -11,7 +11,7 @@
"**/*.ts"
],
"kbn_references": [
"@kbn/core-saved-objects-common"
"@kbn/core-saved-objects-common",
],
"exclude": [
"target/**/*",

10
packages/core/saved-objects/core-saved-objects-common/src/saved_objects.ts
View file

@ -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>;

2
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/export/apply_export_transforms.test.ts
View file

@ -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';

3
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/export/collect_exported_objects.test.ts
View file

@ -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,

2
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/export/collect_exported_objects.ts
View file

@ -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,

2
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/export/errors.ts
View file

@ -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

2
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/export/saved_objects_exporter.test.ts
View file

@ -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';

2
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/export/saved_objects_exporter.ts
View file

@ -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,

2
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/export/sort_objects.test.ts
View file

@ -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', () => {

2
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/export/sort_objects.ts
View file

@ -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}`;

2
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/export/utils.test.ts
View file

@ -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 => ({

2
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/export/utils.ts
View file

@ -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;

2
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/import_saved_objects.test.ts
View file

@ -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,

7
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/check_conflicts.test.ts
View file

@ -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';

2
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/check_conflicts.ts
View file

@ -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';

8
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/check_origin_conflicts.test.ts
View file

@ -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';

3
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/check_origin_conflicts.ts
View file

@ -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';

3
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/collect_saved_objects.ts
View file

@ -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';

3
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/create_objects_filter.ts
View file

@ -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}`));

3
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/create_saved_objects.test.ts
View file

@ -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';

3
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/create_saved_objects.ts
View file

@ -6,7 +6,8 @@
* Side Public License, v 1.
*/
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 type { CreatedObject } from '@kbn/core-saved-objects-server';
import { extractErrors } from './extract_errors';

3
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/execute_import_hooks.test.ts
View file

@ -6,7 +6,8 @@
* Side Public License, v 1.
*/
import type { SavedObject, SavedObjectsImportWarning } from '@kbn/core-saved-objects-common';
import type { SavedObjectsImportWarning } from '@kbn/core-saved-objects-common';
import type { SavedObject } from '@kbn/core-saved-objects-server';
import type { SavedObjectsImportHookResult } from '@kbn/core-saved-objects-server';
import { executeImportHooks } from './execute_import_hooks';

3
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/execute_import_hooks.ts
View file

@ -6,7 +6,8 @@
* Side Public License, v 1.
*/
import type { SavedObject, SavedObjectsImportWarning } from '@kbn/core-saved-objects-common';
import type { SavedObjectsImportWarning } from '@kbn/core-saved-objects-common';
import type { SavedObject } from '@kbn/core-saved-objects-server';
import type { SavedObjectsImportHook } from '@kbn/core-saved-objects-server';
export interface ExecuteImportHooksOptions {

3
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/extract_errors.test.ts
View file

@ -6,8 +6,7 @@
* Side Public License, v 1.
*/
import type { SavedObject } from '@kbn/core-saved-objects-common';
import type { CreatedObject } from '@kbn/core-saved-objects-server';
import type { SavedObject, CreatedObject } from '@kbn/core-saved-objects-server';
import { SavedObjectsErrorHelpers } from '@kbn/core-saved-objects-utils-server';
import { extractErrors } from './extract_errors';

3
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/extract_errors.ts
View file

@ -6,7 +6,8 @@
* Side Public License, v 1.
*/
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 { CreatedObject } from '@kbn/core-saved-objects-server';
export function extractErrors(

3
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/get_import_state_map_for_retries.test.ts
View file

@ -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';
import { getImportStateMapForRetries } from './get_import_state_map_for_retries';
describe('#getImportStateMapForRetries', () => {

3
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/get_import_state_map_for_retries.ts
View file

@ -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';
import type { ImportStateMap } from './types';
interface GetImportStateMapForRetriesParams {

2
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/regenerate_ids.test.ts
View file

@ -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 { regenerateIds } from './regenerate_ids';
jest.mock('uuid', () => ({

3
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/split_overwrites.ts
View file

@ -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 splitOverwrites<T>(
savedObjects: Array<SavedObject<T>>,

2
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/validate_references.ts
View file

@ -7,10 +7,10 @@
*/
import type {
SavedObject,
SavedObjectsImportFailure,
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 { SavedObjectsImportError } from '../errors';
import type { ImportStateMap } from './types';

3
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/resolve_import_errors.test.ts
View file

@ -24,12 +24,11 @@ import {
import { Readable } from 'stream';
import { v4 as uuidv4 } from 'uuid';
import type {
SavedObject,
SavedObjectsImportFailure,
SavedObjectsImportRetry,
SavedObjectReference,
SavedObjectsImportWarning,
} 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 type {
SavedObjectsType,

2
packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/resolve_import_errors.ts
View file

@ -8,12 +8,12 @@
import { Readable } from 'stream';
import type {
SavedObject,
SavedObjectsImportRetry,
SavedObjectsImportFailure,
SavedObjectsImportResponse,
SavedObjectsImportSuccess,
} from '@kbn/core-saved-objects-common';
import { SavedObject } from '@kbn/core-saved-objects-server';
import type { SavedObjectsClientContract } from '@kbn/core-saved-objects-api-server';
import type {
ISavedObjectTypeRegistry,

2
packages/core/saved-objects/core-saved-objects-server-internal/src/routes/legacy_import_export/import.ts
View file

@ -8,7 +8,7 @@
import { schema } from '@kbn/config-schema';
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 { InternalCoreUsageDataSetup } from '@kbn/core-usage-data-base-server-internal';
import type { InternalSavedObjectRouter } from '../../internal_types';
import { importDashboards } from './lib';

2
packages/core/saved-objects/core-saved-objects-server-internal/src/routes/legacy_import_export/lib/collect_references_deep.test.ts
View file

@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
import type { SavedObject, SavedObjectAttributes } from '@kbn/core-saved-objects-common';
import type { SavedObject, SavedObjectAttributes } from '@kbn/core-saved-objects-server';
import { savedObjectsClientMock } from '@kbn/core-saved-objects-api-server-mocks';
import { collectReferencesDeep } from './collect_references_deep';

2
packages/core/saved-objects/core-saved-objects-server-internal/src/routes/legacy_import_export/lib/collect_references_deep.ts
View file

@ -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 } from '@kbn/core-saved-objects-api-server';
const MAX_BULK_GET_SIZE = 10000;

2
packages/core/saved-objects/core-saved-objects-server-internal/src/routes/legacy_import_export/lib/import_dashboards.test.ts
View file

@ -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 { savedObjectsClientMock } from '@kbn/core-saved-objects-api-server-mocks';
import { importDashboards } from './import_dashboards';

2
packages/core/saved-objects/core-saved-objects-server-internal/src/routes/legacy_import_export/lib/import_dashboards.ts
View file

@ -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 } from '@kbn/core-saved-objects-api-server';
export async function importDashboards(

2
packages/core/saved-objects/core-saved-objects-server-internal/src/routes/utils.ts
View file

@ -17,8 +17,8 @@ import {
} from '@kbn/utils';
import Boom from '@hapi/boom';
import type { RequestHandlerWrapper } from '@kbn/core-http-server';
import type { SavedObject } from '@kbn/core-saved-objects-common';
import type {
SavedObject,
ISavedObjectTypeRegistry,
SavedObjectsExportResultDetails,
} from '@kbn/core-saved-objects-server';

1
packages/core/saved-objects/core-saved-objects-server-internal/tsconfig.json
View file

@ -18,7 +18,6 @@
"@kbn/core-http-server",
"@kbn/core-http-server-internal",
"@kbn/core-elasticsearch-server",
"@kbn/core-saved-objects-common",
"@kbn/core-saved-objects-server",
"@kbn/core-saved-objects-api-server",
"@kbn/core-saved-objects-api-server-internal",

3
packages/core/saved-objects/core-saved-objects-server/src/export.ts
View file

@ -8,8 +8,9 @@
import type { Readable } from 'stream';
import type { KibanaRequest } from '@kbn/core-http-server';
import type { SavedObject, SavedObjectTypeIdTuple } from '@kbn/core-saved-objects-common';
import type { SavedObjectTypeIdTuple } from '@kbn/core-saved-objects-common';
import type { SavedObjectsFindOptionsReference } from '@kbn/core-saved-objects-api-server';
import type { SavedObject } from '..';
/**
* Utility class used to export savedObjects.

2
packages/core/saved-objects/core-saved-objects-server/src/extensions/encryption.ts
View file

@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
import type { SavedObject } from '@kbn/core-saved-objects-common';
import type { SavedObject } from '../..';
/**
* The EncryptedObjectDescriptor interface contains settings for describing

2
packages/core/saved-objects/core-saved-objects-server/src/extensions/security.ts
View file

@ -6,8 +6,8 @@
* Side Public License, v 1.
*/
import type { SavedObject } from '@kbn/core-saved-objects-common';
import type { EcsEventOutcome } from '@kbn/ecs';
import type { SavedObject } from '../..';
/**
* The PerformAuthorizationParams interface contains settings for checking

2
packages/core/saved-objects/core-saved-objects-server/src/import.ts
View file

@ -8,11 +8,11 @@
import { Readable } from 'stream';
import {
SavedObject,
SavedObjectsImportRetry,
SavedObjectsImportWarning,
SavedObjectsImportResponse,
} from '@kbn/core-saved-objects-common';
import type { SavedObject } from '..';
/**
* Utility class used to import savedObjects.

2
packages/core/saved-objects/core-saved-objects-server/src/saved_objects_management.ts
View file

@ -6,9 +6,9 @@
* Side Public License, v 1.
*/
import type { SavedObject } from '@kbn/core-saved-objects-common';
import type { SavedObjectsExportTransform } from './export';
import type { SavedObjectsImportHook } from './import';
import type { SavedObject } from '..';
/**
* Configuration options for the {@link SavedObjectsType | type}'s management section.

6
packages/core/saved-objects/core-saved-objects-server/src/serialization.ts
View file

@ -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 '..';
/**
* A serializer that can be used to manually convert {@link SavedObjectsRawDoc | raw} or

2
src/core/server/integration_tests/saved_objects/service/lib/repository_with_proxy.test.ts
View file

@ -9,7 +9,7 @@
import Hapi from '@hapi/hapi';
import h2o2 from '@hapi/h2o2';
import { URL } from 'url';
import type { SavedObject } from '@kbn/core-saved-objects-common';
import type { SavedObject } from '@kbn/core-saved-objects-server';
import type { ISavedObjectsRepository } from '@kbn/core-saved-objects-api-server';
import type { InternalCoreSetup, InternalCoreStart } from '@kbn/core-lifecycle-server-internal';
import { Root } from '@kbn/core-root-server-internal';

2
x-pack/plugins/alerting/server/rules_client/tests/bulk_disable.test.ts
View file

@ -8,7 +8,7 @@
import { RulesClient, ConstructorOptions } from '../rules_client';
import { savedObjectsClientMock } from '@kbn/core/server/mocks';
import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
import type { SavedObject } from '@kbn/core-saved-objects-common';
import type { SavedObject } from '@kbn/core-saved-objects-server';
import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';

2
x-pack/plugins/alerting/server/rules_client/tests/test_helpers.ts
View file

@ -5,7 +5,7 @@
* 2.0.
*/
import type { SavedObject } from '@kbn/core-saved-objects-common';
import type { SavedObject } from '@kbn/core-saved-objects-server';
export const savedObjectWith500Error = {
id: 'id2',

2
x-pack/plugins/alerting/server/saved_objects/migrations/7.11/index.ts
View file

@ -5,7 +5,7 @@
* 2.0.
*/
import { SavedObjectAttributes } from '@kbn/core-saved-objects-common';
import { SavedObjectAttributes } from '@kbn/core-saved-objects-server';
import { SavedObjectUnsanitizedDoc } from '@kbn/core-saved-objects-server';
import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
import { RawRule, RawRuleAction } from '../../../types';

2
x-pack/plugins/alerting/server/saved_objects/migrations/7.13/index.ts
View file

@ -5,7 +5,7 @@
* 2.0.
*/
import { SavedObjectAttribute } from '@kbn/core-saved-objects-common';
import { SavedObjectAttribute } from '@kbn/core-saved-objects-server';
import { SavedObjectUnsanitizedDoc } from '@kbn/core-saved-objects-server';
import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
import { RawRule } from '../../../types';

2
x-pack/plugins/alerting/server/saved_objects/migrations/7.15/index.ts
View file

@ -9,7 +9,7 @@ import {
SavedObjectAttribute,
SavedObjectAttributes,
SavedObjectReference,
} from '@kbn/core-saved-objects-common';
} from '@kbn/core-saved-objects-server';
import { SavedObjectUnsanitizedDoc } from '@kbn/core-saved-objects-server';
import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
import { isString } from 'lodash/fp';

2
x-pack/plugins/alerting/server/saved_objects/migrations/7.16/index.ts
View file

@ -5,7 +5,7 @@
* 2.0.
*/
import { SavedObjectAttribute, SavedObjectReference } from '@kbn/core-saved-objects-common';
import { SavedObjectAttribute, SavedObjectReference } from '@kbn/core-saved-objects-server';
import { SavedObjectUnsanitizedDoc } from '@kbn/core-saved-objects-server';
import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
import { isString } from 'lodash/fp';

1
x-pack/plugins/alerting/tsconfig.json
View file

@ -34,7 +34,6 @@
"@kbn/rule-data-utils",
"@kbn/logging-mocks",
"@kbn/core-logging-server-mocks",
"@kbn/core-saved-objects-common",
"@kbn/securitysolution-rules",
"@kbn/apm-utils",
"@kbn/data-views-plugin",

2
x-pack/plugins/cases/server/authorization/authorization.ts
View file

@ -5,7 +5,7 @@
* 2.0.
*/
import type { SavedObject } from '@kbn/core-saved-objects-common';
import type { SavedObject } from '@kbn/core-saved-objects-server';
import type { KibanaRequest, Logger } from '@kbn/core/server';
import Boom from '@hapi/boom';
import type { SecurityPluginStart } from '@kbn/security-plugin/server';

2
x-pack/plugins/cases/server/authorization/utils.ts
View file

@ -8,7 +8,7 @@
import { partition, remove, uniq } from 'lodash';
import type { KueryNode } from '@kbn/es-query';
import { nodeBuilder } from '@kbn/es-query';
import type { SavedObject } from '@kbn/core-saved-objects-common';
import type { SavedObject } from '@kbn/core-saved-objects-server';
import { OWNER_FIELD } from '../../common/api';
export const getOwnersFilter = (

2
x-pack/plugins/cases/server/common/types.ts
View file

@ -5,7 +5,7 @@
* 2.0.
*/
import type { SavedObject } from '@kbn/core-saved-objects-common';
import type { SavedObject } from '@kbn/core-saved-objects-server';
import type { KueryNode } from '@kbn/es-query';
import type { CaseAttributes, SavedObjectFindOptions } from '../../common/api';

2
x-pack/plugins/encrypted_saved_objects/server/saved_objects/saved_objects_encryption_extension.ts
View file

@ -5,11 +5,11 @@
* 2.0.
*/
import type { SavedObject } from '@kbn/core-saved-objects-common';
import type {
EncryptedObjectDescriptor,
ISavedObjectsEncryptionExtension,
ISavedObjectTypeRegistry,
SavedObject,
} from '@kbn/core-saved-objects-server';
import type { AuthenticatedUser } from '@kbn/security-plugin/common';

1
x-pack/plugins/encrypted_saved_objects/tsconfig.json
View file

@ -10,7 +10,6 @@
"@kbn/core",
"@kbn/utility-types",
"@kbn/core-saved-objects-server",
"@kbn/core-saved-objects-common",
],
"exclude": [
"target/**/*",

2
x-pack/plugins/fleet/server/services/agents/action.mock.ts
View file

@ -7,7 +7,7 @@
import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
import type { SavedObject } from '@kbn/core-saved-objects-common';
import type { SavedObject } from '@kbn/core-saved-objects-server';
import type { AgentPolicy } from '../../types';

2
x-pack/plugins/lens/server/embeddable/make_lens_embeddable_factory.ts
View file

@ -7,7 +7,7 @@
import { EmbeddableRegistryDefinition } from '@kbn/embeddable-plugin/server';
import type { SerializableRecord } from '@kbn/utility-types';
import type { SavedObject } from '@kbn/core-saved-objects-common';
import type { SavedObject } from '@kbn/core-saved-objects-server';
import {
mergeMigrationFunctionMaps,
MigrateFunctionsObject,

1
x-pack/plugins/lens/tsconfig.json
View file

@ -62,6 +62,7 @@
"@kbn/language-documentation-popover",
"@kbn/core-saved-objects-common",
"@kbn/core-ui-settings-browser",
"@kbn/core-saved-objects-server",
],
"exclude": [
"target/**/*",

2
x-pack/plugins/observability/server/services/slo/fixtures/slo.ts
View file

@ -7,7 +7,7 @@
import { cloneDeep } from 'lodash';
import { v1 as uuidv1 } from 'uuid';
import { SavedObject } from '@kbn/core-saved-objects-common';
import { SavedObject } from '@kbn/core-saved-objects-server';
import { sloSchema, CreateSLOParams } from '@kbn/slo-schema';
import { SO_SLO_TYPE } from '../../../saved_objects';

1
x-pack/plugins/observability/tsconfig.json
View file

@ -63,7 +63,6 @@
"@kbn/logging",
"@kbn/core-saved-objects-api-server",
"@kbn/core-saved-objects-utils-server",
"@kbn/core-saved-objects-common",
"@kbn/share-plugin",
"@kbn/core-notifications-browser",
"@kbn/slo-schema",

2
x-pack/plugins/security/server/saved_objects/saved_objects_security_extension.ts
View file

@ -6,7 +6,6 @@
*/
import type { SavedObjectsClient } from '@kbn/core-saved-objects-api-server-internal';
import type { SavedObject } from '@kbn/core-saved-objects-common';
import type {
AddAuditEventParams,
AuthorizationTypeEntry,
@ -17,6 +16,7 @@ import type {
ISavedObjectsSecurityExtension,
PerformAuthorizationParams,
RedactNamespacesParams,
SavedObject,
} from '@kbn/core-saved-objects-server';
import { ALL_SPACES_ID, UNKNOWN_SPACE } from '../../common/constants';

1
x-pack/plugins/security/tsconfig.json
View file

@ -45,7 +45,6 @@
"@kbn/es-errors",
"@kbn/logging",
"@kbn/core-saved-objects-api-server-internal",
"@kbn/core-saved-objects-common",
"@kbn/core-saved-objects-api-server-mocks",
"@kbn/logging-mocks",
"@kbn/web-worker-stub",

2
x-pack/plugins/synthetics/server/routes/monitor_cruds/bulk_cruds/delete_monitor_bulk.ts
View file

@ -5,7 +5,7 @@
* 2.0.
*/
import { SavedObjectsClientContract, KibanaRequest } from '@kbn/core/server';
import { SavedObject } from '@kbn/core-saved-objects-common';
import { SavedObject } from '@kbn/core-saved-objects-server';
import {
formatTelemetryDeleteEvent,
sendTelemetryEvents,

1
x-pack/plugins/synthetics/tsconfig.json
View file

@ -70,6 +70,7 @@
"@kbn/actions-plugin",
"@kbn/core-elasticsearch-server",
"@kbn/core-saved-objects-api-server-mocks",
"@kbn/core-saved-objects-server",
],
"exclude": [
"target/**/*",

2
x-pack/test/api_integration/apis/synthetics/sync_global_params.ts
View file

@ -15,7 +15,7 @@ import { secretKeys } from '@kbn/synthetics-plugin/common/constants/monitor_mana
import { PackagePolicy } from '@kbn/fleet-plugin/common';
import expect from '@kbn/expect';
import { syntheticsParamType } from '@kbn/synthetics-plugin/common/types/saved_objects';
import { SavedObject } from '@kbn/core-saved-objects-common';
import { SavedObject } from '@kbn/core-saved-objects-server';
import { FtrProviderContext } from '../../ftr_provider_context';
import { getFixtureJson } from '../uptime/rest/helper/get_fixture_json';
import { PrivateLocationTestService } from './services/private_location_test_service';

1
x-pack/test/tsconfig.json
View file

@ -105,7 +105,6 @@
"@kbn/controls-plugin",
"@kbn/core-saved-objects-server",
"@kbn/core-provider-plugin",
"@kbn/core-saved-objects-common",
"@kbn/user-profile-components",
"@kbn/apm-synthtrace-client",
"@kbn/utils",