From 905f67f3119110df32528fa69214c94a15315324 Mon Sep 17 00:00:00 2001
From: Rene Groeschke <rene@elastic.co>
Date: Mon, 11 Jul 2022 10:45:16 +0200
Subject: [PATCH] Polish reworked LoggedExec task

---
 .../gradle/LoggedExecFuncTest.groovy             |  6 +++---
 .../org/elasticsearch/gradle/LoggedExec.java     | 16 +++++++++-------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/build-tools/src/integTest/groovy/org/elasticsearch/gradle/LoggedExecFuncTest.groovy b/build-tools/src/integTest/groovy/org/elasticsearch/gradle/LoggedExecFuncTest.groovy
index 302fb2bcc2257..5a92f61c70d8c 100644
--- a/build-tools/src/integTest/groovy/org/elasticsearch/gradle/LoggedExecFuncTest.groovy
+++ b/build-tools/src/integTest/groovy/org/elasticsearch/gradle/LoggedExecFuncTest.groovy
@@ -35,7 +35,7 @@ class LoggedExecFuncTest extends AbstractGradleFuncTest {
         import org.elasticsearch.gradle.LoggedExec
         tasks.register('loggedExec', LoggedExec) {
           commandLine 'ls', '-lh'
-          spoolOutput = $spooling
+          getSpoolOutput().set($spooling)
         }
         """
         when:
@@ -54,7 +54,7 @@ class LoggedExecFuncTest extends AbstractGradleFuncTest {
         import org.elasticsearch.gradle.LoggedExec
         tasks.register('loggedExec', LoggedExec) {
           commandLine 'ls', 'wtf'
-          spoolOutput = $spooling
+          getSpoolOutput().set($spooling)        
         }
         """
         when:
@@ -97,7 +97,7 @@ class LoggedExecFuncTest extends AbstractGradleFuncTest {
         tasks.register('loggedExec', LoggedExec) {
           commandLine 'echo', 'HELLO'
           getCaptureOutput().set(true)
-          spoolOutput = true
+          getSpoolOutput().set(true)
         }
         """
         when:
diff --git a/build-tools/src/main/java/org/elasticsearch/gradle/LoggedExec.java b/build-tools/src/main/java/org/elasticsearch/gradle/LoggedExec.java
index 9740a0c2f5425..acb526cf9a3bb 100644
--- a/build-tools/src/main/java/org/elasticsearch/gradle/LoggedExec.java
+++ b/build-tools/src/main/java/org/elasticsearch/gradle/LoggedExec.java
@@ -56,7 +56,6 @@ public abstract class LoggedExec extends DefaultTask implements FileSystemOperat
     protected FileSystemOperations fileSystemOperations;
     private ProjectLayout projectLayout;
     private ExecOperations execOperations;
-    private boolean spoolOutput;
 
     @Input
     @Optional
@@ -84,6 +83,9 @@ public abstract class LoggedExec extends DefaultTask implements FileSystemOperat
     @Input
     abstract public Property<File> getWorkingDir();
 
+    @Internal
+    abstract public Property<Boolean> getSpoolOutput();
+
     private String output;
 
     @Inject
@@ -95,14 +97,16 @@ public LoggedExec(ProjectLayout projectLayout, ExecOperations execOperations, Fi
         // For now mimic default behaviour of Gradle Exec task here
         getEnvironment().putAll(System.getenv());
         getCaptureOutput().convention(false);
+        getSpoolOutput().convention(false);
     }
 
     @TaskAction
     public void run() {
+        boolean spoolOutput = getSpoolOutput().get();
         if (spoolOutput && getCaptureOutput().get()) {
             throw new GradleException("Capturing output is not supported when spoolOutput is true.");
         }
-        if (getCaptureOutput().getOrElse(false) && getIndentingConsoleOutput().isPresent()) {
+        if (getCaptureOutput().get() && getIndentingConsoleOutput().isPresent()) {
             throw new GradleException("Capturing output is not supported when indentingConsoleOutput is configured.");
         }
         Consumer<Logger> outputLogger;
@@ -156,7 +160,9 @@ public void run() {
         if (getLogger().isInfoEnabled() == false) {
             if (exitValue != 0) {
                 try {
-                    getLogger().error("Output for " + getExecutable().get() + ":");
+                    if (getIndentingConsoleOutput().isPresent() == false) {
+                        getLogger().error("Output for " + getExecutable().get() + ":");
+                    }
                     outputLogger.accept(getLogger());
                 } catch (Exception e) {
                     throw new GradleException("Failed to read exec output", e);
@@ -173,10 +179,6 @@ private String byteStreamToString(OutputStream out) {
         return ((ByteArrayOutputStream) out).toString(StandardCharsets.UTF_8);
     }
 
-    public void setSpoolOutput(boolean spoolOutput) {
-        this.spoolOutput = spoolOutput;
-    }
-
     public static ExecResult exec(ExecOperations execOperations, Action<ExecSpec> action) {
         return genericExec(execOperations::exec, action);
     }