chore: appease linter

DanielleMaywood · DanielleMaywood · commit ecba0c6079d5 · 2025-07-23T17:40:39.000Z
diff --git a/agent/agentcontainers/api.go b/agent/agentcontainers/api.go
@@ -473,7 +473,7 @@ func (api *API) discoverDevcontainerProjects() error {
 func (api *API) discoverDevcontainersInProject(projectPath string) error {
 	patterns, err := ignore.ReadPatterns(api.fs, projectPath)
 	if err != nil {
-		return fmt.Errorf("read git ignore patterns: %w", err)
+		return xerrors.Errorf("read git ignore patterns: %w", err)
 	}
 
 	matcher := gitignore.NewMatcher(patterns)
diff --git a/agent/agentcontainers/ignore/dir.go b/agent/agentcontainers/ignore/dir.go
@@ -27,10 +27,10 @@ func FilePathToParts(path string) []string {
 	return components
 }
 
-func readIgnoreFile(fs afero.Fs, path string) ([]gitignore.Pattern, error) {
+func readIgnoreFile(fileSystem afero.Fs, path string) ([]gitignore.Pattern, error) {
 	var ps []gitignore.Pattern
 
-	data, err := afero.ReadFile(fs, filepath.Join(path, ".gitignore"))
+	data, err := afero.ReadFile(fileSystem, filepath.Join(path, ".gitignore"))
 	if err != nil && !errors.Is(err, os.ErrNotExist) {
 		return nil, err
 	}
@@ -47,7 +47,7 @@ func readIgnoreFile(fs afero.Fs, path string) ([]gitignore.Pattern, error) {
 func ReadPatterns(fileSystem afero.Fs, path string) ([]gitignore.Pattern, error) {
 	ps, _ := readIgnoreFile(fileSystem, path)
 
-	if err := afero.Walk(fileSystem, path, func(path string, info fs.FileInfo, err error) error {
+	if err := afero.Walk(fileSystem, path, func(path string, info fs.FileInfo, _ error) error {
 		if !info.IsDir() {
 			return nil
 		}
diff --git a/agent/agentcontainers/ignore/dir_test.go b/agent/agentcontainers/ignore/dir_test.go
@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/coder/coder/v2/agent/agentcontainers/ignore"
 	"github.com/stretchr/testify/require"
+
+	"github.com/coder/coder/v2/agent/agentcontainers/ignore"
 )
 
 func TestFilePathToParts(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,7 @@ func (api *API) discoverDevcontainerProjects() error {`
`473`	`473`	`func (api *API) discoverDevcontainersInProject(projectPath string) error {`
`474`	`474`	`patterns, err := ignore.ReadPatterns(api.fs, projectPath)`
`475`	`475`	`if err != nil {`
`476`		`- return fmt.Errorf("read git ignore patterns: %w", err)`
	`476`	`+ return xerrors.Errorf("read git ignore patterns: %w", err)`
`477`	`477`	`}`
`478`	`478`
`479`	`479`	`matcher := gitignore.NewMatcher(patterns)`
Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,10 @@ func FilePathToParts(path string) []string {`
`27`	`27`	`return components`
`28`	`28`	`}`
`29`	`29`
`30`		`-func readIgnoreFile(fs afero.Fs, path string) ([]gitignore.Pattern, error) {`
	`30`	`+func readIgnoreFile(fileSystem afero.Fs, path string) ([]gitignore.Pattern, error) {`
`31`	`31`	`var ps []gitignore.Pattern`
`32`	`32`
`33`		`- data, err := afero.ReadFile(fs, filepath.Join(path, ".gitignore"))`
	`33`	`+ data, err := afero.ReadFile(fileSystem, filepath.Join(path, ".gitignore"))`
`34`	`34`	`if err != nil && !errors.Is(err, os.ErrNotExist) {`
`35`	`35`	`return nil, err`
`36`	`36`	`}`
`@@ -47,7 +47,7 @@ func readIgnoreFile(fs afero.Fs, path string) ([]gitignore.Pattern, error) {`
`47`	`47`	`func ReadPatterns(fileSystem afero.Fs, path string) ([]gitignore.Pattern, error) {`
`48`	`48`	`ps, _ := readIgnoreFile(fileSystem, path)`
`49`	`49`
`50`		`- if err := afero.Walk(fileSystem, path, func(path string, info fs.FileInfo, err error) error {`
	`50`	`+ if err := afero.Walk(fileSystem, path, func(path string, info fs.FileInfo, _ error) error {`
`51`	`51`	`if !info.IsDir() {`
`52`	`52`	`return nil`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,9 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"testing"`
`6`	`6`
`7`		`- "github.com/coder/coder/v2/agent/agentcontainers/ignore"`
`8`	`7`	`"github.com/stretchr/testify/require"`
	`8`	`+`
	`9`	`+ "github.com/coder/coder/v2/agent/agentcontainers/ignore"`
`9`	`10`	`)`
`10`	`11`
`11`	`12`	`func TestFilePathToParts(t *testing.T) {`