o/snapstate: respect validation sets when refreshing and installing components with snaps

overlord/snapstate/backend_test.go

@@ -197,6 +197,16 @@ type fakeStore struct {
 	snapResourcesFn func(*snap.Info) []store.SnapResourceResult
 
 	downloadCallback func()
+
+	namesToAssertedIDs map[string]string
+	idsToNames         map[string]string
+
+	mutateSnapInfo func(*snap.Info) error
+}
+
+func (f *fakeStore) registerID(name, id string) {
+	f.namesToAssertedIDs[name] = id
+	f.idsToNames[id] = name
 }
 
 func (f *fakeStore) snapResources(info *snap.Info) []store.SnapResourceResult {
@@ -263,7 +273,12 @@ func (f *fakeStore) snap(spec snapSpec) (*snap.Info, error) {
 
 	typ := snap.TypeApp
 	epoch := snap.E("1*")
+
 	snapID := spec.Name + "-id"
+	if id, ok := f.namesToAssertedIDs[spec.Name]; ok {
+		snapID = id
+	}
+
 	switch spec.Name {
 	case "core", "core16", "ubuntu-core", "some-core":
 		typ = snap.TypeOS
@@ -422,6 +437,12 @@ func (f *fakeStore) snap(spec snapSpec) (*snap.Info, error) {
 		info.SnapProvenance = "prov"
 	}
 
+	if f.mutateSnapInfo != nil {
+		if err := f.mutateSnapInfo(info); err != nil {
+			return nil, err
+		}
+	}
+
 	return info, nil
 }
 
@@ -535,7 +556,10 @@ func (f *fakeStore) lookupRefresh(cand refreshCand) (*snap.Info, error) {
 		name = "kernel-snap-with-components"
 		typ = snap.TypeKernel
 	default:
-		panic(fmt.Sprintf("refresh: unknown snap-id: %s", cand.snapID))
+		name = f.idsToNames[cand.snapID]
+		if name == "" {
+			panic(fmt.Sprintf("refresh: unknown snap-id: %s", cand.snapID))
+		}
 	}
 
 	revno := snap.R(11)
@@ -649,6 +673,12 @@ func (f *fakeStore) lookupRefresh(cand refreshCand) (*snap.Info, error) {
 		}
 	}
 
+	if f.mutateSnapInfo != nil {
+		if err := f.mutateSnapInfo(info); err != nil {
+			return nil, err
+		}
+	}
+
 	var hit snap.Revision
 	if cand.revision != revno {
 		hit = revno

overlord/snapstate/snapmgr.go

@@ -699,6 +699,24 @@
 	return snap.InstanceName(cur.RealName, snapst.InstanceKey)
 }
 
+// SnapName returns the name of the snap. Implementation of naming.SnapRef.
+func (snapst *SnapState) SnapName() string {
+	cur := snapst.CurrentSideInfo()
+	if cur == nil {
+		return ""
+	}
+	return cur.RealName
+}
+
+// ID returns the ID of the snap. Implementation of naming.SnapRef.
+func (snapst *SnapState) ID() string {
+	cur := snapst.CurrentSideInfo()
+	if cur == nil {
+		return ""
+	}
+	return cur.SnapID
+}
+
 // RefreshInhibitProceedTime is the time after which a pending refresh is forced
 // for a running snap in the next auto-refresh. Zero time indicates that there
 // are no pending refreshes. st must be locked.

overlord/snapstate/snapstate.go

@@ -2167,8 +2167,6 @@ func doUpdate(st *state.State, requested []string, updates []update, opts Option
 		// re-refresh check
 		needsRerefreshCheck = true
 
-		// TODO:COMPS: we need to handle components here too
-
 		// Do not set any default restart boundaries, we do it when we have access to all
 		// the task-sets in preparation for single-reboot.
 		ts, err := doInstall(st, &up.SnapState, up.Setup, up.Components, noRestartBoundaries, opts.FromChange, inUseFor(opts.DeviceCtx))