Merge branch 'logs-ui-server-np-shim' of github.com:jasonrhodes/kiban…

…a into logs-ui-server-np-shim

x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.ts

@@ -70,10 +70,10 @@ export async function setupRequest<TParams extends SetupRequestParams>(
   context: APMRequestHandlerContext<TParams>,
   request: KibanaRequest
 ): Promise<InferSetup<TParams>> {
-  const { config } = context;
+  const { config, core } = context;
   const { query } = context.params;
 
-  const indices = await getApmIndices(context.core, context.config);
+  const indices = await getApmIndices(core.savedObjects.client, config);
 
   const dynamicIndexPattern = await getDynamicIndexPattern({
     context,

x-pack/legacy/plugins/apm/server/lib/settings/apm_indices/get_apm_indices.ts

@@ -59,12 +59,12 @@ export function getApmIndicesConfig(config: APMConfig): ApmIndicesConfig {
 // }
 
 export async function getApmIndices(
-  core: APMRequestHandlerContext['core'],
+  savedObjectsClient: SavedObjectsClientContract,
   config: APMRequestHandlerContext['config']
 ) {
   try {
     const apmIndicesSavedObject = await getApmIndicesSavedObject(
-      core.savedObjects.client
+      savedObjectsClient
     );
     const apmIndicesConfig = getApmIndicesConfig(config);
     return merge({}, apmIndicesConfig, apmIndicesSavedObject);

x-pack/legacy/plugins/apm/server/routes/settings/apm_indices.ts

@@ -26,7 +26,10 @@ export const apmIndicesRoute = createRoute(() => ({
   method: 'GET',
   path: '/api/apm/settings/apm-indices',
   handler: async ({ context }) => {
-    return await getApmIndices(context.core, context.config);
+    return await getApmIndices(
+      context.core.savedObjects.client,
+      context.config
+    );
   }
 }));
 

x-pack/legacy/plugins/infra/index.ts

@@ -7,14 +7,14 @@
 import { i18n } from '@kbn/i18n';
 import JoiNamespace from 'joi';
 import { resolve } from 'path';
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext, SavedObjectsClientContract } from 'src/core/server';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import KbnServer from 'src/legacy/server/kbn_server';
 import { getConfigSchema } from './server/kibana.index';
 import { savedObjectMappings } from './server/saved_objects';
 import { plugin, InfraServerPluginDeps } from './server/new_platform_index';
 import { InfraSetup } from '../../../plugins/infra/server';
-import { getApmIndices } from '../apm/server/lib/settings/apm_indices/get_apm_indices';
+import { APMPluginContract } from '../../../plugins/apm/server/plugin';
 
 const APP_ID = 'infra';
 const logsSampleDataLinkLabel = i18n.translate('xpack.infra.sampleDataLinkLabel', {
@@ -103,12 +103,7 @@ export function infra(kibana: any) {
             __internals: legacyServer.newPlatform.__internals,
           },
         },
-        apm: {
-          // NP_NOTE: This needs migrating once APM's getApmIndices() has been ported to NP.
-          // On our side we're using the NP savedObjectsClient, but legacyServer.config() needs to go.
-          getIndices: savedObjectsClient =>
-            getApmIndices({ savedObjectsClient, config: legacyServer.config() }),
-        },
+        apm: plugins.apm as APMPluginContract,
       };
 
       const infraPluginInstance = plugin(initContext);

x-pack/legacy/plugins/infra/server/lib/adapters/framework/adapter_types.ts

@@ -9,6 +9,7 @@ import { Lifecycle } from 'hapi';
 import { ObjectType } from '@kbn/config-schema';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { RouteMethod, RouteConfig } from '../../../../../../../../src/core/server';
+import { APMPluginContract } from '../../../../../../../plugins/apm/server/plugin';
 
 interface ApmIndices {
   'apm_oss.transactionIndices': string | undefined;
@@ -25,9 +26,7 @@ export interface InfraServerPluginDeps {
     indexPatternsServiceFactory: any;
   };
   features: any;
-  apm: {
-    getIndices: (savedObjectsClient: any) => Promise<ApmIndices>;
-  };
+  apm: APMPluginContract;
   ___legacy: any;
 }
 

x-pack/legacy/plugins/infra/server/routes/metadata/lib/has_apm_data.ts

@@ -17,7 +17,7 @@ export const hasAPMData = async (
   nodeId: string,
   nodeType: 'host' | 'pod' | 'container'
 ) => {
-  const apmIndices = await framework.plugins.apm.getIndices(
+  const apmIndices = await framework.plugins.apm.getApmIndices(
     requestContext.core.savedObjects.client
   );
   const apmIndex = apmIndices['apm_oss.transactionIndices'] || 'apm-*';

x-pack/plugins/apm/server/plugin.ts

@@ -8,6 +8,7 @@ import {
   Plugin,
   CoreSetup,
   RequestHandlerContext,
+  SavedObjectsClientContract,
 } from 'src/core/server';
 import { Observable, combineLatest, AsyncSubject } from 'rxjs';
 import { map } from 'rxjs/operators';
@@ -26,14 +27,18 @@ export interface LegacySetup {
 export interface APMPluginContract {
   config$: Observable<APMConfig>;
   registerLegacyAPI: (__LEGACY: LegacySetup) => void;
+  getApmIndices: (
+    savedObjectsClient: SavedObjectsClientContract
+  ) => ReturnType<typeof getApmIndices>;
 }
 
 export class APMPlugin implements Plugin<APMPluginContract> {
   legacySetup$: AsyncSubject<LegacySetup>;
-  currentConfig?: APMConfig;
+  currentConfig: APMConfig;
   constructor(private readonly initContext: PluginInitializerContext) {
     this.initContext = initContext;
     this.legacySetup$ = new AsyncSubject();
+    this.currentConfig = {} as APMConfig;
   }
 
   public async setup(
@@ -72,8 +77,8 @@ export class APMPlugin implements Plugin<APMPluginContract> {
         this.legacySetup$.next(__LEGACY);
         this.legacySetup$.complete();
       }),
-      getApmIndices: async (requestContext: RequestHandlerContext) => {
-        return getApmIndices(requestContext.core, this.currentConfig as APMConfig);
+      getApmIndices: async (savedObjectsClient: SavedObjectsClientContract) => {
+        return getApmIndices(savedObjectsClient, this.currentConfig);
       },
     };
   }