Drop cluster scope method from RoleMappingMetadata (elastic#124174)

This removes `getFromClusterState` from `RoleMappingMetadata` and
replaces its use in the 2 test classes that were still using it

Author: tvernum

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

@@ -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);
     }

x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/FileSettingsRoleMappingsRestartIT.java

@@ -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;
@@ -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));
     }
 

x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/jwt/JwtRoleMappingsIntegTests.java

@@ -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;
@@ -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);
@@ -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();
@@ -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