[es6ify] re-apply automated transforms after ingest work

src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js

@@ -1,7 +1,7 @@
-const modules = require('ui/modules');
-const template = require('plugins/kibana/settings/sections/indices/add_data_steps/pattern_review_step.html');
-const _ = require('lodash');
-const editFieldTypeHTML = require('plugins/kibana/settings/sections/indices/partials/_edit_field_type.html');
+import modules from 'ui/modules';
+import template from 'plugins/kibana/settings/sections/indices/add_data_steps/pattern_review_step.html';
+import _ from 'lodash';
+import editFieldTypeHTML from 'plugins/kibana/settings/sections/indices/partials/_edit_field_type.html';
 
 function pickDefaultTimeFieldName(dateFields) {
   if (_.isEmpty(dateFields)) {

src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/directives/output_preview.js

@@ -1,14 +1,15 @@
 import uiModules from 'ui/modules';
 import jsondiffpatch from '@bigfunger/jsondiffpatch';
 import '../styles/_output_preview.less';
+import outputPreviewTemplate from '../views/output_preview.html';
 
 const htmlFormat = jsondiffpatch.formatters.html.format;
 const app = uiModules.get('kibana');
 
 app.directive('outputPreview', function () {
   return {
     restrict: 'E',
-    template: require('../views/output_preview.html'),
+    template: outputPreviewTemplate,
     scope: {
       oldObject: '=',
       newObject: '='

src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/directives/pipeline_output.js

@@ -1,12 +1,13 @@
 import uiModules from 'ui/modules';
 import '../styles/_pipeline_output.less';
+import pipelineOutputTemplate from '../views/pipeline_output.html';
 
 const app = uiModules.get('kibana');
 
 app.directive('pipelineOutput', function () {
   return {
     restrict: 'E',
-    template: require('../views/pipeline_output.html'),
+    template: pipelineOutputTemplate,
     scope: {
       pipeline: '='
     },

src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/directives/pipeline_setup.js

@@ -8,6 +8,7 @@ import '../styles/_pipeline_setup.less';
 import './pipeline_output';
 import './source_data';
 import './processor_ui';
+import pipelineSetupTemplate from '../views/pipeline_setup.html';
 
 const app = uiModules.get('kibana');
 function buildProcessorTypeList() {
@@ -27,7 +28,7 @@ function buildProcessorTypeList() {
 app.directive('pipelineSetup', function () {
   return {
     restrict: 'E',
-    template: require('../views/pipeline_setup.html'),
+    template: pipelineSetupTemplate,
     scope: {
       samples: '=',
       pipeline: '='

src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/directives/processor_ui_container.js

@@ -3,6 +3,7 @@ import _ from 'lodash';
 import '../styles/_processor_ui_container.less';
 import './output_preview';
 import './processor_ui_container_header';
+import processorUiContainerTemplate from '../views/processor_ui_container.html';
 
 const app = uiModules.get('kibana');
 
@@ -13,7 +14,7 @@ app.directive('processorUiContainer', function ($compile) {
       pipeline: '=',
       processor: '='
     },
-    template: require('../views/processor_ui_container.html'),
+    template: processorUiContainerTemplate,
     link: function ($scope, $el) {
       const processor = $scope.processor;
       const pipeline = $scope.pipeline;

src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/directives/processor_ui_container_header.js

@@ -1,5 +1,6 @@
 import uiModules from 'ui/modules';
 import '../styles/_processor_ui_container_header.less';
+import processorUiContainerHeaderTemplate from '../views/processor_ui_container_header.html';
 
 const app = uiModules.get('kibana');
 
@@ -11,6 +12,6 @@ app.directive('processorUiContainerHeader', function () {
       field: '=',
       pipeline: '='
     },
-    template: require('../views/processor_ui_container_header.html')
+    template: processorUiContainerHeaderTemplate
   };
 });

src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/directives/processor_ui_set.js

@@ -1,12 +1,13 @@
 import uiModules from 'ui/modules';
+import processorUiSetTemplate from '../views/processor_ui_set.html';
 
 const app = uiModules.get('kibana');
 
 //scope.processor, scope.pipeline are attached by the process_container.
 app.directive('processorUiSet', function () {
   return {
     restrict: 'E',
-    template: require('../views/processor_ui_set.html'),
+    template: processorUiSetTemplate,
     controller : function ($scope) {
       const processor = $scope.processor;
       const pipeline = $scope.pipeline;

src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/directives/source_data.js

@@ -1,6 +1,7 @@
 import uiModules from 'ui/modules';
 import angular from 'angular';
 import '../styles/_source_data.less';
+import sourceDataTemplate from '../views/source_data.html';
 
 const app = uiModules.get('kibana');
 
@@ -11,7 +12,7 @@ app.directive('sourceData', function () {
       samples: '=',
       sample: '='
     },
-    template: require('../views/source_data.html'),
+    template: sourceDataTemplate,
     controller: function ($scope) {
       const samples = $scope.samples;
 

src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.js

@@ -1,12 +1,16 @@
+import PluginsKibanaSettingsSectionsIndicesRefreshKibanaIndexProvider from 'plugins/kibana/settings/sections/indices/_refresh_kibana_index';
+import uiModules from 'ui/modules';
+import kbnSettingsIndicesTemplate from 'plugins/kibana/settings/sections/indices/directives/kbn_settings_indices.html';
+
 // wrapper directive, which sets some global stuff up like the left nav
-require('ui/modules').get('apps/settings')
+uiModules.get('apps/settings')
 .directive('kbnSettingsIndices', function ($route, config, kbnUrl, indexPatterns, Private) {
   return {
     restrict: 'E',
     transclude: true,
-    template: require('plugins/kibana/settings/sections/indices/directives/kbn_settings_indices.html'),
+    template: kbnSettingsIndicesTemplate,
     link: function ($scope) {
-      const refreshKibanaIndex = Private(require('plugins/kibana/settings/sections/indices/_refresh_kibana_index'));
+      const refreshKibanaIndex = Private(PluginsKibanaSettingsSectionsIndicesRefreshKibanaIndexProvider);
 
       $scope.showAddNew = !/^\/settings\/indices$/.test($route.current.$$route.originalPath);
       $scope.editingId = $route.current.params.indexPatternId;

src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js

@@ -1,11 +1,11 @@
 import modules from 'ui/modules';
 import template from 'plugins/kibana/settings/sections/indices/filebeat/directives/filebeat_wizard.html';
 import IngestProvider from 'ui/ingest';
+import 'plugins/kibana/settings/sections/indices/add_data_steps/pattern_review_step';
+import 'plugins/kibana/settings/sections/indices/add_data_steps/paste_samples_step';
+import 'plugins/kibana/settings/sections/indices/add_data_steps/pipeline_setup';
+import 'plugins/kibana/settings/sections/indices/add_data_steps/install_filebeat_step';
 
-require('plugins/kibana/settings/sections/indices/add_data_steps/pattern_review_step');
-require('plugins/kibana/settings/sections/indices/add_data_steps/paste_samples_step');
-require('plugins/kibana/settings/sections/indices/add_data_steps/pipeline_setup');
-require('plugins/kibana/settings/sections/indices/add_data_steps/install_filebeat_step');
 
 // wrapper directive, which sets up the breadcrumb for all filebeat steps
 modules.get('apps/settings')

src/plugins/kibana/public/settings/sections/indices/filebeat/index.js

@@ -1,7 +1,7 @@
-var routes = require('ui/routes');
-var template = require('plugins/kibana/settings/sections/indices/filebeat/index.html');
+import routes from 'ui/routes';
+import template from 'plugins/kibana/settings/sections/indices/filebeat/index.html';
+import 'plugins/kibana/settings/sections/indices/filebeat/directives/filebeat_wizard';
 
-require('plugins/kibana/settings/sections/indices/filebeat/directives/filebeat_wizard');
 
 routes.when('/settings/indices/create/filebeat', {
   template: template

src/plugins/kibana/server/lib/__tests__/process_es_ingest_simulate_response.js

@@ -1,6 +1,6 @@
-const expect = require('expect.js');
-const _ = require('lodash');
 import processESIngestSimulateResponse from '../process_es_ingest_simulate_response';
+import expect from 'expect.js';
+import _ from 'lodash';
 
 describe('processESIngestSimulateResponse', function () {
 

src/plugins/kibana/server/lib/process_es_ingest_simulate_response.js

@@ -1,4 +1,4 @@
-const _ = require('lodash');
+import _ from 'lodash';
 
 function translateError(esError) {
   const rootCause = _.get(esError, 'root_cause[0]');

src/plugins/kibana/server/lib/schemas/resources/ingest_config_schema.js

@@ -1,6 +1,6 @@
-const Joi = require('joi');
-const indexPatternSchema = require('./index_pattern_schema');
-const pipelineSchema = require('./pipeline_schema');
+import Joi from 'joi';
+import indexPatternSchema from './index_pattern_schema';
+import pipelineSchema from './pipeline_schema';
 
 module.exports = Joi.object({
   index_pattern: indexPatternSchema.required(),

src/plugins/kibana/server/routes/api/ingest/index.js

@@ -1,5 +1,9 @@
+import { registerPost } from './register_post';
+import { registerDelete } from './register_delete';
+import { registerSimulate } from './register_simulate';
+
 export default function (server) {
-  require('./register_post')(server);
-  require('./register_delete')(server);
-  require('./register_simulate')(server);
+  registerPost(server);
+  registerDelete(server);
+  registerSimulate(server);
 }

src/plugins/kibana/server/routes/api/ingest/register_delete.js

@@ -2,7 +2,7 @@ import Promise from 'bluebird';
 import handleESError from '../../../lib/handle_es_error';
 import {ingestToPattern, patternToIngest} from '../../../../common/lib/convert_pattern_and_ingest_name';
 
-module.exports = function registerDelete(server) {
+export function registerDelete(server) {
   server.route({
     path: '/api/kibana/ingest/{id}',
     method: 'DELETE',

src/plugins/kibana/server/routes/api/ingest/register_post.js

@@ -8,7 +8,7 @@ import {ingestToPattern, patternToIngest} from '../../../../common/lib/convert_p
 import { keysToCamelCaseShallow } from '../../../../common/lib/case_conversion';
 import ingestPipelineApiKibanaToEsConverter from '../../../lib/converters/ingest_pipeline_api_kibana_to_es_converter';
 
-module.exports = function registerPost(server) {
+export function registerPost(server) {
   const kibanaIndex = server.config().get('kibana.index');
 
   function patternRollback(rootError, indexPatternId, boundCallWithRequest) {

src/plugins/kibana/server/routes/api/ingest/register_simulate.js

@@ -4,7 +4,7 @@ import simulateRequestSchema from '../../../lib/schemas/simulate_request_schema'
 import ingestSimulateApiKibanaToEsConverter from '../../../lib/converters/ingest_simulate_api_kibana_to_es_converter';
 import { keysToCamelCaseShallow, keysToSnakeCaseShallow } from '../../../../common/lib/case_conversion';
 
-module.exports = function registerSimulate(server) {
+export function registerSimulate(server) {
   server.route({
     path: '/api/kibana/ingest/simulate',
     method: 'POST',