SLVS-1818 Upgrade SLCore to 10.14.0.80189 and adapt RPC changes for SQC multi-region #5985
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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.14.0.80189</EmbeddedSloopVersion> | ||
| </PropertyGroup> | ||
| </Project> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -46,7 +46,8 @@ public async Task Sloop_StartedAndStoppedWithoutErrors() | |
| VerifyNoErrorsInLogs(testLogger); | ||
| VerifyNoErrorsInLogs(slCoreErrorLogger); | ||
| VerifyLogMessagesReceived(slCoreLogger); | ||
| slCoreLogger.AssertPartialOutputStringExists("Telemetry disabled on server startup"); | ||
| slCoreLogger.AssertPartialOutputStringDoesNotExist("Internal error"); | ||
| } | ||
|
|
||
| [TestMethod] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -102,7 +102,7 @@ public void Start() | |
| foldersProvider.GetWorkFolders().Returns(new SLCoreFolders(storageRoot, workDir, userHome)); | ||
|
|
||
| var connectionProvider = Substitute.For<IServerConnectionsProvider>(); | ||
| connectionProvider.GetServerConnections().Returns(new Dictionary<string, ServerConnectionConfigurationDtoBase>()); | ||
|
|
||
| var jarProvider = Substitute.For<ISLCoreEmbeddedPluginJarLocator>(); | ||
| jarProvider.ListJarFiles().Returns(DependencyLocator.AnalyzerPlugins); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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, ServerConnectionConfigurationDtoBase> | ||
| { | ||
| { SonarQubeConnection1.connectionId, SonarQubeConnection1 }, | ||
| { SonarQubeConnection2.connectionId, SonarQubeConnection2 }, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -102,7 +102,8 @@ public void Serialize_WithSonarCloudToken_AsExpected() | |
| "organization": "my-org", | ||
| "credentials": { | ||
| "token": "super-secret-token" | ||
| }, | ||
| "region": "EU" | ||
| } | ||
| } | ||
| """; | ||
|
|
@@ -131,7 +132,8 @@ public void Serialize_WithSonarCloudUsernamePassword_AsExpected() | |
| "credentials": { | ||
| "username": "[email protected]", | ||
| "password": "betwEEn-me-and-U" | ||
| }, | ||
| "region": "EU" | ||
| } | ||
| } | ||
| """; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -115,7 +115,8 @@ public void Serialize_WithSonarCloudToken_AsExpected() | |
| "organization": "my-org", | ||
| "credentials": { | ||
| "token": "super-secret-token" | ||
| }, | ||
| "region": "EU" | ||
| }, | ||
| "projectKeys": [ | ||
| "project-key-1", | ||
|
|
@@ -149,7 +150,8 @@ public void Serialize_WithSonarCloudUsernamePassword_AsExpected() | |
| "credentials": { | ||
| "username": "[email protected]", | ||
| "password": "betwEEn-me-and-U" | ||
| }, | ||
| "region": "EU" | ||
| }, | ||
| "projectKeys": [ | ||
| "project-key-1", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,43 +22,62 @@ | |
| using SonarLint.VisualStudio.SLCore.Common.Models; | ||
| using SonarLint.VisualStudio.SLCore.Protocol; | ||
| using SonarLint.VisualStudio.SLCore.Service.Connection; | ||
| using SonarLint.VisualStudio.SLCore.Service.Connection.Models; | ||
|
|
||
| namespace SonarLint.VisualStudio.SLCore.UnitTests.Service.Connection; | ||
|
|
||
| [TestClass] | ||
| public class ListUserOrganizationsParamsTests | ||
| { | ||
|
|
||
| [DataRow(SonarCloudRegion.EU, """ | ||
| { | ||
| "credentials": { | ||
| "username": "myUser", | ||
| "password": "password" | ||
| }, | ||
| "region": "EU" | ||
| } | ||
| """)] | ||
| [DataRow(SonarCloudRegion.US, """ | ||
| { | ||
| "credentials": { | ||
| "username": "myUser", | ||
| "password": "password" | ||
| }, | ||
| "region": "US" | ||
| } | ||
| """)] | ||
| [TestMethod] | ||
| public void Ctor_UsernamePasswordIsUsed_SerializeAsExpected(SonarCloudRegion region, string expectedString) | ||
| { | ||
| var testSubject = new ListUserOrganizationsParams(new UsernamePasswordDto("myUser", "password"), region); | ||
|
|
||
| var serializedString = JsonConvert.SerializeObject(testSubject, Formatting.Indented); | ||
|
|
||
| serializedString.Should().Be(expectedString); | ||
| } | ||
|
|
||
| [DataRow(SonarCloudRegion.EU, """ | ||
| { | ||
| "credentials": { | ||
| "token": "mytoken" | ||
| }, | ||
| "region": "EU" | ||
| } | ||
| """)] | ||
| [DataRow(SonarCloudRegion.US, """ | ||
| { | ||
| "credentials": { | ||
| "token": "mytoken" | ||
| }, | ||
| "region": "US" | ||
| } | ||
| """)] | ||
| [DataTestMethod] | ||
| public void Ctor_TokenIsUsed_SerializeAsExpected(SonarCloudRegion region, string expectedString) | ||
| { | ||
| var testSubject = new ListUserOrganizationsParams(new TokenDto("mytoken"), region); | ||
|
|
||
| var serializedString = JsonConvert.SerializeObject(testSubject, Formatting.Indented); | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * 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 SonarLint.VisualStudio.SLCore.Service.Connection.Models; | ||
|
|
||
| namespace SonarLint.VisualStudio.SLCore.UnitTests.Service.Connection.Models; | ||
|
|
||
| [TestClass] | ||
| public class SonarCloudConnectionConfigurationDtoTests | ||
| { | ||
|
|
||
| [DataRow("id", true, "org", SonarCloudRegion.EU, """ | ||
| { | ||
| "organization": "org", | ||
| "region": "EU", | ||
| "connectionId": "id", | ||
| "disableNotification": true | ||
| } | ||
| """)] | ||
| [DataRow("id id id", true, "org", SonarCloudRegion.EU, """ | ||
| { | ||
| "organization": "org", | ||
| "region": "EU", | ||
| "connectionId": "id id id", | ||
| "disableNotification": true | ||
| } | ||
| """)] | ||
| [DataRow("id", false, "org", SonarCloudRegion.EU, """ | ||
| { | ||
| "organization": "org", | ||
| "region": "EU", | ||
| "connectionId": "id", | ||
| "disableNotification": false | ||
| } | ||
| """)] | ||
| [DataRow("id", true, "org org org", SonarCloudRegion.EU, """ | ||
| { | ||
| "organization": "org org org", | ||
| "region": "EU", | ||
| "connectionId": "id", | ||
| "disableNotification": true | ||
| } | ||
| """)] | ||
| [DataRow("id", true, "org", SonarCloudRegion.US, """ | ||
| { | ||
| "organization": "org", | ||
| "region": "US", | ||
| "connectionId": "id", | ||
| "disableNotification": true | ||
| } | ||
| """)] | ||
| [DataTestMethod] | ||
| public void Serialize_AsExpected(string id, bool notificationEnabled, string organization, SonarCloudRegion region, string expected) => | ||
| JsonConvert.SerializeObject(new SonarCloudConnectionConfigurationDto(id, notificationEnabled, organization, region), Formatting.Indented).Should().Be(expected); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| /* | ||
| * 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 SonarLint.VisualStudio.SLCore.Common.Models; | ||
| using SonarLint.VisualStudio.SLCore.Service.Connection.Models; | ||
|
|
||
| namespace SonarLint.VisualStudio.SLCore.UnitTests.Service.Connection.Models; | ||
|
|
||
| [TestClass] | ||
| public class TransientSonarCloudConnectionDtoTests | ||
| { | ||
| [DataRow("my org", SonarCloudRegion.US, """ | ||
| { | ||
| "organization": "my org", | ||
| "credentials": { | ||
| "token": "abctoken" | ||
| }, | ||
| "region": "US" | ||
| } | ||
| """)] | ||
| [DataRow("my org two", SonarCloudRegion.EU, """ | ||
| { | ||
| "organization": "my org two", | ||
| "credentials": { | ||
| "token": "abctoken" | ||
| }, | ||
| "region": "EU" | ||
| } | ||
| """)] | ||
| [DataTestMethod] | ||
| public void Serialized_Token_AsExpected(string organization, SonarCloudRegion region, string expected) => | ||
| JsonConvert.SerializeObject(new TransientSonarCloudConnectionDto(organization, new TokenDto("abctoken"), region), Formatting.Indented).Should().Be(expected); | ||
|
|
||
| [DataRow("my org", SonarCloudRegion.US, """ | ||
| { | ||
| "organization": "my org", | ||
| "credentials": { | ||
| "username": "usr", | ||
| "password": "pwd" | ||
| }, | ||
| "region": "US" | ||
| } | ||
| """)] | ||
| [DataRow("my org two", SonarCloudRegion.EU, """ | ||
| { | ||
| "organization": "my org two", | ||
| "credentials": { | ||
| "username": "usr", | ||
| "password": "pwd" | ||
| }, | ||
| "region": "EU" | ||
| } | ||
| """)] | ||
| [DataTestMethod] | ||
| public void Serialized_UsernameAndPassword_AsExpected(string organization, SonarCloudRegion region, string expected) => | ||
| JsonConvert.SerializeObject(new TransientSonarCloudConnectionDto(organization, new UsernamePasswordDto("usr", "pwd"), region), Formatting.Indented).Should().Be(expected); | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add a helper method to check the region, i.e. IsExpectedRegion
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't really see the point of creating a method to replace one equals expression
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because this occurs in multiple places. And if something changes, it would be easier to just modify one helper method instead of multiple places.