SLVS-1818 Upgrade SLCore to 10.14.0.80189 and adapt RPC changes for S…

…QC multi-region
SonarSource · Feb 4, 2025 · a52e452 · a52e452
1 parent 7434614
commit a52e452
Show file tree

Hide file tree

Showing 13 changed files with 100 additions and 28 deletions.
diff --git a/src/EmbeddedSonarAnalyzer.props b/src/EmbeddedSonarAnalyzer.props
@@ -10,6 +10,6 @@
     <EmbeddedSonarHtmlAnalyzerVersion>3.18.0.5605</EmbeddedSonarHtmlAnalyzerVersion>
     <EmbeddedSonarSecretsJarVersion>2.20.0.5038</EmbeddedSonarSecretsJarVersion>
     <!-- SLOOP: Binaries for SonarLint Out Of Process -->
-    <EmbeddedSloopVersion>10.13.0.79996</EmbeddedSloopVersion>
+    <EmbeddedSloopVersion>10.14.0.80189</EmbeddedSloopVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/SLCore.IntegrationTests/SLCoreTestRunner.cs b/src/SLCore.IntegrationTests/SLCoreTestRunner.cs
@@ -103,7 +103,7 @@ public void Start()
             foldersProvider.GetWorkFolders().Returns(new SLCoreFolders(storageRoot, workDir, userHome));
 
             var connectionProvider = Substitute.For<IServerConnectionsProvider>();
-            connectionProvider.GetServerConnections().Returns(new Dictionary<string, ServerConnectionConfiguration>());
+            connectionProvider.GetServerConnections().Returns(new Dictionary<string, ServerConnectionConfigurationDtoBase>());
 
             var jarProvider = Substitute.For<ISLCoreEmbeddedPluginJarLocator>();
             jarProvider.ListJarFiles().Returns(DependencyLocator.AnalyzerPlugins);

diff --git a/src/SLCore.UnitTests/SLCoreInstanceHandleTests.cs b/src/SLCore.UnitTests/SLCoreInstanceHandleTests.cs
@@ -279,7 +279,7 @@ private void SetUpSuccessfulInitialization(out ILifecycleManagementSLCoreService
         constantsProvider.TelemetryConstants.Returns(TelemetryConstants);
 
         foldersProvider.GetWorkFolders().Returns(new SLCoreFolders(StorageRoot, WorkDir, UserHome));
-        connectionsProvider.GetServerConnections().Returns(new Dictionary<string, ServerConnectionConfiguration>
+        connectionsProvider.GetServerConnections().Returns(new Dictionary<string, ServerConnectionConfigurationDtoBase>
         {
             { SonarQubeConnection1.connectionId, SonarQubeConnection1 },
             { SonarQubeConnection2.connectionId, SonarQubeConnection2 },

diff --git a/src/SLCore.UnitTests/Service/Connection/ValidateConnectionParamsTests.cs b/src/SLCore.UnitTests/Service/Connection/ValidateConnectionParamsTests.cs
@@ -84,7 +84,8 @@ public void Ctor_TransientSonarCloudConnectionDtoWithCredentials_SerializeAsExpe
                                           "credentials": {
                                             "username": "myUser",
                                             "password": "password"
-                                          }
+                                          },
+                                          "region": "EU"
                                         }
                                       }
                                       """;
@@ -105,7 +106,8 @@ public void Ctor_TransientSonarCloudConnectionDtoDtoWithToken_SerializeAsExpecte
                                           "organization": "myOrg",
                                           "credentials": {
                                             "token": "myToken"
-                                          }
+                                          },
+                                          "region": "EU"
                                         }
                                       }
                                       """;
@@ -114,4 +116,37 @@ public void Ctor_TransientSonarCloudConnectionDtoDtoWithToken_SerializeAsExpecte
 
         serializedString.Should().Be(expectedString);
     }
+
+
+    [DataRow(SonarCloudRegion.EU, """
+                                  {
+                                    "transientConnection": {
+                                      "organization": "myOrg",
+                                      "credentials": {
+                                        "token": "myToken"
+                                      },
+                                      "region": "EU"
+                                    }
+                                  }
+                                  """)]
+    [DataRow(SonarCloudRegion.US, """
+                                  {
+                                    "transientConnection": {
+                                      "organization": "myOrg",
+                                      "credentials": {
+                                        "token": "myToken"
+                                      },
+                                      "region": "US"
+                                    }
+                                  }
+                                  """)]
+    [DataTestMethod]
+    public void Ctor_TransientSonarCloudConnectionWithRegion_SerializeAsExpected(SonarCloudRegion region, string expectedString)
+    {
+        var testSubject = new ValidateConnectionParams(new TransientSonarCloudConnectionDto("myOrg", Either<TokenDto, UsernamePasswordDto>.CreateLeft(new TokenDto("myToken")), region));
+
+        var serializedString = JsonConvert.SerializeObject(testSubject, Formatting.Indented);
+
+        serializedString.Should().Be(expectedString);
+    }
 }
