Skip to content

Commit 10f1e97

Browse files
authored
misc: use a separate tools/go.mod for go tool (#377)
Use a separate `tools/go.mod` for `go tool` for the following reasons. 1. Prevent dependency conflicts between the primary `go.mod` and `tools/go.mod`. This is recommended by tooling like `golangci-lint` as documented in https://golangci-lint.run/docs/welcome/install/local/. 2. Keep the primary `go.mod` focused on its dependencies only. This enables us to use `go.work` files locally for overriding modules rather than adding `replace` directives to the `go.mod`.
1 parent 44dc2f2 commit 10f1e97

7 files changed

Lines changed: 1273 additions & 1203 deletions

File tree

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ generate:
1919
@ echo "+ Generating SDK..."
2020
@ go generate ./...
2121
@ echo "+ Updating imports..."
22-
@ go tool goimports -w oxide/*.go
22+
@ go tool -modfile tools/go.mod goimports -w oxide/*.go
2323
@ echo "+ Formatting generated SDK..."
2424
@ gofmt -s -w oxide/*.go
2525
@ echo "+ Tidying up modules..."
@@ -37,7 +37,7 @@ all: generate test fmt lint staticcheck vet ## Runs a fmt, lint, test, staticche
3737
.PHONY: fmt
3838
fmt: ## Formats Go code including long line wrapping.
3939
@ echo "+ Formatting Go code..."
40-
@ go tool golangci-lint fmt
40+
@ go tool -modfile tools/go.mod golangci-lint fmt
4141

4242
.PHONY: fmt-md
4343
fmt-md: ## Formats markdown files with prettier.
@@ -47,7 +47,7 @@ fmt-md: ## Formats markdown files with prettier.
4747
.PHONY: lint
4848
lint: ## Verifies `golangci-lint` passes.
4949
@ echo "+ Running Go linters..."
50-
@ go tool golangci-lint run
50+
@ go tool -modfile tools/go.mod golangci-lint run
5151

5252
.PHONY: test
5353
test: ## Runs the go tests.
@@ -69,7 +69,7 @@ vet: ## Verifies `go vet` passes.
6969
.PHONY: staticcheck
7070
staticcheck: ## Verifies `staticcheck` passes.
7171
@ echo "+ Verifying staticcheck passes..."
72-
@if [[ ! -z "$(shell go tool staticcheck ./... | tee /dev/stderr)" ]]; then \
72+
@if [[ ! -z "$(shell go tool -modfile tools/go.mod staticcheck ./... | tee /dev/stderr)" ]]; then \
7373
exit 1; \
7474
fi
7575

go.mod

Lines changed: 3 additions & 211 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
module github.com/oxidecomputer/oxide.go
22

3-
go 1.24.3
4-
5-
tool (
6-
github.com/golangci/golangci-lint/v2/cmd/golangci-lint
7-
golang.org/x/tools/cmd/goimports
8-
honnef.co/go/tools/cmd/staticcheck
9-
)
3+
go 1.25.0
104

115
require (
126
github.com/getkin/kin-openapi v0.133.0
@@ -17,221 +11,19 @@ require (
1711
)
1812

1913
require (
20-
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
21-
4d63.com/gochecknoglobals v0.2.2 // indirect
22-
codeberg.org/chavacava/garif v0.2.0 // indirect
23-
codeberg.org/polyfloyd/go-errorlint v1.9.0 // indirect
24-
dev.gaijin.team/go/exhaustruct/v4 v4.0.0 // indirect
25-
dev.gaijin.team/go/golib v0.6.0 // indirect
26-
github.com/4meepo/tagalign v1.4.3 // indirect
27-
github.com/Abirdcfly/dupword v0.1.7 // indirect
28-
github.com/AdminBenni/iota-mixing v1.0.0 // indirect
29-
github.com/AlwxSin/noinlineerr v1.0.5 // indirect
30-
github.com/Antonboom/errname v1.1.1 // indirect
31-
github.com/Antonboom/nilnil v1.1.1 // indirect
32-
github.com/Antonboom/testifylint v1.6.4 // indirect
33-
github.com/BurntSushi/toml v1.6.0 // indirect
34-
github.com/Djarvur/go-err113 v0.1.1 // indirect
35-
github.com/Masterminds/semver/v3 v3.4.0 // indirect
36-
github.com/MirrexOne/unqueryvet v1.4.0 // indirect
37-
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
38-
github.com/alecthomas/chroma/v2 v2.21.1 // indirect
39-
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
40-
github.com/alexkohler/nakedret/v2 v2.0.6 // indirect
41-
github.com/alexkohler/prealloc v1.0.1 // indirect
42-
github.com/alfatraining/structtag v1.0.0 // indirect
43-
github.com/alingse/asasalint v0.0.11 // indirect
44-
github.com/alingse/nilnesserr v0.2.0 // indirect
45-
github.com/ashanbrown/forbidigo/v2 v2.3.0 // indirect
46-
github.com/ashanbrown/makezero/v2 v2.1.0 // indirect
47-
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
48-
github.com/beorn7/perks v1.0.1 // indirect
49-
github.com/bkielbasa/cyclop v1.2.3 // indirect
50-
github.com/blizzy78/varnamelen v0.8.0 // indirect
51-
github.com/bombsimon/wsl/v4 v4.7.0 // indirect
52-
github.com/bombsimon/wsl/v5 v5.3.0 // indirect
53-
github.com/breml/bidichk v0.3.3 // indirect
54-
github.com/breml/errchkjson v0.4.1 // indirect
55-
github.com/butuzov/ireturn v0.4.0 // indirect
56-
github.com/butuzov/mirror v1.3.0 // indirect
57-
github.com/catenacyber/perfsprint v0.10.1 // indirect
58-
github.com/ccojocar/zxcvbn-go v1.0.4 // indirect
59-
github.com/cespare/xxhash/v2 v2.3.0 // indirect
60-
github.com/charithe/durationcheck v0.0.11 // indirect
61-
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
62-
github.com/charmbracelet/lipgloss v1.1.0 // indirect
63-
github.com/charmbracelet/x/ansi v0.8.0 // indirect
64-
github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
65-
github.com/charmbracelet/x/term v0.2.1 // indirect
66-
github.com/ckaznocha/intrange v0.3.1 // indirect
67-
github.com/curioswitch/go-reassign v0.3.0 // indirect
68-
github.com/daixiang0/gci v0.13.7 // indirect
69-
github.com/dave/dst v0.27.3 // indirect
70-
github.com/davecgh/go-spew v1.1.1 // indirect
71-
github.com/denis-tingaikin/go-header v0.5.0 // indirect
72-
github.com/dlclark/regexp2 v1.11.5 // indirect
73-
github.com/ettle/strcase v0.2.0 // indirect
74-
github.com/fatih/color v1.18.0 // indirect
75-
github.com/fatih/structtag v1.2.0 // indirect
76-
github.com/firefart/nonamedreturns v1.0.6 // indirect
77-
github.com/fsnotify/fsnotify v1.5.4 // indirect
78-
github.com/fzipp/gocyclo v0.6.0 // indirect
79-
github.com/ghostiam/protogetter v0.3.18 // indirect
80-
github.com/go-critic/go-critic v0.14.3 // indirect
14+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8115
github.com/go-openapi/jsonpointer v0.21.0 // indirect
8216
github.com/go-openapi/swag v0.23.0 // indirect
83-
github.com/go-toolsmith/astcast v1.1.0 // indirect
84-
github.com/go-toolsmith/astcopy v1.1.0 // indirect
85-
github.com/go-toolsmith/astequal v1.2.0 // indirect
86-
github.com/go-toolsmith/astfmt v1.1.0 // indirect
87-
github.com/go-toolsmith/astp v1.1.0 // indirect
88-
github.com/go-toolsmith/strparse v1.1.0 // indirect
89-
github.com/go-toolsmith/typep v1.1.0 // indirect
90-
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
91-
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
92-
github.com/gobwas/glob v0.2.3 // indirect
93-
github.com/godoc-lint/godoc-lint v0.11.1 // indirect
94-
github.com/gofrs/flock v0.13.0 // indirect
95-
github.com/golang/protobuf v1.5.3 // indirect
96-
github.com/golangci/asciicheck v0.5.0 // indirect
97-
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
98-
github.com/golangci/go-printf-func-name v0.1.1 // indirect
99-
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
100-
github.com/golangci/golangci-lint/v2 v2.8.0 // indirect
101-
github.com/golangci/golines v0.14.0 // indirect
102-
github.com/golangci/misspell v0.7.0 // indirect
103-
github.com/golangci/plugin-module-register v0.1.2 // indirect
104-
github.com/golangci/revgrep v0.8.0 // indirect
105-
github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e // indirect
106-
github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect
107-
github.com/gordonklaus/ineffassign v0.2.0 // indirect
108-
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
109-
github.com/gostaticanalysis/comment v1.5.0 // indirect
110-
github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
111-
github.com/gostaticanalysis/nilerr v0.1.2 // indirect
112-
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
113-
github.com/hashicorp/go-version v1.8.0 // indirect
114-
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
115-
github.com/hashicorp/hcl v1.0.0 // indirect
116-
github.com/hexops/gotextdiff v1.0.3 // indirect
117-
github.com/inconshreveable/mousetrap v1.1.0 // indirect
118-
github.com/jgautheron/goconst v1.8.2 // indirect
119-
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
120-
github.com/jjti/go-spancheck v0.6.5 // indirect
12117
github.com/josharian/intern v1.0.0 // indirect
122-
github.com/julz/importas v0.2.0 // indirect
123-
github.com/karamaru-alpha/copyloopvar v1.2.2 // indirect
124-
github.com/kisielk/errcheck v1.9.0 // indirect
125-
github.com/kkHAIKE/contextcheck v1.1.6 // indirect
126-
github.com/kulti/thelper v0.7.1 // indirect
127-
github.com/kunwardeep/paralleltest v1.0.15 // indirect
128-
github.com/lasiar/canonicalheader v1.1.2 // indirect
129-
github.com/ldez/exptostd v0.4.5 // indirect
130-
github.com/ldez/gomoddirectives v0.8.0 // indirect
131-
github.com/ldez/grignotin v0.10.1 // indirect
132-
github.com/ldez/structtags v0.6.1 // indirect
133-
github.com/ldez/tagliatelle v0.7.2 // indirect
134-
github.com/ldez/usetesting v0.5.0 // indirect
135-
github.com/leonklingele/grouper v1.1.2 // indirect
136-
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
137-
github.com/macabu/inamedparam v0.2.0 // indirect
138-
github.com/magiconair/properties v1.8.6 // indirect
13918
github.com/mailru/easyjson v0.7.7 // indirect
140-
github.com/manuelarte/embeddedstructfieldcheck v0.4.0 // indirect
141-
github.com/manuelarte/funcorder v0.5.0 // indirect
142-
github.com/maratori/testableexamples v1.0.1 // indirect
143-
github.com/maratori/testpackage v1.1.2 // indirect
144-
github.com/matoous/godox v1.1.0 // indirect
145-
github.com/mattn/go-colorable v0.1.14 // indirect
146-
github.com/mattn/go-isatty v0.0.20 // indirect
147-
github.com/mattn/go-runewidth v0.0.16 // indirect
148-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
149-
github.com/mgechev/revive v1.13.0 // indirect
150-
github.com/mitchellh/go-homedir v1.1.0 // indirect
151-
github.com/mitchellh/mapstructure v1.5.0 // indirect
15219
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
153-
github.com/moricho/tparallel v0.3.2 // indirect
154-
github.com/muesli/termenv v0.16.0 // indirect
155-
github.com/nakabonne/nestif v0.3.1 // indirect
156-
github.com/nishanths/exhaustive v0.12.0 // indirect
157-
github.com/nishanths/predeclared v0.2.2 // indirect
158-
github.com/nunnatsa/ginkgolinter v0.21.2 // indirect
15920
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect
16021
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
161-
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
16222
github.com/perimeterx/marshmallow v1.1.5 // indirect
163-
github.com/pmezard/go-difflib v1.0.0 // indirect
164-
github.com/prometheus/client_golang v1.12.1 // indirect
165-
github.com/prometheus/client_model v0.2.0 // indirect
166-
github.com/prometheus/common v0.32.1 // indirect
167-
github.com/prometheus/procfs v0.7.3 // indirect
168-
github.com/quasilyte/go-ruleguard v0.4.5 // indirect
169-
github.com/quasilyte/go-ruleguard/dsl v0.3.23 // indirect
170-
github.com/quasilyte/gogrep v0.5.0 // indirect
171-
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
172-
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
173-
github.com/raeperd/recvcheck v0.2.0 // indirect
174-
github.com/rivo/uniseg v0.4.7 // indirect
23+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
17524
github.com/rogpeppe/go-internal v1.14.1 // indirect
176-
github.com/ryancurrah/gomodguard v1.4.1 // indirect
177-
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
178-
github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
179-
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
180-
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
181-
github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect
182-
github.com/securego/gosec/v2 v2.22.11 // indirect
183-
github.com/sirupsen/logrus v1.9.3 // indirect
184-
github.com/sivchari/containedctx v1.0.3 // indirect
185-
github.com/sonatard/noctx v0.4.0 // indirect
186-
github.com/sourcegraph/go-diff v0.7.0 // indirect
187-
github.com/spf13/afero v1.15.0 // indirect
188-
github.com/spf13/cast v1.5.0 // indirect
189-
github.com/spf13/cobra v1.10.2 // indirect
190-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
191-
github.com/spf13/pflag v1.0.10 // indirect
192-
github.com/spf13/viper v1.12.0 // indirect
193-
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
194-
github.com/stbenjam/no-sprintf-host-port v0.3.1 // indirect
195-
github.com/stretchr/objx v0.5.2 // indirect
196-
github.com/subosito/gotenv v1.4.1 // indirect
197-
github.com/tetafro/godot v1.5.4 // indirect
198-
github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 // indirect
199-
github.com/timonwong/loggercheck v0.11.0 // indirect
200-
github.com/tomarrell/wrapcheck/v2 v2.12.0 // indirect
201-
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
202-
github.com/ultraware/funlen v0.2.0 // indirect
203-
github.com/ultraware/whitespace v0.2.0 // indirect
204-
github.com/uudashr/gocognit v1.2.0 // indirect
205-
github.com/uudashr/iface v1.4.1 // indirect
20625
github.com/woodsbury/decimal128 v1.3.0 // indirect
207-
github.com/xen0n/gosmopolitan v1.3.0 // indirect
208-
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
209-
github.com/yagipy/maintidx v1.0.0 // indirect
210-
github.com/yeya24/promlinter v0.3.0 // indirect
211-
github.com/ykadowak/zerologlint v0.1.5 // indirect
212-
gitlab.com/bosi/decorder v0.4.2 // indirect
213-
go-simpler.org/musttag v0.14.0 // indirect
214-
go-simpler.org/sloglint v0.11.1 // indirect
215-
go.augendre.info/arangolint v0.3.1 // indirect
216-
go.augendre.info/fatcontext v0.9.0 // indirect
217-
go.uber.org/automaxprocs v1.6.0 // indirect
218-
go.uber.org/multierr v1.10.0 // indirect
219-
go.uber.org/zap v1.27.0 // indirect
220-
go.yaml.in/yaml/v3 v3.0.4 // indirect
221-
golang.org/x/exp/typeparams v0.0.0-20251023183803-a4bb9ffd2546 // indirect
222-
golang.org/x/mod v0.32.0 // indirect
223-
golang.org/x/sync v0.19.0 // indirect
224-
golang.org/x/sys v0.40.0 // indirect
225-
golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2 // indirect
226-
golang.org/x/text v0.31.0 // indirect
227-
golang.org/x/tools v0.41.0 // indirect
228-
google.golang.org/protobuf v1.36.8 // indirect
229-
gopkg.in/ini.v1 v1.67.0 // indirect
230-
gopkg.in/yaml.v2 v2.4.0 // indirect
23126
gopkg.in/yaml.v3 v3.0.1 // indirect
232-
honnef.co/go/tools v0.6.1 // indirect
233-
mvdan.cc/gofumpt v0.9.2 // indirect
234-
mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15 // indirect
23527
)
23628

23729
retract (

0 commit comments

Comments
 (0)