-
Notifications
You must be signed in to change notification settings - Fork 17
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
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
} | ||
|
||
// 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 | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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") | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
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.There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds fair :)
There was a problem hiding this comment.
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.