expose es config on es setup contract

docs/development/core/server/kibana-plugin-core-server.elasticsearchservicesetup.config_.md

@@ -0,0 +1,18 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [ElasticsearchServiceSetup](./kibana-plugin-core-server.elasticsearchservicesetup.md) &gt; [config$](./kibana-plugin-core-server.elasticsearchservicesetup.config_.md)
+
+## ElasticsearchServiceSetup.config$ property
+
+> Warning: This API is now obsolete.
+> 
+> this will be removed in a later version.
+> 
+
+Provide direct access to the current elasticsearch configuration.
+
+<b>Signature:</b>
+
+```typescript
+readonly config$: Observable<ElasticsearchConfig>;
+```

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

@@ -15,5 +15,6 @@ export interface ElasticsearchServiceSetup
 
 |  Property | Type | Description |
 |  --- | --- | --- |
+|  [config$](./kibana-plugin-core-server.elasticsearchservicesetup.config_.md) | <code>Observable&lt;ElasticsearchConfig&gt;</code> | Provide direct access to the current elasticsearch configuration. |
 |  [legacy](./kibana-plugin-core-server.elasticsearchservicesetup.legacy.md) | <code>{</code><br/><code>        readonly createClient: (type: string, clientConfig?: Partial&lt;LegacyElasticsearchClientConfig&gt;) =&gt; ILegacyCustomClusterClient;</code><br/><code>        readonly client: ILegacyClusterClient;</code><br/><code>    }</code> |  |
 

