diff --git a/.golangci.yaml b/.golangci.yaml index 8e447bfc3..39a9e2e3d 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -12,7 +12,6 @@ linters: enable: - asciicheck - bodyclose - - depguard - dogsled - dupl - errcheck @@ -57,6 +56,7 @@ run: # do not enable... # - deadcode # The owner seems to have abandoned the linter. Replaced by "unused". +# - depguard # We don't have a configuration for this yet # - goprintffuncname # does not catch all cases and there are exceptions # - nakedret # does not catch all cases and should not fail a build # - gochecknoglobals diff --git a/Makefile b/Makefile index ae917777f..08865e055 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ CHRONICLE_CMD = $(TEMP_DIR)/chronicle GLOW_CMD = $(TEMP_DIR)/glow # Tool versions ################################# -GOLANGCILINT_VERSION := v1.52.2 +GOLANGCILINT_VERSION := v1.53.2 GOSIMPORTS_VERSION := v0.3.8 BOUNCER_VERSION := v0.4.0 CHRONICLE_VERSION := v0.6.0 diff --git a/syft/internal/fileresolver/unindexed_directory.go b/syft/internal/fileresolver/unindexed_directory.go index ae2300c5a..31e888913 100644 --- a/syft/internal/fileresolver/unindexed_directory.go +++ b/syft/internal/fileresolver/unindexed_directory.go @@ -374,7 +374,7 @@ func (f unindexedDirectoryResolverFS) resolve(filePath string) (resolved string, abs := f.u.absPath(resolved) fi, _, err = f.u.ls.LstatIfPossible(abs) if err != nil { - return + return resolved, fi, err } for f.u.isSymlink(fi) { if slices.Contains(visited, resolved) {