Replacing require.nil in utils package (#16965)

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>

utils/archive_test.go

@@ -91,33 +91,33 @@ func TestUnzipToPath(t *testing.T) {
 	require.NotEmpty(t, testDir)
 
 	dir, err := ioutil.TempDir("", "unzip")
-	require.Nil(t, err)
+	require.NoError(t, err)
 	defer os.RemoveAll(dir)
 
 	t.Run("invalid archive", func(t *testing.T) {
 		file, err := os.Open(testDir + "/testplugin.tar.gz")
-		require.Nil(t, err)
+		require.NoError(t, err)
 		defer file.Close()
 
 		info, err := file.Stat()
-		require.Nil(t, err)
+		require.NoError(t, err)
 
 		paths, err := UnzipToPath(file, info.Size(), dir)
-		require.NotNil(t, err)
+		require.Error(t, err)
 		require.True(t, errors.Is(err, zip.ErrFormat))
 		require.Nil(t, paths)
 	})
 
 	t.Run("valid archive", func(t *testing.T) {
 		file, err := os.Open(testDir + "/testarchive.zip")
-		require.Nil(t, err)
+		require.NoError(t, err)
 		defer file.Close()
 
 		info, err := file.Stat()
-		require.Nil(t, err)
+		require.NoError(t, err)
 
 		paths, err := UnzipToPath(file, info.Size(), dir)
-		require.Nil(t, err)
+		require.NoError(t, err)
 		require.NotEmpty(t, paths)
 
 		expectedFiles := map[string]int64{
@@ -132,7 +132,7 @@ func TestUnzipToPath(t *testing.T) {
 		}
 
 		err = filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
-			require.Nil(t, err)
+			require.NoError(t, err)
 			if path == dir {
 				return nil
 			}
@@ -144,6 +144,6 @@ func TestUnzipToPath(t *testing.T) {
 			}
 			return nil
 		})
-		require.Nil(t, err)
+		require.NoError(t, err)
 	})
 }

utils/backoff_test.go

@@ -56,7 +56,7 @@ func TestProgressiveRetry(t *testing.T) {
 
 			err := ProgressiveRetry(tt.args.operation)
 			if !tt.wantErr {
-				require.Nil(t, err)
+				require.NoError(t, err)
 			}
 
 			assert.Equal(t, tt.expectedRetries, retries)

utils/imgutils/gif_test.go

@@ -36,7 +36,7 @@ func TestCountFrames(t *testing.T) {
 
 		count, err := CountFrames(bytes.NewReader(b))
 
-		assert.Nil(t, err)
+		assert.NoError(t, err)
 		assert.Equal(t, 1, count)
 	})
 
@@ -50,32 +50,32 @@ func TestCountFrames(t *testing.T) {
 
 		count, err := CountFrames(bytes.NewReader(b))
 
-		assert.Nil(t, err)
+		assert.NoError(t, err)
 		assert.Equal(t, 100, count)
 	})
 
 	t.Run("should count the frames of an actual animated gif", func(t *testing.T) {
 		b, err := testutils.ReadTestFile("testgif.gif")
-		require.Nil(t, err)
+		require.NoError(t, err)
 
 		count, err := CountFrames(bytes.NewReader(b))
 
-		assert.Nil(t, err)
+		assert.NoError(t, err)
 		assert.Equal(t, 4, count)
 	})
 
 	t.Run("should return an error for a non-gif image", func(t *testing.T) {
 		b, err := testutils.ReadTestFile("test.png")
-		require.Nil(t, err)
+		require.NoError(t, err)
 
 		_, err = CountFrames(bytes.NewReader(b))
 
-		assert.NotNil(t, err)
+		assert.Error(t, err)
 	})
 
 	t.Run("should return an error for garbage data", func(t *testing.T) {
 		_, err := CountFrames(bytes.NewReader([]byte("garbage data")))
 
-		assert.NotNil(t, err)
+		assert.Error(t, err)
 	})
 }