SCANJLIB-208 Support new bootstrapping mechanism

Author: ericg138

.cirrus.yml

@@ -70,7 +70,7 @@ qa_task:
   env:
     matrix:
       - QA_CATEGORY: RELEASE
-      - QA_CATEGORY: DEV
+      - QA_CATEGORY: LATEST_RELEASE
     JAVA_VERSION:
       - LATEST_RELEASE
     GITHUB_TOKEN: VAULT[development/github/token/licenses-ro token]

batch-interface/src/main/java/org/sonarsource/scanner/lib/internal/batch/IsolatedLauncher.java

@@ -23,7 +23,4 @@
 
 public interface IsolatedLauncher {
   void execute(Map<String, String> properties, LogOutput logOutput);
-
-  String getVersion();
-
 }

batch/src/main/java/org/sonarsource/scanner/lib/internal/batch/BatchIsolatedLauncher.java

@@ -19,11 +19,6 @@
  */
 package org.sonarsource.scanner.lib.internal.batch;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 /**
@@ -45,17 +40,4 @@ public BatchIsolatedLauncher(BatchFactory factory) {
   public void execute(Map<String, String> properties, LogOutput logOutput) {
     factory.createBatch(properties, logOutput).execute();
   }
-
-  @Override
-  public String getVersion() {
-    InputStream is = this.getClass().getClassLoader().getResourceAsStream("sq-version.txt");
-    if (is == null) {
-      return null;
-    }
-    try (BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
-      return br.readLine();
-    } catch (IOException e) {
-      return null;
-    }
-  }
 }

its/it-simple-scanner/src/main/java/com/sonar/scanner/lib/it/Main.java

@@ -50,7 +50,7 @@ public static void main(String[] args) {
 
   private static void runProject(Map<String, String> props, LogOutput logOutput) throws Exception {
 
-    try (var scannerEngine = new ScannerEngineBootstrapper("Simple Scanner", "1.0", logOutput)
+    try (var scannerEngine = ScannerEngineBootstrapper.create("Simple Scanner", "1.0", logOutput)
       .addBootstrapProperties(props)
       .bootstrap()) {
       scannerEngine.analyze(props);

its/it-tests/src/test/java/com/sonar/scanner/lib/it/ProxyTest.java

@@ -209,7 +209,7 @@ public void simple_analysis_with_proxy_auth() throws Exception {
 
     BuildResult buildResult = scanner.executeSimpleProject(project("js-sample"), ORCHESTRATOR.getServer().getUrl(), params, Map.of());
     assertThat(buildResult.getLastStatus()).isEqualTo(1);
-    assertThat(buildResult.getLogs()).contains("Status returned by url", "is not valid: [407]");
+    assertThat(buildResult.getLogs()).contains("Error status returned by url", ": 407");
     assertThat(seenByProxy).isEmpty();
 
     params.put("http.proxyUser", PROXY_USER);

its/it-tests/src/test/java/com/sonar/scanner/lib/it/SSLTest.java

@@ -212,7 +212,7 @@ public void simple_analysis_with_server_and_without_client_certificate_is_failin
     assertThat(buildResult.getLastStatus()).isEqualTo(1);
 
     // different exception is thrown depending on the JDK version. See: https://bugs.java.com/bugdatabase/view_bug.do?bug_id=8172163
-    String failedAnalysis = "(?s).*org\\.sonarsource\\.scanner\\.lib\\.internal\\.ScannerException: Unable to execute SonarScanner analysis.*";
+    String failedAnalysis = "(?s).*java\\.lang\\.IllegalStateException: Failed to get server version.*";
     assertThat(buildResult.getLogs())
       .matches(p -> p.matches(failedAnalysis + "Caused by: javax\\.net\\.ssl\\.SSLException: Broken pipe \\(Write failed\\).*") ||
         p.matches(failedAnalysis + "Caused by: javax\\.net\\.ssl\\.SSLProtocolException: Broken pipe \\(Write failed\\).*") ||

its/it-tests/src/test/java/com/sonar/scanner/lib/it/ScannerJavaLibraryTestSuite.java

@@ -37,7 +37,7 @@ public class ScannerJavaLibraryTestSuite {
 
   @ClassRule
   public static final OrchestratorRule ORCHESTRATOR = OrchestratorRule.builderEnv()
-    .setSonarVersion(System.getProperty(SONAR_RUNTIME_VERSION, "LATEST_RELEASE"))
+    .setSonarVersion(System.getProperty(SONAR_RUNTIME_VERSION, "DEV"))
     .useDefaultAdminCredentialsForBuilds(true)
     // We need to use a plugin compatible with both SonarQube DEV & SonarQube version defined in .cirrus.yml (currently SQ 7.9)
     .addPlugin(MavenLocation.of("org.sonarsource.javascript", "sonar-javascript-plugin", "7.4.4.15624"))

lib/pom.xml

@@ -24,6 +24,10 @@
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-compress</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
@@ -66,6 +70,11 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>

lib/src/main/java/org/sonarsource/scanner/lib/InProcessScannerEngineFacade.java

@@ -0,0 +1,45 @@
+/*
+ * SonarScanner Java Library
+ * Copyright (C) 2011-2024 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.sonarsource.scanner.lib;
+
+import java.util.Map;
+import javax.annotation.Nullable;
+import org.sonarsource.scanner.lib.internal.IsolatedLauncherFactory;
+
+public class InProcessScannerEngineFacade extends ScannerEngineFacade {
+  private final IsolatedLauncherFactory.IsolatedLauncherAndClassloader launcherAndCl;
+
+  InProcessScannerEngineFacade(Map<String, String> bootstrapProperties, IsolatedLauncherFactory.IsolatedLauncherAndClassloader launcherAndCl,
+                               LogOutput logOutput, boolean isSonarCloud, @Nullable String serverVersion) {
+    super(bootstrapProperties, logOutput, isSonarCloud, serverVersion);
+    this.launcherAndCl = launcherAndCl;
+  }
+
+  @Override
+  void doAnalyze(Map<String, String> allProps) {
+    launcherAndCl.getLauncher().execute(allProps, (formattedMessage, level) -> logOutput.log(formattedMessage,
+      LogOutput.Level.valueOf(level.name())));
+  }
+
+  @Override
+  public void close() throws Exception {
+    launcherAndCl.close();
+  }
+}

lib/src/main/java/org/sonarsource/scanner/lib/LoggerAdapter.java

@@ -53,6 +53,11 @@ public void error(String msg) {
     logOutput.log(msg, LogOutput.Level.ERROR);
   }
 
+  @Override
+  public void trace(String msg) {
+    logOutput.log(msg, LogOutput.Level.TRACE);
+  }
+
   @Override
   public void debug(String msg) {
     logOutput.log(msg, LogOutput.Level.DEBUG);