SCANJLIB-215 Analysis should default to SonarCloud

Author: henryju

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

@@ -41,7 +41,6 @@
  * @since 2.2
  */
 public class EmbeddedScanner {
-  private static final String BITBUCKET_CLOUD_ENV_VAR = "BITBUCKET_BUILD_NUMBER";
   private static final String SONAR_HOST_URL_ENV_VAR = "SONAR_HOST_URL";
   private static final String SONARCLOUD_HOST = "https://sonarcloud.io";
   private final IsolatedLauncherFactory launcherFactory;
@@ -131,14 +130,15 @@ private void initBootstrapDefaultValues() {
     String sonarHostUrl = system.getEnvironmentVariable(SONAR_HOST_URL_ENV_VAR);
     if (sonarHostUrl != null) {
       setBootstrapPropertyIfNotAlreadySet(ScannerProperties.HOST_URL, sonarHostUrl);
-    } else if (system.getEnvironmentVariable(BITBUCKET_CLOUD_ENV_VAR) != null) {
-      setBootstrapPropertyIfNotAlreadySet(ScannerProperties.HOST_URL, SONARCLOUD_HOST);
-      logger.info("Bitbucket Cloud Pipelines detected, no host variable set. Defaulting to sonarcloud.io.");
     } else {
-      setBootstrapPropertyIfNotAlreadySet(ScannerProperties.HOST_URL, "http://localhost:9000");
+      setBootstrapPropertyIfNotAlreadySet(ScannerProperties.HOST_URL, getSonarCloudUrl());
     }
   }
 
+  private String getSonarCloudUrl() {
+    return bootstrapProperties.getOrDefault("sonar.scanner.sonarcloudUrl", SONARCLOUD_HOST);
+  }
+
   private void initAnalysisProperties(Map<String, String> p) {
     initSourceEncoding(p);
     new Dirs(logger).init(p);

lib/src/test/java/org/sonarsource/scanner/lib/EmbeddedScannerTest.java

@@ -99,29 +99,19 @@ public void test_app() {
   }
 
   @Test
-  public void should_set_localhost_as_host_by_default() {
-    scanner.start();
-
-    assertThat(scanner.getBootstrapProperty("sonar.host.url", null)).isEqualTo("http://localhost:9000");
-  }
-
-  @Test
-  public void should_set_sonarcloud_as_host_if_executed_from_bitbucket_cloud_and_no_host_env() {
-    when(system.getEnvironmentVariable("BITBUCKET_BUILD_NUMBER")).thenReturn("123");
-
+  public void should_set_sonarcloud_as_host_by_default() {
     scanner.start();
 
     assertThat(scanner.getBootstrapProperty("sonar.host.url", null)).isEqualTo("https://sonarcloud.io");
   }
 
   @Test
-  public void should_set_url_from_env_as_host_if_host_env_var_provided_even_on_bitbucket_cloud() {
-    when(system.getEnvironmentVariable("BITBUCKET_BUILD_NUMBER")).thenReturn("123");
-    when(system.getEnvironmentVariable("SONAR_HOST_URL")).thenReturn("http://from-env.org:9000");
+  public void should_use_sonarcloud_url_from_property() {
+    scanner
+      .setBootstrapProperty("sonar.scanner.sonarcloudUrl", "https://preprod.sonarcloud.io")
+      .start();
 
-    scanner.start();
-
-    assertThat(scanner.getBootstrapProperty("sonar.host.url", null)).isEqualTo("http://from-env.org:9000");
+    assertThat(scanner.getBootstrapProperty("sonar.host.url", null)).isEqualTo("https://preprod.sonarcloud.io");
   }
 
   @Test