Merge branch '7.x' into backport/7.x/pr-51505

x-pack/legacy/plugins/file_upload/common/constants/file_import.ts

@@ -16,3 +16,5 @@ export const ES_GEO_FIELD_TYPE = {
   GEO_POINT: 'geo_point',
   GEO_SHAPE: 'geo_shape',
 };
+
+export const DEFAULT_KBN_VERSION = 'kbnVersion';

x-pack/legacy/plugins/file_upload/index.js

@@ -3,10 +3,8 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { mirrorPluginStatus } from '../../server/lib/mirror_plugin_status';
-import { fileUploadRoutes } from './server/routes/file_upload';
-import { makeUsageCollector } from './server/telemetry/';
-import mappings from './mappings';
+import { FileUploadPlugin } from './server/plugin';
+import { mappings } from './mappings';
 
 export const fileUpload = kibana => {
   return new kibana.Plugin({
@@ -23,11 +21,26 @@ export const fileUpload = kibana => {
     },
 
     init(server) {
-      const { xpack_main: xpackMainPlugin } = server.plugins;
+      const coreSetup = server.newPlatform.setup.core;
+      const pluginsSetup = {};
 
-      mirrorPluginStatus(xpackMainPlugin, this);
-      fileUploadRoutes(server);
-      makeUsageCollector(server);
+      // legacy dependencies
+      const __LEGACY = {
+        route: server.route.bind(server),
+        plugins: {
+          elasticsearch: server.plugins.elasticsearch,
+        },
+        savedObjects: {
+          getSavedObjectsRepository: server.savedObjects.getSavedObjectsRepository
+        },
+        usage: {
+          collectorSet: {
+            makeUsageCollector: server.usage.collectorSet.makeUsageCollector
+          }
+        }
+      };
+
+      new FileUploadPlugin().setup(coreSetup, pluginsSetup, __LEGACY);
     }
   });
 };

x-pack/legacy/plugins/file_upload/mappings.ts

@@ -0,0 +1,15 @@
+/*
+ * 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.
+ */
+
+export const mappings = {
+  'file-upload-telemetry': {
+    properties: {
+      filesUploadedTotalCount: {
+        type: 'long',
+      },
+    },
+  },
+};

x-pack/legacy/plugins/file_upload/public/components/json_import_progress.js

