Skip to content

Commit cd93d26

Browse files
authored
Merge pull request #210 from stackitcloud/feature/patchday
chore: update dependencies and fix lint
2 parents 179f0ec + 7ab5d51 commit cd93d26

8 files changed

Lines changed: 261 additions & 243 deletions

File tree

.github/workflows/semgrep.yaml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,27 @@ jobs:
1010
runs-on: ubuntu-latest
1111
# Skip any PR created by dependabot to avoid permission issues
1212
if: (github.actor != 'dependabot[bot]')
13+
container:
14+
image: semgrep/semgrep:1.168.0@sha256:59fbed6127ea7c5dde3ba6a85142733bb20ea9aaa36120c953904f1539aaf66e
1315
steps:
1416
# Fetch project source
1517
- uses: actions/checkout@v7
1618

17-
- uses: returntocorp/semgrep-action@v1
18-
with:
19-
config: >- # more at semgrep.dev/explore
20-
p/security-audit
21-
p/secrets
22-
p/ci
23-
p/r2c
24-
p/r2c-ci
25-
p/docker
26-
p/dockerfile
27-
p/command-injection
28-
generateSarif: "1"
19+
- name: Run Semgrep
20+
run: |
21+
semgrep scan \
22+
--sarif \
23+
--output=semgrep.sarif \
24+
--config="p/security-audit" \
25+
--config="p/secrets" \
26+
--config="p/ci" \
27+
--config="p/default" \
28+
--config="p/docker" \
29+
--config="p/dockerfile" \
30+
--config="p/command-injection"
2931
3032
# Upload findings to GitHub Advanced Security Dashboard [step 2/2]
3133
- name: Upload SARIF file for GitHub Advanced Security Dashboard
3234
uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
3335
with:
34-
sarif_file: semgrep.sarif
35-
if: always()
36+
sarif_file: semgrep.sarif

.golangci.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: "2"
22
run:
33
concurrency: 4
4-
go: "1.22"
4+
go: "1.26"
55
issues-exit-code: 1
66
tests: true
77
allow-parallel-runners: false
@@ -34,7 +34,7 @@ linters:
3434
- godox
3535
- goheader
3636
- gomoddirectives
37-
- gomodguard
37+
- gomodguard_v2
3838
- goprintffuncname
3939
- gosec
4040
- importas
@@ -139,9 +139,6 @@ linters:
139139
replace-local: false
140140
exclude-forbidden: false
141141
retract-allow-no-explanation: false
142-
gomodguard:
143-
blocked:
144-
local-replace-directives: false
145142
gosec:
146143
includes:
147144
- G401

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
GOLANGCI_VERSION = 2.10.1
1+
# https://github.com/golangci/golangci-lint/releases
2+
GOLANGCI_VERSION = 2.12.2
23
HELM_DOCS_VERSION = 1.14.2
34
LICENCES_IGNORE_LIST = $(shell cat licenses/licenses-ignore-list.txt)
45

@@ -32,7 +33,7 @@ mocks:
3233

3334
GOLANGCI_LINT = bin/golangci-lint-$(GOLANGCI_VERSION)
3435
$(GOLANGCI_LINT):
35-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | bash -s -- -b bin v$(GOLANGCI_VERSION)
36+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/main/install.sh | bash -s -- -b bin v$(GOLANGCI_VERSION)
3637
@mv bin/golangci-lint "$(@)"
3738

3839
lint: $(GOLANGCI_LINT) download

go.mod

Lines changed: 66 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -15,110 +15,116 @@ require (
1515
github.com/stretchr/testify v1.11.1
1616
go.uber.org/mock v0.6.0
1717
go.uber.org/zap v1.28.0
18-
k8s.io/api v0.35.2
19-
k8s.io/apiextensions-apiserver v0.35.2
20-
k8s.io/apimachinery v0.35.2
21-
k8s.io/client-go v0.35.2
22-
k8s.io/utils v0.0.0-20260507154919-ff6756f316d2
18+
k8s.io/api v0.36.2
19+
k8s.io/apiextensions-apiserver v0.36.2
20+
k8s.io/apimachinery v0.36.2
21+
k8s.io/client-go v0.36.2
22+
k8s.io/utils v0.0.0-20260626114624-be93311217bd
2323
)
2424

