cloudapi: enable librepo by default (and update tests)

This commit enables librepo by default in the cloudapi. This
should help with on-prem out of sync mirror issues like:
#4427

We have librepo in osbuild/images/ibcli/bib for a while now, c.f.
osbuild/image-builder-cli#51
osbuild/bootc-image-builder#786 (enable)
osbuild/bootc-image-builder#840 (make default)

It is not configurable right now, I am not sure there is a reason
to keep libcurl around for manifest generation as its more fragile
but if it is desired I can look into that too. Having it configurable
would allow us to revert to the previous org.osbuild.curl in case
anything is wrong with the new downloader (and arguably it was
only excercised by a relatively small number of people compared
to how much the service is building).

Author: mvo5

internal/cloudapi/v2/server.go

@@ -27,6 +27,7 @@ import (
 	"github.com/osbuild/images/pkg/distro"
 	"github.com/osbuild/images/pkg/distrofactory"
 	"github.com/osbuild/images/pkg/manifest"
+	"github.com/osbuild/images/pkg/osbuild"
 	"github.com/osbuild/images/pkg/ostree"
 	"github.com/osbuild/images/pkg/reporegistry"
 	"github.com/osbuild/images/pkg/sbom"
@@ -647,7 +648,10 @@ func serializeManifest(ctx context.Context, manifestSource *manifest.Manifest, w
 		r.Repos = res
 		depsolveResultsInTheRightFormat[plName] = r
 	}
-	ms, err := manifestSource.Serialize(depsolveResultsInTheRightFormat, containerSpecs, ostreeCommitSpecs, nil)
+	opts := &manifest.SerializeOptions{
+		RpmDownloader: osbuild.RpmDownloaderLibrepo,
+	}
+	ms, err := manifestSource.Serialize(depsolveResultsInTheRightFormat, containerSpecs, ostreeCommitSpecs, opts)
 	if err != nil {
 		reason := "Error serializing manifest"
 		jobResult.JobError = clienterrors.New(clienterrors.ErrorManifestGeneration, reason, err.Error())

internal/cloudapi/v2/v2_koji_test.go

@@ -400,7 +400,7 @@ func TestKojiCompose(t *testing.T) {
 		},
 	}
 
-	emptyManifest := `{"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"}}}}}`
+	emptyManifest := `{"version":"2","pipelines":[{"name":"build"},{"name":"os"}],"sources":{"org.osbuild.librepo":{"items":{"sha256:e50ddb78a37f5851d1a5c37a4c77d59123153c156e628e064b9daa378f45a2fe":{"path":"","mirror":"pkg1-repoid"}},"options":{"mirrors":{"pkg1-repoid":{"url":"https://pkg1.example.com/","type":"baseurl"}}}}}}`
 	expectedManifests := `{"manifests":[` + emptyManifest + `,` + emptyManifest + `],"kind":"ComposeManifests"}`
 	for idx, c := range cases {
 		name, version, release := "foo", "1", "2"

internal/cloudapi/v2/v2_multi_tenancy_test.go

@@ -179,24 +179,7 @@ func runNextJob(t *testing.T, jobs []uuid.UUID, workerServer *worker.Server, org
 	// the manifest generation job would fail on empty depsolved package list.
 	// This would make the ComposeManifests endpoint return an error.
 	case worker.JobTypeDepsolve:
-		dummyPackage := worker.DepsolvedPackage{
-			Name:    "pkg1",
-			Version: "1.33",
-			Release: "2.fc30",
-			Arch:    "x86_64",
-			Checksum: &worker.DepsolvedPackageChecksum{
-				Type:  "sha256",
-				Value: "e50ddb78a37f5851d1a5c37a4c77d59123153c156e628e064b9daa378f45a2fe",
-			},
-			RemoteLocations: []string{"https://pkg1.example.com/1.33-2.fc30.x86_64.rpm"},
-		}
-		depsolveJobResult := &worker.DepsolveJobResult{
-			PackageSpecs: map[string]worker.DepsolvedPackageList{
-				// Used when depsolving a manifest
-				"build": {dummyPackage},
-				"os":    {dummyPackage},
-			},
-		}
+		depsolveJobResult := makeFakeWorkerDepsolveResult()
 		rawDepsolveJobResult, err := json.Marshal(depsolveJobResult)
 		require.NoError(t, err)
 		result := api.UpdateJobResult{

internal/cloudapi/v2/v2_test.go

@@ -74,6 +74,46 @@ var sbomDoc = json.RawMessage(`{
   ]
 }`)
 
+func makeFakeWorkerDepsolveResult() *worker.DepsolveJobResult {
+	dummyPackage := worker.DepsolvedPackage{
+		Name:    "pkg1",
+		Version: "1.33",
+		Release: "2.fc30",
+		Arch:    "x86_64",
+		Checksum: &worker.DepsolvedPackageChecksum{
+			Type:  "sha256",
+			Value: "e50ddb78a37f5851d1a5c37a4c77d59123153c156e628e064b9daa378f45a2fe",
+		},
+		RemoteLocations: []string{"https://pkg1.example.com/1.33-2.fc30.x86_64.rpm"},
+		RepoID:          "pkg1-repoid",
+	}
+	dummyRepo := rpmmd.RepoConfig{
+		Id:       "pkg1-repoid",
+		BaseURLs: []string{"https://pkg1.example.com/"},
+	}
+	return &worker.DepsolveJobResult{
+		PackageSpecs: map[string]worker.DepsolvedPackageList{
+			// Used when depsolving a manifest
+			"build": {dummyPackage},
+			"os":    {dummyPackage},
+		},
+		RepoConfigs: map[string][]rpmmd.RepoConfig{
+			"build": {dummyRepo},
+			"os":    {dummyRepo},
+		},
+		SbomDocs: map[string]worker.SbomDoc{
+			"build": {
+				DocType:  sbom.StandardTypeSpdx,
+				Document: sbomDoc,
+			},
+			"os": {
+				DocType:  sbom.StandardTypeSpdx,
+				Document: sbomDoc,
+			},
+		},
+	}
+}
+
 // mockDepsolve starts a routine which just completes depsolve jobs
 // It requires some of the test framework to operate
 // And the optional fail parameter will cause it to return an error as if the depsolve failed
@@ -92,35 +132,7 @@ func mockDepsolve(t *testing.T, workerServer *worker.Server, wg *sync.WaitGroup,
 			if err != nil {
 				continue
 			}
-			dummyPackage := worker.DepsolvedPackage{
-				Name:    "pkg1",
-				Version: "1.33",
-				Release: "2.fc30",
-				Arch:    "x86_64",
-				Checksum: &worker.DepsolvedPackageChecksum{
-					Type:  "sha256",
-					Value: "e50ddb78a37f5851d1a5c37a4c77d59123153c156e628e064b9daa378f45a2fe",
-				},
-				RemoteLocations: []string{"https://pkg1.example.com/1.33-2.fc30.x86_64.rpm"},
-			}
-			dJR := &worker.DepsolveJobResult{
-				PackageSpecs: map[string]worker.DepsolvedPackageList{
-					// Used when depsolving a manifest
-					"build": {dummyPackage},
-					"os":    {dummyPackage},
-				},
-				SbomDocs: map[string]worker.SbomDoc{
-					"build": {
-						DocType:  sbom.StandardTypeSpdx,
-						Document: sbomDoc,
-					},
-					"os": {
-						DocType:  sbom.StandardTypeSpdx,
-						Document: sbomDoc,
-					},
-				},
-			}
-
+			dJR := makeFakeWorkerDepsolveResult()
 			if fail {
 				dJR.JobResult.JobError = clienterrors.New(clienterrors.ErrorDNFOtherError, "DNF Error", nil)
 			}
@@ -837,7 +849,7 @@ func TestComposeStatusSuccess(t *testing.T) {
 		]
 	}`, jobId, jobId))
 
-	emptyManifest := `{"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"}}}}}`
+	emptyManifest := `{"version":"2","pipelines":[{"name":"build"},{"name":"os"}],"sources":{"org.osbuild.librepo":{"items":{"sha256:e50ddb78a37f5851d1a5c37a4c77d59123153c156e628e064b9daa378f45a2fe":{"path":"","mirror":"pkg1-repoid"}},"options":{"mirrors":{"pkg1-repoid":{"url":"https://pkg1.example.com/","type":"baseurl"}}}}}}`
 	test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "GET", fmt.Sprintf("/api/image-builder-composer/v2/composes/%v/manifests", jobId), ``, http.StatusOK, fmt.Sprintf(`
 	{
 		"href": "/api/image-builder-composer/v2/composes/%v/manifests",
@@ -881,7 +893,7 @@ func TestComposeManifests(t *testing.T) {
 		{
 			name: "success",
 			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"}}}}}`)),
+				Manifest: manifest.OSBuildManifest([]byte(`{"version":"2","pipelines":[{"name":"build"},{"name":"os"}],"sources":{"org.osbuild.librepo":{"items":{"sha256:e50ddb78a37f5851d1a5c37a4c77d59123153c156e628e064b9daa378f45a2fe":{"path":"","mirror":"pkg1-repoid"}},"options":{"mirrors":{"pkg1-repoid":{"url":"https://pkg1.example.com/","type":"baseurl"}}}}}}`)),
 			}},
 		{
 			name: "failure",