diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/privilege/RestGetBuiltinPrivilegesAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/privilege/RestGetBuiltinPrivilegesAction.java index 13e7b5446d3cf..e0ef46dc73a18 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/privilege/RestGetBuiltinPrivilegesAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/privilege/RestGetBuiltinPrivilegesAction.java @@ -28,9 +28,7 @@ import org.elasticsearch.xpack.security.rest.action.SecurityBaseRestHandler; import java.io.IOException; -import java.util.Arrays; import java.util.List; -import java.util.Set; import static org.elasticsearch.rest.RestRequest.Method.GET; @@ -41,8 +39,6 @@ public class RestGetBuiltinPrivilegesAction extends SecurityBaseRestHandler { private static final Logger logger = LogManager.getLogger(RestGetBuiltinPrivilegesAction.class); - // TODO remove this once we can update docs tests again - private static final Set FAILURE_STORE_PRIVILEGES_TO_EXCLUDE = Set.of("read_failure_store", "manage_failure_store"); private final GetBuiltinPrivilegesResponseTranslator responseTranslator; public RestGetBuiltinPrivilegesAction( @@ -75,7 +71,7 @@ public RestResponse buildResponse(GetBuiltinPrivilegesResponse response, XConten final var translatedResponse = responseTranslator.translate(response); builder.startObject(); builder.array("cluster", translatedResponse.getClusterPrivileges()); - builder.array("index", filterOutFailureStorePrivileges(translatedResponse)); + builder.array("index", translatedResponse.getIndexPrivileges()); String[] remoteClusterPrivileges = translatedResponse.getRemoteClusterPrivileges(); if (remoteClusterPrivileges.length > 0) { // remote clusters are not supported in stateless mode, so hide entirely builder.array("remote_cluster", remoteClusterPrivileges); @@ -83,12 +79,6 @@ public RestResponse buildResponse(GetBuiltinPrivilegesResponse response, XConten builder.endObject(); return new RestResponse(RestStatus.OK, builder); } - - private static String[] filterOutFailureStorePrivileges(GetBuiltinPrivilegesResponse translatedResponse) { - return Arrays.stream(translatedResponse.getIndexPrivileges()) - .filter(p -> false == FAILURE_STORE_PRIVILEGES_TO_EXCLUDE.contains(p)) - .toArray(String[]::new); - } } ); } diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/privileges/11_builtin.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/privileges/11_builtin.yml index d03e6925cab1f..d4e795bf5b8cf 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/privileges/11_builtin.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/privileges/11_builtin.yml @@ -16,4 +16,4 @@ setup: # I would much prefer we could just check that specific entries are in the array, but we don't have # an assertion for that - length: { "cluster" : 62 } - - length: { "index" : 22 } + - length: { "index" : 24 }