From 8e5ac9790e8732de2bdf869dd23f43c3f65de5f3 Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas@koutsou.net>
Date: Tue, 6 Jun 2023 17:19:20 +0200
Subject: [PATCH] worker: update ostree job structs

Change the OSTreeResolveSpec to match the ostree SourceSpec by removing
the Parent field.

Change OSTreeResolveResultSpec to match the CommitSpec by adding the
Secrets field.  The RHSM field is kept for backwards compatibility with
older workers.
---
 cmd/osbuild-worker/jobimpl-ostree-resolve.go |  8 ++------
 internal/worker/json.go                      | 10 +++++-----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/cmd/osbuild-worker/jobimpl-ostree-resolve.go b/cmd/osbuild-worker/jobimpl-ostree-resolve.go
index 1a0dde45b..93216d4c8 100644
--- a/cmd/osbuild-worker/jobimpl-ostree-resolve.go
+++ b/cmd/osbuild-worker/jobimpl-ostree-resolve.go
@@ -51,12 +51,7 @@ func (impl *OSTreeResolveJobImpl) Run(job worker.Job) error {
 	logWithId.Infof("Resolving (%d) ostree commits", len(args.Specs))
 
 	for i, s := range args.Specs {
-		reqParams := ostree.SourceSpec{
-			URL:  s.URL,
-			Ref:  s.Ref,
-			RHSM: s.RHSM,
-		}
-
+		reqParams := ostree.SourceSpec(s)
 		commitSpec, err := ostree.Resolve(reqParams)
 		if err != nil {
 			logWithId.Infof("Resolving ostree params failed: %v", err)
@@ -68,6 +63,7 @@ func (impl *OSTreeResolveJobImpl) Run(job worker.Job) error {
 			URL:      commitSpec.URL,
 			Ref:      commitSpec.Ref,
 			Checksum: commitSpec.Checksum,
+			Secrets:  commitSpec.Secrets,
 			RHSM:     s.RHSM,
 		}
 	}
diff --git a/internal/worker/json.go b/internal/worker/json.go
index d22f51da6..2f0683f00 100644
--- a/internal/worker/json.go
+++ b/internal/worker/json.go
@@ -287,10 +287,9 @@ type FileResolveJobResult struct {
 }
 
 type OSTreeResolveSpec struct {
-	URL    string `json:"url"`
-	Ref    string `json:"ref"`
-	Parent string `json:"parent"`
-	RHSM   bool   `json:"rhsm"`
+	URL  string `json:"url"`
+	Ref  string `json:"ref"`
+	RHSM bool   `json:"rhsm"`
 }
 
 type OSTreeResolveJob struct {
@@ -301,7 +300,8 @@ type OSTreeResolveResultSpec struct {
 	URL      string `json:"url"`
 	Ref      string `json:"ref"`
 	Checksum string `json:"checksum"`
-	RHSM     bool   `json:"bool"`
+	RHSM     bool   `json:"bool"` // NOTE: kept for backwards compatibility; remove after a few releases
+	Secrets  string `json:"secrets"`
 }
 
 type OSTreeResolveJobResult struct {