fixup! Test

Author: jfreden

x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/SecurityIndexRoleMappingCleanupIT.java

@@ -44,7 +44,8 @@ public void testCleanupDuplicateMappingsCreatedWithBug() throws Exception {
             assertAllRoleMappings(client(), "no_name_conflict", "operator_role_mapping_1");
         } else if (CLUSTER_TYPE == ClusterType.UPGRADED) {
             waitForSecurityMigrationCompletion(adminClient(), 2);
-            assertAllRoleMappings(client(), "no_name_conflict");
+            assertRoleMappingsExistsInClusterState("operator_role_mapping_1", "operator_role_mapping_2");
+            // In the old cluster we might have created these (depending on the node features), so make sure they were removed
             assertFalse(roleMappingExistsInSecurityIndex("operator_role_mapping_1"));
             assertFalse(roleMappingExistsInSecurityIndex("operator_role_mapping_2"));
             // Make sure we can create a conflicting role mapping again
@@ -63,15 +64,41 @@ public void testCleanupDuplicateMappingsCreatedBeforeBug() throws Exception {
             assertAllRoleMappings(client(), "no_name_conflict", "operator_role_mapping_1", "operator_role_mapping_2");
         } else if (CLUSTER_TYPE == ClusterType.UPGRADED) {
             waitForSecurityMigrationCompletion(adminClient(), 2);
-            // Make sure migrated mapping is only in cluster state
+            assertRoleMappingsExistsInClusterState("operator_role_mapping_1", "operator_role_mapping_2");
+            // In the old cluster we might have created these (depending on the version), so make sure they were removed
             assertFalse(roleMappingExistsInSecurityIndex("operator_role_mapping_1"));
             assertFalse(roleMappingExistsInSecurityIndex("operator_role_mapping_2"));
-            // Make sure not migrated mapping is still in security index
-            assertTrue(roleMappingExistsInSecurityIndex("no_name_conflict"));
             // Make sure we can create a conflicting role mapping
             createNativeRoleMapping("operator_role_mapping_1", Map.of("meta", "test"));
         }
     }
+    @SuppressWarnings("unchecked")
+    private void assertRoleMappingsExistsInClusterState(String... roleMappingNames) throws IOException {
+        final Request request = new Request("GET", "_cluster/state/metadata/");
+        Response response = adminClient().performRequest(request);
+        assertOK(response);
+        Map<String, Object> responseMap = responseAsMap(response);
+        Map<String, Object> metadata = ((Map<String, Object>) responseMap.get("metadata"));
+        assertNotNull(metadata);
+        List<Map<String,Object>> clusterStateRoleMappings = (List<Map<String,Object>>) ((Map<String,Object>) metadata.get("role_mappings"))
+            .get("role_mappings");
+
+        assertNotNull(clusterStateRoleMappings);
+        assertEquals(clusterStateRoleMappings.size(), roleMappingNames.length);
+
+        List<String> roleMappingHandlers = (List<String>) ((Map<String, Object>)((Map<String, Object>)
+            ((Map<String, Object>)((Map<String, Object>) metadata
+                .get("reserved_state"))
+                .get("file_settings"))
+                .get("handlers"))
+                .get("role_mappings"))
+                .get("keys");
+
+        assertNotNull(roleMappingHandlers);
+        assertEquals(clusterStateRoleMappings.size(), roleMappingHandlers.size());
+        assertThat(roleMappingHandlers, containsInAnyOrder(roleMappingNames));
+    }
+
 
     @SuppressWarnings("unchecked")
     private boolean roleMappingExistsInSecurityIndex(String mappingName) throws IOException {