From a613e8cb37d7f1565acc0b58f7324c5adf610a60 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Tue, 28 Jan 2025 10:10:42 -0800
Subject: [PATCH] DepsolveJobResult: Remove unused Error and ErrorType

These fields are not set by the depsolve job, they are only set and used
in tests so remove them. Errors are reported in the result.JobError

Related: Related: RHEL-60125
---
 internal/cloudapi/v2/v2_test.go |  2 --
 internal/worker/json.go         |  9 ---------
 internal/worker/server.go       |  8 --------
 internal/worker/server_test.go  | 35 ---------------------------------
 4 files changed, 54 deletions(-)

diff --git a/internal/cloudapi/v2/v2_test.go b/internal/cloudapi/v2/v2_test.go
index 8e79100d2..a918a90fc 100644
--- a/internal/cloudapi/v2/v2_test.go
+++ b/internal/cloudapi/v2/v2_test.go
@@ -125,8 +125,6 @@ func mockDepsolve(t *testing.T, workerServer *worker.Server, wg *sync.WaitGroup,
 						Document: sbomDoc,
 					},
 				},
-				Error:     "",
-				ErrorType: worker.ErrorType(""),
 			}
 
 			if fail {
diff --git a/internal/worker/json.go b/internal/worker/json.go
index 37fd7aeca..bd3e50e40 100644
--- a/internal/worker/json.go
+++ b/internal/worker/json.go
@@ -195,13 +195,6 @@ type DepsolveJob struct {
 	SbomType sbom.StandardType `json:"sbom_type,omitempty"`
 }
 
-type ErrorType string
-
-const (
-	DepsolveErrorType ErrorType = "depsolve"
-	OtherErrorType    ErrorType = "other"
-)
-
 // SbomDoc represents a single SBOM document result.
 type SbomDoc struct {
 	DocType  sbom.StandardType `json:"type"`
@@ -212,8 +205,6 @@ type DepsolveJobResult struct {
 	PackageSpecs map[string][]rpmmd.PackageSpec `json:"package_specs"`
 	SbomDocs     map[string]SbomDoc             `json:"sbom_docs,omitempty"`
 	RepoConfigs  map[string][]rpmmd.RepoConfig  `json:"repo_configs"`
-	Error        string                         `json:"error"`
-	ErrorType    ErrorType                      `json:"error_type"`
 	JobResult
 }
 
diff --git a/internal/worker/server.go b/internal/worker/server.go
index 9f2cbcb87..27762d8d8 100644
--- a/internal/worker/server.go
+++ b/internal/worker/server.go
@@ -420,14 +420,6 @@ func (s *Server) DepsolveJobInfo(id uuid.UUID, result *DepsolveJobResult) (*JobI
 		return nil, fmt.Errorf("expected %q, found %q job instead", JobTypeDepsolve, jobInfo.JobType)
 	}
 
-	if result.JobError == nil && result.Error != "" {
-		if result.ErrorType == DepsolveErrorType {
-			result.JobError = clienterrors.New(clienterrors.ErrorDNFDepsolveError, result.Error, nil)
-		} else {
-			result.JobError = clienterrors.New(clienterrors.ErrorRPMMDError, result.Error, nil)
-		}
-	}
-
 	return jobInfo, nil
 }
 
diff --git a/internal/worker/server_test.go b/internal/worker/server_test.go
index 20a5b1026..41039a44e 100644
--- a/internal/worker/server_test.go
+++ b/internal/worker/server_test.go
@@ -640,41 +640,6 @@ func TestMixedOSBuildJob(t *testing.T) {
 	require.Equal(newJobResult, newJobResultRead)
 }
 
-func TestDepsolveLegacyErrorConversion(t *testing.T) {
-	distroStruct := newTestDistro(t)
-	arch, err := distroStruct.GetArch(test_distro.TestArchName)
-	if err != nil {
-		t.Fatalf("error getting arch from distro: %v", err)
-	}
-	server := newTestServer(t, t.TempDir(), defaultConfig, false)
-
-	depsolveJobId, err := server.EnqueueDepsolve(&worker.DepsolveJob{}, "")
-	require.NoError(t, err)
-
-	_, _, _, _, _, err = server.RequestJob(context.Background(), arch.Name(), []string{worker.JobTypeDepsolve}, []string{""}, uuid.Nil)
-	require.NoError(t, err)
-
-	reason := "Depsolve failed"
-	errType := worker.DepsolveErrorType
-
-	expectedResult := worker.DepsolveJobResult{
-		Error:     reason,
-		ErrorType: errType,
-		JobResult: worker.JobResult{
-			JobError: clienterrors.New(clienterrors.ErrorDNFDepsolveError, reason, nil),
-		},
-	}
-
-	depsolveJobResult := worker.DepsolveJobResult{
-		Error:     reason,
-		ErrorType: errType,
-	}
-
-	_, err = server.DepsolveJobInfo(depsolveJobId, &depsolveJobResult)
-	require.NoError(t, err)
-	require.Equal(t, expectedResult, depsolveJobResult)
-}
-
 type testJob struct {
 	main   interface{}
 	deps   []testJob