Merge pull request #1356 from github/dylan-smith/fix-linter

dylan-smith · web-flow · commit cf69a05a5357 · 2025-06-10T17:03:26.000-05:00
Fix broken build / linter errors
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.404",
+    "version": "8.0.410",
     "rollForward": "minor"
   }
 }
diff --git a/src/OctoshiftCLI.Tests/Octoshift/Services/AdoApiTests.cs b/src/OctoshiftCLI.Tests/Octoshift/Services/AdoApiTests.cs
@@ -455,7 +455,7 @@ public async Task AddRepoToBoardsGithubConnection_Should_Send_Correct_Payload()
             }
         };
 
-        await sut.AddRepoToBoardsGithubConnection(ADO_ORG, ADO_TEAM_PROJECT, connectionId, connectionName, endpointId, new List<string>() { ADO_REPO, repo2 });
+        await sut.AddRepoToBoardsGithubConnection(ADO_ORG, ADO_TEAM_PROJECT, connectionId, connectionName, endpointId, [ADO_REPO, repo2]);
 
         _mockAdoClient.Verify(m => m.PostAsync(endpoint, It.Is<object>(y => y.ToJson() == payload.ToJson())).Result);
     }
diff --git a/src/OctoshiftCLI.Tests/Octoshift/Services/CodeScanningAlertServiceTests.cs b/src/OctoshiftCLI.Tests/Octoshift/Services/CodeScanningAlertServiceTests.cs
@@ -135,7 +135,7 @@ public async Task MigrateAnalyses_Migrate_Multiple_Analysis()
         var processingStatus = new SarifProcessingStatus
         {
             Status = SarifProcessingStatus.Complete,
-            Errors = new Collection<string>()
+            Errors = []
         };
 
         _mockSourceGithubApi.Setup(x => x.GetCodeScanningAnalysisForRepository(SOURCE_ORG, SOURCE_REPO, "main")).ReturnsAsync(new[] { analysis1, analysis2 });
@@ -219,7 +219,7 @@ public async Task MigrateAnalyses_Skips_Analysis_That_Exist_On_Target_By_Count()
         const string sarifResponse2 = "SARIF_RESPONSE_2";
         const string sarifResponse3 = "SARIF_RESPONSE_3";
         var processingStatus =
-            new SarifProcessingStatus { Status = SarifProcessingStatus.Complete, Errors = new Collection<string>() };
+            new SarifProcessingStatus { Status = SarifProcessingStatus.Complete, Errors = [] };
 
         _mockSourceGithubApi.Setup(x => x.GetCodeScanningAnalysisForRepository(SOURCE_ORG, SOURCE_REPO, "main")).ReturnsAsync(new[] { analysis1, analysis2, analysis3 });
         _mockTargetGithubApi.Setup(x => x.GetCodeScanningAnalysisForRepository(TARGET_ORG, TARGET_REPO, "main")).ReturnsAsync(new[] { analysis1 });
@@ -898,7 +898,7 @@ public async Task MigrateAlerts_Skips_An_Analysis_When_SARIF_Report_Not_Found()
         var processingStatus = new SarifProcessingStatus
         {
             Status = SarifProcessingStatus.Complete,
-            Errors = new Collection<string>()
+            Errors = []
         };
 
         _mockSourceGithubApi.Setup(x => x.GetCodeScanningAnalysisForRepository(SOURCE_ORG, SOURCE_REPO, "main")).ReturnsAsync(new[] { analysis1, analysis2 });
diff --git a/src/OctoshiftCLI.Tests/Octoshift/Services/GithubApiTests.cs b/src/OctoshiftCLI.Tests/Octoshift/Services/GithubApiTests.cs
@@ -2842,17 +2842,6 @@ async IAsyncEnumerable<JToken> GetAllPages()
         location.Path.Should().Be((string)expectedData["details"]["path"]);
     }
 
