internal/cloudapi: check JobError in ComposeManifest endpoint

The API endpoint used to check only for errors when getting the osbuild
manifest from job dependencies results. However, if the actual manifest
serialization in the respective job failed, the endpoint would return no
error, but instead `nil` as the manifest value.

Make sure to check also the manifest generation job JobError, before
returning the manifest, and return the error instead if it is set.

Signed-off-by: Tomáš Hozza <[email protected]>

Author: thozza

internal/cloudapi/v2/handler.go

@@ -880,6 +880,9 @@ func (h *apiHandlers) getComposeManifestsImpl(ctx echo.Context, jobId uuid.UUID)
 					if err != nil {
 						return HTTPErrorWithInternal(ErrorComposeNotFound, fmt.Errorf("job %q: %v", jobId, err))
 					}
+					if manifestResult.JobError != nil {
+						return HTTPErrorWithInternal(ErrorFailedToMakeManifest, fmt.Errorf("job %q: %v", jobId, manifestResult.JobError))
+					}
 					mf = manifestResult.Manifest
 				}
 
@@ -909,6 +912,9 @@ func (h *apiHandlers) getComposeManifestsImpl(ctx echo.Context, jobId uuid.UUID)
 			if err != nil {
 				return HTTPErrorWithInternal(ErrorComposeNotFound, fmt.Errorf("job %q: %v", jobId, err))
 			}
+			if manifestResult.JobError != nil {
+				return HTTPErrorWithInternal(ErrorFailedToMakeManifest, fmt.Errorf("job %q: %v", jobId, manifestResult.JobError))
+			}
 			mf = manifestResult.Manifest
 		}
 		manifestBlobs = append(manifestBlobs, mf)

internal/cloudapi/v2/v2_test.go

@@ -880,16 +880,14 @@ func TestComposeManifests(t *testing.T) {
 			jobResult: worker.ManifestJobByIDResult{
 				Manifest: manifest.OSBuildManifest([]byte(`{"version":"2","pipelines":[{"name":"build"},{"name":"os"}],"sources":{"org.osbuild.curl":{"items":{"sha256:e50ddb78a37f5851d1a5c37a4c77d59123153c156e628e064b9daa378f45a2fe":{"url":"https://pkg1.example.com/1.33-2.fc30.x86_64.rpm"}}}}}`)),
 			}},
-		// TODO: this case should actually fail, but it doesn't
 		{
 			name: "failure",
 			jobResult: worker.ManifestJobByIDResult{
-				Manifest: manifest.OSBuildManifest([]byte(`null`)),
 				JobResult: worker.JobResult{
 					JobError: clienterrors.New(clienterrors.ErrorManifestDependency, "Manifest generation test error", "Package XYZ does not have a RemoteLocation"),
 				},
 			},
-			//expectedError: clienterrors.New(clienterrors.ErrorManifestDependency, "Manifest generation test error", "Package XYZ does not have a RemoteLocation"),
+			expectedError: clienterrors.New(clienterrors.ErrorManifestDependency, "Manifest generation test error", "Package XYZ does not have a RemoteLocation"),
 		},
 	}