many: simplify changes

Author: Meulengracht

boot/assets.go

@@ -509,8 +509,6 @@ type TrustedAssetsUpdateObserver struct {
 	modeenvLocked bool
 }
 
-var _ gadget.ContentUpdateObserver = (*TrustedAssetsUpdateObserver)(nil)
-
 func doUpdateBootEntry(efiBl bootloader.UefiBootloader, updatedAssets []string) error {
 	description, assetPath, optionalData, err := efiBl.ParametersForEfiLoadOption(updatedAssets)
 	if err != nil {
@@ -541,10 +539,6 @@ func (o *TrustedAssetsUpdateObserver) UpdateBootEntry() error {
 	return doUpdateBootEntry(efiBl, updatedAssets)
 }
 
-func (o *TrustedAssetsUpdateObserver) UpdateApplied() error {
-	return o.UpdateBootEntry()
-}
-
 // Done must be called when done with the observer if any of the
 // gadget.ContenUpdateObserver methods might have been called.
 func (o *TrustedAssetsUpdateObserver) Done() {

gadget/mountedfilesystem_test.go

@@ -969,21 +969,6 @@ func (m *mockContentUpdateObserver) Observe(op gadget.ContentOperation, partRole
 	return gadget.ChangeApply, nil
 }
 
-func (m *mockContentUpdateObserver) BeforeWrite() error {
-	return nil
-}
-
-func (m *mockContentUpdateObserver) Canceled() error {
-	return nil
-}
-
-func (m *mockContentUpdateObserver) UpdateApplied() error {
-	return nil
-}
-
-func (m *mockContentUpdateObserver) Done() {
-}
-
 func (s *mountedfilesystemTestSuite) TestMountedUpdaterBackupSimple(c *C) {
 	// some data for the gadget
 	gdWritten := []gadgetData{

gadget/update.go

@@ -124,11 +124,6 @@ type ContentUpdateObserver interface {
 	// Canceled is called when the update has been canceled, or if changes
 	// were written and the update has been reverted.
 	Canceled() error
-	// UpdateApplied is called after a successful update has been written to
-	// disk and before the update is considered complete.
-	UpdateApplied() error
-	// Done is called when the observer is no longer needed.
-	Done()
 }
 
 // searchVolumeWithTraitsAndMatchParts searches for a disk matching the given
@@ -1790,9 +1785,6 @@ func updateLocationForStructure(structureLocations map[string]map[int]StructureL
 
 func applyUpdates(structureLocations map[string]map[int]StructureLocation, new GadgetData, updates []updatePair, rollbackDir string, observer ContentUpdateObserver) error {
 	updaters := make([]Updater, len(updates))
-	if observer != nil {
-		defer observer.Done()
-	}
 
 	for i, one := range updates {
 		loc, err := updateLocationForStructure(structureLocations, one.to)
@@ -1850,15 +1842,8 @@ func applyUpdates(structureLocations map[string]map[int]StructureLocation, new G
 	}
 
 	if updateErr == nil {
-		if observer == nil {
-			// all good, updates applied successfully
-			return nil
-		}
-		if err := observer.UpdateApplied(); err == nil {
-			return nil
-		} else {
-			updateErr = fmt.Errorf("cannot observe applied update: %v", err)
-		}
+		// all good, updates applied successfully
+		return nil
 	}
 
 	logger.Noticef("cannot update gadget: %v", updateErr)

gadget/update_test.go

@@ -694,13 +694,6 @@ func (m *mockUpdateProcessObserver) Canceled() error {
 	return m.canceledErr
 }
 
-func (m *mockUpdateProcessObserver) UpdateApplied() error {
-	return nil
-}
-
-func (m *mockUpdateProcessObserver) Done() {
-}
-
 func (u *updateTestSuite) TestUpdateApplyHappy(c *C) {
 	oldData, newData, rollbackDir := u.updateDataSet(c)
 	// update two structs

overlord/devicestate/devicestate_gadget_test.go

@@ -325,7 +325,6 @@ func (s *deviceMgrGadgetSuite) testUpdateGadgetSimple(c *C, grade string, encryp
 			c.Check(observer, IsNil)
 		} else {
 			c.Check(observer, NotNil)
-			defer observer.Done()
 			// expecting a very specific observer
 			trustedUpdateObserver, ok := observer.(*boot.TrustedAssetsUpdateObserver)
 			c.Assert(ok, Equals, true, Commentf("unexpected type: %T", observer))
@@ -348,7 +347,6 @@ func (s *deviceMgrGadgetSuite) testUpdateGadgetSimple(c *C, grade string, encryp
 			c.Assert(m.CurrentTrustedRecoveryBootAssets, NotNil)
 			c.Check(m.CurrentTrustedRecoveryBootAssets["trusted-asset"], DeepEquals,
 				[]string{"88478d8afe6925b348b9cd00085f3535959fde7029a64d7841b031acc39415c690796757afab1852a9e09da913a0151b"})
-			c.Assert(observer.UpdateApplied(), IsNil)
 		}
 		return nil
 	})

overlord/devicestate/handlers_gadget.go

@@ -198,6 +198,7 @@ func (m *DeviceManager) doUpdateGadgetAssets(t *state.Task, _ *tomb.Tomb) error
 		}
 		if err == nil {
 			updateObserver = observeTrustedBootAssets
+			defer observeTrustedBootAssets.Done()
 		}
 
 		// do not release the state lock, the update observer may
@@ -208,12 +209,17 @@ func (m *DeviceManager) doUpdateGadgetAssets(t *state.Task, _ *tomb.Tomb) error
 			return err
 		}
 
+		// After a gadget-update, some bootloaders may need to reconfigure values.
 		if updated, err := boot.ReconfigureRuntimeBootConfig(groundDeviceCtx); err != nil {
 			return fmt.Errorf("cannot reconfigure runtime boot config: %v", err)
 		} else if updated {
 			t.Logf("reconfigured runtime boot config")
 		}
-		return nil
+
+		if updateObserver == nil {
+			return nil
+		}
+		return observeTrustedBootAssets.UpdateBootEntry()
 	}()
 	if err != nil {
 		if err == gadget.ErrNoUpdate {