wip

Author: kirill-knize-sonarsource

API_CHANGES.md

@@ -24,6 +24,7 @@
   * `getCleanCodeAttribute`
   * `getImpacts`
   * Use `getSeverityMode` instead.
+* Add SonarCloud region parameter to `org.sonarsource.sonarlint.core.rpc.protocol.client.connection.SonarCloudConnectionParams` to support multi-region SQC connection configuration
 
 # 10.13
 

backend/core/src/main/java/org/sonarsource/sonarlint/core/SonarCloudActiveEnvironment.java

@@ -21,7 +21,6 @@
 
 import java.net.URI;
 import java.util.Map;
-import java.util.Optional;
 
 import static org.apache.commons.lang.StringUtils.removeEnd;
 
@@ -63,12 +62,16 @@ public boolean isSonarQubeCloud(String uri) {
       .anyMatch(u -> u.equals(removeEnd(uri, "/")));
   }
 
-  public Optional<SonarCloudRegion> getRegion(String uri) {
+  /**
+   *  Before calling this method, caller should make sure URI is SonarCloud
+   */
+  public SonarCloudRegion getRegionOrThrow(String uri) {
     return uris.entrySet()
       .stream()
       .filter(e -> removeEnd(e.getValue().getProductionUri().toString(), "/").equals(removeEnd(uri, "/")))
       .findFirst()
-      .map(Map.Entry::getKey);
+      .map(Map.Entry::getKey)
+      .orElseThrow(() -> new IllegalArgumentException("URI should be a known SonarCloud URI"));
   }
 
   private static class SonarQubeCloudUris {

backend/core/src/main/java/org/sonarsource/sonarlint/core/embedded/server/RequestHandlerUtils.java

@@ -0,0 +1,38 @@
+/*
+ * SonarLint Core - Implementation
+ * Copyright (C) 2016-2025 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.sonarlint.core.embedded.server;
+
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ProtocolException;
+import org.sonarsource.sonarlint.core.SonarCloudActiveEnvironment;
+
+public class RequestHandlerUtils {
+
+  private RequestHandlerUtils() {
+    // util
+  }
+
+  public static String getServerUrlForSonarCloud(ClassicHttpRequest request, SonarCloudActiveEnvironment sonarCloudActiveEnvironment) throws ProtocolException {
+    var originUrl = request.getHeader("Origin").getValue();
+    // Since the 'isSonarCloud' check passed, we are sure that the region will be there
+    var region = sonarCloudActiveEnvironment.getRegionOrThrow(originUrl);
+    return sonarCloudActiveEnvironment.getUri(region).toString();
+  }
+}

backend/core/src/main/java/org/sonarsource/sonarlint/core/embedded/server/ShowFixSuggestionRequestHandler.java

@@ -69,6 +69,7 @@
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 import static org.sonarsource.sonarlint.core.commons.util.StringUtils.sanitizeAgainstRTLO;
+import static org.sonarsource.sonarlint.core.embedded.server.RequestHandlerUtils.getServerUrlForSonarCloud;
 
 public class ShowFixSuggestionRequestHandler implements HttpRequestHandler {
 
@@ -166,7 +167,7 @@ private static AssistCreatingConnectionParams createAssistServerConnectionParams
     String tokenValue = query.getTokenValue();
     if (query.isSonarCloud) {
       // It 'isSonarCloud' check passed, we are sure we will have a region
-      var region = sonarCloudActiveEnvironment.getRegion(query.getServerUrl()).get();
+      var region = sonarCloudActiveEnvironment.getRegionOrThrow(query.getServerUrl());
       return new AssistCreatingConnectionParams(new SonarCloudConnectionParams(query.getOrganizationKey(), tokenName, tokenValue, SonarCloudRegion.valueOf(region.name())));
     } else {
       return new AssistCreatingConnectionParams(new SonarQubeConnectionParams(query.getServerUrl(), tokenName, tokenValue));
@@ -211,13 +212,8 @@ ShowFixSuggestionQuery extractQuery(ClassicHttpRequest request, @Nullable String
     var payload = extractAndValidatePayload(request);
     boolean isSonarCloud = isSonarCloud(origin);
     String serverUrl;
-
-    // TODO remove duplication
     if (isSonarCloud) {
-      var originUrl = request.getHeader("Origin").getValue();
-      var region = sonarCloudActiveEnvironment.getRegion(originUrl);
-      // Since the 'isSonarCloud' check passed, we are sure that the region will be there
-      serverUrl = sonarCloudActiveEnvironment.getUri(region.get()).toString();
+      serverUrl = getServerUrlForSonarCloud(request, sonarCloudActiveEnvironment);
     } else {
       serverUrl = params.get("server");
     }

backend/core/src/main/java/org/sonarsource/sonarlint/core/embedded/server/ShowIssueRequestHandler.java

@@ -65,6 +65,7 @@
 
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
+import static org.sonarsource.sonarlint.core.embedded.server.RequestHandlerUtils.getServerUrlForSonarCloud;
 
 public class ShowIssueRequestHandler implements HttpRequestHandler {
 
@@ -207,12 +208,8 @@ ShowIssueQuery extractQuery(ClassicHttpRequest request) throws ProtocolException
     }
     boolean isSonarCloud = isSonarCloud(request);
     String serverUrl;
-
     if (isSonarCloud) {
-      var originUrl = request.getHeader("Origin").getValue();
-      var region = sonarCloudActiveEnvironment.getRegion(originUrl);
-      // Since the 'isSonarCloud' check passed, we are sure that the region will be there
-      serverUrl = sonarCloudActiveEnvironment.getUri(region.get()).toString();
+      serverUrl = getServerUrlForSonarCloud(request, sonarCloudActiveEnvironment);
     } else {
       serverUrl = params.get("server");
     }

backend/core/src/main/java/org/sonarsource/sonarlint/core/spring/SonarLintSpringAppConfig.java

@@ -206,7 +206,6 @@ UserPaths provideClientPaths(InitializeParams initializeParams) {
   @Bean
   SonarCloudActiveEnvironment provideSonarCloudActiveEnvironment(InitializeParams params) {
     var alternativeSonarCloudEnv = params.getAlternativeSonarCloudEnvironment();
-    // TODO consider giving possibility to provide custom urls for both regions
     return alternativeSonarCloudEnv == null ? SonarCloudActiveEnvironment.prod()
       : new SonarCloudActiveEnvironment(alternativeSonarCloudEnv.getUri(), alternativeSonarCloudEnv.getWebSocketsEndpointUri());
   }

test-utils/src/main/java/org/sonarsource/sonarlint/core/test/utils/SonarLintBackendFixture.java

@@ -253,7 +253,8 @@ public SonarLintBackendBuilder withSonarCloudConnection(String connectionId, Str
         storageBuilder.accept(storage);
         storages.add(storage);
       }
-      sonarCloudConnections.add(new SonarCloudConnectionConfigurationDto(connectionId, organizationKey, org.sonarsource.sonarlint.core.rpc.protocol.common.SonarCloudRegion.EU, disableNotifications));
+      sonarCloudConnections.add(new SonarCloudConnectionConfigurationDto(connectionId, organizationKey,
+        org.sonarsource.sonarlint.core.rpc.protocol.common.SonarCloudRegion.EU, disableNotifications));
       return this;
     }