review + a few more changes related to runners

ubisoft · Dec 16, 2024 · 1b4db01 · 1b4db01
1 parent 77c6af9
commit 1b4db01
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 36 deletions.
diff --git a/NGitLab.Mock/Clients/RunnerClient.cs b/NGitLab.Mock/Clients/RunnerClient.cs
@@ -132,11 +132,6 @@ public Models.Runner Update(long runnerId, RunnerUpdate runnerUpdate)
         return GitLabCollectionResponse.Create(OfProject(projectId));
     }
 
-    public IEnumerable<Models.Job> GetJobs(long runnerId, JobScope jobScope)
-    {
-        throw new NotImplementedException();
-    }
-
     public IEnumerable<Models.Job> GetJobs(long runnerId, JobStatus? status = null)
     {
         throw new NotImplementedException();

diff --git a/NGitLab.Mock/Project.cs b/NGitLab.Mock/Project.cs
@@ -382,7 +382,7 @@ public Runner AddRunner(string name, string description, bool paused, bool locke
         };
 
         RegisteredRunners.Add(runner);
-        if (paused)
+        if (!paused)
         {
             EnabledRunners.Add(new RunnerRef(runner));
         }

diff --git a/NGitLab/IRunnerClient.cs b/NGitLab/IRunnerClient.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using NGitLab.Models;
@@ -59,16 +57,9 @@ public interface IRunnerClient
 
     GitLabCollectionResponse<Runner> OfProjectAsync(long projectId);
 
-    /// <summary>
-    /// List all jobs of the given runner that meet the specified scope
-    /// </summary>
-    [Obsolete("Use GetJobs(int, JobStatus?) instead")]
-    IEnumerable<Job> GetJobs(long runnerId, JobScope jobScope);
-
     /// <summary>
     /// List all jobs of the given runner that meet the specified status
     /// </summary>
-    [SuppressMessage("ApiDesign", "RS0027:Public API with optional parameter(s) should have the most parameters amongst its public overloads", Justification = "Keep compatibility")]
     IEnumerable<Job> GetJobs(long runnerId, JobStatus? status = null);
 
     /// <summary>

diff --git a/NGitLab/Impl/RunnerClient.cs b/NGitLab/Impl/RunnerClient.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using NGitLab.Extensions;
@@ -63,20 +61,6 @@ public Runner Update(long runnerId, RunnerUpdate runnerUpdate)
         return _api.Put().With(runnerUpdate).To<Runner>(url);
     }
 
-    [Obsolete("Use GetJobs(int, JobStatus?) instead")]
-    public IEnumerable<Job> GetJobs(long runnerId, JobScope scope)
-    {
-        var url = $"{Runner.Url}/{runnerId.ToStringInvariant()}/jobs";
-
-        if (scope != JobScope.All)
-        {
-            url = Utils.AddParameter(url, "status", scope.ToString().ToLowerInvariant());
-        }
-
-        return _api.Get().GetAll<Job>(url);
-    }
-
-    [SuppressMessage("ApiDesign", "RS0027:Public API with optional parameter(s) should have the most parameters amongst its public overloads", Justification = "Keep compatibility")]
     public IEnumerable<Job> GetJobs(long runnerId, JobStatus? status = null)
     {
         var url = $"{Runner.Url}/{runnerId.ToStringInvariant()}/jobs";

diff --git a/NGitLab/PublicAPI.Unshipped.txt b/NGitLab/PublicAPI.Unshipped.txt
@@ -880,7 +880,6 @@ NGitLab.Impl.RunnerClient.EnableRunner(long projectId, NGitLab.Models.RunnerId r
 NGitLab.Impl.RunnerClient.EnableRunnerAsync(long projectId, NGitLab.Models.RunnerId runnerId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<NGitLab.Models.Runner>
 NGitLab.Impl.RunnerClient.GetAllRunnersWithScope(NGitLab.Models.RunnerScope scope) -> System.Collections.Generic.IEnumerable<NGitLab.Models.Runner>
 NGitLab.Impl.RunnerClient.GetJobs(long runnerId, NGitLab.JobStatus? status = null) -> System.Collections.Generic.IEnumerable<NGitLab.Models.Job>
-NGitLab.Impl.RunnerClient.GetJobs(long runnerId, NGitLab.Models.JobScope scope) -> System.Collections.Generic.IEnumerable<NGitLab.Models.Job>
 NGitLab.Impl.RunnerClient.OfGroup(long groupId) -> System.Collections.Generic.IEnumerable<NGitLab.Models.Runner>
 NGitLab.Impl.RunnerClient.OfGroupAsync(long groupId) -> NGitLab.GitLabCollectionResponse<NGitLab.Models.Runner>
 NGitLab.Impl.RunnerClient.OfProject(long projectId) -> System.Collections.Generic.IEnumerable<NGitLab.Models.Runner>
@@ -1112,7 +1111,6 @@ NGitLab.IRunnerClient.EnableRunnerAsync(long projectId, NGitLab.Models.RunnerId
 NGitLab.IRunnerClient.GetAllRunnersWithScope(NGitLab.Models.RunnerScope scope) -> System.Collections.Generic.IEnumerable<NGitLab.Models.Runner>
 NGitLab.IRunnerClient.GetAvailableRunners(long projectId) -> System.Collections.Generic.IEnumerable<NGitLab.Models.Runner>
 NGitLab.IRunnerClient.GetJobs(long runnerId, NGitLab.JobStatus? status = null) -> System.Collections.Generic.IEnumerable<NGitLab.Models.Job>
-NGitLab.IRunnerClient.GetJobs(long runnerId, NGitLab.Models.JobScope jobScope) -> System.Collections.Generic.IEnumerable<NGitLab.Models.Job>
 NGitLab.IRunnerClient.OfGroup(long groupId) -> System.Collections.Generic.IEnumerable<NGitLab.Models.Runner>
 NGitLab.IRunnerClient.OfGroupAsync(long groupId) -> NGitLab.GitLabCollectionResponse<NGitLab.Models.Runner>
 NGitLab.IRunnerClient.OfProject(long projectId) -> System.Collections.Generic.IEnumerable<NGitLab.Models.Runner>
@@ -4139,4 +4137,4 @@ virtual NGitLab.Impl.HttpRequestor.To<T>(string tailAPIUrl) -> T
 virtual NGitLab.Impl.HttpRequestor.ToAsync<T>(string tailAPIUrl, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<T>
 virtual NGitLab.RequestOptions.GetResponse(System.Net.HttpWebRequest request) -> System.Net.WebResponse
 virtual NGitLab.RequestOptions.GetResponseAsync(System.Net.HttpWebRequest request, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<System.Net.WebResponse>
-virtual NGitLab.RequestOptions.ShouldRetry(System.Exception ex, int retryNumber) -> bool
+virtual NGitLab.RequestOptions.ShouldRetry(System.Exception ex, int retryNumber) -> bool