fix merge

ankit--sethi · ankit--sethi · commit 39b2bb6f7760 · 2025-06-24T14:03:48.000-05:00
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Authentication.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Authentication.java
@@ -823,7 +823,6 @@ public void toXContentFragment(XContentBuilder builder) throws IOException {
             apiKeyField.put("managed_by", CredentialManagedBy.CLOUD.getDisplayName());
             builder.field("api_key", Collections.unmodifiableMap(apiKeyField));
         }
-        // TODO cloud API key fields such as managed_by
     }
 
     public static Authentication getAuthenticationFromCrossClusterAccessMetadata(Authentication authentication) {

Original file line number	Diff line number	Diff line change
`@@ -823,7 +823,6 @@ public void toXContentFragment(XContentBuilder builder) throws IOException {`
`823`	`823`	`apiKeyField.put("managed_by", CredentialManagedBy.CLOUD.getDisplayName());`
`824`	`824`	`builder.field("api_key", Collections.unmodifiableMap(apiKeyField));`
`825`	`825`	`}`
`826`		`- // TODO cloud API key fields such as managed_by`
`827`	`826`	`}`
`828`	`827`
`829`	`828`	`public static Authentication getAuthenticationFromCrossClusterAccessMetadata(Authentication authentication) {`