Fix adding the wrong scope parameter.

ubisoft · Dec 18, 2023 · 61f6387 · 61f6387
1 parent 0b94429
commit 61f6387
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/NGitLab.Tests/PipelineTests.cs b/NGitLab.Tests/PipelineTests.cs
@@ -74,6 +74,26 @@ public async Task Test_can_list_all_jobs_from_project()
             Assert.That(allJobs.Any());
         }
 
+        [Test]
+        [NGitLabRetry]
+        public async Task Test_can_list_jobs_from_pipeline()
+        {
+            using var context = await GitLabTestContext.CreateAsync();
+            var project = context.CreateProject();
+            var pipelineClient = context.Client.GetPipelines(project.Id);
+            JobTests.AddGitLabCiFile(context.Client, project);
+
+            var pipelines = await GitLabTestContext.RetryUntilAsync(() => pipelineClient.All, p => p.Any(), TimeSpan.FromSeconds(120));
+            var pipeline = pipelines.First();
+
+            var pipelineJobQuery = new PipelineJobQuery
+            {
+                PipelineId = pipeline.Id, Scope = new[] { "success", "pending" },
+            };
+            var allJobs = await GitLabTestContext.RetryUntilAsync(() => pipelineClient.GetJobsAsync(pipelineJobQuery).ToList(), p => p.Any(), TimeSpan.FromSeconds(120));
+            Assert.That(allJobs.Any());
+        }
+
         [Test]
         [NGitLabRetry]
         public async Task Test_search_for_pipeline()

diff --git a/NGitLab/Impl/PipelineClient.cs b/NGitLab/Impl/PipelineClient.cs
@@ -84,7 +84,7 @@ public GitLabCollectionResponse<Job> GetJobsAsync(PipelineJobQuery query)
         private string CreateGetJobsUrl(PipelineJobQuery query)
         {
             var url = $"{_pipelinesPath}/{query.PipelineId.ToStringInvariant()}/jobs";
-            url = Utils.AddParameter(url, "scope", query.Scope);
+            url = Utils.AddArrayParameter(url, "scope", query.Scope);
             url = Utils.AddParameter(url, "include_retried", query.IncludeRetried);
             return url;
         }
@@ -213,7 +213,7 @@ public GitLabCollectionResponse<Bridge> GetBridgesAsync(PipelineBridgeQuery quer
         private string CreateGetBridgesUrl(PipelineBridgeQuery query)
         {
             var url = $"{_pipelinesPath}/{query.PipelineId.ToStringInvariant()}/bridges";
-            url = Utils.AddParameter(url, "scope", query.Scope);
+            url = Utils.AddArrayParameter(url, "scope", query.Scope);
             return url;
         }
 

diff --git a/NGitLab/Impl/Utils.cs b/NGitLab/Impl/Utils.cs
@@ -29,6 +29,21 @@ public static string AddParameter(string url, string parameterName, int[] values
             return Equals(values, null) ? url : AddParameterInternal(url, parameterName, string.Join(",", values));
         }
 
+        public static string AddArrayParameter(string url, string parameterName, string[] values)
+        {
+            if (Equals(values, null))
+            {
+                return url;
+            }
+
+            foreach (var value in values)
+            {
+                url = AddParameterInternal(url, $"{parameterName}[]", value);
+            }
+
+            return url;
+        }
+
         public static string AddOrderBy(string url, string orderBy = null, bool supportKeysetPagination = true)
         {
             if (supportKeysetPagination && (string.IsNullOrEmpty(orderBy) || string.Equals(orderBy, "id", StringComparison.Ordinal)))