Skip to content

Commit c479433

Browse files
mmorel-35mmorel-35
committed
fix: testifylint last issues
Signed-off-by: Matthieu MOREL <[email protected]>
1 parent 427a18e commit c479433

File tree

21 files changed

+60
-59
lines changed

21 files changed

+60
-59
lines changed

‎.golangci.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,6 @@ linters:
140140
- linters:
141141
- goconst
142142
text: "string `each` has 3 occurrences, make it a constant" # FIXME
143-
- linters:
144-
- testifylint
145-
text: "(len|empty|equal-values)" # FIXME
146143
presets:
147144
- comments
148145
- common-false-positives

‎internal/testutil/util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func AssertRuleFound(t *testing.T, ruleID string, results scan.Results, message
2323
m := result.Metadata()
2424
meta := &m
2525
for meta != nil {
26-
assert.NotNil(t, meta.Range(), 0)
26+
assert.NotNil(t, meta.Range())
2727
assert.Positive(t, meta.Range().GetStartLine())
2828
assert.Positive(t, meta.Range().GetEndLine())
2929
meta = meta.Parent()

‎pkg/cache/fs_test.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func newTempDB(t *testing.T, dbPath string) (string, error) {
2020
dir := t.TempDir()
2121
if dbPath != "" {
2222
d := filepath.Join(dir, "fanal")
23-
if err := os.MkdirAll(d, 0700); err != nil {
23+
if err := os.MkdirAll(d, 0o700); err != nil {
2424
return "", err
2525
}
2626

@@ -105,7 +105,11 @@ func TestFSCache_GetBlob(t *testing.T) {
105105
}()
106106

107107
got, err := fs.GetBlob(tt.args.layerID)
108-
assert.Equal(t, tt.wantErr, err != nil, err)
108+
if tt.wantErr {
109+
require.Error(t, err)
110+
} else {
111+
require.NoError(t, err)
112+
}
109113
assert.Equal(t, tt.want, got)
110114
})
111115
}

‎pkg/detector/ospkg/redhat/redhat_test.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,11 @@ func TestScanner_Detect(t *testing.T) {
428428

429429
s := redhat.NewScanner()
430430
got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs)
431-
require.Equal(t, tt.wantErr, err != nil, err)
431+
if tt.wantErr {
432+
require.Error(t, err)
433+
} else {
434+
require.NoError(t, err)
435+
}
432436
assert.Equal(t, tt.want, got)
433437
})
434438
}

‎pkg/fanal/analyzer/language/golang/binary/binary_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func Test_gobinaryLibraryAnalyzer_Required(t *testing.T) {
122122
fileInfo, err := os.Lstat(tt.filePath)
123123
require.NoError(t, err)
124124
got := a.Required(tt.filePath, fileInfo)
125-
assert.Equal(t, tt.want, got, fileInfo.Mode().Perm())
125+
assert.Equal(t, tt.want, got, "%+v", fileInfo.Mode().Perm())
126126
})
127127
}
128128

‎pkg/fanal/analyzer/language/rust/binary/binary_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func Test_rustBinaryLibraryAnalyzer_Required(t *testing.T) {
102102
fileInfo, err := os.Lstat(tt.filePath)
103103
require.NoError(t, err)
104104
got := a.Required(tt.filePath, fileInfo)
105-
assert.Equal(t, tt.want, got, fileInfo.Mode().Perm())
105+
assert.Equal(t, tt.want, got, "%+v", fileInfo.Mode().Perm())
106106
})
107107
}
108108
}

‎pkg/fanal/image/daemon/docker_test.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"github.com/docker/docker/api/types"
77
"github.com/google/go-containerregistry/pkg/name"
88
v1 "github.com/google/go-containerregistry/pkg/v1"
9-
"github.com/stretchr/testify/assert"
109
"github.com/stretchr/testify/require"
1110
)
1211

