Linux: Check historic machine-id files #44
Merged
Conversation
This file contains 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
houndci-bot
reviewed
Mar 22, 2019
added 2 commits
March 22, 2019 14:32
andrewkroh
reviewed
Mar 25, 2019
| // These will be searched in order. | ||
| machineIDFiles = []string{"/etc/machine-id", "/var/lib/dbus/machine-id", "/var/db/dbus/machine-id"} | ||
| ) | ||
|
|
||
| func MachineID() (string, error) { |
There was a problem hiding this comment.
What do you think about adding machine-id files to the testdata directory? Then make this unit testable by adding a machineID(rootDir string) that enables a test to point this at a specific directory in testdata. MachineID() would call machineID("/").
There was a problem hiding this comment.
We certainly could. I assume it wouldn't do much more than ioutil.ReadFile() and string(bytes.TrimSpace()) though, so I'm not sure how much testing it actually achieves.
Thanks for merging!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Historically, the
machine-idwas not always in/etc/machine-id. On Ubuntu 14.04, it is still in/var/lib/dbus/machine-id. Another possible location is/var/db/dbus/machine-id.This checks these three locations in order and returns the first ID it finds.