Skip to content

Commit d8ef625

Browse files
AshleyDumaineAshleyDumaine
committed
fix GHA to use the version of golangci-lint we declare in tools rather than the action, add missing steps for gosec (added to go tools) and vulncheck in the go-analyze workflow
1 parent 53f3cd7 commit d8ef625

File tree

5 files changed

+39
-9
lines changed

5 files changed

+39
-9
lines changed

‎.github/workflows/go-analyze.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,16 @@ jobs:
6969
cache: false
7070

7171
- name: lint
72-
uses: golangci/golangci-lint-action@v8
73-
with:
74-
version: latest
72+
run: make lint
7573

7674
- name: lint-api
7775
run: make lint-api
7876

7977
- name: Nilcheck
8078
run: make nilcheck
79+
80+
- name: Vulncheck
81+
run: make vulncheck
82+
83+
- name: Gosec
84+
run: make gosec

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ vet: ## Run go vet against code.
123123
go vet ./...
124124

125125
.PHONY: gosec
126-
gosec: ## Run gosec against code.
127-
docker run --rm -w /workdir -v $(PWD):/workdir securego/gosec:2.19.0 -exclude-dir=bin -exclude-generated ./...
126+
gosec: tools ## Run gosec against code.
127+
gosec -exclude-dir=bin -exclude-generated ./...
128128

129129
.PHONY: lint
130130
lint: tools ## Run lint against code.

