Address issues

pkg/cloudprovider/gcp/cloud_provider_test.go

@@ -77,7 +77,7 @@ func TestIsSpotInstance(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			cloudProvider := &CloudProvider{}
 			isSpotInstance, err := cloudProvider.IsSpotInstance(context.Background(), test.node)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			require.Equal(t, test.isSpotInstance, isSpotInstance)
 		})
 	}

pkg/cloudprovider/gcp/compute_test.go

@@ -24,6 +24,6 @@ func TestGetManagedInstanceGroupFromInstance(t *testing.T) {
 		},
 	}
 	managedInstanceGroupName, err := getManagedInstanceGroupFromInstance(instance)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, "my-managed-instance-group", managedInstanceGroupName)
 }

pkg/cloudprovider/gcp/provider_test.go

@@ -9,7 +9,7 @@ import (
 func TestParseProviderID(t *testing.T) {
 	providerID := "gce://my-project/my-zone/my-instance"
 	project, zone, instanceName, err := parseProviderID(providerID)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, "my-project", project)
 	require.Equal(t, "my-zone", zone)
 	require.Equal(t, "my-instance", instanceName)

pkg/controller/controller_test.go

@@ -64,7 +64,7 @@ func TestSetupWithManager(t *testing.T) {
 			if test.shouldSucceed {
 				require.NoError(t, err)
 			} else {
-				require.NotNil(t, err)
+				require.Error(t, err)
 			}
 		})
 	}

pkg/controller/spot_migrator_test.go

@@ -76,7 +76,7 @@ func TestSpotMigratorNodeCreatedTrueOnNodeCreate(t *testing.T) {
 func TestSpotMigratorSelectNodeForDeletionErrorOnEmptyList(t *testing.T) {
 	nodes := []*corev1.Node{}
 	_, err := selectNodeForDeletion(nodes)
-	require.NotNil(t, err)
+	require.Error(t, err)
 }
 
 func TestSpotMigratorSelectNodeForDeletionPreferOldest(t *testing.T) {

pkg/kubernetes/drain_test.go

@@ -12,5 +12,5 @@ func TestWaitForNodeToBeDeletedWithMissingNode(t *testing.T) {
 	ctx := context.Background()
 	clientset := fake.NewSimpleClientset()
 	err := WaitForNodeToBeDeleted(ctx, clientset, "test")
-	require.Nil(t, err)
+	require.NoError(t, err)
 }

pkg/kubernetes/labels_test.go

@@ -115,7 +115,7 @@ func TestMatchesLabels(t *testing.T) {
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
 			matches, err := SelectorMatchesLabels(test.selector, test.labels)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			require.Equal(t, test.shouldMatch, matches)
 		})
 	}

pkg/kubernetes/scheme_test.go

@@ -8,5 +8,5 @@ import (
 
 func TestNewScheme(t *testing.T) {
 	_, err := NewScheme()
-	require.Nil(t, err)
+	require.NoError(t, err)
 }

pkg/kubernetes/watch_test.go

@@ -19,7 +19,7 @@ func TestParseWatchEventPodObject(t *testing.T) {
 		},
 	}
 	pod, err := ParseWatchEventObject[*corev1.Pod](event)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, "foo", pod.ObjectMeta.Name)
 	require.Equal(t, "bar", pod.ObjectMeta.Namespace)
 }
@@ -32,6 +32,6 @@ func TestParseWatchEventErrorObject(t *testing.T) {
 		},
 	}
 	_, err := ParseWatchEventObject[*corev1.Pod](event)
-	require.NotNil(t, err)
+	require.Error(t, err)
 	require.Equal(t, "watch failed with error: message", err.Error())
 }

pkg/test/generate_test.go

@@ -30,5 +30,5 @@ func TestGenerateLongResourceNameTruncatedTo62CharactersXxxX(t *testing.T) {
 
 func TestGenerateDeployment(t *testing.T) {
 	_, err := GenerateDeployment("test", "test")
-	require.Nil(t, err)
+	require.NoError(t, err)
 }