[Remote clusters] Migrate server code out of legacy (#56781) (#57263)

elastic · Feb 10, 2020 · b64ad63 · b64ad63
1 parent b548737
commit b64ad63
Show file tree

Hide file tree

Showing 38 changed files with 1,736 additions and 783 deletions.
diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json
@@ -26,7 +26,7 @@
     "xpack.logstash": "legacy/plugins/logstash",
     "xpack.main": "legacy/plugins/xpack_main",
     "xpack.monitoring": "legacy/plugins/monitoring",
-    "xpack.remoteClusters": "legacy/plugins/remote_clusters",
+    "xpack.remoteClusters": ["plugins/remote_clusters", "legacy/plugins/remote_clusters"],
     "xpack.reporting": ["plugins/reporting", "legacy/plugins/reporting"],
     "xpack.rollupJobs": "legacy/plugins/rollup",
     "xpack.searchProfiler": "plugins/searchprofiler",

diff --git a/x-pack/legacy/plugins/remote_clusters/index.ts b/x-pack/legacy/plugins/remote_clusters/index.ts
@@ -7,8 +7,6 @@
 import { Legacy } from 'kibana';
 import { resolve } from 'path';
 import { PLUGIN } from './common';
-import { Plugin as RemoteClustersPlugin } from './plugin';
-import { createShim } from './shim';
 
 export function remoteClusters(kibana: any) {
   return new kibana.Plugin({
@@ -43,25 +41,6 @@ export function remoteClusters(kibana: any) {
         config.get('xpack.remote_clusters.enabled') && config.get('xpack.index_management.enabled')
       );
     },
-    init(server: Legacy.Server) {
-      const {
-        coreSetup,
-        pluginsSetup: {
-          license: { registerLicenseChecker },
-        },
-      } = createShim(server, PLUGIN.ID);
-
-      const remoteClustersPlugin = new RemoteClustersPlugin();
-
-      // Set up plugin.
-      remoteClustersPlugin.setup(coreSetup);
-
-      registerLicenseChecker(
-        server,
-        PLUGIN.ID,
-        PLUGIN.getI18nName(),
-        PLUGIN.MINIMUM_LICENSE_REQUIRED
-      );
-    },
+    init(server: any) {},
   });
 }
diff --git a/x-pack/legacy/plugins/remote_clusters/plugin.ts b/x-pack/legacy/plugins/remote_clusters/plugin.ts
diff --git a/...cy/plugins/remote_clusters/public/app/sections/remote_cluster_edit/remote_cluster_edit.js b/...cy/plugins/remote_clusters/public/app/sections/remote_cluster_edit/remote_cluster_edit.js
@@ -37,7 +37,7 @@ export class RemoteClusterEdit extends Component {
     stopEditingCluster: PropTypes.func,
     editCluster: PropTypes.func,
     isEditingCluster: PropTypes.bool,
-    getEditClusterError: PropTypes.string,
+    getEditClusterError: PropTypes.object,
     clearEditClusterErrors: PropTypes.func,
     openDetailPanel: PropTypes.func,
   };

diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/store/actions/remove_clusters.js b/x-pack/legacy/plugins/remote_clusters/public/app/store/actions/remove_clusters.js
@@ -63,9 +63,7 @@ export const removeClusters = names => async (dispatch, getState) => {
     const {
       name,
       error: {
-        output: {
-          payload: { message },
-        },
+        payload: { message },
       },
     } = errors[0];
 

diff --git a/x-pack/legacy/plugins/remote_clusters/server/routes/api/add_route.test.ts b/x-pack/legacy/plugins/remote_clusters/server/routes/api/add_route.test.ts
diff --git a/x-pack/legacy/plugins/remote_clusters/server/routes/api/add_route.ts b/x-pack/legacy/plugins/remote_clusters/server/routes/api/add_route.ts