Move tools to tools/go.mod; add golangci-lint there; update it to 2.5.0 (#3722)

denik · web-flow · commit 26536bf11bdb · 2025-10-06T13:50:04.000+02:00
## Changes - Move yamlfmt, gotestsum, and golangci-lint into a tools module that pins their versions - This pins golangci-lint as 2.5.0 which adds "no naked return" in gofumpt so this PR updates the code that triggers it. - We no longer use golangci-lint github action, the same command/version that is configured in tools/go.mod is used on CI as well. - Pre-build golangci-lint in Makefile, this takes 0.5s of start time on my machine. - Configure dependabot to manage tools/go.mod ## Why Relying on system golangci-lint results in people (and agents) running into issue due to version mismatch. This manages the version inside the repo, so everyone is one the same version and updates go through PR + testing. ------ https://chatgpt.com/codex/tasks/task_e_68e1967083908325baa2939b043cae54 Original PR: denik#3
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,6 +4,10 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "gomod"
+    directory: "/tools"
+    schedule:
+      interval: "weekly"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -116,10 +116,7 @@ jobs:
           # Exit with status code 1 if there are differences (i.e. unformatted files)
           git diff --exit-code
       - name: Run Go lint checks (does not include formatting checks)
-        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
-        with:
-          version: v2.4.0
-          args: --timeout=15m
+        run: go tool -modfile=tools/go.mod golangci-lint run --timeout=15m
       - name: Run ruff (Python linter and formatter)
         uses: astral-sh/ruff-action@0c50076f12c38c3d0115b7b519b54a91cb9cf0ad # v3.5.0
         with:
diff --git a/Makefile b/Makefile
@@ -2,40 +2,45 @@ default: checks fmt lint
 
 PACKAGES=./acceptance/... ./libs/... ./internal/... ./cmd/... ./bundle/... ./experimental/ssh/... .
 
+GO_TOOL ?= go tool -modfile=tools/go.mod
 GOTESTSUM_FORMAT ?= pkgname-and-test-fails
-GOTESTSUM_CMD ?= go tool gotestsum --format ${GOTESTSUM_FORMAT} --no-summary=skipped --jsonfile test-output.json
+GOTESTSUM_CMD ?= ${GO_TOOL} gotestsum --format ${GOTESTSUM_FORMAT} --no-summary=skipped --jsonfile test-output.json
 LOCAL_TIMEOUT ?= 30m
 
 
-lintfull:
-	golangci-lint run --fix
+lintfull: ./tools/golangci-lint
+	./tools/golangci-lint run --fix
 
-lint:
-	./tools/lintdiff.py run --fix
+lint: ./tools/golangci-lint
+	./tools/lintdiff.py ./tools/golangci-lint run --fix
 
 tidy:
 	@# not part of golangci-lint, apparently
 	go mod tidy
 
-lintcheck:
-	golangci-lint run ./...
+lintcheck: ./tools/golangci-lint
+	./tools/golangci-lint run ./...
 
-fmtfull: tools/yamlfmt
+fmtfull: ./tools/golangci-lint ./tools/yamlfmt
 	ruff format -n
-	golangci-lint fmt
+	./tools/golangci-lint fmt
 	./tools/yamlfmt .
 
-fmt: tools/yamlfmt
+fmt: ./tools/golangci-lint ./tools/yamlfmt
 	ruff format -n
-	./tools/lintdiff.py fmt
+	./tools/lintdiff.py ./tools/golangci-lint fmt
 	./tools/yamlfmt .
 
-# pre-building yamlfmt because I also want to call it from tests
-tools/yamlfmt: go.mod
-	go build -o tools/yamlfmt github.com/google/yamlfmt/cmd/yamlfmt
+# pre-building yamlfmt because it is invoked from tests and scripts
+tools/yamlfmt: tools/go.mod tools/go.sum
+	go build -modfile=tools/go.mod -o tools/yamlfmt github.com/google/yamlfmt/cmd/yamlfmt
 
-tools/yamlfmt.exe: go.mod
-	go build -o tools/yamlfmt.exe github.com/google/yamlfmt/cmd/yamlfmt
+tools/yamlfmt.exe: tools/go.mod tools/go.sum
+	go build -modfile=tools/go.mod -o tools/yamlfmt.exe github.com/google/yamlfmt/cmd/yamlfmt
+
+# pre-building golangci-lint because it's faster to run pre-built version
+tools/golangci-lint: tools/go.mod tools/go.sum
+	go build -modfile=tools/go.mod -o tools/golangci-lint github.com/golangci/golangci-lint/v2/cmd/golangci-lint
 
 ws:
 	./tools/validate_whitespace.py
@@ -65,7 +70,7 @@ test-update-aws:
 test-update-all: test-update test-update-aws
 
 slowest:
-	go tool gotestsum tool slowest --jsonfile test-output.json --threshold 1s --num 50
+	${GO_TOOL} gotestsum tool slowest --jsonfile test-output.json --threshold 1s --num 50
 
 cover:
 	rm -fr ./acceptance/build/cover/
@@ -102,7 +107,7 @@ schema:
 docs:
 	go run ./bundle/docsgen ./bundle/internal/schema ./bundle/docsgen
 
-INTEGRATION = go tool gotestsum --format github-actions --rerun-fails --jsonfile output.json --packages "./acceptance ./integration/..." -- -parallel 4 -timeout=2h
+INTEGRATION = ${GO_TOOL} gotestsum --format github-actions --rerun-fails --jsonfile output.json --packages "./acceptance ./integration/..." -- -parallel 4 -timeout=2h
 
 integration:
 	$(INTEGRATION)
diff --git a/bundle/internal/tf/codegen/schema/generate.go b/bundle/internal/tf/codegen/schema/generate.go
@@ -38,7 +38,7 @@ func (s *Schema) installTerraform(ctx context.Context) (path string, err error)
 	installDir := filepath.Join(s.WorkingDir, "bin")
 	err = os.MkdirAll(installDir, 0o755)
 	if err != nil {
-		return
+		return path, err
 	}
 
 	installer := &releases.ExactVersion{
@@ -50,7 +50,7 @@ func (s *Schema) installTerraform(ctx context.Context) (path string, err error)
 	installer.SetLogger(log.Default())
 
 	path, err = installer.Install(ctx)
-	return
+	return path, err
 }
 
 func (s *Schema) generateSchema(ctx context.Context, execPath string) error {
diff --git a/cmd/labs/project/login.go b/cmd/labs/project/login.go
@@ -48,23 +48,23 @@ func (lc *loginConfig) askWorkspace(ctx context.Context, cfg *config.Config) (*d
 func (lc *loginConfig) askWorkspaceProfile(ctx context.Context, cfg *config.Config) (err error) {
 	if cfg.Profile != "" {
 		lc.WorkspaceProfile = cfg.Profile
-		return
+		return err
 	}
 	if !cmdio.IsPromptSupported(ctx) {
 		return ErrNotInTTY
 	}
 	lc.WorkspaceProfile, err = root.AskForWorkspaceProfile(ctx)
 	cfg.Profile = lc.WorkspaceProfile
-	return
+	return err
 }
 
 func (lc *loginConfig) askCluster(ctx context.Context, w *databricks.WorkspaceClient) (err error) {
 	if !lc.NeedsCluster() {
-		return
+		return err
 	}
 	if w.Config.ClusterID != "" {
 		lc.ClusterID = w.Config.ClusterID
-		return
+		return err
 	}
 	if !cmdio.IsPromptSupported(ctx) {
 		return ErrNotInTTY
@@ -76,23 +76,23 @@ func (lc *loginConfig) askCluster(ctx context.Context, w *databricks.WorkspaceCl
 	}
 	w.Config.ClusterID = clusterID
 	lc.ClusterID = clusterID
-	return
+	return err
 }
 
 func (lc *loginConfig) askWarehouse(ctx context.Context, w *databricks.WorkspaceClient) (err error) {
 	if !lc.NeedsWarehouse() {
-		return
+		return err
 	}
 	if w.Config.WarehouseID != "" {
 		lc.WarehouseID = w.Config.WarehouseID
-		return
+		return err
 	}
 	if !cmdio.IsPromptSupported(ctx) {
 		return ErrNotInTTY
 	}
 	lc.WarehouseID, err = cfgpickers.AskForWarehouse(ctx, w,
 		cfgpickers.WithWarehouseTypes(lc.Installer.WarehouseTypes...))
-	return
+	return err
 }
 
 func (lc *loginConfig) askAccountProfile(ctx context.Context, cfg *config.Config) (err error) {
@@ -104,7 +104,7 @@ func (lc *loginConfig) askAccountProfile(ctx context.Context, cfg *config.Config
 	}
 	lc.AccountProfile, err = root.AskForAccountProfile(ctx)
 	cfg.Profile = lc.AccountProfile
-	return
+	return err
 }
 
 func (lc *loginConfig) save(ctx context.Context) error {
diff --git a/cmd/root/bundle.go b/cmd/root/bundle.go
@@ -52,7 +52,7 @@ func getProfile(cmd *cobra.Command) (value string) {
 	if flag != nil {
 		value = flag.Value.String()
 		if value != "" {
-			return
+			return value
 		}
 	}
 
diff --git a/go.mod b/go.mod
@@ -46,28 +46,20 @@ require (
 	cloud.google.com/go/compute/metadata v0.8.4 // indirect
 	github.com/ProtonMail/go-crypto v1.1.6 // indirect
 	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
-	github.com/bitfield/gotestdox v0.2.2 // indirect
-	github.com/bmatcuk/doublestar/v4 v4.7.1 // indirect
 	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
 	github.com/cloudflare/circl v1.6.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dnephin/pflag v1.0.7 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/s2a-go v0.1.9 // indirect
-	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/google/yamlfmt v0.17.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
 	github.com/googleapis/gax-go/v2 v2.15.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/zclconf/go-cty v1.16.4 // indirect
@@ -78,15 +70,8 @@ require (
 	go.opentelemetry.io/otel/trace v1.38.0 // indirect
 	golang.org/x/net v0.44.0 // indirect
 	golang.org/x/time v0.13.0 // indirect
-	golang.org/x/tools v0.37.0 // indirect
 	google.golang.org/api v0.249.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250922171735-9219d122eba9 // indirect
 	google.golang.org/grpc v1.75.1 // indirect
 	google.golang.org/protobuf v1.36.9 // indirect
-	gotest.tools/gotestsum v1.12.1 // indirect
-)
-
-tool (
-	github.com/google/yamlfmt/cmd/yamlfmt
-	gotest.tools/gotestsum
 )
diff --git a/go.sum b/go.sum
@@ -16,10 +16,6 @@ github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNx
 github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
 github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
 github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
-github.com/bitfield/gotestdox v0.2.2 h1:x6RcPAbBbErKLnapz1QeAlf3ospg8efBsedU93CDsnE=
-github.com/bitfield/gotestdox v0.2.2/go.mod h1:D+gwtS0urjBrzguAkTM2wodsTQYFHdpx8eqRJ3N+9pY=
-github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q=
-github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
 github.com/briandowns/spinner v1.23.1 h1:t5fDPmScwUjozhDj4FA46p5acZWIPXYE30qW2Ptu650=
 github.com/briandowns/spinner v1.23.1/go.mod h1:LaZeM4wm2Ywy6vO571mvhQNRcWfRUnXOs0RcKV0wYKM=
 github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE=
@@ -38,17 +34,13 @@ github.com/databricks/databricks-sdk-go v0.85.0/go.mod h1:hWoHnHbNLjPKiTm5K/7bcI
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dnephin/pflag v1.0.7 h1:oxONGlWxhmUct0YzKTgrpQv9AUA1wtPBn7zuSjJqptk=
-github.com/dnephin/pflag v1.0.7/go.mod h1:uxE91IoWURlOiTUIA8Mq5ZZkAv3dPUfZNaT80Zm7OQE=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
-github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
 github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UNbRM=
@@ -71,12 +63,8 @@ github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
 github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
-github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
-github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/yamlfmt v0.17.0 h1:/tdp01rIlvLz3LgJ2NtMLnqgAadZm33P7GcPU680b+w=
-github.com/google/yamlfmt v0.17.0/go.mod h1:gs0UEklJOYkUJ+OOCG0hg9n+DzucKDPlJElTUasVNK8=
 github.com/googleapis/enterprise-certificate-proxy v0.3.6 h1:GW/XbdyBFQ8Qe+YAmFU9uHLo7OnF5tL52HFAgMmyrf4=
 github.com/googleapis/enterprise-certificate-proxy v0.3.6/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA=
 github.com/googleapis/gax-go/v2 v2.15.0 h1:SyjDc1mGgZU5LncH8gimWo9lW1DtIfPibOG81vgd/bo=
@@ -121,8 +109,6 @@ github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOA
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
-github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/nwidger/jsoncolor v0.3.2 h1:rVJJlwAWDJShnbTYOQ5RM7yTA20INyKXlJ/fg4JMhHQ=
 github.com/nwidger/jsoncolor v0.3.2/go.mod h1:Cs34umxLbJvgBMnVNVqhji9BhoT/N/KinHqZptQ7cf4=
 github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4=
@@ -199,8 +185,6 @@ golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
 golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
 golang.org/x/time v0.13.0 h1:eUlYslOIt32DgYD6utsuUeHs4d7AsEYLuIAdg7FlYgI=
 golang.org/x/time v0.13.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
-golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE=
-golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
 gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
@@ -222,7 +206,3 @@ gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRN
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gotest.tools/gotestsum v1.12.1 h1:dvcxFBTFR1QsQmrCQa4k/vDXow9altdYz4CjdW+XeBE=
-gotest.tools/gotestsum v1.12.1/go.mod h1:mwDmLbx9DIvr09dnAoGgQPLaSXszNpXpWo2bsQge5BE=
-gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
-gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
diff --git a/libs/cmdio/io.go b/libs/cmdio/io.go
@@ -138,10 +138,10 @@ func (c *cmdIO) Select(items []Tuple, label string) (id string, err error) {
 		Stdin: io.NopCloser(c.in),
 	}).Run()
 	if err != nil {
-		return
+		return id, err
 	}
 	id = items[idx].Id
-	return
+	return id, err
 }
 
 // Show a selection prompt where the user can pick one of the name/id items.
diff --git a/libs/databrickscfg/profile/file.go b/libs/databrickscfg/profile/file.go
@@ -89,7 +89,7 @@ func (f FileProfilerImpl) LoadProfiles(ctx context.Context, fn ProfileMatchFunct
 		}
 	}
 
-	return
+	return profiles, err
 }
 
 func ProfileCompletion(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
diff --git a/libs/fileset/fileset.go b/libs/fileset/fileset.go
@@ -130,5 +130,5 @@ func (w *FileSet) recursiveListFiles(path string, seen map[string]struct{}) (out
 
 		return nil
 	})
-	return
+	return out, err
 }
diff --git a/libs/process/stub.go b/libs/process/stub.go
@@ -101,7 +101,7 @@ func (s *processStub) Commands() (called []string) {
 	for _, v := range s.calls {
 		called = append(called, s.normCmd(v))
 	}
-	return
+	return called
 }
 
 // CombinedEnvironment returns all enviroment variables used for all commands
diff --git a/libs/structs/structpath/path.go b/libs/structs/structpath/path.go
@@ -11,7 +11,7 @@ import (
 )
 
 const (
-	// Encodes string key, which is encoded as .field or as ['spark.conf']
+	// Encodes string key, which is encoded as .field or as ['spark.conf']x
 	tagStringKey = -1
 
 	// Encodes wildcard after a dot: foo.*
diff --git a/tools/go.mod b/tools/go.mod
diff --git a/tools/go.sum b/tools/go.sum
diff --git a/tools/lintdiff.py b/tools/lintdiff.py
diff --git a/tools/post-generate.sh b/tools/post-generate.sh

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ func (s *Schema) installTerraform(ctx context.Context) (path string, err error)`
`38`	`38`	`installDir := filepath.Join(s.WorkingDir, "bin")`
`39`	`39`	`err = os.MkdirAll(installDir, 0o755)`
`40`	`40`	`if err != nil {`
`41`		`- return`
	`41`	`+ return path, err`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`installer := &releases.ExactVersion{`
`@@ -50,7 +50,7 @@ func (s *Schema) installTerraform(ctx context.Context) (path string, err error)`
`50`	`50`	`installer.SetLogger(log.Default())`
`51`	`51`
`52`	`52`	`path, err = installer.Install(ctx)`
`53`		`- return`
	`53`	`+ return path, err`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`func (s *Schema) generateSchema(ctx context.Context, execPath string) error {`
Original file line number	Diff line number	Diff line change
`@@ -48,23 +48,23 @@ func (lc loginConfig) askWorkspace(ctx context.Context, cfg config.Config) (*d`
`48`	`48`	`func (lc loginConfig) askWorkspaceProfile(ctx context.Context, cfg config.Config) (err error) {`
`49`	`49`	`if cfg.Profile != "" {`
`50`	`50`	`lc.WorkspaceProfile = cfg.Profile`
`51`		`- return`
	`51`	`+ return err`
`52`	`52`	`}`
`53`	`53`	`if !cmdio.IsPromptSupported(ctx) {`
`54`	`54`	`return ErrNotInTTY`
`55`	`55`	`}`
`56`	`56`	`lc.WorkspaceProfile, err = root.AskForWorkspaceProfile(ctx)`
`57`	`57`	`cfg.Profile = lc.WorkspaceProfile`
`58`		`- return`
	`58`	`+ return err`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`func (lc loginConfig) askCluster(ctx context.Context, w databricks.WorkspaceClient) (err error) {`
`62`	`62`	`if !lc.NeedsCluster() {`
`63`		`- return`
	`63`	`+ return err`
`64`	`64`	`}`
`65`	`65`	`if w.Config.ClusterID != "" {`
`66`	`66`	`lc.ClusterID = w.Config.ClusterID`
`67`		`- return`
	`67`	`+ return err`
`68`	`68`	`}`
`69`	`69`	`if !cmdio.IsPromptSupported(ctx) {`
`70`	`70`	`return ErrNotInTTY`
`@@ -76,23 +76,23 @@ func (lc loginConfig) askCluster(ctx context.Context, w databricks.WorkspaceCl`
`76`	`76`	`}`
`77`	`77`	`w.Config.ClusterID = clusterID`
`78`	`78`	`lc.ClusterID = clusterID`
`79`		`- return`
	`79`	`+ return err`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`func (lc loginConfig) askWarehouse(ctx context.Context, w databricks.WorkspaceClient) (err error) {`
`83`	`83`	`if !lc.NeedsWarehouse() {`
`84`		`- return`
	`84`	`+ return err`
`85`	`85`	`}`
`86`	`86`	`if w.Config.WarehouseID != "" {`
`87`	`87`	`lc.WarehouseID = w.Config.WarehouseID`
`88`		`- return`
	`88`	`+ return err`
`89`	`89`	`}`
`90`	`90`	`if !cmdio.IsPromptSupported(ctx) {`
`91`	`91`	`return ErrNotInTTY`
`92`	`92`	`}`
`93`	`93`	`lc.WarehouseID, err = cfgpickers.AskForWarehouse(ctx, w,`
`94`	`94`	`cfgpickers.WithWarehouseTypes(lc.Installer.WarehouseTypes...))`
`95`		`- return`
	`95`	`+ return err`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`func (lc loginConfig) askAccountProfile(ctx context.Context, cfg config.Config) (err error) {`
`@@ -104,7 +104,7 @@ func (lc loginConfig) askAccountProfile(ctx context.Context, cfg config.Config`
`104`	`104`	`}`
`105`	`105`	`lc.AccountProfile, err = root.AskForAccountProfile(ctx)`
`106`	`106`	`cfg.Profile = lc.AccountProfile`
`107`		`- return`
	`107`	`+ return err`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`func (lc *loginConfig) save(ctx context.Context) error {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func getProfile(cmd *cobra.Command) (value string) {`
`52`	`52`	`if flag != nil {`
`53`	`53`	`value = flag.Value.String()`
`54`	`54`	`if value != "" {`
`55`		`- return`
	`55`	`+ return value`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -138,10 +138,10 @@ func (c *cmdIO) Select(items []Tuple, label string) (id string, err error) {`
`138`	`138`	`Stdin: io.NopCloser(c.in),`
`139`	`139`	`}).Run()`
`140`	`140`	`if err != nil {`
`141`		`- return`
	`141`	`+ return id, err`
`142`	`142`	`}`
`143`	`143`	`id = items[idx].Id`
`144`		`- return`
	`144`	`+ return id, err`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`// Show a selection prompt where the user can pick one of the name/id items.`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ func (f FileProfilerImpl) LoadProfiles(ctx context.Context, fn ProfileMatchFunct`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`
`92`		`- return`
	`92`	`+ return profiles, err`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`func ProfileCompletion(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`