Revert "Don't add shard-specific versions of index/delete to isComposite"

This reverts commit elastic/x-pack@4b97fb70b5.

Original commit: elastic/x-pack-elasticsearch@1777134975
This commit is contained in:
Lee Hinman 2017-01-11 14:17:40 -07:00
parent f64b1ea3eb
commit a21f64fef2
1 changed files with 9 additions and 0 deletions

View File

@ -309,10 +309,19 @@ public class AuthorizationService extends AbstractComponent {
} }
} }
private static String IndexActionSubRequestPrimary = IndexAction.NAME + "[p]";
private static String IndexActionSubRequestReplica = IndexAction.NAME + "[r]";
private static String DeleteActionSubRequestPrimary = DeleteAction.NAME + "[p]";
private static String DeleteActionSubRequestReplica = DeleteAction.NAME + "[r]";
private static boolean isCompositeAction(String action) { private static boolean isCompositeAction(String action) {
return action.equals(BulkAction.NAME) || return action.equals(BulkAction.NAME) ||
action.equals(IndexAction.NAME) || action.equals(IndexAction.NAME) ||
action.equals(DeleteAction.NAME) || action.equals(DeleteAction.NAME) ||
action.equals(IndexActionSubRequestPrimary) ||
action.equals(IndexActionSubRequestReplica) ||
action.equals(DeleteActionSubRequestPrimary) ||
action.equals(DeleteActionSubRequestReplica) ||
action.equals(MultiGetAction.NAME) || action.equals(MultiGetAction.NAME) ||
action.equals(MultiTermVectorsAction.NAME) || action.equals(MultiTermVectorsAction.NAME) ||
action.equals(MultiSearchAction.NAME) || action.equals(MultiSearchAction.NAME) ||