Merge branch 'knowledge-base-index-privileges' of https://github.com/Supplementing/elasticsearch into knowledge-base-index-privileges

Author: Supplementing

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

@@ -4306,10 +4306,4 @@ private IndexAbstraction mockIndexAbstraction(String name) {
         return mock;
     }
 
-    private IndexAbstraction mockIndexAbstraction(String name, IndexAbstraction.Type type) {
-        IndexAbstraction mock = mock(IndexAbstraction.class);
-        when(mock.getName()).thenReturn(name);
-        when(mock.getType()).thenReturn(type);
-        return mock;
-    }
 }

x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/Fleet.java

@@ -271,7 +271,10 @@ private static SystemIndexDescriptor fleetArtifactsSystemIndexDescriptors() {
 
     private static SystemIndexDescriptor fleetIntegrationKnowledgeSystemIndexDescriptor() {
         PutIndexTemplateRequest request = new PutIndexTemplateRequest();
-        request.source(loadTemplateSource("/fleet-integration-knowledge.json", FLEET_INTEGRATION_KNOWLEDGE_MAPPINGS_VERSION), XContentType.JSON);
+        request.source(
+            loadTemplateSource("/fleet-integration-knowledge.json", FLEET_INTEGRATION_KNOWLEDGE_MAPPINGS_VERSION),
+            XContentType.JSON
+        );
 
         return SystemIndexDescriptor.builder()
             .setType(Type.INTERNAL_MANAGED)

x-pack/plugin/fleet/src/test/java/org/elasticsearch/xpack/fleet/FleetTests.java

@@ -61,7 +61,7 @@ public void testFleetIndexNames() {
         assertFalse(fleetDescriptors.stream().anyMatch(d -> d.matchesIndexPattern(".fleet-actions-results")));
 
         assertTrue(fleetDescriptors.stream().anyMatch(d -> d.matchesIndexPattern(".fleet-secrets")));
-        
+
         assertTrue(fleetDescriptors.stream().anyMatch(d -> d.matchesIndexPattern(".integration_knowledge")));
     }