remote cluster test_user

rashmivkulkarni · rashmivkulkarni · commit 47895ff2731d · 2020-09-10T10:15:03.000-07:00
diff --git a/x-pack/test/functional/apps/remote_clusters/home_page.ts b/x-pack/test/functional/apps/remote_clusters/home_page.ts
@@ -13,7 +13,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
   describe('Home page', function () {
     before(async () => {
-      await security.testUser.setRoles(['global_remote_cluster_role']);
+      await security.testUser.setRoles(['global_ccr_role']);
       await pageObjects.common.navigateToApp('remoteClusters');
     });
 
diff --git a/x-pack/test/functional/apps/remote_clusters/index.ts b/x-pack/test/functional/apps/remote_clusters/index.ts
@@ -6,6 +6,7 @@
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
+// refer to the below docs for CCR, Remote Clusters
 // https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-getting-started.html#ccr-getting-started-prerequisites
 // https://www.elastic.co/guide/en/kibana/7.9/working-remote-clusters.html
 export default ({ loadTestFile }: FtrProviderContext) => {
diff --git a/x-pack/test/functional/config.js b/x-pack/test/functional/config.js
@@ -324,6 +324,7 @@ export default async function ({ readConfigFile }) {
           ],
         },
 
+        // using this role even for remote clusters
         global_ccr_role: {
           elasticsearch: {
             cluster: ['manage', 'manage_ccr'],
@@ -338,20 +339,6 @@ export default async function ({ readConfigFile }) {
           ],
         },
 
-<<<<<<< HEAD
-        global_remote_cluster_role: {
-          kibana: [
-            {
-              feature: {
-                advancedSettings: ['read'],
-              },
-              spaces: ['*'],
-            },
-          ],
-        },
-
-=======
->>>>>>> 0207f82e801e70641f9b1b820e0425187aae0b22
         //Kibana feature privilege isn't specific to advancedSetting. It can be anything. https://github.com/elastic/kibana/issues/35965
         test_api_keys: {
           elasticsearch: {
