o/devicestate,o/snapstate: move the gadget.yaml check #7906
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
move the gadget.yaml check to its own checker that will be invoked both for install and refresh
stolowski
approved these changes
Dec 18, 2019
| @@ -202,11 +203,28 @@ func checkGadgetOrKernel(st *state.State, snapInfo, curInfo *snap.Info, _ snap.C | |||
| return nil | |||
| } | |||
|
|
|||
| func checkGadgetValid(st *state.State, snapInfo, _ *snap.Info, snapf snap.Container, flags snapstate.Flags, deviceCtx snapstate.DeviceContext) error { | |||
| if snapInfo.GetType() != snap.TypeGadget { | |||
| // not a gadget, nothing to do | |||
There was a problem hiding this comment.
This semantic was slightly surprising at first given the promise of the function name, but I see it's part of the general check snap callback chain, so it has to be that way.
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.
Move the gadget.yaml basic check to its own checker (checkGadgetValid in devicestate.go) that will be
invoked both for install and refresh. The current placement runs it only on refreshes.
To help write the test introduce snaptest.MockContainer.
drive-by: use gadget.ReadInfoFromSnapFile in checkGadgetRemodelCompatible