From a657fdb05c7be770c85e1827da73e0fcb065ef97 Mon Sep 17 00:00:00 2001 From: pgayvallet Date: Wed, 31 Aug 2022 09:49:47 +0200 Subject: [PATCH 1/8] Move files to packages --- package.json | 4 + packages/BUILD.bazel | 4 + .../BUILD.bazel | 125 ++++++++++++++++++ .../README.md | 3 + .../index.ts | 10 ++ .../jest.config.js | 13 ++ .../package.json | 7 + .../src}/deprecation_config.ts | 0 .../src}/deprecations_factory.test.ts | 0 .../src}/deprecations_factory.ts | 0 .../src}/deprecations_registry.test.ts | 0 .../src}/deprecations_registry.ts | 0 .../deprecations_route_handler_context.ts | 14 +- .../src}/deprecations_service.test.mocks.ts | 2 +- .../src}/deprecations_service.test.ts | 9 +- .../src}/deprecations_service.ts | 11 +- .../src}/index.ts | 8 -- .../src}/internal_types.ts | 2 +- .../src/mocks}/deprecations_factory.mock.ts | 3 +- .../src/mocks}/deprecations_registry.mock.ts | 2 +- .../src/mocks/index.ts | 10 ++ .../src}/routes/get.ts | 0 .../src}/routes/index.ts | 0 .../tsconfig.json | 17 +++ .../BUILD.bazel | 106 +++++++++++++++ .../core-deprecations-server-mocks/README.md | 3 + .../core-deprecations-server-mocks/index.ts | 9 ++ .../jest.config.js | 13 ++ .../package.json | 7 + .../src}/deprecations_service.mock.ts | 7 +- .../src/index.ts | 9 ++ .../tsconfig.json | 17 +++ .../core-deprecations-server/index.ts | 2 + .../core-deprecations-server/src/index.ts | 4 + .../src/request_handler_context.ts | 26 ++++ yarn.lock | 16 +++ 36 files changed, 424 insertions(+), 39 deletions(-) create mode 100644 packages/core/deprecations/core-deprecations-server-internal/BUILD.bazel create mode 100644 packages/core/deprecations/core-deprecations-server-internal/README.md create mode 100644 packages/core/deprecations/core-deprecations-server-internal/index.ts create mode 100644 packages/core/deprecations/core-deprecations-server-internal/jest.config.js create mode 100644 packages/core/deprecations/core-deprecations-server-internal/package.json rename {src/core/server/deprecations => packages/core/deprecations/core-deprecations-server-internal/src}/deprecation_config.ts (100%) rename {src/core/server/deprecations => packages/core/deprecations/core-deprecations-server-internal/src}/deprecations_factory.test.ts (100%) rename {src/core/server/deprecations => packages/core/deprecations/core-deprecations-server-internal/src}/deprecations_factory.ts (100%) rename {src/core/server/deprecations => packages/core/deprecations/core-deprecations-server-internal/src}/deprecations_registry.test.ts (100%) rename {src/core/server/deprecations => packages/core/deprecations/core-deprecations-server-internal/src}/deprecations_registry.ts (100%) rename {src/core/server/deprecations => packages/core/deprecations/core-deprecations-server-internal/src}/deprecations_route_handler_context.ts (83%) rename {src/core/server/deprecations => packages/core/deprecations/core-deprecations-server-internal/src}/deprecations_service.test.mocks.ts (90%) rename {src/core/server/deprecations => packages/core/deprecations/core-deprecations-server-internal/src}/deprecations_service.test.ts (95%) rename {src/core/server/deprecations => packages/core/deprecations/core-deprecations-server-internal/src}/deprecations_service.ts (94%) rename {src/core/server/deprecations => packages/core/deprecations/core-deprecations-server-internal/src}/index.ts (72%) rename {src/core/server/deprecations => packages/core/deprecations/core-deprecations-server-internal/src}/internal_types.ts (90%) rename {src/core/server/deprecations => packages/core/deprecations/core-deprecations-server-internal/src/mocks}/deprecations_factory.mock.ts (93%) rename {src/core/server/deprecations => packages/core/deprecations/core-deprecations-server-internal/src/mocks}/deprecations_registry.mock.ts (95%) create mode 100644 packages/core/deprecations/core-deprecations-server-internal/src/mocks/index.ts rename {src/core/server/deprecations => packages/core/deprecations/core-deprecations-server-internal/src}/routes/get.ts (100%) rename {src/core/server/deprecations => packages/core/deprecations/core-deprecations-server-internal/src}/routes/index.ts (100%) create mode 100644 packages/core/deprecations/core-deprecations-server-internal/tsconfig.json create mode 100644 packages/core/deprecations/core-deprecations-server-mocks/BUILD.bazel create mode 100644 packages/core/deprecations/core-deprecations-server-mocks/README.md create mode 100644 packages/core/deprecations/core-deprecations-server-mocks/index.ts create mode 100644 packages/core/deprecations/core-deprecations-server-mocks/jest.config.js create mode 100644 packages/core/deprecations/core-deprecations-server-mocks/package.json rename {src/core/server/deprecations => packages/core/deprecations/core-deprecations-server-mocks/src}/deprecations_service.mock.ts (92%) create mode 100644 packages/core/deprecations/core-deprecations-server-mocks/src/index.ts create mode 100644 packages/core/deprecations/core-deprecations-server-mocks/tsconfig.json create mode 100644 packages/core/deprecations/core-deprecations-server/src/request_handler_context.ts diff --git a/package.json b/package.json index e267daf24541b..ea5749c3ab202 100644 --- a/package.json +++ b/package.json @@ -176,6 +176,8 @@ "@kbn/core-deprecations-browser-mocks": "link:bazel-bin/packages/core/deprecations/core-deprecations-browser-mocks", "@kbn/core-deprecations-common": "link:bazel-bin/packages/core/deprecations/core-deprecations-common", "@kbn/core-deprecations-server": "link:bazel-bin/packages/core/deprecations/core-deprecations-server", + "@kbn/core-deprecations-server-internal": "link:bazel-bin/packages/core/deprecations/core-deprecations-server-internal", + "@kbn/core-deprecations-server-mocks": "link:bazel-bin/packages/core/deprecations/core-deprecations-server-mocks", "@kbn/core-doc-links-browser": "link:bazel-bin/packages/core/doc-links/core-doc-links-browser", "@kbn/core-doc-links-browser-internal": "link:bazel-bin/packages/core/doc-links/core-doc-links-browser-internal", "@kbn/core-doc-links-browser-mocks": "link:bazel-bin/packages/core/doc-links/core-doc-links-browser-mocks", @@ -851,6 +853,8 @@ "@types/kbn__core-deprecations-browser-mocks": "link:bazel-bin/packages/core/deprecations/core-deprecations-browser-mocks/npm_module_types", "@types/kbn__core-deprecations-common": "link:bazel-bin/packages/core/deprecations/core-deprecations-common/npm_module_types", "@types/kbn__core-deprecations-server": "link:bazel-bin/packages/core/deprecations/core-deprecations-server/npm_module_types", + "@types/kbn__core-deprecations-server-internal": "link:bazel-bin/packages/core/deprecations/core-deprecations-server-internal/npm_module_types", + "@types/kbn__core-deprecations-server-mocks": "link:bazel-bin/packages/core/deprecations/core-deprecations-server-mocks/npm_module_types", "@types/kbn__core-doc-links-browser": "link:bazel-bin/packages/core/doc-links/core-doc-links-browser/npm_module_types", "@types/kbn__core-doc-links-browser-internal": "link:bazel-bin/packages/core/doc-links/core-doc-links-browser-internal/npm_module_types", "@types/kbn__core-doc-links-browser-mocks": "link:bazel-bin/packages/core/doc-links/core-doc-links-browser-mocks/npm_module_types", diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel index 1ca4722d80123..74fb75b384224 100644 --- a/packages/BUILD.bazel +++ b/packages/BUILD.bazel @@ -42,6 +42,8 @@ filegroup( "//packages/core/deprecations/core-deprecations-browser-mocks:build", "//packages/core/deprecations/core-deprecations-common:build", "//packages/core/deprecations/core-deprecations-server:build", + "//packages/core/deprecations/core-deprecations-server-internal:build", + "//packages/core/deprecations/core-deprecations-server-mocks:build", "//packages/core/doc-links/core-doc-links-browser:build", "//packages/core/doc-links/core-doc-links-browser-internal:build", "//packages/core/doc-links/core-doc-links-browser-mocks:build", @@ -335,6 +337,8 @@ filegroup( "//packages/core/deprecations/core-deprecations-browser-mocks:build_types", "//packages/core/deprecations/core-deprecations-common:build_types", "//packages/core/deprecations/core-deprecations-server:build_types", + "//packages/core/deprecations/core-deprecations-server-internal:build_types", + "//packages/core/deprecations/core-deprecations-server-mocks:build_types", "//packages/core/doc-links/core-doc-links-browser:build_types", "//packages/core/doc-links/core-doc-links-browser-internal:build_types", "//packages/core/doc-links/core-doc-links-browser-mocks:build_types", diff --git a/packages/core/deprecations/core-deprecations-server-internal/BUILD.bazel b/packages/core/deprecations/core-deprecations-server-internal/BUILD.bazel new file mode 100644 index 0000000000000..fc13f6b731d67 --- /dev/null +++ b/packages/core/deprecations/core-deprecations-server-internal/BUILD.bazel @@ -0,0 +1,125 @@ +load("@npm//@bazel/typescript:index.bzl", "ts_config") +load("@build_bazel_rules_nodejs//:index.bzl", "js_library") +load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project") + +PKG_DIRNAME = "core-deprecations-server-internal" +PKG_REQUIRE_NAME = "@kbn/core-deprecations-server-internal" + +SOURCE_FILES = glob( + [ + "**/*.ts", + ], + exclude = [ + "**/*.config.js", + "**/*.mock.*", + "**/*.test.*", + "**/*.stories.*", + "**/__snapshots__/**", + "**/integration_tests/**", + "**/mocks/**", + "**/scripts/**", + "**/storybook/**", + "**/test_fixtures/**", + "**/test_helpers/**", + ], +) + +SRCS = SOURCE_FILES + +filegroup( + name = "srcs", + srcs = SRCS, +) + +NPM_MODULE_EXTRA_FILES = [ + "package.json", +] + +RUNTIME_DEPS = [ + "@npm//rxjs", + "//packages/kbn-i18n", + "//packages/kbn-std", + ### test dependencies + "//packages/kbn-logging-mocks", +] + +TYPES_DEPS = [ + "@npm//@types/node", + "@npm//@types/jest", + "@npm//rxjs", + "//packages/kbn-config-schema:npm_module_types", + "//packages/kbn-utility-types:npm_module_types", + "//packages/kbn-std:npm_module_types", + "//packages/kbn-i18n:npm_module_types", + "//packages/kbn-logging:npm_module_types", + "//packages/kbn-config:npm_module_types", + "//packages/core/base/core-base-server-internal:npm_module_types", + "//packages/core/http/core-http-server-internal:npm_module_types", + "//packages/core/elasticsearch/core-elasticsearch-server:npm_module_types", + "//packages/core/elasticsearch/core-elasticsearch-server-internal:npm_module_types", + "//packages/core/saved-objects/core-saved-objects-api-server:npm_module_types", + "//packages/core/saved-objects/core-saved-objects-server-internal:npm_module_types", + "//packages/core/deprecations/core-deprecations-common:npm_module_types", + "//packages/core/deprecations/core-deprecations-server:npm_module_types", +] + +jsts_transpiler( + name = "target_node", + srcs = SRCS, + build_pkg_name = package_name(), +) + +ts_config( + name = "tsconfig", + src = "tsconfig.json", + deps = [ + "//:tsconfig.base.json", + "//:tsconfig.bazel.json", + ], +) + +ts_project( + name = "tsc_types", + args = ['--pretty'], + srcs = SRCS, + deps = TYPES_DEPS, + declaration = True, + declaration_map = True, + emit_declaration_only = True, + out_dir = "target_types", + tsconfig = ":tsconfig", +) + +js_library( + name = PKG_DIRNAME, + srcs = NPM_MODULE_EXTRA_FILES, + deps = RUNTIME_DEPS + [":target_node"], + package_name = PKG_REQUIRE_NAME, + visibility = ["//visibility:public"], +) + +pkg_npm( + name = "npm_module", + deps = [":" + PKG_DIRNAME], +) + +filegroup( + name = "build", + srcs = [":npm_module"], + visibility = ["//visibility:public"], +) + +pkg_npm_types( + name = "npm_module_types", + srcs = SRCS, + deps = [":tsc_types"], + package_name = PKG_REQUIRE_NAME, + tsconfig = ":tsconfig", + visibility = ["//visibility:public"], +) + +filegroup( + name = "build_types", + srcs = [":npm_module_types"], + visibility = ["//visibility:public"], +) diff --git a/packages/core/deprecations/core-deprecations-server-internal/README.md b/packages/core/deprecations/core-deprecations-server-internal/README.md new file mode 100644 index 0000000000000..127b95a62c998 --- /dev/null +++ b/packages/core/deprecations/core-deprecations-server-internal/README.md @@ -0,0 +1,3 @@ +# @kbn/core-deprecations-server-internal + +Empty package generated by @kbn/generate diff --git a/packages/core/deprecations/core-deprecations-server-internal/index.ts b/packages/core/deprecations/core-deprecations-server-internal/index.ts new file mode 100644 index 0000000000000..90680c8eb9797 --- /dev/null +++ b/packages/core/deprecations/core-deprecations-server-internal/index.ts @@ -0,0 +1,10 @@ +/* + * 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. + */ + +export { DeprecationsService, config, CoreDeprecationsRouteHandlerContext } from './src'; +export type { InternalDeprecationsServiceSetup, InternalDeprecationsServiceStart } from './src'; diff --git a/packages/core/deprecations/core-deprecations-server-internal/jest.config.js b/packages/core/deprecations/core-deprecations-server-internal/jest.config.js new file mode 100644 index 0000000000000..9bbfd494f7909 --- /dev/null +++ b/packages/core/deprecations/core-deprecations-server-internal/jest.config.js @@ -0,0 +1,13 @@ +/* + * 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. + */ + +module.exports = { + preset: '@kbn/test/jest_node', + rootDir: '../../../..', + roots: ['/packages/core/deprecations/core-deprecations-server-internal'], +}; diff --git a/packages/core/deprecations/core-deprecations-server-internal/package.json b/packages/core/deprecations/core-deprecations-server-internal/package.json new file mode 100644 index 0000000000000..bbbad23b396f7 --- /dev/null +++ b/packages/core/deprecations/core-deprecations-server-internal/package.json @@ -0,0 +1,7 @@ +{ + "name": "@kbn/core-deprecations-server-internal", + "private": true, + "version": "1.0.0", + "main": "./target_node/index.js", + "license": "SSPL-1.0 OR Elastic License 2.0" +} diff --git a/src/core/server/deprecations/deprecation_config.ts b/packages/core/deprecations/core-deprecations-server-internal/src/deprecation_config.ts similarity index 100% rename from src/core/server/deprecations/deprecation_config.ts rename to packages/core/deprecations/core-deprecations-server-internal/src/deprecation_config.ts diff --git a/src/core/server/deprecations/deprecations_factory.test.ts b/packages/core/deprecations/core-deprecations-server-internal/src/deprecations_factory.test.ts similarity index 100% rename from src/core/server/deprecations/deprecations_factory.test.ts rename to packages/core/deprecations/core-deprecations-server-internal/src/deprecations_factory.test.ts diff --git a/src/core/server/deprecations/deprecations_factory.ts b/packages/core/deprecations/core-deprecations-server-internal/src/deprecations_factory.ts similarity index 100% rename from src/core/server/deprecations/deprecations_factory.ts rename to packages/core/deprecations/core-deprecations-server-internal/src/deprecations_factory.ts diff --git a/src/core/server/deprecations/deprecations_registry.test.ts b/packages/core/deprecations/core-deprecations-server-internal/src/deprecations_registry.test.ts similarity index 100% rename from src/core/server/deprecations/deprecations_registry.test.ts rename to packages/core/deprecations/core-deprecations-server-internal/src/deprecations_registry.test.ts diff --git a/src/core/server/deprecations/deprecations_registry.ts b/packages/core/deprecations/core-deprecations-server-internal/src/deprecations_registry.ts similarity index 100% rename from src/core/server/deprecations/deprecations_registry.ts rename to packages/core/deprecations/core-deprecations-server-internal/src/deprecations_registry.ts diff --git a/src/core/server/deprecations/deprecations_route_handler_context.ts b/packages/core/deprecations/core-deprecations-server-internal/src/deprecations_route_handler_context.ts similarity index 83% rename from src/core/server/deprecations/deprecations_route_handler_context.ts rename to packages/core/deprecations/core-deprecations-server-internal/src/deprecations_route_handler_context.ts index f3bb17dd720a5..94d29f8b5388f 100644 --- a/src/core/server/deprecations/deprecations_route_handler_context.ts +++ b/packages/core/deprecations/core-deprecations-server-internal/src/deprecations_route_handler_context.ts @@ -8,15 +8,11 @@ import type { CoreElasticsearchRouteHandlerContext } from '@kbn/core-elasticsearch-server-internal'; import type { CoreSavedObjectsRouteHandlerContext } from '@kbn/core-saved-objects-server-internal'; -import type { DeprecationsClient, InternalDeprecationsServiceStart } from './deprecations_service'; - -/** - * Core's `deprecations` request handler context. - * @public - */ -export interface DeprecationsRequestHandlerContext { - client: DeprecationsClient; -} +import type { + DeprecationsRequestHandlerContext, + DeprecationsClient, +} from '@kbn/core-deprecations-server'; +import type { InternalDeprecationsServiceStart } from './deprecations_service'; /** * The {@link DeprecationsRequestHandlerContext} implementation. diff --git a/src/core/server/deprecations/deprecations_service.test.mocks.ts b/packages/core/deprecations/core-deprecations-server-internal/src/deprecations_service.test.mocks.ts similarity index 90% rename from src/core/server/deprecations/deprecations_service.test.mocks.ts rename to packages/core/deprecations/core-deprecations-server-internal/src/deprecations_service.test.mocks.ts index 3174698725f96..664a719ae0b7c 100644 --- a/src/core/server/deprecations/deprecations_service.test.mocks.ts +++ b/packages/core/deprecations/core-deprecations-server-internal/src/deprecations_service.test.mocks.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { mockDeprecationsFactory } from './deprecations_factory.mock'; +import { mockDeprecationsFactory } from './mocks'; export const mockedDeprecationFactoryInstance = mockDeprecationsFactory.create(); export const DeprecationsFactoryMock = jest diff --git a/src/core/server/deprecations/deprecations_service.test.ts b/packages/core/deprecations/core-deprecations-server-internal/src/deprecations_service.test.ts similarity index 95% rename from src/core/server/deprecations/deprecations_service.test.ts rename to packages/core/deprecations/core-deprecations-server-internal/src/deprecations_service.test.ts index cedb524b29095..b1ff4ae080e78 100644 --- a/src/core/server/deprecations/deprecations_service.test.ts +++ b/packages/core/deprecations/core-deprecations-server-internal/src/deprecations_service.test.ts @@ -10,12 +10,13 @@ import { DeprecationsFactoryMock } from './deprecations_service.test.mocks'; import { mockCoreContext } from '@kbn/core-base-server-mocks'; import { httpServiceMock } from '@kbn/core-http-server-mocks'; -/* eslint-disable dot-notation */ +import { configServiceMock } from '@kbn/config-mocks'; +import { savedObjectsClientMock } from '@kbn/core-saved-objects-api-server-mocks'; +import { elasticsearchServiceMock } from '@kbn/core-elasticsearch-server-mocks'; import { DeprecationsService, DeprecationsSetupDeps } from './deprecations_service'; -import { savedObjectsClientMock, elasticsearchServiceMock, configServiceMock } from '../mocks'; -import { mockDeprecationsFactory } from './deprecations_factory.mock'; -import { mockDeprecationsRegistry } from './deprecations_registry.mock'; +import { mockDeprecationsRegistry, mockDeprecationsFactory } from './mocks'; +/* eslint-disable dot-notation */ describe('DeprecationsService', () => { let coreContext: ReturnType; let http: ReturnType; diff --git a/src/core/server/deprecations/deprecations_service.ts b/packages/core/deprecations/core-deprecations-server-internal/src/deprecations_service.ts similarity index 94% rename from src/core/server/deprecations/deprecations_service.ts rename to packages/core/deprecations/core-deprecations-server-internal/src/deprecations_service.ts index 5ed25bee4c3d9..bee59eaff8730 100644 --- a/src/core/server/deprecations/deprecations_service.ts +++ b/packages/core/deprecations/core-deprecations-server-internal/src/deprecations_service.ts @@ -10,27 +10,18 @@ import { firstValueFrom } from 'rxjs'; import type { Logger } from '@kbn/logging'; import type { IConfigService } from '@kbn/config'; import type { CoreContext, CoreService } from '@kbn/core-base-server-internal'; -import type { DomainDeprecationDetails } from '@kbn/core-deprecations-common'; import type { InternalHttpServiceSetup } from '@kbn/core-http-server-internal'; import type { IScopedClusterClient } from '@kbn/core-elasticsearch-server'; import type { SavedObjectsClientContract } from '@kbn/core-saved-objects-api-server'; import type { DeprecationsServiceSetup, DeprecationRegistryProvider, + DeprecationsClient, } from '@kbn/core-deprecations-server'; import { DeprecationsFactory } from './deprecations_factory'; import { registerRoutes } from './routes'; import { config as deprecationConfig, DeprecationConfigType } from './deprecation_config'; -/** - * Server-side client that provides access to fetch all Kibana deprecations - * - * @public - */ -export interface DeprecationsClient { - getAllDeprecations: () => Promise; -} - export interface InternalDeprecationsServiceStart { /** * Creates a {@link DeprecationsClient} with provided SO client and ES client. diff --git a/src/core/server/deprecations/index.ts b/packages/core/deprecations/core-deprecations-server-internal/src/index.ts similarity index 72% rename from src/core/server/deprecations/index.ts rename to packages/core/deprecations/core-deprecations-server-internal/src/index.ts index 623a343a6aa88..5e9d277764210 100644 --- a/src/core/server/deprecations/index.ts +++ b/packages/core/deprecations/core-deprecations-server-internal/src/index.ts @@ -6,19 +6,11 @@ * Side Public License, v 1. */ -export type { - DeprecationsServiceSetup, - GetDeprecationsContext, - RegisterDeprecationsConfig, -} from '@kbn/core-deprecations-server'; - export type { InternalDeprecationsServiceSetup, InternalDeprecationsServiceStart, - DeprecationsClient, } from './deprecations_service'; export { DeprecationsService } from './deprecations_service'; export { config } from './deprecation_config'; export { CoreDeprecationsRouteHandlerContext } from './deprecations_route_handler_context'; -export type { DeprecationsRequestHandlerContext } from './deprecations_route_handler_context'; diff --git a/src/core/server/deprecations/internal_types.ts b/packages/core/deprecations/core-deprecations-server-internal/src/internal_types.ts similarity index 90% rename from src/core/server/deprecations/internal_types.ts rename to packages/core/deprecations/core-deprecations-server-internal/src/internal_types.ts index 90c45bc11ea81..6182ac30afd5a 100644 --- a/src/core/server/deprecations/internal_types.ts +++ b/packages/core/deprecations/core-deprecations-server-internal/src/internal_types.ts @@ -7,7 +7,7 @@ */ import type { IRouter, RequestHandlerContextBase } from '@kbn/core-http-server'; -import type { DeprecationsRequestHandlerContext } from './deprecations_route_handler_context'; +import type { DeprecationsRequestHandlerContext } from '@kbn/core-deprecations-server'; /** * Request handler context used by core's deprecations routes. diff --git a/src/core/server/deprecations/deprecations_factory.mock.ts b/packages/core/deprecations/core-deprecations-server-internal/src/mocks/deprecations_factory.mock.ts similarity index 93% rename from src/core/server/deprecations/deprecations_factory.mock.ts rename to packages/core/deprecations/core-deprecations-server-internal/src/mocks/deprecations_factory.mock.ts index 91ae4e6fa9af9..1b47fab5a54dc 100644 --- a/src/core/server/deprecations/deprecations_factory.mock.ts +++ b/packages/core/deprecations/core-deprecations-server-internal/src/mocks/deprecations_factory.mock.ts @@ -7,7 +7,8 @@ */ import type { PublicMethodsOf } from '@kbn/utility-types'; -import type { DeprecationsFactory } from './deprecations_factory'; +import type { DeprecationsFactory } from '../deprecations_factory'; + type DeprecationsFactoryContract = PublicMethodsOf; const createDeprecationsFactoryMock = () => { diff --git a/src/core/server/deprecations/deprecations_registry.mock.ts b/packages/core/deprecations/core-deprecations-server-internal/src/mocks/deprecations_registry.mock.ts similarity index 95% rename from src/core/server/deprecations/deprecations_registry.mock.ts rename to packages/core/deprecations/core-deprecations-server-internal/src/mocks/deprecations_registry.mock.ts index 22ffff877ddc5..c4eb21d40e615 100644 --- a/src/core/server/deprecations/deprecations_registry.mock.ts +++ b/packages/core/deprecations/core-deprecations-server-internal/src/mocks/deprecations_registry.mock.ts @@ -10,7 +10,7 @@ import type { PublicMethodsOf } from '@kbn/utility-types'; import { elasticsearchClientMock } from '@kbn/core-elasticsearch-client-server-mocks'; import type { GetDeprecationsContext } from '@kbn/core-deprecations-server'; import { savedObjectsClientMock } from '@kbn/core-saved-objects-api-server-mocks'; -import type { DeprecationsRegistry } from './deprecations_registry'; +import type { DeprecationsRegistry } from '../deprecations_registry'; type DeprecationsRegistryContract = PublicMethodsOf; diff --git a/packages/core/deprecations/core-deprecations-server-internal/src/mocks/index.ts b/packages/core/deprecations/core-deprecations-server-internal/src/mocks/index.ts new file mode 100644 index 0000000000000..3d66ba8330bba --- /dev/null +++ b/packages/core/deprecations/core-deprecations-server-internal/src/mocks/index.ts @@ -0,0 +1,10 @@ +/* + * 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. + */ + +export { mockDeprecationsRegistry } from './deprecations_registry.mock'; +export { mockDeprecationsFactory } from './deprecations_factory.mock'; diff --git a/src/core/server/deprecations/routes/get.ts b/packages/core/deprecations/core-deprecations-server-internal/src/routes/get.ts similarity index 100% rename from src/core/server/deprecations/routes/get.ts rename to packages/core/deprecations/core-deprecations-server-internal/src/routes/get.ts diff --git a/src/core/server/deprecations/routes/index.ts b/packages/core/deprecations/core-deprecations-server-internal/src/routes/index.ts similarity index 100% rename from src/core/server/deprecations/routes/index.ts rename to packages/core/deprecations/core-deprecations-server-internal/src/routes/index.ts diff --git a/packages/core/deprecations/core-deprecations-server-internal/tsconfig.json b/packages/core/deprecations/core-deprecations-server-internal/tsconfig.json new file mode 100644 index 0000000000000..71bb40fe57f3f --- /dev/null +++ b/packages/core/deprecations/core-deprecations-server-internal/tsconfig.json @@ -0,0 +1,17 @@ +{ + "extends": "../../../../tsconfig.bazel.json", + "compilerOptions": { + "declaration": true, + "declarationMap": true, + "emitDeclarationOnly": true, + "outDir": "target_types", + "stripInternal": false, + "types": [ + "jest", + "node" + ] + }, + "include": [ + "**/*.ts", + ] +} diff --git a/packages/core/deprecations/core-deprecations-server-mocks/BUILD.bazel b/packages/core/deprecations/core-deprecations-server-mocks/BUILD.bazel new file mode 100644 index 0000000000000..ba5e204595d9d --- /dev/null +++ b/packages/core/deprecations/core-deprecations-server-mocks/BUILD.bazel @@ -0,0 +1,106 @@ +load("@npm//@bazel/typescript:index.bzl", "ts_config") +load("@build_bazel_rules_nodejs//:index.bzl", "js_library") +load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project") + +PKG_DIRNAME = "core-deprecations-server-mocks" +PKG_REQUIRE_NAME = "@kbn/core-deprecations-server-mocks" + +SOURCE_FILES = glob( + [ + "**/*.ts", + ], + exclude = [ + "**/*.config.js", + "**/*.test.*", + "**/*.stories.*", + "**/__snapshots__/**", + "**/integration_tests/**", + "**/scripts/**", + "**/storybook/**", + "**/test_fixtures/**", + "**/test_helpers/**", + ], +) + +SRCS = SOURCE_FILES + +filegroup( + name = "srcs", + srcs = SRCS, +) + +NPM_MODULE_EXTRA_FILES = [ + "package.json", +] + +RUNTIME_DEPS = [ +] + +TYPES_DEPS = [ + "@npm//@types/node", + "@npm//@types/jest", + "//packages/kbn-utility-types:npm_module_types", + "//packages/core/deprecations/core-deprecations-server:npm_module_types", + "//packages/core/deprecations/core-deprecations-server-internal:npm_module_types", +] + +jsts_transpiler( + name = "target_node", + srcs = SRCS, + build_pkg_name = package_name(), +) + +ts_config( + name = "tsconfig", + src = "tsconfig.json", + deps = [ + "//:tsconfig.base.json", + "//:tsconfig.bazel.json", + ], +) + +ts_project( + name = "tsc_types", + args = ['--pretty'], + srcs = SRCS, + deps = TYPES_DEPS, + declaration = True, + declaration_map = True, + emit_declaration_only = True, + out_dir = "target_types", + tsconfig = ":tsconfig", +) + +js_library( + name = PKG_DIRNAME, + srcs = NPM_MODULE_EXTRA_FILES, + deps = RUNTIME_DEPS + [":target_node"], + package_name = PKG_REQUIRE_NAME, + visibility = ["//visibility:public"], +) + +pkg_npm( + name = "npm_module", + deps = [":" + PKG_DIRNAME], +) + +filegroup( + name = "build", + srcs = [":npm_module"], + visibility = ["//visibility:public"], +) + +pkg_npm_types( + name = "npm_module_types", + srcs = SRCS, + deps = [":tsc_types"], + package_name = PKG_REQUIRE_NAME, + tsconfig = ":tsconfig", + visibility = ["//visibility:public"], +) + +filegroup( + name = "build_types", + srcs = [":npm_module_types"], + visibility = ["//visibility:public"], +) diff --git a/packages/core/deprecations/core-deprecations-server-mocks/README.md b/packages/core/deprecations/core-deprecations-server-mocks/README.md new file mode 100644 index 0000000000000..90df9a4f327d5 --- /dev/null +++ b/packages/core/deprecations/core-deprecations-server-mocks/README.md @@ -0,0 +1,3 @@ +# @kbn/core-deprecations-server-mocks + +Empty package generated by @kbn/generate diff --git a/packages/core/deprecations/core-deprecations-server-mocks/index.ts b/packages/core/deprecations/core-deprecations-server-mocks/index.ts new file mode 100644 index 0000000000000..2e35ba5ba3b6e --- /dev/null +++ b/packages/core/deprecations/core-deprecations-server-mocks/index.ts @@ -0,0 +1,9 @@ +/* + * 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. + */ + +export { deprecationsServiceMock } from './src'; diff --git a/packages/core/deprecations/core-deprecations-server-mocks/jest.config.js b/packages/core/deprecations/core-deprecations-server-mocks/jest.config.js new file mode 100644 index 0000000000000..22578d8247161 --- /dev/null +++ b/packages/core/deprecations/core-deprecations-server-mocks/jest.config.js @@ -0,0 +1,13 @@ +/* + * 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. + */ + +module.exports = { + preset: '@kbn/test/jest_node', + rootDir: '../../../..', + roots: ['/packages/core/deprecations/core-deprecations-server-mocks'], +}; diff --git a/packages/core/deprecations/core-deprecations-server-mocks/package.json b/packages/core/deprecations/core-deprecations-server-mocks/package.json new file mode 100644 index 0000000000000..575a2d64bd609 --- /dev/null +++ b/packages/core/deprecations/core-deprecations-server-mocks/package.json @@ -0,0 +1,7 @@ +{ + "name": "@kbn/core-deprecations-server-mocks", + "private": true, + "version": "1.0.0", + "main": "./target_node/index.js", + "license": "SSPL-1.0 OR Elastic License 2.0" +} diff --git a/src/core/server/deprecations/deprecations_service.mock.ts b/packages/core/deprecations/core-deprecations-server-mocks/src/deprecations_service.mock.ts similarity index 92% rename from src/core/server/deprecations/deprecations_service.mock.ts rename to packages/core/deprecations/core-deprecations-server-mocks/src/deprecations_service.mock.ts index a3be83dfc138a..3ea313ab93777 100644 --- a/src/core/server/deprecations/deprecations_service.mock.ts +++ b/packages/core/deprecations/core-deprecations-server-mocks/src/deprecations_service.mock.ts @@ -7,13 +7,12 @@ */ import type { PublicMethodsOf } from '@kbn/utility-types'; -import type { DeprecationsServiceSetup } from '@kbn/core-deprecations-server'; -import { +import type { DeprecationsServiceSetup, DeprecationsClient } from '@kbn/core-deprecations-server'; +import type { DeprecationsService, InternalDeprecationsServiceSetup, InternalDeprecationsServiceStart, - DeprecationsClient, -} from './deprecations_service'; +} from '@kbn/core-deprecations-server-internal'; type DeprecationsServiceContract = PublicMethodsOf; diff --git a/packages/core/deprecations/core-deprecations-server-mocks/src/index.ts b/packages/core/deprecations/core-deprecations-server-mocks/src/index.ts new file mode 100644 index 0000000000000..1239090c387ad --- /dev/null +++ b/packages/core/deprecations/core-deprecations-server-mocks/src/index.ts @@ -0,0 +1,9 @@ +/* + * 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. + */ + +export { deprecationsServiceMock } from './deprecations_service.mock'; diff --git a/packages/core/deprecations/core-deprecations-server-mocks/tsconfig.json b/packages/core/deprecations/core-deprecations-server-mocks/tsconfig.json new file mode 100644 index 0000000000000..71bb40fe57f3f --- /dev/null +++ b/packages/core/deprecations/core-deprecations-server-mocks/tsconfig.json @@ -0,0 +1,17 @@ +{ + "extends": "../../../../tsconfig.bazel.json", + "compilerOptions": { + "declaration": true, + "declarationMap": true, + "emitDeclarationOnly": true, + "outDir": "target_types", + "stripInternal": false, + "types": [ + "jest", + "node" + ] + }, + "include": [ + "**/*.ts", + ] +} diff --git a/packages/core/deprecations/core-deprecations-server/index.ts b/packages/core/deprecations/core-deprecations-server/index.ts index ace64af1dda39..a16f1ada1a0b2 100644 --- a/packages/core/deprecations/core-deprecations-server/index.ts +++ b/packages/core/deprecations/core-deprecations-server/index.ts @@ -11,4 +11,6 @@ export type { GetDeprecationsContext, DeprecationsServiceSetup, DeprecationRegistryProvider, + DeprecationsClient, + DeprecationsRequestHandlerContext, } from './src'; diff --git a/packages/core/deprecations/core-deprecations-server/src/index.ts b/packages/core/deprecations/core-deprecations-server/src/index.ts index 9d4a624c2f23a..77ae047e5e799 100644 --- a/packages/core/deprecations/core-deprecations-server/src/index.ts +++ b/packages/core/deprecations/core-deprecations-server/src/index.ts @@ -12,3 +12,7 @@ export type { DeprecationsServiceSetup, DeprecationRegistryProvider, } from './contracts'; +export type { + DeprecationsClient, + DeprecationsRequestHandlerContext, +} from './request_handler_context'; diff --git a/packages/core/deprecations/core-deprecations-server/src/request_handler_context.ts b/packages/core/deprecations/core-deprecations-server/src/request_handler_context.ts new file mode 100644 index 0000000000000..64fe2373cf093 --- /dev/null +++ b/packages/core/deprecations/core-deprecations-server/src/request_handler_context.ts @@ -0,0 +1,26 @@ +/* + * 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 type { DomainDeprecationDetails } from '@kbn/core-deprecations-common'; + +/** + * Server-side client that provides access to fetch all Kibana deprecations + * + * @public + */ +export interface DeprecationsClient { + getAllDeprecations: () => Promise; +} + +/** + * Core's `deprecations` request handler context. + * @public + */ +export interface DeprecationsRequestHandlerContext { + client: DeprecationsClient; +} diff --git a/yarn.lock b/yarn.lock index 9a72a47d3351b..93ada50c63f78 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2839,6 +2839,14 @@ version "0.0.0" uid "" +"@kbn/core-deprecations-server-internal@link:bazel-bin/packages/core/deprecations/core-deprecations-server-internal": + version "0.0.0" + uid "" + +"@kbn/core-deprecations-server-mocks@link:bazel-bin/packages/core/deprecations/core-deprecations-server-mocks": + version "0.0.0" + uid "" + "@kbn/core-deprecations-server@link:bazel-bin/packages/core/deprecations/core-deprecations-server": version "0.0.0" uid "" @@ -6885,6 +6893,14 @@ version "0.0.0" uid "" +"@types/kbn__core-deprecations-server-internal@link:bazel-bin/packages/core/deprecations/core-deprecations-server-internal/npm_module_types": + version "0.0.0" + uid "" + +"@types/kbn__core-deprecations-server-mocks@link:bazel-bin/packages/core/deprecations/core-deprecations-server-mocks/npm_module_types": + version "0.0.0" + uid "" + "@types/kbn__core-deprecations-server@link:bazel-bin/packages/core/deprecations/core-deprecations-server/npm_module_types": version "0.0.0" uid "" From c30c3aff555c6be644dd277f39aead3b2f5ce72f Mon Sep 17 00:00:00 2001 From: pgayvallet Date: Wed, 31 Aug 2022 10:01:46 +0200 Subject: [PATCH 2/8] start fixing usages --- src/core/server/core_route_handler_context.ts | 6 ++---- src/core/server/index.ts | 4 ++-- src/core/server/mocks.ts | 4 ++-- src/core/server/server.ts | 5 ++++- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/core/server/core_route_handler_context.ts b/src/core/server/core_route_handler_context.ts index 50844d0ccfcd9..d08a4ad0dc143 100644 --- a/src/core/server/core_route_handler_context.ts +++ b/src/core/server/core_route_handler_context.ts @@ -12,10 +12,8 @@ import { CoreElasticsearchRouteHandlerContext } from '@kbn/core-elasticsearch-se import type { SavedObjectsRequestHandlerContext } from '@kbn/core-saved-objects-server'; import { CoreSavedObjectsRouteHandlerContext } from '@kbn/core-saved-objects-server-internal'; import { CoreUiSettingsRouteHandlerContext, UiSettingsRequestHandlerContext } from './ui_settings'; -import { - CoreDeprecationsRouteHandlerContext, - DeprecationsRequestHandlerContext, -} from './deprecations'; +import type { DeprecationsRequestHandlerContext } from '@kbn/core-deprecations-server'; +import { CoreDeprecationsRouteHandlerContext } from '@kbn/core-deprecations-server-internal'; import type { InternalCoreStart } from './internal_types'; /** diff --git a/src/core/server/index.ts b/src/core/server/index.ts index 2072edc1996a2..3a4452aebebd8 100644 --- a/src/core/server/index.ts +++ b/src/core/server/index.ts @@ -64,6 +64,7 @@ import type { SavedObjectsServiceSetup, SavedObjectsServiceStart, } from '@kbn/core-saved-objects-server'; +import { DeprecationsServiceSetup } from '@kbn/core-deprecations-server'; import { HttpResources } from './http_resources'; import { PluginsServiceSetup, PluginsServiceStart, PluginOpaqueId } from './plugins'; @@ -71,7 +72,6 @@ import { UiSettingsServiceSetup, UiSettingsServiceStart } from './ui_settings'; import { StatusServiceSetup } from './status'; import { CoreUsageDataStart, CoreUsageDataSetup } from './core_usage_data'; import { I18nServiceSetup } from './i18n'; -import { DeprecationsServiceSetup } from './deprecations'; // Because of #79265 we need to explicitly import, then export these types for // scripts/telemetry_check.js to work as expected import { @@ -432,7 +432,7 @@ export type { DeprecationsServiceSetup, DeprecationsClient, DeprecationsRequestHandlerContext, -} from './deprecations'; +} from '@kbn/core-deprecations-server'; export type { DeprecationsDetails } from '@kbn/core-deprecations-common'; export type { AppCategory } from '@kbn/core-application-common'; diff --git a/src/core/server/mocks.ts b/src/core/server/mocks.ts index ebc5d92be84b0..6c1019e2cf77f 100644 --- a/src/core/server/mocks.ts +++ b/src/core/server/mocks.ts @@ -26,6 +26,7 @@ import { capabilitiesServiceMock } from '@kbn/core-capabilities-server-mocks'; import { typeRegistryMock as savedObjectsTypeRegistryMock } from '@kbn/core-saved-objects-base-server-mocks'; import { savedObjectsServiceMock } from '@kbn/core-saved-objects-server-mocks'; import { savedObjectsClientMock } from '@kbn/core-saved-objects-api-server-mocks'; +import { deprecationsServiceMock } from '@kbn/core-deprecations-server-mocks'; import type { PluginInitializerContext, CoreSetup, @@ -41,7 +42,6 @@ import { SharedGlobalConfig } from './plugins'; import { statusServiceMock } from './status/status_service.mock'; import { coreUsageDataServiceMock } from './core_usage_data/core_usage_data_service.mock'; import { i18nServiceMock } from './i18n/i18n_service.mock'; -import { deprecationsServiceMock } from './deprecations/deprecations_service.mock'; export { configServiceMock, configDeprecationsMock } from '@kbn/config-mocks'; export { loggingSystemMock } from '@kbn/core-logging-server-mocks'; @@ -61,9 +61,9 @@ export { renderingMock } from './rendering/rendering_service.mock'; export { statusServiceMock } from './status/status_service.mock'; export { contextServiceMock } from '@kbn/core-http-context-server-mocks'; export { capabilitiesServiceMock } from '@kbn/core-capabilities-server-mocks'; +export { deprecationsServiceMock } from '@kbn/core-deprecations-server-mocks'; export { coreUsageDataServiceMock } from './core_usage_data/core_usage_data_service.mock'; export { i18nServiceMock } from './i18n/i18n_service.mock'; -export { deprecationsServiceMock } from './deprecations/deprecations_service.mock'; export { executionContextServiceMock } from '@kbn/core-execution-context-server-mocks'; export { docLinksServiceMock } from '@kbn/core-doc-links-server-mocks'; export { analyticsServiceMock } from '@kbn/core-analytics-server-mocks'; diff --git a/src/core/server/server.ts b/src/core/server/server.ts index b73cd8fc99753..dbfbbe261da5e 100644 --- a/src/core/server/server.ts +++ b/src/core/server/server.ts @@ -50,6 +50,10 @@ import { savedObjectsMigrationConfig, } from '@kbn/core-saved-objects-base-server-internal'; import { SavedObjectsService } from '@kbn/core-saved-objects-server-internal'; +import { + DeprecationsService, + config as deprecationConfig, +} from '@kbn/core-deprecations-server-internal'; import { CoreApp } from './core_app'; import { I18nService } from './i18n'; import { HttpResourcesService } from './http_resources'; @@ -64,7 +68,6 @@ import { config as statusConfig } from './status'; import { config as i18nConfig } from './i18n'; import { InternalCorePreboot, InternalCoreSetup, InternalCoreStart } from './internal_types'; import { CoreUsageDataService } from './core_usage_data'; -import { DeprecationsService, config as deprecationConfig } from './deprecations'; import { CoreRouteHandlerContext } from './core_route_handler_context'; import { PrebootCoreRouteHandlerContext } from './preboot_core_route_handler_context'; import { DiscoveredPlugins } from './plugins'; From 259ed8357bc0da9461a38e6d7a7695410df0943e Mon Sep 17 00:00:00 2001 From: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Date: Wed, 31 Aug 2022 08:10:17 +0000 Subject: [PATCH 3/8] [CI] Auto-commit changed files from 'node scripts/precommit_hook.js --ref HEAD~1..HEAD --fix' --- src/core/server/core_route_handler_context.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/server/core_route_handler_context.ts b/src/core/server/core_route_handler_context.ts index d08a4ad0dc143..52e49615971ab 100644 --- a/src/core/server/core_route_handler_context.ts +++ b/src/core/server/core_route_handler_context.ts @@ -11,9 +11,9 @@ import type { ElasticsearchRequestHandlerContext } from '@kbn/core-elasticsearch import { CoreElasticsearchRouteHandlerContext } from '@kbn/core-elasticsearch-server-internal'; import type { SavedObjectsRequestHandlerContext } from '@kbn/core-saved-objects-server'; import { CoreSavedObjectsRouteHandlerContext } from '@kbn/core-saved-objects-server-internal'; -import { CoreUiSettingsRouteHandlerContext, UiSettingsRequestHandlerContext } from './ui_settings'; import type { DeprecationsRequestHandlerContext } from '@kbn/core-deprecations-server'; import { CoreDeprecationsRouteHandlerContext } from '@kbn/core-deprecations-server-internal'; +import { CoreUiSettingsRouteHandlerContext, UiSettingsRequestHandlerContext } from './ui_settings'; import type { InternalCoreStart } from './internal_types'; /** From c3339395e976b9ac561b1133943333c2d263800a Mon Sep 17 00:00:00 2001 From: pgayvallet Date: Wed, 31 Aug 2022 10:52:07 +0200 Subject: [PATCH 4/8] fix more usages --- src/core/server/internal_types.ts | 5 ++++- src/core/server/server.test.mocks.ts | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/core/server/internal_types.ts b/src/core/server/internal_types.ts index 6df001934f090..ac8cbed641da1 100644 --- a/src/core/server/internal_types.ts +++ b/src/core/server/internal_types.ts @@ -45,6 +45,10 @@ import { InternalSavedObjectsServiceSetup, InternalSavedObjectsServiceStart, } from '@kbn/core-saved-objects-server-internal'; +import { + InternalDeprecationsServiceSetup, + InternalDeprecationsServiceStart, +} from '@kbn/core-deprecations-server-internal'; import { InternalUiSettingsServicePreboot, InternalUiSettingsServiceSetup, @@ -55,7 +59,6 @@ import { InternalHttpResourcesPreboot, InternalHttpResourcesSetup } from './http import { InternalStatusServiceSetup } from './status'; import { CoreUsageDataStart, InternalCoreUsageDataSetup } from './core_usage_data'; import { I18nServiceSetup } from './i18n'; -import { InternalDeprecationsServiceSetup, InternalDeprecationsServiceStart } from './deprecations'; /** @internal */ export interface InternalCorePreboot { diff --git a/src/core/server/server.test.mocks.ts b/src/core/server/server.test.mocks.ts index 35512c0918620..f63e6bd2481e7 100644 --- a/src/core/server/server.test.mocks.ts +++ b/src/core/server/server.test.mocks.ts @@ -117,10 +117,10 @@ jest.doMock('@kbn/core-preboot-server-internal', () => ({ PrebootService: jest.fn(() => mockPrebootService), })); -import { deprecationsServiceMock } from './deprecations/deprecations_service.mock'; +import { deprecationsServiceMock } from '@kbn/core-deprecations-server-mocks'; export const mockDeprecationService = deprecationsServiceMock.create(); -jest.doMock('./deprecations/deprecations_service', () => ({ +jest.doMock('@kbn/core-deprecations-server-internal', () => ({ DeprecationsService: jest.fn(() => mockDeprecationService), })); From 2a17e18177c2996a4af89c80941e7237d909b744 Mon Sep 17 00:00:00 2001 From: pgayvallet Date: Wed, 31 Aug 2022 13:10:41 +0200 Subject: [PATCH 5/8] move mdx files --- .../README.mdx => docs/kib-core-deprecations-service.mdx} | 0 src/core/server/{logging/README.mdx => docs/kib-core-logging.mdx} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/core/server/{deprecations/README.mdx => docs/kib-core-deprecations-service.mdx} (100%) rename src/core/server/{logging/README.mdx => docs/kib-core-logging.mdx} (100%) diff --git a/src/core/server/deprecations/README.mdx b/src/core/server/docs/kib-core-deprecations-service.mdx similarity index 100% rename from src/core/server/deprecations/README.mdx rename to src/core/server/docs/kib-core-deprecations-service.mdx diff --git a/src/core/server/logging/README.mdx b/src/core/server/docs/kib-core-logging.mdx similarity index 100% rename from src/core/server/logging/README.mdx rename to src/core/server/docs/kib-core-logging.mdx From 00920ad9abf38b78cf1c28b49f48d90dd83fef6e Mon Sep 17 00:00:00 2001 From: pgayvallet Date: Wed, 31 Aug 2022 13:14:08 +0200 Subject: [PATCH 6/8] update READMEs --- .../deprecations/core-deprecations-server-internal/README.md | 2 +- .../deprecations/core-deprecations-server-mocks/README.md | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/core/deprecations/core-deprecations-server-internal/README.md b/packages/core/deprecations/core-deprecations-server-internal/README.md index 127b95a62c998..8257dfb40ebbf 100644 --- a/packages/core/deprecations/core-deprecations-server-internal/README.md +++ b/packages/core/deprecations/core-deprecations-server-internal/README.md @@ -1,3 +1,3 @@ # @kbn/core-deprecations-server-internal -Empty package generated by @kbn/generate +This package contains the internal types and implementation of Core's server-side `deprecations` service. diff --git a/packages/core/deprecations/core-deprecations-server-mocks/README.md b/packages/core/deprecations/core-deprecations-server-mocks/README.md index 90df9a4f327d5..fc2261d00b66b 100644 --- a/packages/core/deprecations/core-deprecations-server-mocks/README.md +++ b/packages/core/deprecations/core-deprecations-server-mocks/README.md @@ -1,3 +1,5 @@ # @kbn/core-deprecations-server-mocks -Empty package generated by @kbn/generate +This package contains mocks fore Core's server-side `deprecations` service. + +- `deprecationsServiceMock` \ No newline at end of file From a68d1e5f3f7563ac6bdc93f7c5a9428b344104c1 Mon Sep 17 00:00:00 2001 From: pgayvallet Date: Wed, 31 Aug 2022 13:24:47 +0200 Subject: [PATCH 7/8] add author to package files --- .../deprecations/core-deprecations-server-internal/package.json | 1 + .../deprecations/core-deprecations-server-mocks/package.json | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/core/deprecations/core-deprecations-server-internal/package.json b/packages/core/deprecations/core-deprecations-server-internal/package.json index bbbad23b396f7..f8ace4c54ccdb 100644 --- a/packages/core/deprecations/core-deprecations-server-internal/package.json +++ b/packages/core/deprecations/core-deprecations-server-internal/package.json @@ -3,5 +3,6 @@ "private": true, "version": "1.0.0", "main": "./target_node/index.js", + "author": "Kibana Core", "license": "SSPL-1.0 OR Elastic License 2.0" } diff --git a/packages/core/deprecations/core-deprecations-server-mocks/package.json b/packages/core/deprecations/core-deprecations-server-mocks/package.json index 575a2d64bd609..f1cc7299b3a2f 100644 --- a/packages/core/deprecations/core-deprecations-server-mocks/package.json +++ b/packages/core/deprecations/core-deprecations-server-mocks/package.json @@ -3,5 +3,6 @@ "private": true, "version": "1.0.0", "main": "./target_node/index.js", + "author": "Kibana Core", "license": "SSPL-1.0 OR Elastic License 2.0" } From 1dcd7f44dc8d8c92c1b306c25f12b56de2b8eeb9 Mon Sep 17 00:00:00 2001 From: pgayvallet Date: Wed, 31 Aug 2022 13:59:05 +0200 Subject: [PATCH 8/8] snake casing --- ...deprecations-service.mdx => kib_core_deprecations_service.mdx} | 0 .../server/docs/{kib-core-logging.mdx => kib_core_logging.mdx} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/core/server/docs/{kib-core-deprecations-service.mdx => kib_core_deprecations_service.mdx} (100%) rename src/core/server/docs/{kib-core-logging.mdx => kib_core_logging.mdx} (100%) diff --git a/src/core/server/docs/kib-core-deprecations-service.mdx b/src/core/server/docs/kib_core_deprecations_service.mdx similarity index 100% rename from src/core/server/docs/kib-core-deprecations-service.mdx rename to src/core/server/docs/kib_core_deprecations_service.mdx diff --git a/src/core/server/docs/kib-core-logging.mdx b/src/core/server/docs/kib_core_logging.mdx similarity index 100% rename from src/core/server/docs/kib-core-logging.mdx rename to src/core/server/docs/kib_core_logging.mdx