Change remote_clusters ID to remoteClusters (#59246)

elastic · Mar 5, 2020 · bb86bf2 · bb86bf2
1 parent 755439d
commit bb86bf2
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/x-pack/legacy/plugins/cross_cluster_replication/index.js b/x-pack/legacy/plugins/cross_cluster_replication/index.js
@@ -15,7 +15,7 @@ export function crossClusterReplication(kibana) {
     id: PLUGIN.ID,
     configPrefix: 'xpack.ccr',
     publicDir: resolve(__dirname, 'public'),
-    require: ['kibana', 'elasticsearch', 'xpack_main', 'remote_clusters', 'index_management'],
+    require: ['kibana', 'elasticsearch', 'xpack_main', 'remoteClusters', 'index_management'],
     uiExports: {
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
       managementSections: ['plugins/cross_cluster_replication'],

diff --git a/x-pack/legacy/plugins/remote_clusters/common/index.ts b/x-pack/legacy/plugins/remote_clusters/common/index.ts
@@ -5,5 +5,5 @@
  */
 
 export const PLUGIN = {
-  ID: 'remote_clusters',
+  ID: 'remoteClusters',
 };
diff --git a/x-pack/plugins/remote_clusters/common/constants.ts b/x-pack/plugins/remote_clusters/common/constants.ts
@@ -10,7 +10,6 @@ import { LicenseType } from '../../licensing/common/types';
 const basicLicense: LicenseType = 'basic';
 
 export const PLUGIN = {
-  id: 'remote_clusters',
   // Remote Clusters are used in both CCS and CCR, and CCS is available for all licenses.
   minimumLicenseType: basicLicense,
   getI18nName: (): string => {

diff --git a/x-pack/plugins/remote_clusters/kibana.json b/x-pack/plugins/remote_clusters/kibana.json
@@ -1,5 +1,5 @@
 {
-  "id": "remote_clusters",
+  "id": "remoteClusters",
   "version": "kibana",
   "configPath": [
     "xpack",

diff --git a/x-pack/plugins/remote_clusters/server/plugin.ts b/x-pack/plugins/remote_clusters/server/plugin.ts
@@ -50,7 +50,7 @@ export class RemoteClustersServerPlugin implements Plugin<void, void, any, any>
     registerDeleteRoute(routeDependencies);
 
     licensing.license$.subscribe(license => {
-      const { state, message } = license.check(PLUGIN.id, PLUGIN.minimumLicenseType);
+      const { state, message } = license.check(PLUGIN.getI18nName(), PLUGIN.minimumLicenseType);
       const hasRequiredLicense = state === LICENSE_CHECK_STATE.Valid;
       if (hasRequiredLicense) {
         this.licenseStatus = { valid: true };