Skip to content

Add an arch package #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PKGS := release stream fedoracoreos
PKGS := arch release stream fedoracoreos

build:
for pkg in $(PKGS); do (cd $$pkg && go build -mod=vendor); done
Expand Down
48 changes: 48 additions & 0 deletions arch/arch.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
// package arch contains mappings between the Golang architecture and
// the RPM architecture used by Fedora CoreOS and derivatives.
package arch

import "runtime"

type mapping struct {
rpmArch string
goArch string
}

// If an architecture isn't defined here, we assume it's
// pass through.
var translations = []mapping{
{
rpmArch: "x86_64",
goArch: "amd64",
},
{
rpmArch: "aarch64",
goArch: "arm64",
},
}

// CurrentRpmArch returns the current architecture in RPM terms.
func CurrentRpmArch() string {
return RpmArch(runtime.GOARCH)
}

// RpmArch translates a Go architecture to RPM.
func RpmArch(goarch string) string {
for _, m := range translations {
if m.goArch == goarch {
return m.rpmArch
}
}
return goarch
Copy link
Member

@kelvinfan001 kelvinfan001 Jan 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe this isn't a concern, but would the "pass through" assumption be potentially deceiving? e.g. one would assume whatever comes out of the RpmArch function is definitely an RPM Arch.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's definitely a concern! The downside is that we'd need to maintain an exhaustive list here of all architectures to validate it, I didn't think that was worth the maintenance overhead.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds fair :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A good example is I notice the coreos-assembler code is already missing RISC-V and...honestly I'm not sure if that matches or not. OK looks like the Go arch is riscv64 and the RPM one is (time passes while I dig in links from here) that too! Hooray.

}

// GoArch translates an RPM architecture to Go.
func GoArch(rpmarch string) string {
for _, m := range translations {
if m.rpmArch == rpmarch {
return m.goArch
}
}
return rpmarch
}
19 changes: 19 additions & 0 deletions arch/arch_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// package arch contains mappings between the Golang architecture and
// the RPM architecture used by Fedora CoreOS and derivatives.
package arch

import (
"runtime"
"testing"

"github.com/stretchr/testify/assert"
)

func TestMapping(t *testing.T) {
// Validate bidirectional mapping for current architecture
assert.Equal(t, GoArch(CurrentRpmArch()), runtime.GOARCH)

assert.Equal(t, GoArch("x86_64"), "amd64")
assert.Equal(t, GoArch("aarch64"), "arm64")
assert.Equal(t, GoArch("ppc64le"), "ppc64le")
}