Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove _xpack from CCR APIs #32563

Merged
merged 2 commits into from
Aug 3, 2018
Merged

Remove _xpack from CCR APIs #32563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89037c5
Remove _xpack from CCR APIs
jasontedor Aug 1, 2018
2db359a
fix api
jasontedor Aug 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...luster-with-security/src/test/java/org/elasticsearch/xpack/ccr/FollowIndexSecurityIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")));
Expand All @@ -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")));
Expand Down Expand Up @@ -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));
}
Expand Down
6 changes: 3 additions & 3 deletions .../plugin/ccr/qa/multi-cluster/src/test/java/org/elasticsearch/xpack/ccr/FollowIndexIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions ...in/ccr/src/main/java/org/elasticsearch/xpack/ccr/rest/RestCreateAndFollowIndexAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/rest/RestFollowIndexAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...ck/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/rest/RestUnfollowIndexAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...pi/xpack.ccr.create_and_follow_index.json → ...spec/api/ccr.create_and_follow_index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
6 changes: 3 additions & 3 deletions ...-api-spec/api/xpack.ccr.follow_index.json → ...s/rest-api-spec/api/ccr.follow_index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
6 changes: 3 additions & 3 deletions ...pi-spec/api/xpack.ccr.unfollow_index.json → ...rest-api-spec/api/ccr.unfollow_index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
8 changes: 4 additions & 4 deletions x-pack/plugin/src/test/resources/rest-api-spec/test/ccr/follow_and_unfollow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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