Merge branch 'main' into issue-119454-es-upgrade

api_docs/alerting.json

@@ -3450,10 +3450,10 @@
           },
           {
             "parentPluginId": "alerting",
-            "id": "def-common.AlertingFrameworkHealth.alertingFrameworkHeath",
+            "id": "def-common.AlertingFrameworkHealth.alertingFrameworkHealth",
             "type": "Object",
             "tags": [],
-            "label": "alertingFrameworkHeath",
+            "label": "alertingFrameworkHealth",
             "description": [],
             "signature": [
               {

docs/api/alerting/health.asciidoc

@@ -74,6 +74,9 @@ The health API response contains the following properties:
 | `alerting_framework_health`
 | This state property has three substates that identify the health of the alerting framework API: `decryption_health`, `execution_health`, and `read_health`.
 
+| deprecated::`alerting_framework_heath`
+| This state property has a typo, use `alerting_framework_health` instead. It has three substates that identify the health of the alerting framework API: `decryption_health`, `execution_health`, and `read_health`.
+
 |===
 
 `alerting_framework_health` consists of the following properties:

docs/api/alerting/legacy/health.asciidoc

@@ -45,7 +45,7 @@ The API returns the following:
 {
    "isSufficientlySecure":true,
    "hasPermanentEncryptionKey":true,
-   "alertingFrameworkHeath":{
+   "alertingFrameworkHealth":{
       "decryptionHealth":{
          "status":"ok",
          "timestamp":"2021-02-10T23:35:04.949Z"
@@ -73,12 +73,12 @@ The health API response contains the following properties:
 | `hasPermanentEncryptionKey`
 | Return the state `false` if Encrypted Saved Object plugin has not a permanent encryption Key.
 
-| `alertingFrameworkHeath`
+| `alertingFrameworkHealth`
 | This state property has three substates that identify the health of the alerting framework API: `decryptionHealth`, `executionHealth`, and `readHealth`.
 
 |===
 
-`alertingFrameworkHeath` consists of the following properties:
+`alertingFrameworkHealth` consists of the following properties:
 
 [cols="2*<"]
 |===

package.json

@@ -602,6 +602,8 @@
     "@types/kbn__server-route-repository": "link:bazel-bin/packages/kbn-server-route-repository/npm_module_types",
     "@types/kbn__std": "link:bazel-bin/packages/kbn-std/npm_module_types",
     "@types/kbn__telemetry-tools": "link:bazel-bin/packages/kbn-telemetry-tools/npm_module_types",
+    "@types/kbn__utility-types": "link:bazel-bin/packages/kbn-utility-types/npm_module_types",
+    "@types/kbn__utils": "link:bazel-bin/packages/kbn-utils/npm_module_types",
     "@types/license-checker": "15.0.0",
     "@types/listr": "^0.14.0",
     "@types/loader-utils": "^1.1.3",

packages/BUILD.bazel

@@ -119,6 +119,8 @@ filegroup(
       "//packages/kbn-server-route-repository:build_types",
       "//packages/kbn-std:build_types",
       "//packages/kbn-telemetry-tools:build_types",
+      "//packages/kbn-utility-types:build_types",
+      "//packages/kbn-utils:build_types",
   ],
 )
 

packages/kbn-apm-config-loader/BUILD.bazel

@@ -36,7 +36,7 @@ RUNTIME_DEPS = [
 
 TYPES_DEPS = [
   "//packages/elastic-safer-lodash-set",
-  "//packages/kbn-utils",
+  "//packages/kbn-utils:npm_module_types",
   "@npm//@elastic/apm-rum",
   "@npm//@types/jest",
   "@npm//@types/js-yaml",

packages/kbn-cli-dev-mode/BUILD.bazel

@@ -55,7 +55,7 @@ TYPES_DEPS = [
   "//packages/kbn-optimizer:npm_module_types",
   "//packages/kbn-server-http-tools:npm_module_types",
   "//packages/kbn-std:npm_module_types",
-  "//packages/kbn-utils",
+  "//packages/kbn-utils:npm_module_types",
   "@npm//argsplit",
   "@npm//chokidar",
   "@npm//elastic-apm-node",

packages/kbn-config/BUILD.bazel

@@ -49,7 +49,7 @@ TYPES_DEPS = [
   "//packages/kbn-config-schema:npm_module_types",
   "//packages/kbn-logging",
   "//packages/kbn-std:npm_module_types",
-  "//packages/kbn-utility-types",
+  "//packages/kbn-utility-types:npm_module_types",
   "//packages/kbn-i18n:npm_module_types",
   "@npm//load-json-file",
   "@npm//rxjs",

packages/kbn-dev-utils/BUILD.bazel

@@ -66,7 +66,7 @@ RUNTIME_DEPS = [
 ]
 
 TYPES_DEPS = [
-  "//packages/kbn-utils",
+  "//packages/kbn-utils:npm_module_types",
   "@npm//@babel/parser",
   "@npm//@babel/types",
   "@npm//@types/babel__core",

packages/kbn-docs-utils/BUILD.bazel

@@ -39,7 +39,7 @@ RUNTIME_DEPS = [
 TYPES_DEPS = [
   "//packages/kbn-config:npm_module_types",
   "//packages/kbn-dev-utils:npm_module_types",
-  "//packages/kbn-utils",
+  "//packages/kbn-utils:npm_module_types",
   "@npm//ts-morph",
   "@npm//@types/dedent",
   "@npm//@types/jest",

packages/kbn-es-archiver/BUILD.bazel

@@ -46,7 +46,7 @@ RUNTIME_DEPS = [
 TYPES_DEPS = [
   "//packages/kbn-dev-utils:npm_module_types",
   "//packages/kbn-test",
-  "//packages/kbn-utils",
+  "//packages/kbn-utils:npm_module_types",
   "@npm//@elastic/elasticsearch",
   "@npm//aggregate-error",
   "@npm//globby",

packages/kbn-es-query/BUILD.bazel

@@ -41,7 +41,7 @@ RUNTIME_DEPS = [
 ]
 
 TYPES_DEPS = [
-  "//packages/kbn-utility-types",
+  "//packages/kbn-utility-types:npm_module_types",
   "//packages/kbn-i18n:npm_module_types",
   "@npm//@elastic/elasticsearch",
   "@npm//tslib",

packages/kbn-optimizer/BUILD.bazel

@@ -71,7 +71,7 @@ TYPES_DEPS = [
   "//packages/kbn-std:npm_module_types",
   "//packages/kbn-ui-shared-deps-npm",
   "//packages/kbn-ui-shared-deps-src",
-  "//packages/kbn-utils",
+  "//packages/kbn-utils:npm_module_types",
   "@npm//chalk",
   "@npm//clean-webpack-plugin",
   "@npm//cpy",

packages/kbn-plugin-generator/BUILD.bazel

@@ -51,7 +51,7 @@ RUNTIME_DEPS = [
 ]
 
 TYPES_DEPS = [
-  "//packages/kbn-utils",
+  "//packages/kbn-utils:npm_module_types",
   "//packages/kbn-dev-utils:npm_module_types",
   "@npm//del",
   "@npm//execa",

packages/kbn-plugin-helpers/BUILD.bazel

@@ -45,7 +45,7 @@ RUNTIME_DEPS = [
 TYPES_DEPS = [
   "//packages/kbn-dev-utils:npm_module_types",
   "//packages/kbn-optimizer:npm_module_types",
-  "//packages/kbn-utils",
+  "//packages/kbn-utils:npm_module_types",
   "@npm//del",
   "@npm//execa",
   "@npm//globby",

packages/kbn-std/BUILD.bazel

@@ -37,7 +37,7 @@ RUNTIME_DEPS = [
 ]
 
 TYPES_DEPS = [
-  "//packages/kbn-utility-types",
+  "//packages/kbn-utility-types:npm_module_types",
   "@npm//query-string",
   "@npm//rxjs",
   "@npm//tslib",

packages/kbn-storybook/BUILD.bazel

@@ -51,7 +51,7 @@ TYPES_DEPS = [
   "//packages/kbn-dev-utils:npm_module_types",
   "//packages/kbn-ui-shared-deps-npm",
   "//packages/kbn-ui-shared-deps-src",
-  "//packages/kbn-utils",
+  "//packages/kbn-utils:npm_module_types",
   "@npm//@storybook/addons",
   "@npm//@storybook/api",
   "@npm//@storybook/components",

packages/kbn-telemetry-tools/BUILD.bazel

@@ -40,7 +40,7 @@ RUNTIME_DEPS = [
 
 TYPES_DEPS = [
   "//packages/kbn-dev-utils:npm_module_types",
-  "//packages/kbn-utility-types",
+  "//packages/kbn-utility-types:npm_module_types",
   "@npm//tslib",
   "@npm//@types/glob",
   "@npm//@types/jest",

packages/kbn-test-subj-selector/BUILD.bazel

@@ -1,4 +1,5 @@
-load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "pkg_npm")
 
 PKG_BASE_NAME = "kbn-test-subj-selector"
 PKG_REQUIRE_NAME = "@kbn/test-subj-selector"
@@ -20,14 +21,14 @@ NPM_MODULE_EXTRA_FILES = [
   "README.md",
 ]
 
-DEPS = []
+RUNTIME_DEPS = []
 
 js_library(
   name = PKG_BASE_NAME,
   srcs = NPM_MODULE_EXTRA_FILES + [
     ":srcs",
   ],
-  deps = DEPS,
+  deps = RUNTIME_DEPS,
   package_name = PKG_REQUIRE_NAME,
   visibility = ["//visibility:public"],
 )

packages/kbn-test/src/jest/utils/testbed/index.ts

@@ -12,7 +12,6 @@ export type {
   TestBedConfig,
   AsyncTestBedConfig,
   SetupFunc,
-  UnwrapPromise,
   SyncSetupFunc,
   AsyncSetupFunc,
 } from './types';

packages/kbn-test/src/jest/utils/testbed/types.ts

@@ -164,8 +164,3 @@ export interface MemoryRouterConfig {
   /** A callBack that will be called with the React Router instance once mounted  */
   onRouter?: (router: any) => void;
 }
-
-/**
- * Utility type: extracts returned type from a Promise.
- */
-export type UnwrapPromise<T> = T extends Promise<infer P> ? P : T;

packages/kbn-tinymath/BUILD.bazel

@@ -1,5 +1,6 @@
-load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
 load("@npm//peggy:index.bzl", "peggy")
+load("//src/dev/bazel:index.bzl", "pkg_npm")
 
 PKG_BASE_NAME = "kbn-tinymath"
 PKG_REQUIRE_NAME = "@kbn/tinymath"
@@ -26,7 +27,7 @@ NPM_MODULE_EXTRA_FILES = [
   "README.md",
 ]
 
-DEPS = [
+RUNTIME_DEPS = [
   "@npm//lodash",
 ]
 
@@ -49,7 +50,7 @@ js_library(
     ":srcs",
     ":grammar"
   ],
-  deps = DEPS,
+  deps = RUNTIME_DEPS,
   package_name = PKG_REQUIRE_NAME,
   visibility = ["//visibility:public"],
 )

packages/kbn-ui-framework/BUILD.bazel

@@ -1,4 +1,5 @@
-load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "pkg_npm")
 
 PKG_BASE_NAME = "kbn-ui-framework"
 PKG_REQUIRE_NAME = "@kbn/ui-framework"
@@ -19,14 +20,14 @@ NPM_MODULE_EXTRA_FILES = [
   "README.md",
 ]
 
-DEPS = []
+RUNTIME_DEPS = []
 
 js_library(
   name = PKG_BASE_NAME,
   srcs = NPM_MODULE_EXTRA_FILES + [
     ":srcs",
   ],
-  deps = DEPS,
+  deps = RUNTIME_DEPS,
   package_name = PKG_REQUIRE_NAME,
   visibility = ["//visibility:public"],
 )

packages/kbn-utility-types/BUILD.bazel

@@ -1,9 +1,10 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_config", "ts_project")
-load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm")
-load("//src/dev/bazel:index.bzl", "jsts_transpiler")
+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_BASE_NAME = "kbn-utility-types"
 PKG_REQUIRE_NAME = "@kbn/utility-types"
+TYPES_PKG_REQUIRE_NAME = "@types/kbn__utility-types"
 
 SOURCE_FILES = glob([
   "src/jest/index.ts",
@@ -66,7 +67,7 @@ ts_project(
 js_library(
   name = PKG_BASE_NAME,
   srcs = NPM_MODULE_EXTRA_FILES,
-  deps = RUNTIME_DEPS + [":target_node", ":tsc_types"],
+  deps = RUNTIME_DEPS + [":target_node"],
   package_name = "@kbn/utility-types",
   visibility = ["//visibility:public"],
 )
@@ -85,3 +86,20 @@ filegroup(
   ],
   visibility = ["//visibility:public"],
 )
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = TYPES_PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [
+    ":npm_module_types",
+  ],
+  visibility = ["//visibility:public"],
+)

packages/kbn-utility-types/README.md

@@ -9,10 +9,10 @@ TypeScript utility types for usage in Kibana.
 ## Usage
 
 ```ts
-import { UnwrapPromise } from '@kbn/utility-types';
+import { UnwrapObservable } from '@kbn/utility-types';
 
-type A = Promise<string>;
-type B = UnwrapPromise<A>; // string
+type A = Observable<string>;
+type B = UnwrapObservable<A>; // string
 ```
 
 
@@ -27,6 +27,4 @@ type B = UnwrapPromise<A>; // string
 - `ShallowPromise<T>` &mdash; Same as `Promise` type, but it flat maps the wrapped type.
 - `UnionToIntersection<T>` &mdash; Converts a union of types into an intersection.
 - `UnwrapObservable<T>` &mdash; Returns wrapped type of an observable.
-- `UnwrapPromise<T>` &mdash; Returns wrapped type of a promise.
-- `UnwrapPromiseOrReturn<T>` &mdash; Returns wrapped type of a promise or the type itself, if it isn't a promise.
 - `Values<T>` &mdash; Returns object or array value types.

packages/kbn-utility-types/package.json

@@ -4,7 +4,6 @@
   "private": true,
   "license": "SSPL-1.0 OR Elastic License 2.0",
   "main": "target_node/index.js",
-  "types": "target_types/index.d.ts",
   "kibana": {
     "devOnly": false
   },

packages/kbn-utility-types/src/index.ts

@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-import { PromiseType } from 'utility-types';
 export type { $Values, Assign, Class, Optional, Required } from 'utility-types';
 
 export type {
@@ -27,16 +26,6 @@ export type MaybePromise<T> = T | Promise<T>;
  */
 export type ShallowPromise<T> = T extends Promise<infer U> ? Promise<U> : Promise<T>;
 
-/**
- * Returns wrapped type of a `Promise`.
- */
-export type UnwrapPromise<T extends Promise<any>> = PromiseType<T>;
-
-/**
- * Returns wrapped type of a promise, or returns type as is, if it is not a promise.
- */
-export type UnwrapPromiseOrReturn<T> = T extends Promise<infer U> ? U : T;
-
 /**
  * Minimal interface for an object resembling an `Observable`.
  */