2525
require (
26-
cel.dev/expr v0.25.1 // indirect
26+
cel.dev/expr v0.25.2 // indirect
2727
github.com/NYTimes/gziphandler v1.1.1 // indirect
2828
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
2929
github.com/beorn7/perks v1.0.1 // indirect
3030
github.com/blang/semver/v4 v4.0.0 // indirect
3131
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
3232
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3333
github.com/coreos/go-semver v0.3.1 // indirect
34-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
34+
github.com/coreos/go-systemd/v22 v22.7.0 // indirect
3535
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3636
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
3737
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
38-
github.com/felixge/httpsnoop v1.0.4 // indirect
39-
github.com/fsnotify/fsnotify v1.9.0 // indirect
40-
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
38+
github.com/felixge/httpsnoop v1.1.0 // indirect
39+
github.com/fsnotify/fsnotify v1.10.1 // indirect
40+
github.com/fxamacker/cbor/v2 v2.9.2 // indirect
4141
github.com/go-logr/logr v1.4.3 // indirect
4242
github.com/go-logr/stdr v1.2.2 // indirect
4343
github.com/go-logr/zapr v1.3.0 // indirect
44-
github.com/go-openapi/jsonpointer v0.22.4 // indirect
45-
github.com/go-openapi/jsonreference v0.21.4 // indirect
46-
github.com/go-openapi/swag v0.23.1 // indirect
47-
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
44+
github.com/go-openapi/jsonpointer v0.24.0 // indirect
45+
github.com/go-openapi/jsonreference v0.21.6 // indirect
46+
github.com/go-openapi/swag v0.27.0 // indirect
47+
github.com/go-openapi/swag/cmdutils v0.27.0 // indirect
48+
github.com/go-openapi/swag/conv v0.27.0 // indirect
49+
github.com/go-openapi/swag/fileutils v0.27.0 // indirect
50+
github.com/go-openapi/swag/jsonutils v0.27.0 // indirect
51+
github.com/go-openapi/swag/loading v0.27.0 // indirect
52+
github.com/go-openapi/swag/mangling v0.27.0 // indirect
53+
github.com/go-openapi/swag/netutils v0.27.0 // indirect
54+
github.com/go-openapi/swag/stringutils v0.27.0 // indirect
55+
github.com/go-openapi/swag/typeutils v0.27.0 // indirect
56+
github.com/go-openapi/swag/yamlutils v0.27.0 // indirect
4857
github.com/gogo/protobuf v1.3.2 // indirect
4958
github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
5059
github.com/golang/protobuf v1.5.4 // indirect
51-
github.com/google/btree v1.1.3 // indirect
52-
github.com/google/cel-go v0.26.0 // indirect
60+
github.com/google/cel-go v0.28.1 // indirect
5361
github.com/google/gnostic-models v0.7.1 // indirect
54-
github.com/google/go-cmp v0.7.0 // indirect
5562
github.com/google/uuid v1.6.0 // indirect
56-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
57-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
63+
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 // indirect
64+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3 // indirect
65+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect
5866
github.com/inconshreveable/mousetrap v1.1.0 // indirect
59-
github.com/josharian/intern v1.0.0 // indirect
6067
github.com/json-iterator/go v1.1.12 // indirect
6168
github.com/kylelemons/godebug v1.1.0 // indirect
62-
github.com/mailru/easyjson v0.9.1 // indirect
6369
github.com/miekg/dns v1.1.72 // indirect
6470
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6571
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
6672
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6773
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6874
github.com/prometheus/client_golang v1.23.2 // indirect
6975
github.com/prometheus/client_model v0.6.2 // indirect
70-
github.com/prometheus/common v0.66.1 // indirect
71-
github.com/prometheus/procfs v0.17.0 // indirect
76+
github.com/prometheus/common v0.69.0 // indirect
77+
github.com/prometheus/procfs v0.21.1 // indirect
7278
github.com/spf13/cobra v1.10.2 // indirect
7379
github.com/spf13/pflag v1.0.10 // indirect
74-
github.com/stoewer/go-strcase v1.3.1 // indirect
7580
github.com/x448/float16 v0.8.4 // indirect
76-
go.etcd.io/etcd/api/v3 v3.6.5 // indirect
77-
go.etcd.io/etcd/client/pkg/v3 v3.6.5 // indirect
78-
go.etcd.io/etcd/client/v3 v3.6.5 // indirect
81+
go.etcd.io/etcd/api/v3 v3.6.13 // indirect
82+
go.etcd.io/etcd/client/pkg/v3 v3.6.13 // indirect
83+
go.etcd.io/etcd/client/v3 v3.6.13 // indirect
7984
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
80-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
81-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
82-
go.opentelemetry.io/otel v1.43.0 // indirect
83-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
84-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 // indirect
85-
go.opentelemetry.io/otel/metric v1.43.0 // indirect
86-
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
87-
go.opentelemetry.io/otel/trace v1.43.0 // indirect
88-
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
85+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.69.0 // indirect
86+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0 // indirect
87+
go.opentelemetry.io/otel v1.44.0 // indirect
88+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.44.0 // indirect
89+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.44.0 // indirect
90+
go.opentelemetry.io/otel/metric v1.44.0 // indirect
91+
go.opentelemetry.io/otel/sdk v1.44.0 // indirect
92+
go.opentelemetry.io/otel/trace v1.44.0 // indirect
93+
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
8994
go.uber.org/multierr v1.11.0 // indirect
90-
go.yaml.in/yaml/v2 v2.4.3 // indirect
95+
go.yaml.in/yaml/v2 v2.4.4 // indirect
9196
go.yaml.in/yaml/v3 v3.0.4 // indirect
92-
golang.org/x/crypto v0.52.0 // indirect
93-
golang.org/x/exp v0.0.0-20250718183923-645b1fa84792 // indirect
94-
golang.org/x/mod v0.35.0 // indirect
95-
golang.org/x/net v0.55.0 // indirect
96-
golang.org/x/oauth2 v0.35.0 // indirect
97-
golang.org/x/sync v0.20.0 // indirect
98-
golang.org/x/sys v0.45.0 // indirect
99-
golang.org/x/term v0.43.0 // indirect
100-
golang.org/x/text v0.37.0 // indirect
101-
golang.org/x/time v0.14.0 // indirect
102-
golang.org/x/tools v0.44.0 // indirect
97+
golang.org/x/crypto v0.53.0 // indirect
98+
golang.org/x/exp v0.0.0-20260611194520-c48552f49976 // indirect
99+
golang.org/x/mod v0.37.0 // indirect
100+
golang.org/x/net v0.56.0 // indirect
101+
golang.org/x/oauth2 v0.36.0 // indirect
102+
golang.org/x/sync v0.21.0 // indirect
103+
golang.org/x/sys v0.46.0 // indirect
104+
golang.org/x/term v0.44.0 // indirect
105+
golang.org/x/text v0.38.0 // indirect
106+
golang.org/x/time v0.15.0 // indirect
107+
golang.org/x/tools v0.47.0 // indirect
103108
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
104-
google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect
105-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7 // indirect
106-
google.golang.org/grpc v1.79.3 // indirect
107-
google.golang.org/protobuf v1.36.11 // indirect
109+
google.golang.org/genproto/googleapis/api v0.0.0-20260630182238-925bb5da69e7 // indirect
110+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260630182238-925bb5da69e7 // indirect
111+
google.golang.org/grpc v1.82.0 // indirect
112+
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
108113
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
109114
gopkg.in/inf.v0 v0.9.1 // indirect
110115
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
111116
gopkg.in/yaml.v3 v3.0.1 // indirect
112-
k8s.io/apiserver v0.35.2 // indirect
113-
k8s.io/component-base v0.35.2 // indirect
117+
k8s.io/apiserver v0.36.2 // indirect
118+
k8s.io/component-base v0.36.2 // indirect
114119
k8s.io/klog/v2 v2.140.0 // indirect
115-
k8s.io/kms v0.35.2 // indirect
116-
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4 // indirect
117-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0 // indirect
118-
sigs.k8s.io/controller-runtime v0.23.1 // indirect
119-
sigs.k8s.io/gateway-api v1.5.0 // indirect
120+
k8s.io/kms v0.36.2 // indirect
121+
k8s.io/kube-openapi v0.0.0-20260624041617-8f3fa4921821 // indirect
122+
k8s.io/streaming v0.36.2 // indirect
123+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.36.0 // indirect
124+
sigs.k8s.io/controller-runtime v0.24.1 // indirect
125+
sigs.k8s.io/gateway-api v1.6.0 // indirect
120126
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
121127
sigs.k8s.io/randfill v1.0.0 // indirect
122-
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
128+
sigs.k8s.io/structured-merge-diff/v6 v6.4.0 // indirect
123129
sigs.k8s.io/yaml v1.6.0 // indirect
124130
)

0 commit comments

Comments
 (0)