Merge branch 'fix-reporting_user-role' of github.com:legrego/elasticsearch into fix-reporting_user-role

Author: legrego

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

@@ -330,13 +330,11 @@ private static Map<String, RoleDescriptor> initializeReservedRoles() {
                         RoleDescriptor.ApplicationResourcePrivileges.builder()
                             .application("kibana-*")
                             .resources("*")
-                            .privileges(
-                                "reserved_reporting_user"
-                            )
+                            .privileges("reserved_reporting_user")
                             .build() },
                     null,
                     null,
-                    MetadataUtils.DEFAULT_RESERVED_METADATA,
+                    MetadataUtils.getDeprecatedReservedMetadata("Please grant access via Kibana privileges instead."),
                     null,
                     null,
                     null,

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

@@ -2773,9 +2773,7 @@ public void testReportingUserRole() {
 
         final String applicationName = "kibana-.kibana";
 
-        final Set<String> applicationPrivilegeNames = Set.of(
-            "reserved_reporting_user"
-        );
+        final Set<String> applicationPrivilegeNames = Set.of("reserved_reporting_user");
 
         final Set<String> allowedApplicationActionPatterns = Set.of(
             "login:",