diff --git a/src/SLCore.UnitTests/Service/Lifecycle/InitializeParamsTests.cs b/src/SLCore.UnitTests/Service/Lifecycle/InitializeParamsTests.cs
@@ -45,7 +45,10 @@ public void Serialize_AsExpected()
             [Language.CPP],
             ["csharp"],
             [new SonarQubeConnectionConfigurationDto("con1", true, "localhost")],
-            [new SonarCloudConnectionConfigurationDto("con2", false, "organization1")],
+            [
+                new SonarCloudConnectionConfigurationDto("con2", false, "organization1"),
+                new SonarCloudConnectionConfigurationDto("con3", true, "organization2", SonarCloudRegion.US)
+            ],
             "userHome",
             new Dictionary<string, StandaloneRuleConfigDto>
             {
@@ -107,8 +110,15 @@ [new SonarCloudConnectionConfigurationDto("con2", false, "organization1")],
                                   "sonarCloudConnections": [
                                     {
                                       "organization": "organization1",
+                                      "region": "EU",
                                       "connectionId": "con2",
                                       "disableNotification": false
+                                    },
+                                    {
+                                      "organization": "organization2",
+                                      "region": "US",
+                                      "connectionId": "con3",
+                                      "disableNotification": true
                                     }
                                   ],
                                   "sonarlintUserHome": "userHome",

diff --git a/src/SLCore.UnitTests/State/AliveConnectionTrackerTests.cs b/src/SLCore.UnitTests/State/AliveConnectionTrackerTests.cs
@@ -258,7 +258,7 @@ private static void VerifyLockTakenAndReleased(Mock<IAsyncLock> asyncLock, Mock<
     }
 
     private static void ConfigureConnectionProvider(out Mock<IServerConnectionsProvider> connectionProvider,
-        params ServerConnectionConfiguration[] connections)
+        params ServerConnectionConfigurationDtoBase[] connections)
     {
         connectionProvider = new Mock<IServerConnectionsProvider>();
         connectionProvider.Setup(x => x.GetServerConnections()).Returns(connections.ToDictionary(x => x.connectionId, x => x));

diff --git a/src/SLCore.UnitTests/State/ServerConnectionsProviderTests.cs b/src/SLCore.UnitTests/State/ServerConnectionsProviderTests.cs
@@ -83,7 +83,7 @@ public void GetServerConnections_CorrectlyReturnsSonarCloudConnection()
         var serverConnections = testSubject.GetServerConnections();
 
         serverConnections.Should().HaveCount(1);
-        serverConnections[connection.Id].Should().BeOfType<SonarCloudConnectionConfigurationDto>().Which.organization.Should().Be(organizationKey);
+        serverConnections[connection.Id].Should().BeEquivalentTo(new SonarCloudConnectionConfigurationDto("https://sonarcloud.io/organizations/org", false, "org", SonarCloudRegion.EU));
     }
 
     [TestMethod]
@@ -99,7 +99,7 @@ public void GetServerConnections_CorrectlyReturnsSonarCloudNotifications(bool is
         var serverConnections = testSubject.GetServerConnections();
 
         serverConnections.Should().HaveCount(1);
-        serverConnections[connection.Id].Should().BeOfType<SonarCloudConnectionConfigurationDto>().Which.disableNotification.Should().Be(!isSmartNotificationsEnabled);
+        serverConnections[connection.Id].Should().BeEquivalentTo(new SonarCloudConnectionConfigurationDto("https://sonarcloud.io/organizations/org", !isSmartNotificationsEnabled, "org", SonarCloudRegion.EU));
     }
 
     [TestMethod]

