Move src/legacy/server/index_patterns to data plugin (server) (Remo…

…ve step) (#61618) * Removed legacy index pattern * fix type * remove unnecessary import * Removed old references to indexPatternsServiceFactory Co-authored-by: Elastic Machine <[email protected]>
elastic · Apr 2, 2020 · 486d75c · 486d75c
1 parent fa4699f
commit 486d75c
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 99 deletions.
diff --git a/kibana.d.ts b/kibana.d.ts
@@ -37,7 +37,6 @@ import * as LegacyKibanaServer from './src/legacy/server/kbn_server';
  */
 // eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace Legacy {
-  export type IndexPatternsService = LegacyKibanaServer.IndexPatternsService;
   export type KibanaConfig = LegacyKibanaServer.KibanaConfig;
   export type Request = LegacyKibanaServer.Request;
   export type ResponseToolkit = LegacyKibanaServer.ResponseToolkit;

diff --git a/src/legacy/server/index_patterns/index.ts b/src/legacy/server/index_patterns/index.ts
diff --git a/src/legacy/server/index_patterns/mixin.ts b/src/legacy/server/index_patterns/mixin.ts
diff --git a/src/legacy/server/kbn_server.d.ts b/src/legacy/server/kbn_server.d.ts
@@ -44,7 +44,6 @@ import { LegacyConfig, ILegacyService, ILegacyInternals } from '../../core/serve
 import { ApmOssPlugin } from '../core_plugins/apm_oss';
 import { CallClusterWithRequest, ElasticsearchPlugin } from '../core_plugins/elasticsearch';
 import { UsageCollectionSetup } from '../../plugins/usage_collection/server';
-import { IndexPatternsServiceFactory } from './index_patterns';
 import { Capabilities } from '../../core/server';
 import { UiSettingsServiceFactoryOptions } from '../../legacy/ui/ui_settings/ui_settings_service_factory';
 import { HomeServerPluginSetup } from '../../plugins/home/server';
@@ -68,7 +67,6 @@ declare module 'hapi' {
 
   interface Server {
     config: () => KibanaConfig;
-    indexPatternsServiceFactory: IndexPatternsServiceFactory;
     savedObjects: SavedObjectsLegacyService;
     injectUiAppVars: (pluginName: string, getAppVars: () => { [key: string]: any }) => void;
     getHiddenUiAppById(appId: string): UiApp;
@@ -175,5 +173,4 @@ export default class KbnServer {
 export { Server, Request, ResponseToolkit } from 'hapi';
 
 // Re-export commonly accessed api types.
-export { IndexPatternsFetcher as IndexPatternsService } from './index_patterns';
 export { SavedObjectsLegacyService, SavedObjectsClient } from 'src/core/server';
diff --git a/src/legacy/server/kbn_server.js b/src/legacy/server/kbn_server.js
@@ -33,7 +33,6 @@ import pidMixin from './pid';
 import configCompleteMixin from './config/complete';
 import optimizeMixin from '../../optimize';
 import * as Plugins from './plugins';
-import { indexPatternsMixin } from './index_patterns';
 import { savedObjectsMixin } from './saved_objects/saved_objects_mixin';
 import { capabilitiesMixin } from './capabilities';
 import { serverExtensionsMixin } from './server_extensions';
@@ -114,7 +113,6 @@ export default class KbnServer {
 
         // setup this.uiBundles
         uiMixin,
-        indexPatternsMixin,
 
         // setup saved object routes
         savedObjectsMixin,

diff --git a/src/legacy/server/saved_objects/saved_objects_mixin.test.js b/src/legacy/server/saved_objects/saved_objects_mixin.test.js
@@ -118,11 +118,6 @@ describe('Saved Objects Mixin', () => {
           get: stubConfig,
         };
       },
-      indexPatternsServiceFactory: () => {
-        return {
-          getFieldsForWildcard: jest.fn(),
-        };
-      },
       plugins: {
         elasticsearch: {
           getCluster: () => {

diff --git a/x-pack/plugins/infra/server/lib/adapters/framework/adapter_types.ts b/x-pack/plugins/infra/server/lib/adapters/framework/adapter_types.ts
@@ -21,9 +21,6 @@ export interface InfraServerPluginDeps {
   spaces: SpacesPluginSetup;
   usageCollection: UsageCollectionSetup;
   metrics: VisTypeTimeseriesSetup;
-  indexPatterns: {
-    indexPatternsServiceFactory: any;
-  };
   features: FeaturesPluginSetup;
   apm: APMPluginContract;
   alerting: AlertingPluginContract;

diff --git a/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
@@ -7,7 +7,6 @@
 /* eslint-disable @typescript-eslint/array-type */
 
 import { GraphQLSchema } from 'graphql';
-import { Legacy } from 'kibana';
 import { runHttpQuery } from 'apollo-server-core';
 import { schema, TypeOf } from '@kbn/config-schema';
 import {
@@ -217,9 +216,7 @@ export class KibanaFramework {
     });
   }
 
-  public getIndexPatternsService(
-    requestContext: RequestHandlerContext
-  ): Legacy.IndexPatternsService {
+  public getIndexPatternsService(requestContext: RequestHandlerContext): IndexPatternsFetcher {
     return new IndexPatternsFetcher((...rest: Parameters<APICaller>) => {
       rest[1] = rest[1] || {};
       rest[1].allowNoIndices = true;