Skip to content

Commit 560402d

Browse files
authored
Merge branch 'main' into ale-upload-icon
2 parents adb56b9 + 5ffec6b commit 560402d

File tree

7 files changed

+1082
-98
lines changed

7 files changed

+1082
-98
lines changed

.circleci/config.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,6 @@ jobs:
120120
keys:
121121
- go-mod-v4-{{ checksum "go.sum" }}
122122
- retrieve-oidc-secrets
123-
- run:
124-
name: Install Lint
125-
command: |
126-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin
127123
- run:
128124
name: Run Unit Tests
129125
command: |

.claude/CLAUDE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ make coverage # View test coverage report
2727
### Linting
2828

2929
```bash
30-
make lint # Run golangci-lint
31-
golangci-lint --version # Verify linter version
30+
make lint # Run golangci-lint
31+
go tool golangci-lint version # Verify linter version
3232
```
3333

3434
### Formatting

.github/MAINTAINERS_GUIDE.md

Lines changed: 3 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -90,87 +90,19 @@ brew uninstall go
9090

9191
Linters are used to help catch formatting strangeness and strange spellings.
9292

93-
The CI runs linting via [golangci-lint][golangci-lint] and is configured in the
94-
`.golangci.yml` file.
95-
96-
Install this tool to mimic CI environments and run linting with the `Makefile`:
97-
98-
```sh
99-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin
100-
```
101-
102-
Confirm the installation worked right with:
93+
The CI runs linting with [golangci-lint][golangci-lint] and is installed in the
94+
project `go.mod` tools and separate `.golangci.yml` configuration file:
10395

10496
```sh
105-
golangci-lint --version
106-
```
107-
108-
<details>
109-
<summary>Troubleshooting</summary>
110-
111-
#### Error: command not found: golangci-lint
112-
113-
If you receive the following error:
114-
115-
```bash
116-
$ golangci-lint --version
117-
command not found: golangci-lint
97+
go tool golangci-lint run
11898
```
11999

120-
You may need to update your `$PATH` environment variable with `$GOPATH/bin`:
121-
1. Open your terminal's configuration file (e.g. `~/.zshrc`):
122-
123-
```bash
124-
$ vim ~/.zshrc
125-
```
126-
127-
2. Add the following:
128-
129-
```bash
130-
export PATH=$PATH:$(go env GOPATH)/bin
131-
```
132-
3. Open a new terminal session (tab) or source your configuration file (`source ~/.zshrc`).
133-
4. Run the following command:
134-
135-
```bash
136-
$ golangci-lint --version
137-
```
138-
</details>
139-
140100
#### VSCode
141101

142102
Settings are already defined in this project for using the VSCode editor with
143103
`golangci-lint` as the `go.lintTool`. Inspect [`.vscode/settings.json`][vscode]
144104
for more details.
145105

146-
#### Troubleshooting
147-
148-
Linting troubles can happen from unexpected formatting or a broken installation.
149-
Broken installations might be fixed by the below:
150-
151-
<details>
152-
<summary>Matching versions that don't match</summary>
153-
154-
The latest version of `golangci-lint` is used in testing and should be matched
155-
by the installation you have.
156-
157-
Compare [the latest version][golangci-lint-release] to your current installation
158-
and try linting once more.
159-
160-
</details>
161-
162-
<details>
163-
<summary>Uninstalling a Homebrew installation</summary>
164-
165-
Setting the correct version of `golangci-lint` can be difficult with Homebrew.
166-
If this is causing issues try uninstalling it with:
167-
168-
```sh
169-
brew uninstall golangci-lint
170-
```
171-
172-
</details>
173-
174106
### Makefile
175107

176108
Common commands are contained in the `Makefile` for this project. These perform

.github/workflows/tests.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ jobs:
2727
with:
2828
go-version: "1.26.2"
2929
- name: Lint
30-
uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
31-
with:
32-
version: latest
33-
args: --timeout=5m
30+
run: go tool golangci-lint run --timeout=5m
3431
- name: Unit Tests
3532
run: make test
3633
- name: Install Tests

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ coverage:
5252
# Run the linter
5353
.PHONY: lint
5454
lint:
55-
golangci-lint run
55+
go tool golangci-lint run
5656

5757
# Build the CLI
5858
.PHONY: build

go.mod

Lines changed: 187 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,53 +33,234 @@ require (
3333
)
3434

