Skip to content

Commit da5a9ec

Browse files
authored
misc: use a separate tools/go.mod for go tool (#636)
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 a68a9ea commit da5a9ec

5 files changed

Lines changed: 1438 additions & 1222 deletions

File tree

Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ test:
5454

5555
.PHONY: docs
5656
docs:
57-
@ go tool tfplugindocs generate
57+
@ go tool -modfile=tools/go.mod tfplugindocs generate
5858

5959
.PHONY: check-docs
6060
check-docs:
61-
@ go tool tfplugindocs generate
61+
@ go tool -modfile=tools/go.mod tfplugindocs generate
6262
@ if ! git diff --exit-code docs; then echo 'Generated docs have changed. Re-generate with `make docs`.'; fi
6363

6464
## Lints all of the source files
@@ -68,35 +68,35 @@ lint: golangci-lint tfproviderdocs terrafmt tfproviderlint check-docs # configfm
6868
.PHONY: tfproviderlint
6969
tfproviderlint:
7070
@ echo "-> Running Terraform static analysis linter"
71-
@ go tool tfproviderlint ./...
71+
@ go tool -modfile=tools/go.mod tfproviderlint ./...
7272

7373
.PHONY: tfproviderdocs
7474
tfproviderdocs:
7575
@ echo "-> Running terraform provider documentation linter"
76-
@ go tool tfproviderdocs check -provider-name $(BINARY) .
76+
@ go tool -modfile=tools/go.mod tfproviderdocs check -provider-name $(BINARY) .
7777

7878
.PHONY: golangci-lint
7979
golangci-lint:
8080
@ echo "-> Running Go linters"
81-
@ go tool golangci-lint run
81+
@ go tool -modfile=tools/go.mod golangci-lint run
8282

8383
.PHONY: fmt
8484
fmt: golangci-fmt terrafmt-fmt docs
8585

8686
.PHONY: golangci-fmt
8787
golangci-fmt:
8888
@ echo "-> Formatting Go code"
89-
@ go tool golangci-lint fmt
89+
@ go tool -modfile=tools/go.mod golangci-lint fmt
9090

9191
.PHONY: terrafmt
9292
terrafmt:
9393
@ echo "-> Running terraform docs codeblocks linter"
94-
@ find ./docs -type f -name "*.md" -exec go tool terrafmt diff -f {} \;
94+
@ find ./docs -type f -name "*.md" -exec go tool -modfile=tools/go.mod terrafmt diff -f {} \;
9595

9696
.PHONY: terrafmt-fmt
9797
terrafmt-fmt:
9898
@ echo "-> Running terraform docs codeblocks linter"
99-
@ find ./docs -type f -name "*.md" -exec go tool terrafmt fmt -f {} \;
99+
@ find ./docs -type f -name "*.md" -exec go tool -modfile=tools/go.mod terrafmt fmt -f {} \;
100100

101101
configfmt:
102102
@ echo "-> Running terraform linters on .tf files"

go.mod

Lines changed: 2 additions & 227 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
module github.com/oxidecomputer/terraform-provider-oxide
22

3-
go 1.24.3
4-
5-
tool (
6-
github.com/bflad/tfproviderdocs
7-
github.com/bflad/tfproviderlint/cmd/tfproviderlint
8-
github.com/golangci/golangci-lint/v2/cmd/golangci-lint
9-
github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs
10-
github.com/katbyte/terrafmt
11-
)
3+
go 1.25.0
124

135
require (
146
github.com/google/uuid v1.6.0
@@ -25,260 +17,48 @@ require (
2517
)
2618

2719
require (
28-
codeberg.org/chavacava/garif v0.2.0 // indirect
29-
codeberg.org/polyfloyd/go-errorlint v1.9.0 // indirect
30-
dev.gaijin.team/go/exhaustruct/v4 v4.0.0 // indirect
31-
dev.gaijin.team/go/golib v0.6.0 // indirect
32-
github.com/AdminBenni/iota-mixing v1.0.0 // indirect
33-
github.com/AlwxSin/noinlineerr v1.0.5 // indirect
34-
github.com/MirrexOne/unqueryvet v1.4.0 // indirect
35-
github.com/alecthomas/chroma/v2 v2.21.1 // indirect
36-
github.com/alfatraining/structtag v1.0.0 // indirect
37-
github.com/ashanbrown/forbidigo/v2 v2.3.0 // indirect
38-
github.com/ashanbrown/makezero/v2 v2.1.0 // indirect
39-
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
40-
github.com/bombsimon/wsl/v5 v5.3.0 // indirect
41-
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
42-
github.com/charmbracelet/lipgloss v1.1.0 // indirect
43-
github.com/charmbracelet/x/ansi v0.8.0 // indirect
44-
github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
45-
github.com/charmbracelet/x/term v0.2.1 // indirect
46-
github.com/dave/dst v0.27.3 // indirect
47-
github.com/dlclark/regexp2 v1.11.5 // indirect
48-
github.com/godoc-lint/godoc-lint v0.11.1 // indirect
49-
github.com/golangci/asciicheck v0.5.0 // indirect
50-
github.com/golangci/golangci-lint/v2 v2.8.0 // indirect
51-
github.com/golangci/golines v0.14.0 // indirect
52-
github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e // indirect
53-
github.com/ldez/structtags v0.6.1 // indirect
54-
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
55-
github.com/manuelarte/embeddedstructfieldcheck v0.4.0 // indirect
56-
github.com/manuelarte/funcorder v0.5.0 // indirect
57-
github.com/muesli/termenv v0.16.0 // indirect
58-
go.augendre.info/arangolint v0.3.1 // indirect
59-
go.augendre.info/fatcontext v0.9.0 // indirect
60-
go.yaml.in/yaml/v3 v3.0.4 // indirect
61-
)
62-
63-
require (
64-
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
65-
4d63.com/gochecknoglobals v0.2.2 // indirect
66-
github.com/4meepo/tagalign v1.4.3 // indirect
67-
github.com/Abirdcfly/dupword v0.1.7 // indirect
68-
github.com/Antonboom/errname v1.1.1 // indirect
69-
github.com/Antonboom/nilnil v1.1.1 // indirect
70-
github.com/Antonboom/testifylint v1.6.4 // indirect
71-
github.com/BurntSushi/toml v1.6.0 // indirect
72-
github.com/Djarvur/go-err113 v0.1.1 // indirect
73-
github.com/Kunde21/markdownfmt/v3 v3.1.0 // indirect
74-
github.com/Masterminds/goutils v1.1.1 // indirect
75-
github.com/Masterminds/semver/v3 v3.4.0 // indirect
76-
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
77-
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
7820
github.com/ProtonMail/go-crypto v1.1.6 // indirect
7921
github.com/agext/levenshtein v1.2.3 // indirect
80-
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
81-
github.com/alexkohler/nakedret/v2 v2.0.6 // indirect
82-
github.com/alexkohler/prealloc v1.0.1 // indirect
83-
github.com/alingse/asasalint v0.0.11 // indirect
84-
github.com/alingse/nilnesserr v0.2.0 // indirect
8522
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
86-
github.com/armon/go-radix v1.0.0 // indirect
87-
github.com/beorn7/perks v1.0.1 // indirect
88-
github.com/bflad/gopaniccheck v0.1.0 // indirect
89-
github.com/bflad/tfproviderdocs v0.12.1 // indirect
90-
github.com/bflad/tfproviderlint v0.31.0 // indirect
91-
github.com/bgentry/speakeasy v0.1.0 // indirect
92-
github.com/bkielbasa/cyclop v1.2.3 // indirect
93-
github.com/blizzy78/varnamelen v0.8.0 // indirect
94-
github.com/bmatcuk/doublestar v1.3.4 // indirect
95-
github.com/bmatcuk/doublestar/v4 v4.9.1 // indirect
96-
github.com/bombsimon/wsl/v4 v4.7.0 // indirect
97-
github.com/breml/bidichk v0.3.3 // indirect
98-
github.com/breml/errchkjson v0.4.1 // indirect
99-
github.com/butuzov/ireturn v0.4.0 // indirect
100-
github.com/butuzov/mirror v1.3.0 // indirect
101-
github.com/catenacyber/perfsprint v0.10.1 // indirect
102-
github.com/ccojocar/zxcvbn-go v1.0.4 // indirect
103-
github.com/cespare/xxhash/v2 v2.3.0 // indirect
104-
github.com/charithe/durationcheck v0.0.11 // indirect
105-
github.com/ckaznocha/intrange v0.3.1 // indirect
10623
github.com/cloudflare/circl v1.6.1 // indirect
107-
github.com/curioswitch/go-reassign v0.3.0 // indirect
108-
github.com/daixiang0/gci v0.13.7 // indirect
10924
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
110-
github.com/denis-tingaikin/go-header v0.5.0 // indirect
111-
github.com/ettle/strcase v0.2.0 // indirect
11225
github.com/fatih/color v1.18.0 // indirect
113-
github.com/fatih/structtag v1.2.0 // indirect
114-
github.com/firefart/nonamedreturns v1.0.6 // indirect
115-
github.com/fsnotify/fsnotify v1.5.4 // indirect
116-
github.com/fzipp/gocyclo v0.6.0 // indirect
117-
github.com/ghostiam/protogetter v0.3.18 // indirect
118-
github.com/go-critic/go-critic v0.14.3 // indirect
119-
github.com/go-toolsmith/astcast v1.1.0 // indirect
120-
github.com/go-toolsmith/astcopy v1.1.0 // indirect
121-
github.com/go-toolsmith/astequal v1.2.0 // indirect
122-
github.com/go-toolsmith/astfmt v1.1.0 // indirect
123-
github.com/go-toolsmith/astp v1.1.0 // indirect
124-
github.com/go-toolsmith/strparse v1.1.0 // indirect
125-
github.com/go-toolsmith/typep v1.1.0 // indirect
126-
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
127-
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
128-
github.com/gobwas/glob v0.2.3 // indirect
129-
github.com/gofrs/flock v0.13.0 // indirect
13026
github.com/golang/protobuf v1.5.4 // indirect
131-
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
132-
github.com/golangci/go-printf-func-name v0.1.1 // indirect
133-
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
134-
github.com/golangci/misspell v0.7.0 // indirect
135-
github.com/golangci/plugin-module-register v0.1.2 // indirect
136-
github.com/golangci/revgrep v0.8.0 // indirect
137-
github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect
13827
github.com/google/go-cmp v0.7.0 // indirect
139-
github.com/gookit/color v1.6.0 // indirect
140-
github.com/gordonklaus/ineffassign v0.2.0 // indirect
141-
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
142-
github.com/gostaticanalysis/comment v1.5.0 // indirect
143-
github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
144-
github.com/gostaticanalysis/nilerr v0.1.2 // indirect
145-
github.com/hashicorp/cli v1.1.7 // indirect
14628
github.com/hashicorp/errwrap v1.1.0 // indirect
14729
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
14830
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
14931
github.com/hashicorp/go-cty v1.5.0 // indirect
15032
github.com/hashicorp/go-hclog v1.6.3 // indirect
151-
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
15233
github.com/hashicorp/go-multierror v1.1.1 // indirect
15334
github.com/hashicorp/go-plugin v1.7.0 // indirect
15435
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
15536
github.com/hashicorp/go-uuid v1.0.3 // indirect
15637
github.com/hashicorp/go-version v1.8.0 // indirect
157-
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
15838
github.com/hashicorp/hc-install v0.9.2 // indirect
159-
github.com/hashicorp/hcl v1.0.0 // indirect
16039
github.com/hashicorp/hcl/v2 v2.24.0 // indirect
16140
github.com/hashicorp/logutils v1.0.0 // indirect
16241
github.com/hashicorp/terraform-exec v0.24.0 // indirect
16342
github.com/hashicorp/terraform-json v0.27.2 // indirect
164-
github.com/hashicorp/terraform-plugin-docs v0.24.0 // indirect
16543
github.com/hashicorp/terraform-registry-address v0.4.0 // indirect
16644
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
16745
github.com/hashicorp/yamux v0.1.2 // indirect
168-
github.com/hexops/gotextdiff v1.0.3 // indirect
169-
github.com/huandu/xstrings v1.3.3 // indirect
170-
github.com/imdario/mergo v0.3.15 // indirect
171-
github.com/inconshreveable/mousetrap v1.1.0 // indirect
172-
github.com/jgautheron/goconst v1.8.2 // indirect
173-
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
174-
github.com/jjti/go-spancheck v0.6.5 // indirect
175-
github.com/julz/importas v0.2.0 // indirect
176-
github.com/karamaru-alpha/copyloopvar v1.2.2 // indirect
177-
github.com/katbyte/andreyvit-diff v0.0.2 // indirect
178-
github.com/katbyte/sergi-go-diff v1.2.2 // indirect
179-
github.com/katbyte/terrafmt v0.5.5 // indirect
180-
github.com/kisielk/errcheck v1.9.0 // indirect
181-
github.com/kkHAIKE/contextcheck v1.1.6 // indirect
182-
github.com/kulti/thelper v0.7.1 // indirect
183-
github.com/kunwardeep/paralleltest v1.0.15 // indirect
184-
github.com/lasiar/canonicalheader v1.1.2 // indirect
185-
github.com/ldez/exptostd v0.4.5 // indirect
186-
github.com/ldez/gomoddirectives v0.8.0 // indirect
187-
github.com/ldez/grignotin v0.10.1 // indirect
188-
github.com/ldez/tagliatelle v0.7.2 // indirect
189-
github.com/ldez/usetesting v0.5.0 // indirect
190-
github.com/leonklingele/grouper v1.1.2 // indirect
191-
github.com/macabu/inamedparam v0.2.0 // indirect
192-
github.com/magiconair/properties v1.8.6 // indirect
193-
github.com/maratori/testableexamples v1.0.1 // indirect
194-
github.com/maratori/testpackage v1.1.2 // indirect
195-
github.com/matoous/godox v1.1.0 // indirect
46+
github.com/kr/text v0.2.0 // indirect
19647
github.com/mattn/go-colorable v0.1.14 // indirect
19748
github.com/mattn/go-isatty v0.0.20 // indirect
198-
github.com/mattn/go-runewidth v0.0.16 // indirect
199-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
200-
github.com/mgechev/revive v1.13.0 // indirect
201-
github.com/mitchellh/cli v1.1.5 // indirect
20249
github.com/mitchellh/copystructure v1.2.0 // indirect
203-
github.com/mitchellh/go-homedir v1.1.0 // indirect
20450
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
20551
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
20652
github.com/mitchellh/mapstructure v1.5.0 // indirect
20753
github.com/mitchellh/reflectwalk v1.0.2 // indirect
208-
github.com/moricho/tparallel v0.3.2 // indirect
209-
github.com/nakabonne/nestif v0.3.1 // indirect
210-
github.com/nishanths/exhaustive v0.12.0 // indirect
211-
github.com/nishanths/predeclared v0.2.2 // indirect
212-
github.com/nunnatsa/ginkgolinter v0.21.2 // indirect
21354
github.com/oklog/run v1.1.0 // indirect
21455
github.com/pelletier/go-toml v1.9.5 // indirect
215-
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
21656
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
217-
github.com/posener/complete v1.2.3 // indirect
218-
github.com/prometheus/client_golang v1.12.1 // indirect
219-
github.com/prometheus/client_model v0.2.0 // indirect
220-
github.com/prometheus/common v0.32.1 // indirect
221-
github.com/prometheus/procfs v0.7.3 // indirect
222-
github.com/quasilyte/go-ruleguard v0.4.5 // indirect
223-
github.com/quasilyte/go-ruleguard/dsl v0.3.23 // indirect
224-
github.com/quasilyte/gogrep v0.5.0 // indirect
225-
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
226-
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
227-
github.com/raeperd/recvcheck v0.2.0 // indirect
228-
github.com/rivo/uniseg v0.4.7 // indirect
229-
github.com/rogpeppe/go-internal v1.14.1 // indirect
230-
github.com/ryancurrah/gomodguard v1.4.1 // indirect
231-
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
232-
github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
233-
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
234-
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
235-
github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect
236-
github.com/securego/gosec/v2 v2.22.11 // indirect
237-
github.com/shopspring/decimal v1.3.1 // indirect
238-
github.com/sirupsen/logrus v1.9.3 // indirect
239-
github.com/sivchari/containedctx v1.0.3 // indirect
240-
github.com/sonatard/noctx v0.4.0 // indirect
241-
github.com/sourcegraph/go-diff v0.7.0 // indirect
242-
github.com/spf13/afero v1.15.0 // indirect
243-
github.com/spf13/cast v1.5.0 // indirect
244-
github.com/spf13/cobra v1.10.2 // indirect
245-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
246-
github.com/spf13/pflag v1.0.10 // indirect
247-
github.com/spf13/viper v1.12.0 // indirect
248-
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
249-
github.com/stbenjam/no-sprintf-host-port v0.3.1 // indirect
250-
github.com/stretchr/objx v0.5.2 // indirect
251-
github.com/subosito/gotenv v1.4.1 // indirect
252-
github.com/tetafro/godot v1.5.4 // indirect
253-
github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 // indirect
254-
github.com/timonwong/loggercheck v0.11.0 // indirect
255-
github.com/tomarrell/wrapcheck/v2 v2.12.0 // indirect
256-
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
257-
github.com/ultraware/funlen v0.2.0 // indirect
258-
github.com/ultraware/whitespace v0.2.0 // indirect
259-
github.com/uudashr/gocognit v1.2.0 // indirect
260-
github.com/uudashr/iface v1.4.1 // indirect
26157
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
26258
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
26359
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
264-
github.com/xen0n/gosmopolitan v1.3.0 // indirect
265-
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
266-
github.com/yagipy/maintidx v1.0.0 // indirect
267-
github.com/yeya24/promlinter v0.3.0 // indirect
268-
github.com/ykadowak/zerologlint v0.1.5 // indirect
269-
github.com/yuin/goldmark v1.7.7 // indirect
270-
github.com/yuin/goldmark-meta v1.1.0 // indirect
27160
github.com/zclconf/go-cty v1.17.0 // indirect
272-
gitlab.com/bosi/decorder v0.4.2 // indirect
273-
go-simpler.org/musttag v0.14.0 // indirect
274-
go-simpler.org/sloglint v0.11.1 // indirect
275-
go.abhg.dev/goldmark/frontmatter v0.2.0 // indirect
276-
go.uber.org/automaxprocs v1.6.0 // indirect
277-
go.uber.org/multierr v1.10.0 // indirect
278-
go.uber.org/zap v1.27.0 // indirect
27961
golang.org/x/crypto v0.47.0 // indirect
280-
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
281-
golang.org/x/exp/typeparams v0.0.0-20251023183803-a4bb9ffd2546 // indirect
28262
golang.org/x/mod v0.32.0 // indirect
28363
golang.org/x/net v0.49.0 // indirect
28464
golang.org/x/sync v0.19.0 // indirect
@@ -289,10 +69,5 @@ require (
28969
google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect
29070
google.golang.org/grpc v1.75.1 // indirect
29171
google.golang.org/protobuf v1.36.9 // indirect
292-
gopkg.in/ini.v1 v1.67.0 // indirect
293-
gopkg.in/yaml.v2 v2.4.0 // indirect
29472
gopkg.in/yaml.v3 v3.0.1 // indirect
295-
honnef.co/go/tools v0.6.1 // indirect
296-
mvdan.cc/gofumpt v0.9.2 // indirect
297-
mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15 // indirect
29873
)

0 commit comments

Comments
 (0)