‎go.mod‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ require (
4141
4d63.com/gochecknoglobals v0.2.2 // indirect
4242
cel.dev/expr v0.24.0 // indirect
4343
cloud.google.com/go v0.121.2 // indirect
44-
cloud.google.com/go/auth v0.16.3 // indirect
44+
cloud.google.com/go/auth v0.16.5 // indirect
4545
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
46-
cloud.google.com/go/compute/metadata v0.7.0 // indirect
46+
cloud.google.com/go/compute/metadata v0.8.0 // indirect
4747
cloud.google.com/go/iam v1.5.2 // indirect
4848
cloud.google.com/go/monitoring v1.24.2 // indirect
4949
cloud.google.com/go/storage v1.53.0 // indirect
@@ -82,6 +82,7 @@ require (
8282
github.com/alfatraining/structtag v1.0.0 // indirect
8383
github.com/alingse/asasalint v0.0.11 // indirect
8484
github.com/alingse/nilnesserr v0.2.0 // indirect
85+
github.com/anthropics/anthropic-sdk-go v1.12.0 // indirect
8586
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
8687
github.com/aquilax/truncate v1.0.1 // indirect
8788
github.com/ashanbrown/forbidigo/v2 v2.1.0 // indirect
@@ -192,8 +193,10 @@ require (
192193
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
193194
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
194195
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
196+
github.com/gookit/color v1.6.0 // indirect
195197
github.com/gordonklaus/ineffassign v0.2.0 // indirect
196198
github.com/gorilla/mux v1.8.1 // indirect
199+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
197200
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
198201
github.com/gostaticanalysis/comment v1.5.0 // indirect
199202
github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
@@ -294,7 +297,7 @@ require (
294297
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
295298
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
296299
github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect
297-
github.com/securego/gosec/v2 v2.22.8 // indirect
300+
github.com/securego/gosec/v2 v2.22.9 // indirect
298301
github.com/sergi/go-diff v1.2.0 // indirect
299302
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
300303
github.com/shoenig/go-m1cpu v0.1.6 // indirect
@@ -315,6 +318,10 @@ require (
315318
github.com/subosito/gotenv v1.6.0 // indirect
316319
github.com/termie/go-shutil v0.0.0-20140729215957-bcacb06fecae // indirect
317320
github.com/tetafro/godot v1.5.4 // indirect
321+
github.com/tidwall/gjson v1.18.0 // indirect
322+
github.com/tidwall/match v1.1.1 // indirect
323+
github.com/tidwall/pretty v1.2.1 // indirect
324+
github.com/tidwall/sjson v1.2.5 // indirect
318325
github.com/tilt-dev/clusterid v0.1.6 // indirect
319326
github.com/tilt-dev/ctlptl v0.8.43 // indirect
320327
github.com/tilt-dev/localregistry-go v0.0.0-20201021185044-ffc4c827f097 // indirect
@@ -366,6 +373,7 @@ require (
366373
golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053 // indirect
367374
golang.org/x/vuln v1.1.4 // indirect
368375
google.golang.org/api v0.246.0 // indirect
376+
google.golang.org/genai v1.25.0 // indirect
369377
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
370378
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
371379
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
@@ -412,7 +420,7 @@ require (
412420
github.com/gobuffalo/flect v1.0.3 // indirect
413421
github.com/gogo/protobuf v1.3.2 // indirect
414422
github.com/google/gnostic-models v0.7.0 // indirect
415-
github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a // indirect
423+
github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 // indirect
416424
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
417425
github.com/josharian/intern v1.0.0 // indirect
418426
github.com/json-iterator/go v1.1.12 // indirect
@@ -477,6 +485,7 @@ tool (
477485
github.com/hexdigest/gowrap/cmd/gowrap
478486
github.com/kyverno/chainsaw
479487
github.com/peak/s5cmd/v2
488+
github.com/securego/gosec/v2/cmd/gosec
480489
github.com/tilt-dev/ctlptl/cmd/ctlptl
481490
go.uber.org/mock/mockgen
482491
go.uber.org/nilaway/cmd/nilaway

‎go.sum‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ cloud.google.com/go/assuredworkloads v1.9.0/go.mod h1:kFuI1P78bplYtT77Tb1hi0FMxM
107107
cloud.google.com/go/assuredworkloads v1.10.0/go.mod h1:kwdUQuXcedVdsIaKgKTp9t0UJkE5+PAVNhdQm4ZVq2E=
108108
cloud.google.com/go/auth v0.16.3 h1:kabzoQ9/bobUmnseYnBO6qQG7q4a/CffFRlJSxv2wCc=
109109
cloud.google.com/go/auth v0.16.3/go.mod h1:NucRGjaXfzP1ltpcQ7On/VTZ0H4kWB5Jy+Y9Dnm76fA=
110+
cloud.google.com/go/auth v0.16.5 h1:mFWNQ2FEVWAliEQWpAdH80omXFokmrnbDhUS9cBywsI=
111+
cloud.google.com/go/auth v0.16.5/go.mod h1:utzRfHMP+Vv0mpOkTRQoWD2q3BatTOoWbA7gCc2dUhQ=
110112
cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
111113
cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
112114
cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0=
@@ -190,6 +192,8 @@ cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxB
190192
cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
191193
cloud.google.com/go/compute/metadata v0.7.0 h1:PBWF+iiAerVNe8UCHxdOt6eHLVc3ydFeOCw78U8ytSU=
192194
cloud.google.com/go/compute/metadata v0.7.0/go.mod h1:j5MvL9PprKL39t166CoB1uVHfQMs4tFQZZcKwksXUjo=
195+
cloud.google.com/go/compute/metadata v0.8.0 h1:HxMRIbao8w17ZX6wBnjhcDkW6lTFpgcaobyVfZWqRLA=
196+
cloud.google.com/go/compute/metadata v0.8.0/go.mod h1:sYOGTp851OV9bOFJ9CH7elVvyzopvWQFNNghtDQ/Biw=
193197
cloud.google.com/go/contactcenterinsights v1.3.0/go.mod h1:Eu2oemoePuEFc/xKFPjbTuPSj0fYJcPls9TFlPNnHHY=
194198
cloud.google.com/go/contactcenterinsights v1.4.0/go.mod h1:L2YzkGbPsv+vMQMCADxJoT9YiTTnSEd6fEvCeHTYVck=
195199
cloud.google.com/go/contactcenterinsights v1.6.0/go.mod h1:IIDlT6CLcDoyv79kDv8iWxMSTZhLxSCofVV5W6YFM/w=
@@ -726,6 +730,8 @@ github.com/alingse/nilnesserr v0.2.0/go.mod h1:1xJPrXonEtX7wyTq8Dytns5P2hNzoWymV
726730
github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 h1:MzBOUgng9orim59UnfUTLRjMpd09C5uEVQ6RPGeCaVI=
727731
github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129/go.mod h1:rFgpPQZYZ8vdbc+48xibu8ALc3yeyd64IhHS+PU6Yyg=
728732
github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
733+
github.com/anthropics/anthropic-sdk-go v1.12.0 h1:xPqlGnq7rWrTiHazIvCiumA0u7mGQnwDQtvA1M82h9U=
734+
github.com/anthropics/anthropic-sdk-go v1.12.0/go.mod h1:WTz31rIUHUHqai2UslPpw5CwXrQP3geYBioRV4WOLvE=
729735
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
730736
github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ=
731737
github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw=
@@ -1239,6 +1245,8 @@ github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLe
12391245
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
12401246
github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a h1://KbezygeMJZCSHH+HgUZiTeSoiuFspbMg1ge+eFj18=
12411247
github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a/go.mod h1:5hDyRhoBCxViHszMt12TnOpEI4VVi+U8Gm9iphldiMA=
1248+
github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 h1:EEHtgt9IwisQ2AZ4pIsMjahcegHh6rmhqxzIRQIyepY=
1249+
github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6/go.mod h1:I6V7YzU0XDpsHqbsyrghnFZLO1gwK6NPTNvmetQIk9U=
12421250
github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA=
12431251
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
12441252
github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
@@ -1274,6 +1282,8 @@ github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsC
12741282
github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
12751283
github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=
12761284
github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
1285+
github.com/gookit/color v1.6.0 h1:JjJXBTk1ETNyqyilJhkTXJYYigHG24TM9Xa2M1xAhRA=
1286+
github.com/gookit/color v1.6.0/go.mod h1:9ACFc7/1IpHGBW8RwuDm/0YEnhg3dwwXpoMsmtyHfjs=
12771287
github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
12781288
github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
12791289
github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
@@ -1693,6 +1703,8 @@ github.com/sashamelentyev/usestdlibvars v1.29.0 h1:8J0MoRrw4/NAXtjQqTHrbW9NN+3iM
16931703
github.com/sashamelentyev/usestdlibvars v1.29.0/go.mod h1:8PpnjHMk5VdeWlVb4wCdrB8PNbLqZ3wBZTZWkrpZZL8=
16941704
github.com/securego/gosec/v2 v2.22.8 h1:3NMpmfXO8wAVFZPNsd3EscOTa32Jyo6FLLlW53bexMI=
16951705
github.com/securego/gosec/v2 v2.22.8/go.mod h1:ZAw8K2ikuH9qDlfdV87JmNghnVfKB1XC7+TVzk6Utto=
1706+
github.com/securego/gosec/v2 v2.22.9 h1:njwnorLl1pJMkwaymi1iyWDy8xeaVUByW4oteJzYNHc=
1707+
github.com/securego/gosec/v2 v2.22.9/go.mod h1:x3qEF4J5bkDFIm8siAwsYZ40Uu5tD4JWpfVDPx3P3+0=
16961708
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
16971709
github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
16981710
github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
@@ -1794,10 +1806,12 @@ github.com/tetafro/godot v1.5.4 h1:u1ww+gqpRLiIA16yF2PV1CV1n/X3zhyezbNXC3E14Sg=
17941806
github.com/tetafro/godot v1.5.4/go.mod h1:eOkMrVQurDui411nBY2FA05EYH01r14LuWY/NrVDVcU=
17951807
github.com/theupdateframework/notary v0.7.0 h1:QyagRZ7wlSpjT5N2qQAh/pN+DVqgekv4DzbAiAiEL3c=
17961808
github.com/theupdateframework/notary v0.7.0/go.mod h1:c9DRxcmhHmVLDay4/2fUYdISnHqbFDGRSlXPO0AhYWw=
1809+
github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
17971810
github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
17981811
github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
17991812
github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
18001813
github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
1814+
github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
18011815
github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
18021816
github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
18031817
github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
@@ -2549,6 +2563,8 @@ google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww
25492563
google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
25502564
google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
25512565
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
2566+
google.golang.org/genai v1.25.0 h1:Cpyh2nmEoOS1eM3mT9XKuA/qWTEDoktfP2gsN3EduPE=
2567+
google.golang.org/genai v1.25.0/go.mod h1:OClfdf+r5aaD+sCd4aUSkPzJItmg2wD/WON9lQnRPaY=
25522568
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
25532569
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
25542570
google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=

‎internal/webhook/v1alpha2/linodeobjectstoragekey_webhook.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import (
3737
// log is for logging in this package.
3838
var linodeobjectstoragekeylog = logf.Log.WithName("linodeobjectstoragekey-resource")
3939

40+
//gosec:disable G101 -- This is a false positive
4041
const defaultKeySecretNameTemplate = "%s-obj-key"
4142

4243
// SetupLinodeObjectStorageKeyWebhookWithManager registers the webhook for LinodeObjectStorageKey in the manager.

0 commit comments

Comments
 (0)