chore(test): use require.ErrorContains when possible

Signed-off-by: Matthieu MOREL <[email protected]>

pkg/cache/fs_test.go

@@ -286,8 +286,7 @@ func TestFSCache_PutBlob(t *testing.T) {
 
 			err = fs.PutBlob(tt.args.diffID, tt.args.layerInfo)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr, tt.name)
+				require.ErrorContains(t, err, tt.wantErr, tt.name)
 				return
 			} else {
 				require.NoError(t, err, tt.name)
@@ -366,8 +365,7 @@ func TestFSCache_PutArtifact(t *testing.T) {
 
 			err = fs.PutArtifact(tt.args.imageID, tt.args.imageConfig)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr, tt.name)
+				require.ErrorContains(t, err, tt.wantErr, tt.name)
 				return
 			} else {
 				require.NoError(t, err, tt.name)

pkg/cache/memory_test.go

@@ -314,8 +314,7 @@ func TestMemoryCache_DeleteBlobs(t *testing.T) {
 			// Check that the blobs are no longer in the cache
 			for _, blobID := range tt.blobIDs {
 				_, err := c.GetBlob(blobID)
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), "not found in memory cache")
+				require.ErrorContains(t, err, "not found in memory cache")
 			}
 		})
 	}
@@ -348,12 +347,10 @@ func TestMemoryCache_Clear(t *testing.T) {
 			require.NoError(t, err)
 
 			_, err = c.GetArtifact(tt.artifactID)
-			require.Error(t, err)
-			assert.Contains(t, err.Error(), "not found in memory cache")
+			require.ErrorContains(t, err, "not found in memory cache")
 
 			_, err = c.GetBlob(tt.blobID)
-			require.Error(t, err)
-			assert.Contains(t, err.Error(), "not found in memory cache")
+			require.ErrorContains(t, err, "not found in memory cache")
 		})
 	}
 }
@@ -385,12 +382,10 @@ func TestMemoryCache_Close(t *testing.T) {
 			require.NoError(t, err)
 
 			_, err = c.GetArtifact(tt.artifactID)
-			require.Error(t, err)
-			assert.Contains(t, err.Error(), "not found in memory cache")
+			require.ErrorContains(t, err, "not found in memory cache")
 
 			_, err = c.GetBlob(tt.blobID)
-			require.Error(t, err)
-			assert.Contains(t, err.Error(), "not found in memory cache")
+			require.ErrorContains(t, err, "not found in memory cache")
 		})
 	}
 }

pkg/cache/redis_test.go

@@ -537,8 +537,7 @@ func TestRedisCache_DeleteBlobs(t *testing.T) {
 
 			err = c.DeleteBlobs(tt.args.blobIDs)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 			require.NoError(t, err)

pkg/cache/remote_test.go

@@ -152,8 +152,7 @@ func TestRemoteCache_PutArtifact(t *testing.T) {
 			})
 			err := c.PutArtifact(tt.args.imageID, tt.args.imageInfo)
 			if tt.wantErr != "" {
-				require.Error(t, err, tt.name)
-				assert.Contains(t, err.Error(), tt.wantErr, tt.name)
+				require.ErrorContains(t, err, tt.wantErr, tt.name)
 				return
 			} else {
 				require.NoError(t, err, tt.name)
@@ -217,8 +216,7 @@ func TestRemoteCache_PutBlob(t *testing.T) {
 			})
 			err := c.PutBlob(tt.args.diffID, tt.args.layerInfo)
 			if tt.wantErr != "" {
-				require.Error(t, err, tt.name)
-				assert.Contains(t, err.Error(), tt.wantErr, tt.name)
+				require.ErrorContains(t, err, tt.wantErr, tt.name)
 				return
 			} else {
 				require.NoError(t, err, tt.name)
@@ -299,8 +297,7 @@ func TestRemoteCache_MissingBlobs(t *testing.T) {
 			})
 			gotMissingImage, gotMissingLayerIDs, err := c.MissingBlobs(tt.args.imageID, tt.args.layerIDs)
 			if tt.wantErr != "" {
-				require.Error(t, err, tt.name)
-				assert.Contains(t, err.Error(), tt.wantErr, tt.name)
+				require.ErrorContains(t, err, tt.wantErr, tt.name)
 				return
 			} else {
 				require.NoError(t, err, tt.name)
@@ -353,8 +350,7 @@ func TestRemoteCache_PutArtifactInsecure(t *testing.T) {
 			})
 			err := c.PutArtifact(tt.args.imageID, tt.args.imageInfo)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 			require.NoError(t, err, tt.name)

