cmd: add snap debug validate-seed <path> cmd
#6771
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
We had a bug where one of the recent livecd-rootfs build images had an incorrect seed.yaml. This caused a panic of snapd on when seeding. To prevent this here is a small helper that we can run inside livecd-rootfs to ensure seed.yaml is good enough to not crash snapd.
mvo5
changed the title
snap debug validate-seed <path> cmd
bboozzoo
reviewed
Apr 25, 2019
| } | ||
|
|
||
| func init() { | ||
| cmd := addDebugCommand("validate-seed", |
There was a problem hiding this comment.
Not sure, feel a bit long but I don't really mind strongly either way. Its a debug command after all :)
stolowski
reviewed
Apr 25, 2019
| return ErrExtraArgs | ||
| } | ||
|
|
||
| if _, err := snap.ReadSeedYaml(x.Positionals.SeedYamlPath); err != nil { |
There was a problem hiding this comment.
Not super important, but would it make sense to make seed yaml path argument optional, and use the default /var/lib/snapd/.../seed.yaml path if not provided, for convienience?
There was a problem hiding this comment.
I like the idea, but I'm also a bit lazy :) We could do it in a followup.
The current code in ReadSeedYaml is not doing much validation and missing or invalid elements will be caught only (much) later. This commit adds some basic validations to the read of the seed.yaml.
stolowski
approved these changes
Apr 25, 2019
snap/seed_yaml.go
Outdated
| yamlData, err := ioutil.ReadFile(fn) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("cannot read seed yaml: %s", fn) | ||
| return nil, fmt.Errorf(errPrefix+"%v", err) |
There was a problem hiding this comment.
Nitpick: looks a bit weird to concatenate errorPrefix that way when using fmt formatting anyway, why not simply fmt.Errorf("%s%v", errorPrefix, err) (also below)?
| if err := ValidateInstanceName(sn.Name); err != nil { | ||
| return nil, fmt.Errorf(errPrefix+"%v", err) | ||
| } | ||
| if sn.Channel != "" { |
|
Shall we land it? |
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.
We had a bug where one of the recent livecd-rootfs build images
had an incorrect seed.yaml. This caused a panic of snapd on when
seeding. To prevent this here is a small helper that we can run
inside livecd-rootfs to ensure seed.yaml is good enough to not
crash snapd.
This is for https://bugs.launchpad.net/ubuntu/+source/livecd-rootfs/+bug/1825437