Add support for project's "releases_access_level" + a bit more (#591)

* Add support for project's "releases_access_level" + a bit more * review * update
ubisoft · Dec 6, 2023 · 1406016 · 1406016
1 parent ee644fe
commit 1406016
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -51,8 +51,8 @@ jobs:
         # Keep in sync with the version in GitLabDockerContainer.cs
         # Available tags: https://hub.docker.com/r/gitlab/gitlab-ee/tags
         gitlab: [
-          'gitlab/gitlab-ee:15.4.6-ee.0',
           'gitlab/gitlab-ee:15.11.9-ee.0',
+          'gitlab/gitlab-ee:15.11.13-ee.0',
         ]
         configuration: [ Release ]
       fail-fast: false

diff --git a/NGitLab.Tests/Docker/GitLabDockerContainer.cs b/NGitLab.Tests/Docker/GitLabDockerContainer.cs
@@ -8,7 +8,6 @@
 using System.Linq;
 using System.Net;
 using System.Net.Http;
-using System.Runtime.InteropServices;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
@@ -27,7 +26,7 @@ public class GitLabDockerContainer
         public const string ImageName = "gitlab/gitlab-ee";
 
         // https://hub.docker.com/r/gitlab/gitlab-ee/tags/
-        public const string GitLabDockerVersion = "15.4.6-ee.0"; // Keep in sync with .github/workflows/ci.yml
+        public const string GitLabDockerVersion = "15.11.9-ee.0"; // Keep in sync with .github/workflows/ci.yml
 
         private static string s_creationErrorMessage;
         private static readonly SemaphoreSlim s_setupLock = new(initialCount: 1, maxCount: 1);
@@ -156,7 +155,7 @@ private async Task SpawnDockerContainerAsync()
 
             // Spawn the container
             // https://docs.gitlab.com/omnibus/settings/configuration.html
-            using var conf = new DockerClientConfiguration(new Uri(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "npipe://./pipe/docker_engine" : "unix:///var/run/docker.sock"));
+            using var conf = new DockerClientConfiguration(new Uri(OperatingSystem.IsWindows() ? "npipe://./pipe/docker_engine" : "unix:///var/run/docker.sock"));
             using var client = conf.CreateClient();
             await ValidateDockerIsEnabled(client);
 

diff --git a/NGitLab.Tests/Docker/GitLabTestContext.cs b/NGitLab.Tests/Docker/GitLabTestContext.cs
@@ -300,11 +300,11 @@ public async Task<IDisposable> StartRunnerForOneJobAsync(int projectId)
                 if (!File.Exists(path))
                 {
                     Uri url;
-                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                    if (OperatingSystem.IsWindows())
                     {
                         url = new Uri($"https://gitlab-runner-downloads.s3.amazonaws.com/v{version}/binaries/gitlab-runner-windows-amd64.exe");
                     }
-                    else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                    else if (OperatingSystem.IsLinux())
                     {
                         url = new Uri($"https://gitlab-runner-downloads.s3.amazonaws.com/v{version}/binaries/gitlab-runner-linux-amd64");
                     }
@@ -335,7 +335,7 @@ public async Task<IDisposable> StartRunnerForOneJobAsync(int projectId)
                 }
 
                 TestContext.WriteLine("Test runner downloaded");
-                if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                if (OperatingSystem.IsLinux())
                 {
                     using var chmodProcess = Process.Start("chmod", "+x \"" + path + "\"");
                     chmodProcess.WaitForExit();
@@ -379,7 +379,7 @@ public async Task<IDisposable> StartRunnerForOneJobAsync(int projectId)
                         "run-single",
                         "--url", DockerContainer.GitLabUrl.ToString(),
                         "--executor", "shell",
-                        "--shell", RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "powershell" : "pwsh",
+                        "--shell", OperatingSystem.IsWindows() ? "powershell" : "pwsh",
                         "--builds-dir", buildDir,
                         "--wait-timeout", "240", // in seconds
                         "--token", runner.Token,

diff --git a/NGitLab.Tests/ReleaseClientTests.cs b/NGitLab.Tests/ReleaseClientTests.cs
@@ -30,6 +30,7 @@ public async Task Test_release_api()
                 Description = "test",
             });
 
+            Assert.AreEqual(ReleasesAccessLevel.Enabled, project.ReleasesAccessLevel);
             Assert.That(release.TagName, Is.EqualTo("0.7"));
             Assert.That(release.Name, Is.EqualTo("0.7"));
             Assert.That(release.Description, Is.EqualTo("test"));

diff --git a/NGitLab/Models/Project.cs b/NGitLab/Models/Project.cs
@@ -212,5 +212,8 @@ public class Project
 
         [JsonPropertyName("permissions")]
         public ProjectPermissions Permissions;
+
+        [JsonPropertyName("releases_access_level")]
+        public ReleasesAccessLevel ReleasesAccessLevel { get; set; }
     }
 }
diff --git a/NGitLab/Models/ReleasesAccessLevel.cs b/NGitLab/Models/ReleasesAccessLevel.cs
@@ -0,0 +1,8 @@
+namespace NGitLab.Models;
+
+public enum ReleasesAccessLevel
+{
+    Disabled,
+    Private,
+    Enabled,
+}
diff --git a/NGitLab/PublicAPI.Unshipped.txt b/NGitLab/PublicAPI.Unshipped.txt
@@ -2731,6 +2731,8 @@ NGitLab.Models.Project.PrintingMergeRequestsLinkEnabled -> bool
 NGitLab.Models.Project.Project() -> void
 NGitLab.Models.Project.Public -> bool
 NGitLab.Models.Project.PublicJobs -> bool
+NGitLab.Models.Project.ReleasesAccessLevel.get -> NGitLab.Models.ReleasesAccessLevel
+NGitLab.Models.Project.ReleasesAccessLevel.set -> void
 NGitLab.Models.Project.RepositoryAccessLevel -> NGitLab.Models.RepositoryAccessLevel
 NGitLab.Models.Project.RepositoryStorage -> string
 NGitLab.Models.Project.RequestAccessEnabled -> bool
@@ -3146,6 +3148,10 @@ NGitLab.Models.ReleaseQuery.PerPage.set -> void
 NGitLab.Models.ReleaseQuery.ReleaseQuery() -> void
 NGitLab.Models.ReleaseQuery.Sort.get -> string
 NGitLab.Models.ReleaseQuery.Sort.set -> void
+NGitLab.Models.ReleasesAccessLevel
+NGitLab.Models.ReleasesAccessLevel.Disabled = 0 -> NGitLab.Models.ReleasesAccessLevel
+NGitLab.Models.ReleasesAccessLevel.Enabled = 2 -> NGitLab.Models.ReleasesAccessLevel
+NGitLab.Models.ReleasesAccessLevel.Private = 1 -> NGitLab.Models.ReleasesAccessLevel
 NGitLab.Models.ReleaseUpdate
 NGitLab.Models.ReleaseUpdate.Description.get -> string
 NGitLab.Models.ReleaseUpdate.Description.set -> void