-    private void AssertSecretScanningData(GithubSecretScanningAlert actual, JToken expectedData)
-    {
-        actual.Number.Should().Be((int)expectedData["number"]);
-        actual.State.Should().Be((string)expectedData["state"]);
-        actual.SecretType.Should().Be((string)expectedData["secret_type"]);
-        actual.Resolution.Should().Be((string)expectedData["resolution"]);
-        actual.Secret.Should().Be((string)expectedData["secret"]);
-        actual.ResolutionComment.Should().Be((string)expectedData["resolution_comment"]);
-        actual.ResolverName.Should().Be((string)expectedData["resolved_by"]["login"]);
-    }
-
     [Fact]
     public async Task UpdateSecretScanningAlert_Calls_The_Right_Endpoint_With_Payload_For_Resolved_State()
     {
diff --git a/src/OctoshiftCLI.Tests/ado2gh/Commands/GenerateScript/GenerateScriptCommandHandlerTests.cs b/src/OctoshiftCLI.Tests/ado2gh/Commands/GenerateScript/GenerateScriptCommandHandlerTests.cs
@@ -28,11 +28,11 @@ public class GenerateScriptCommandHandlerTests
     private const string GITHUB_ORG = "GITHUB_ORG";
     private const string ADO_SERVER_URL = "http://ado.contoso.com";
 
-    private readonly IEnumerable<string> ADO_ORGS = new List<string>() { ADO_ORG };
-    private readonly IEnumerable<string> ADO_TEAM_PROJECTS = new List<string>() { ADO_TEAM_PROJECT };
-    private IEnumerable<AdoRepository> ADO_REPOS = new List<AdoRepository> { new() { Name = FOO_REPO } };
-    private IEnumerable<string> ADO_PIPELINES = new List<string>() { FOO_PIPELINE };
-    private readonly IEnumerable<string> EMPTY_PIPELINES = new List<string>();
+    private readonly IEnumerable<string> ADO_ORGS = [ADO_ORG];
+    private readonly IEnumerable<string> ADO_TEAM_PROJECTS = [ADO_TEAM_PROJECT];
+    private IEnumerable<AdoRepository> ADO_REPOS = [new() { Name = FOO_REPO }];
+    private IEnumerable<string> ADO_PIPELINES = [FOO_PIPELINE];
+    private readonly IEnumerable<string> EMPTY_PIPELINES = [];
 
     private readonly Mock<AdoApi> _mockAdoApi = TestHelpers.CreateMock<AdoApi>();
     private readonly Mock<AdoInspectorService> _mockAdoInspector = TestHelpers.CreateMock<AdoInspectorService>();
@@ -326,7 +326,7 @@ public async Task SequentialScript_Skips_Team_Project_With_No_Repos()
     public async Task SequentialScript_Single_Repo_Two_Pipelines_All_Options()
     {
         // Arrange
-        ADO_PIPELINES = new List<string> { FOO_PIPELINE, BAR_PIPELINE };
+        ADO_PIPELINES = [FOO_PIPELINE, BAR_PIPELINE];
 
         _mockAdoApi.Setup(m => m.GetTeamProjects(ADO_ORG)).ReturnsAsync(ADO_TEAM_PROJECTS);
         _mockAdoApi.Setup(m => m.GetGithubAppId(ADO_ORG, GITHUB_ORG, ADO_TEAM_PROJECTS)).ReturnsAsync(APP_ID);
@@ -374,7 +374,7 @@ public async Task SequentialScript_Single_Repo_Two_Pipelines_All_Options()
     public async Task SequentialScript_Single_Repo_Two_Pipelines_No_Service_Connection_All_Options()
     {
         // Arrange
-        ADO_PIPELINES = new List<string> { FOO_PIPELINE, BAR_PIPELINE };
+        ADO_PIPELINES = [FOO_PIPELINE, BAR_PIPELINE];
 
         _mockAdoInspector.Setup(m => m.GetRepoCount()).ReturnsAsync(1);
         _mockAdoInspector.Setup(m => m.GetOrgs()).ReturnsAsync(ADO_ORGS);
@@ -874,7 +874,7 @@ public async Task ParallelScript_Skips_Team_Project_With_No_Repos()
     public async Task ParallelScript_Two_Repos_Two_Pipelines_All_Options()
     {
         // Arrange
-        ADO_REPOS = new List<AdoRepository> { new() { Name = FOO_REPO }, new() { Name = BAR_REPO } };
+        ADO_REPOS = [new() { Name = FOO_REPO }, new() { Name = BAR_REPO }];
 
         _mockAdoApi.Setup(m => m.GetTeamProjects(ADO_ORG)).ReturnsAsync(ADO_TEAM_PROJECTS);
         _mockAdoApi.Setup(m => m.GetGithubAppId(ADO_ORG, GITHUB_ORG, ADO_TEAM_PROJECTS)).ReturnsAsync(APP_ID);
@@ -1031,7 +1031,7 @@ exit 1
     public async Task ParallelScript_Single_Repo_No_Service_Connection_All_Options()
     {
         // Arrange
-        ADO_PIPELINES = new List<string> { FOO_PIPELINE, BAR_PIPELINE };
+        ADO_PIPELINES = [FOO_PIPELINE, BAR_PIPELINE];
 
         _mockAdoApi.Setup(m => m.GetTeamProjects(ADO_ORG)).ReturnsAsync(ADO_TEAM_PROJECTS);
 
diff --git a/src/OctoshiftCLI.Tests/ado2gh/Commands/MigrateRepo/MigrateRepoCommandHandlerTests.cs b/src/OctoshiftCLI.Tests/ado2gh/Commands/MigrateRepo/MigrateRepoCommandHandlerTests.cs
@@ -251,7 +251,7 @@ await _handler.Invoking(async x => await x.Handle(new MigrateRepoCommandArgs
     [Fact]
     public async Task It_Falls_Back_To_Ado_And_Github_Pats_From_Environment_When_Not_Provided()
     {
-        _mockGithubApi.Setup(x => x.GetRepos(GITHUB_ORG).Result).Returns(new List<(string Name, string Visibility)>());
+        _mockGithubApi.Setup(x => x.GetRepos(GITHUB_ORG).Result).Returns([]);
         _mockGithubApi.Setup(x => x.GetMigration(It.IsAny<string>()).Result).Returns((State: RepositoryMigrationStatus.Succeeded, GITHUB_REPO, 0, null, null));
 
         _mockEnvironmentVariableProvider
diff --git a/src/OctoshiftCLI.Tests/ado2gh/Services/OrgsCsvGeneratorServiceTests.cs b/src/OctoshiftCLI.Tests/ado2gh/Services/OrgsCsvGeneratorServiceTests.cs
@@ -21,7 +21,7 @@ public class OrgsCsvGeneratorServiceTests
         private readonly Mock<AdoInspectorServiceFactory> _mockAdoInspectorServiceFactory = TestHelpers.CreateMock<AdoInspectorServiceFactory>();
 
         private const string ADO_ORG = "foo-org";
-        private readonly IEnumerable<string> _adoOrgs = new List<string>() { ADO_ORG };
+        private readonly IEnumerable<string> _adoOrgs = [ADO_ORG];
 
         private readonly OrgsCsvGeneratorService _service;
 
diff --git a/src/OctoshiftCLI.Tests/ado2gh/Services/PipelinesCsvGeneratorServiceTests.cs b/src/OctoshiftCLI.Tests/ado2gh/Services/PipelinesCsvGeneratorServiceTests.cs
@@ -20,13 +20,13 @@ public class PipelinesCsvGeneratorServiceTests
         private readonly Mock<AdoInspectorServiceFactory> _mockAdoInspectorServiceFactory = TestHelpers.CreateMock<AdoInspectorServiceFactory>();
 
         private const string ADO_ORG = "foo-org";
-        private readonly IEnumerable<string> _adoOrgs = new List<string>() { ADO_ORG };
+        private readonly IEnumerable<string> _adoOrgs = [ADO_ORG];
         private const string ADO_TEAM_PROJECT = "foo-tp";
-        private readonly IEnumerable<string> _adoTeamProjects = new List<string>() { ADO_TEAM_PROJECT };
+        private readonly IEnumerable<string> _adoTeamProjects = [ADO_TEAM_PROJECT];
         private const string ADO_REPO = "foo-repo";
-        private readonly IEnumerable<AdoRepository> _adoRepos = new List<AdoRepository> { new() { Name = ADO_REPO } };
+        private readonly IEnumerable<AdoRepository> _adoRepos = [new() { Name = ADO_REPO }];
         private const string ADO_PIPELINE = "foo-pipeline";
-        private readonly IEnumerable<string> _adoPipelines = new List<string>() { ADO_PIPELINE };
+        private readonly IEnumerable<string> _adoPipelines = [ADO_PIPELINE];
 
         private readonly PipelinesCsvGeneratorService _service;
 
diff --git a/src/OctoshiftCLI.Tests/ado2gh/Services/ReposCsvGeneratorServiceTests.cs b/src/OctoshiftCLI.Tests/ado2gh/Services/ReposCsvGeneratorServiceTests.cs
@@ -22,11 +22,11 @@ public class ReposCsvGeneratorServiceTests
         private readonly Mock<AdoInspectorServiceFactory> _mockAdoInspectorServiceFactory = TestHelpers.CreateMock<AdoInspectorServiceFactory>();
 
         private const string ADO_ORG = "foo-org";
-        private readonly IEnumerable<string> _adoOrgs = new List<string>() { ADO_ORG };
+        private readonly IEnumerable<string> _adoOrgs = [ADO_ORG];
         private const string ADO_TEAM_PROJECT = "foo-tp";
-        private readonly IEnumerable<string> _adoTeamProjects = new List<string>() { ADO_TEAM_PROJECT };
+        private readonly IEnumerable<string> _adoTeamProjects = [ADO_TEAM_PROJECT];
         private const string ADO_REPO = "foo-repo";
-        private readonly IEnumerable<AdoRepository> _adoRepos = new List<AdoRepository> { new() { Name = ADO_REPO, Size = 12345 } };
+        private readonly IEnumerable<AdoRepository> _adoRepos = [new() { Name = ADO_REPO, Size = 12345 }];
 
         private readonly ReposCsvGeneratorService _service;
 
diff --git a/src/OctoshiftCLI.Tests/ado2gh/Services/TeamProjectsCsvGeneratorServiceTests.cs b/src/OctoshiftCLI.Tests/ado2gh/Services/TeamProjectsCsvGeneratorServiceTests.cs
@@ -21,9 +21,9 @@ public class TeamProjectsCsvGeneratorServiceTests
         private readonly Mock<AdoInspectorServiceFactory> _mockAdoInspectorServiceFactory = TestHelpers.CreateMock<AdoInspectorServiceFactory>();
 
         private const string ADO_ORG = "foo-org";
-        private readonly IEnumerable<string> _adoOrgs = new List<string>() { ADO_ORG };
+        private readonly IEnumerable<string> _adoOrgs = [ADO_ORG];
         private const string ADO_TEAM_PROJECT = "foo-tp";
-        private readonly IEnumerable<string> _adoTeamProjects = new List<string>() { ADO_TEAM_PROJECT };
+        private readonly IEnumerable<string> _adoTeamProjects = [ADO_TEAM_PROJECT];
 
         private readonly TeamProjectsCsvGeneratorService _service;
 
diff --git a/src/OctoshiftCLI.Tests/bbs2gh/Services/BbsInspectorServiceTests.cs b/src/OctoshiftCLI.Tests/bbs2gh/Services/BbsInspectorServiceTests.cs
@@ -37,7 +37,7 @@ public async Task GetProjects_Should_Return_All_Projects()
             var result = await _service.GetProjects();
 
             // Assert
-            result.Should().BeEquivalentTo(new List<(string, string)>() { (BBS_FOO_PROJECT_KEY, project1), (BBS_BAR_PROJECT_KEY, project2) });
+            result.Should().BeEquivalentTo([(BBS_FOO_PROJECT_KEY, project1), (BBS_BAR_PROJECT_KEY, project2)]);
         }
 
         [Fact]
diff --git a/src/OctoshiftCLI.Tests/bbs2gh/Services/ProjectsCsvGeneratorServiceTests.cs b/src/OctoshiftCLI.Tests/bbs2gh/Services/ProjectsCsvGeneratorServiceTests.cs
@@ -29,7 +29,7 @@ public class ProjectsCsvGeneratorServiceTests
         private const string BBS_PASSWORD = "bbs-password";
         private const bool NO_SSL_VERIFY = true;
         private readonly (string, string) _bbsProject = (BBS_FOO_PROJECT_KEY, BBS_FOO_PROJECT);
-        private readonly IEnumerable<(string, string)> _bbsProjects = new List<(string, string)>() { (BBS_FOO_PROJECT_KEY, BBS_FOO_PROJECT), (BBS_BAR_PROJECT_KEY, BBS_BAR_PROJECT) };
+        private readonly IEnumerable<(string, string)> _bbsProjects = [(BBS_FOO_PROJECT_KEY, BBS_FOO_PROJECT), (BBS_BAR_PROJECT_KEY, BBS_BAR_PROJECT)];
 
         private readonly ProjectsCsvGeneratorService _service;
 
diff --git a/src/OctoshiftCLI.Tests/bbs2gh/Services/ReposCsvGeneratorServiceTests.cs b/src/OctoshiftCLI.Tests/bbs2gh/Services/ReposCsvGeneratorServiceTests.cs
@@ -33,7 +33,7 @@ public class ReposCsvGeneratorServiceTests
         private const bool ARCHIVED = false;
         private const ulong REPO_SIZE = 10000UL;
         private const ulong ATTACHMENTS_SIZE = 10000UL;
-        private readonly IEnumerable<BbsRepository> _bbsRepos = new List<BbsRepository> { new() { Name = BBS_REPO, Slug = BBS_REPO_SLUG } };
+        private readonly IEnumerable<BbsRepository> _bbsRepos = [new() { Name = BBS_REPO, Slug = BBS_REPO_SLUG }];
 
         private readonly ReposCsvGeneratorService _service;
 
diff --git a/src/ado2gh/Services/AdoInspectorService.cs b/src/ado2gh/Services/AdoInspectorService.cs
@@ -35,7 +35,7 @@ public AdoInspectorService(OctoLogger log, AdoApi adoApi)
 
         public virtual void LoadReposCsv(string csvPath)
         {
-            _orgs = new List<string>();
+            _orgs = [];
 
             using var csvStream = OpenFileStream(csvPath);
             using var csvParser = new TextFieldParser(csvStream);
@@ -57,7 +57,7 @@ public virtual void LoadReposCsv(string csvPath)
 
                 if (!_teamProjects.ContainsKey(org))
                 {
-                    _teamProjects.Add(org, new List<string>());
+                    _teamProjects.Add(org, []);
                 }
 
                 if (!_repos.ContainsKey(org))
@@ -72,7 +72,7 @@ public virtual void LoadReposCsv(string csvPath)
 
                 if (!_repos[org].ContainsKey(teamProject))
                 {
-                    _repos[org].Add(teamProject, new List<AdoRepository>());
+                    _repos[org].Add(teamProject, []);
                 }
 
                 if (!_repos[org][teamProject].Any(x => x.Name == repo))
@@ -88,7 +88,7 @@ public virtual async Task<IEnumerable<string>> GetOrgs()
             {
                 if (OrgFilter.HasValue())
                 {
-                    _orgs = new List<string>() { OrgFilter };
+                    _orgs = [OrgFilter];
                 }
                 else
                 {
diff --git a/src/bbs2gh/Commands/GenerateScript/GenerateScriptCommandHandler.cs b/src/bbs2gh/Commands/GenerateScript/GenerateScriptCommandHandler.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -81,7 +80,7 @@ private async Task<string> GenerateScript(GenerateScriptCommandArgs args)
         }
 
         var projects = args.BbsProject.HasValue()
-            ? new List<string>() { args.BbsProject }
+            ? [args.BbsProject]
             : (await _bbsApi.GetProjects()).Select(x => x.Key);
 
         foreach (var projectKey in projects)

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "8.0.404",`
	`3`	`+ "version": "8.0.410",`
`4`	`4`	`"rollForward": "minor"`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,7 @@ public async Task AddRepoToBoardsGithubConnection_Should_Send_Correct_Payload()`
`455`	`455`	`}`
`456`	`456`	`};`
`457`	`457`
`458`		`- await sut.AddRepoToBoardsGithubConnection(ADO_ORG, ADO_TEAM_PROJECT, connectionId, connectionName, endpointId, new List<string>() { ADO_REPO, repo2 });`
	`458`	`+ await sut.AddRepoToBoardsGithubConnection(ADO_ORG, ADO_TEAM_PROJECT, connectionId, connectionName, endpointId, [ADO_REPO, repo2]);`
`459`	`459`
`460`	`460`	`_mockAdoClient.Verify(m => m.PostAsync(endpoint, It.Is<object>(y => y.ToJson() == payload.ToJson())).Result);`
`461`	`461`	`}`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ await _handler.Invoking(async x => await x.Handle(new MigrateRepoCommandArgs`
`251`	`251`	`[Fact]`
`252`	`252`	`public async Task It_Falls_Back_To_Ado_And_Github_Pats_From_Environment_When_Not_Provided()`
`253`	`253`	`{`
`254`		`- _mockGithubApi.Setup(x => x.GetRepos(GITHUB_ORG).Result).Returns(new List<(string Name, string Visibility)>());`
	`254`	`+ _mockGithubApi.Setup(x => x.GetRepos(GITHUB_ORG).Result).Returns([]);`
`255`	`255`	`_mockGithubApi.Setup(x => x.GetMigration(It.IsAny<string>()).Result).Returns((State: RepositoryMigrationStatus.Succeeded, GITHUB_REPO, 0, null, null));`
`256`	`256`
`257`	`257`	`_mockEnvironmentVariableProvider`