o/snapstate: make names of fields in componentInstallTaskSet more exp…

…licit
canonical · Sep 12, 2024 · 9254023 · 9254023
1 parent 6d38bec
commit 9254023
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/overlord/snapstate/component.go b/overlord/snapstate/component.go
@@ -256,18 +256,18 @@ type componentInstallFlags struct {
 }
 
 type componentInstallTaskSet struct {
-	compSetupTaskID     string
-	beforeLink          []*state.Task
-	linkTask            *state.Task
-	postOpHookToDiscard []*state.Task
-	discardTask         *state.Task
+	compSetupTaskID        string
+	beforeLinkTasks        []*state.Task
+	linkTask               *state.Task
+	postHookToDiscardTasks []*state.Task
+	discardTask            *state.Task
 }
 
 func (c *componentInstallTaskSet) taskSet() *state.TaskSet {
-	tasks := make([]*state.Task, 0, len(c.beforeLink)+1+len(c.postOpHookToDiscard)+1)
-	tasks = append(tasks, c.beforeLink...)
+	tasks := make([]*state.Task, 0, len(c.beforeLinkTasks)+1+len(c.postHookToDiscardTasks)+1)
+	tasks = append(tasks, c.beforeLinkTasks...)
 	tasks = append(tasks, c.linkTask)
-	tasks = append(tasks, c.postOpHookToDiscard...)
+	tasks = append(tasks, c.postHookToDiscardTasks...)
 	if c.discardTask != nil {
 		tasks = append(tasks, c.discardTask)
 	}
@@ -345,13 +345,13 @@ func doInstallComponent(st *state.State, snapst *SnapState, compSetup ComponentS
 		compSetupTaskID: prepare.ID(),
 	}
 
-	componentTS.beforeLink = append(componentTS.beforeLink, prepare)
+	componentTS.beforeLinkTasks = append(componentTS.beforeLinkTasks, prepare)
 
 	if fromStore {
 		validate := st.NewTask("validate-component", fmt.Sprintf(
 			i18n.G("Fetch and check assertions for component %q%s"), compSetup.ComponentName(), revisionStr),
 		)
-		componentTS.beforeLink = append(componentTS.beforeLink, validate)
+		componentTS.beforeLinkTasks = append(componentTS.beforeLinkTasks, validate)
 		addTask(validate)
 	}
 
@@ -360,7 +360,7 @@ func doInstallComponent(st *state.State, snapst *SnapState, compSetup ComponentS
 		mount := st.NewTask("mount-component",
 			fmt.Sprintf(i18n.G("Mount component %q%s"),
 				compSi.Component, revisionStr))
-		componentTS.beforeLink = append(componentTS.beforeLink, mount)
+		componentTS.beforeLinkTasks = append(componentTS.beforeLinkTasks, mount)
 		addTask(mount)
 	} else {
 		if compSetup.RemoveComponentPath {
@@ -379,7 +379,7 @@ func doInstallComponent(st *state.State, snapst *SnapState, compSetup ComponentS
 
 	if !snapsup.Revert && compInstalled {
 		preRefreshHook := SetupPreRefreshComponentHook(st, snapsup.InstanceName(), compSi.Component.ComponentName)
-		componentTS.beforeLink = append(componentTS.beforeLink, preRefreshHook)
+		componentTS.beforeLinkTasks = append(componentTS.beforeLinkTasks, preRefreshHook)
 		addTask(preRefreshHook)
 	}
 
@@ -396,7 +396,7 @@ func doInstallComponent(st *state.State, snapst *SnapState, compSetup ComponentS
 		unlink := st.NewTask("unlink-current-component", fmt.Sprintf(i18n.G(
 			"Make current revision for component %q unavailable"),
 			compSi.Component))
-		componentTS.beforeLink = append(componentTS.beforeLink, unlink)
+		componentTS.beforeLinkTasks = append(componentTS.beforeLinkTasks, unlink)
 		addTask(unlink)
 	}
 
@@ -405,7 +405,7 @@ func doInstallComponent(st *state.State, snapst *SnapState, compSetup ComponentS
 		setupSecurity = st.NewTask("setup-profiles", fmt.Sprintf(i18n.G("Setup component %q%s security profiles"), compSi.Component, revisionStr))
 		setupSecurity.Set("component-setup-task", prepare.ID())
 		setupSecurity.Set("snap-setup-task", snapSetupTaskID)
-		componentTS.beforeLink = append(componentTS.beforeLink, setupSecurity)
+		componentTS.beforeLinkTasks = append(componentTS.beforeLinkTasks, setupSecurity)
 	}
 	if setupSecurity != nil {
 		// note that we don't use addTask here because this task is shared and
@@ -428,7 +428,7 @@ func doInstallComponent(st *state.State, snapst *SnapState, compSetup ComponentS
 	} else {
 		postOpHook = SetupPostRefreshComponentHook(st, snapsup.InstanceName(), compSi.Component.ComponentName)
 	}
-	componentTS.postOpHookToDiscard = append(componentTS.postOpHookToDiscard, postOpHook)
+	componentTS.postHookToDiscardTasks = append(componentTS.postHookToDiscardTasks, postOpHook)
 	addTask(postOpHook)
 
 	if !compSetup.MultiComponentInstall && kmodSetup == nil && compSetup.CompType == snap.KernelModulesComponent {
@@ -437,7 +437,7 @@ func doInstallComponent(st *state.State, snapst *SnapState, compSetup ComponentS
 				compSi.Component, revisionStr))
 		kmodSetup.Set("component-setup-task", prepare.ID())
 		kmodSetup.Set("snap-setup-task", snapSetupTaskID)
-		componentTS.postOpHookToDiscard = append(componentTS.postOpHookToDiscard, kmodSetup)
+		componentTS.postHookToDiscardTasks = append(componentTS.postHookToDiscardTasks, kmodSetup)
 	}
 	if kmodSetup != nil {
 		// note that we don't use addTask here because this task is shared and

diff --git a/overlord/snapstate/snapstate.go b/overlord/snapstate/snapstate.go
@@ -778,9 +778,9 @@ func splitComponentTasksForInstall(
 
 		compSetupIDs = append(compSetupIDs, componentTS.compSetupTaskID)
 
-		tasksBeforePreRefreshHook = append(tasksBeforePreRefreshHook, componentTS.beforeLink...)
+		tasksBeforePreRefreshHook = append(tasksBeforePreRefreshHook, componentTS.beforeLinkTasks...)
 		tasksAfterLinkSnap = append(tasksAfterLinkSnap, componentTS.linkTask)
-		tasksAfterPostOpHook = append(tasksAfterPostOpHook, componentTS.postOpHookToDiscard...)
+		tasksAfterPostOpHook = append(tasksAfterPostOpHook, componentTS.postHookToDiscardTasks...)
 		if componentTS.discardTask != nil {
 			tasksBeforeDiscard = append(tasksBeforeDiscard, componentTS.discardTask)
 		}