manifest,sources: add librepo support to Serialize/GenSources

cmd/build/main.go

@@ -59,14 +59,13 @@ func makeManifest(
 		fmt.Fprintf(os.Stderr, "[WARNING]\n%s", strings.Join(warnings, "\n"))
 	}
 
-	packageSpecs, repoConfigs, err := depsolve(cacheDir, manifest.GetPackageSetChains(), distribution, archName)
+	depsolvedSets, err := depsolve(cacheDir, manifest.GetPackageSetChains(), distribution, archName)
 	if err != nil {
 		return nil, fmt.Errorf("[ERROR] depsolve failed: %w", err)
 	}
-	if packageSpecs == nil {
+	if depsolvedSets == nil {
 		return nil, fmt.Errorf("[ERROR] depsolve did not return any packages")
 	}
-	_ = repoConfigs
 
 	if config.Blueprint != nil {
 		bp = blueprint.Blueprint(*config.Blueprint)
@@ -82,7 +81,7 @@ func makeManifest(
 		return nil, fmt.Errorf("[ERROR] ostree commit resolution failed: %w", err)
 	}
 
-	mf, err := manifest.Serialize(packageSpecs, containerSpecs, commitSpecs, nil)
+	mf, err := manifest.Serialize(depsolvedSets, containerSpecs, commitSpecs, nil)
 	if err != nil {
 		return nil, fmt.Errorf("[ERROR] manifest serialization failed: %w", err)
 	}
@@ -128,19 +127,17 @@ func resolvePipelineCommits(commitSources map[string][]ostree.SourceSpec) (map[s
 	return commits, nil
 }
 
-func depsolve(cacheDir string, packageSets map[string][]rpmmd.PackageSet, d distro.Distro, arch string) (map[string][]rpmmd.PackageSpec, map[string][]rpmmd.RepoConfig, error) {
+func depsolve(cacheDir string, packageSets map[string][]rpmmd.PackageSet, d distro.Distro, arch string) (map[string]dnfjson.DepsolveResult, error) {
 	solver := dnfjson.NewSolver(d.ModulePlatformID(), d.Releasever(), arch, d.Name(), cacheDir)
-	depsolvedSets := make(map[string][]rpmmd.PackageSpec)
-	repoSets := make(map[string][]rpmmd.RepoConfig)
+	depsolvedSets := make(map[string]dnfjson.DepsolveResult)
 	for name, pkgSet := range packageSets {
 		res, err := solver.Depsolve(pkgSet, sbom.StandardTypeNone)
 		if err != nil {
-			return nil, nil, err
+			return nil, err
 		}
-		depsolvedSets[name] = res.Packages
-		repoSets[name] = res.Repos
+		depsolvedSets[name] = *res
 	}
-	return depsolvedSets, repoSets, nil
+	return depsolvedSets, nil
 }
 
 func save(ms manifest.OSBuildManifest, fpath string) error {

cmd/gen-manifests/main.go

@@ -214,22 +214,22 @@ func makeManifestJob(
 			return
 		}
 
-		var packageSpecs map[string][]rpmmd.PackageSpec
-		var repoConfigs map[string][]rpmmd.RepoConfig
+		var depsolvedSets map[string]dnfjson.DepsolveResult
 		if content["packages"] {
-			packageSpecs, repoConfigs, err = depsolve(cacheDir, manifest.GetPackageSetChains(), distribution, archName)
+			depsolvedSets, err = depsolve(cacheDir, manifest.GetPackageSetChains(), distribution, archName)
 			if err != nil {
 				err = fmt.Errorf("[%s] depsolve failed: %s", filename, err.Error())
 				return
 			}
-			if packageSpecs == nil {
-				err = fmt.Errorf("[%s] nil package specs", filename)
-				return
+			for plName, depsolved := range depsolvedSets {
+				if depsolved.Packages == nil {
+					err = fmt.Errorf("[%s] nil package specs in %v", filename, plName)
+					return
+				}
 			}
 		} else {
-			packageSpecs, repoConfigs = mockDepsolve(manifest.GetPackageSetChains(), repos, archName)
+			depsolvedSets = mockDepsolve(manifest.GetPackageSetChains(), repos, archName)
 		}
-		_ = repoConfigs
 
 		var containerSpecs map[string][]container.Spec
 		if content["containers"] {
@@ -251,7 +251,7 @@ func makeManifestJob(
 			commitSpecs = mockResolveCommits(manifest.GetOSTreeSourceSpecs())
 		}
 
-		mf, err := manifest.Serialize(packageSpecs, containerSpecs, commitSpecs, repoConfigs)
+		mf, err := manifest.Serialize(depsolvedSets, containerSpecs, commitSpecs, nil)
 		if err != nil {
 			return fmt.Errorf("[%s] manifest serialization failed: %s", filename, err.Error())
 		}
@@ -263,7 +263,7 @@ func makeManifestJob(
 			Repositories: repos,
 			Config:       bc,
 		}
-		err = save(mf, packageSpecs, containerSpecs, commitSpecs, request, path, filename, metadata)
+		err = save(mf, depsolvedSets, containerSpecs, commitSpecs, request, path, filename, metadata)
 		return
 	}
 	return job
@@ -346,24 +346,21 @@ func mockResolveCommits(commitSources map[string][]ostree.SourceSpec) map[string
 	return commits
 }
 
-func depsolve(cacheDir string, packageSets map[string][]rpmmd.PackageSet, d distro.Distro, arch string) (map[string][]rpmmd.PackageSpec, map[string][]rpmmd.RepoConfig, error) {
+func depsolve(cacheDir string, packageSets map[string][]rpmmd.PackageSet, d distro.Distro, arch string) (map[string]dnfjson.DepsolveResult, error) {
 	solver := dnfjson.NewSolver(d.ModulePlatformID(), d.Releasever(), arch, d.Name(), cacheDir)
-	depsolvedSets := make(map[string][]rpmmd.PackageSpec)
-	repoSets := make(map[string][]rpmmd.RepoConfig)
+	depsolvedSets := make(map[string]dnfjson.DepsolveResult)
 	for name, pkgSet := range packageSets {
 		res, err := solver.Depsolve(pkgSet, sbom.StandardTypeNone)
 		if err != nil {
-			return nil, nil, err
+			return nil, err
 		}
-		depsolvedSets[name] = res.Packages
-		repoSets[name] = res.Repos
+		depsolvedSets[name] = *res
 	}
-	return depsolvedSets, repoSets, nil
+	return depsolvedSets, nil
 }
 
-func mockDepsolve(packageSets map[string][]rpmmd.PackageSet, repos []rpmmd.RepoConfig, archName string) (map[string][]rpmmd.PackageSpec, map[string][]rpmmd.RepoConfig) {
-	depsolvedSets := make(map[string][]rpmmd.PackageSpec)
-	repoSets := make(map[string][]rpmmd.RepoConfig)
+func mockDepsolve(packageSets map[string][]rpmmd.PackageSet, repos []rpmmd.RepoConfig, archName string) map[string]dnfjson.DepsolveResult {
+	depsolvedSets := make(map[string]dnfjson.DepsolveResult)
 
 	for name, pkgSetChain := range packageSets {
 		specSet := make([]rpmmd.PackageSpec, 0)
@@ -424,16 +421,22 @@ func mockDepsolve(packageSets map[string][]rpmmd.PackageSet, repos []rpmmd.RepoC
 			})
 		}
 
-		depsolvedSets[name] = specSet
-		repoSets[name] = repos
+		depsolvedSets[name] = dnfjson.DepsolveResult{
+			Packages: specSet,
+			Repos:    repos,
+		}
 	}
 
-	return depsolvedSets, repoSets
+	return depsolvedSets
 }
 
-func save(ms manifest.OSBuildManifest, pkgs map[string][]rpmmd.PackageSpec, containers map[string][]container.Spec, commits map[string][]ostree.CommitSpec, cr buildRequest, path, filename string, metadata bool) error {
+func save(ms manifest.OSBuildManifest, depsolved map[string]dnfjson.DepsolveResult, containers map[string][]container.Spec, commits map[string][]ostree.CommitSpec, cr buildRequest, path, filename string, metadata bool) error {
 	var data interface{}
 	if metadata {
+		rpmmds := make(map[string][]rpmmd.PackageSpec)
+		for plName, res := range depsolved {
+			rpmmds[plName] = res.Packages
+		}
 		data = struct {
 			BuidRequest   buildRequest                   `json:"build-request"`
 			Manifest      manifest.OSBuildManifest       `json:"manifest"`
@@ -442,7 +445,7 @@ func save(ms manifest.OSBuildManifest, pkgs map[string][]rpmmd.PackageSpec, cont
 			OSTreeCommits map[string][]ostree.CommitSpec `json:"ostree-commits,omitempty"`
 			NoImageInfo   bool                           `json:"no-image-info"`
 		}{
-			cr, ms, pkgs, containers, commits, true,
+			cr, ms, rpmmds, containers, commits, true,
 		}
 	} else {
 		data = ms

cmd/osbuild-playground/playground.go

@@ -35,21 +35,21 @@ func RunPlayground(img image.ImageKind, d distro.Distro, arch distro.Arch, repos
 		panic("InstantiateManifest() failed: " + err.Error())
 	}
 
-	packageSpecs := make(map[string][]rpmmd.PackageSpec)
+	depsolvedSets := make(map[string]dnfjson.DepsolveResult)
 	for name, chain := range manifest.GetPackageSetChains() {
 		res, err := solver.Depsolve(chain, sbom.StandardTypeNone)
 		if err != nil {
 			panic(fmt.Sprintf("failed to depsolve for pipeline %s: %s\n", name, err.Error()))
 		}
-		packageSpecs[name] = res.Packages
+		depsolvedSets[name] = *res
 	}
 
 	if err := solver.CleanCache(); err != nil {
 		// print to stderr but don't exit with error
 		fmt.Fprintf(os.Stderr, "could not clean dnf cache: %s", err.Error())
 	}
 
-	bytes, err := manifest.Serialize(packageSpecs, nil, nil, nil)
+	bytes, err := manifest.Serialize(depsolvedSets, nil, nil, nil)
 	if err != nil {
 		panic("failed to serialize manifest: " + err.Error())
 	}

pkg/distro/distro_test.go

@@ -9,16 +9,18 @@ import (
 
 	"slices"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/osbuild/images/internal/common"
 	"github.com/osbuild/images/pkg/blueprint"
 	"github.com/osbuild/images/pkg/container"
 	"github.com/osbuild/images/pkg/distro"
 	"github.com/osbuild/images/pkg/distrofactory"
+	"github.com/osbuild/images/pkg/dnfjson"
 	"github.com/osbuild/images/pkg/ostree"
 	"github.com/osbuild/images/pkg/rpmmd"
 	testrepos "github.com/osbuild/images/test/data/repositories"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 // listTestedDistros returns a list of distro names that are explicitly tested
@@ -109,11 +111,11 @@ func TestImageTypePipelineNames(t *testing.T) {
 						{Name: "filesystem", Checksum: "sha256:6b4bf18ba28ccbdd49f2716c9f33c9211155ff703fa6c195c78a07bd160da0eb"},
 					}
 
-					packageSets := make(map[string][]rpmmd.PackageSpec, len(allPipelines))
-					repoSets := make(map[string][]rpmmd.RepoConfig, len(allPipelines))
+					depsolvedSets := make(map[string]dnfjson.DepsolveResult, len(allPipelines))
 					for _, plName := range allPipelines {
-						packageSets[plName] = minimalPackageSet
-						repoSets[plName] = repos
+						dr := depsolvedSets[plName]
+						dr.Packages = minimalPackageSet
+						depsolvedSets[plName] = dr
 					}
 
 					m, _, err := imageType.Manifest(&bp, options, repos, &seed)
@@ -134,7 +136,7 @@ func TestImageTypePipelineNames(t *testing.T) {
 						}
 						commits[name] = commitSpecs
 					}
-					mf, err := m.Serialize(packageSets, containers, commits, repoSets)
+					mf, err := m.Serialize(depsolvedSets, containers, commits, nil)
 					assert.NoError(err)
 					pm := new(manifest)
 					err = json.Unmarshal(mf, pm)

pkg/image/installer_image_test.go

@@ -5,37 +5,45 @@ import (
 	"math/rand"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/osbuild/images/pkg/container"
 	"github.com/osbuild/images/pkg/customizations/anaconda"
 	"github.com/osbuild/images/pkg/customizations/kickstart"
+	"github.com/osbuild/images/pkg/dnfjson"
 	"github.com/osbuild/images/pkg/image"
 	"github.com/osbuild/images/pkg/manifest"
 	"github.com/osbuild/images/pkg/osbuild"
 	"github.com/osbuild/images/pkg/ostree"
 	"github.com/osbuild/images/pkg/platform"
 	"github.com/osbuild/images/pkg/rpmmd"
 	"github.com/osbuild/images/pkg/runner"
-	"github.com/stretchr/testify/assert"
 )
 
-func mockPackageSets() map[string][]rpmmd.PackageSpec {
-	return map[string][]rpmmd.PackageSpec{
+func mockPackageSets() map[string]dnfjson.DepsolveResult {
+	return map[string]dnfjson.DepsolveResult{
 		"build": {
-			{
-				Name:     "coreutils",
-				Checksum: "sha256:cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
+			Packages: []rpmmd.PackageSpec{
+				{
+					Name:     "coreutils",
+					Checksum: "sha256:cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
+				},
 			},
 		},
 		"os": {
-			{
-				Name:     "kernel",
-				Checksum: "sha256:eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+			Packages: []rpmmd.PackageSpec{
+				{
+					Name:     "kernel",
+					Checksum: "sha256:eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+				},
 			},
 		},
 		"anaconda-tree": {
-			{
-				Name:     "kernel",
-				Checksum: "sha256:eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+			Packages: []rpmmd.PackageSpec{
+				{
+					Name:     "kernel",
+					Checksum: "sha256:eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+				},
 			},
 		},
 	}
@@ -354,7 +362,7 @@ func TestLiveInstallerSquashfsRootfs(t *testing.T) {
 	assert.NotContains(t, mfs, `"name:rootfs-image"`)
 }
 
-func instantiateAndSerialize(t *testing.T, img image.ImageKind, packages map[string][]rpmmd.PackageSpec, containers map[string][]container.Spec, commits map[string][]ostree.CommitSpec) string {
+func instantiateAndSerialize(t *testing.T, img image.ImageKind, depsolved map[string]dnfjson.DepsolveResult, containers map[string][]container.Spec, commits map[string][]ostree.CommitSpec) string {
 	source := rand.NewSource(int64(0))
 	// math/rand is good enough in this case
 	/* #nosec G404 */
@@ -364,7 +372,7 @@ func instantiateAndSerialize(t *testing.T, img image.ImageKind, packages map[str
 	_, err := img.InstantiateManifest(&mf, nil, &runner.CentOS{Version: 9}, rng)
 	assert.NoError(t, err)
 
-	mfs, err := mf.Serialize(packages, containers, commits, nil)
+	mfs, err := mf.Serialize(depsolved, containers, commits, nil)
 	assert.NoError(t, err)
 
 	return string(mfs)

pkg/manifest/anaconda_installer.go

@@ -198,11 +198,11 @@ func (p *AnacondaInstaller) serializeStart(inputs Inputs) {
 	if len(p.packageSpecs) > 0 {
 		panic("double call to serializeStart()")
 	}
-	p.packageSpecs = inputs.Packages
+	p.packageSpecs = inputs.Depsolved.Packages
 	if p.kernelName != "" {
 		p.kernelVer = rpmmd.GetVerStrFromPackageSpecListPanic(p.packageSpecs, p.kernelName)
 	}
-	p.repos = append(p.repos, inputs.RpmRepos...)
+	p.repos = append(p.repos, inputs.Depsolved.Repos...)
 }
 
 func (p *AnacondaInstaller) serializeEnd() {

pkg/manifest/anaconda_installer_test.go

@@ -3,12 +3,14 @@ package manifest
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/osbuild/images/pkg/customizations/anaconda"
+	"github.com/osbuild/images/pkg/dnfjson"
 	"github.com/osbuild/images/pkg/osbuild"
 	"github.com/osbuild/images/pkg/platform"
 	"github.com/osbuild/images/pkg/rpmmd"
 	"github.com/osbuild/images/pkg/runner"
-	"github.com/stretchr/testify/require"
 )
 
 func newAnacondaInstaller() *AnacondaInstaller {
@@ -105,7 +107,7 @@ func TestAnacondaInstallerModules(t *testing.T) {
 				installerPipeline.UseLegacyAnacondaConfig = legacy
 				installerPipeline.AdditionalAnacondaModules = tc.enable
 				installerPipeline.DisabledAnacondaModules = tc.disable
-				installerPipeline.serializeStart(Inputs{Packages: pkgs})
+				installerPipeline.serializeStart(Inputs{Depsolved: dnfjson.DepsolveResult{Packages: pkgs}})
 				pipeline := installerPipeline.serialize()
 
 				require := require.New(t)

pkg/manifest/build.go

@@ -102,8 +102,8 @@ func (p *BuildrootFromPackages) serializeStart(inputs Inputs) {
 	if len(p.packageSpecs) > 0 {
 		panic("double call to serializeStart()")
 	}
-	p.packageSpecs = inputs.Packages
-	p.repos = append(p.repos, inputs.RpmRepos...)
+	p.packageSpecs = inputs.Depsolved.Packages
+	p.repos = append(p.repos, inputs.Depsolved.Repos...)
 }
 
 func (p *BuildrootFromPackages) serializeEnd() {

pkg/manifest/commit_server_tree.go

@@ -82,8 +82,8 @@ func (p *OSTreeCommitServer) serializeStart(inputs Inputs) {
 	if len(p.packageSpecs) > 0 {
 		panic("double call to serializeStart()")
 	}
-	p.packageSpecs = inputs.Packages
-	p.repos = append(p.repos, inputs.RpmRepos...)
+	p.packageSpecs = inputs.Depsolved.Packages
+	p.repos = append(p.repos, inputs.Depsolved.Repos...)
 }
 
 func (p *OSTreeCommitServer) serializeEnd() {

pkg/manifest/coreos_installer.go

@@ -138,11 +138,11 @@ func (p *CoreOSInstaller) serializeStart(inputs Inputs) {
 	if len(p.packageSpecs) > 0 {
 		panic("double call to serializeStart()")
 	}
-	p.packageSpecs = inputs.Packages
+	p.packageSpecs = inputs.Depsolved.Packages
 	if p.kernelName != "" {
 		p.kernelVer = rpmmd.GetVerStrFromPackageSpecListPanic(p.packageSpecs, p.kernelName)
 	}
-	p.repos = append(p.repos, inputs.RpmRepos...)
+	p.repos = append(p.repos, inputs.Depsolved.Repos...)
 }
 
 func (p *CoreOSInstaller) getInline() []string {