Fix workspace serialization

drakon64 · Nov 18, 2024 · c1c6db8 · c1c6db8
1 parent edb15d5
commit c1c6db8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/Amaurot.Processor/Models/AmaurotSerializerContext.cs b/Amaurot.Processor/Models/AmaurotSerializerContext.cs
@@ -3,6 +3,7 @@
 using Amaurot.Processor.Models.GitHub.Commit;
 using Amaurot.Processor.Models.GitHub.Issues;
 using Amaurot.Processor.Models.GitHub.PullRequest;
+using Amaurot.Processor.Models.OpenTofu;
 
 namespace Amaurot.Processor.Models;
 
@@ -11,6 +12,7 @@ namespace Amaurot.Processor.Models;
 [JsonSerializable(typeof(PullRequest))]
 [JsonSerializable(typeof(GitHubError))]
 [JsonSerializable(typeof(InstallationAccessToken))]
+[JsonSerializable(typeof(AmaurotJson))]
 [JsonSourceGenerationOptions(
     PropertyNamingPolicy = JsonKnownNamingPolicy.SnakeCaseLower,
     UseStringEnumConverter = true

diff --git a/Amaurot.Processor/Models/OpenTofu/AmaurotJson.cs b/Amaurot.Processor/Models/OpenTofu/AmaurotJson.cs
@@ -0,0 +1,6 @@
+namespace Amaurot.Processor.Models.OpenTofu;
+
+internal class AmaurotJson
+{
+    public required Dictionary<string, Workspace> Workspaces { get; init; }
+}
diff --git a/...t.Processor/Models/OpenTofu/Workspaces.cs → ...ot.Processor/Models/OpenTofu/Workspace.cs b/...t.Processor/Models/OpenTofu/Workspaces.cs → ...ot.Processor/Models/OpenTofu/Workspace.cs
@@ -1,10 +1,5 @@
 namespace Amaurot.Processor.Models.OpenTofu;
 
-internal class Workspaces
-{
-    public required Dictionary<string, Workspace> Workspace { get; init; }
-}
-
 internal class Workspace
 {
     public string[]? VarFiles { get; init; }

diff --git a/Amaurot.Processor/Program.cs b/Amaurot.Processor/Program.cs
@@ -2,6 +2,7 @@
 using System.Text.Json;
 using Amaurot.Common.Models;
 using Amaurot.Processor.Clients;
+using Amaurot.Processor.Models;
 using Amaurot.Processor.Models.GitHub.Commit;
 using Amaurot.Processor.Models.OpenTofu;
 
@@ -105,14 +106,19 @@ await gitHubClient.CreateCommitStatus(
             var directory =
                 $"{tempDirectory.FullName}/{taskRequestBody.RepositoryOwner}-{taskRequestBody.RepositoryName}-{taskRequestBody.Sha}/{tfDirectory}";
 
-            Workspaces workspaces;
+            AmaurotJson workspaces;
 
             await using (var workspacesFile = File.OpenRead($"{directory}/amaurot.json"))
             {
-                workspaces = (await JsonSerializer.DeserializeAsync<Workspaces>(workspacesFile))!;
+                workspaces = (
+                    await JsonSerializer.DeserializeAsync<AmaurotJson>(
+                        workspacesFile,
+                        AmaurotSerializerContext.Default.AmaurotJson
+                    )
+                )!;
             }
 
-            foreach (var workspace in workspaces.Workspace)
+            foreach (var workspace in workspaces.Workspaces)
             {
                 var executionOutput = new Dictionary<string, List<ExecutionOutput>>();