Use dot to separate distro major and minor version and replace distro registry with factory

cmd/build/main.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"io"
 	"os"
 	"path/filepath"
 	"strings"
@@ -15,11 +14,12 @@ import (
 	"github.com/osbuild/images/pkg/blueprint"
 	"github.com/osbuild/images/pkg/container"
 	"github.com/osbuild/images/pkg/distro"
-	"github.com/osbuild/images/pkg/distroregistry"
+	"github.com/osbuild/images/pkg/distrofactory"
 	"github.com/osbuild/images/pkg/dnfjson"
 	"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/rhsm/facts"
 	"github.com/osbuild/images/pkg/rpmmd"
 )
@@ -112,32 +112,6 @@ func makeManifest(imgType distro.ImageType, config BuildConfig, distribution dis
 	return mf, nil
 }
 
-type DistroArchRepoMap map[string]map[string][]rpmmd.RepoConfig
-
-func readRepos() DistroArchRepoMap {
-	reposDir := "./test/data/repositories/"
-	darm := make(DistroArchRepoMap)
-	filelist, err := os.ReadDir(reposDir)
-	check(err)
-	for _, file := range filelist {
-		filename := file.Name()
-		if !strings.HasSuffix(filename, ".json") {
-			continue
-		}
-		reposFilepath := filepath.Join(reposDir, filename)
-		fp, err := os.Open(reposFilepath)
-		check(err)
-		defer fp.Close()
-		data, err := io.ReadAll(fp)
-		check(err)
-		repos := make(map[string][]rpmmd.RepoConfig)
-		check(json.Unmarshal(data, &repos))
-		distro := strings.TrimSuffix(filename, filepath.Ext(filename))
-		darm[distro] = repos
-	}
-	return darm
-}
-
 func resolveContainers(containers []container.SourceSpec, archName string) ([]container.Spec, error) {
 	resolver := container.NewResolver(archName)
 
@@ -249,16 +223,20 @@ func main() {
 
 	rngSeed, err := cmdutil.NewRNGSeed()
 	check(err)
-	darm := readRepos()
-	distroReg := distroregistry.NewDefault()
+
+	testedRepoRegistry, err := reporegistry.NewTestedDefault()
+	if err != nil {
+		panic(fmt.Sprintf("failed to create repo registry with tested distros: %v", err))
+	}
+	distroFac := distrofactory.NewDefault()
 
 	config := loadConfig(configFile)
 
 	if err := os.MkdirAll(outputDir, 0777); err != nil {
 		fail(fmt.Sprintf("failed to create target directory: %s", err.Error()))
 	}
 
-	distribution := distroReg.GetDistro(distroName)
+	distribution := distroFac.GetDistro(distroName)
 	if distribution == nil {
 		fail(fmt.Sprintf("invalid or unsupported distribution: %q", distroName))
 	}
@@ -281,7 +259,11 @@ func main() {
 	}
 
 	// get repositories
-	repos := filterRepos(darm[distroName][archName], imgTypeName)
+	repos, err := testedRepoRegistry.ReposByArchName(distroName, archName, true)
+	if err != nil {
+		panic(fmt.Sprintf("failed to get repositories for %s/%s: %v", distroName, archName, err))
+	}
+	repos = filterRepos(repos, imgTypeName)
 	if len(repos) == 0 {
 		fail(fmt.Sprintf("no repositories defined for %s/%s\n", distroName, archName))
 	}

cmd/gen-manifests/main.go

@@ -21,10 +21,11 @@ import (
 	"github.com/osbuild/images/pkg/blueprint"
 	"github.com/osbuild/images/pkg/container"
 	"github.com/osbuild/images/pkg/distro"
-	"github.com/osbuild/images/pkg/distroregistry"
+	"github.com/osbuild/images/pkg/distrofactory"
 	"github.com/osbuild/images/pkg/dnfjson"
 	"github.com/osbuild/images/pkg/manifest"
 	"github.com/osbuild/images/pkg/ostree"
+	"github.com/osbuild/images/pkg/reporegistry"
 	"github.com/osbuild/images/pkg/rhsm/facts"
 	"github.com/osbuild/images/pkg/rpmmd"
 )
@@ -291,40 +292,6 @@ func makeManifestJob(
 	return job
 }
 
-type DistroArchRepoMap map[string]map[string][]rpmmd.RepoConfig
-
-func readRepos() DistroArchRepoMap {
-	reposDir := "./test/data/repositories/"
-	darm := make(DistroArchRepoMap)
-	filelist, err := os.ReadDir(reposDir)
-	if err != nil {
-		panic(err)
-	}
-	for _, file := range filelist {
-		filename := file.Name()
-		if !strings.HasSuffix(filename, ".json") {
-			continue
-		}
-		reposFilepath := filepath.Join(reposDir, filename)
-		fp, err := os.Open(reposFilepath)
-		if err != nil {
-			panic(err)
-		}
-		defer fp.Close()
-		data, err := io.ReadAll(fp)
-		if err != nil {
-			panic(err)
-		}
-		repos := make(map[string][]rpmmd.RepoConfig)
-		if err := json.Unmarshal(data, &repos); err != nil {
-			panic(err)
-		}
-		distro := strings.TrimSuffix(filename, filepath.Ext(filename))
-		darm[distro] = repos
-	}
-	return darm
-}
-
 func resolveContainers(containers []container.SourceSpec, archName string) ([]container.Spec, error) {
 	resolver := container.NewResolver(archName)
 
@@ -559,8 +526,13 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-	darm := readRepos()
-	distroReg := distroregistry.NewDefault()
+
+	testedRepoRegistry, err := reporegistry.NewTestedDefault()
+	if err != nil {
+		panic(fmt.Sprintf("failed to create repo registry with tested distros: %v", err))
+	}
+
+	distroFac := distrofactory.NewDefault()
 	jobs := make([]manifestJob, 0)
 
 	contentResolve := map[string]bool{
@@ -582,12 +554,17 @@ func main() {
 	}
 
 	fmt.Println("Collecting jobs")
-	distros, invalidDistros := resolveArgValues(distros, distroReg.List())
+
+	distros, invalidDistros := resolveArgValues(distros, testedRepoRegistry.ListDistros())
 	if len(invalidDistros) > 0 {
 		fmt.Fprintf(os.Stderr, "WARNING: invalid distro names: [%s]\n", strings.Join(invalidDistros, ","))
 	}
 	for _, distroName := range distros {
-		distribution := distroReg.GetDistro(distroName)
+		distribution := distroFac.GetDistro(distroName)
+		if distribution == nil {
+			fmt.Fprintf(os.Stderr, "WARNING: invalid distro name %q\n", distroName)
+			continue
+		}
 
 		distroArches, invalidArches := resolveArgValues(arches, distribution.ListArches())
 		if len(invalidArches) > 0 {
@@ -612,7 +589,10 @@ func main() {
 				}
 
 				// get repositories
-				repos := darm[distroName][archName]
+				repos, err := testedRepoRegistry.ReposByArchName(distroName, archName, true)
+				if err != nil {
+					panic(fmt.Sprintf("failed to get repositories for %s/%s: %v", distroName, archName, err))
+				}
 				repos = filterRepos(repos, imgTypeName)
 				if len(repos) == 0 {
 					fmt.Printf("no repositories defined for %s/%s/%s\n", distroName, archName, imgTypeName)

cmd/list-images/main.go

@@ -10,7 +10,8 @@ import (
 	"strings"
 
 	"github.com/gobwas/glob"
-	"github.com/osbuild/images/pkg/distroregistry"
+	"github.com/osbuild/images/pkg/distrofactory"
+	"github.com/osbuild/images/pkg/reporegistry"
 )
 
 type multiValue []string
@@ -74,15 +75,23 @@ func main() {
 	flag.BoolVar(&json, "json", false, "print configs as json")
 	flag.Parse()
 
-	distroReg := distroregistry.NewDefault()
-	distros, invalidDistros := resolveArgValues(distros, distroReg.List())
+	testedRepoRegistry, err := reporegistry.NewTestedDefault()
+	if err != nil {
+		panic(fmt.Sprintf("failed to create repo registry with tested distros: %v", err))
+	}
+	distroFac := distrofactory.NewDefault()
+	distros, invalidDistros := resolveArgValues(distros, testedRepoRegistry.ListDistros())
 	if len(invalidDistros) > 0 {
 		fmt.Fprintf(os.Stderr, "WARNING: invalid distro names: [%s]\n", strings.Join(invalidDistros, ","))
 	}
 
 	configs := make([]config, 0)
 	for _, distroName := range distros {
-		distribution := distroReg.GetDistro(distroName)
+		distribution := distroFac.GetDistro(distroName)
+		if distribution == nil {
+			fmt.Fprintf(os.Stderr, "WARNING: invalid distro name %q", distroName)
+			continue
+		}
 
 		distroArches, invalidArches := resolveArgValues(arches, distribution.ListArches())
 		if len(invalidArches) > 0 {

cmd/osbuild-composer-image-definitions/main.go

@@ -5,15 +5,26 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/osbuild/images/pkg/distroregistry"
+	"github.com/osbuild/images/pkg/distrofactory"
+	"github.com/osbuild/images/pkg/reporegistry"
 )
 
 func main() {
 	definitions := map[string]map[string][]string{}
-	distroRegistry := distroregistry.NewDefault()
+	distroFac := distrofactory.NewDefault()
+
+	testedRepoRegistry, err := reporegistry.NewTestedDefault()
+	if err != nil {
+		panic(fmt.Sprintf("failed to create repo registry with tested distros: %v", err))
+	}
+
+	for _, distroName := range testedRepoRegistry.ListDistros() {
+		distro := distroFac.GetDistro(distroName)
+		if distro == nil {
+			fmt.Fprintf(os.Stderr, "WARNING: invalid distro name %q", distroName)
+			continue
+		}
 
-	for _, distroName := range distroRegistry.List() {
-		distro := distroRegistry.GetDistro(distroName)
 		for _, archName := range distro.ListArches() {
 			arch, err := distro.GetArch(archName)
 			if err != nil {
@@ -28,7 +39,7 @@ func main() {
 	}
 
 	encoder := json.NewEncoder(os.Stdout)
-	err := encoder.Encode(definitions)
+	err = encoder.Encode(definitions)
 	if err != nil {
 		panic(err)
 	}

cmd/osbuild-dnf-json-tests/main_test.go

@@ -13,9 +13,10 @@ import (
 	"github.com/osbuild/images/pkg/arch"
 	"github.com/osbuild/images/pkg/blueprint"
 	"github.com/osbuild/images/pkg/distro"
-	rhel "github.com/osbuild/images/pkg/distro/rhel8"
+	"github.com/osbuild/images/pkg/distro/rhel9"
 	"github.com/osbuild/images/pkg/dnfjson"
 	"github.com/osbuild/images/pkg/ostree"
+	"github.com/osbuild/images/pkg/reporegistry"
 	"github.com/osbuild/images/pkg/rpmmd"
 )
 
@@ -27,20 +28,20 @@ func TestCrossArchDepsolve(t *testing.T) {
 	repoDir := "/usr/share/tests/osbuild-composer"
 
 	// NOTE: we can add RHEL, but don't make it hard requirement because it will fail outside of VPN
-	cs9 := rhel.NewCentos()
+	c9s := rhel9.DistroFactory("centos-9")
 
 	// Set up temporary directory for rpm/dnf cache
 	dir := t.TempDir()
 	baseSolver := dnfjson.NewBaseSolver(dir)
 
-	repos, err := rpmmd.LoadRepositories([]string{repoDir}, cs9.Name())
-	require.NoErrorf(t, err, "Failed to LoadRepositories %v", cs9.Name())
+	repos, err := reporegistry.LoadRepositories([]string{repoDir}, c9s.Name())
+	require.NoErrorf(t, err, "Failed to LoadRepositories %v", c9s.Name())
 
-	for _, archStr := range cs9.ListArches() {
+	for _, archStr := range c9s.ListArches() {
 		t.Run(archStr, func(t *testing.T) {
-			arch, err := cs9.GetArch(archStr)
+			arch, err := c9s.GetArch(archStr)
 			require.NoError(t, err)
-			solver := baseSolver.NewWithConfig(cs9.ModulePlatformID(), cs9.Releasever(), archStr, cs9.Name())
+			solver := baseSolver.NewWithConfig(c9s.ModulePlatformID(), c9s.Releasever(), archStr, c9s.Name())
 			for _, imgTypeStr := range arch.ListImageTypes() {
 				t.Run(imgTypeStr, func(t *testing.T) {
 					imgType, err := arch.GetImageType(imgTypeStr)
@@ -81,26 +82,26 @@ func TestDepsolvePackageSets(t *testing.T) {
 	repoDir := "/usr/share/tests/osbuild-composer"
 
 	// NOTE: we can add RHEL, but don't make it hard requirement because it will fail outside of VPN
-	cs9 := rhel.NewCentos()
+	c9s := rhel9.DistroFactory("centos-9")
 
 	// Set up temporary directory for rpm/dnf cache
 	dir := t.TempDir()
-	solver := dnfjson.NewSolver(cs9.ModulePlatformID(), cs9.Releasever(), arch.ARCH_X86_64.String(), cs9.Name(), dir)
+	solver := dnfjson.NewSolver(c9s.ModulePlatformID(), c9s.Releasever(), arch.ARCH_X86_64.String(), c9s.Name(), dir)
 
-	repos, err := rpmmd.LoadRepositories([]string{repoDir}, cs9.Name())
-	require.NoErrorf(t, err, "Failed to LoadRepositories %v", cs9.Name())
+	repos, err := reporegistry.LoadRepositories([]string{repoDir}, c9s.Name())
+	require.NoErrorf(t, err, "Failed to LoadRepositories %v", c9s.Name())
 	x86Repos, ok := repos[arch.ARCH_X86_64.String()]
-	require.Truef(t, ok, "failed to get %q repos for %q", arch.ARCH_X86_64.String(), cs9.Name())
+	require.Truef(t, ok, "failed to get %q repos for %q", arch.ARCH_X86_64.String(), c9s.Name())
 
-	x86Arch, err := cs9.GetArch(arch.ARCH_X86_64.String())
-	require.Nilf(t, err, "failed to get %q arch of %q distro", arch.ARCH_X86_64.String(), cs9.Name())
+	x86Arch, err := c9s.GetArch(arch.ARCH_X86_64.String())
+	require.Nilf(t, err, "failed to get %q arch of %q distro", arch.ARCH_X86_64.String(), c9s.Name())
 
 	qcow2ImageTypeName := "qcow2"
 	qcow2Image, err := x86Arch.GetImageType(qcow2ImageTypeName)
-	require.Nilf(t, err, "failed to get %q image type of %q/%q distro/arch", qcow2ImageTypeName, cs9.Name(), arch.ARCH_X86_64.String())
+	require.Nilf(t, err, "failed to get %q image type of %q/%q distro/arch", qcow2ImageTypeName, c9s.Name(), arch.ARCH_X86_64.String())
 
 	manifestSource, _, err := qcow2Image.Manifest(&blueprint.Blueprint{Packages: []blueprint.Package{{Name: "bind"}}}, distro.ImageOptions{}, x86Repos, 0)
-	require.Nilf(t, err, "failed to initialise manifest for %q image type of %q/%q distro/arch", qcow2ImageTypeName, cs9.Name(), arch.ARCH_X86_64.String())
+	require.Nilf(t, err, "failed to initialise manifest for %q image type of %q/%q distro/arch", qcow2ImageTypeName, c9s.Name(), arch.ARCH_X86_64.String())
 	imagePkgSets := manifestSource.GetPackageSetChains()
 
 	gotPackageSpecsSets := make(map[string][]rpmmd.PackageSpec, len(imagePkgSets))

cmd/osbuild-package-sets/main.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/osbuild/images/pkg/blueprint"
 	"github.com/osbuild/images/pkg/distro"
-	"github.com/osbuild/images/pkg/distroregistry"
+	"github.com/osbuild/images/pkg/distrofactory"
 	"github.com/osbuild/images/pkg/ostree"
 )
 
@@ -29,9 +29,9 @@ func main() {
 		os.Exit(1)
 	}
 
-	dr := distroregistry.NewDefault()
+	df := distrofactory.NewDefault()
 
-	d := dr.GetDistro(distroName)
+	d := df.GetDistro(distroName)
 	if d == nil {
 		panic(fmt.Errorf("Distro %q does not exist", distroName))
 	}