-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Migrate server-side http_resources service to packages (#142537)
Co-authored-by: pgayvallet <[email protected]> Co-authored-by: kibanamachine <[email protected]>
- Loading branch information
3 people
authored
Oct 4, 2022
1 parent
5ff2232
commit 1c8e0ed
Showing
43 changed files
with
675 additions
and
43 deletions.
There are no files selected for viewing
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
115 changes: 115 additions & 0 deletions
115
packages/core/http/core-http-resources-server-internal/BUILD.bazel
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| 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-http-resources-server-internal" | ||
| PKG_REQUIRE_NAME = "@kbn/core-http-resources-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//elastic-apm-node", | ||
| "//packages/kbn-logging", | ||
| "//packages/kbn-apm-config-loader", | ||
| ] | ||
|
|
||
| TYPES_DEPS = [ | ||
| "@npm//@types/node", | ||
| "@npm//@types/jest", | ||
| "@npm//elastic-apm-node", | ||
| "//packages/kbn-apm-config-loader:npm_module_types", | ||
| "//packages/kbn-logging:npm_module_types", | ||
| "//packages/core/http/core-http-server:npm_module_types", | ||
| "//packages/core/http/core-http-resources-server:npm_module_types", | ||
| "//packages/core/rendering/core-rendering-server-internal:npm_module_types", | ||
| "//packages/core/http/core-http-request-handler-context-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"], | ||
| ) |
3 changes: 3 additions & 0 deletions
3
packages/core/http/core-http-resources-server-internal/README.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| # @kbn/core-http-resources-server-internal | ||
|
|
||
| This package contains the internal types and implementation for Core's internal `http` resources service. |
11 changes: 11 additions & 0 deletions
11
packages/core/http/core-http-resources-server-internal/index.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| /* | ||
| * 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 { HttpResourcesService } from './src'; | ||
|
|
||
| export type { InternalHttpResourcesPreboot, InternalHttpResourcesSetup } from './src'; |
13 changes: 13 additions & 0 deletions
13
packages/core/http/core-http-resources-server-internal/jest.config.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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: ['<rootDir>/packages/core/http/core-http-resources-server-internal'], | ||
| }; |
7 changes: 7 additions & 0 deletions
7
packages/core/http/core-http-resources-server-internal/kibana.jsonc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "type": "shared-common", | ||
| "id": "@kbn/core-http-resources-server-internal", | ||
| "owner": "@elastic/kibana-core", | ||
| "runtimeDeps": [], | ||
| "typeDeps": [], | ||
| } |
7 changes: 7 additions & 0 deletions
7
packages/core/http/core-http-resources-server-internal/package.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "name": "@kbn/core-http-resources-server-internal", | ||
| "private": true, | ||
| "version": "1.0.0", | ||
| "main": "./target_node/index.js", | ||
| "license": "SSPL-1.0 OR Elastic License 2.0" | ||
| } |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
packages/core/http/core-http-resources-server-internal/src/index.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| /* | ||
| * 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 { HttpResourcesService } from './http_resources_service'; | ||
|
|
||
| export type { InternalHttpResourcesPreboot, InternalHttpResourcesSetup } from './types'; |
35 changes: 35 additions & 0 deletions
35
...core-http-resources-server-internal/src/test_helpers/http_resources_service_test_mocks.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /* | ||
| * 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 { HttpResourcesServiceToolkit } from '@kbn/core-http-resources-server'; | ||
| import { httpServerMock } from '@kbn/core-http-server-mocks'; | ||
| import { uiSettingsServiceMock } from '@kbn/core-ui-settings-server-mocks'; | ||
|
|
||
| // partial duplicate of coreMock | ||
| export function createCoreRequestHandlerContextMock() { | ||
| return { | ||
| core: { | ||
| uiSettings: { client: uiSettingsServiceMock.createClient() }, | ||
| }, | ||
| }; | ||
| } | ||
|
|
||
| // duplicate of public mock for internal testing only | ||
| export function createHttpResourcesResponseFactory() { | ||
| const mocked: jest.Mocked<HttpResourcesServiceToolkit> = { | ||
| renderCoreApp: jest.fn(), | ||
| renderAnonymousCoreApp: jest.fn(), | ||
| renderHtml: jest.fn(), | ||
| renderJs: jest.fn(), | ||
| }; | ||
|
|
||
| return { | ||
| ...httpServerMock.createResponseFactory(), | ||
| ...mocked, | ||
| }; | ||
| } |
Oops, something went wrong.