Skip to content

Commit b602ee1

Browse files
pdabelf5pdabelf5
authored
Merge branch 'main' into pre-commit-ci-update-config
2 parents f381e7a + d3bd725 commit b602ee1

File tree

10 files changed

+23
-22
lines changed

10 files changed

+23
-22
lines changed

‎.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ jobs:
135135
DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
136136

137137
- name: Create/Update Draft
138-
uses: lucacome/draft-release@38def8b74645796e9743b53e0f187d4a8915ea3e # v1.2.3
138+
uses: lucacome/draft-release@00f74370c044c322da6cb52acc707d62c7762c71 # v1.2.4
139139
with:
140140
minor-label: "enhancement"
141141
major-label: "change"
@@ -155,11 +155,11 @@ jobs:
155155
if: github.event_name != 'pull_request'
156156

157157
- name: Download Syft
158-
uses: anchore/sbom-action/download-syft@9246b90769f852b3a8921f330c59e0b3f439d6e9 # v0.20.1
158+
uses: anchore/sbom-action/download-syft@7b36ad622f042cab6f59a75c2ac24ccb256e9b45 # v0.20.4
159159
if: github.ref_type == 'tag'
160160

161161
- name: Install Cosign
162-
uses: sigstore/cosign-installer@398d4b0eeef1380460a10c8013a76f728fb906ac # v3.9.1
162+
uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
163163
if: github.ref_type == 'tag'
164164

165165
- name: Setup Snapcraft
@@ -178,7 +178,7 @@ jobs:
178178
- name: Run GoReleaser
179179
uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
180180
with:
181-
version: v2.10.2 # renovate: datasource=github-tags depName=goreleaser/goreleaser
181+
version: v2.11.2 # renovate: datasource=github-tags depName=goreleaser/goreleaser
182182
args: ${{ github.ref_type == 'tag' && 'release' || 'build --snapshot' }} --clean
183183
env:
184184
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -207,7 +207,7 @@ jobs:
207207
sbom: true
208208

209209
- name: Scan image
210-
uses: anchore/scan-action@be7a22da4f22dde446c4c4c099887ff5b256526c # v6.3.0
210+
uses: anchore/scan-action@1638637db639e0ade3258b51db49a9a137574c3e # v6.5.1
211211
id: scan
212212
continue-on-error: true
213213
with:
@@ -216,7 +216,7 @@ jobs:
216216
add-cpes-if-none: true
217217

218218
- name: Upload scan result to GitHub Security tab
219-
uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
219+
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
220220
continue-on-error: true
221221
with:
222222
sarif_file: ${{ steps.scan.outputs.sarif }}

‎.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555

5656
# Initializes the CodeQL tools for scanning.
5757
- name: Initialize CodeQL
58-
uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
58+
uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
5959
with:
6060
languages: ${{ matrix.language }}
6161
build-mode: ${{ matrix.build-mode }}
@@ -67,6 +67,6 @@ jobs:
6767
# queries: security-extended,security-and-quality
6868

6969
- name: Perform CodeQL Analysis
70-
uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
70+
uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
7171
with:
7272
category: "/language:${{matrix.language}}"

‎.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Lint Go
3333
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
3434
with:
35-
version: v2.2.1 # renovate: datasource=github-tags depName=golangci/golangci-lint
35+
version: v2.3.1 # renovate: datasource=github-tags depName=golangci/golangci-lint
3636

3737
actionlint:
3838
name: Actionlint

‎.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ jobs:
5656

5757
# Upload the results to GitHub's code scanning dashboard.
5858
- name: "Upload to code-scanning"
59-
uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
59+
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
6060
with:
6161
sarif_file: results.sarif

‎.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ repos:
2626
- id: fix-byte-order-marker
2727

2828
- repo: https://github.com/golangci/golangci-lint
29-
rev: v2.2.1
29+
rev: v2.3.1
3030
hooks:
3131
- id: golangci-lint-full
3232

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ VERSION = 1.4.2
22
TAG = $(VERSION)
33
PREFIX = nginx/nginx-prometheus-exporter
44
# renovate: datasource=github-tags depName=golangci/golangci-lint
5-
GOLANGCI_LINT_VERSION = v2.2.1
5+
GOLANGCI_LINT_VERSION = v2.3.1
66

77
.DEFAULT_GOAL:=nginx-prometheus-exporter
88

‎collector/nginx_plus.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strconv"
88
"sync"
99

10-
plusclient "github.com/nginx/nginx-plus-go-client/v2/client"
10+
plusclient "github.com/nginx/nginx-plus-go-client/v3/client"
1111
"github.com/prometheus/client_golang/prometheus"
1212
)
1313

‎exporter.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"syscall"
1717
"time"
1818

19-
plusclient "github.com/nginx/nginx-plus-go-client/v2/client"
19+
plusclient "github.com/nginx/nginx-plus-go-client/v3/client"
2020
"github.com/nginx/nginx-prometheus-exporter/client"
2121
"github.com/nginx/nginx-prometheus-exporter/collector"
2222

@@ -230,8 +230,9 @@ func registerCollector(logger *slog.Logger, transport *http.Transport,
230230
os.Exit(1)
231231
}
232232

233-
transport.DialContext = func(_ context.Context, _, _ string) (net.Conn, error) {
234-
return net.Dial("unix", socketPath)
233+
transport.DialContext = func(ctx context.Context, _, _ string) (net.Conn, error) {
234+
d := &net.Dialer{}
235+
return d.DialContext(ctx, "unix", socketPath)
235236
}
236237
addr = "http://unix" + requestPath
237238
}

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.24.2
44

55
require (
66
github.com/alecthomas/kingpin/v2 v2.4.0
7-
github.com/nginx/nginx-plus-go-client/v2 v2.4.0
7+
github.com/nginx/nginx-plus-go-client/v3 v3.0.0
88
github.com/prometheus/client_golang v1.22.0
99
github.com/prometheus/common v0.65.0
1010
github.com/prometheus/exporter-toolkit v0.14.0
@@ -26,7 +26,7 @@ require (
2626
golang.org/x/crypto v0.38.0 // indirect
2727
golang.org/x/net v0.40.0 // indirect
2828
golang.org/x/oauth2 v0.30.0 // indirect
29-
golang.org/x/sync v0.14.0 // indirect
29+
golang.org/x/sync v0.16.0 // indirect
3030
golang.org/x/sys v0.33.0 // indirect
3131
golang.org/x/text v0.25.0 // indirect
3232
google.golang.org/protobuf v1.36.6 // indirect

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
3232
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
3333
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
3434
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
35-
github.com/nginx/nginx-plus-go-client/v2 v2.4.0 h1:4c7V57CLCZUOxQCUcS9G8a5MClzdmxByBm+f4zKMzAY=
36-
github.com/nginx/nginx-plus-go-client/v2 v2.4.0/go.mod h1:P+dIP2oKYzFoyf/zlLWQa8Sf+fHb+CclOKzxAjxpvug=
35+
github.com/nginx/nginx-plus-go-client/v3 v3.0.0 h1:toZ6X4+4zhUkifYvUdiAaAe4tlq+Y7c03Ns4zb/2ytY=
36+
github.com/nginx/nginx-plus-go-client/v3 v3.0.0/go.mod h1:sCHx+oXai55zsoco5IKSIsVoDH6dEAMtlw9qjkJ9gFM=
3737
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
3838
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
3939
github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
@@ -60,8 +60,8 @@ golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
6060
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
6161
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
6262
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
63-
golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
64-
golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
63+
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
64+
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
6565
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
6666
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
6767
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=

0 commit comments

Comments
 (0)