@@ -8,7 +8,7 @@ import React, { Fragment, Component } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiCodeBlock, EuiSpacer, EuiText, EuiTitle, EuiProgress, EuiCallOut } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import chrome from 'ui/chrome';
+import { basePath } from '../kibana_services';
 
 export class JsonImportProgress extends Component {
 
@@ -114,7 +114,7 @@ export class JsonImportProgress extends Component {
                 <a
                   data-test-subj="indexManagementNewIndexLink"
                   target="_blank"
-                  href={`${chrome.getBasePath()}/app/kibana#/
+                  href={`${basePath}/app/kibana#/
                       management/elasticsearch/index_management/indices/
                       filter/${indexName}`.replace(/\s/g, '')}
                 >

x-pack/legacy/plugins/file_upload/public/index.js → x-pack/legacy/plugins/file_upload/public/index.ts

@@ -4,4 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { JsonUploadAndParse } from './components/json_upload_and_parse';
+import { FileUploadPlugin } from './plugin';
+
+export function plugin() {
+  return new FileUploadPlugin();
+}

x-pack/legacy/plugins/file_upload/public/kibana_services.js

@@ -5,5 +5,18 @@
  */
 
 import { start as data } from '../../../../../src/legacy/core_plugins/data/public/legacy';
+import { DEFAULT_KBN_VERSION } from '../common/constants/file_import';
 
 export const indexPatternService = data.indexPatterns.indexPatterns;
+
+export let savedObjectsClient;
+export let basePath;
+export let apiBasePath;
+export let kbnVersion;
+
+export const initServicesAndConstants = ({ savedObjects, http, injectedMetadata }) => {
+  savedObjectsClient = savedObjects.client;
+  basePath = http.basePath.basePath;
+  apiBasePath = http.basePath.prepend('/api');
+  kbnVersion = injectedMetadata.getKibanaVersion(DEFAULT_KBN_VERSION);
+};

x-pack/legacy/plugins/file_upload/public/legacy.ts

@@ -0,0 +1,12 @@
+/*
+ * 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 { npStart } from 'ui/new_platform';
+import { plugin } from '.';
+
+const pluginInstance = plugin();
+
+export const start = pluginInstance.start(npStart.core);

x-pack/legacy/plugins/file_upload/public/plugin.ts

@@ -0,0 +1,33 @@
+/*
+ * 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 { Plugin, CoreStart } from 'src/core/public';
+// @ts-ignore
+import { initResources } from './util/indexing_service';
+// @ts-ignore
+import { JsonUploadAndParse } from './components/json_upload_and_parse';
+// @ts-ignore
+import { initServicesAndConstants } from './kibana_services';
+
+/**
+ * These are the interfaces with your public contracts. You should export these
+ * for other plugins to use in _their_ `SetupDeps`/`StartDeps` interfaces.
+ * @public
+ */
+export type FileUploadPluginSetup = ReturnType<FileUploadPlugin['setup']>;
+export type FileUploadPluginStart = ReturnType<FileUploadPlugin['start']>;
+
+/** @internal */
+export class FileUploadPlugin implements Plugin<FileUploadPluginSetup, FileUploadPluginStart> {
+  public setup() {}
+
+  public start(core: CoreStart) {
+    initServicesAndConstants(core);
+    return {
+      JsonUploadAndParse,
+    };
+  }
+}

x-pack/legacy/plugins/file_upload/public/util/http_service.js

@@ -6,9 +6,9 @@
 
 // service for interacting with the server
 
-import chrome from 'ui/chrome';
 import { addSystemApiHeader } from 'ui/system_api';
 import { i18n } from '@kbn/i18n';
+import { kbnVersion } from '../kibana_services';
 
 export async function http(options) {
   if(!(options && options.url)) {
@@ -20,7 +20,7 @@ export async function http(options) {
   const url = options.url || '';
   const headers = addSystemApiHeader({
     'Content-Type': 'application/json',
-    'kbn-version': chrome.getXsrfToken(),
+    'kbn-version': kbnVersion,
     ...options.headers
   });
 

x-pack/legacy/plugins/file_upload/public/util/indexing_service.js

@@ -4,22 +4,23 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { http } from './http_service';
-import chrome from 'ui/chrome';
-import { i18n } from '@kbn/i18n';
-import { indexPatternService } from '../kibana_services';
+import { http as httpService } from './http_service';
+import {
+  indexPatternService,
+  apiBasePath,
+  savedObjectsClient
+} from '../kibana_services';
 import { getGeoJsonIndexingDetails } from './geo_processing';
 import { sizeLimitedChunking } from './size_limited_chunking';
+import { i18n } from '@kbn/i18n';
 
-const basePath = chrome.addBasePath('/api/fileupload');
 const fileType = 'json';
 
 export async function indexData(parsedFile, transformDetails, indexName, dataType, appName) {
   if (!parsedFile) {
     throw(i18n.translate('xpack.fileUpload.indexingService.noFileImported', {
       defaultMessage: 'No file imported.'
     }));
-    return;
   }
 
   // Perform any processing required on file prior to indexing
@@ -129,8 +130,8 @@ async function writeToIndex(indexingDetails) {
     ingestPipeline
   } = indexingDetails;
 
-  return await http({
-    url: `${basePath}/import${paramString}`,
+  return await httpService({
+    url: `${apiBasePath}/fileupload/import${paramString}`,
     method: 'POST',
     data: {
       index,
@@ -223,7 +224,6 @@ export async function createIndexPattern(indexPatternName) {
 }
 
 async function getIndexPatternId(name) {
-  const savedObjectsClient = chrome.getSavedObjectsClient();
   const savedObjectSearch =
     await savedObjectsClient.find({ type: 'index-pattern', perPage: 1000 });
   const indexPatternSavedObjects = savedObjectSearch.savedObjects;
@@ -237,9 +237,8 @@ async function getIndexPatternId(name) {
 }
 
 export const getExistingIndexNames = async () => {
-  const basePath = chrome.addBasePath('/api');
-  const indexes = await http({
-    url: `${basePath}/index_management/indices`,
+  const indexes = await httpService({
+    url: `${apiBasePath}/index_management/indices`,
     method: 'GET',
   });
   return indexes
@@ -248,7 +247,6 @@ export const getExistingIndexNames = async () => {
 };
 
 export const getExistingIndexPatternNames = async () => {
-  const savedObjectsClient = chrome.getSavedObjectsClient();
   const indexPatterns = await savedObjectsClient.find({
     type: 'index-pattern',
     fields: ['id', 'title', 'type', 'fields'],

x-pack/legacy/plugins/file_upload/server/client/call_with_internal_user_factory.d.ts

@@ -4,6 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Server } from 'hapi';
-
-export function callWithInternalUserFactory(server: Server): any;
+export function callWithInternalUserFactory(elasticsearchPlugin: any): any;

x-pack/legacy/plugins/file_upload/server/client/call_with_internal_user_factory.js

@@ -5,16 +5,15 @@
  */
 
 
-
 import { once } from 'lodash';
 
-const _callWithInternalUser = once((server) => {
-  const { callWithInternalUser } = server.plugins.elasticsearch.getCluster('admin');
+const _callWithInternalUser = once(elasticsearchPlugin => {
+  const { callWithInternalUser } = elasticsearchPlugin.getCluster('admin');
   return callWithInternalUser;
 });
 
-export const callWithInternalUserFactory = (server) => {
+export const callWithInternalUserFactory = elasticsearchPlugin => {
   return (...args) => {
-    return _callWithInternalUser(server)(...args);
+    return _callWithInternalUser(elasticsearchPlugin)(...args);
   };
 };

x-pack/legacy/plugins/file_upload/server/client/call_with_internal_user_factory.test.ts

@@ -8,25 +8,15 @@ import { callWithInternalUserFactory } from './call_with_internal_user_factory';
 
 describe('call_with_internal_user_factory', () => {
   describe('callWithInternalUserFactory', () => {
-    let server: any;
-    let callWithInternalUser: any;
-
-    beforeEach(() => {
-      callWithInternalUser = jest.fn();
-      server = {
-        plugins: {
-          elasticsearch: {
-            getCluster: jest.fn(() => ({ callWithInternalUser })),
-          },
-        },
-      };
-    });
-
     it('should use internal user "admin"', () => {
-      const callWithInternalUserInstance = callWithInternalUserFactory(server);
+      const callWithInternalUser: any = jest.fn();
+      const elasticsearchPlugin: any = {
+        getCluster: jest.fn(() => ({ callWithInternalUser })),
+      };
+      const callWithInternalUserInstance = callWithInternalUserFactory(elasticsearchPlugin);
       callWithInternalUserInstance();
 
-      expect(server.plugins.elasticsearch.getCluster).toHaveBeenCalledWith('admin');
+      expect(elasticsearchPlugin.getCluster).toHaveBeenCalledWith('admin');
     });
   });
 });

x-pack/legacy/plugins/file_upload/server/client/call_with_request_factory.js

@@ -8,13 +8,13 @@
 
 import { once } from 'lodash';
 
-const callWithRequest = once((server) => {
-  const cluster = server.plugins.elasticsearch.getCluster('data');
+const callWithRequest = once(elasticsearchPlugin => {
+  const cluster = elasticsearchPlugin.getCluster('data');
   return cluster.callWithRequest;
 });
 
-export const callWithRequestFactory = (server, request) => {
+export const callWithRequestFactory = (elasticsearchPlugin, request) => {
   return (...args) => {
-    return callWithRequest(server)(request, ...args);
+    return callWithRequest(elasticsearchPlugin)(request, ...args);
   };
 };

x-pack/legacy/plugins/file_upload/server/plugin.js

@@ -0,0 +1,36 @@
+/*
+ * 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 { getImportRouteHandler } from './routes/file_upload';
+import { getTelemetry, initTelemetry } from './telemetry/telemetry';
+import { MAX_BYTES } from '../common/constants/file_import';
+
+const TELEMETRY_TYPE = 'fileUploadTelemetry';
+
+export class FileUploadPlugin {
+  setup(core, plugins, __LEGACY) {
+    const elasticsearchPlugin = __LEGACY.plugins.elasticsearch;
+    const getSavedObjectsRepository = __LEGACY.savedObjects.getSavedObjectsRepository;
+    const makeUsageCollector = __LEGACY.usage.collectorSet.makeUsageCollector;
+
+    // Set up route
+    __LEGACY.route({
+      method: 'POST',
+      path: '/api/fileupload/import',
+      handler: getImportRouteHandler(elasticsearchPlugin, getSavedObjectsRepository),
+      config: {
+        payload: { maxBytes: MAX_BYTES },
+      }
+    });
+
+    // Make usage collector
+    makeUsageCollector({
+      type: TELEMETRY_TYPE,
+      isReady: () => true,
+      fetch: async () => (await getTelemetry(elasticsearchPlugin, getSavedObjectsRepository)) || initTelemetry()
+    });
+  }
+}