mirror of
https://github.com/aquasecurity/trivy.git
synced 2025-12-12 15:50:15 -08:00
chore: bump golangci-lint to v1.61.0 (#7853)
Signed-off-by: knqyf263 <knqyf263@gmail.com>
This commit is contained in:
2
.github/workflows/test.yaml
vendored
2
.github/workflows/test.yaml
vendored
@@ -42,7 +42,7 @@ jobs:
|
||||
id: lint
|
||||
uses: golangci/golangci-lint-action@v6.0.1
|
||||
with:
|
||||
version: v1.59
|
||||
version: v1.61
|
||||
args: --verbose --out-format=line-number
|
||||
if: matrix.operating-system == 'ubuntu-latest'
|
||||
|
||||
|
||||
@@ -68,6 +68,7 @@ linters-settings:
|
||||
excludes:
|
||||
- G101
|
||||
- G114
|
||||
- G115
|
||||
- G204
|
||||
- G304
|
||||
- G402
|
||||
|
||||
@@ -77,7 +77,7 @@ func (Tool) Wire() error {
|
||||
|
||||
// GolangciLint installs golangci-lint
|
||||
func (t Tool) GolangciLint() error {
|
||||
const version = "v1.59.1"
|
||||
const version = "v1.61.0"
|
||||
bin := filepath.Join(GOBIN, "golangci-lint")
|
||||
if exists(bin) && t.matchGolangciLintVersion(bin, version) {
|
||||
return nil
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package walker_test
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
@@ -42,8 +41,11 @@ func TestSkipFile(t *testing.T) {
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "multiple skip files",
|
||||
skipFiles: []string{"/etc/*/*", "/var/log/*.txt"},
|
||||
name: "multiple skip files",
|
||||
skipFiles: []string{
|
||||
"/etc/*/*",
|
||||
"/var/log/*.txt",
|
||||
},
|
||||
wants: map[string]bool{
|
||||
"/etc/foo": false,
|
||||
"/etc/foo/bar": true,
|
||||
@@ -65,7 +67,7 @@ func TestSkipFile(t *testing.T) {
|
||||
for file, want := range tt.wants {
|
||||
file = filepath.ToSlash(filepath.Clean(file))
|
||||
got := utils.SkipPath(file, utils.CleanSkipPaths(tt.skipFiles))
|
||||
assert.Equal(t, want, got, fmt.Sprintf("skipFiles: %s, file: %s", tt.skipFiles, file))
|
||||
assert.Equal(t, want, got, "skipFiles: %s, file: %s", tt.skipFiles, file)
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -108,8 +110,11 @@ func TestSkipDir(t *testing.T) {
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "multiple dirs",
|
||||
skipDirs: []string{"/etc/*/*", "/var/log/*"},
|
||||
name: "multiple dirs",
|
||||
skipDirs: []string{
|
||||
"/etc/*/*",
|
||||
"/var/log/*",
|
||||
},
|
||||
wants: map[string]bool{
|
||||
"/etc/foo": false,
|
||||
"/etc/foo/bar": true,
|
||||
@@ -139,7 +144,7 @@ func TestSkipDir(t *testing.T) {
|
||||
for dir, want := range tt.wants {
|
||||
dir = filepath.ToSlash(filepath.Clean(dir))
|
||||
got := utils.SkipPath(dir, utils.CleanSkipPaths(tt.skipDirs))
|
||||
assert.Equal(t, want, got, fmt.Sprintf("defaultSkipDirs: %s, dir: %s", tt.skipDirs, dir))
|
||||
assert.Equal(t, want, got, "defaultSkipDirs: %s, dir: %s", tt.skipDirs, dir)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ func (m *Manager) Search(ctx context.Context, keyword string) error {
|
||||
}
|
||||
}
|
||||
|
||||
if _, err = fmt.Fprintf(m.w, buf.String()); err != nil {
|
||||
if _, err = fmt.Fprint(m.w, buf.String()); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user