Fix repository-hdfs gradle to perform transformation directly

Author: ldematte

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/dependencies/patches/hdfs/HdfsClassPatcher.java

@@ -54,8 +54,13 @@ record JarPatchers(String artifactName, Map<String, Function<ClassWriter, ClassV
             )
         ),
         new JarPatchers(
-            "hadoop-auth",
-            Map.of("org/apache/hadoop/security/authentication/client/KerberosAuthenticator.class", SubjectGetSubjectPatcher::new)
+            "hadoop-client-api",
+            Map.ofEntries(
+                entry("org/apache/hadoop/util/ShutdownHookManager.class", ShutdownHookManagerPatcher::new),
+                entry("org/apache/hadoop/util/Shell.class", ShellPatcher::new),
+                entry("org/apache/hadoop/security/UserGroupInformation.class", SubjectGetSubjectPatcher::new),
+                entry("org/apache/hadoop/security/authentication/client/KerberosAuthenticator.class", SubjectGetSubjectPatcher::new)
+            )
         )
     );
 

plugins/repository-hdfs/build.gradle

@@ -27,23 +27,20 @@ def patched = Attribute.of('patched', Boolean)
 configurations {
   hdfsFixture2
   hdfsFixture3
-  hdfsClientApi {
+  compileClasspath {
+    attributes {
+      attribute(patched, true)
+    }
+  }
+  runtimeClasspath {
     attributes {
       attribute(patched, true)
     }
   }
 }
 
 dependencies {
-  hdfsClientApi "org.apache.hadoop:hadoop-client-api:${versions.hadoop}"
-  api project(path: 'hadoop-client-api', configuration: 'default')
-  if (isEclipse) {
-    /*
-     * Eclipse can't pick up the shadow dependency so we point it at *something*
-     * so it can compile things.
-     */
-    api project(path: 'hadoop-client-api')
-  }
+  api("org.apache.hadoop:hadoop-client-api:${versions.hadoop}")
   runtimeOnly "org.apache.hadoop:hadoop-client-runtime:${versions.hadoop}"
   implementation "org.apache.hadoop:hadoop-hdfs:${versions.hadoop}"
   api "com.google.protobuf:protobuf-java:${versions.protobuf}"
@@ -88,7 +85,7 @@ dependencies {
     from.attribute(patched, false)
     to.attribute(patched, true)
     parameters {
-      matchingArtifacts = ["hadoop-common", "hadoop-auth"]
+      matchingArtifacts = ["hadoop-client-api"]
     }
   }
 }
@@ -212,6 +209,15 @@ tasks.named("thirdPartyAudit").configure {
     'org.apache.hadoop.thirdparty.protobuf.UnsafeUtil$MemoryAccessor',
     'org.apache.hadoop.thirdparty.protobuf.MessageSchema',
     'org.apache.hadoop.thirdparty.protobuf.UnsafeUtil$Android32MemoryAccessor',
-    'org.apache.hadoop.thirdparty.protobuf.UnsafeUtil$Android64MemoryAccessor'
+    'org.apache.hadoop.thirdparty.protobuf.UnsafeUtil$Android64MemoryAccessor',
+    'org.apache.hadoop.thirdparty.protobuf.UnsafeUtil$Android64MemoryAccessor',
+    'org.apache.hadoop.hdfs.shortcircuit.ShortCircuitShm',
+    'org.apache.hadoop.hdfs.shortcircuit.ShortCircuitShm$Slot',
+    'org.apache.hadoop.io.FastByteComparisons$LexicographicalComparerHolder$UnsafeComparer',
+    'org.apache.hadoop.io.FastByteComparisons$LexicographicalComparerHolder$UnsafeComparer$1',
+    'org.apache.hadoop.io.nativeio.NativeIO',
+    'org.apache.hadoop.service.launcher.InterruptEscalator',
+    'org.apache.hadoop.service.launcher.IrqHandler',
+    'org.apache.hadoop.util.SignalLogger$Handler'
   )
 }