3535
require (
36+
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
37+
4d63.com/gochecknoglobals v0.2.2 // indirect
3638
charm.land/bubbles/v2 v2.0.0 // indirect
39+
codeberg.org/chavacava/garif v0.2.0 // indirect
40+
codeberg.org/polyfloyd/go-errorlint v1.9.0 // indirect
3741
dario.cat/mergo v1.0.2 // indirect
42+
dev.gaijin.team/go/exhaustruct/v4 v4.0.0 // indirect
43+
dev.gaijin.team/go/golib v0.6.0 // indirect
44+
github.com/4meepo/tagalign v1.4.3 // indirect
45+
github.com/Abirdcfly/dupword v0.1.7 // indirect
46+
github.com/AdminBenni/iota-mixing v1.0.0 // indirect
47+
github.com/AlwxSin/noinlineerr v1.0.5 // indirect
48+
github.com/Antonboom/errname v1.1.1 // indirect
49+
github.com/Antonboom/nilnil v1.1.1 // indirect
50+
github.com/Antonboom/testifylint v1.6.4 // indirect
51+
github.com/BurntSushi/toml v1.6.0 // indirect
52+
github.com/Djarvur/go-err113 v0.1.1 // indirect
3853
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
54+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
3955
github.com/Microsoft/go-winio v0.6.2 // indirect
56+
github.com/MirrexOne/unqueryvet v1.5.4 // indirect
57+
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
4058
github.com/ProtonMail/go-crypto v1.3.0 // indirect
59+
github.com/alecthomas/chroma/v2 v2.23.1 // indirect
60+
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
61+
github.com/alexkohler/nakedret/v2 v2.0.6 // indirect
62+
github.com/alexkohler/prealloc v1.1.0 // indirect
63+
github.com/alfatraining/structtag v1.0.0 // indirect
64+
github.com/alingse/asasalint v0.0.11 // indirect
65+
github.com/alingse/nilnesserr v0.2.0 // indirect
66+
github.com/ashanbrown/forbidigo/v2 v2.3.0 // indirect
67+
github.com/ashanbrown/makezero/v2 v2.1.0 // indirect
4168
github.com/atotto/clipboard v0.1.4 // indirect
69+
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
70+
github.com/beorn7/perks v1.0.1 // indirect
71+
github.com/bkielbasa/cyclop v1.2.3 // indirect
72+
github.com/blizzy78/varnamelen v0.8.0 // indirect
73+
github.com/bombsimon/wsl/v4 v4.7.0 // indirect
74+
github.com/bombsimon/wsl/v5 v5.6.0 // indirect
75+
github.com/breml/bidichk v0.3.3 // indirect
76+
github.com/breml/errchkjson v0.4.1 // indirect
77+
github.com/butuzov/ireturn v0.4.0 // indirect
78+
github.com/butuzov/mirror v1.3.0 // indirect
79+
github.com/catenacyber/perfsprint v0.10.1 // indirect
4280
github.com/catppuccin/go v0.3.0 // indirect
81+
github.com/ccojocar/zxcvbn-go v1.0.4 // indirect
82+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4383
github.com/chainguard-dev/git-urls v1.0.2 // indirect
84+
github.com/charithe/durationcheck v0.0.11 // indirect
4485
github.com/charmbracelet/colorprofile v0.4.3 // indirect
86+
github.com/charmbracelet/lipgloss v1.1.0 // indirect
4587
github.com/charmbracelet/ultraviolet v0.0.0-20260416155717-489999b90468 // indirect
88+
github.com/charmbracelet/x/cellbuf v0.0.15 // indirect
4689
github.com/charmbracelet/x/exp/ordered v0.1.0 // indirect
4790
github.com/charmbracelet/x/exp/strings v0.1.0 // indirect
4891
github.com/charmbracelet/x/term v0.2.2 // indirect
4992
github.com/charmbracelet/x/termios v0.1.1 // indirect
5093
github.com/charmbracelet/x/windows v0.2.2 // indirect
94+
github.com/ckaznocha/intrange v0.3.1 // indirect
5195
github.com/clipperhouse/displaywidth v0.11.0 // indirect
5296
github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
5397
github.com/cloudflare/circl v1.6.3 // indirect
98+
github.com/curioswitch/go-reassign v0.3.0 // indirect
5499
github.com/cyphar/filepath-securejoin v0.6.1 // indirect
100+
github.com/daixiang0/gci v0.13.7 // indirect
101+
github.com/dave/dst v0.27.3 // indirect
102+
github.com/denis-tingaikin/go-header v0.5.0 // indirect
103+
github.com/dlclark/regexp2 v1.11.5 // indirect
55104
github.com/dustin/go-humanize v1.0.1 // indirect
56105
github.com/emirpasic/gods v1.18.1 // indirect
106+
github.com/ettle/strcase v0.2.0 // indirect
107+
github.com/fatih/structtag v1.2.0 // indirect
108+
github.com/firefart/nonamedreturns v1.0.6 // indirect
109+
github.com/fsnotify/fsnotify v1.5.4 // indirect
110+
github.com/fzipp/gocyclo v0.6.0 // indirect
111+
github.com/ghostiam/protogetter v0.3.20 // indirect
112+
github.com/go-critic/go-critic v0.14.3 // indirect
57113
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
58114
github.com/go-git/go-billy/v5 v5.8.0 // indirect
115+
github.com/go-toolsmith/astcast v1.1.0 // indirect
116+
github.com/go-toolsmith/astcopy v1.1.0 // indirect
117+
github.com/go-toolsmith/astequal v1.2.0 // indirect
118+
github.com/go-toolsmith/astfmt v1.1.0 // indirect
119+
github.com/go-toolsmith/astp v1.1.0 // indirect
120+
github.com/go-toolsmith/strparse v1.1.0 // indirect
121+
github.com/go-toolsmith/typep v1.1.0 // indirect
122+
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
123+
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
124+
github.com/gobwas/glob v0.2.3 // indirect
125+
github.com/godoc-lint/godoc-lint v0.11.2 // indirect
126+
github.com/gofrs/flock v0.13.0 // indirect
59127
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
128+
github.com/golang/protobuf v1.5.4 // indirect
129+
github.com/golangci/asciicheck v0.5.0 // indirect
130+
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
131+
github.com/golangci/go-printf-func-name v0.1.1 // indirect
132+
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
133+
github.com/golangci/golangci-lint/v2 v2.11.4 // indirect
134+
github.com/golangci/golines v0.15.0 // indirect
135+
github.com/golangci/misspell v0.8.0 // indirect
136+
github.com/golangci/plugin-module-register v0.1.2 // indirect
137+
github.com/golangci/revgrep v0.8.0 // indirect
138+
github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e // indirect
139+
github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect
140+
github.com/google/go-cmp v0.7.0 // indirect
141+
github.com/gordonklaus/ineffassign v0.2.0 // indirect
142+
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
143+
github.com/gostaticanalysis/comment v1.5.0 // indirect
144+
github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
145+
github.com/gostaticanalysis/nilerr v0.1.2 // indirect
146+
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
147+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
148+
github.com/hashicorp/hcl v1.0.0 // indirect
149+
github.com/hexops/gotextdiff v1.0.3 // indirect
60150
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.2 // indirect
61156
github.com/kevinburke/ssh_config v1.6.0 // indirect
157+
github.com/kisielk/errcheck v1.10.0 // indirect
158+
github.com/kkHAIKE/contextcheck v1.1.6 // indirect
62159
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.8.0 // indirect
165+
github.com/ldez/grignotin v0.10.1 // indirect
166+
github.com/ldez/structtags v0.6.1 // indirect
167+
github.com/ldez/tagliatelle v0.7.2 // indirect
168+
github.com/ldez/usetesting v0.5.0 // indirect
169+
github.com/leonklingele/grouper v1.1.2 // indirect
63170
github.com/lucasb-eyer/go-colorful v1.4.0 // indirect
171+
github.com/macabu/inamedparam v0.2.0 // indirect
172+
github.com/magiconair/properties v1.8.6 // indirect
173+
github.com/manuelarte/embeddedstructfieldcheck v0.4.0 // indirect
174+
github.com/manuelarte/funcorder v0.5.0 // indirect
175+
github.com/maratori/testableexamples v1.0.1 // indirect
176+
github.com/maratori/testpackage v1.1.2 // indirect
177+
github.com/matoous/godox v1.1.0 // indirect
64178
github.com/mattn/go-runewidth v0.0.23 // indirect
179+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
180+
github.com/mgechev/revive v1.15.0 // indirect
181+
github.com/mitchellh/go-homedir v1.1.0 // indirect
65182
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
183+
github.com/mitchellh/mapstructure v1.5.0 // indirect
184+
github.com/moricho/tparallel v0.3.2 // indirect
66185
github.com/muesli/cancelreader v0.2.2 // indirect
186+
github.com/muesli/termenv v0.16.0 // indirect
187+
github.com/nakabonne/nestif v0.3.1 // indirect
188+
github.com/nishanths/exhaustive v0.12.0 // indirect
189+
github.com/nishanths/predeclared v0.2.2 // indirect
190+
github.com/nunnatsa/ginkgolinter v0.23.0 // indirect
191+
github.com/pelletier/go-toml v1.9.5 // indirect
67192
github.com/pjbgf/sha1cd v0.5.0 // indirect
193+
github.com/prometheus/client_golang v1.12.1 // indirect
194+
github.com/prometheus/client_model v0.2.0 // indirect
195+
github.com/prometheus/common v0.32.1 // indirect
196+
github.com/prometheus/procfs v0.7.3 // indirect
197+
github.com/quasilyte/go-ruleguard v0.4.5 // indirect
198+
github.com/quasilyte/go-ruleguard/dsl v0.3.23 // indirect
199+
github.com/quasilyte/gogrep v0.5.0 // indirect
200+
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
201+
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
202+
github.com/raeperd/recvcheck v0.2.0 // indirect
68203
github.com/rivo/uniseg v0.4.7 // indirect
204+
github.com/rogpeppe/go-internal v1.14.1 // indirect
205+
github.com/ryancurrah/gomodguard v1.4.1 // indirect
206+
github.com/ryanrolds/sqlclosecheck v0.6.0 // indirect
207+
github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
208+
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
209+
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
210+
github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect
211+
github.com/securego/gosec/v2 v2.24.8-0.20260309165252-619ce2117e08 // indirect
69212
github.com/sergi/go-diff v1.4.0 // indirect
213+
github.com/sirupsen/logrus v1.9.4 // indirect
214+
github.com/sivchari/containedctx v1.0.3 // indirect
70215
github.com/skeema/knownhosts v1.3.2 // indirect
216+
github.com/sonatard/noctx v0.5.1 // indirect
217+
github.com/sourcegraph/go-diff v0.7.0 // indirect
218+
github.com/spf13/cast v1.5.0 // indirect
219+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
220+
github.com/spf13/viper v1.12.0 // indirect
221+
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
222+
github.com/stbenjam/no-sprintf-host-port v0.3.1 // indirect
223+
github.com/subosito/gotenv v1.4.1 // indirect
224+
github.com/tetafro/godot v1.5.4 // indirect
225+
github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 // indirect
226+
github.com/timonwong/loggercheck v0.11.0 // indirect
227+
github.com/tomarrell/wrapcheck/v2 v2.12.0 // indirect
228+
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
229+
github.com/ultraware/funlen v0.2.0 // indirect
230+
github.com/ultraware/whitespace v0.2.0 // indirect
231+
github.com/uudashr/gocognit v1.2.1 // indirect
232+
github.com/uudashr/iface v1.4.1 // indirect
71233
github.com/xanzy/ssh-agent v0.3.3 // indirect
234+
github.com/xen0n/gosmopolitan v1.3.0 // indirect
72235
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
73-
golang.org/x/crypto v0.48.0 // indirect
74-
golang.org/x/net v0.50.0 // indirect
236+
github.com/yagipy/maintidx v1.0.0 // indirect
237+
github.com/yeya24/promlinter v0.3.0 // indirect
238+
github.com/ykadowak/zerologlint v0.1.5 // indirect
239+
gitlab.com/bosi/decorder v0.4.2 // indirect
240+
go-simpler.org/musttag v0.14.0 // indirect
241+
go-simpler.org/sloglint v0.11.1 // indirect
242+
go.augendre.info/arangolint v0.4.0 // indirect
243+
go.augendre.info/fatcontext v0.9.0 // indirect
244+
go.uber.org/multierr v1.10.0 // indirect
245+
go.uber.org/zap v1.27.0 // indirect
246+
go.yaml.in/yaml/v3 v3.0.4 // indirect
247+
golang.org/x/crypto v0.49.0 // indirect
248+
golang.org/x/exp/typeparams v0.0.0-20260209203927-2842357ff358 // indirect
249+
golang.org/x/net v0.52.0 // indirect
75250
golang.org/x/sync v0.20.0 // indirect
251+
golang.org/x/tools v0.43.0 // indirect
252+
google.golang.org/protobuf v1.36.8 // indirect
253+
gopkg.in/ini.v1 v1.67.0 // indirect
76254
gopkg.in/warnings.v0 v0.1.2 // indirect
255+
honnef.co/go/tools v0.7.0 // indirect
77256
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 // indirect
257+
mvdan.cc/gofumpt v0.9.2 // indirect
258+
mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15 // indirect
78259
)
79260

80261
require (
81262
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
82-
github.com/fatih/color v1.18.0 // indirect
263+
github.com/fatih/color v1.19.0 // indirect
83264
github.com/go-git/go-git/v5 v5.18.0
84265
github.com/inconshreveable/mousetrap v1.1.0 // indirect
85266
github.com/kubescape/go-git-url v0.0.31
@@ -90,6 +271,8 @@ require (
90271
github.com/stretchr/objx v0.5.3 // indirect
91272
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
92273
go.uber.org/atomic v1.11.0 // indirect
93-
golang.org/x/term v0.40.0 // indirect
274+
golang.org/x/term v0.41.0 // indirect
94275
gopkg.in/yaml.v3 v3.0.1 // indirect
95276
)
277+
278+
tool github.com/golangci/golangci-lint/v2/cmd/golangci-lint

0 commit comments

Comments
 (0)