Skip to content

Drop cluster scope method from RoleMappingMetadata #124174

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

Merged
merged 1 commit into from
Mar 6, 2025
Merged

Drop cluster scope method from RoleMappingMetadata #124174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions ...n/core/src/main/java/org/elasticsearch/xpack/core/security/authz/RoleMappingMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,6 @@ public final class RoleMappingMetadata extends AbstractNamedDiffable<Metadata.Pr

private static final RoleMappingMetadata EMPTY = new RoleMappingMetadata(Set.of());

public static RoleMappingMetadata getFromClusterState(ClusterState clusterState) {
final ProjectMetadata project = clusterState.metadata().getProject();
return getFromProject(project);
}

public static RoleMappingMetadata getFromProject(ProjectMetadata project) {
return project.custom(RoleMappingMetadata.TYPE, RoleMappingMetadata.EMPTY);
}
Expand Down
4 changes: 3 additions & 1 deletion ...lClusterTest/java/org/elasticsearch/xpack/security/FileSettingsRoleMappingsRestartIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.apache.lucene.tests.util.LuceneTestCase;
import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.metadata.ProjectId;
import org.elasticsearch.core.Tuple;
import org.elasticsearch.integration.RoleMappingFileSettingsIT;
import org.elasticsearch.reservedstate.service.FileSettingsService;
Expand Down Expand Up @@ -272,9 +273,10 @@ private void assertRoleMappingsInClusterStateWithAwait(
}

private void assertRoleMappingsInClusterState(ClusterState clusterState, ExpressionRoleMapping... expectedRoleMappings) {
final var project = clusterState.metadata().getProject(ProjectId.DEFAULT);
String[] expectedRoleMappingNames = Arrays.stream(expectedRoleMappings).map(ExpressionRoleMapping::getName).toArray(String[]::new);
assertRoleMappingReservedMetadata(clusterState, expectedRoleMappingNames);
var actualRoleMappings = new ArrayList<>(RoleMappingMetadata.getFromClusterState(clusterState).getRoleMappings());
var actualRoleMappings = new ArrayList<>(RoleMappingMetadata.getFromProject(project).getRoleMappings());
assertThat(actualRoleMappings, containsInAnyOrder(expectedRoleMappings));
}

Expand Down
9 changes: 7 additions & 2 deletions ...lusterTest/java/org/elasticsearch/xpack/security/authc/jwt/JwtRoleMappingsIntegTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.ClusterStateListener;
import org.elasticsearch.cluster.ClusterStateUpdateTask;
import org.elasticsearch.cluster.metadata.ProjectId;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.bytes.BytesArray;
import org.elasticsearch.common.settings.Settings;
Expand Down Expand Up @@ -444,6 +445,7 @@ private SignedJWT getSignedJWT(JWTClaimsSet claimsSet) throws Exception {
}

private void publishRoleMappings(Set<ExpressionRoleMapping> roleMappings) throws InterruptedException {
final ProjectId projectId = ProjectId.DEFAULT;
RoleMappingMetadata roleMappingMetadata = new RoleMappingMetadata(roleMappings);
List<ClusterService> clusterServices = new ArrayList<>();
internalCluster().getInstances(ClusterService.class).forEach(clusterServices::add);
Expand All @@ -452,7 +454,8 @@ private void publishRoleMappings(Set<ExpressionRoleMapping> roleMappings) throws
clusterService.addListener(new ClusterStateListener() {
@Override
public void clusterChanged(ClusterChangedEvent event) {
RoleMappingMetadata publishedRoleMappingMetadata = RoleMappingMetadata.getFromClusterState(event.state());
final var project = event.state().metadata().getProject(projectId);
RoleMappingMetadata publishedRoleMappingMetadata = RoleMappingMetadata.getFromProject(project);
if (roleMappingMetadata.equals(publishedRoleMappingMetadata)) {
clusterService.removeListener(this);
publishedClusterState.countDown();
Expand All @@ -464,7 +467,9 @@ public void clusterChanged(ClusterChangedEvent event) {
masterClusterService.submitUnbatchedStateUpdateTask("test-add-role-mapping", new ClusterStateUpdateTask() {
@Override
public ClusterState execute(ClusterState currentState) {
return roleMappingMetadata.updateClusterState(currentState);
return ClusterState.builder(currentState)
.putProjectMetadata(roleMappingMetadata.updateProject(currentState.getMetadata().getProject(projectId)))
.build();
}

@Override
Expand Down