[Gradle JDK automanagment] GradleWrapperMain patching

changelog/@unreleased/pr-341.v2.yml

@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: '[Gradle JDK automanagment] GradleWrapperMain patching'
+  links:
+  - https://github.com/palantir/gradle-jdks/pull/341

gradle-jdks-distributions/build.gradle

@@ -2,6 +2,7 @@ apply plugin: 'java'
 apply plugin: 'com.palantir.external-publish-jar'
 
 dependencies {
+    api project(':gradle-jdks-setup-common')
     api 'com.fasterxml.jackson.core:jackson-annotations'
 
     testImplementation 'org.junit.jupiter:junit-jupiter'

gradle-jdks-setup-common/build.gradle

@@ -0,0 +1,10 @@
+apply plugin: 'java'
+apply plugin: 'com.palantir.external-publish-jar'
+
+dependencies {
+    // Avoid adding large compile dependencies here, as they will also be added in the gradle-jdks-setup-all*.jar using the fatJar task
+    implementation 'com.fasterxml.jackson.core:jackson-annotations'
+
+    testImplementation platform('org.junit:junit-bom:5.9.1')
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+}

gradle-jdks-setup/src/main/java/com/palantir/gradle/jdks/setup/CommandRunner.java → gradle-jdks-setup-common/src/main/java/com/palantir/gradle/jdks/CommandRunner.java

@@ -14,14 +14,16 @@
  * limitations under the License.
  */
 
-package com.palantir.gradle.jdks.setup;
+package com.palantir.gradle.jdks;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
@@ -32,9 +34,17 @@
 public final class CommandRunner {
 
     public static String run(List<String> commandArguments) {
+        return run(commandArguments, Optional.empty());
+    }
+
+    public static String run(List<String> commandArguments, Optional<File> directory) {
         ExecutorService executorService = Executors.newFixedThreadPool(2);
         try {
-            Process process = new ProcessBuilder().command(commandArguments).start();
+            ProcessBuilder processBuilder = new ProcessBuilder().command(commandArguments);
+            if (directory.isPresent()) {
+                processBuilder.directory(directory.get());
+            }
+            Process process = processBuilder.start();
             CompletableFuture<String> outputFuture =
                     CompletableFuture.supplyAsync(() -> readAllInput(process.getInputStream()), executorService);
             CompletableFuture<String> errorOutputFuture =
@@ -64,7 +74,7 @@ public static String run(List<String> commandArguments) {
         }
     }
 
-    static String readAllInput(InputStream inputStream) {
+    public static String readAllInput(InputStream inputStream) {
         try (Stream<String> lines =
                 new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)).lines()) {
             return lines.collect(Collectors.joining("\n"));

gradle-jdks/src/main/java/com/palantir/gradle/jdks/CurrentOs.java → gradle-jdks-setup-common/src/main/java/com/palantir/gradle/jdks/CurrentOs.java

@@ -16,17 +16,12 @@
 
 package com.palantir.gradle.jdks;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.function.UnaryOperator;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 public final class CurrentOs {
     public static Os get() {
@@ -61,8 +56,8 @@ static Os linuxLibcFromLdd(UnaryOperator<List<String>> argTransformer) {
             // Extremely frustratingly, musl `ldd` exits with code 1 on --version, and prints to stderr, unlike the more
             // reasonable glibc, which exits with code 0 and prints to stdout. So we concat stdout and stderr together,
             // check the output for the correct strings, then fail if we can't find it.
-            String lowercaseOutput = (readAllInput(process.getInputStream()) + "\n"
-                            + readAllInput(process.getErrorStream()))
+            String lowercaseOutput = (CommandRunner.readAllInput(process.getInputStream()) + "\n"
+                            + CommandRunner.readAllInput(process.getErrorStream()))
                     .toLowerCase(Locale.ROOT);
 
             int secondsToWait = 5;
@@ -92,11 +87,5 @@ static Os linuxLibcFromLdd(UnaryOperator<List<String>> argTransformer) {
         }
     }
 
-    private static String readAllInput(InputStream inputStream) {
-        try (Stream<String> lines = new BufferedReader(new InputStreamReader(inputStream)).lines()) {
-            return lines.collect(Collectors.joining("\n"));
-        }
-    }
-
     private CurrentOs() {}
 }

gradle-jdks-setup/build.gradle

@@ -8,7 +8,8 @@ testSets {
 }
 
 dependencies {
-    // Avoid adding compile dependencies here, as they will also need to be added in the gradle-jdks-setup*.jar
+    // Avoid adding large compile dependencies here, as they will also be added in the gradle-jdks-setup-all*.jar using the fatJar task
+    implementation project(':gradle-jdks-setup-common')
 
     testImplementation 'org.junit.jupiter:junit-jupiter'
     testImplementation 'org.assertj:assertj-core'
@@ -21,10 +22,24 @@ dependencies {
     integrationTestImplementation 'org.assertj:assertj-core'
 }
 
+tasks.register('fatJar', Jar) {
+    dependsOn tasks.jar, ':gradle-jdks-setup-common:jar'
+    manifest {
+        attributes 'Main-Class': 'com.palantir.gradle.jdks.setup.GradleJdkInstallationSetup'
+    }
+    archiveBaseName = 'gradle-jdks-setup-all'
+    duplicatesStrategy = DuplicatesStrategy.FAIL
+    from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
+    with jar
+}
+
 tasks.withType(JavaCompile) {
     options.errorprone.disable 'PreferSafeLoggableExceptions'
 }
 
 tasks.integrationTest {
     environment("PROJECT_VERSION", project.version)
+    dependsOn tasks.build
 }
+
+tasks.build.dependsOn tasks.fatJar

gradle-jdks-setup/src/integrationTest/java/com/palantir/gradle/jdks/setup/GradleJdkInstallationSetupIntegrationTest.java

@@ -22,6 +22,7 @@
 import com.google.common.collect.Iterables;
 import com.palantir.gradle.jdks.AmazonCorrettoJdkDistribution;
 import com.palantir.gradle.jdks.Arch;
+import com.palantir.gradle.jdks.CommandRunner;
 import com.palantir.gradle.jdks.CurrentArch;
 import com.palantir.gradle.jdks.JdkPath;
 import com.palantir.gradle.jdks.JdkRelease;
@@ -43,7 +44,7 @@ public class GradleJdkInstallationSetupIntegrationTest {
             new BigInteger("143266978916655856878034712317230054538369994");
     private static final String AMAZON_CERT_ALIAS = "AmazonRootCA1Test";
     private static final String NON_EXISTING_CERT_ALIAS = "NonExistingCert";
-    private static final String SUCCESSFUL_OUTPUT = "Successfully installed JDK distribution, setting JAVA_HOME to";
+    private static final String SUCCESSFUL_OUTPUT = "Successfully installed JDK distribution in";
     private static final String JDK_VERSION = "11.0.21.9.1";
     private static final Arch ARCH = CurrentArch.get();
     private static final String TEST_HASH = "integration-tests";
@@ -91,14 +92,15 @@ private Path setupGradleDirectoryStructure(String jdkVersion, Os os) throws IOEx
          * │   │   │   │   │   ├── local-path
          * │   ├── certs/
          * │   │   ├── Palantir3rdGenRootCa.serial-number
-         * │   ├── gradle-jdk-major-version
+         * │   ├── gradle-daemon-jdk-version
+         * │   ├── gradle-jdks-setup.sh
          * │   ├── gradle-jdks-setup.jar
          * ├── subProjects/...
          * ...
          */
         String jdkMajorVersion = Iterables.get(Splitter.on('.').split(jdkVersion), 0);
         Path gradleDirectory = Files.createDirectories(workingDir.resolve("gradle"));
-        Path gradleJdkVersion = Files.createFile(gradleDirectory.resolve("gradle-jdk-major-version"));
+        Path gradleJdkVersion = Files.createFile(gradleDirectory.resolve("gradle-daemon-jdk-version"));
         writeFileContent(gradleJdkVersion, jdkMajorVersion.toString());
         JdkPath jdkPath = CORRETTO_JDK_DISTRIBUTION.path(
                 JdkRelease.builder().version(jdkVersion).os(os).arch(ARCH).build());
@@ -124,9 +126,9 @@ private Path setupGradleDirectoryStructure(String jdkVersion, Os os) throws IOEx
         // copy the jar from build/libs to the gradle directory
         Files.copy(
                 Path.of(String.format(
-                        "../gradle-jdks-setup/build/libs/gradle-jdks-setup-%s.jar",
+                        "../gradle-jdks-setup/build/libs/gradle-jdks-setup-all-%s.jar",
                         System.getenv().get("PROJECT_VERSION"))),
-                gradleDirectory.resolve("jdks/gradle-jdks-setup.jar"));
+                gradleDirectory.resolve("gradle-jdks-setup.jar"));
 
         // copy the gradle-jdks-setup.sh to the gradle directory
         Files.copy(
@@ -198,7 +200,7 @@ private static void assertJdkWithNoCertsWasSetUp(String output) {
         String expectedDistributionPath =
                 String.format("/root/.gradle/gradle-jdks/amazon-corretto-%s-%s", JDK_VERSION, TEST_HASH);
         assertThat(output)
-                .contains(SUCCESSFUL_OUTPUT)
+                .contains(String.format("%s %s", SUCCESSFUL_OUTPUT, expectedDistributionPath))
                 .contains(String.format("Java home is: %s", expectedDistributionPath))
                 .containsPattern(String.format("Java path is: java is ([^/]*\\s)*%s", expectedDistributionPath))
                 .contains(String.format("Java version is: %s", getJavaVersion(JDK_VERSION)))

gradle-jdks-setup/src/main/java/com/palantir/gradle/jdks/setup/CaResources.java

@@ -16,6 +16,9 @@
 
 package com.palantir.gradle.jdks.setup;
 
+import com.palantir.gradle.jdks.CommandRunner;
+import com.palantir.gradle.jdks.CurrentOs;
+import com.palantir.gradle.jdks.Os;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -33,7 +36,6 @@
 import java.util.Base64;
 import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -66,13 +68,20 @@ public void maybeImportCertsInJdk(Path jdkInstallationDirectory, Map<String, Str
     }
 
     private void importCertInJdk(AliasContentCert aliasContentCert, Path jdkInstallationDirectory) {
-        String osName = System.getProperty("os.name").toLowerCase(Locale.ROOT);
-        if (osName.startsWith("mac") || osName.startsWith("linux")) {
-            unixImportCertInJdk(aliasContentCert, jdkInstallationDirectory);
-            logger.log(String.format(
-                    "Successfully imported CA certificate %s into the JDK truststore", aliasContentCert.getAlias()));
-        } else {
-            logger.logError(String.format("Importing certificates for OS type '%s' is not yet supported", osName));
+        Os os = CurrentOs.get();
+        switch (os) {
+            case MACOS:
+            case LINUX_GLIBC:
+            case LINUX_MUSL:
+                unixImportCertInJdk(aliasContentCert, jdkInstallationDirectory);
+                logger.log(String.format(
+                        "Successfully imported CA certificate %s into the JDK truststore",
+                        aliasContentCert.getAlias()));
+                break;
+            case WINDOWS:
+                logger.logError(
+                        String.format("Importing certificates for OS type '%s' is not yet supported", os.uiName()));
+                break;
         }
     }
 
@@ -132,18 +141,21 @@ private static boolean isCertificateInTruststore(Path jdkInstallationDirectory,
     }
 
     private Optional<byte[]> systemCertificates() {
-        String osName = System.getProperty("os.name").toLowerCase(Locale.ROOT);
-        if (osName.startsWith("mac")) {
-            return Optional.of(macosSystemCertificates());
-        } else if (osName.startsWith("linux")) {
-            return linuxSystemCertificates();
-        } else {
-            logger.logError(String.format(
-                    "Not attempting to read Palantir CA from system truststore "
-                            + "as OS type '%s' does not yet support this",
-                    osName));
-            return Optional.empty();
+        Os os = CurrentOs.get();
+        switch (os) {
+            case MACOS:
+                return Optional.of(macosSystemCertificates());
+            case LINUX_MUSL:
+            case LINUX_GLIBC:
+                return linuxSystemCertificates();
+            case WINDOWS:
+                logger.logError(String.format(
+                        "Not attempting to read Palantir CA from system truststore "
+                                + "as OS type '%s' does not yet support this",
+                        os.uiName()));
+                return Optional.empty();
         }
+        throw new IllegalStateException("Unreachable code; all Os enum values should be handled");
     }
 
     private static byte[] macosSystemCertificates() {