Remove _xpack from CCR APIs (#32563)

jasontedor · web-flow · commit 2387616c80b5 · 2018-08-02T20:21:43.000-04:00
For a new feature like CCR we will go without this extra layer of
indirection. This commit replaces all /_xpack/ccr/_(\S+) endpoints by
/_ccr/$1 endpoints.
diff --git a/x-pack/plugin/ccr/qa/multi-cluster-with-security/src/test/java/org/elasticsearch/xpack/ccr/FollowIndexSecurityIT.java b/x-pack/plugin/ccr/qa/multi-cluster-with-security/src/test/java/org/elasticsearch/xpack/ccr/FollowIndexSecurityIT.java
@@ -76,7 +76,7 @@ public void testFollowIndex() throws Exception {
             createAndFollowIndex("leader_cluster:" + allowedIndex, allowedIndex);
             assertBusy(() -> verifyDocuments(client(), allowedIndex, numDocs));
             assertThat(countCcrNodeTasks(), equalTo(1));
-            assertOK(client().performRequest(new Request("POST", "/" + allowedIndex + "/_xpack/ccr/_unfollow")));
+            assertOK(client().performRequest(new Request("POST", "/" + allowedIndex + "/_ccr/unfollow")));
             // Make sure that there are no other ccr relates operations running:
             assertBusy(() -> {
                 Map<String, Object> clusterState = toMap(adminClient().performRequest(new Request("GET", "/_cluster/state")));
@@ -87,7 +87,7 @@ public void testFollowIndex() throws Exception {
 
             followIndex("leader_cluster:" + allowedIndex, allowedIndex);
             assertThat(countCcrNodeTasks(), equalTo(1));
-            assertOK(client().performRequest(new Request("POST", "/" + allowedIndex + "/_xpack/ccr/_unfollow")));
+            assertOK(client().performRequest(new Request("POST", "/" + allowedIndex + "/_ccr/unfollow")));
             // Make sure that there are no other ccr relates operations running:
             assertBusy(() -> {
                 Map<String, Object> clusterState = toMap(adminClient().performRequest(new Request("GET", "/_cluster/state")));
@@ -144,13 +144,13 @@ private static void refresh(String index) throws IOException {
     }
 
     private static void followIndex(String leaderIndex, String followIndex) throws IOException {
-        final Request request = new Request("POST", "/" + followIndex + "/_xpack/ccr/_follow");
+        final Request request = new Request("POST", "/" + followIndex + "/_ccr/follow");
         request.setJsonEntity("{\"leader_index\": \"" + leaderIndex + "\", \"idle_shard_retry_delay\": \"10ms\"}");
         assertOK(client().performRequest(request));
     }
 
     private static void createAndFollowIndex(String leaderIndex, String followIndex) throws IOException {
-        final Request request = new Request("POST", "/" + followIndex + "/_xpack/ccr/_create_and_follow");
+        final Request request = new Request("POST", "/" + followIndex + "/_ccr/create_and_follow");
         request.setJsonEntity("{\"leader_index\": \"" + leaderIndex + "\", \"idle_shard_retry_delay\": \"10ms\"}");
         assertOK(client().performRequest(request));
     }
diff --git a/x-pack/plugin/ccr/qa/multi-cluster/src/test/java/org/elasticsearch/xpack/ccr/FollowIndexIT.java b/x-pack/plugin/ccr/qa/multi-cluster/src/test/java/org/elasticsearch/xpack/ccr/FollowIndexIT.java
@@ -94,19 +94,19 @@ private static void refresh(String index) throws IOException {
     }
 
     private static void followIndex(String leaderIndex, String followIndex) throws IOException {
-        final Request request = new Request("POST", "/" + followIndex + "/_xpack/ccr/_follow");
+        final Request request = new Request("POST", "/" + followIndex + "/_ccr/follow");
         request.setJsonEntity("{\"leader_index\": \"" + leaderIndex + "\", \"idle_shard_retry_delay\": \"10ms\"}");
         assertOK(client().performRequest(request));
     }
 
     private static void createAndFollowIndex(String leaderIndex, String followIndex) throws IOException {
-        final Request request = new Request("POST", "/" + followIndex + "/_xpack/ccr/_create_and_follow");
+        final Request request = new Request("POST", "/" + followIndex + "/_ccr/create_and_follow");
         request.setJsonEntity("{\"leader_index\": \"" + leaderIndex + "\", \"idle_shard_retry_delay\": \"10ms\"}");
         assertOK(client().performRequest(request));
     }
 
     private static void unfollowIndex(String followIndex) throws IOException {
-        assertOK(client().performRequest(new Request("POST", "/" + followIndex + "/_xpack/ccr/_unfollow")));
+        assertOK(client().performRequest(new Request("POST", "/" + followIndex + "/_ccr/unfollow")));
     }
 
     private static void verifyDocuments(String index, int expectedNumDocs) throws IOException {
diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/rest/RestCreateAndFollowIndexAction.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/rest/RestCreateAndFollowIndexAction.java
@@ -21,12 +21,12 @@ public class RestCreateAndFollowIndexAction extends BaseRestHandler {
 
     public RestCreateAndFollowIndexAction(Settings settings, RestController controller) {
         super(settings);
-        controller.registerHandler(RestRequest.Method.POST, "/{index}/_xpack/ccr/_create_and_follow", this);
+        controller.registerHandler(RestRequest.Method.POST, "/{index}/_ccr/create_and_follow", this);
     }
 
     @Override
     public String getName() {
-        return "xpack_ccr_create_and_follow_index_action";
+        return "ccr_create_and_follow_index_action";
     }
 
     @Override
diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/rest/RestFollowIndexAction.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/rest/RestFollowIndexAction.java
@@ -22,12 +22,12 @@ public class RestFollowIndexAction extends BaseRestHandler {
 
     public RestFollowIndexAction(Settings settings, RestController controller) {
         super(settings);
-        controller.registerHandler(RestRequest.Method.POST, "/{index}/_xpack/ccr/_follow", this);
+        controller.registerHandler(RestRequest.Method.POST, "/{index}/_ccr/follow", this);
     }
 
     @Override
     public String getName() {
-        return "xpack_ccr_follow_index_action";
+        return "ccr_follow_index_action";
     }
 
     @Override
diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/rest/RestUnfollowIndexAction.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/rest/RestUnfollowIndexAction.java
@@ -21,12 +21,12 @@ public class RestUnfollowIndexAction extends BaseRestHandler {
 
     public RestUnfollowIndexAction(Settings settings, RestController controller) {
         super(settings);
-        controller.registerHandler(RestRequest.Method.POST, "/{index}/_xpack/ccr/_unfollow", this);
+        controller.registerHandler(RestRequest.Method.POST, "/{index}/_ccr/unfollow", this);
     }
 
     @Override
     public String getName() {
-        return "xpack_ccr_unfollow_index_action";
+        return "ccr_unfollow_index_action";
     }
 
     @Override
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/ccr.create_and_follow_index.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/ccr.create_and_follow_index.json
@@ -1,10 +1,10 @@
 {
-  "xpack.ccr.create_and_follow_index": {
+  "ccr.create_and_follow_index": {
     "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current",
     "methods": [ "POST" ],
     "url": {
-      "path": "/{index}/_xpack/ccr/_create_and_follow",
-      "paths": [ "/{index}/_xpack/ccr/_create_and_follow" ],
+      "path": "/{index}/_ccr/create_and_follow",
+      "paths": [ "/{index}/_ccr/create_and_follow" ],
       "parts": {
         "index": {
           "type": "string",
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/ccr.follow_index.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/ccr.follow_index.json
@@ -1,10 +1,10 @@
 {
-  "xpack.ccr.follow_index": {
+  "ccr.follow_index": {
     "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current",
     "methods": [ "POST" ],
     "url": {
-      "path": "/{index}/_xpack/ccr/_follow",
-      "paths": [ "/{index}/_xpack/ccr/_follow" ],
+      "path": "/{index}/_ccr/follow",
+      "paths": [ "/{index}/_ccr/follow" ],
       "parts": {
         "index": {
           "type": "string",
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/ccr.unfollow_index.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/ccr.unfollow_index.json
@@ -1,10 +1,10 @@
 {
-  "xpack.ccr.unfollow_index": {
+  "ccr.unfollow_index": {
     "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current",
     "methods": [ "POST" ],
     "url": {
-      "path": "/{index}/_xpack/ccr/_unfollow",
-      "paths": [ "/{index}/_xpack/ccr/_unfollow" ],
+      "path": "/{index}/_ccr/unfollow",
+      "paths": [ "/{index}/_ccr/unfollow" ],
       "parts": {
         "index": {
           "type": "string",
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/ccr/follow_and_unfollow.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/ccr/follow_and_unfollow.yml
@@ -16,7 +16,7 @@
   - is_true: acknowledged
 
   - do:
-      xpack.ccr.create_and_follow_index:
+      ccr.create_and_follow_index:
         index: bar
         body:
           leader_index: foo
@@ -25,18 +25,18 @@
   - is_true: index_following_started
 
   - do:
-      xpack.ccr.unfollow_index:
+      ccr.unfollow_index:
         index: bar
   - is_true: acknowledged
 
   - do:
-      xpack.ccr.follow_index:
+      ccr.follow_index:
         index: bar
         body:
           leader_index: foo
   - is_true: acknowledged
 
   - do:
-      xpack.ccr.unfollow_index:
+      ccr.unfollow_index:
         index: bar
   - is_true: acknowledged

Original file line number	Diff line number	Diff line change
`@@ -94,19 +94,19 @@ private static void refresh(String index) throws IOException {`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`private static void followIndex(String leaderIndex, String followIndex) throws IOException {`
`97`		`- final Request request = new Request("POST", "/" + followIndex + "/_xpack/ccr/_follow");`
	`97`	`+ final Request request = new Request("POST", "/" + followIndex + "/_ccr/follow");`
`98`	`98`	`request.setJsonEntity("{\"leader_index\": \"" + leaderIndex + "\", \"idle_shard_retry_delay\": \"10ms\"}");`
`99`	`99`	`assertOK(client().performRequest(request));`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`private static void createAndFollowIndex(String leaderIndex, String followIndex) throws IOException {`
`103`		`- final Request request = new Request("POST", "/" + followIndex + "/_xpack/ccr/_create_and_follow");`
	`103`	`+ final Request request = new Request("POST", "/" + followIndex + "/_ccr/create_and_follow");`
`104`	`104`	`request.setJsonEntity("{\"leader_index\": \"" + leaderIndex + "\", \"idle_shard_retry_delay\": \"10ms\"}");`
`105`	`105`	`assertOK(client().performRequest(request));`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`private static void unfollowIndex(String followIndex) throws IOException {`
`109`		`- assertOK(client().performRequest(new Request("POST", "/" + followIndex + "/_xpack/ccr/_unfollow")));`
	`109`	`+ assertOK(client().performRequest(new Request("POST", "/" + followIndex + "/_ccr/unfollow")));`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`private static void verifyDocuments(String index, int expectedNumDocs) throws IOException {`
Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,12 @@ public class RestCreateAndFollowIndexAction extends BaseRestHandler {`
`21`	`21`
`22`	`22`	`public RestCreateAndFollowIndexAction(Settings settings, RestController controller) {`
`23`	`23`	`super(settings);`
`24`		`- controller.registerHandler(RestRequest.Method.POST, "/{index}/_xpack/ccr/_create_and_follow", this);`
	`24`	`+ controller.registerHandler(RestRequest.Method.POST, "/{index}/_ccr/create_and_follow", this);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`@Override`
`28`	`28`	`public String getName() {`
`29`		`- return "xpack_ccr_create_and_follow_index_action";`
	`29`	`+ return "ccr_create_and_follow_index_action";`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,12 @@ public class RestFollowIndexAction extends BaseRestHandler {`
`22`	`22`
`23`	`23`	`public RestFollowIndexAction(Settings settings, RestController controller) {`
`24`	`24`	`super(settings);`
`25`		`- controller.registerHandler(RestRequest.Method.POST, "/{index}/_xpack/ccr/_follow", this);`
	`25`	`+ controller.registerHandler(RestRequest.Method.POST, "/{index}/_ccr/follow", this);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`@Override`
`29`	`29`	`public String getName() {`
`30`		`- return "xpack_ccr_follow_index_action";`
	`30`	`+ return "ccr_follow_index_action";`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,12 @@ public class RestUnfollowIndexAction extends BaseRestHandler {`
`21`	`21`
`22`	`22`	`public RestUnfollowIndexAction(Settings settings, RestController controller) {`
`23`	`23`	`super(settings);`
`24`		`- controller.registerHandler(RestRequest.Method.POST, "/{index}/_xpack/ccr/_unfollow", this);`
	`24`	`+ controller.registerHandler(RestRequest.Method.POST, "/{index}/_ccr/unfollow", this);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`@Override`
`28`	`28`	`public String getName() {`
`29`		`- return "xpack_ccr_unfollow_index_action";`
	`29`	`+ return "ccr_unfollow_index_action";`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Override`