From 318a4525c650b24c997dd32a5194243b51a40013 Mon Sep 17 00:00:00 2001
From: Sanne Raymaekers <sanne.raymaekers@gmail.com>
Date: Fri, 25 Feb 2022 10:33:24 +0100
Subject: [PATCH] cmd/osbuild-worker: dnf-json returns MarkingErrors (plural)

---
 cmd/osbuild-worker/jobimpl-depsolve.go | 4 ++--
 internal/cloudapi/v2/v2.go             | 2 +-
 internal/worker/clienterrors/errors.go | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmd/osbuild-worker/jobimpl-depsolve.go b/cmd/osbuild-worker/jobimpl-depsolve.go
index e81c00116..f5cdce415 100644
--- a/cmd/osbuild-worker/jobimpl-depsolve.go
+++ b/cmd/osbuild-worker/jobimpl-depsolve.go
@@ -51,8 +51,8 @@ func (impl *DepsolveJobImpl) Run(job worker.Job) error {
 			switch e.Kind {
 			case "DepsolveError":
 				result.JobError = clienterrors.WorkerClientError(clienterrors.ErrorDNFDepsolveError, err.Error())
-			case "MarkingError":
-				result.JobError = clienterrors.WorkerClientError(clienterrors.ErrorDNFMarkingError, err.Error())
+			case "MarkingErrors":
+				result.JobError = clienterrors.WorkerClientError(clienterrors.ErrorDNFMarkingErrors, err.Error())
 			default:
 				// This still has the kind/reason format but a kind that's returned
 				// by dnf-json and not explicitly handled here.
diff --git a/internal/cloudapi/v2/v2.go b/internal/cloudapi/v2/v2.go
index 6d6d1b51b..b09dd921f 100644
--- a/internal/cloudapi/v2/v2.go
+++ b/internal/cloudapi/v2/v2.go
@@ -697,7 +697,7 @@ func generateManifest(ctx context.Context, cancel context.CancelFunc, workers *w
 	}
 
 	if jobErr := depsolveResults.JobError; jobErr != nil {
-		if jobErr.ID == clienterrors.ErrorDNFDepsolveError || jobErr.ID == clienterrors.ErrorDNFMarkingError {
+		if jobErr.ID == clienterrors.ErrorDNFDepsolveError || jobErr.ID == clienterrors.ErrorDNFMarkingErrors {
 			jobResult.JobError = clienterrors.WorkerClientError(clienterrors.ErrorDepsolveDependency, "Error in depsolve job dependency input, bad package set requested")
 			return
 		}
diff --git a/internal/worker/clienterrors/errors.go b/internal/worker/clienterrors/errors.go
index 69648faed..9f090672f 100644
--- a/internal/worker/clienterrors/errors.go
+++ b/internal/worker/clienterrors/errors.go
@@ -21,7 +21,7 @@ const (
 	ErrorOldResultCompatible  ClientErrorCode = 18
 
 	ErrorDNFDepsolveError ClientErrorCode = 20
-	ErrorDNFMarkingError  ClientErrorCode = 21
+	ErrorDNFMarkingErrors ClientErrorCode = 21
 	ErrorDNFOtherError    ClientErrorCode = 22
 	ErrorRPMMDError       ClientErrorCode = 23
 )
@@ -53,7 +53,7 @@ func GetStatusCode(err *Error) StatusCode {
 	switch err.ID {
 	case ErrorDNFDepsolveError:
 		return JobStatusUserInputError
-	case ErrorDNFMarkingError:
+	case ErrorDNFMarkingErrors:
 		return JobStatusUserInputError
 	case ErrorNoDynamicArgs:
 		return JobStatusUserInputError