lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util: distro: Rename functions to avoid golang stutter warning

Browse Source
This commit is contained in:
James Shubin
2024-10-25 02:56:12 -04:00
parent 85e1d6c0e8
commit 583f90dc7b
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/resources/virt_builder.go
View File

@@ -206,7 +206,7 @@ func (obj *VirtBuilderRes) getGuestfs() ([]string, error) {
return nil, nil return nil, nil
} }
packages, exists := distroUtil.DistroToGuestfsPackages(distro) packages, exists := distroUtil.ToGuestfsPackages(distro)
if !exists { if !exists {
// TODO: patches welcome! // TODO: patches welcome!
return nil, fmt.Errorf("os/version is not supported") return nil, fmt.Errorf("os/version is not supported")
@@ -220,7 +220,7 @@ func (obj *VirtBuilderRes) getGuestfs() ([]string, error) {
func (obj *VirtBuilderRes) getDeps() ([]string, error) { func (obj *VirtBuilderRes) getDeps() ([]string, error) {
// TODO: Improve this function as things evolve. // TODO: Improve this function as things evolve.
distro := strings.TrimSuffix(obj.OSVersion, "-") // fedora- or debian- distro := strings.TrimSuffix(obj.OSVersion, "-") // fedora- or debian-
packages, exists := distroUtil.DistroToBootstrapPackages(distro) packages, exists := distroUtil.ToBootstrapPackages(distro)
if !exists { if !exists {
// TODO: patches welcome! // TODO: patches welcome!
return nil, fmt.Errorf("os version is not supported") return nil, fmt.Errorf("os version is not supported")

2
lang/core/deploy/bootstrap_packages_func.go
View File

@@ -49,7 +49,7 @@ func init() {
// for bootstrapping new machines which will need these installed before they // for bootstrapping new machines which will need these installed before they
// can run mgmt. // can run mgmt.
func BootstrapPackages(ctx context.Context, input []types.Value) (types.Value, error) { func BootstrapPackages(ctx context.Context, input []types.Value) (types.Value, error) {
packages, exists := distroUtil.DistroToBootstrapPackages(input[0].Str()) packages, exists := distroUtil.ToBootstrapPackages(input[0].Str())
if !exists { if !exists {
return nil, fmt.Errorf("missing distro") return nil, fmt.Errorf("missing distro")
} }

14
util/distro/distro.go
View File

@@ -85,17 +85,17 @@ var (
} }
) )
// DistroToBootstrapPackages returns the list of packages corresponding to the // ToBootstrapPackages returns the list of packages corresponding to the distro
// distro for bootstrapping. This returns false if the value doesn't exist. // for bootstrapping. This returns false if the value doesn't exist.
func DistroToBootstrapPackages(distro string) ([]string, bool) { func ToBootstrapPackages(distro string) ([]string, bool) {
l, exists := MapDistroToBootstrapPackages[distro] l, exists := MapDistroToBootstrapPackages[distro]
return l, exists return l, exists
} }
// DistroToGuestfsPackages returns the list of packages corresponding to the // ToGuestfsPackages returns the list of packages corresponding to the distro
// distro for running the virt-builder software and guestfs suite. This returns // for running the virt-builder software and guestfs suite. This returns false
// false if the value doesn't exist. // if the value doesn't exist.
func DistroToGuestfsPackages(distro string) ([]string, bool) { func ToGuestfsPackages(distro string) ([]string, bool) {
l, exists := MapDistroToGuestfsPackages[distro] l, exists := MapDistroToGuestfsPackages[distro]
return l, exists return l, exists
} }