honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SQL: Fix the name of the indices lookup action (elastic/x-pack-elasticsearch#2840) 

Fix the name of the action the SQL uses to lookup index information from
the cluster state. The old name was silly.

Original commit: elastic/x-pack-elasticsearch@805fb29662
This commit is contained in:
Nik Everett 2017-11-03 23:37:22 +00:00 committed by GitHub
parent 25a0ec42f6
commit 41284cae93
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/SqlSecurityTestCase.java
View File

@ -67,7 +67,7 @@ public abstract class SqlSecurityTestCase extends ESRestTestCase {
}
protected static final String SQL_ACTION_NAME = "indices:data/read/sql";
protected static final String SQL_INDICES_ACTION_NAME = "indices:data/read/sql/tables";
protected static final String SQL_INDICES_ACTION_NAME = "indices:data/read/sql/indices";
/**
* Location of the audit log file. We could technically figure this out by reading the admin
* APIs but it isn't worth doing because we also have to give ourselves permission to read

4
sql/server/src/main/java/org/elasticsearch/xpack/sql/plugin/SqlGetIndicesAction.java
View File

@ -44,7 +44,7 @@ import static java.util.Comparator.comparing;
public class SqlGetIndicesAction
extends Action<SqlGetIndicesAction.Request, SqlGetIndicesAction.Response, SqlGetIndicesAction.RequestBuilder> {
public static final SqlGetIndicesAction INSTANCE = new SqlGetIndicesAction();
public static final String NAME = "indices:data/read/sql/tables";
public static final String NAME = "indices:data/read/sql/indices";
private SqlGetIndicesAction() {
super(NAME);
@ -59,7 +59,7 @@ public class SqlGetIndicesAction
public Response newResponse() {
return new Response();
}
public static class Request extends MasterNodeReadRequest<Request> implements IndicesRequest.Replaceable {
private IndicesOptions indicesOptions;
private String[] indices;