Move defer?

kipz · Dec 19, 2023 · 655513d · 655513d
1 parent 011f7b6
commit 655513d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/metadata/updater/updater.go b/metadata/updater/updater.go
@@ -619,7 +619,7 @@ func (update *Updater) persistMetadata(roleName string, data []byte) error {
 	if err != nil {
 		return err
 	}
-	defer file.Close()
+
 	// write the data content to the temporary file
 	err = os.WriteFile(file.Name(), data, 0644)
 	if err != nil {
@@ -630,6 +630,7 @@ func (update *Updater) persistMetadata(roleName string, data []byte) error {
 		}
 		return err
 	}
+	defer file.Close()
 	// can't move/rename an open file on windows, so close it first
 	file.Close()
 	// if all okay, rename the temporary file to the desired one

diff --git a/metadata/updater/updater_consistent_snapshot_test.go b/metadata/updater/updater_consistent_snapshot_test.go
@@ -33,15 +33,9 @@ func TestTopLevelRolesUpdateWithConsistentSnapshotDisabled(t *testing.T) {
 	updaterConfig, err := loadUpdaterConfig()
 	assert.NoError(t, err)
 	updater := initUpdater(updaterConfig)
-	if updater == nil {
-		t.Fatal("updater is nil")
-	}
 	// cleanup fetch tracker metadata
 	simulator.Sim.FetchTracker.Metadata = []simulator.FTMetadata{}
 	err = updater.Refresh()
-	if err != nil {
-		t.Fatal(err)
-	}
 	assert.NoError(t, err)
 
 	// metadata files are fetched with the expected version (or None)