SCANNERAPI-190 Don't override the SONAR_HOST_URL env variable if using Bitbucket Pipelines

Author: wouter-admiraal-sonarsource

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

@@ -143,11 +143,11 @@ public void execute(Map<String, String> taskProps) {
 
   private void initGlobalDefaultValues() {
     String sonarHostUrl = system.getEnvironmentVariable(SONAR_HOST_URL_ENV_VAR);
-    if (system.getEnvironmentVariable(BITBUCKET_CLOUD_ENV_VAR) != null) {
-      setGlobalDefaultValue(ScannerProperties.HOST_URL, SONARCLOUD_HOST);
-      logger.info("Bitbucket Cloud Pipelines detected");
-    } else if (sonarHostUrl != null) {
+    if (sonarHostUrl != null) {
       setGlobalDefaultValue(ScannerProperties.HOST_URL, sonarHostUrl);
+    } else if (system.getEnvironmentVariable(BITBUCKET_CLOUD_ENV_VAR) != null) {
+      setGlobalDefaultValue(ScannerProperties.HOST_URL, SONARCLOUD_HOST);
+      logger.info("Bitbucket Cloud Pipelines detected, no host variable set. Defaulting to sonarcloud.io.");
     } else {
       setGlobalDefaultValue(ScannerProperties.HOST_URL, "http://localhost:9000");
     }

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

@@ -106,14 +106,24 @@ public void should_set_localhost_as_host_by_default() {
   }
 
   @Test
-  public void should_set_sonarcloud_as_host_if_executed_from_bitbucket_cloud() {
+  public void should_set_sonarcloud_as_host_if_executed_from_bitbucket_cloud_and_no_host_env() {
     when(system.getEnvironmentVariable("BITBUCKET_BUILD_NUMBER")).thenReturn("123");
 
     scanner.start();
 
     assertThat(scanner.globalProperty("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");
+
+    scanner.start();
+
+    assertThat(scanner.globalProperty("sonar.host.url", null)).isEqualTo("http://from-env.org:9000");
+  }
+
   @Test
   public void should_set_url_from_env_as_host_if_host_env_var_provided() {
     when(system.getEnvironmentVariable("SONAR_HOST_URL")).thenReturn("http://from-env.org:9000");