daemon, snapstate: move ensureCore from daemon/api.go into snapstate.go

daemon/api.go

@@ -828,7 +828,6 @@ func (inst *snapInstruction) installFlags() (snapstate.Flags, error) {
 }
 
 var (
-	snapstateCoreInfo          = snapstate.CoreInfo
 	snapstateInstall           = snapstate.Install
 	snapstateInstallPath       = snapstate.InstallPath
 	snapstateRefreshCandidates = snapstate.RefreshCandidates
@@ -851,42 +850,6 @@ var ensureStateSoon = ensureStateSoonImpl
 
 var errNothingToInstall = errors.New("nothing to install")
 
-const oldDefaultSnapCoreName = "ubuntu-core"
-const defaultCoreSnapName = "core"
-
-func ensureCore(st *state.State, targetSnap string, userID int) (*state.TaskSet, error) {
-	if targetSnap == defaultCoreSnapName || targetSnap == oldDefaultSnapCoreName {
-		return nil, errNothingToInstall
-	}
-
-	_, err := snapstateCoreInfo(st)
-	if err != state.ErrNoState {
-		return nil, err
-	}
-
-	return snapstateInstall(st, defaultCoreSnapName, "stable", snap.R(0), userID, snapstate.Flags{})
-}
-
-func withEnsureCore(st *state.State, targetSnap string, userID int, install func() (*state.TaskSet, error)) ([]*state.TaskSet, error) {
-	ubuCoreTs, err := ensureCore(st, targetSnap, userID)
-	if err != nil && err != errNothingToInstall {
-		return nil, err
-	}
-
-	ts, err := install()
-	if err != nil {
-		return nil, err
-	}
-
-	// ensure main install waits on ubuntu core install
-	if ubuCoreTs != nil {
-		ts.WaitAll(ubuCoreTs)
-		return []*state.TaskSet{ubuCoreTs, ts}, nil
-	}
-
-	return []*state.TaskSet{ts}, nil
-}
-
 var errDevJailModeConflict = errors.New("cannot use devmode and jailmode flags together")
 var errClassicDevmodeConflict = errors.New("cannot use classic and devmode flags together")
 var errNoJailMode = errors.New("this system cannot honour the jailmode flag")
@@ -984,11 +947,7 @@ func snapInstall(inst *snapInstruction, st *state.State) (string, []*state.TaskS
 
 	logger.Noticef("Installing snap %q revision %s", inst.Snaps[0], inst.Revision)
 
-	tsets, err := withEnsureCore(st, inst.Snaps[0], inst.userID,
-		func() (*state.TaskSet, error) {
-			return snapstateInstall(st, inst.Snaps[0], inst.Channel, inst.Revision, inst.userID, flags)
-		},
-	)
+	tset, err := snapstateInstall(st, inst.Snaps[0], inst.Channel, inst.Revision, inst.userID, flags)
 	if err != nil {
 		return "", nil, err
 	}
@@ -997,7 +956,7 @@ func snapInstall(inst *snapInstruction, st *state.State) (string, []*state.TaskS
 	if inst.Channel != "stable" && inst.Channel != "" {
 		msg = fmt.Sprintf(i18n.G("Install %q snap from %q channel"), inst.Snaps[0], inst.Channel)
 	}
-	return msg, tsets, nil
+	return msg, []*state.TaskSet{tset}, nil
 }
 
 func snapUpdate(inst *snapInstruction, st *state.State) (string, []*state.TaskSet, error) {
@@ -1242,21 +1201,13 @@ func trySnap(c *Command, r *http.Request, user *auth.UserState, trydir string, f
 		return BadRequest("cannot read snap info for %s: %s", trydir, err)
 	}
 
-	var userID int
-	if user != nil {
-		userID = user.ID
-	}
-	tsets, err := withEnsureCore(st, info.Name(), userID,
-		func() (*state.TaskSet, error) {
-			return snapstateTryPath(st, info.Name(), trydir, flags)
-		},
-	)
+	tset, err := snapstateTryPath(st, info.Name(), trydir, flags)
 	if err != nil {
 		return BadRequest("cannot try %s: %s", trydir, err)
 	}
 
 	msg := fmt.Sprintf(i18n.G("Try %q snap from %s"), info.Name(), trydir)
-	chg := newChange(st, "try-snap", msg, tsets, []string{info.Name()})
+	chg := newChange(st, "try-snap", msg, []*state.TaskSet{tset}, []string{info.Name()})
 	chg.Set("api-data", map[string]string{"snap-name": info.Name()})
 
 	ensureStateSoon(st)
@@ -1467,21 +1418,12 @@ out:
 		msg = fmt.Sprintf(i18n.G("Install %q snap from file %q"), snapName, origPath)
 	}
 
-	var userID int
-	if user != nil {
-		userID = user.ID
-	}
-
-	tsets, err := withEnsureCore(st, snapName, userID,
-		func() (*state.TaskSet, error) {
-			return snapstateInstallPath(st, sideInfo, tempPath, "", flags)
-		},
-	)
+	tset, err := snapstateInstallPath(st, sideInfo, tempPath, "", flags)
 	if err != nil {
 		return InternalError("cannot install snap file: %v", err)
 	}
 
-	chg := newChange(st, "install-snap", msg, tsets, []string{snapName})
+	chg := newChange(st, "install-snap", msg, []*state.TaskSet{tset}, []string{snapName})
 	chg.Set("api-data", map[string]string{"snap-name": snapName})
 
 	ensureStateSoon(st)