update to .Net 9.0 and fix api deserialize

Author: elasticroentgen

Dockerfile

@@ -1,10 +1,10 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
 USER $APP_UID
 WORKDIR /app
 EXPOSE 8080
 EXPOSE 8081
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
 COPY ["GithubActionsOrchestrator.csproj", "./"]

GitHubApi.cs

@@ -1,5 +1,6 @@
 using System.Net.Http.Headers;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 using GithubActionsOrchestrator.GitHub;
 using Npgsql.Replication;
 using Serilog;
@@ -157,7 +158,7 @@ public static async Task<bool> RemoveRunnerFromRepo(string repoName, string orgG
 
     }
 
-    public static async Task<GitHubJob> GetJobInfoForOrg(long stuckJobGithubJobId,string repoName, string orgGitHubToken)
+    public static async Task<GitHubApiWorkflowRun> GetJobInfoForOrg(long stuckJobGithubJobId,string repoName, string orgGitHubToken)
     {
         using HttpClient client = new();
         client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/vnd.github+json"));
@@ -170,15 +171,15 @@ public static async Task<GitHubJob> GetJobInfoForOrg(long stuckJobGithubJobId,st
         if(response.IsSuccessStatusCode)
         {
             string content = await response.Content.ReadAsStringAsync();
-            GitHubJob responseObject = JsonSerializer.Deserialize<GitHubJob>(content);
+            GitHubApiWorkflowRun responseObject = JsonSerializer.Deserialize<GitHubApiWorkflowRun>(content);
 
             return responseObject;
         }
         Log.Warning($"Unable to get GH job info for {repoName}/{stuckJobGithubJobId}: [{response.StatusCode}] {response.ReasonPhrase}");
 
         return null;
     }
-    public static async Task<GitHubJob> GetJobInfoForRepo(long stuckJobGithubJobId,string repoName, string orgGitHubToken)
+    public static async Task<GitHubApiWorkflowRun> GetJobInfoForRepo(long stuckJobGithubJobId,string repoName, string orgGitHubToken)
     {
         using HttpClient client = new();
         client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/vnd.github+json"));
@@ -191,7 +192,7 @@ public static async Task<GitHubJob> GetJobInfoForRepo(long stuckJobGithubJobId,s
         if(response.IsSuccessStatusCode)
         {
             string content = await response.Content.ReadAsStringAsync();
-            GitHubJob responseObject = JsonSerializer.Deserialize<GitHubJob>(content);
+            GitHubApiWorkflowRun responseObject = JsonSerializer.Deserialize<GitHubApiWorkflowRun>(content);
 
             return responseObject;
         }
@@ -201,42 +202,95 @@ public static async Task<GitHubJob> GetJobInfoForRepo(long stuckJobGithubJobId,s
     }
 }
 
-public class GitHubJob
+public class GitHubApiWorkflowJob
 {
+    [JsonPropertyName("name")]
+    public string Name { get; set; }
+
+    [JsonPropertyName("status")]
+    public string Status { get; set; }
+
+    [JsonPropertyName("conclusion")]
+    public string Conclusion { get; set; }
+
+    [JsonPropertyName("number")]
+    public int? Number { get; set; }
+
+    [JsonPropertyName("started_at")]
+    public DateTime? StartedAt { get; set; }
+
+    [JsonPropertyName("completed_at")]
+    public DateTime? CompletedAt { get; set; }
+}
 
-    public int Id { get; set; }
-    public int RunId { get; set; }
+public class GitHubApiWorkflowRun
+{
+    [JsonPropertyName("id")]
+    public long? Id { get; set; }
+
+    [JsonPropertyName("run_id")]
+    public long? RunId { get; set; }
+
+    [JsonPropertyName("workflow_name")]
+    public string WorkflowName { get; set; }
+
+    [JsonPropertyName("head_branch")]
+    public string HeadBranch { get; set; }
+
+    [JsonPropertyName("run_url")]
     public string RunUrl { get; set; }
-    public int RunAttempt { get; set; }
+
+    [JsonPropertyName("run_attempt")]
+    public int? RunAttempt { get; set; }
+
+    [JsonPropertyName("node_id")]
     public string NodeId { get; set; }
+
+    [JsonPropertyName("head_sha")]
     public string HeadSha { get; set; }
+
+    [JsonPropertyName("url")]
     public string Url { get; set; }
+
+    [JsonPropertyName("html_url")]
     public string HtmlUrl { get; set; }
+
+    [JsonPropertyName("status")]
     public string Status { get; set; }
+
+    [JsonPropertyName("conclusion")]
     public string Conclusion { get; set; }
-    public DateTime CreatedAt { get; set; }
-    public DateTime StartedAt { get; set; }
-    public DateTime? CompletedAt { get; set; } // Nullable
+
+    [JsonPropertyName("created_at")]
+    public DateTime? CreatedAt { get; set; }
+
+    [JsonPropertyName("started_at")]
+    public DateTime? StartedAt { get; set; }
+
+    [JsonPropertyName("completed_at")]
+    public DateTime? CompletedAt { get; set; }
+
+    [JsonPropertyName("name")]
     public string Name { get; set; }
-    public List<GitHubJobStep> Steps { get; set; }
+
+    [JsonPropertyName("steps")]
+    public List<GitHubApiWorkflowJob> Steps { get; set; }
+
+    [JsonPropertyName("check_run_url")]
     public string CheckRunUrl { get; set; }
+
+    [JsonPropertyName("labels")]
     public List<string> Labels { get; set; }
-    public int? RunnerId { get; set; } // Nullable
-    public string RunnerName { get; set; } // Nullable
-    public int? RunnerGroupId { get; set; } // Nullable
-    public string RunnerGroupName { get; set; } // Nullable
-    public string WorkflowName { get; set; } // Nullable
-    public string HeadBranch { get; set; } // Nullable
 
-}
+    [JsonPropertyName("runner_id")]
+    public long? RunnerId { get; set; }
 
-public class GitHubJobStep
-    {
-        public string Status { get; set; }
-        public string Conclusion { get; set; }
-        public string Name { get; set; }
-        public int Number { get; set; }
-        public DateTime? StartedAt { get; set; } // Nullable
-        public DateTime? CompletedAt { get; set; } // Nullable
-    }
+    [JsonPropertyName("runner_name")]
+    public string RunnerName { get; set; }
 
+    [JsonPropertyName("runner_group_id")]
+    public int? RunnerGroupId { get; set; }
+
+    [JsonPropertyName("runner_group_name")]
+    public string RunnerGroupName { get; set; }
+}

GithubActionsOrchestrator.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>disable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <InvariantGlobalization>true</InvariantGlobalization>

PoolManager.cs

@@ -59,7 +59,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
         DateTime crudeTimer = DateTime.UtcNow;
         DateTime crudeStatsTimer = DateTime.UtcNow;
-        int cullMinutes = 5;
+        int cullMinutes = 1;
         int statsSeconds = 10;
 
         while (!stoppingToken.IsCancellationRequested)
@@ -286,7 +286,7 @@ private async Task CheckForStuckJobs(List<GithubTargetConfiguration> targetConfi
             }
 
             // check job on github
-            GitHubJob ghJob = await GitHubApi.GetJobInfoForRepo(stuckJob.GithubJobId, stuckJob.Repository , owner.GitHubToken);
+            GitHubApiWorkflowRun ghJob = await GitHubApi.GetJobInfoForRepo(stuckJob.GithubJobId, stuckJob.Repository , owner.GitHubToken);
             if (ghJob == null || ghJob.Status != "queued")
             {
                 _logger.LogWarning($"job info for {stuckJob.JobId} not found or job not queued anymore on github.");