diff --git a/cmd/osbuild-dnf-json-tests/main_test.go b/cmd/osbuild-dnf-json-tests/main_test.go index 0ff22b62c..d51c3f97d 100644 --- a/cmd/osbuild-dnf-json-tests/main_test.go +++ b/cmd/osbuild-dnf-json-tests/main_test.go @@ -61,7 +61,7 @@ func TestCrossArchDepsolve(t *testing.T) { // for the remaining distros continue } - for _, archStr := range distroStruct.ListArchs() { + for _, archStr := range distroStruct.ListArches() { arch, err := distroStruct.GetArch(archStr) assert.Nilf(t, err, "Failed to GetArch from %v structure: %v", distroStruct.Name(), err) if err != nil { diff --git a/cmd/osbuild-pipeline/main.go b/cmd/osbuild-pipeline/main.go index bc56069bb..7d93ea676 100644 --- a/cmd/osbuild-pipeline/main.go +++ b/cmd/osbuild-pipeline/main.go @@ -88,7 +88,7 @@ func main() { arch, err := distro.GetArch(composeRequest.Arch) if err != nil { fmt.Fprintf(os.Stderr, "The provided architecture '%s' is not supported by %s. Use one of these:\n", composeRequest.Arch, distro.Name()) - for _, a := range distro.ListArchs() { + for _, a := range distro.ListArches() { _, _ = fmt.Fprintln(os.Stderr, " *", a) } return diff --git a/internal/distro/distro.go b/internal/distro/distro.go index 07144706d..d3d5d7ecf 100644 --- a/internal/distro/distro.go +++ b/internal/distro/distro.go @@ -26,7 +26,7 @@ type Distro interface { // Returns a sorted list of the names of the architectures this distro // supports. - ListArchs() []string + ListArches() []string // Returns an object representing the given architecture as support // by this distro. diff --git a/internal/distro/fedora30/distro.go b/internal/distro/fedora30/distro.go index 81d607690..a9fc0c1ec 100644 --- a/internal/distro/fedora30/distro.go +++ b/internal/distro/fedora30/distro.go @@ -48,7 +48,7 @@ type imageType struct { assembler func(uefi bool, size uint64) *osbuild.Assembler } -func (d *Fedora30) ListArchs() []string { +func (d *Fedora30) ListArches() []string { archs := make([]string, 0, len(d.arches)) for name := range d.arches { archs = append(archs, name) diff --git a/internal/distro/fedora30/distro_test.go b/internal/distro/fedora30/distro_test.go index b1d3bb9d0..3775277eb 100644 --- a/internal/distro/fedora30/distro_test.go +++ b/internal/distro/fedora30/distro_test.go @@ -121,7 +121,7 @@ func TestImageType_BuildPackages(t *testing.T) { "aarch64": aarch64BuildPackages, } d := fedora30.New() - for _, archLabel := range d.ListArchs() { + for _, archLabel := range d.ListArches() { archStruct, err := d.GetArch(archLabel) if err != nil { t.Errorf("d.GetArch(%v) returned err = %v; expected nil", archLabel, err) diff --git a/internal/distro/fedora31/distro.go b/internal/distro/fedora31/distro.go index 2d147249d..9201479d0 100644 --- a/internal/distro/fedora31/distro.go +++ b/internal/distro/fedora31/distro.go @@ -47,7 +47,7 @@ type arch struct { imageTypes map[string]imageType } -func (d *Fedora31) ListArchs() []string { +func (d *Fedora31) ListArches() []string { archs := make([]string, 0, len(d.arches)) for name := range d.arches { archs = append(archs, name) diff --git a/internal/distro/fedora31/distro_test.go b/internal/distro/fedora31/distro_test.go index 2b2bf6d2a..e28123be3 100644 --- a/internal/distro/fedora31/distro_test.go +++ b/internal/distro/fedora31/distro_test.go @@ -121,7 +121,7 @@ func TestImageType_BuildPackages(t *testing.T) { "aarch64": aarch64BuildPackages, } d := fedora31.New() - for _, archLabel := range d.ListArchs() { + for _, archLabel := range d.ListArches() { archStruct, err := d.GetArch(archLabel) if err != nil { t.Errorf("d.GetArch(%v) returned err = %v; expected nil", archLabel, err) diff --git a/internal/distro/fedora32/distro.go b/internal/distro/fedora32/distro.go index 0fbdbd3d7..ae1ec56a2 100644 --- a/internal/distro/fedora32/distro.go +++ b/internal/distro/fedora32/distro.go @@ -48,7 +48,7 @@ type imageType struct { assembler func(uefi bool, size uint64) *osbuild.Assembler } -func (d *Fedora32) ListArchs() []string { +func (d *Fedora32) ListArches() []string { archs := make([]string, 0, len(d.arches)) for name := range d.arches { archs = append(archs, name) diff --git a/internal/distro/fedora32/distro_test.go b/internal/distro/fedora32/distro_test.go index 40ad6f0a3..7dff248ef 100644 --- a/internal/distro/fedora32/distro_test.go +++ b/internal/distro/fedora32/distro_test.go @@ -121,7 +121,7 @@ func TestImageType_BuildPackages(t *testing.T) { "aarch64": aarch64BuildPackages, } d := fedora32.New() - for _, archLabel := range d.ListArchs() { + for _, archLabel := range d.ListArches() { archStruct, err := d.GetArch(archLabel) if err != nil { t.Errorf("d.GetArch(%v) returned err = %v; expected nil", archLabel, err) diff --git a/internal/distro/fedoratest/distro.go b/internal/distro/fedoratest/distro.go index 72c6ade49..1fbe1620a 100644 --- a/internal/distro/fedoratest/distro.go +++ b/internal/distro/fedoratest/distro.go @@ -24,7 +24,7 @@ type fedoraTestDistroImageType struct { arch *fedoraTestDistroArch } -func (d *FedoraTestDistro) ListArchs() []string { +func (d *FedoraTestDistro) ListArches() []string { return []string{"x86_64"} } diff --git a/internal/distro/rhel81/distro.go b/internal/distro/rhel81/distro.go index e1f082ead..5c71da16b 100644 --- a/internal/distro/rhel81/distro.go +++ b/internal/distro/rhel81/distro.go @@ -57,7 +57,7 @@ type rhel81ImageType struct { imageType *imageType } -func (d *RHEL81) ListArchs() []string { +func (d *RHEL81) ListArches() []string { archs := make([]string, 0, len(d.arches)) for name := range d.arches { archs = append(archs, name) diff --git a/internal/distro/rhel82/distro.go b/internal/distro/rhel82/distro.go index f9d85f17d..90ad1aa14 100644 --- a/internal/distro/rhel82/distro.go +++ b/internal/distro/rhel82/distro.go @@ -57,7 +57,7 @@ type rhel82ImageType struct { imageType *imageType } -func (d *RHEL82) ListArchs() []string { +func (d *RHEL82) ListArches() []string { archs := make([]string, 0, len(d.arches)) for name := range d.arches { archs = append(archs, name) diff --git a/internal/distro/test/distro.go b/internal/distro/test/distro.go index 80f860af4..1e85601f2 100644 --- a/internal/distro/test/distro.go +++ b/internal/distro/test/distro.go @@ -16,7 +16,7 @@ type testImageType struct{} const name = "test-distro" const modulePlatformID = "platform:test" -func (d *TestDistro) ListArchs() []string { +func (d *TestDistro) ListArches() []string { return []string{"test_arch"} }