From: Zipeng WU <zipeng.wu@sonarsource.com>
Date: Thu, 23 Mar 2023 18:58:58 +0000 (+0100)
Subject: SONAR-18867 When native git fails, it should output the actual error message
X-Git-Tag: 10.0.0.68432~73
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ba260e0990797dbe26ab1edc182200c758e3a8b2;p=sonarqube.git

SONAR-18867 When native git fails, it should output the actual error message
---

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scm/git/ProcessWrapperFactory.java b/sonar-scanner-engine/src/main/java/org/sonar/scm/git/ProcessWrapperFactory.java
index d317362ebc7..c00b62f4b5e 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scm/git/ProcessWrapperFactory.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scm/git/ProcessWrapperFactory.java
@@ -63,14 +63,13 @@ public class ProcessWrapperFactory {
 
       Process p = pb.start();
       try {
-        InputStream processStdOutput = p.getInputStream();
-        // don't use BufferedReader#readLine because it will also parse CR, which may be part of the actual source code line
-        try (Scanner scanner = new Scanner(new InputStreamReader(processStdOutput, UTF_8))) {
-          scanner.useDelimiter("\n");
-          while (scanner.hasNext()) {
-            stdOutLineConsumer.accept(scanner.next());
+        processInputStream(p.getInputStream(), stdOutLineConsumer);
+
+        processInputStream(p.getErrorStream(), line -> {
+          if (!line.isBlank()) {
+            LOG.debug(line);
           }
-        }
+        });
 
         int exit = p.waitFor();
         if (exit != 0) {
@@ -83,6 +82,15 @@ public class ProcessWrapperFactory {
         p.destroy();
       }
     }
+
+    private static void processInputStream(InputStream inputStream, Consumer<String> stringConsumer) {
+      try (Scanner scanner = new Scanner(new InputStreamReader(inputStream, UTF_8))) {
+        scanner.useDelimiter("\n");
+        while (scanner.hasNext()) {
+          stringConsumer.accept(scanner.next());
+        }
+      }
+    }
   }
 
 }
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scm/git/ProcessWrapperFactoryTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scm/git/ProcessWrapperFactoryTest.java
new file mode 100644
index 00000000000..12952933806
--- /dev/null
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scm/git/ProcessWrapperFactoryTest.java
@@ -0,0 +1,51 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2023 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonar.scm.git;
+
+import java.io.File;
+import java.io.IOException;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.sonar.api.utils.log.LogTester;
+import org.sonar.api.utils.log.LoggerLevel;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class ProcessWrapperFactoryTest {
+
+  @Rule
+  public TemporaryFolder temp = new TemporaryFolder();
+  @Rule
+  public LogTester logTester = new LogTester();
+  private final ProcessWrapperFactory underTest = new ProcessWrapperFactory();
+
+  @Test
+  public void should_log_error_output_in_debug_mode() throws IOException {
+    var root = temp.newFolder().toPath();
+    var processWrapper = underTest.create(root, v -> {}, "git", "blame");
+    assertThatThrownBy(() -> processWrapper.execute())
+      .isInstanceOf(IllegalStateException.class);
+
+    assertThat(logTester.logs(LoggerLevel.DEBUG).get(0)).contains("fatal: not a git repository");
+  }
+
+}