diff --git a/...n/Models/ServerConnectionConfiguration.cs → ...s/ServerConnectionConfigurationDtoBase.cs b/...n/Models/ServerConnectionConfiguration.cs → ...s/ServerConnectionConfigurationDtoBase.cs
@@ -18,7 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-namespace SonarLint.VisualStudio.SLCore.Service.Connection.Models
-{
-    public record ServerConnectionConfiguration(string connectionId, bool disableNotification);
-}
+namespace SonarLint.VisualStudio.SLCore.Service.Connection.Models;
+
+public record ServerConnectionConfigurationDtoBase(string connectionId, bool disableNotification);
diff --git a/src/SLCore/Service/Connection/Models/SonarCloudConnectionConfigurationDto.cs b/src/SLCore/Service/Connection/Models/SonarCloudConnectionConfigurationDto.cs
@@ -18,8 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-namespace SonarLint.VisualStudio.SLCore.Service.Connection.Models
-{
-    public record SonarCloudConnectionConfigurationDto(string connectionId, bool disableNotification, string organization)
-        : ServerConnectionConfiguration(connectionId, disableNotification);
-}
+namespace SonarLint.VisualStudio.SLCore.Service.Connection.Models;
+
+public record SonarCloudConnectionConfigurationDto(string connectionId, bool disableNotification, string organization, SonarCloudRegion region = SonarCloudRegion.EU)
+    : ServerConnectionConfigurationDtoBase(connectionId, disableNotification);
diff --git a/src/SLCore/Service/Connection/Models/SonarCloudRegion.cs b/src/SLCore/Service/Connection/Models/SonarCloudRegion.cs
@@ -0,0 +1,29 @@
+/*
+ * SonarLint for Visual Studio
+ * 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.
+ */
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace SonarLint.VisualStudio.SLCore.Service.Connection.Models;
+
+[JsonConverter(typeof(StringEnumConverter))]
+public enum SonarCloudRegion {
+    EU, US
+}
diff --git a/src/SLCore/Service/Connection/Models/SonarQubeConnectionConfigurationDto.cs b/src/SLCore/Service/Connection/Models/SonarQubeConnectionConfigurationDto.cs
@@ -18,8 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-namespace SonarLint.VisualStudio.SLCore.Service.Connection.Models
-{
-    public record SonarQubeConnectionConfigurationDto(string connectionId, bool disableNotification, string serverUrl)
-        : ServerConnectionConfiguration(connectionId, disableNotification);
-}
+namespace SonarLint.VisualStudio.SLCore.Service.Connection.Models;
+
+public record SonarQubeConnectionConfigurationDto(string connectionId, bool disableNotification, string serverUrl)
+    : ServerConnectionConfigurationDtoBase(connectionId, disableNotification);
diff --git a/src/SLCore/Service/Connection/Models/TransientSonarCloudConnectionDto.cs b/src/SLCore/Service/Connection/Models/TransientSonarCloudConnectionDto.cs
@@ -27,4 +27,5 @@ namespace SonarLint.VisualStudio.SLCore.Service.Connection.Models;
 public record TransientSonarCloudConnectionDto(
     string organization,
     [property: JsonConverter(typeof(EitherJsonConverter<TokenDto, UsernamePasswordDto>))]
-    Either<TokenDto, UsernamePasswordDto> credentials);
+    Either<TokenDto, UsernamePasswordDto> credentials,
+    SonarCloudRegion region = SonarCloudRegion.EU);
diff --git a/src/SLCore/State/ServerConnectionsProvider.cs b/src/SLCore/State/ServerConnectionsProvider.cs
@@ -26,7 +26,7 @@ namespace SonarLint.VisualStudio.SLCore.State;
 
 internal interface IServerConnectionsProvider
 {
-    Dictionary<string, ServerConnectionConfiguration> GetServerConnections();
+    Dictionary<string, ServerConnectionConfigurationDtoBase> GetServerConnections();
 }
 
 [Export(typeof(IServerConnectionsProvider))]
@@ -41,15 +41,15 @@ public ServerConnectionsProvider(IServerConnectionsRepository serverConnectionsR
         this.serverConnectionsRepository = serverConnectionsRepository;
     }
 
-    public Dictionary<string, ServerConnectionConfiguration> GetServerConnections()
+    public Dictionary<string, ServerConnectionConfigurationDtoBase> GetServerConnections()
     {
         var succeeded = serverConnectionsRepository.TryGetAll(out var serverConnections);
         return succeeded ? GetServerConnectionConfigurations(serverConnections).ToDictionary(conf => conf.connectionId) : [];
     }
 
-    private static List<ServerConnectionConfiguration> GetServerConnectionConfigurations(IReadOnlyList<ServerConnection> serverConnections)
+    private static List<ServerConnectionConfigurationDtoBase> GetServerConnectionConfigurations(IReadOnlyList<ServerConnection> serverConnections)
     {
-        var serverConnectionConfigurations = new List<ServerConnectionConfiguration>();
+        var serverConnectionConfigurations = new List<ServerConnectionConfigurationDtoBase>();
         foreach (var serverConnection in serverConnections)
         {
             switch (serverConnection)