Skip to content

Commit

Permalink
fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
simar7 committed Sep 13, 2024
1 parent 6eb4b76 commit 01e8a4f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions pkg/result/filter.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import (
"sort"
"strings"

"github.com/aquasecurity/trivy/pkg/fanal/walker"
"github.com/aquasecurity/trivy/pkg/log"
"github.com/open-policy-agent/opa/rego"
"github.com/samber/lo"
"golang.org/x/xerrors"

dbTypes "github.com/aquasecurity/trivy-db/pkg/types"
"github.com/aquasecurity/trivy/pkg/fanal/walker"
"github.com/aquasecurity/trivy/pkg/log"
"github.com/aquasecurity/trivy/pkg/types"
"github.com/aquasecurity/trivy/pkg/vex"
)
Expand Down
12 changes: 6 additions & 6 deletions pkg/result/filter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ func TestFilter(t *testing.T) {
EndLine: 456,
Occurrences: []ftypes.Occurrence{
{
Resource: "foo-resource-occurance-1",
Filename: "bar-filename-occurance-1",
Resource: "foo-resource-occurrence-1",
Filename: "bar-filename-occurrence-1",
Location: ftypes.Location{
StartLine: 666,
EndLine: 888,
Expand Down Expand Up @@ -172,8 +172,8 @@ func TestFilter(t *testing.T) {
EndLine: 456,
Occurrences: []ftypes.Occurrence{
{
Resource: "foo-resource-occurance-3",
Filename: "../modules/bar-filename-occurance-3",
Resource: "foo-resource-occurrence-3",
Filename: "../modules/bar-filename-occurrence-3",
Location: ftypes.Location{
StartLine: 666,
EndLine: 888,
Expand Down Expand Up @@ -1100,7 +1100,7 @@ func TestFilter(t *testing.T) {
dbTypes.SeverityLow,
dbTypes.SeverityHigh,
},
skipFiles: []string{"../**/bar-filename-occurance-3"},
skipFiles: []string{"../**/bar-filename-occurrence-3"},
},
want: types.Report{
Results: types.Results{
Expand All @@ -1117,7 +1117,7 @@ func TestFilter(t *testing.T) {
{
Type: types.FindingTypeMisconfiguration,
Status: types.FindingStatusIgnored,
Statement: "skipped due to glob match: [../**/bar-filename-occurance-3]",
Statement: "skipped due to glob match: [../**/bar-filename-occurrence-3]",
Source: "trivy cli args",
Finding: misconf3,
},
Expand Down

0 comments on commit 01e8a4f

Please sign in to comment.