Skip to content

Commit 0f0816f

Browse files
SLCORE-1123 Account for SonarQube Cloud region in
1 parent fcff018 commit 0f0816f

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

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

-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ private static BindingProperties extractSonarLintConfiguration(ClientFile sonarL
188188
var projectKey = configuration.get("projectKey");
189189
var organization = configuration.get("sonarCloudOrganization");
190190
var serverUrl = configuration.get("sonarQubeUri");
191-
// TODO make sure the field name is final
192191
var region = configuration.get("region");
193192
// Checking for PascalCase due to VS backward compatibility
194193
if (projectKey == null || ((organization == null) == (serverUrl == null))) {

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ public OrganizationsCache(ConnectionManager connectionManager) {
5252
this.connectionManager = connectionManager;
5353
}
5454

55-
public List<OrganizationDto> fuzzySearchOrganizations(Either<TokenDto, UsernamePasswordDto> credentials, String searchText, SonarCloudRegion region, SonarLintCancelMonitor cancelMonitor) {
55+
public List<OrganizationDto> fuzzySearchOrganizations(Either<TokenDto, UsernamePasswordDto> credentials, String searchText,
56+
SonarCloudRegion region, SonarLintCancelMonitor cancelMonitor) {
5657
return getTextSearchIndex(credentials, region, cancelMonitor).search(searchText)
5758
.entrySet()
5859
.stream()

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ public class SharedConnectedModeSettingsProvider {
3535
private static final String SONARCLOUD_CONNECTED_MODE_CONFIG = """
3636
{
3737
"sonarCloudOrganization": "%s",
38-
"projectKey": "%s"
38+
"projectKey": "%s",
39+
"region": "%s"
3940
}""";
4041
private static final String SONARQUBE_CONNECTED_MODE_CONFIG = """
4142
{
@@ -64,8 +65,9 @@ public String getSharedConnectedModeConfigFileContents(String configScopeId) {
6465
telemetryService.exportedConnectedMode();
6566
if (connection.getKind() == ConnectionKind.SONARCLOUD) {
6667
var organization = ((SonarCloudConnectionConfiguration) connection).getOrganization();
68+
var region = ((SonarCloudConnectionConfiguration) connection).getRegion();
6769

68-
return format(SONARCLOUD_CONNECTED_MODE_CONFIG, organization, projectKey);
70+
return format(SONARCLOUD_CONNECTED_MODE_CONFIG, organization, projectKey, region);
6971
} else {
7072
return format(SONARQUBE_CONNECTED_MODE_CONFIG, connection.getEndpointParams().getBaseUrl(), projectKey);
7173
}

0 commit comments

Comments
 (0)