Skip to content

Commit cb6a9da

Browse files
authored
refactor: use go tool directives in tests (#3084)
Update all_test.go to use `go tool` instead of `go run` with versioned package paths. This leverages the tool directives in go.mod for golangci-lint, goimports, and yamlfmt. .github/workflows/librarian.yaml is also updated to run `go install tool` for downloading tool dependencies in tests. Additionally, the e2e-test GitHub action is removed, since it only ran a few legacy librarian tests we no longer need. See https://go.dev/doc/modules/managing-dependencies#tools.
1 parent a282284 commit cb6a9da

File tree

4 files changed

+1162
-34
lines changed

4 files changed

+1162
-34
lines changed

.github/workflows/librarian.yaml

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -26,49 +26,24 @@ jobs:
2626
go-version-file: "go.mod"
2727
- name: Display Go version
2828
run: go version
29-
- name: Install tools
29+
- name: Install Go tools
30+
run: go install tool
31+
- name: Install protoc
3032
run: |
3133
set -e
3234
curl -fSSL -o /tmp/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v28.3/protoc-28.3-linux-x86_64.zip
3335
cd /usr/local
3436
sudo unzip -x /tmp/protoc.zip
3537
protoc --version
36-
go install golang.org/x/tools/cmd/goimports@latest
3738
- name: Run tests
3839
run: go test -race -coverprofile=coverage.out -covermode=atomic ./...
3940
- name: Upload coverage report
4041
uses: codecov/codecov-action@v5
4142
with:
4243
token: ${{ secrets.CODECOV_TOKEN }}
43-
e2e-test:
44-
runs-on: ubuntu-24.04
45-
steps:
46-
- uses: actions/checkout@v5
47-
- uses: actions/setup-go@v6
48-
with:
49-
go-version-file: "go.mod"
50-
- name: Install tools
51-
run: |
52-
set -e
53-
curl -fSSL -o /tmp/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v28.3/protoc-28.3-linux-x86_64.zip
54-
cd /usr/local
55-
sudo unzip -x /tmp/protoc.zip
56-
protoc --version
57-
go install github.com/google/yamlfmt/cmd/[email protected]
58-
go install golang.org/x/tools/cmd/goimports@latest
59-
- uses: docker/setup-docker-action@v4
60-
- name: Build the test image
61-
run: |
62-
DOCKER_BUILDKIT=1 docker build \
63-
-f ./internal/legacylibrarian/legacyintegration/testdata/e2e-test.Dockerfile \
64-
-t test-image:latest \
65-
.
66-
- name: Run end-to-end test
67-
run: |
68-
go test -tags e2e ./...
6944
create-issue-on-failure:
7045
runs-on: ubuntu-24.04
71-
needs: [test, e2e-test]
46+
needs: [test]
7247
if: ${{ always() && contains(needs.*.result, 'failure') && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
7348
steps:
7449
- name: Create an issue for push event to main

all_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,11 +221,11 @@ func recordGoVersion(path string, sfs fs.FS, re *regexp.Regexp, goVersions map[s
221221
}
222222

223223
func TestGolangCILint(t *testing.T) {
224-
rungo(t, "run", "github.com/golangci/golangci-lint/v2/cmd/[email protected]", "run")
224+
rungo(t, "tool", "golangci-lint", "run")
225225
}
226226

227227
func TestGoImports(t *testing.T) {
228-
cmd := exec.Command("go", "run", "golang.org/x/tools/cmd/goimports@v0.38.0", "-d", ".")
228+
cmd := exec.Command("go", "tool", "goimports", "-d", ".")
229229
var stdout, stderr bytes.Buffer
230230
cmd.Stdout = &stdout
231231
cmd.Stderr = &stderr
@@ -243,7 +243,7 @@ func TestGoModTidy(t *testing.T) {
243243
}
244244

245245
func TestYAMLFormat(t *testing.T) {
246-
cmd := exec.Command("go", "run", "github.com/google/yamlfmt/cmd/[email protected]", "-lint", ".")
246+
cmd := exec.Command("go", "tool", "yamlfmt", "-lint", ".")
247247
var stdout, stderr bytes.Buffer
248248
cmd.Stdout = &stdout
249249
cmd.Stderr = &stderr

go.mod

Lines changed: 207 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,57 +29,264 @@ require (
2929
)
3030

3131
require (
32+
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
33+
4d63.com/gochecknoglobals v0.2.2 // indirect
3234
cloud.google.com/go v0.122.0 // indirect
3335
cloud.google.com/go/auth v0.16.5 // indirect
3436
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
3537
cloud.google.com/go/compute/metadata v0.8.0 // indirect
38+
codeberg.org/chavacava/garif v0.2.0 // indirect
3639
dario.cat/mergo v1.0.2 // indirect
40+
dev.gaijin.team/go/exhaustruct/v4 v4.0.0 // indirect
41+
dev.gaijin.team/go/golib v0.6.0 // indirect
42+
github.com/4meepo/tagalign v1.4.3 // indirect
43+
github.com/Abirdcfly/dupword v0.1.7 // indirect
44+
github.com/AdminBenni/iota-mixing v1.0.0 // indirect
45+
github.com/AlwxSin/noinlineerr v1.0.5 // indirect
46+
github.com/Antonboom/errname v1.1.1 // indirect
47+
github.com/Antonboom/nilnil v1.1.1 // indirect
48+
github.com/Antonboom/testifylint v1.6.4 // indirect
49+
github.com/BurntSushi/toml v1.5.0 // indirect
50+
github.com/Djarvur/go-err113 v0.1.1 // indirect
51+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
3752
github.com/Microsoft/go-winio v0.6.2 // indirect
53+
github.com/MirrexOne/unqueryvet v1.2.1 // indirect
54+
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
3855
github.com/ProtonMail/go-crypto v1.3.0 // indirect
56+
github.com/alecthomas/chroma/v2 v2.20.0 // indirect
57+
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
58+
github.com/alexkohler/nakedret/v2 v2.0.6 // indirect
59+
github.com/alexkohler/prealloc v1.0.0 // indirect
60+
github.com/alfatraining/structtag v1.0.0 // indirect
61+
github.com/alingse/asasalint v0.0.11 // indirect
62+
github.com/alingse/nilnesserr v0.2.0 // indirect
63+
github.com/ashanbrown/forbidigo/v2 v2.3.0 // indirect
64+
github.com/ashanbrown/makezero/v2 v2.1.0 // indirect
65+
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
3966
github.com/bahlo/generic-list-go v0.2.0 // indirect
67+
github.com/beorn7/perks v1.0.1 // indirect
68+
github.com/bkielbasa/cyclop v1.2.3 // indirect
69+
github.com/blizzy78/varnamelen v0.8.0 // indirect
70+
github.com/bmatcuk/doublestar/v4 v4.7.1 // indirect
71+
github.com/bombsimon/wsl/v4 v4.7.0 // indirect
72+
github.com/bombsimon/wsl/v5 v5.3.0 // indirect
73+
github.com/breml/bidichk v0.3.3 // indirect
74+
github.com/breml/errchkjson v0.4.1 // indirect
4075
github.com/buger/jsonparser v1.1.1 // indirect
76+
github.com/butuzov/ireturn v0.4.0 // indirect
77+
github.com/butuzov/mirror v1.3.0 // indirect
78+
github.com/catenacyber/perfsprint v0.10.0 // indirect
79+
github.com/ccojocar/zxcvbn-go v1.0.4 // indirect
80+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
81+
github.com/charithe/durationcheck v0.0.11 // indirect
82+
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
83+
github.com/charmbracelet/lipgloss v1.1.0 // indirect
84+
github.com/charmbracelet/x/ansi v0.8.0 // indirect
85+
github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
86+
github.com/charmbracelet/x/term v0.2.1 // indirect
87+
github.com/ckaznocha/intrange v0.3.1 // indirect
4188
github.com/cloudflare/circl v1.6.1 // indirect
89+
github.com/curioswitch/go-reassign v0.3.0 // indirect
4290
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
91+
github.com/daixiang0/gci v0.13.7 // indirect
92+
github.com/dave/dst v0.27.3 // indirect
4393
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
94+
github.com/denis-tingaikin/go-header v0.5.0 // indirect
95+
github.com/dlclark/regexp2 v1.11.5 // indirect
4496
github.com/emirpasic/gods v1.18.1 // indirect
97+
github.com/ettle/strcase v0.2.0 // indirect
98+
github.com/fatih/color v1.18.0 // indirect
99+
github.com/fatih/structtag v1.2.0 // indirect
45100
github.com/felixge/httpsnoop v1.0.4 // indirect
101+
github.com/firefart/nonamedreturns v1.0.6 // indirect
102+
github.com/fsnotify/fsnotify v1.5.4 // indirect
103+
github.com/fzipp/gocyclo v0.6.0 // indirect
104+
github.com/ghostiam/protogetter v0.3.17 // indirect
105+
github.com/go-critic/go-critic v0.14.0 // indirect
46106
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
47107
github.com/go-git/go-billy/v5 v5.6.2 // indirect
48108
github.com/go-logr/logr v1.4.3 // indirect
49109
github.com/go-logr/stdr v1.2.2 // indirect
110+
github.com/go-toolsmith/astcast v1.1.0 // indirect
111+
github.com/go-toolsmith/astcopy v1.1.0 // indirect
112+
github.com/go-toolsmith/astequal v1.2.0 // indirect
113+
github.com/go-toolsmith/astfmt v1.1.0 // indirect
114+
github.com/go-toolsmith/astp v1.1.0 // indirect
115+
github.com/go-toolsmith/strparse v1.1.0 // indirect
116+
github.com/go-toolsmith/typep v1.1.0 // indirect
117+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
118+
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
119+
github.com/gobwas/glob v0.2.3 // indirect
120+
github.com/godoc-lint/godoc-lint v0.10.1 // indirect
121+
github.com/gofrs/flock v0.13.0 // indirect
50122
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
123+
github.com/golang/protobuf v1.5.4 // indirect
124+
github.com/golangci/asciicheck v0.5.0 // indirect
125+
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
126+
github.com/golangci/go-printf-func-name v0.1.1 // indirect
127+
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
128+
github.com/golangci/golangci-lint/v2 v2.6.0 // indirect
129+
github.com/golangci/golines v0.0.0-20250217134842-442fd0091d95 // indirect
130+
github.com/golangci/misspell v0.7.0 // indirect
131+
github.com/golangci/plugin-module-register v0.1.2 // indirect
132+
github.com/golangci/revgrep v0.8.0 // indirect
133+
github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e // indirect
134+
github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect
51135
github.com/google/go-querystring v1.1.0 // indirect
52136
github.com/google/s2a-go v0.1.9 // indirect
137+
github.com/google/yamlfmt v0.20.0 // indirect
53138
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
139+
github.com/gordonklaus/ineffassign v0.2.0 // indirect
140+
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
141+
github.com/gostaticanalysis/comment v1.5.0 // indirect
142+
github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
143+
github.com/gostaticanalysis/nilerr v0.1.2 // indirect
144+
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
145+
github.com/hashicorp/go-version v1.7.0 // indirect
146+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
147+
github.com/hashicorp/hcl v1.0.0 // indirect
148+
github.com/hexops/gotextdiff v1.0.3 // indirect
149+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
54150
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
151+
github.com/jgautheron/goconst v1.8.2 // indirect
152+
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
153+
github.com/jjti/go-spancheck v0.6.5 // indirect
154+
github.com/julz/importas v0.2.0 // indirect
155+
github.com/karamaru-alpha/copyloopvar v1.2.1 // indirect
55156
github.com/kevinburke/ssh_config v1.4.0 // indirect
157+
github.com/kisielk/errcheck v1.9.0 // indirect
158+
github.com/kkHAIKE/contextcheck v1.1.6 // indirect
56159
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
160+
github.com/kulti/thelper v0.7.1 // indirect
161+
github.com/kunwardeep/paralleltest v1.0.15 // indirect
162+
github.com/lasiar/canonicalheader v1.1.2 // indirect
163+
github.com/ldez/exptostd v0.4.5 // indirect
164+
github.com/ldez/gomoddirectives v0.7.1 // indirect
165+
github.com/ldez/grignotin v0.10.1 // indirect
166+
github.com/ldez/tagliatelle v0.7.2 // indirect
167+
github.com/ldez/usetesting v0.5.0 // indirect
168+
github.com/leonklingele/grouper v1.1.2 // indirect
169+
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
170+
github.com/macabu/inamedparam v0.2.0 // indirect
171+
github.com/magiconair/properties v1.8.6 // indirect
172+
github.com/manuelarte/embeddedstructfieldcheck v0.4.0 // indirect
173+
github.com/manuelarte/funcorder v0.5.0 // indirect
174+
github.com/maratori/testableexamples v1.0.0 // indirect
175+
github.com/maratori/testpackage v1.1.1 // indirect
176+
github.com/matoous/godox v1.1.0 // indirect
177+
github.com/mattn/go-colorable v0.1.14 // indirect
178+
github.com/mattn/go-isatty v0.0.20 // indirect
179+
github.com/mattn/go-runewidth v0.0.16 // indirect
180+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
181+
github.com/mgechev/revive v1.12.0 // indirect
182+
github.com/mitchellh/go-homedir v1.1.0 // indirect
183+
github.com/mitchellh/mapstructure v1.5.0 // indirect
184+
github.com/moricho/tparallel v0.3.2 // indirect
185+
github.com/muesli/termenv v0.16.0 // indirect
186+
github.com/nakabonne/nestif v0.3.1 // indirect
187+
github.com/nishanths/exhaustive v0.12.0 // indirect
188+
github.com/nishanths/predeclared v0.2.2 // indirect
189+
github.com/nunnatsa/ginkgolinter v0.21.2 // indirect
57190
github.com/pb33f/ordered-map/v2 v2.2.0 // indirect
191+
github.com/pelletier/go-toml v1.9.5 // indirect
58192
github.com/pjbgf/sha1cd v0.5.0 // indirect
59193
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
194+
github.com/polyfloyd/go-errorlint v1.8.0 // indirect
195+
github.com/prometheus/client_golang v1.12.1 // indirect
196+
github.com/prometheus/client_model v0.2.0 // indirect
197+
github.com/prometheus/common v0.32.1 // indirect
198+
github.com/prometheus/procfs v0.7.3 // indirect
199+
github.com/quasilyte/go-ruleguard v0.4.4 // indirect
200+
github.com/quasilyte/go-ruleguard/dsl v0.3.23 // indirect
201+
github.com/quasilyte/gogrep v0.5.0 // indirect
202+
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
203+
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
204+
github.com/raeperd/recvcheck v0.2.0 // indirect
205+
github.com/rivo/uniseg v0.4.7 // indirect
206+
github.com/rogpeppe/go-internal v1.14.1 // indirect
207+
github.com/ryancurrah/gomodguard v1.4.1 // indirect
208+
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
209+
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
210+
github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
211+
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
212+
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
213+
github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect
214+
github.com/securego/gosec/v2 v2.22.10 // indirect
60215
github.com/sergi/go-diff v1.4.0 // indirect
216+
github.com/sirupsen/logrus v1.9.3 // indirect
217+
github.com/sivchari/containedctx v1.0.3 // indirect
61218
github.com/skeema/knownhosts v1.3.1 // indirect
219+
github.com/sonatard/noctx v0.4.0 // indirect
220+
github.com/sourcegraph/go-diff v0.7.0 // indirect
62221
github.com/speakeasy-api/jsonpath v0.6.2 // indirect
222+
github.com/spf13/afero v1.14.0 // indirect
223+
github.com/spf13/cast v1.5.0 // indirect
224+
github.com/spf13/cobra v1.10.1 // indirect
225+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
226+
github.com/spf13/pflag v1.0.10 // indirect
227+
github.com/spf13/viper v1.12.0 // indirect
228+
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
229+
github.com/stbenjam/no-sprintf-host-port v0.2.0 // indirect
230+
github.com/stretchr/objx v0.5.2 // indirect
231+
github.com/stretchr/testify v1.11.1 // indirect
232+
github.com/subosito/gotenv v1.4.1 // indirect
233+
github.com/tetafro/godot v1.5.4 // indirect
234+
github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 // indirect
235+
github.com/timonwong/loggercheck v0.11.0 // indirect
236+
github.com/tomarrell/wrapcheck/v2 v2.11.0 // indirect
237+
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
238+
github.com/ultraware/funlen v0.2.0 // indirect
239+
github.com/ultraware/whitespace v0.2.0 // indirect
240+
github.com/uudashr/gocognit v1.2.0 // indirect
241+
github.com/uudashr/iface v1.4.1 // indirect
63242
github.com/xanzy/ssh-agent v0.3.3 // indirect
243+
github.com/xen0n/gosmopolitan v1.3.0 // indirect
244+
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
245+
github.com/yagipy/maintidx v1.0.0 // indirect
246+
github.com/yeya24/promlinter v0.3.0 // indirect
247+
github.com/ykadowak/zerologlint v0.1.5 // indirect
248+
gitlab.com/bosi/decorder v0.4.2 // indirect
249+
go-simpler.org/musttag v0.14.0 // indirect
250+
go-simpler.org/sloglint v0.11.1 // indirect
251+
go.augendre.info/arangolint v0.3.1 // indirect
252+
go.augendre.info/fatcontext v0.9.0 // indirect
64253
go.opentelemetry.io/auto/sdk v1.2.0 // indirect
65254
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
66255
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
67256
go.opentelemetry.io/otel v1.38.0 // indirect
68257
go.opentelemetry.io/otel/metric v1.38.0 // indirect
69258
go.opentelemetry.io/otel/trace v1.38.0 // indirect
259+
go.uber.org/automaxprocs v1.6.0 // indirect
260+
go.uber.org/multierr v1.10.0 // indirect
261+
go.uber.org/zap v1.27.0 // indirect
70262
golang.org/x/crypto v0.45.0 // indirect
263+
golang.org/x/exp/typeparams v0.0.0-20251002181428-27f1f14c8bb9 // indirect
264+
golang.org/x/mod v0.30.0 // indirect
71265
golang.org/x/net v0.47.0 // indirect
72266
golang.org/x/oauth2 v0.31.0 // indirect
73267
golang.org/x/sync v0.18.0 // indirect
74268
golang.org/x/sys v0.38.0 // indirect
269+
golang.org/x/telemetry v0.0.0-20251111182119-bc8e575c7b54 // indirect
75270
golang.org/x/text v0.31.0 // indirect
76271
golang.org/x/time v0.13.0 // indirect
272+
golang.org/x/tools v0.39.0 // indirect
77273
google.golang.org/api v0.249.0 // indirect
78274
google.golang.org/grpc v1.75.1 // indirect
275+
gopkg.in/ini.v1 v1.67.0 // indirect
79276
gopkg.in/warnings.v0 v0.1.2 // indirect
277+
gopkg.in/yaml.v2 v2.4.0 // indirect
278+
honnef.co/go/tools v0.6.1 // indirect
279+
mvdan.cc/gofumpt v0.9.2 // indirect
280+
mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15 // indirect
80281
)
81282

82283
retract (
83284
v1.0.1 // Version bump to roll out retractions only.
84285
v1.0.0 // Retracted because the 1.0.0 release was published prematurely.
85286
)
287+
288+
tool (
289+
github.com/golangci/golangci-lint/v2/cmd/golangci-lint
290+
github.com/google/yamlfmt/cmd/yamlfmt
291+
golang.org/x/tools/cmd/goimports
292+
)

0 commit comments

Comments
 (0)