util: distro: Put distro specific data in this util package

Try and see if we can put all our distro specific stuff in here...

engine/resources/virt_builder.go

@@ -48,6 +48,7 @@ import (
 	"github.com/purpleidea/mgmt/engine"
 	"github.com/purpleidea/mgmt/engine/traits"
 	archUtil "github.com/purpleidea/mgmt/util/arch"
+	distroUtil "github.com/purpleidea/mgmt/util/distro"
 	"github.com/purpleidea/mgmt/util/errwrap"
 	"github.com/purpleidea/mgmt/util/recwatch"
 )
@@ -217,25 +218,14 @@ func (obj *VirtBuilderRes) getGuestfs() (string, error) {
 // that we can easily run mgmt.
 func (obj *VirtBuilderRes) getDeps() ([]string, error) {
 	// TODO: Improve this function as things evolve.
-
+	distro := strings.TrimSuffix(obj.OSVersion, "-") // fedora- or debian-
-	if strings.HasPrefix(obj.OSVersion, "fedora-") {
+	packages, exists := distroUtil.DistroToBootstrapPackages(distro)
-		return []string{
+	if !exists {
-			"augeas-devel",
+		// TODO: patches welcome!
-			"libvirt-devel",
+		return nil, fmt.Errorf("os version is not supported")
-			"PackageKit",
-		}, nil
 	}
 
-	if strings.HasPrefix(obj.OSVersion, "debian-") {
+	return packages, nil
-		return []string{
-			"libaugeas-dev",
-			"libvirt-dev",
-			"packagekit-tools",
-		}, nil
-	}
-
-	// TODO: patches welcome!
-	return nil, fmt.Errorf("os version is not supported")
 }
 
 // Default returns some sensible defaults for this resource.

util/distro/distro.go

@@ -0,0 +1,57 @@
+// Mgmt
+// Copyright (C) 2013-2024+ James Shubin and the project contributors
+// Written by James Shubin <james@shubin.ca> and the project contributors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+//
+// Additional permission under GNU GPL version 3 section 7
+//
+// If you modify this program, or any covered work, by linking or combining it
+// with embedded mcl code and modules (and that the embedded mcl code and
+// modules which link with this program, contain a copy of their source code in
+// the authoritative form) containing parts covered by the terms of any other
+// license, the licensors of this program grant you additional permission to
+// convey the resulting work. Furthermore, the licensors of this program grant
+// the original author, James Shubin, additional permission to update this
+// additional permission if he deems it necessary to achieve the goals of this
+// additional permission.
+
+// Package distro is for utilities that deal with os/distro things. Best to keep
+// these all in one place so that adding this data happens all in the same file.
+package distro
+
+var (
+	// MapDistroToBootstrapPackages is a map of distro to packages needed to
+	// run our software.
+	MapDistroToBootstrapPackages = map[string][]string{
+		// TODO: add more values
+		"debian": {
+			"libaugeas-dev",
+			"libvirt-dev",
+			"packagekit-tools",
+		},
+		"fedora": {
+			"augeas-devel",
+			"libvirt-devel",
+			"PackageKit",
+		},
+	}
+)
+
+// DistroToBootstrapPackages returns the list of packages corresponding to the
+// distro for bootstrapping. This returns false if the value doesn't exist.
+func DistroToBootstrapPackages(distro string) ([]string, bool) {
+	l, exists := MapDistroToBootstrapPackages[distro]
+	return l, exists
+}