Infra server NP shim + config/routing API adoption

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

@@ -78,7 +78,10 @@ async function getParamsForSearchRequest(
 ) {
   const { uiSettings } = context.core;
   const [indices, includeFrozen] = await Promise.all([
-    getApmIndices(context),
+    getApmIndices({
+      savedObjectsClient: context.core.savedObjects.client,
+      config: context.config
+    }),
     uiSettings.client.get('search:includeFrozen')
   ]);
 

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

@@ -50,6 +50,11 @@ function getMockRequest() {
         client: {
           get: jest.fn().mockResolvedValue(false)
         }
+      },
+      savedObjects: {
+        client: {
+          get: jest.fn()
+        }
       }
     }
   } as unknown) as APMRequestHandlerContext & {
@@ -65,6 +70,11 @@ function getMockRequest() {
           get: jest.Mock<any, any>;
         };
       };
+      savedObjects: {
+        client: {
+          get: jest.Mock<any, any>;
+        };
+      };
     };
   };
 

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

@@ -73,7 +73,10 @@ export async function setupRequest<TParams extends SetupRequestParams>(
   const { config } = context;
   const { query } = context.params;
 
-  const indices = await getApmIndices(context);
+  const indices = await getApmIndices({
+    savedObjectsClient: context.core.savedObjects.client,
+    config
+  });
 
   const dynamicIndexPattern = await getDynamicIndexPattern({
     context,

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

@@ -54,15 +54,25 @@ export function getApmIndicesConfig(config: APMConfig): ApmIndicesConfig {
   };
 }
 
-export async function getApmIndices(context: APMRequestHandlerContext) {
+// export async function getApmIndices(context: APMRequestHandlerContext) {
+//   return _getApmIndices(context.core, context.config);
+// }
+
+export async function getApmIndices({
+  config,
+  savedObjectsClient
+}: {
+  config: APMConfig;
+  savedObjectsClient: SavedObjectsClientContract;
+}) {
   try {
     const apmIndicesSavedObject = await getApmIndicesSavedObject(
-      context.core.savedObjects.client
+      savedObjectsClient
     );
-    const apmIndicesConfig = getApmIndicesConfig(context.config);
+    const apmIndicesConfig = getApmIndicesConfig(config);
     return merge({}, apmIndicesConfig, apmIndicesSavedObject);
   } catch (error) {
-    return getApmIndicesConfig(context.config);
+    return getApmIndicesConfig(config);
   }
 }
 

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);
+    return await getApmIndices({
+      savedObjectsClient: context.core.savedObjects.client,
+      config: context.config
+    });
   }
 }));
 

x-pack/legacy/plugins/infra/common/http_api/metadata_api.ts

@@ -5,7 +5,6 @@
  */
 
 import * as rt from 'io-ts';
