Enable Product check from @elastic/elasticsearch-js

docs/development/core/server/kibana-plugin-core-server.elasticsearchconfig.md

@@ -33,7 +33,6 @@ export declare class ElasticsearchConfig
 |  [requestTimeout](./kibana-plugin-core-server.elasticsearchconfig.requesttimeout.md) |  | <code>Duration</code> | Timeout after which HTTP request will be aborted and retried. |
 |  [serviceAccountToken](./kibana-plugin-core-server.elasticsearchconfig.serviceaccounttoken.md) |  | <code>string</code> | If Elasticsearch security features are enabled, this setting provides the service account token that the Kibana server users to perform its administrative functions.<!-- -->This is an alternative to specifying a username and password. |
 |  [shardTimeout](./kibana-plugin-core-server.elasticsearchconfig.shardtimeout.md) |  | <code>Duration</code> | Timeout for Elasticsearch to wait for responses from shards. Set to 0 to disable. |
-|  [skipStartupConnectionCheck](./kibana-plugin-core-server.elasticsearchconfig.skipstartupconnectioncheck.md) |  | <code>boolean</code> | Skip the valid connection check during startup. The connection check allows Kibana to ensure that the Elasticsearch connection is valid before allowing any other services to be set up. |
 |  [sniffInterval](./kibana-plugin-core-server.elasticsearchconfig.sniffinterval.md) |  | <code>false &#124; Duration</code> | Interval to perform a sniff operation and make sure the list of nodes is complete. If <code>false</code> then sniffing is disabled. |
 |  [sniffOnConnectionFault](./kibana-plugin-core-server.elasticsearchconfig.sniffonconnectionfault.md) |  | <code>boolean</code> | Specifies whether the client should immediately sniff for a more current list of nodes when a connection dies. |
 |  [sniffOnStart](./kibana-plugin-core-server.elasticsearchconfig.sniffonstart.md) |  | <code>boolean</code> | Specifies whether the client should attempt to detect the rest of the cluster when it is first instantiated. |

src/core/server/elasticsearch/elasticsearch_config.test.ts

@@ -398,3 +398,33 @@ test('serviceAccountToken does not throw if username is not set', () => {
 
   expect(() => config.schema.validate(obj)).not.toThrow();
 });
+
+describe('skipStartupConnectionCheck', () => {
+  test('defaults to `false`', () => {
+    const obj = {};
+    expect(() => config.schema.validate(obj)).not.toThrow();
+    expect(config.schema.validate(obj)).toEqual(
+      expect.objectContaining({
+        skipStartupConnectionCheck: false,
+      })
+    );
+  });
+
+  test('accepts `false` on both prod and dev mode', () => {
+    const obj = {
+      skipStartupConnectionCheck: false,
+    };
+    expect(() => config.schema.validate(obj, { dist: false })).not.toThrow();
+    expect(() => config.schema.validate(obj, { dist: true })).not.toThrow();
+  });
+
+  test('accepts `true` only when running from source to allow integration tests to run without an ES server', () => {
+    const obj = {
+      skipStartupConnectionCheck: true,
+    };
+    expect(() => config.schema.validate(obj, { dist: false })).not.toThrow();
+    expect(() => config.schema.validate(obj, { dist: true })).toThrowErrorMatchingInlineSnapshot(
+      `"[skipStartupConnectionCheck]: \\"skipStartupConnectionCheck\\" can only be set to true when running from source to allow integration tests to run without an ES server"`
+    );
+  });
+});

src/core/server/elasticsearch/elasticsearch_config.ts

@@ -153,7 +153,21 @@ export const configSchema = schema.object({
     }),
     schema.boolean({ defaultValue: false })
   ),
-  skipStartupConnectionCheck: schema.boolean({ defaultValue: false }),
+  skipStartupConnectionCheck: schema.conditional(
+    // Using dist over dev because integration_tests run with dev: false,
+    // and this config is solely introduced to allow some of the integration tests to run without an ES server.
+    schema.contextRef('dist'),
+    true,
+    schema.boolean({
+      validate: (rawValue) => {
+        if (rawValue === true) {
+          return '"skipStartupConnectionCheck" can only be set to true when running from source to allow integration tests to run without an ES server';
+        }
+      },
+      defaultValue: false,
+    }),
+    schema.boolean({ defaultValue: false })
+  ),
 });
 
 const deprecations: ConfigDeprecationProvider = () => [
@@ -222,7 +236,8 @@ export const config: ServiceConfigDescriptor<ElasticsearchConfigType> = {
  */
 export class ElasticsearchConfig {
   /**
-   * Skip the valid connection check during startup. The connection check allows
+   * @internal
+   * Only valid in dev mode. Skip the valid connection check during startup. The connection check allows
    * Kibana to ensure that the Elasticsearch connection is valid before allowing
    * any other services to be set up.
    *

src/core/server/server.api.md

@@ -237,7 +237,7 @@ export const config: {
                 delay: Type<import("moment").Duration>;
             }>;
             ignoreVersionMismatch: import("@kbn/config-schema/target_types/types").ConditionalType<false, boolean, boolean>;
-            skipStartupConnectionCheck: Type<boolean>;
+            skipStartupConnectionCheck: import("@kbn/config-schema/target_types/types").ConditionalType<true, boolean, boolean>;
         }>;
     };
     logging: {
@@ -826,6 +826,7 @@ export class ElasticsearchConfig {
     readonly requestTimeout: Duration;
     readonly serviceAccountToken?: string;
     readonly shardTimeout: Duration;
+    // @internal
     readonly skipStartupConnectionCheck: boolean;
     readonly sniffInterval: false | Duration;
     readonly sniffOnConnectionFault: boolean;

src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker

@@ -53,7 +53,6 @@ kibana_vars=(
     elasticsearch.requestTimeout
     elasticsearch.serviceAccountToken
     elasticsearch.shardTimeout
-    elasticsearch.skipStartupConnectionCheck
     elasticsearch.sniffInterval
     elasticsearch.sniffOnConnectionFault
     elasticsearch.sniffOnStart