diff --git a/.golangci.yaml b/.golangci.yaml
index 8a4d089f95242a270fae135cc5af459febc0f438..92c4d6d3d1644e5ed47f8c98ba09cd08aa11917c 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -66,26 +66,35 @@ linters-settings:
ruleguard:
failOn: all
rules: '${configDir}/misc/lint/rules.go'
+ testifylint:
+ enable-all: true
+ disable:
+ - bool-compare
+ - expected-actual
+ - float-compare
+ - len
+ - require-error
linters:
disable-all: true
enable:
- - unused
- - ineffassign
- - typecheck
- - govet
- - revive
- - gosec
- - unconvert
+ - bodyclose
+ - gci
- goconst
+ - gocritic
- gocyclo
- gofmt
- - misspell
- - bodyclose
- - gci
- gomodguard
+ - gosec
+ - govet
+ - ineffassign
+ - misspell
+ - revive
- tenv
- - gocritic
+ - testifylint
+ - typecheck
+ - unconvert
+ - unused
run:
go: '1.22'
@@ -93,12 +102,24 @@ run:
issues:
exclude-files:
- ".*_mock.go$"
- - ".*_test.go$"
- "integration/*"
- "examples/*"
exclude-dirs:
- "pkg/iac/scanners/terraform/parser/funcs" # copies of Terraform functions
exclude-rules:
+ - path: ".*_test.go$"
+ linters:
+ - bodyclose
+ - gci
+ - gocritic
+ - goconst
+ - gofmt
+ - gosec
+ - govet
+ - ineffassign
+ - misspell
+ - tenv
+ - unused
- linters:
- gosec
text: "G304: Potential file inclusion"
diff --git a/pkg/cache/remote_test.go b/pkg/cache/remote_test.go
index 9ed9802096dfc4baea344df9957732c5f23586d5..25ca003910b9c5172c7256572dd1ccdbfa775ec2 100644
--- a/pkg/cache/remote_test.go
+++ b/pkg/cache/remote_test.go
@@ -146,7 +146,7 @@ func TestRemoteCache_PutArtifact(t *testing.T) {
c := cache.NewRemoteCache(ts.URL, tt.args.customHeaders, false)
err := c.PutArtifact(tt.args.imageID, tt.args.imageInfo)
if tt.wantErr != "" {
- require.NotNil(t, err, tt.name)
+ require.Error(t, err, tt.name)
assert.Contains(t, err.Error(), tt.wantErr, tt.name)
return
} else {
@@ -207,7 +207,7 @@ func TestRemoteCache_PutBlob(t *testing.T) {
c := cache.NewRemoteCache(ts.URL, tt.args.customHeaders, false)
err := c.PutBlob(tt.args.diffID, tt.args.layerInfo)
if tt.wantErr != "" {
- require.NotNil(t, err, tt.name)
+ require.Error(t, err, tt.name)
assert.Contains(t, err.Error(), tt.wantErr, tt.name)
return
} else {
@@ -285,7 +285,7 @@ func TestRemoteCache_MissingBlobs(t *testing.T) {
c := cache.NewRemoteCache(ts.URL, tt.args.customHeaders, false)
gotMissingImage, gotMissingLayerIDs, err := c.MissingBlobs(tt.args.imageID, tt.args.layerIDs)
if tt.wantErr != "" {
- require.NotNil(t, err, tt.name)
+ require.Error(t, err, tt.name)
assert.Contains(t, err.Error(), tt.wantErr, tt.name)
return
} else {
diff --git a/pkg/dependency/parser/dotnet/core_deps/parse_test.go b/pkg/dependency/parser/dotnet/core_deps/parse_test.go
index dfd0a9cd96f7ebd6f013e170678703ad56e4d9f4..a495fe0d61febfb1b6d96918796acb6138f3afa3 100644
--- a/pkg/dependency/parser/dotnet/core_deps/parse_test.go
+++ b/pkg/dependency/parser/dotnet/core_deps/parse_test.go
@@ -41,7 +41,7 @@ func TestParse(t *testing.T) {
got, _, err := NewParser().Parse(f)
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
} else {
require.NoError(t, err)
diff --git a/pkg/dependency/parser/golang/binary/parse_test.go b/pkg/dependency/parser/golang/binary/parse_test.go
index e3144064ffe335bddb3642ffdc649b3fec539c93..c93d038c6d8b043f36858d8330da413f73e6edd4 100644
--- a/pkg/dependency/parser/golang/binary/parse_test.go
+++ b/pkg/dependency/parser/golang/binary/parse_test.go
@@ -128,7 +128,7 @@ func TestParse(t *testing.T) {
got, _, err := binary.NewParser().Parse(f)
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
}
diff --git a/pkg/dependency/parser/java/pom/parse_test.go b/pkg/dependency/parser/java/pom/parse_test.go
index 3627a5c2eb90f08cc6aee12bdc15715c4fedcfaa..1207f32adcf7c1b46fcfe4b401476684f92066b0 100644
--- a/pkg/dependency/parser/java/pom/parse_test.go
+++ b/pkg/dependency/parser/java/pom/parse_test.go
@@ -1408,7 +1408,7 @@ func TestPom_Parse(t *testing.T) {
gotPkgs, gotDeps, err := p.Parse(f)
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
}
diff --git a/pkg/dependency/parser/nuget/config/parse_test.go b/pkg/dependency/parser/nuget/config/parse_test.go
index b216fd81d70356f0177be400c34e718e2122e018..5ea128c2861a22102ba6bc93021bcdd85a5ec8e3 100644
--- a/pkg/dependency/parser/nuget/config/parse_test.go
+++ b/pkg/dependency/parser/nuget/config/parse_test.go
@@ -46,7 +46,7 @@ func TestParse(t *testing.T) {
got, _, err := config.NewParser().Parse(f)
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
}
diff --git a/pkg/dependency/parser/nuget/packagesprops/parse_test.go b/pkg/dependency/parser/nuget/packagesprops/parse_test.go
index 58c5209da333be948b99d28b7fd2836ea9dcb77c..a33dfb76611e34c2584f36d880b1a3169a5ad028 100644
--- a/pkg/dependency/parser/nuget/packagesprops/parse_test.go
+++ b/pkg/dependency/parser/nuget/packagesprops/parse_test.go
@@ -70,7 +70,7 @@ func TestParse(t *testing.T) {
got, _, err := config.NewParser().Parse(f)
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
}
diff --git a/pkg/dependency/parser/ruby/gemspec/parse_test.go b/pkg/dependency/parser/ruby/gemspec/parse_test.go
index 292b6e7a74d7b1dc9a8cd8487d2aa8d86bb225b8..dbf13826f7e06b65fc7a54b442ccb8a54746e667 100644
--- a/pkg/dependency/parser/ruby/gemspec/parse_test.go
+++ b/pkg/dependency/parser/ruby/gemspec/parse_test.go
@@ -83,7 +83,7 @@ func TestParse(t *testing.T) {
got, _, err := gemspec.NewParser().Parse(f)
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
}
diff --git a/pkg/dependency/parser/rust/binary/parse_test.go b/pkg/dependency/parser/rust/binary/parse_test.go
index d914a93ffb4b70c39b00e0bcf6e269d044db7284..88da862c860a7f57c8054bd2bed5c324f44c6b73 100644
--- a/pkg/dependency/parser/rust/binary/parse_test.go
+++ b/pkg/dependency/parser/rust/binary/parse_test.go
@@ -77,7 +77,7 @@ func TestParse(t *testing.T) {
got, gotDeps, err := binary.NewParser().Parse(f)
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
}
diff --git a/pkg/detector/ospkg/oracle/oracle_test.go b/pkg/detector/ospkg/oracle/oracle_test.go
index 530639c9ea73c0749f5cbfb3e2a56a717f5f8fb3..8dd3dfc8900f245079586da64619643eab6608f7 100644
--- a/pkg/detector/ospkg/oracle/oracle_test.go
+++ b/pkg/detector/ospkg/oracle/oracle_test.go
@@ -252,7 +252,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.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
} else {
diff --git a/pkg/fanal/analyzer/analyzer_test.go b/pkg/fanal/analyzer/analyzer_test.go
index 169bbce3e8e6c52ba7d02fb4de64aa71f0643deb..1aa2eab607e6761be1cb3762dd5f3d2329fd2e7d 100644
--- a/pkg/fanal/analyzer/analyzer_test.go
+++ b/pkg/fanal/analyzer/analyzer_test.go
@@ -522,7 +522,7 @@ func TestAnalyzerGroup_AnalyzeFile(t *testing.T) {
DisabledAnalyzers: tt.args.disabledAnalyzers,
})
if err != nil && tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
}
@@ -549,7 +549,7 @@ func TestAnalyzerGroup_AnalyzeFile(t *testing.T) {
wg.Wait()
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
}
diff --git a/pkg/fanal/analyzer/language/analyze_test.go b/pkg/fanal/analyzer/language/analyze_test.go
index 8b6c9dad44deb1cae2dd8d55cc0bdff6a50f8f78..6a996fc031725d361a00cd07b6ea4596551f4f4e 100644
--- a/pkg/fanal/analyzer/language/analyze_test.go
+++ b/pkg/fanal/analyzer/language/analyze_test.go
@@ -97,7 +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.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
}
diff --git a/pkg/fanal/analyzer/language/dotnet/deps/deps_test.go b/pkg/fanal/analyzer/language/dotnet/deps/deps_test.go
index e3cdf2730e726c5240a98b262a3a45a724f7611c..4e8cc0ba212b640c75d300a2b4a1917239328b77 100644
--- a/pkg/fanal/analyzer/language/dotnet/deps/deps_test.go
+++ b/pkg/fanal/analyzer/language/dotnet/deps/deps_test.go
@@ -63,7 +63,7 @@ func Test_depsLibraryAnalyzer_Analyze(t *testing.T) {
})
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
}
diff --git a/pkg/fanal/analyzer/language/java/pom/pom_test.go b/pkg/fanal/analyzer/language/java/pom/pom_test.go
index 865f2cb5471bdfe5eae181689061c888c3d4faf6..8a169b9291512e036564f0df060d2ce35ac20aef 100644
--- a/pkg/fanal/analyzer/language/java/pom/pom_test.go
+++ b/pkg/fanal/analyzer/language/java/pom/pom_test.go
@@ -180,7 +180,7 @@ func Test_pomAnalyzer_Analyze(t *testing.T) {
},
})
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
}
diff --git a/pkg/fanal/analyzer/language/nodejs/pkg/pkg_test.go b/pkg/fanal/analyzer/language/nodejs/pkg/pkg_test.go
index c27032b45166d3d650eca366f3a5e4787b877b91..c2528c92f974e9a8f46366a4b1dc61e92c00cae2 100644
--- a/pkg/fanal/analyzer/language/nodejs/pkg/pkg_test.go
+++ b/pkg/fanal/analyzer/language/nodejs/pkg/pkg_test.go
@@ -89,7 +89,7 @@ func Test_nodePkgLibraryAnalyzer_Analyze(t *testing.T) {
})
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
}
diff --git a/pkg/fanal/analyzer/language/nodejs/pnpm/pnpm_test.go b/pkg/fanal/analyzer/language/nodejs/pnpm/pnpm_test.go
index c3a50922a56907ea85d03ef5da51e9f54f3ac5c9..130482746a20e0e7324fb5a97d213b205564c7e7 100644
--- a/pkg/fanal/analyzer/language/nodejs/pnpm/pnpm_test.go
+++ b/pkg/fanal/analyzer/language/nodejs/pnpm/pnpm_test.go
@@ -54,7 +54,7 @@ func Test_pnpmPkgLibraryAnalyzer_Analyze(t *testing.T) {
})
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
}
diff --git a/pkg/fanal/analyzer/language/python/packaging/packaging_test.go b/pkg/fanal/analyzer/language/python/packaging/packaging_test.go
index eac4d29f5e84128998557b3e543b11b04fdd77e9..69eec5eba5f0f06796ac8d79dafaf7c76e8ebf0e 100644
--- a/pkg/fanal/analyzer/language/python/packaging/packaging_test.go
+++ b/pkg/fanal/analyzer/language/python/packaging/packaging_test.go
@@ -168,7 +168,7 @@ func Test_packagingAnalyzer_Analyze(t *testing.T) {
})
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
}
diff --git a/pkg/fanal/analyzer/language/python/pip/pip_test.go b/pkg/fanal/analyzer/language/python/pip/pip_test.go
index 0a930f5cce5143ffe21007db246b4af45f5aeaf9..fc86c5a4fad8b2a493d102e9394471847241b375 100644
--- a/pkg/fanal/analyzer/language/python/pip/pip_test.go
+++ b/pkg/fanal/analyzer/language/python/pip/pip_test.go
@@ -65,7 +65,7 @@ func Test_pipAnalyzer_Analyze(t *testing.T) {
})
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
}
diff --git a/pkg/fanal/analyzer/language/ruby/gemspec/gemspec_test.go b/pkg/fanal/analyzer/language/ruby/gemspec/gemspec_test.go
index 41e4746b68b64a075895db4c1bdc01e7155928bc..69aff2a3ed612f07326c248f9737674ea88e7709 100644
--- a/pkg/fanal/analyzer/language/ruby/gemspec/gemspec_test.go
+++ b/pkg/fanal/analyzer/language/ruby/gemspec/gemspec_test.go
@@ -92,7 +92,7 @@ func Test_gemspecLibraryAnalyzer_Analyze(t *testing.T) {
})
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
}
diff --git a/pkg/fanal/analyzer/os/alpine/alpine_test.go b/pkg/fanal/analyzer/os/alpine/alpine_test.go
index 29a2496ba556f69092d2235d3d2ad8e73d21f8ce..330695eaf117d8da87db2a8971ccc9dd479ddd69 100644
--- a/pkg/fanal/analyzer/os/alpine/alpine_test.go
+++ b/pkg/fanal/analyzer/os/alpine/alpine_test.go
@@ -39,10 +39,10 @@ func TestAlpineReleaseOSAnalyzer_Required(t *testing.T) {
res, err := a.Analyze(context.Background(), test.input)
if test.wantError != "" {
- assert.NotNil(t, err)
+ assert.Error(t, err)
assert.Equal(t, test.wantError, err.Error())
} else {
- assert.Nil(t, err)
+ assert.NoError(t, err)
assert.Equal(t, test.wantResult, res)
}
})
diff --git a/pkg/fanal/analyzer/os/amazonlinux/amazonlinux_test.go b/pkg/fanal/analyzer/os/amazonlinux/amazonlinux_test.go
index 83fcd25fe76bcafa2a441acd489e1655a025b5da..5ae7bc0d0f79d343f54f33c93bcece2f04b6ee52 100644
--- a/pkg/fanal/analyzer/os/amazonlinux/amazonlinux_test.go
+++ b/pkg/fanal/analyzer/os/amazonlinux/amazonlinux_test.go
@@ -95,7 +95,7 @@ func Test_amazonlinuxOSAnalyzer_Analyze(t *testing.T) {
ctx := context.Background()
got, err := a.Analyze(ctx, tt.input)
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
} else {
diff --git a/pkg/fanal/analyzer/os/debian/debian_test.go b/pkg/fanal/analyzer/os/debian/debian_test.go
index 0366e87693e416509f09d2a4e8f57b1ad1bb532e..1fa36db41b07bccae18116fbd091510814df6f98 100644
--- a/pkg/fanal/analyzer/os/debian/debian_test.go
+++ b/pkg/fanal/analyzer/os/debian/debian_test.go
@@ -59,7 +59,7 @@ func Test_debianOSAnalyzer_Analyze(t *testing.T) {
Content: f,
})
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
} else {
diff --git a/pkg/fanal/analyzer/os/redhatbase/centos_test.go b/pkg/fanal/analyzer/os/redhatbase/centos_test.go
index d85ea2494a89eb004ed2511f191742fbf4a87da7..bee789865363b90522e4a7730322662cf820db03 100644
--- a/pkg/fanal/analyzer/os/redhatbase/centos_test.go
+++ b/pkg/fanal/analyzer/os/redhatbase/centos_test.go
@@ -45,7 +45,7 @@ func Test_centosOSAnalyzer_Analyze(t *testing.T) {
Content: f,
})
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
} else {
diff --git a/pkg/fanal/analyzer/os/redhatbase/fedora_test.go b/pkg/fanal/analyzer/os/redhatbase/fedora_test.go
index 48bbb3b427551991877d0f1f9fc8961ec861b62c..405bbd5356bad9a8ca9235a47a73b39e5aca3b4c 100644
--- a/pkg/fanal/analyzer/os/redhatbase/fedora_test.go
+++ b/pkg/fanal/analyzer/os/redhatbase/fedora_test.go
@@ -45,7 +45,7 @@ func Test_fedoraOSAnalyzer_Analyze(t *testing.T) {
Content: f,
})
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
} else {
diff --git a/pkg/fanal/analyzer/os/redhatbase/oracle_test.go b/pkg/fanal/analyzer/os/redhatbase/oracle_test.go
index c30498481a23916c4749cf038e1f95635160aacd..1f3120b47763670c3eb4fdfb789c4f6fe5106c34 100644
--- a/pkg/fanal/analyzer/os/redhatbase/oracle_test.go
+++ b/pkg/fanal/analyzer/os/redhatbase/oracle_test.go
@@ -45,7 +45,7 @@ func Test_oracleOSAnalyzer_Analyze(t *testing.T) {
Content: f,
})
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
} else {
diff --git a/pkg/fanal/analyzer/os/redhatbase/redhatbase_test.go b/pkg/fanal/analyzer/os/redhatbase/redhatbase_test.go
index 8d1688ef1b8af8020bc97bfb303ac0c2ea13fadc..b47174523a16df7ddc01b3b29f3ba52a7b945304 100644
--- a/pkg/fanal/analyzer/os/redhatbase/redhatbase_test.go
+++ b/pkg/fanal/analyzer/os/redhatbase/redhatbase_test.go
@@ -45,7 +45,7 @@ func Test_redhatOSAnalyzer_Analyze(t *testing.T) {
Content: f,
})
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
} else {
diff --git a/pkg/fanal/analyzer/os/ubuntu/ubuntu_test.go b/pkg/fanal/analyzer/os/ubuntu/ubuntu_test.go
index 042d28af9924ee704f939561b1db921d57032b41..1aad32e8f124a79e71d8e00614d8ff6edff0ed80 100644
--- a/pkg/fanal/analyzer/os/ubuntu/ubuntu_test.go
+++ b/pkg/fanal/analyzer/os/ubuntu/ubuntu_test.go
@@ -45,7 +45,7 @@ func Test_ubuntuOSAnalyzer_Analyze(t *testing.T) {
Content: f,
})
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
} else {
diff --git a/pkg/fanal/analyzer/pkg/rpm/rpmqa_test.go b/pkg/fanal/analyzer/pkg/rpm/rpmqa_test.go
index 1e01535db900bb2a513810fbe35c460c29bdee58..ae216d501fc9795754ab72ab0e7a40cc58bd238c 100644
--- a/pkg/fanal/analyzer/pkg/rpm/rpmqa_test.go
+++ b/pkg/fanal/analyzer/pkg/rpm/rpmqa_test.go
@@ -63,7 +63,7 @@ glibc 2.35-2.cm2 1653816591 1653628955 Microsoft Corporation (none) 10855265 x86
a := rpmqaPkgAnalyzer{}
result, err := a.parseRpmqaManifest(strings.NewReader(test.content))
if test.wantErr != "" {
- assert.NotNil(t, err)
+ assert.Error(t, err)
assert.Equal(t, test.wantErr, err.Error())
} else {
assert.NoError(t, err)
diff --git a/pkg/fanal/applier/applier_test.go b/pkg/fanal/applier/applier_test.go
index a1844c5bb545201438e5aa4b6cb8fb88dc87a1a7..8ba2b3f1eb95a78861ebe8be6d83b56197985189 100644
--- a/pkg/fanal/applier/applier_test.go
+++ b/pkg/fanal/applier/applier_test.go
@@ -972,7 +972,7 @@ func TestApplier_ApplyLayers(t *testing.T) {
got, err := a.ApplyLayers(tt.args.imageID, tt.args.layerIDs)
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr, tt.name)
} else {
require.NoError(t, err, tt.name)
diff --git a/pkg/fanal/artifact/local/fs_test.go b/pkg/fanal/artifact/local/fs_test.go
index 176a53797616b4ea68115a9bc86efa22618c2b98..3bbb9d2c3b7982091b9339dbcb4a2232422f2067 100644
--- a/pkg/fanal/artifact/local/fs_test.go
+++ b/pkg/fanal/artifact/local/fs_test.go
@@ -248,7 +248,7 @@ func TestArtifact_Inspect(t *testing.T) {
got, err := a.Inspect(context.Background())
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
} else {
diff --git a/pkg/fanal/artifact/repo/git_test.go b/pkg/fanal/artifact/repo/git_test.go
index 0e7aadd411a9cdb055e17676693a94c01d0b0552..e5ea1ad3a230c56f89820d6c7c81d7b1e9f31b6d 100644
--- a/pkg/fanal/artifact/repo/git_test.go
+++ b/pkg/fanal/artifact/repo/git_test.go
@@ -253,7 +253,7 @@ func Test_newURL(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
got, err := newURL(tt.args.rawurl)
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
} else {
diff --git a/pkg/fanal/artifact/sbom/sbom_test.go b/pkg/fanal/artifact/sbom/sbom_test.go
index 7355c0c75abe1fea5caedaf3390fc58289a9b9ab..d7af10196a1cc2c876a07d8ddf02b8880d01e44f 100644
--- a/pkg/fanal/artifact/sbom/sbom_test.go
+++ b/pkg/fanal/artifact/sbom/sbom_test.go
@@ -408,7 +408,7 @@ func TestArtifact_Inspect(t *testing.T) {
got, err := a.Inspect(context.Background())
if len(tt.wantErr) > 0 {
- require.NotNil(t, err)
+ require.Error(t, err)
found := false
for _, wantErr := range tt.wantErr {
if strings.Contains(err.Error(), wantErr) {
diff --git a/pkg/fanal/cache/fs_test.go b/pkg/fanal/cache/fs_test.go
index ba2d9fe33d01f4b2786e9c983786ad16c0cbc10a..4eb059f5c5089240183654555c6774cc53bb432c 100644
--- a/pkg/fanal/cache/fs_test.go
+++ b/pkg/fanal/cache/fs_test.go
@@ -286,7 +286,7 @@ func TestFSCache_PutBlob(t *testing.T) {
err = fs.PutBlob(tt.args.diffID, tt.args.layerInfo)
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr, tt.name)
return
} else {
@@ -366,7 +366,7 @@ func TestFSCache_PutArtifact(t *testing.T) {
err = fs.PutArtifact(tt.args.imageID, tt.args.imageConfig)
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr, tt.name)
return
} else {
diff --git a/pkg/fanal/cache/redis_test.go b/pkg/fanal/cache/redis_test.go
index 028860c4dfc2b4e4fa9ee321d1d4664b7993b91c..99bdae01b3d4b1c9420116af407764ffade5cddc 100644
--- a/pkg/fanal/cache/redis_test.go
+++ b/pkg/fanal/cache/redis_test.go
@@ -73,7 +73,7 @@ func TestRedisCache_PutArtifact(t *testing.T) {
err = c.PutArtifact(tt.args.artifactID, tt.args.artifactConfig)
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
} else {
@@ -162,7 +162,7 @@ func TestRedisCache_PutBlob(t *testing.T) {
err = c.PutBlob(tt.args.blobID, tt.args.blobConfig)
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
} else {
@@ -247,7 +247,7 @@ func TestRedisCache_GetArtifact(t *testing.T) {
got, err := c.GetArtifact(tt.artifactID)
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
} else {
@@ -340,7 +340,7 @@ func TestRedisCache_GetBlob(t *testing.T) {
got, err := c.GetBlob(tt.blobID)
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
}
@@ -451,7 +451,7 @@ func TestRedisCache_MissingBlobs(t *testing.T) {
missingArtifact, missingBlobIDs, err := c.MissingBlobs(tt.args.artifactID, tt.args.blobIDs)
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
}
diff --git a/pkg/fanal/image/daemon/image_test.go b/pkg/fanal/image/daemon/image_test.go
index a8462200e479b14f599499781c5ecaf04b092568..330041cfd42d75b16284a5e5281ffb658838e496 100644
--- a/pkg/fanal/image/daemon/image_test.go
+++ b/pkg/fanal/image/daemon/image_test.go
@@ -112,7 +112,7 @@ func Test_image_ConfigNameWithCustomDockerHost(t *testing.T) {
Algorithm: "sha256",
Hex: "a187dde48cd289ac374ad8539930628314bc581a481cdb41409c9289419ddb72",
}, conf)
- assert.Nil(t, err)
+ assert.NoError(t, err)
}
func Test_image_ConfigNameWithCustomPodmanHost(t *testing.T) {
@@ -152,7 +152,7 @@ func Test_image_ConfigNameWithCustomPodmanHost(t *testing.T) {
Algorithm: "sha256",
Hex: "a187dde48cd289ac374ad8539930628314bc581a481cdb41409c9289419ddb72",
}, conf)
- assert.Nil(t, err)
+ assert.NoError(t, err)
}
func Test_image_ConfigFile(t *testing.T) {
diff --git a/pkg/fanal/image/daemon/podman_test.go b/pkg/fanal/image/daemon/podman_test.go
index d408def16e8711e8c5ef13a3d2abfa6fb445c7ea..5d56facb8cd2e5a91c2aca32622d10a94fb270a2 100644
--- a/pkg/fanal/image/daemon/podman_test.go
+++ b/pkg/fanal/image/daemon/podman_test.go
@@ -88,7 +88,7 @@ func TestPodmanImage(t *testing.T) {
defer cleanup()
if tt.wantErr {
- assert.NotNil(t, err)
+ assert.Error(t, err)
return
}
assert.NoError(t, err)
diff --git a/pkg/fanal/image/image_test.go b/pkg/fanal/image/image_test.go
index 551fbd6d682a8804549d49c20651ed99ddf57dbf..78147fb93f0eae81d735438eef69c40302d1b3db 100644
--- a/pkg/fanal/image/image_test.go
+++ b/pkg/fanal/image/image_test.go
@@ -281,7 +281,7 @@ func TestNewDockerImage(t *testing.T) {
defer cleanup()
if tt.wantErr {
- assert.NotNil(t, err)
+ assert.Error(t, err)
return
}
assert.NoError(t, err)
@@ -399,7 +399,7 @@ func TestNewDockerImageWithPrivateRegistry(t *testing.T) {
defer cleanup()
if tt.wantErr != "" {
- assert.NotNil(t, err)
+ assert.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr, err)
} else {
assert.NoError(t, err)
@@ -490,7 +490,7 @@ func TestNewArchiveImage(t *testing.T) {
img, err := NewArchiveImage(tt.args.fileName)
switch {
case tt.wantErr != "":
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr, tt.name)
return
default:
diff --git a/pkg/fanal/image/oci_test.go b/pkg/fanal/image/oci_test.go
index b7bcf4b8f640f9c94e41b4014bdcd0bfa6cd480e..6279fa1ed5c22dcb9eb45bcb1c64bd7028e7570f 100644
--- a/pkg/fanal/image/oci_test.go
+++ b/pkg/fanal/image/oci_test.go
@@ -61,7 +61,7 @@ func TestTryOCI(t *testing.T) {
t.Run(test.name, func(t *testing.T) {
_, err := tryOCI(test.ociImagePath)
if test.wantErr != "" {
- assert.NotNil(t, err)
+ assert.Error(t, err)
assert.Contains(t, err.Error(), test.wantErr, err)
} else {
assert.NoError(t, err)
diff --git a/pkg/iac/adapters/arm/compute/adapt_test.go b/pkg/iac/adapters/arm/compute/adapt_test.go
index 2021e08b95a88b05cc9c22329509ab6f6d23af43..8763a0aac28a768add899884352947b9ffe2b9cc 100644
--- a/pkg/iac/adapters/arm/compute/adapt_test.go
+++ b/pkg/iac/adapters/arm/compute/adapt_test.go
@@ -30,7 +30,7 @@ func Test_AdaptLinuxVM(t *testing.T) {
output := Adapt(input)
require.Len(t, output.LinuxVirtualMachines, 1)
- require.Len(t, output.WindowsVirtualMachines, 0)
+ require.Empty(t, output.WindowsVirtualMachines)
linuxVM := output.LinuxVirtualMachines[0]
assert.True(t, linuxVM.OSProfileLinuxConfig.DisablePasswordAuthentication.IsTrue())
@@ -54,6 +54,6 @@ func Test_AdaptWindowsVM(t *testing.T) {
output := Adapt(input)
- require.Len(t, output.LinuxVirtualMachines, 0)
+ require.Empty(t, output.LinuxVirtualMachines)
require.Len(t, output.WindowsVirtualMachines, 1)
}
diff --git a/pkg/iac/adapters/terraform/aws/dynamodb/adapt_test.go b/pkg/iac/adapters/terraform/aws/dynamodb/adapt_test.go
index ae7002ac697b78b6cf1fb7853f563bbbd12d4288..3ebd86b70199c74765597a410b3d7754d1b926cc 100644
--- a/pkg/iac/adapters/terraform/aws/dynamodb/adapt_test.go
+++ b/pkg/iac/adapters/terraform/aws/dynamodb/adapt_test.go
@@ -154,7 +154,7 @@ func TestLines(t *testing.T) {
modules := tftestutil.CreateModulesFromSource(t, src, ".tf")
adapted := Adapt(modules)
- require.Len(t, adapted.DAXClusters, 0)
+ require.Empty(t, adapted.DAXClusters)
require.Len(t, adapted.Tables, 1)
table := adapted.Tables[0]
diff --git a/pkg/iac/detection/detect_test.go b/pkg/iac/detection/detect_test.go
index e5f875071e16b47242fa4b613553b470f211d985..ceb7f65f143a8142794ce5ebeb3b9c029645788c 100644
--- a/pkg/iac/detection/detect_test.go
+++ b/pkg/iac/detection/detect_test.go
@@ -389,7 +389,7 @@ rules:
func BenchmarkIsType_SmallFile(b *testing.B) {
data, err := os.ReadFile(fmt.Sprintf("./testdata/%s", "small.file"))
- assert.Nil(b, err)
+ assert.NoError(b, err)
b.ReportAllocs()
b.ResetTimer()
@@ -400,7 +400,7 @@ func BenchmarkIsType_SmallFile(b *testing.B) {
func BenchmarkIsType_BigFile(b *testing.B) {
data, err := os.ReadFile(fmt.Sprintf("./testdata/%s", "big.file"))
- assert.Nil(b, err)
+ assert.NoError(b, err)
b.ReportAllocs()
b.ResetTimer()
diff --git a/pkg/iac/rego/scanner_test.go b/pkg/iac/rego/scanner_test.go
index f2d115ba05823c8a36cb444ea81550cb4297e118..83f3a2b1f9596b882556ad740e52733a30baa5a4 100644
--- a/pkg/iac/rego/scanner_test.go
+++ b/pkg/iac/rego/scanner_test.go
@@ -59,8 +59,8 @@ deny {
require.NoError(t, err)
require.Equal(t, 1, len(results.GetFailed()))
- assert.Equal(t, 0, len(results.GetPassed()))
- assert.Equal(t, 0, len(results.GetIgnored()))
+ assert.Empty(t, results.GetPassed())
+ assert.Empty(t, results.GetIgnored())
assert.Equal(t, "/evil.lol", results.GetFailed()[0].Metadata().Range().GetFilename())
assert.False(t, results.GetFailed()[0].IsWarning())
@@ -94,8 +94,8 @@ deny {
require.NoError(t, err)
require.Equal(t, 1, len(results.GetFailed()))
- assert.Equal(t, 0, len(results.GetPassed()))
- assert.Equal(t, 0, len(results.GetIgnored()))
+ assert.Empty(t, results.GetPassed())
+ assert.Empty(t, results.GetIgnored())
assert.Equal(t, "/evil.lol", results.GetFailed()[0].Metadata().Range().GetFilename())
assert.False(t, results.GetFailed()[0].IsWarning())
@@ -128,8 +128,8 @@ warn {
require.NoError(t, err)
require.Equal(t, 1, len(results.GetFailed()))
- require.Equal(t, 0, len(results.GetPassed()))
- require.Equal(t, 0, len(results.GetIgnored()))
+ require.Empty(t, results.GetPassed())
+ require.Empty(t, results.GetIgnored())
assert.True(t, results.GetFailed()[0].IsWarning())
}
@@ -159,9 +159,9 @@ deny {
})
require.NoError(t, err)
- assert.Equal(t, 0, len(results.GetFailed()))
+ assert.Empty(t, results.GetFailed())
require.Equal(t, 1, len(results.GetPassed()))
- assert.Equal(t, 0, len(results.GetIgnored()))
+ assert.Empty(t, results.GetIgnored())
assert.Equal(t, "/evil.lol", results.GetPassed()[0].Metadata().Range().GetFilename())
}
@@ -202,8 +202,8 @@ exception[ns] {
})
require.NoError(t, err)
- assert.Equal(t, 0, len(results.GetFailed()))
- assert.Equal(t, 0, len(results.GetPassed()))
+ assert.Empty(t, results.GetFailed())
+ assert.Empty(t, results.GetPassed())
assert.Equal(t, 1, len(results.GetIgnored()))
}
@@ -251,7 +251,7 @@ exception[ns] {
require.NoError(t, err)
assert.Equal(t, 1, len(results.GetFailed()))
- assert.Equal(t, 0, len(results.GetPassed()))
+ assert.Empty(t, results.GetPassed())
assert.Equal(t, 1, len(results.GetIgnored()))
}
@@ -287,8 +287,8 @@ exception[rules] {
})
require.NoError(t, err)
- assert.Equal(t, 0, len(results.GetFailed()))
- assert.Equal(t, 0, len(results.GetPassed()))
+ assert.Empty(t, results.GetFailed())
+ assert.Empty(t, results.GetPassed())
assert.Equal(t, 1, len(results.GetIgnored()))
}
@@ -324,8 +324,8 @@ exception[rules] {
require.NoError(t, err)
assert.Equal(t, 1, len(results.GetFailed()))
- assert.Equal(t, 0, len(results.GetPassed()))
- assert.Equal(t, 0, len(results.GetIgnored()))
+ assert.Empty(t, results.GetPassed())
+ assert.Empty(t, results.GetIgnored())
}
func Test_RegoScanning_WithRuntimeValues(t *testing.T) {
@@ -358,8 +358,8 @@ deny_evil {
require.NoError(t, err)
assert.Equal(t, 1, len(results.GetFailed()))
- assert.Equal(t, 0, len(results.GetPassed()))
- assert.Equal(t, 0, len(results.GetIgnored()))
+ assert.Empty(t, results.GetPassed())
+ assert.Empty(t, results.GetIgnored())
}
func Test_RegoScanning_WithDenyMessage(t *testing.T) {
@@ -389,8 +389,8 @@ deny[msg] {
require.NoError(t, err)
require.Equal(t, 1, len(results.GetFailed()))
- assert.Equal(t, 0, len(results.GetPassed()))
- assert.Equal(t, 0, len(results.GetIgnored()))
+ assert.Empty(t, results.GetPassed())
+ assert.Empty(t, results.GetIgnored())
assert.Equal(t, "oh no", results.GetFailed()[0].Description())
assert.Equal(t, "/evil.lol", results.GetFailed()[0].Metadata().Range().GetFilename())
@@ -427,8 +427,8 @@ deny[res] {
require.NoError(t, err)
require.Equal(t, 1, len(results.GetFailed()))
- assert.Equal(t, 0, len(results.GetPassed()))
- assert.Equal(t, 0, len(results.GetIgnored()))
+ assert.Empty(t, results.GetPassed())
+ assert.Empty(t, results.GetIgnored())
assert.Equal(t, "oh no", results.GetFailed()[0].Description())
assert.Equal(t, "/evil.lol", results.GetFailed()[0].Metadata().Range().GetFilename())
@@ -469,8 +469,8 @@ deny[res] {
require.NoError(t, err)
require.Equal(t, 1, len(results.GetFailed()))
- assert.Equal(t, 0, len(results.GetPassed()))
- assert.Equal(t, 0, len(results.GetIgnored()))
+ assert.Empty(t, results.GetPassed())
+ assert.Empty(t, results.GetIgnored())
assert.Equal(t, "oh no", results.GetFailed()[0].Description())
assert.Equal(t, "/blah.txt", results.GetFailed()[0].Metadata().Range().GetFilename())
@@ -523,8 +523,8 @@ deny[res] {
require.NoError(t, err)
require.Equal(t, 1, len(results.GetFailed()))
- assert.Equal(t, 0, len(results.GetPassed()))
- assert.Equal(t, 0, len(results.GetIgnored()))
+ assert.Empty(t, results.GetPassed())
+ assert.Empty(t, results.GetIgnored())
failure := results.GetFailed()[0]
@@ -572,8 +572,8 @@ deny {
require.NoError(t, err)
assert.Equal(t, 1, len(results.GetFailed()))
- assert.Equal(t, 0, len(results.GetPassed()))
- assert.Equal(t, 0, len(results.GetIgnored()))
+ assert.Empty(t, results.GetPassed())
+ assert.Empty(t, results.GetIgnored())
}
func Test_RegoScanning_WithNonMatchingInputSelector(t *testing.T) {
@@ -605,9 +605,9 @@ deny {
})
require.NoError(t, err)
- assert.Equal(t, 0, len(results.GetFailed()))
- assert.Equal(t, 0, len(results.GetPassed()))
- assert.Equal(t, 0, len(results.GetIgnored()))
+ assert.Empty(t, results.GetFailed())
+ assert.Empty(t, results.GetPassed())
+ assert.Empty(t, results.GetIgnored())
}
func Test_RegoScanning_NoTracingByDefault(t *testing.T) {
@@ -637,10 +637,10 @@ deny {
require.NoError(t, err)
assert.Equal(t, 1, len(results.GetFailed()))
- assert.Equal(t, 0, len(results.GetPassed()))
- assert.Equal(t, 0, len(results.GetIgnored()))
+ assert.Empty(t, results.GetPassed())
+ assert.Empty(t, results.GetIgnored())
- assert.Len(t, results.GetFailed()[0].Traces(), 0)
+ assert.Empty(t, results.GetFailed()[0].Traces())
}
func Test_RegoScanning_GlobalTracingEnabled(t *testing.T) {
@@ -672,11 +672,11 @@ deny {
require.NoError(t, err)
assert.Equal(t, 1, len(results.GetFailed()))
- assert.Equal(t, 0, len(results.GetPassed()))
- assert.Equal(t, 0, len(results.GetIgnored()))
+ assert.Empty(t, results.GetPassed())
+ assert.Empty(t, results.GetIgnored())
- assert.Len(t, results.GetFailed()[0].Traces(), 0)
- assert.Greater(t, len(traceBuffer.Bytes()), 0)
+ assert.Empty(t, results.GetFailed()[0].Traces())
+ assert.NotEmpty(t, traceBuffer.Bytes())
}
func Test_RegoScanning_PerResultTracingEnabled(t *testing.T) {
@@ -706,10 +706,10 @@ deny {
require.NoError(t, err)
assert.Equal(t, 1, len(results.GetFailed()))
- assert.Equal(t, 0, len(results.GetPassed()))
- assert.Equal(t, 0, len(results.GetIgnored()))
+ assert.Empty(t, results.GetPassed())
+ assert.Empty(t, results.GetIgnored())
- assert.Greater(t, len(results.GetFailed()[0].Traces()), 0)
+ assert.NotEmpty(t, results.GetFailed()[0].Traces())
}
func Test_dynamicMetadata(t *testing.T) {
@@ -934,8 +934,8 @@ deny {
require.NoError(t, err)
assert.Equal(t, 1, len(results.GetFailed()))
- assert.Equal(t, 0, len(results.GetPassed()))
- assert.Equal(t, 0, len(results.GetIgnored()))
+ assert.Empty(t, results.GetPassed())
+ assert.Empty(t, results.GetIgnored())
}
func Test_RegoScanning_InvalidFS(t *testing.T) {
@@ -974,8 +974,8 @@ deny {
require.NoError(t, err)
assert.Equal(t, 1, len(results.GetFailed()))
- assert.Equal(t, 0, len(results.GetPassed()))
- assert.Equal(t, 0, len(results.GetIgnored()))
+ assert.Empty(t, results.GetPassed())
+ assert.Empty(t, results.GetIgnored())
}
func Test_NoErrorsWhenUsingBadRegoCheck(t *testing.T) {
diff --git a/pkg/iac/rules/register_test.go b/pkg/iac/rules/register_test.go
index 22eec16c0c6680eb7b1d1fdc9048f2ecd0f0e495..e44acd3d94d218626f1f6fc2a46a2498244ca1af 100644
--- a/pkg/iac/rules/register_test.go
+++ b/pkg/iac/rules/register_test.go
@@ -16,7 +16,7 @@ func Test_Reset(t *testing.T) {
_ = Register(rule)
assert.Equal(t, 1, len(GetFrameworkRules()))
Reset()
- assert.Equal(t, 0, len(GetFrameworkRules()))
+ assert.Empty(t, GetFrameworkRules())
}
func Test_Registration(t *testing.T) {
@@ -112,7 +112,7 @@ func Test_Deregistration(t *testing.T) {
require.Equal(t, 1, len(actual))
assert.Equal(t, "B", actual[0].GetRule().AVDID)
Deregister(registrationB)
- assert.Equal(t, 0, len(GetFrameworkRules()))
+ assert.Empty(t, GetFrameworkRules())
}
func Test_DeregistrationMultipleFrameworks(t *testing.T) {
@@ -135,5 +135,5 @@ func Test_DeregistrationMultipleFrameworks(t *testing.T) {
require.Equal(t, 1, len(actual))
assert.Equal(t, "B", actual[0].GetRule().AVDID)
Deregister(registrationB)
- assert.Equal(t, 0, len(GetFrameworkRules()))
+ assert.Empty(t, GetFrameworkRules())
}
diff --git a/pkg/iac/scanners/azure/arm/parser/armjson/parse_array_test.go b/pkg/iac/scanners/azure/arm/parser/armjson/parse_array_test.go
index 382da0b0c45db488451a423fb118dfe94d6dcaa3..87169460cd0d52d3e2066e634f3964811386f795 100644
--- a/pkg/iac/scanners/azure/arm/parser/armjson/parse_array_test.go
+++ b/pkg/iac/scanners/azure/arm/parser/armjson/parse_array_test.go
@@ -14,7 +14,7 @@ func Test_Array_Empty(t *testing.T) {
target := []int{}
metadata := types.NewTestMetadata()
require.NoError(t, Unmarshal(example, &target, &metadata))
- assert.Len(t, target, 0)
+ assert.Empty(t, target)
}
func Test_Array_ToSlice(t *testing.T) {
diff --git a/pkg/iac/scanners/azure/arm/parser/parser_test.go b/pkg/iac/scanners/azure/arm/parser/parser_test.go
index d54a147370e00c96737eb2ccc11027b97f5b1637..759127ca0b00abe4dcef8a10cb9dc7b623a9cbb0 100644
--- a/pkg/iac/scanners/azure/arm/parser/parser_test.go
+++ b/pkg/iac/scanners/azure/arm/parser/parser_test.go
@@ -215,7 +215,7 @@ func TestParser_Parse(t *testing.T) {
require.NoError(t, err)
if !tt.wantDeployment {
- assert.Len(t, got, 0)
+ assert.Empty(t, got)
return
}
diff --git a/pkg/iac/scanners/cloudformation/parser/fn_builtin_test.go b/pkg/iac/scanners/cloudformation/parser/fn_builtin_test.go
index 9a14029344a8309f103678d404f3a76be67e46fe..c5fbce41b489691c9d2ce6121b5da48c838a4df1 100644
--- a/pkg/iac/scanners/cloudformation/parser/fn_builtin_test.go
+++ b/pkg/iac/scanners/cloudformation/parser/fn_builtin_test.go
@@ -20,7 +20,7 @@ func Test_cidr_generator(t *testing.T) {
}
ranges, err := calculateCidrs("10.1.0.0/16", 4, 4, original)
- require.Nil(t, err)
+ require.NoError(t, err)
require.Len(t, ranges, 4)
results := make(map[int]string)
@@ -47,7 +47,7 @@ func Test_cidr_generator_8_bits(t *testing.T) {
}
ranges, err := calculateCidrs("10.1.0.0/16", 4, 8, original)
- require.Nil(t, err)
+ require.NoError(t, err)
require.Len(t, ranges, 4)
results := make(map[int]string)
diff --git a/pkg/iac/scanners/cloudformation/test/cf_scanning_test.go b/pkg/iac/scanners/cloudformation/test/cf_scanning_test.go
index 47063669a24de0913e55959beb5a1b3ef158120d..3fd466e40ed801054b8f08fa95a24b7faac9324e 100644
--- a/pkg/iac/scanners/cloudformation/test/cf_scanning_test.go
+++ b/pkg/iac/scanners/cloudformation/test/cf_scanning_test.go
@@ -19,7 +19,7 @@ func Test_basic_cloudformation_scanning(t *testing.T) {
results, err := cfScanner.ScanFS(context.TODO(), os.DirFS("./examples/bucket"), ".")
require.NoError(t, err)
- assert.Greater(t, len(results.GetFailed()), 0)
+ assert.NotEmpty(t, results.GetFailed())
}
func Test_cloudformation_scanning_has_expected_errors(t *testing.T) {
@@ -28,7 +28,7 @@ func Test_cloudformation_scanning_has_expected_errors(t *testing.T) {
results, err := cfScanner.ScanFS(context.TODO(), os.DirFS("./examples/bucket"), ".")
require.NoError(t, err)
- assert.Greater(t, len(results.GetFailed()), 0)
+ assert.NotEmpty(t, results.GetFailed())
}
func Test_cloudformation_scanning_with_debug(t *testing.T) {
@@ -44,5 +44,5 @@ func Test_cloudformation_scanning_with_debug(t *testing.T) {
require.NoError(t, err)
// check debug is as expected
- assert.Greater(t, len(debugWriter.String()), 0)
+ assert.NotEmpty(t, debugWriter.String())
}
diff --git a/pkg/iac/scanners/helm/test/scanner_test.go b/pkg/iac/scanners/helm/test/scanner_test.go
index a46031a8fb9866ec78c3bc8c2f8c6d57d5d0d4e5..fdcb0d3af8133c2150bd581026cdc7b20d48c4e8 100644
--- a/pkg/iac/scanners/helm/test/scanner_test.go
+++ b/pkg/iac/scanners/helm/test/scanner_test.go
@@ -357,5 +357,5 @@ deny[res] {
require.NoError(t, err)
require.Len(t, results, 1)
- assert.Len(t, results.GetFailed(), 0)
+ assert.Empty(t, results.GetFailed())
}
diff --git a/pkg/iac/scanners/kubernetes/scanner_test.go b/pkg/iac/scanners/kubernetes/scanner_test.go
index 11d58b3ce30c70bc8889e6de7aca3eae9a91c676..bf8ea32461eba739dfbe66d3b8ab3a8152e220f6 100644
--- a/pkg/iac/scanners/kubernetes/scanner_test.go
+++ b/pkg/iac/scanners/kubernetes/scanner_test.go
@@ -338,7 +338,7 @@ spec:
`))
require.NoError(t, err)
- assert.Greater(t, len(results.GetFailed()), 0)
+ assert.NotEmpty(t, results.GetFailed())
}
func Test_FileScan_WithSeparator(t *testing.T) {
@@ -358,7 +358,7 @@ spec:
`))
require.NoError(t, err)
- assert.Greater(t, len(results.GetFailed()), 0)
+ assert.NotEmpty(t, results.GetFailed())
}
func Test_FileScan_MultiManifests(t *testing.T) {
@@ -396,7 +396,7 @@ spec:
for _, failure := range results.GetFailed() {
actualCode, err := failure.GetCode()
require.NoError(t, err)
- assert.Greater(t, len(actualCode.Lines), 0)
+ assert.NotEmpty(t, actualCode.Lines)
for _, line := range actualCode.Lines {
assert.Greater(t, len(fileLines), line.Number)
assert.Equal(t, line.Content, fileLines[line.Number-1])
@@ -514,7 +514,7 @@ spec:
`))
require.NoError(t, err)
- assert.Greater(t, len(results.GetFailed()), 0)
+ assert.NotEmpty(t, results.GetFailed())
firstResult := results.GetFailed()[0]
assert.Equal(t, 2, firstResult.Metadata().Range().GetStartLine())
@@ -592,7 +592,7 @@ spec:
`))
require.NoError(t, err)
- require.Greater(t, len(results.GetFailed()), 0)
+ require.NotEmpty(t, results.GetFailed())
firstResult := results.GetFailed()[0]
assert.Equal(t, 8, firstResult.Metadata().Range().GetStartLine())
diff --git a/pkg/iac/scanners/terraform/executor/executor_test.go b/pkg/iac/scanners/terraform/executor/executor_test.go
index ac663c313c177e6034158bd088c0163b3336646a..d33e5d999c38a5cbd9ce1b661d752dddb0020619 100644
--- a/pkg/iac/scanners/terraform/executor/executor_test.go
+++ b/pkg/iac/scanners/terraform/executor/executor_test.go
@@ -56,7 +56,7 @@ resource "problem" "this" {
results, err := New().Execute(modules)
assert.Error(t, err)
- assert.Equal(t, len(results.GetFailed()), 0)
+ assert.Empty(t, results.GetFailed())
}
func Test_PanicInCheckAllowed(t *testing.T) {
@@ -104,7 +104,7 @@ resource "problem" "this" {
results, _ := New().Execute(modules)
require.NoError(t, err)
- assert.Equal(t, len(results.GetFailed()), 0)
+ assert.Empty(t, results.GetFailed())
}
func Test_PanicNotInCheckNotIncludePassedStopOnError(t *testing.T) {
diff --git a/pkg/iac/scanners/terraform/fs_test.go b/pkg/iac/scanners/terraform/fs_test.go
index 117b3c17ac6edd82a04f3de01aae7fc5312290bf..0089bc49a477bb836e9f22529cdd85d5a9d7be45 100644
--- a/pkg/iac/scanners/terraform/fs_test.go
+++ b/pkg/iac/scanners/terraform/fs_test.go
@@ -18,5 +18,5 @@ func Test_OS_FS(t *testing.T) {
)
results, err := s.ScanFS(context.TODO(), os.DirFS("testdata"), "fail")
require.NoError(t, err)
- assert.Greater(t, len(results.GetFailed()), 0)
+ assert.NotEmpty(t, results.GetFailed())
}
diff --git a/pkg/iac/scanners/terraform/ignore_test.go b/pkg/iac/scanners/terraform/ignore_test.go
index ddddd7a6e04e1246cf62392514d51dc8b6de3d1f..ce0596f157a93c8fdb7945c509d107eb7e7c6dc2 100644
--- a/pkg/iac/scanners/terraform/ignore_test.go
+++ b/pkg/iac/scanners/terraform/ignore_test.go
@@ -673,7 +673,7 @@ func Test_IgnoreInline(t *testing.T) {
secure = false # tfsec:ignore:%s
}
`, exampleRule.LongID()))
- assert.Len(t, results.GetFailed(), 0)
+ assert.Empty(t, results.GetFailed())
}
func Test_IgnoreWithAliasCodeStillIgnored(t *testing.T) {
@@ -686,7 +686,7 @@ resource "bad" "my-rule" {
}
`, "testworkspace")
- assert.Len(t, results.GetFailed(), 0)
+ assert.Empty(t, results.GetFailed())
}
func Test_TrivyIgnoreWithAliasCodeStillIgnored(t *testing.T) {
@@ -699,7 +699,7 @@ resource "bad" "my-rule" {
}
`, "testworkspace")
- assert.Len(t, results.GetFailed(), 0)
+ assert.Empty(t, results.GetFailed())
}
func Test_TrivyIgnoreInline(t *testing.T) {
@@ -711,7 +711,7 @@ func Test_TrivyIgnoreInline(t *testing.T) {
secure = false # trivy:ignore:%s
}
`, exampleRule.LongID()))
- assert.Len(t, results.GetFailed(), 0)
+ assert.Empty(t, results.GetFailed())
}
func Test_IgnoreInlineByAVDID(t *testing.T) {
@@ -742,7 +742,7 @@ func Test_IgnoreInlineByAVDID(t *testing.T) {
reg := rules.Register(exampleRule)
defer rules.Deregister(reg)
results := scanHCL(t, fmt.Sprintf(tc.input, id))
- assert.Len(t, results.GetFailed(), 0)
+ assert.Empty(t, results.GetFailed())
})
}
}
diff --git a/pkg/iac/scanners/terraform/parser/resolvers/registry_test.go b/pkg/iac/scanners/terraform/parser/resolvers/registry_test.go
index a36c19ae4c1ebc0f46565885b0ae9d73a7349308..1adc8e9d2922757acd994bc4233622a320149012 100644
--- a/pkg/iac/scanners/terraform/parser/resolvers/registry_test.go
+++ b/pkg/iac/scanners/terraform/parser/resolvers/registry_test.go
@@ -50,7 +50,7 @@ func Test_getPrivateRegistryTokenFromEnvVars_ConvertsSiteNameToEnvVar(t *testing
t.Setenv(tt.tokenName, "abcd")
token, err := getPrivateRegistryTokenFromEnvVars(tt.siteName)
assert.Equal(t, "abcd", token)
- assert.Equal(t, nil, err)
+ assert.NoError(t, err)
})
}
}
diff --git a/pkg/module/memfs_test.go b/pkg/module/memfs_test.go
index fe60004cb783c22c30b7fcb7363936aa3fb0ef4b..bac354087ae507c620e0b29c1e7a3eda0d5508ca 100644
--- a/pkg/module/memfs_test.go
+++ b/pkg/module/memfs_test.go
@@ -1,7 +1,6 @@
package module
import (
- "errors"
"io"
"io/fs"
"os"
@@ -54,6 +53,6 @@ func TestMemFS_NilIsDirectory(t *testing.T) {
t.Run("read invalid", func(t *testing.T) {
buf := make([]byte, 4)
_, err = f.Read(buf)
- require.True(t, errors.Is(err, fs.ErrInvalid))
+ require.ErrorIs(t, err, fs.ErrInvalid)
})
}
diff --git a/pkg/policy/policy_test.go b/pkg/policy/policy_test.go
index a12a8374f25e63b76a4aab65d7a6a8645b62e2b0..2ac5d92399d962eba34a8fea0c7cf3c21d71a2d1 100644
--- a/pkg/policy/policy_test.go
+++ b/pkg/policy/policy_test.go
@@ -124,7 +124,7 @@ func TestClient_LoadBuiltinPolicies(t *testing.T) {
got, err := c.LoadBuiltinPolicies()
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
}
@@ -369,7 +369,7 @@ func TestClient_DownloadBuiltinPolicies(t *testing.T) {
err = c.DownloadBuiltinPolicies(context.Background(), ftypes.RegistryOptions{})
if tt.wantErr != "" {
- require.NotNil(t, err)
+ require.Error(t, err)
assert.Contains(t, err.Error(), tt.wantErr)
return
}
diff --git a/pkg/rpc/client/client_test.go b/pkg/rpc/client/client_test.go
index b3adeeed376cc6940fa5b73b52befa3840629295..e3c0b67ff4336efcf77583b8223166144861b57e 100644
--- a/pkg/rpc/client/client_test.go
+++ b/pkg/rpc/client/client_test.go
@@ -201,7 +201,7 @@ func TestScanner_Scan(t *testing.T) {
gotResults, gotOS, err := s.Scan(context.Background(), tt.args.target, tt.args.imageID, tt.args.layerIDs, tt.args.options)
if tt.wantErr != "" {
- require.NotNil(t, err, tt.name)
+ require.Error(t, err, tt.name)
require.Contains(t, err.Error(), tt.wantErr, tt.name)
return
}
diff --git a/pkg/rpc/server/listen_test.go b/pkg/rpc/server/listen_test.go
index 2a3399bf5eb9bcaded95249764ec54dbad1065a9..093aebca0c90ba6ebb01a0de043fd35d634dc9b7 100644
--- a/pkg/rpc/server/listen_test.go
+++ b/pkg/rpc/server/listen_test.go
@@ -166,7 +166,7 @@ func Test_dbWorker_update(t *testing.T) {
err := w.update(context.Background(), tt.args.appVersion, cacheDir,
tt.needsUpdate.input.skip, &dbUpdateWg, &requestWg, ftypes.RegistryOptions{})
if tt.wantErr != "" {
- require.NotNil(t, err, tt.name)
+ require.Error(t, err, tt.name)
assert.Contains(t, err.Error(), tt.wantErr, tt.name)
return
}
diff --git a/pkg/rpc/server/server_test.go b/pkg/rpc/server/server_test.go
index 8c19e897035bba5b7735d67d2c8ce0a78b60d56c..ca4a66850faffebc284f94486b3d9bfe407dfbd5 100644
--- a/pkg/rpc/server/server_test.go
+++ b/pkg/rpc/server/server_test.go
@@ -174,7 +174,7 @@ func TestScanServer_Scan(t *testing.T) {
s := NewScanServer(mockDriver)
got, err := s.Scan(context.Background(), tt.args.in)
if tt.wantErr != "" {
- require.NotNil(t, err, tt.name)
+ require.Error(t, err, tt.name)
assert.Contains(t, err.Error(), tt.wantErr, tt.name)
return
}
@@ -273,7 +273,7 @@ func TestCacheServer_PutArtifact(t *testing.T) {
got, err := s.PutArtifact(context.Background(), tt.args.in)
if tt.wantErr != "" {
- require.NotNil(t, err, tt.name)
+ require.Error(t, err, tt.name)
assert.Contains(t, err.Error(), tt.wantErr, tt.name)
return
} else {
@@ -508,7 +508,7 @@ func TestCacheServer_PutBlob(t *testing.T) {
got, err := s.PutBlob(context.Background(), tt.args.in)
if tt.wantErr != "" {
- require.NotNil(t, err, tt.name)
+ require.Error(t, err, tt.name)
assert.Contains(t, err.Error(), tt.wantErr, tt.name)
return
} else {
@@ -573,7 +573,7 @@ func TestCacheServer_MissingBlobs(t *testing.T) {
s := NewCacheServer(mockCache)
got, err := s.MissingBlobs(tt.args.ctx, tt.args.in)
if tt.wantErr != "" {
- require.NotNil(t, err, tt.name)
+ require.Error(t, err, tt.name)
assert.Contains(t, err.Error(), tt.wantErr, tt.name)
return
} else {
diff --git a/pkg/scanner/local/scan_test.go b/pkg/scanner/local/scan_test.go
index f15c90f2964c6a576301b6ef08bf6f071f03aff8..9bc8124d10eeedf399ecea898c38e3122ac9b644 100644
--- a/pkg/scanner/local/scan_test.go
+++ b/pkg/scanner/local/scan_test.go
@@ -1371,7 +1371,7 @@ func TestScanner_Scan(t *testing.T) {
s := NewScanner(applier, ospkg.NewScanner(), langpkg.NewScanner(), vulnerability.NewClient(db.Config{}))
gotResults, gotOS, err := s.Scan(context.Background(), tt.args.target, "", tt.args.layerIDs, tt.args.options)
if tt.wantErr != "" {
- require.NotNil(t, err, tt.name)
+ require.Error(t, err, tt.name)
require.Contains(t, err.Error(), tt.wantErr, tt.name)
return
}
diff --git a/pkg/scanner/scan_test.go b/pkg/scanner/scan_test.go
index bc6a0d6696e266db224f45e5dc9bc36c60199058..eaa0a6028e693160b7d5d717c73ef1477ccb3f17 100644
--- a/pkg/scanner/scan_test.go
+++ b/pkg/scanner/scan_test.go
@@ -202,7 +202,7 @@ func TestScanner_ScanArtifact(t *testing.T) {
s := NewScanner(d, mockArtifact)
got, err := s.ScanArtifact(ctx, tt.args.options)
if tt.wantErr != "" {
- require.NotNil(t, err, tt.name)
+ require.Error(t, err, tt.name)
require.Contains(t, err.Error(), tt.wantErr, tt.name)
return
} else {
diff --git a/pkg/utils/fsutils/fs_test.go b/pkg/utils/fsutils/fs_test.go
index b6304ea7edb35999f09a7233799704d617a91449..14d39c2fa5d4f8b763e4aa691062676846016bf0 100644
--- a/pkg/utils/fsutils/fs_test.go
+++ b/pkg/utils/fsutils/fs_test.go
@@ -64,7 +64,7 @@ func TestCopyFile(t *testing.T) {
_, err := CopyFile(src, dst)
if tt.wantErr != "" {
- require.NotNil(t, err, tt.name)
+ require.Error(t, err, tt.name)
assert.Equal(t, err.Error(), tt.wantErr, tt.name)
} else {
assert.NoError(t, err, tt.name)