src/core/server/elasticsearch/elasticsearch_service.mock.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
 import { ILegacyClusterClient, ILegacyCustomClusterClient } from './legacy';
 import {
   elasticsearchClientMock,
@@ -32,13 +32,14 @@ import { NodesVersionCompatibility } from './version_check/ensure_es_version';
 import { ServiceStatus, ServiceStatusLevels } from '../status';
 
 interface MockedElasticSearchServiceSetup {
+  config$: Observable<ElasticsearchConfig>;
   legacy: {
     createClient: jest.Mock<ILegacyCustomClusterClient, any>;
     client: jest.Mocked<ILegacyClusterClient>;
   };
 }
 
-type MockedElasticSearchServiceStart = MockedElasticSearchServiceSetup;
+type MockedElasticSearchServiceStart = Omit<MockedElasticSearchServiceSetup, 'config$'>;
 
 interface MockedInternalElasticSearchServiceStart extends MockedElasticSearchServiceStart {
   client: ClusterClientMock;
@@ -47,6 +48,7 @@ interface MockedInternalElasticSearchServiceStart extends MockedElasticSearchSer
 
 const createSetupContractMock = () => {
   const setupContract: MockedElasticSearchServiceSetup = {
+    config$: new BehaviorSubject({} as ElasticsearchConfig),
     legacy: {
       createClient: jest.fn(),
       client: legacyClientMock.createClusterClient(),
@@ -92,6 +94,7 @@ type MockedInternalElasticSearchServiceSetup = jest.Mocked<
 >;
 const createInternalSetupContractMock = () => {
   const setupContract: MockedInternalElasticSearchServiceSetup = {
+    config$: new BehaviorSubject({} as ElasticsearchConfig),
     esNodesCompatibility$: new BehaviorSubject<NodesVersionCompatibility>({
       isCompatible: true,
       incompatibleNodes: [],
@@ -103,7 +106,6 @@ const createInternalSetupContractMock = () => {
       summary: 'Elasticsearch is available',
     }),
     legacy: {
-      config$: new BehaviorSubject({} as ElasticsearchConfig),
       ...createSetupContractMock().legacy,
     },
   };

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

@@ -81,10 +81,10 @@ beforeEach(() => {
 afterEach(() => jest.clearAllMocks());
 
 describe('#setup', () => {
-  it('returns legacy Elasticsearch config as a part of the contract', async () => {
+  it('returns Elasticsearch config as a part of the contract', async () => {
     const setupContract = await elasticsearchService.setup(setupDeps);
 
-    await expect(setupContract.legacy.config$.pipe(first()).toPromise()).resolves.toBeInstanceOf(
+    await expect(setupContract.config$.pipe(first()).toPromise()).resolves.toBeInstanceOf(
       ElasticsearchConfig
     );
   });

src/core/server/elasticsearch/elasticsearch_service.ts

@@ -94,8 +94,8 @@ export class ElasticsearchService
     };
 
     return {
+      config$: this.config$,
       legacy: {
-        config$: this.config$,
         client: this.legacyClient,
         createClient: this.createLegacyCustomClient,
       },

src/core/server/elasticsearch/types.ts

@@ -34,11 +34,17 @@ import { ServiceStatus } from '../status';
  * @public
  */
 export interface ElasticsearchServiceSetup {
+  /**
+   * Provide direct access to the current elasticsearch configuration.
+   *
+   * @deprecated this will be removed in a later version.
+   */
+  readonly config$: Observable<ElasticsearchConfig>;
+
   /**
    * @deprecated
    * Use {@link ElasticsearchServiceStart.legacy} instead.
-   *
-   * */
+   */
   legacy: {
     /**
      * @deprecated
@@ -82,11 +88,7 @@ export interface ElasticsearchServiceSetup {
 }
 
 /** @internal */
-export interface InternalElasticsearchServiceSetup {
-  // Required for the BWC with the legacy Kibana only.
-  readonly legacy: ElasticsearchServiceSetup['legacy'] & {
-    readonly config$: Observable<ElasticsearchConfig>;
-  };
+export interface InternalElasticsearchServiceSetup extends ElasticsearchServiceSetup {
   esNodesCompatibility$: Observable<NodesVersionCompatibility>;
   status$: Observable<ServiceStatus<ElasticsearchStatusMeta>>;
 }

src/core/server/legacy/legacy_service.ts

@@ -288,6 +288,7 @@ export class LegacyService implements CoreService {
       capabilities: setupDeps.core.capabilities,
       context: setupDeps.core.context,
       elasticsearch: {
+        config$: setupDeps.core.elasticsearch.config$,
         legacy: {
           client: setupDeps.core.elasticsearch.legacy.client,
           createClient: setupDeps.core.elasticsearch.legacy.createClient,

src/core/server/plugins/plugin_context.ts

@@ -147,6 +147,7 @@ export function createPluginSetupContext<TPlugin, TPluginDependencies>(
       createContextContainer: deps.context.createContextContainer,
     },
     elasticsearch: {
+      config$: deps.elasticsearch.config$,
       legacy: deps.elasticsearch.legacy,
     },
     http: {

src/core/server/server.api.md

@@ -669,6 +669,8 @@ export class ElasticsearchConfig {
 
 // @public (undocumented)
 export interface ElasticsearchServiceSetup {
+    // @deprecated
+    readonly config$: Observable<ElasticsearchConfig>;
     // @deprecated (undocumented)
     legacy: {
         readonly createClient: (type: string, clientConfig?: Partial<LegacyElasticsearchClientConfig>) => ILegacyCustomClusterClient;

src/legacy/core_plugins/console_legacy/index.ts

@@ -33,7 +33,7 @@ export default function (kibana: any) {
     id: 'console_legacy',
 
     async init(server: any) {
-      _legacyEsConfig = await server.newPlatform.__internals.elasticsearch.legacy.config$
+      _legacyEsConfig = await server.newPlatform.__internals.elasticsearch.config$
         .pipe(first())
         .toPromise();
     },

src/legacy/core_plugins/elasticsearch/index.js

@@ -38,7 +38,7 @@ export default function (kibana) {
       const adminCluster = new Cluster(client);
       const dataCluster = new Cluster(client);
 
-      const esConfig = await server.newPlatform.__internals.elasticsearch.legacy.config$
+      const esConfig = await server.newPlatform.__internals.elasticsearch.config$
         .pipe(first())
         .toPromise();