Merge branch 'master' into bringing-cypress-tests-back

packages/kbn-plugin-generator/.babelrc

@@ -0,0 +1,3 @@
+{
+  "presets": ["@kbn/babel-preset/node_preset"]
+}

packages/kbn-plugin-generator/BUILD.bazel

@@ -1,5 +1,6 @@
 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")
 
 PKG_BASE_NAME = "kbn-plugin-generator"
 PKG_REQUIRE_NAME = "@kbn/plugin-generator"
@@ -35,7 +36,7 @@ NPM_MODULE_EXTRA_FILES = [
   ":template",
 ]
 
-SRC_DEPS = [
+RUNTIME_DEPS = [
   "//packages/kbn-utils",
   "//packages/kbn-dev-utils",
   "@npm//del",
@@ -49,6 +50,11 @@ SRC_DEPS = [
 ]
 
 TYPES_DEPS = [
+  "//packages/kbn-utils",
+  "//packages/kbn-dev-utils",
+  "@npm//del",
+  "@npm//execa",
+  "@npm//globby",
   "@npm//@types/ejs",
   "@npm//@types/inquirer",
   "@npm//@types/jest",
@@ -58,7 +64,11 @@ TYPES_DEPS = [
   "@npm//@types/vinyl-fs",
 ]
 
-DEPS = SRC_DEPS + TYPES_DEPS
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+)
 
 ts_config(
   name = "tsconfig",
@@ -70,13 +80,14 @@ ts_config(
 )
 
 ts_project(
-  name = "tsc",
+  name = "tsc_types",
   args = ['--pretty'],
   srcs = SRCS,
-  deps = DEPS,
+  deps = TYPES_DEPS,
   declaration = True,
   declaration_map = True,
-  out_dir = "target",
+  emit_declaration_only = True,
+  out_dir = "target_types",
   source_map = True,
   root_dir = "src",
   tsconfig = ":tsconfig",
@@ -85,7 +96,7 @@ ts_project(
 js_library(
   name = PKG_BASE_NAME,
   srcs = NPM_MODULE_EXTRA_FILES,
-  deps = DEPS + [":tsc"],
+  deps = RUNTIME_DEPS + [":target_node", ":tsc_types"],
   package_name = PKG_REQUIRE_NAME,
   visibility = ["//visibility:public"],
 )

packages/kbn-plugin-generator/package.json

@@ -3,6 +3,6 @@
   "version": "1.0.0",
   "private": true,
   "license": "SSPL-1.0 OR Elastic License 2.0",
-  "main": "target/index.js",
-  "types": "target/index.d.ts"
+  "main": "target_node/index.js",
+  "types": "target_types/index.d.ts"
 }

packages/kbn-plugin-generator/tsconfig.json

@@ -1,12 +1,13 @@
 {
   "extends": "../../tsconfig.bazel.json",
   "compilerOptions": {
-    "outDir": "target",
-    "target": "ES2019",
     "declaration": true,
     "declarationMap": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
     "sourceMap": true,
     "sourceRoot": "../../../../packages/kbn-plugin-generator/src",
+    "target": "ES2019",
     "types": [
       "jest",
       "node"

src/plugins/interactive_setup/common/elasticsearch_connection_status.ts

@@ -10,11 +10,6 @@
  * Describes current status of the Elasticsearch connection.
  */
 export enum ElasticsearchConnectionStatus {
-  /**
-   * Indicates that Kibana hasn't figured out yet if existing Elasticsearch connection configuration is valid.
-   */
-  Unknown = 'unknown',
-
   /**
    * Indicates that current Elasticsearch connection configuration valid and sufficient.
    */

src/plugins/interactive_setup/server/config.test.ts

@@ -0,0 +1,43 @@
+/*
+ * 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 { ConfigSchema } from './config';
+
+describe('config schema', () => {
+  it('generates proper defaults', () => {
+    expect(ConfigSchema.validate({})).toMatchInlineSnapshot(`
+      Object {
+        "connectionCheck": Object {
+          "interval": "PT5S",
+        },
+        "enabled": false,
+      }
+    `);
+  });
+
+  describe('#connectionCheck', () => {
+    it('should properly set required connection check interval', () => {
+      expect(ConfigSchema.validate({ connectionCheck: { interval: '1s' } })).toMatchInlineSnapshot(`
+        Object {
+          "connectionCheck": Object {
+            "interval": "PT1S",
+          },
+          "enabled": false,
+        }
+      `);
+    });
+
+    it('should throw error if interactiveSetup.connectionCheck.interval is less than 1 second', () => {
+      expect(() =>
+        ConfigSchema.validate({ connectionCheck: { interval: 100 } })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[connectionCheck.interval]: the value must be greater or equal to 1 second."`
+      );
+    });
+  });
+});

src/plugins/interactive_setup/server/config.ts

@@ -13,4 +13,14 @@ export type ConfigType = TypeOf<typeof ConfigSchema>;
 
 export const ConfigSchema = schema.object({
   enabled: schema.boolean({ defaultValue: false }),
+  connectionCheck: schema.object({
+    interval: schema.duration({
+      defaultValue: '5s',
+      validate(value) {
+        if (value.asSeconds() < 1) {
+          return 'the value must be greater or equal to 1 second.';
+        }
+      },
+    }),
+  }),
 });

src/plugins/interactive_setup/server/elasticsearch_service.mock.ts

@@ -0,0 +1,20 @@
+/*
+ * 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 { BehaviorSubject } from 'rxjs';
+
+import { ElasticsearchConnectionStatus } from '../common';
+
+export const elasticsearchServiceMock = {
+  createSetup: () => ({
+    connectionStatus$: new BehaviorSubject<ElasticsearchConnectionStatus>(
+      ElasticsearchConnectionStatus.Configured
+    ),
+    enroll: jest.fn(),
+  }),
+};