calling setting up defer fn before checking error to prevent panic (#1309)

Author: Uk1288

policy_set_integration_test.go

@@ -159,11 +159,11 @@ func TestPolicySetsCreate(t *testing.T) {
 		Beta:       Bool(false),
 	}
 	sv, err := client.Admin.SentinelVersions.Create(ctx, opts)
+	require.NoError(t, err)
 	defer func() {
 		err := client.Admin.SentinelVersions.Delete(ctx, sv.ID)
 		require.NoError(t, err)
 	}()
-	require.NoError(t, err)
 
 	var vcsPolicyID string
 
@@ -677,11 +677,11 @@ func TestPolicySetsUpdate(t *testing.T) {
 		Beta:       Bool(false),
 	}
 	sv, err := client.Admin.SentinelVersions.Create(ctx, opts)
+	require.NoError(t, err)
 	defer func() {
 		err := client.Admin.SentinelVersions.Delete(ctx, sv.ID)
 		require.NoError(t, err)
 	}()
-	require.NoError(t, err)
 
 	options := PolicySetCreateOptions{
 		Kind:              Sentinel,

run_task_integration_test.go

@@ -356,13 +356,12 @@ func TestRunTasksAttachToWorkspace(t *testing.T) {
 
 	t.Run("to a valid workspace", func(t *testing.T) {
 		wr, err := client.RunTasks.AttachToWorkspace(ctx, wkspaceTest.ID, runTaskTest.ID, Advisory)
+		require.NoError(t, err)
 
 		defer func() {
 			err = client.WorkspaceRunTasks.Delete(ctx, wkspaceTest.ID, wr.ID)
 			require.NoError(t, err)
 		}()
-
-		require.NoError(t, err)
 		require.NotNil(t, wr.ID)
 	})
 }

team_access_integration_test.go

@@ -110,15 +110,15 @@ func TestTeamAccessesAdd(t *testing.T) {
 		}
 
 		ta, err := client.TeamAccess.Add(ctx, options)
+		require.NoError(t, err)
+
 		defer func() {
 			err := client.TeamAccess.Remove(ctx, ta.ID)
 			if err != nil {
 				t.Logf("error removing team access (%s): %s", ta.ID, err)
 			}
 		}()
 
-		require.NoError(t, err)
-
 		// Get a refreshed view from the API.
 		refreshed, err := client.TeamAccess.Read(ctx, ta.ID)
 		require.NoError(t, err)
@@ -142,15 +142,15 @@ func TestTeamAccessesAdd(t *testing.T) {
 		}
 
 		ta, err := client.TeamAccess.Add(ctx, options)
+		require.NoError(t, err)
+
 		defer func() {
 			err := client.TeamAccess.Remove(ctx, ta.ID)
 			if err != nil {
 				t.Logf("error removing team access (%s): %s", ta.ID, err)
 			}
 		}()
 
-		require.NoError(t, err)
-
 		// Get a refreshed view from the API.
 		refreshed, err := client.TeamAccess.Read(ctx, ta.ID)
 		require.NoError(t, err)

team_project_access_integration_test.go

@@ -146,15 +146,15 @@ func TestTeamProjectAccessesAdd(t *testing.T) {
 		}
 
 		tpa, err := client.TeamProjectAccess.Add(ctx, options)
+		require.NoError(t, err)
+
 		defer func() {
 			err := client.TeamProjectAccess.Remove(ctx, tpa.ID)
 			if err != nil {
 				t.Logf("error removing team access (%s): %s", tpa.ID, err)
 			}
 		}()
 
-		require.NoError(t, err)
-
 		// Get a refreshed view from the API.
 		refreshed, err := client.TeamProjectAccess.Read(ctx, tpa.ID)
 		require.NoError(t, err)
@@ -188,15 +188,15 @@ func TestTeamProjectAccessesAdd(t *testing.T) {
 		}
 
 		tpa, err := client.TeamProjectAccess.Add(ctx, options)
+		require.NoError(t, err)
+
 		defer func() {
 			err := client.TeamProjectAccess.Remove(ctx, tpa.ID)
 			if err != nil {
 				t.Logf("error removing team access (%s): %s", tpa.ID, err)
 			}
 		}()
 
-		require.NoError(t, err)
-
 		// Get a refreshed view from the API.
 		refreshed, err := client.TeamProjectAccess.Read(ctx, tpa.ID)
 		require.NoError(t, err)
@@ -242,15 +242,15 @@ func TestTeamProjectAccessesAdd(t *testing.T) {
 		}
 
 		tpa, err := client.TeamProjectAccess.Add(ctx, options)
+		require.NoError(t, err)
+
 		defer func() {
 			err := client.TeamProjectAccess.Remove(ctx, tpa.ID)
 			if err != nil {
 				t.Logf("error removing team access (%s): %s", tpa.ID, err)
 			}
 		}()
 
-		require.NoError(t, err)
-
 		// Get a refreshed view from the API.
 		refreshed, err := client.TeamProjectAccess.Read(ctx, tpa.ID)
 		require.NoError(t, err)