Skip to content

Commit c2baa5b

Browse files
committed
Fix test
1 parent cafd8d2 commit c2baa5b

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/ConfigurableClusterPrivileges.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ public static ManageRolesPrivilege parse(XContentParser parser) throws IOExcepti
562562
IndexPrivilege namedPrivilege = IndexPrivilege.getNamedOrNull(privilege);
563563
if (namedPrivilege != null && namedPrivilege.getSelectorPredicate() == IndexComponentSelectorPredicate.FAILURES) {
564564
throw new IllegalArgumentException(
565-
"Failure store related privileges and not supported as targets of manage roles but found [" + privilege + "]"
565+
"Failure store related privileges are not supported as targets of manage roles but found [" + privilege + "]"
566566
);
567567
}
568568
}

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/RoleDescriptorTestHelper.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.elasticsearch.xpack.core.security.authz.privilege.ClusterPrivilegeResolver;
1515
import org.elasticsearch.xpack.core.security.authz.privilege.ConfigurableClusterPrivilege;
1616
import org.elasticsearch.xpack.core.security.authz.privilege.ConfigurableClusterPrivileges;
17+
import org.elasticsearch.xpack.core.security.authz.privilege.IndexComponentSelectorPredicate;
1718
import org.elasticsearch.xpack.core.security.authz.privilege.IndexPrivilege;
1819
import org.elasticsearch.xpack.core.security.support.MetadataUtils;
1920

@@ -23,6 +24,7 @@
2324
import java.util.List;
2425
import java.util.Map;
2526
import java.util.Set;
27+
import java.util.stream.Collectors;
2628

2729
import static org.elasticsearch.test.ESTestCase.generateRandomStringArray;
2830
import static org.elasticsearch.test.ESTestCase.randomAlphaOfLengthBetween;
@@ -128,10 +130,14 @@ public static ConfigurableClusterPrivilege[] randomManageRolesPrivileges() {
128130
() -> {
129131
String[] indexPatterns = randomArray(1, 5, String[]::new, () -> randomAlphaOfLengthBetween(5, 100));
130132

131-
int startIndex = randomIntBetween(0, IndexPrivilege.names().size() - 2);
132-
int endIndex = randomIntBetween(startIndex + 1, IndexPrivilege.names().size());
133+
Set<String> validNames = IndexPrivilege.names().stream().filter(p -> {
134+
IndexPrivilege named = IndexPrivilege.getNamedOrNull(p);
135+
return named != null && named.getSelectorPredicate() != IndexComponentSelectorPredicate.FAILURES;
136+
}).collect(Collectors.toSet());
137+
int startIndex = randomIntBetween(0, validNames.size() - 2);
138+
int endIndex = randomIntBetween(startIndex + 1, validNames.size());
133139

134-
String[] indexPrivileges = IndexPrivilege.names().stream().toList().subList(startIndex, endIndex).toArray(String[]::new);
140+
String[] indexPrivileges = validNames.stream().toList().subList(startIndex, endIndex).toArray(String[]::new);
135141
return new ConfigurableClusterPrivileges.ManageRolesPrivilege.ManageRolesIndexPermissionGroup(
136142
indexPatterns,
137143
indexPrivileges

0 commit comments

Comments
 (0)