-import { InfraWrappableRequest } from '../../server/lib/adapters/framework';
 
 export const InfraMetadataNodeTypeRT = rt.keyof({
   host: null,
@@ -67,6 +66,7 @@ export const InfraMetadataInfoRT = rt.partial({
 });
 
 const InfraMetadataRequiredRT = rt.type({
+  id: rt.string,
   name: rt.string,
   features: rt.array(InfraMetadataFeatureRT),
 });
@@ -81,8 +81,6 @@ export type InfraMetadata = rt.TypeOf<typeof InfraMetadataRT>;
 
 export type InfraMetadataRequest = rt.TypeOf<typeof InfraMetadataRequestRT>;
 
-export type InfraMetadataWrappedRequest = InfraWrappableRequest<InfraMetadataRequest>;
-
 export type InfraMetadataFeature = rt.TypeOf<typeof InfraMetadataFeatureRT>;
 
 export type InfraMetadataInfo = rt.TypeOf<typeof InfraMetadataInfoRT>;

x-pack/legacy/plugins/infra/common/http_api/node_details_api.ts

@@ -6,7 +6,6 @@
 
 import * as rt from 'io-ts';
 import { InventoryMetricRT, ItemTypeRT } from '../inventory_models/types';
-import { InfraWrappableRequest } from '../../server/lib/adapters/framework';
 import { InfraTimerangeInputRT } from './snapshot_api';
 
 const NodeDetailsDataPointRT = rt.intersection([
@@ -53,6 +52,4 @@ export const NodeDetailsRequestRT = rt.intersection([
 // export type NodeDetailsRequest = InfraWrappableRequest<NodesArgs & SourceArgs>;
 
 export type NodeDetailsRequest = rt.TypeOf<typeof NodeDetailsRequestRT>;
-export type NodeDetailsWrappedRequest = InfraWrappableRequest<NodeDetailsRequest>;
-
 export type NodeDetailsMetricDataResponse = rt.TypeOf<typeof NodeDetailsMetricDataResponseRT>;

x-pack/legacy/plugins/infra/common/http_api/snapshot_api.ts

@@ -5,7 +5,6 @@
  */
 
 import * as rt from 'io-ts';
-import { InfraWrappableRequest } from '../../server/lib/adapters/framework';
 import { SnapshotMetricTypeRT, ItemTypeRT } from '../inventory_models/types';
 
 export const SnapshotNodePathRT = rt.intersection([
@@ -64,6 +63,5 @@ export const SnapshotRequestRT = rt.intersection([
 ]);
 
 export type SnapshotRequest = rt.TypeOf<typeof SnapshotRequestRT>;
-export type SnapshotWrappedRequest = InfraWrappableRequest<SnapshotRequest>;
 export type SnapshotNode = rt.TypeOf<typeof SnapshotNodeRT>;
 export type SnapshotNodeResponse = rt.TypeOf<typeof SnapshotNodeResponseRT>;

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

@@ -7,9 +7,14 @@
 import { i18n } from '@kbn/i18n';
 import JoiNamespace from 'joi';
 import { resolve } from 'path';
-
-import { getConfigSchema, initServerWithKibana } from './server/kibana.index';
+import { PluginInitializerContext } 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 { APMPluginContract } from '../../../plugins/apm/server/plugin';
 
 const APP_ID = 'infra';
 const logsSampleDataLinkLabel = i18n.translate('xpack.infra.sampleDataLinkLabel', {
@@ -70,9 +75,52 @@ export function infra(kibana: any) {
     config(Joi: typeof JoiNamespace) {
       return getConfigSchema(Joi);
     },
-    init(server: any) {
-      initServerWithKibana(server);
-      server.addAppLinksToSampleDataset('logs', [
+    init(legacyServer: any) {
+      const { newPlatform } = legacyServer as KbnServer;
+      const { core, plugins } = newPlatform.setup;
+
+      const infraSetup = (plugins.infra as unknown) as InfraSetup; // chef's kiss
+
+      const initContext = ({
+        config: infraSetup.__legacy.config,
+      } as unknown) as PluginInitializerContext;
+      // NP_TODO: Use real types from the other plugins as they are migrated
+      const pluginDeps: InfraServerPluginDeps = {
+        usageCollection: plugins.usageCollection as UsageCollectionSetup,
+        indexPatterns: {
+          indexPatternsServiceFactory: legacyServer.indexPatternsServiceFactory,
+        },
+        metrics: legacyServer.plugins.metrics,
+        spaces: plugins.spaces,
+        features: plugins.features,
+        // NP_NOTE: [TSVB_GROUP] Huge hack to make TSVB (getVisData()) work with raw requests that
+        // originate from the New Platform router (and are very different to the old request object).
+        // Once TSVB has migrated over to NP, and can work with the new raw requests, or ideally just
+        // the requestContext, this can be removed.
+        ___legacy: {
+          tsvb: {
+            elasticsearch: legacyServer.plugins.elasticsearch,
+            __internals: legacyServer.newPlatform.__internals,
+          },
+        },
+        apm: plugins.apm as APMPluginContract,
+      };
+
+      const infraPluginInstance = plugin(initContext);
+      infraPluginInstance.setup(core, pluginDeps);
+
+      // NP_TODO: EVERYTHING BELOW HERE IS LEGACY
+
+      const libs = infraPluginInstance.getLibs();
+
+      // NP_TODO how do we replace this? Answer: return from setup function.
+      legacyServer.expose(
+        'defineInternalSourceConfiguration',
+        libs.sources.defineInternalSourceConfiguration.bind(libs.sources)
+      );
+
+      // NP_TODO: How do we move this to new platform?
+      legacyServer.addAppLinksToSampleDataset('logs', [
         {
           path: `/app/${APP_ID}#/logs`,
           label: logsSampleDataLinkLabel,

x-pack/legacy/plugins/infra/public/lib/adapters/framework/kibana_framework_adapter.ts

@@ -24,7 +24,7 @@ import {
 const ROOT_ELEMENT_ID = 'react-infra-root';
 const BREADCRUMBS_ELEMENT_ID = 'react-infra-breadcrumbs';
 
-export class InfraKibanaFrameworkAdapter implements InfraFrameworkAdapter {
+export class KibanaFramework implements InfraFrameworkAdapter {
   public appState: object;
   public kbnVersion?: string;
   public timezone?: string;

x-pack/legacy/plugins/infra/public/lib/compose/kibana_compose.ts

@@ -20,7 +20,7 @@ import { HttpLink } from 'apollo-link-http';
 import { withClientState } from 'apollo-link-state';
 import { InfraFrontendLibs } from '../lib';
 import introspectionQueryResultData from '../../graphql/introspection.json';
-import { InfraKibanaFrameworkAdapter } from '../adapters/framework/kibana_framework_adapter';
+import { KibanaFramework } from '../adapters/framework/kibana_framework_adapter';
 import { InfraKibanaObservableApiAdapter } from '../adapters/observable_api/kibana_observable_api';
 
 export function compose(): InfraFrontendLibs {
@@ -57,7 +57,7 @@ export function compose(): InfraFrontendLibs {
 
   const infraModule = uiModules.get('app/infa');
 
-  const framework = new InfraKibanaFrameworkAdapter(infraModule, uiRoutes, timezoneProvider);
+  const framework = new KibanaFramework(infraModule, uiRoutes, timezoneProvider);
 
   const libs: InfraFrontendLibs = {
     apolloClient,

x-pack/legacy/plugins/infra/public/lib/compose/testing_compose.ts

@@ -17,7 +17,7 @@ import { InMemoryCache } from 'apollo-cache-inmemory';
 import ApolloClient from 'apollo-client';
 import { SchemaLink } from 'apollo-link-schema';
 import { addMockFunctionsToSchema, makeExecutableSchema } from 'graphql-tools';
-import { InfraKibanaFrameworkAdapter } from '../adapters/framework/kibana_framework_adapter';
+import { KibanaFramework } from '../adapters/framework/kibana_framework_adapter';
 import { InfraKibanaObservableApiAdapter } from '../adapters/observable_api/kibana_observable_api';
 import { InfraFrontendLibs } from '../lib';
 
@@ -27,7 +27,7 @@ export function compose(): InfraFrontendLibs {
     basePath: chrome.getBasePath(),
     xsrfToken: chrome.getXsrfToken(),
   });
-  const framework = new InfraKibanaFrameworkAdapter(infraModule, uiRoutes, timezoneProvider);
+  const framework = new KibanaFramework(infraModule, uiRoutes, timezoneProvider);
   const typeDefs = `
   Query {}
 `;

x-pack/legacy/plugins/infra/server/features.ts

@@ -0,0 +1,65 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const METRICS_FEATURE = {
+  id: 'infrastructure',
+  name: i18n.translate('xpack.infra.featureRegistry.linkInfrastructureTitle', {
+    defaultMessage: 'Infrastructure',
+  }),
+  icon: 'infraApp',
+  navLinkId: 'infra:home',
+  app: ['infra', 'kibana'],
+  catalogue: ['infraops'],
+  privileges: {
+    all: {
+      api: ['infra'],
+      savedObject: {
+        all: ['infrastructure-ui-source'],
+        read: ['index-pattern'],
+      },
+      ui: ['show', 'configureSource', 'save'],
+    },
+    read: {
+      api: ['infra'],
+      savedObject: {
+        all: [],
+        read: ['infrastructure-ui-source', 'index-pattern'],
+      },
+      ui: ['show'],
+    },
+  },
+};
+
+export const LOGS_FEATURE = {
+  id: 'logs',
+  name: i18n.translate('xpack.infra.featureRegistry.linkLogsTitle', {
+    defaultMessage: 'Logs',
+  }),
+  icon: 'loggingApp',
+  navLinkId: 'infra:logs',
+  app: ['infra', 'kibana'],
+  catalogue: ['infralogging'],
+  privileges: {
+    all: {
+      api: ['infra'],
+      savedObject: {
+        all: ['infrastructure-ui-source'],
+        read: [],
+      },
+      ui: ['show', 'configureSource', 'save'],
+    },
+    read: {
+      api: ['infra'],
+      savedObject: {
+        all: [],
+        read: ['infrastructure-ui-source'],
+      },
+      ui: ['show'],
+    },
+  },
+};

x-pack/legacy/plugins/infra/server/infra_server.ts

@@ -30,7 +30,7 @@ export const initInfraServer = (libs: InfraBackendLibs) => {
     typeDefs: schemas,
   });
 
-  libs.framework.registerGraphQLEndpoint('/api/infra/graphql', schema);
+  libs.framework.registerGraphQLEndpoint('/graphql', schema);
 
   initIpToHostName(libs);
   initLogAnalysisGetLogEntryRateRoute(libs);