pkg/compliance/spec/compliance_test.go

@@ -271,7 +271,7 @@ func TestComplianceSpec_LoadFromDiskBundle(t *testing.T) {
 
 	t.Run("load user specified spec from disk fails", func(t *testing.T) {
 		_, err := spec.GetComplianceSpec("@doesnotexist", "does-not-matter")
-		assert.Contains(t, err.Error(), "error retrieving compliance spec from path")
+		require.ErrorContains(t, err, "error retrieving compliance spec from path")
 	})
 
 	t.Run("bundle does not exist", func(t *testing.T) {
@@ -288,6 +288,6 @@ func TestComplianceSpec_LoadFromDiskBundle(t *testing.T) {
 
 	t.Run("load spec yaml unmarshal failure", func(t *testing.T) {
 		_, err := spec.GetComplianceSpec("invalid", filepath.Join("testdata", "testcache"))
-		assert.Contains(t, err.Error(), "spec yaml decode error")
+		require.ErrorContains(t, err, "spec yaml decode error")
 	})
 }

pkg/db/db_test.go

@@ -127,8 +127,7 @@ func TestClient_NeedsUpdate(t *testing.T) {
 
 			switch {
 			case tt.wantErr != "":
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr, tt.name)
+				require.ErrorContains(t, err, tt.wantErr, tt.name)
 			default:
 				require.NoError(t, err, tt.name)
 			}

pkg/dependency/parser/dotnet/core_deps/parse_test.go

@@ -93,8 +93,7 @@ func TestParse(t *testing.T) {
 
 			got, _, err := NewParser().Parse(f)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 			} else {
 				require.NoError(t, err)
 

pkg/dependency/parser/frameworks/wordpress/parse_test.go

@@ -37,8 +37,7 @@ func TestParseWordPress(t *testing.T) {
 
 			got, err := Parse(f)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 

pkg/dependency/parser/java/pom/parse_test.go

@@ -2160,8 +2160,7 @@ func TestPom_Parse(t *testing.T) {
 
 			gotPkgs, gotDeps, err := p.Parse(f)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 			require.NoError(t, err)

pkg/dependency/parser/nuget/config/parse_test.go

@@ -46,8 +46,7 @@ func TestParse(t *testing.T) {
 
 			got, _, err := config.NewParser().Parse(f)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 

pkg/dependency/parser/nuget/packagesprops/parse_test.go

@@ -70,8 +70,7 @@ func TestParse(t *testing.T) {
 
 			got, _, err := config.NewParser().Parse(f)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 

pkg/dependency/parser/ruby/gemspec/parse_test.go

@@ -83,8 +83,7 @@ func TestParse(t *testing.T) {
 
 			got, _, err := gemspec.NewParser().Parse(f)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 			assert.Equal(t, tt.want, got)

pkg/dependency/parser/rust/binary/parse_test.go

@@ -77,8 +77,7 @@ func TestParse(t *testing.T) {
 
 			got, gotDeps, err := binary.NewParser().Parse(f)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 

pkg/detector/library/driver_test.go

@@ -220,8 +220,7 @@ func TestDriver_Detect(t *testing.T) {
 
 			got, err := driver.DetectVulnerabilities("", tt.args.pkgName, tt.args.pkgVer)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 

pkg/detector/ospkg/alma/alma_test.go

@@ -165,8 +165,7 @@ func TestScanner_Detect(t *testing.T) {
 			s := alma.NewScanner()
 			got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 			require.NoError(t, err)

pkg/detector/ospkg/alpine/alpine_test.go

@@ -254,8 +254,7 @@ func TestScanner_Detect(t *testing.T) {
 			s := alpine.NewScanner()
 			got, err := s.Detect(nil, tt.args.osVer, tt.args.repo, tt.args.pkgs)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 

pkg/detector/ospkg/amazon/amazon_test.go

@@ -180,8 +180,7 @@ func TestScanner_Detect(t *testing.T) {
 			s := amazon.NewScanner()
 			got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 			require.NoError(t, err)

pkg/detector/ospkg/azure/azure_test.go

@@ -187,8 +187,7 @@ func TestScanner_Detect(t *testing.T) {
 			}
 			got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 			require.NoError(t, err)

pkg/detector/ospkg/chainguard/chainguard_test.go

@@ -196,8 +196,7 @@ func TestScanner_Detect(t *testing.T) {
 			s := chainguard.NewScanner()
 			got, err := s.Detect(nil, "", tt.args.repo, tt.args.pkgs)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 

pkg/detector/ospkg/debian/debian_test.go

@@ -118,8 +118,7 @@ func TestScanner_Detect(t *testing.T) {
 			s := debian.NewScanner()
 			got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 

pkg/detector/ospkg/oracle/oracle_test.go

@@ -343,8 +343,7 @@ func TestScanner_Detect(t *testing.T) {
 			s := NewScanner()
 			got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			} else {
 				require.NoError(t, err)

pkg/detector/ospkg/photon/photon_test.go

@@ -97,8 +97,7 @@ func TestScanner_Detect(t *testing.T) {
 			s := photon.NewScanner()
 			got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 			require.NoError(t, err)

pkg/detector/ospkg/rocky/rocky_test.go

@@ -125,8 +125,7 @@ func TestScanner_Detect(t *testing.T) {
 			s := rocky.NewScanner()
 			got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 			require.NoError(t, err)

pkg/detector/ospkg/suse/suse_test.go

@@ -220,8 +220,7 @@ func TestScanner_Detect(t *testing.T) {
 			s := suse.NewScanner(tt.distribution)
 			got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 			require.NoError(t, err)

pkg/detector/ospkg/ubuntu/ubuntu_test.go

@@ -182,8 +182,7 @@ func TestScanner_Detect(t *testing.T) {
 			s := ubuntu.NewScanner()
 			got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 			sort.Slice(got, func(i, j int) bool {

pkg/detector/ospkg/wolfi/wolfi_test.go

@@ -196,8 +196,7 @@ func TestScanner_Detect(t *testing.T) {
 			s := wolfi.NewScanner()
 			got, err := s.Detect(nil, "", tt.args.repo, tt.args.pkgs)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 

pkg/fanal/analyzer/analyzer_test.go

@@ -522,8 +522,7 @@ func TestAnalyzerGroup_AnalyzeFile(t *testing.T) {
 				DisabledAnalyzers: tt.args.disabledAnalyzers,
 			})
 			if err != nil && tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 			require.NoError(t, err)
@@ -549,8 +548,7 @@ func TestAnalyzerGroup_AnalyzeFile(t *testing.T) {
 
 			wg.Wait()
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 

pkg/fanal/analyzer/buildinfo/content_manifest_test.go

@@ -55,8 +55,7 @@ func Test_contentManifestAnalyzer_Analyze(t *testing.T) {
 			})
 
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 

pkg/fanal/analyzer/language/analyze_test.go

@@ -97,8 +97,7 @@ func TestAnalyze(t *testing.T) {
 
 			got, err := language.Analyze(tt.args.fileType, tt.args.filePath, tt.args.content, mp)
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 

pkg/fanal/analyzer/language/dotnet/deps/deps_test.go

@@ -64,8 +64,7 @@ func Test_depsLibraryAnalyzer_Analyze(t *testing.T) {
 			})
 
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 

pkg/fanal/analyzer/language/java/pom/pom_test.go

@@ -191,8 +191,7 @@ func Test_pomAnalyzer_Analyze(t *testing.T) {
 				},
 			})
 			if tt.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				require.ErrorContains(t, err, tt.wantErr)
 				return
 			}
 			require.NoError(t, err)