From 4f2d8f0541abe56d815047489fb5996b3212b014 Mon Sep 17 00:00:00 2001
From: Simar <simar@linux.com>
Date: Fri, 24 Jan 2025 18:29:34 -0700
Subject: [PATCH] fix tests

---
 pkg/plugins/trivy/plugin_test.go | 2 --
 pkg/policy/policy.go             | 2 +-
 pkg/trivyoperator/config_test.go | 7 +++----
 pkg/utils/dateutil_test.go       | 2 +-
 pkg/utils/util_test.go           | 2 +-
 pkg/webhook/webhookreporter.go   | 6 +++++-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkg/plugins/trivy/plugin_test.go b/pkg/plugins/trivy/plugin_test.go
index 54c9f589e..f26a36d91 100644
--- a/pkg/plugins/trivy/plugin_test.go
+++ b/pkg/plugins/trivy/plugin_test.go
@@ -6659,7 +6659,6 @@ var (
 			NoneCount:     0,
 			UnknownCount:  0,
 		},
-		Vulnerabilities: []v1alpha1.Vulnerability{},
 	}
 
 	emptyExposedSecretReport = v1alpha1.ExposedSecretReportData{
@@ -6682,7 +6681,6 @@ var (
 			MediumCount:   0,
 			LowCount:      0,
 		},
-		Secrets: []v1alpha1.ExposedSecret{},
 	}
 )
 
diff --git a/pkg/policy/policy.go b/pkg/policy/policy.go
index 7c797e128..dd23ddc1d 100644
--- a/pkg/policy/policy.go
+++ b/pkg/policy/policy.go
@@ -307,7 +307,7 @@ func createDataFS(dataPaths []string, k8sVersion string) (fs.FS, []string, error
 		if err := fsys.MkdirAll("system", 0700); err != nil {
 			return nil, nil, err
 		}
-		data := []byte(fmt.Sprintf(`{"k8s": {"version": "%q"}}`, k8sVersion))
+		data := []byte(fmt.Sprintf(`{"k8s": {"version": %q}}`, k8sVersion))
 		if err := fsys.WriteVirtualFile("system/k8s-version.json", data, 0600); err != nil {
 			return nil, nil, err
 		}
diff --git a/pkg/trivyoperator/config_test.go b/pkg/trivyoperator/config_test.go
index d72fd94a0..cd5d4d6c2 100644
--- a/pkg/trivyoperator/config_test.go
+++ b/pkg/trivyoperator/config_test.go
@@ -1130,10 +1130,9 @@ func TestConfigData_GetExcludeImages(t *testing.T) {
 			expected: []string{"docker.io/*"},
 		},
 		{
-			name:     "no pattern",
-			key:      "scanJob.excludeImages",
-			value:    "",
-			expected: []string{},
+			name:  "no pattern",
+			key:   "scanJob.excludeImages",
+			value: "",
 		},
 	}
 	for _, tc := range testCases {
diff --git a/pkg/utils/dateutil_test.go b/pkg/utils/dateutil_test.go
index cab985232..162f59df9 100644
--- a/pkg/utils/dateutil_test.go
+++ b/pkg/utils/dateutil_test.go
@@ -77,6 +77,6 @@ func TestTTLIsExpired(t *testing.T) {
 	creationTime := time.Now()
 	then := creationTime.Add(time.Duration(-10) * time.Minute)
 	ttlExpired, duration := IsTTLExpired(ttlReportTime, then, ext.NewSystemClock())
-	assert.LessOrEqual(t, duration, 0)
+	assert.True(t, duration <= 0) // nolint: testifylint
 	assert.True(t, ttlExpired)
 }
diff --git a/pkg/utils/util_test.go b/pkg/utils/util_test.go
index 619aebab4..5a1dd7dd9 100644
--- a/pkg/utils/util_test.go
+++ b/pkg/utils/util_test.go
@@ -20,7 +20,7 @@ func TestMapResources(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got := MapKinds(tt.kinds)
-			assert.Len(t, tt.want, len(got))
+			assert.Equal(t, tt.want, len(got)) // nolint: testifylint
 		})
 	}
 }
diff --git a/pkg/webhook/webhookreporter.go b/pkg/webhook/webhookreporter.go
index 24301c4fb..cde922a4e 100644
--- a/pkg/webhook/webhookreporter.go
+++ b/pkg/webhook/webhookreporter.go
@@ -121,7 +121,11 @@ func sendReport[T any](reports T, endpoint string, timeout time.Duration, header
 	req.Header = headerValues
 
 	resp, err := hc.Do(req)
-	defer func() { _ = resp.Body.Close() }()
+	defer func() {
+		if resp != nil {
+			_ = resp.Body.Close()
+		}
+	}()
 	if err != nil {
 		return fmt.Errorf("failed to send reports to endpoint: %w", err)
 	}