-
Notifications
You must be signed in to change notification settings - Fork 8.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Partially move server-side savedObjects domain implementation to packages
#137448
Merged
pgayvallet
merged 28 commits into
elastic:main
from
pgayvallet:kbn-135820-so-implementation-stage-1
Aug 22, 2022
Merged
Changes from 21 commits
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
258e60d
create @kbn/core-saved-objects-utils-server package
pgayvallet 08bfb2b
create empty @kbn/core-saved-objects-base-server-internal package
pgayvallet 0b0aa51
fix more internal imports
pgayvallet 51fa753
[CI] Auto-commit changed files from 'node scripts/precommit_hook.js -…
kibanamachine 76f8c3d
start moving stuff to base package
pgayvallet 55c372c
Fix SS mocks
pgayvallet 866fb52
adapt some imports
pgayvallet e18a800
start fixing internal imports
pgayvallet 887c196
fix remaining core usages
pgayvallet 240219a
start fixing external usages
pgayvallet 044d5a9
Merge remote-tracking branch 'upstream/main' into kbn-135820-so-imple…
pgayvallet 95837c8
lint
pgayvallet 8c6bd8b
move type registry and mocks to packages
pgayvallet 934f79c
adapt usages of serializer in tests
pgayvallet 32c122a
fix test mocking
pgayvallet dc409a3
[CI] Auto-commit changed files from 'node scripts/generate packages_b…
kibanamachine 45fca48
fix more internal usages of SOTR/mock
pgayvallet b648df6
fix package
pgayvallet 21983bd
fix external usages
pgayvallet cc66bf8
fix more mocked packages
pgayvallet a72136d
fix more mocked packages
pgayvallet 1fe8ec8
self review
pgayvallet db1b9fe
Merge remote-tracking branch 'upstream/main' into kbn-135820-so-imple…
pgayvallet a94a10b
Merge branch 'main' into kbn-135820-so-implementation-stage-1
TinaHeiligers c3210cc
Merge branch 'main' into kbn-135820-so-implementation-stage-1
kibanamachine e7a0ad1
Fix mistake from main merge
TinaHeiligers 50fa813
Merge remote-tracking branch 'upstream/main' into kbn-135820-so-imple…
pgayvallet 6700ce8
add root_input_dir
pgayvallet File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
110 changes: 110 additions & 0 deletions
110
packages/core/saved-objects/core-saved-objects-base-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,110 @@ | ||
| 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-saved-objects-base-server-internal" | ||
| PKG_REQUIRE_NAME = "@kbn/core-saved-objects-base-server-internal" | ||
|
|
||
| SOURCE_FILES = glob( | ||
| [ | ||
| "src/**/*.ts", | ||
| ], | ||
| exclude = [ | ||
| "**/*.test.*", | ||
| "**/*.stories.*", | ||
| ], | ||
| ) | ||
|
|
||
| SRCS = SOURCE_FILES | ||
|
|
||
| filegroup( | ||
| name = "srcs", | ||
| srcs = SRCS, | ||
| ) | ||
|
|
||
| NPM_MODULE_EXTRA_FILES = [ | ||
| "package.json", | ||
| ] | ||
|
|
||
| RUNTIME_DEPS = [ | ||
| "@npm//lodash", | ||
| "@npm//semver", | ||
| "//packages/kbn-config-schema", | ||
| ### test dependencies | ||
| "//packages/kbn-logging-mocks", | ||
| "@npm//@hapi/boom", | ||
| ] | ||
|
|
||
| TYPES_DEPS = [ | ||
| "@npm//@types/node", | ||
| "@npm//@types/jest", | ||
| "@npm//@types/lodash", | ||
| "@npm//@types/semver", | ||
| "//packages/kbn-logging:npm_module_types", | ||
| "//packages/kbn-config-schema:npm_module_types", | ||
| "//packages/core/base/core-base-server-internal:npm_module_types", | ||
| "//packages/core/saved-objects/core-saved-objects-server:npm_module_types", | ||
| "//packages/core/saved-objects/core-saved-objects-utils-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", | ||
| root_dir = "src", | ||
| 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"], | ||
| ) |
4 changes: 4 additions & 0 deletions
4
packages/core/saved-objects/core-saved-objects-base-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,4 @@ | ||
| # @kbn/core-saved-objects-base-server-internal | ||
|
|
||
| This package contains base sub-domains and utilities used by the internal implementation | ||
| of Core's server-side savedObjects domain. |
13 changes: 13 additions & 0 deletions
13
packages/core/saved-objects/core-saved-objects-base-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/saved-objects/core-saved-objects-base-server-internal'], | ||
| }; |
7 changes: 7 additions & 0 deletions
7
packages/core/saved-objects/core-saved-objects-base-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-saved-objects-base-server-internal", | ||
| "private": true, | ||
| "version": "1.0.0", | ||
| "main": "./target_node/index.js", | ||
| "license": "SSPL-1.0 OR Elastic License 2.0" | ||
| } |
29 changes: 29 additions & 0 deletions
29
packages/core/saved-objects/core-saved-objects-base-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,29 @@ | ||
| /* | ||
| * 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 { LEGACY_URL_ALIAS_TYPE, type LegacyUrlAlias } from './legacy_alias'; | ||
| export { | ||
| getProperty, | ||
| getRootProperties, | ||
| getRootPropertiesObjects, | ||
| getTypes, | ||
| type IndexMapping, | ||
| type IndexMappingMeta, | ||
| type SavedObjectsTypeMappingDefinitions, | ||
| } from './mappings'; | ||
| export { SavedObjectsSerializer } from './serialization'; | ||
| export { SavedObjectsTypeValidator } from './validation'; | ||
| export { decodeRequestVersion, decodeVersion, encodeVersion, encodeHitVersion } from './version'; | ||
| export { | ||
| savedObjectsConfig, | ||
| savedObjectsMigrationConfig, | ||
| SavedObjectConfig, | ||
| type SavedObjectsConfigType, | ||
| type SavedObjectsMigrationConfigType, | ||
| } from './saved_objects_config'; | ||
| export { SavedObjectTypeRegistry } from './saved_objects_type_registry'; |
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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
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
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
File renamed without changes.
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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
12 changes: 12 additions & 0 deletions
12
packages/core/saved-objects/core-saved-objects-base-server-internal/src/version/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,12 @@ | ||
| /* | ||
| * 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 { encodeVersion } from './encode_version'; | ||
| export { encodeHitVersion } from './encode_hit_version'; | ||
| export { decodeVersion } from './decode_version'; | ||
| export { decodeRequestVersion } from './decode_request_version'; |
18 changes: 18 additions & 0 deletions
18
packages/core/saved-objects/core-saved-objects-base-server-internal/tsconfig.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,18 @@ | ||
| { | ||
| "extends": "../../../../tsconfig.bazel.json", | ||
| "compilerOptions": { | ||
| "declaration": true, | ||
| "declarationMap": true, | ||
| "emitDeclarationOnly": true, | ||
| "outDir": "target_types", | ||
| "rootDir": "src", | ||
| "stripInternal": false, | ||
| "types": [ | ||
| "jest", | ||
| "node" | ||
| ] | ||
| }, | ||
| "include": [ | ||
| "src/**/*" | ||
| ] | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Only test of the
@kbn/core-saved-objects-base-server-internalthat was using a mock from code that was moved to this package. I KISS'ed and created an inline mock helper.The alternative would have been to create 2 additional packages (impl+mock) just for the SO type registry, and it didn't feel worth it.