Refactor distros so we don't have to add a new one whenever it gets branched

cmd/build/main.go

@@ -15,7 +15,7 @@ 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/distrolist"
 	"github.com/osbuild/images/pkg/manifest"
 	"github.com/osbuild/images/pkg/osbuild"
 	"github.com/osbuild/images/pkg/ostree"
@@ -327,7 +327,7 @@ func main() {
 
 	seedArg := int64(0)
 	darm := readRepos()
-	distroReg := distroregistry.NewDefault()
+	distroReg := distrolist.NewDefault()
 
 	config := loadConfig(configFile)
 

cmd/gen-manifests/main.go

@@ -18,10 +18,10 @@ import (
 	"github.com/gobwas/glob"
 
 	"github.com/osbuild/images/internal/dnfjson"
+	"github.com/osbuild/images/internal/testdistrolist"
 	"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/manifest"
 	"github.com/osbuild/images/pkg/ostree"
 	"github.com/osbuild/images/pkg/rhsm/facts"
@@ -628,7 +628,7 @@ func main() {
 
 	seedArg := int64(0)
 	darm := readRepos()
-	distroReg := distroregistry.NewDefault()
+	distroReg := testdistrolist.New()
 	jobs := make([]manifestJob, 0)
 
 	contentResolve := map[string]bool{
@@ -644,7 +644,7 @@ func main() {
 	}
 
 	fmt.Println("Collecting jobs")
-	distros, invalidDistros := resolveArgValues(distros, distroReg.List())
+	distros, invalidDistros := resolveArgValues(distros, distroReg.ListTested())
 	if len(invalidDistros) > 0 {
 		fmt.Fprintf(os.Stderr, "WARNING: invalid distro names: [%s]\n", strings.Join(invalidDistros, ","))
 	}

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/internal/testdistrolist"
 )
 
 type multiValue []string
@@ -74,8 +75,8 @@ func main() {
 	flag.BoolVar(&json, "json", false, "print configs as json")
 	flag.Parse()
 
-	distroReg := distroregistry.NewDefault()
-	distros, invalidDistros := resolveArgValues(distros, distroReg.List())
+	distroReg := testdistrolist.New()
+	distros, invalidDistros := resolveArgValues(distros, distroReg.ListTested())
 	if len(invalidDistros) > 0 {
 		fmt.Fprintf(os.Stderr, "WARNING: invalid distro names: [%s]\n", strings.Join(invalidDistros, ","))
 	}

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

@@ -5,14 +5,14 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/osbuild/images/pkg/distroregistry"
+	"github.com/osbuild/images/internal/testdistrolist"
 )
 
 func main() {
 	definitions := map[string]map[string][]string{}
-	distroRegistry := distroregistry.NewDefault()
+	distroRegistry := testdistrolist.New()
 
-	for _, distroName := range distroRegistry.List() {
+	for _, distroName := range distroRegistry.ListTested() {
 		distro := distroRegistry.GetDistro(distroName)
 		for _, archName := range distro.ListArches() {
 			arch, err := distro.GetArch(archName)

cmd/osbuild-package-sets/main.go

@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/osbuild/images/internal/testdistrolist"
 	"github.com/osbuild/images/pkg/blueprint"
 	"github.com/osbuild/images/pkg/distro"
-	"github.com/osbuild/images/pkg/distroregistry"
 	"github.com/osbuild/images/pkg/ostree"
 )
 
@@ -29,7 +29,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	dr := distroregistry.NewDefault()
+	dr := testdistrolist.New()
 
 	d := dr.GetDistro(distroName)
 	if d == nil {

cmd/osbuild-pipeline/main.go

@@ -10,9 +10,10 @@ import (
 
 	"github.com/osbuild/images/internal/common"
 	"github.com/osbuild/images/internal/dnfjson"
+	"github.com/osbuild/images/internal/testdistrolist"
 	"github.com/osbuild/images/pkg/container"
 	"github.com/osbuild/images/pkg/distro"
-	"github.com/osbuild/images/pkg/distroregistry"
+	distrolist2 "github.com/osbuild/images/pkg/distrolist"
 	"github.com/osbuild/images/pkg/ostree"
 
 	"github.com/osbuild/images/pkg/blueprint"
@@ -111,11 +112,12 @@ func main() {
 		}
 	}
 
-	distros := distroregistry.NewDefault()
+	distros := distrolist2.NewDefault()
 	d := distros.GetDistro(composeRequest.Distro)
 	if d == nil {
-		_, _ = fmt.Fprintf(os.Stderr, "The provided distribution '%s' is not supported. Use one of these:\n", composeRequest.Distro)
-		for _, d := range distros.List() {
+		_, _ = fmt.Fprintf(os.Stderr, "The provided distribution '%s' is not supported. Use one of these (non-exhaustive list):\n", composeRequest.Distro)
+		dl := testdistrolist.New()
+		for _, d := range dl.ListTested() {
 			_, _ = fmt.Fprintln(os.Stderr, " *", d)
 		}
 		return

cmd/osbuild-playground/main.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/osbuild/images/internal/common"
 	"github.com/osbuild/images/pkg/distro"
-	"github.com/osbuild/images/pkg/distroregistry"
+	"github.com/osbuild/images/pkg/distrolist"
 	"github.com/osbuild/images/pkg/image"
 	"github.com/osbuild/images/pkg/rpmmd"
 )
@@ -72,12 +72,13 @@ func main() {
 		}
 	}
 
-	distros := distroregistry.NewDefault()
+	distros := distrolist.NewDefault()
 	var d distro.Distro
+	var err error
 	if distroArg == "host" {
-		d = distros.FromHost()
-		if d == nil {
-			panic("host distro not supported")
+		distroArg, _, _, err = common.GetHostDistroName()
+		if err != nil {
+			panic(fmt.Sprintf("cannot infer host distro: %v", err))
 		}
 	} else {
 		d = distros.GetDistro(distroArg)

internal/testdistrolist/distrolist.go

@@ -0,0 +1,38 @@
+package testdistrolist
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/osbuild/images/pkg/distrolist"
+)
+
+type DistroList struct {
+	distrolist.List
+}
+
+func New() DistroList {
+	return DistroList{
+		distrolist.NewDefault(),
+	}
+}
+
+func (l *DistroList) ListTested() []string {
+	files, err := os.ReadDir("test/data/repositories")
+	if err != nil {
+		panic(fmt.Sprintf("error when enumerating the test repositories: %v", err))
+	}
+
+	var distros []string
+	for _, f := range files {
+		if f.IsDir() {
+			continue
+		}
+
+		d := strings.TrimSuffix(f.Name(), ".json")
+		distros = append(distros, d)
+	}
+
+	return distros
+}

pkg/distro/fedora/distro.go

@@ -750,3 +750,16 @@ func newDistro(version int) distro.Distro {
 	rd.addArches(x86_64, aarch64)
 	return &rd
 }
+
+func New(idStr string) distro.Distro {
+	id, err := distro.ParseName(idStr)
+	if err != nil {
+		return nil
+	}
+
+	if id.Name != "fedora" {
+		return nil
+	}
+
+	return newDistro(id.MajorVersion)
+}

pkg/distro/id.go

@@ -0,0 +1,66 @@
+package distro
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+)
+
+type ID struct {
+	Name         string
+	MajorVersion int
+	MinorVersion int
+}
+
+type ParseError struct {
+	ToParse string
+	Msg     string
+	Inner   error
+}
+
+func (e ParseError) Error() string {
+	msg := fmt.Sprintf("error when parsing distro name (%s): %v", e.ToParse, e.Msg)
+
+	if e.Inner != nil {
+		msg += fmt.Sprintf(", inner error:\n%v", e.Inner)
+	}
+
+	return msg
+}
+
+func ParseName(id string) (ID, error) {
+	idParts := strings.Split(id, "-")
+
+	if len(idParts) > 2 {
+		return ID{}, ParseError{ToParse: id, Msg: fmt.Sprintf("too many dashes (%d)", len(idParts)-1)}
+	}
+
+	name := idParts[0]
+	version := idParts[1]
+
+	versionParts := strings.Split(version, ".")
+
+	if len(versionParts) > 2 {
+		return ID{}, ParseError{ToParse: id, Msg: fmt.Sprintf("too many dots in the version (%d)", len(versionParts)-1)}
+	}
+
+	majorVersion, err := strconv.Atoi(versionParts[0])
+	if err != nil {
+		return ID{}, ParseError{ToParse: id, Msg: "parsing major version failed", Inner: err}
+	}
+
+	var minorVersion int
+
+	if len(versionParts) > 1 {
+		minorVersion, err = strconv.Atoi(versionParts[1])
+		if err != nil {
+			return ID{}, ParseError{ToParse: id, Msg: "parsing minor version failed", Inner: err}
+		}
+	}
+
+	return ID{
+		Name:         name,
+		MajorVersion: majorVersion,
+		MinorVersion: minorVersion,
+	}, nil
+}

pkg/distro/rhel7/distro.go

@@ -233,3 +233,19 @@ func newDistro(distroName string) distro.Distro {
 
 	return &rd
 }
+
+func NewFromID(idStr string) distro.Distro {
+	id, err := distro.ParseName(idStr)
+	if err != nil {
+		return nil
+	}
+	if id.Name != "rhel" {
+		return nil
+	}
+
+	if id.MajorVersion != 7 {
+		return nil
+	}
+
+	return newDistro("rhel-7")
+}

pkg/distro/rhel8/distro.go

@@ -512,3 +512,30 @@ func newDistro(name string, minor int) *distribution {
 	rd.addArches(x86_64, aarch64, ppc64le)
 	return &rd
 }
+
+func NewFromID(idStr string) distro.Distro {
+	id, err := distro.ParseName(idStr)
+	if err != nil {
+		return nil
+	}
+
+	// compat for rhel-84 and friends
+	if id.MajorVersion >= 80 && id.MajorVersion < 90 {
+		id.MinorVersion = id.MajorVersion % 10
+		id.MajorVersion = 8
+	}
+
+	if id.MajorVersion != 8 {
+		return nil
+	}
+
+	if id.Name == "centos" {
+		return NewCentos()
+	}
+
+	if id.Name != "rhel" {
+		return nil
+	}
+
+	return newDistro("rhel", id.MinorVersion)
+}

pkg/distro/rhel9/distro.go

@@ -487,3 +487,30 @@ func newDistro(name string, minor int) *distribution {
 	rd.addArches(x86_64, aarch64, ppc64le, s390x)
 	return &rd
 }
+
+func NewFromID(idStr string) distro.Distro {
+	id, err := distro.ParseName(idStr)
+	if err != nil {
+		return nil
+	}
+
+	// compat for rhel-94 and friends
+	if id.MajorVersion >= 90 && id.MajorVersion < 100 {
+		id.MinorVersion = id.MajorVersion % 10
+		id.MajorVersion = 9
+	}
+
+	if id.MajorVersion != 9 {
+		return nil
+	}
+
+	if id.Name == "centos" {
+		return NewCentOS9()
+	}
+
+	if id.Name != "rhel" {
+		return nil
+	}
+
+	return newDistro("rhel", id.MinorVersion)
+}