@@ -40,7 +39,11 @@ func TestDockerImage(t *testing.T) {
4039
require.NoError(t, err)
4140

4241
_, cleanup, err := DockerImage(ref, "")
43-
assert.Equal(t, tt.wantErr, err != nil, err)
42+
if tt.wantErr {
43+
require.Error(t, err)
44+
} else {
45+
require.NoError(t, err)
46+
}
4447
defer func() {
4548
if cleanup != nil {
4649
cleanup()

‎pkg/fanal/image/daemon/image_test.go

+15-4
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ func Test_image_ConfigName(t *testing.T) {
7272
}
7373

7474
func Test_image_ConfigNameWithCustomDockerHost(t *testing.T) {
75-
7675
ref, err := name.ParseReference("alpine:3.11")
7776
require.NoError(t, err)
7877

@@ -241,7 +240,11 @@ func Test_image_ConfigFile(t *testing.T) {
241240
defer cleanup()
242241

243242
conf, err := img.ConfigFile()
244-
require.Equal(t, tt.wantErr, err != nil, err)
243+
if tt.wantErr {
244+
require.Error(t, err)
245+
} else {
246+
require.NoError(t, err)
247+
}
245248
assert.Equal(t, tt.want, conf)
246249
})
247250
}
@@ -286,7 +289,11 @@ func Test_image_LayerByDiffID(t *testing.T) {
286289
defer cleanup()
287290

288291
_, err = img.LayerByDiffID(tt.args.h)
289-
assert.Equal(t, tt.wantErr, err != nil, err)
292+
if tt.wantErr {
293+
assert.Error(t, err)
294+
} else {
295+
require.NoError(t, err)
296+
}
290297
})
291298
}
292299
}
@@ -315,7 +322,11 @@ func Test_image_RawConfigFile(t *testing.T) {
315322
defer cleanup()
316323

317324
got, err := img.RawConfigFile()
318-
assert.Equal(t, tt.wantErr, err != nil, err)
325+
if tt.wantErr {
326+
require.Error(t, err)
327+
} else {
328+
require.NoError(t, err)
329+
}
319330

320331
if err != nil {
321332
return

‎pkg/fanal/image/daemon/podman_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func TestPodmanImage(t *testing.T) {
9999
confFile, err := img.ConfigFile()
100100
require.NoError(t, err)
101101

102-
assert.Equal(t, len(confFile.History), len(tt.wantCreateBy))
102+
assert.Len(t, tt.wantCreateBy, len(confFile.History))
103103
for _, h := range confFile.History {
104104
assert.Contains(t, tt.wantCreateBy, h.CreatedBy)
105105
}

‎pkg/fanal/image/image_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -163,16 +163,16 @@ func TestNewDockerImage(t *testing.T) {
163163
wantConfigFile: &v1.ConfigFile{
164164
Architecture: "amd64",
165165
Container: "7f4a36a667d138b079b5ff059485ff65bfbb5ebc48f24a89f983b918e73f4f28",
166-
Created: v1.Time{Time: time.Date(2020, 1, 23, 16, 53, 06, 686519038, time.UTC)},
166+
Created: v1.Time{Time: time.Date(2020, 1, 23, 16, 53, 0o6, 686519038, time.UTC)},
167167
DockerVersion: "18.06.1-ce",
168168
History: []v1.History{
169169
{
170-
Created: v1.Time{Time: time.Date(2020, 1, 23, 16, 53, 06, 551172402, time.UTC)},
170+
Created: v1.Time{Time: time.Date(2020, 1, 23, 16, 53, 0o6, 551172402, time.UTC)},
171171
CreatedBy: "/bin/sh -c #(nop) ADD file:d48cac34fac385cbc1de6adfdd88300f76f9bbe346cd17e64fd834d042a98326 in / ",
172172
EmptyLayer: false,
173173
},
174174
{
175-
Created: v1.Time{Time: time.Date(2020, 1, 23, 16, 53, 06, 686519038, time.UTC)},
175+
Created: v1.Time{Time: time.Date(2020, 1, 23, 16, 53, 0o6, 686519038, time.UTC)},
176176
CreatedBy: "/bin/sh -c #(nop) CMD [\"/bin/sh\"]",
177177
Comment: "",
178178
EmptyLayer: true,
@@ -222,16 +222,16 @@ func TestNewDockerImage(t *testing.T) {
222222
wantConfigFile: &v1.ConfigFile{
223223
Architecture: "amd64",
224224
Container: "7f4a36a667d138b079b5ff059485ff65bfbb5ebc48f24a89f983b918e73f4f28",
225-
Created: v1.Time{Time: time.Date(2020, 1, 23, 16, 53, 06, 686519038, time.UTC)},
225+
Created: v1.Time{Time: time.Date(2020, 1, 23, 16, 53, 0o6, 686519038, time.UTC)},
226226
DockerVersion: "18.06.1-ce",
227227
History: []v1.History{
228228
{
229-
Created: v1.Time{Time: time.Date(2020, 1, 23, 16, 53, 06, 551172402, time.UTC)},
229+
Created: v1.Time{Time: time.Date(2020, 1, 23, 16, 53, 0o6, 551172402, time.UTC)},
230230
CreatedBy: "/bin/sh -c #(nop) ADD file:d48cac34fac385cbc1de6adfdd88300f76f9bbe346cd17e64fd834d042a98326 in / ",
231231
EmptyLayer: false,
232232
},
233233
{
234-
Created: v1.Time{Time: time.Date(2020, 1, 23, 16, 53, 06, 686519038, time.UTC)},
234+
Created: v1.Time{Time: time.Date(2020, 1, 23, 16, 53, 0o6, 686519038, time.UTC)},
235235
CreatedBy: "/bin/sh -c #(nop) CMD [\"/bin/sh\"]",
236236
Comment: "",
237237
EmptyLayer: true,
@@ -396,7 +396,7 @@ func TestNewDockerImageWithPrivateRegistry(t *testing.T) {
396396
defer cleanup()
397397

398398
if tt.wantErr != "" {
399-
require.ErrorContains(t, err, tt.wantErr, err)
399+
require.ErrorContains(t, err, tt.wantErr)
400400
} else {
401401
require.NoError(t, err)
402402
}
@@ -545,7 +545,7 @@ func TestDockerPlatformArguments(t *testing.T) {
545545
defer cleanup()
546546

547547
if tt.wantErr != "" {
548-
assert.ErrorContains(t, err, tt.wantErr, err)
548+
assert.ErrorContains(t, err, tt.wantErr)
549549
} else {
550550
require.NoError(t, err)
551551
}

‎pkg/fanal/image/oci_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func TestTryOCI(t *testing.T) {
6161
t.Run(test.name, func(t *testing.T) {
6262
_, err := tryOCI(test.ociImagePath)
6363
if test.wantErr != "" {
64-
require.ErrorContains(t, err, test.wantErr, err)
64+
require.ErrorContains(t, err, test.wantErr)
6565
} else {
6666
require.NoError(t, err)
6767
}

‎pkg/iac/adapters/arm/storage/adapt_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func Test_AdaptStorageDefaults(t *testing.T) {
2828
require.Len(t, output.Accounts, 1)
2929

3030
account := output.Accounts[0]
31-
assert.Equal(t, "", account.MinimumTLSVersion.Value())
31+
assert.Empty(t, account.MinimumTLSVersion.Value())
3232
assert.False(t, account.EnforceHTTPS.Value())
3333
assert.True(t, account.PublicNetworkAccess.Value())
3434

‎pkg/iac/detection/detect_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ rules:
449449
t.Run(test.name, func(t *testing.T) {
450450
t.Run("GetTypes", func(t *testing.T) {
451451
actualDetections := GetTypes(test.path, test.r)
452-
assert.Equal(t, len(test.expected), len(actualDetections))
452+
assert.Len(t, actualDetections, len(test.expected))
453453
for _, expected := range test.expected {
454454
resetReader(test.r)
455455
found := slices.Contains(actualDetections, expected)

‎pkg/iac/rego/scanner_test.go

+3-21
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ func CreateFS(t *testing.T, files map[string]string) fs.FS {
3131
}
3232

3333
func Test_RegoScanning_Deny(t *testing.T) {
34-
3534
srcFS := CreateFS(t, map[string]string{
3635
"policies/test.rego": `
3736
package defsec.test
@@ -64,14 +63,13 @@ deny {
6463
}
6564

6665
func Test_RegoScanning_AbsolutePolicyPath_Deny(t *testing.T) {
67-
6866
tmp := t.TempDir()
69-
require.NoError(t, os.Mkdir(filepath.Join(tmp, "policies"), 0755))
67+
require.NoError(t, os.Mkdir(filepath.Join(tmp, "policies"), 0o755))
7068
require.NoError(t, os.WriteFile(filepath.Join(tmp, "policies", "test.rego"), []byte(`package defsec.test
7169
7270
deny {
7371
input.evil
74-
}`), 0600))
72+
}`), 0o600))
7573

7674
srcFS := os.DirFS(tmp)
7775

@@ -128,7 +126,6 @@ deny {
128126
}
129127

130128
func Test_RegoScanning_WithRuntimeValues(t *testing.T) {
131-
132129
t.Setenv("DEFSEC_RUNTIME_VAL", "AOK")
133130

134131
srcFS := CreateFS(t, map[string]string{
@@ -230,7 +227,6 @@ deny[res] {
230227
assert.Equal(t, "/evil.lol", results.GetFailed()[0].Metadata().Range().GetFilename())
231228
assert.Equal(t, 123, results.GetFailed()[0].Metadata().Range().GetStartLine())
232229
assert.Equal(t, 456, results.GetFailed()[0].Metadata().Range().GetEndLine())
233-
234230
}
235231

236232
func Test_RegoScanning_WithDenyMetadata_PersistedPath(t *testing.T) {
@@ -271,7 +267,6 @@ deny[res] {
271267
assert.Equal(t, "/blah.txt", results.GetFailed()[0].Metadata().Range().GetFilename())
272268
assert.Equal(t, 123, results.GetFailed()[0].Metadata().Range().GetStartLine())
273269
assert.Equal(t, 456, results.GetFailed()[0].Metadata().Range().GetEndLine())
274-
275270
}
276271

277272
func Test_RegoScanning_WithStaticMetadata(t *testing.T) {
@@ -332,7 +327,6 @@ deny[res] {
332327
assert.Equal(t, severity.Low, failure.Rule().Severity)
333328
assert.Equal(t, "This is a recommendation", failure.Rule().Resolution)
334329
assert.Equal(t, "https://google.com", failure.Rule().Links[0])
335-
336330
}
337331

338332
func Test_RegoScanning_WithMatchingInputSelector(t *testing.T) {
@@ -403,7 +397,6 @@ deny {
403397
}
404398

405399
func Test_RegoScanning_NoTracingByDefault(t *testing.T) {
406-
407400
srcFS := CreateFS(t, map[string]string{
408401
"policies/test.rego": `
409402
package defsec.test
@@ -435,7 +428,6 @@ deny {
435428
}
436429

437430
func Test_RegoScanning_GlobalTracingEnabled(t *testing.T) {
438-
439431
srcFS := CreateFS(t, map[string]string{
440432
"policies/test.rego": `
441433
package defsec.test
@@ -471,7 +463,6 @@ deny {
471463
}
472464

473465
func Test_RegoScanning_PerResultTracingEnabled(t *testing.T) {
474-
475466
srcFS := CreateFS(t, map[string]string{
476467
"policies/test.rego": `
477468
package defsec.test
@@ -504,7 +495,6 @@ deny {
504495
}
505496

506497
func Test_dynamicMetadata(t *testing.T) {
507-
508498
srcFS := CreateFS(t, map[string]string{
509499
"policies/test.rego": `
510500
package defsec.test
@@ -536,7 +526,6 @@ deny {
536526
}
537527

538528
func Test_staticMetadata(t *testing.T) {
539-
540529
srcFS := CreateFS(t, map[string]string{
541530
"policies/test.rego": `
542531
package defsec.test
@@ -568,7 +557,6 @@ deny {
568557
}
569558

570559
func Test_annotationMetadata(t *testing.T) {
571-
572560
srcFS := CreateFS(t, map[string]string{
573561
"policies/test.rego": `# METADATA
574562
# title: i am a title
@@ -623,7 +611,6 @@ deny {
623611
}
624612

625613
func Test_RegoScanning_WithInvalidInputSchema(t *testing.T) {
626-
627614
srcFS := CreateFS(t, map[string]string{
628615
"policies/test.rego": `# METADATA
629616
# schemas:
@@ -643,7 +630,6 @@ deny {
643630
}
644631

645632
func Test_RegoScanning_WithValidInputSchema(t *testing.T) {
646-
647633
srcFS := CreateFS(t, map[string]string{
648634
"policies/test.rego": `# METADATA
649635
# schemas:
@@ -766,7 +752,6 @@ deny {
766752
}
767753

768754
func Test_NoErrorsWhenUsingBadRegoCheck(t *testing.T) {
769-
770755
// this check cause eval_conflict_error
771756
// https://www.openpolicyagent.org/docs/latest/policy-language/#functions
772757
fsys := fstest.MapFS{
@@ -793,7 +778,7 @@ deny {
793778
}
794779

795780
func Test_RegoScanning_WithDeprecatedCheck(t *testing.T) {
796-
var testCases = []struct {
781+
testCases := []struct {
797782
name string
798783
policy string
799784
expectedResults int
@@ -865,7 +850,6 @@ deny {
865850
}
866851

867852
func Test_RegoScanner_WithCustomSchemas(t *testing.T) {
868-
869853
schema := `{
870854
"$id": "https://example.com/test.schema.json",
871855
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -934,7 +918,6 @@ deny {
934918
}
935919

936920
func Test_RegoScanner_WithDisabledCheckIDs(t *testing.T) {
937-
938921
check := `# METADATA
939922
# custom:
940923
# id: TEST-001
@@ -1000,7 +983,6 @@ deny {
1000983

1001984
for _, tt := range tests {
1002985
t.Run(tt.name, func(t *testing.T) {
1003-
1004986
scanner := rego.NewScanner(
1005987
rego.WithPolicyReader(strings.NewReader(tt.inputCheck)),
1006988
rego.WithDisabledCheckIDs(tt.disabledChecks...),

0 commit comments

Comments
 (0)