Skip to content

Commit 0f634dd

Browse files
authored
Merge branch 'main' into pre-commit-ci-update-config
2 parents 9445ded + 3d8ff24 commit 0f634dd

File tree

11 files changed

+51
-52
lines changed

11 files changed

+51
-52
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3030

3131
- name: Setup Golang Environment
32-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
32+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
3333
with:
3434
go-version: stable
3535

@@ -63,7 +63,7 @@ jobs:
6363
fetch-depth: 0
6464

6565
- name: Setup Golang Environment
66-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
66+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
6767
with:
6868
go-version: stable
6969

@@ -77,14 +77,14 @@ jobs:
7777
driver-opts: network=host
7878

7979
- name: DockerHub Login
80-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
80+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
8181
with:
8282
username: ${{ secrets.DOCKER_USERNAME }}
8383
password: ${{ secrets.DOCKER_PASSWORD }}
8484
if: github.event_name != 'pull_request'
8585

8686
- name: Login to GitHub Container Registry
87-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
87+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
8888
with:
8989
registry: ghcr.io
9090
username: ${{ github.repository_owner }}
@@ -99,13 +99,13 @@ jobs:
9999
if: github.event_name != 'pull_request'
100100

101101
- name: Login to Public ECR
102-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
102+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
103103
with:
104104
registry: public.ecr.aws
105105
if: github.event_name != 'pull_request'
106106

107107
- name: Login to Quay.io
108-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
108+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
109109
with:
110110
registry: quay.io
111111
username: ${{ secrets.QUAY_USERNAME }}
@@ -159,7 +159,7 @@ jobs:
159159
if: github.ref_type == 'tag'
160160

161161
- name: Install Cosign
162-
uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
162+
uses: sigstore/cosign-installer@d7543c93d881b35a8faa02e8e3605f69b7a1ce62 # v3.10.0
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@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
180180
with:
181-
version: v2.11.2 # renovate: datasource=github-tags depName=goreleaser/goreleaser
181+
version: v2.12.5 # 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 }}

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4949

5050
- name: Setup Golang Environment
51-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
51+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
5252
with:
5353
go-version: stable
5454
if: matrix.language == 'go'

.github/workflows/dependency-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ jobs:
2222
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2323

2424
- name: Dependency Review
25-
uses: actions/dependency-review-action@595b5aeba73380359d98a5e087f648dbb0edce1b # v4.7.3
25+
uses: actions/dependency-review-action@56339e523c0409420f6c2c9a2f4292bbb3c07dd3 # v4.8.0
2626
with:
2727
config-file: "nginx/k8s-common/dependency-review-config.yml@main"

.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ jobs:
2525
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2626

2727
- name: Setup Golang Environment
28-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
28+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
2929
with:
3030
go-version-file: go.mod
3131

3232
- name: Lint Go
3333
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
3434
with:
35-
version: v2.4.0 # renovate: datasource=github-tags depName=golangci/golangci-lint
35+
version: v2.5.0 # renovate: datasource=github-tags depName=golangci/golangci-lint
3636

3737
actionlint:
3838
name: Actionlint
@@ -42,7 +42,7 @@ jobs:
4242
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4343

4444
- name: Lint Actions
45-
uses: reviewdog/action-actionlint@e37e2ca68a70112d21e135229272da28ce2d0d5a # v1.66.1
45+
uses: reviewdog/action-actionlint@95395aac8c053577d0bc67eb7b74936c660c6f66 # v1.67.0
4646
with:
4747
actionlint_flags: -shellcheck ""
4848

.github/workflows/notifications.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
actions: read # for 8398a7/action-slack
2424
steps:
2525
- name: Data
26-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
26+
uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7.1.0
2727
continue-on-error: true
2828
id: data
2929
with:
@@ -44,7 +44,7 @@ jobs:
4444
}
4545
4646
- name: Send Notification
47-
uses: 8398a7/action-slack@1750b5085f3ec60384090fb7c52965ef822e869e # v3.18.0
47+
uses: 8398a7/action-slack@77eaa4f1c608a7d68b38af4e3f739dcd8cba273e # v3.19.0
4848
with:
4949
status: custom
5050
custom_payload: |

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
persist-credentials: false
3131

3232
- name: "Run analysis"
33-
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
33+
uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
3434
with:
3535
results_file: results.sarif
3636
results_format: sarif

Makefile

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

77
.DEFAULT_GOAL:=nginx-prometheus-exporter
88

build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile:1.17
1+
# syntax=docker/dockerfile:1.19
22
FROM golang:1.25.1 AS builder
33
ARG VERSION
44
ARG TARGETARCH

exporter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func parsePositiveDuration(s string) (positiveDuration, error) {
6161
func createPositiveDurationFlag(s kingpin.Settings) (target *time.Duration) {
6262
target = new(time.Duration)
6363
s.SetValue(&positiveDuration{Duration: *target})
64-
return
64+
return target
6565
}
6666

6767
func parseUnixSocketAddress(address string) (string, string, error) {

go.mod

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ require (
66
github.com/alecthomas/kingpin/v2 v2.4.0
77
github.com/nginx/nginx-plus-go-client/v3 v3.0.0
88
github.com/pires/go-proxyproto v0.8.1
9-
github.com/prometheus/client_golang v1.23.0
10-
github.com/prometheus/common v0.65.0
11-
github.com/prometheus/exporter-toolkit v0.14.0
9+
github.com/prometheus/client_golang v1.23.2
10+
github.com/prometheus/common v0.66.1
11+
github.com/prometheus/exporter-toolkit v0.14.1
1212
)
1313

1414
require (
1515
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
1616
github.com/beorn7/perks v1.0.1 // indirect
1717
github.com/cespare/xxhash/v2 v2.3.0 // indirect
18-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
18+
github.com/coreos/go-systemd/v22 v22.6.0 // indirect
1919
github.com/jpillora/backoff v1.0.0 // indirect
2020
github.com/mdlayher/socket v0.4.1 // indirect
2121
github.com/mdlayher/vsock v1.2.1 // indirect
@@ -24,12 +24,12 @@ require (
2424
github.com/prometheus/client_model v0.6.2 // indirect
2525
github.com/prometheus/procfs v0.16.1 // indirect
2626
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
27-
golang.org/x/crypto v0.38.0 // indirect
28-
golang.org/x/net v0.40.0 // indirect
27+
go.yaml.in/yaml/v2 v2.4.2 // indirect
28+
golang.org/x/crypto v0.41.0 // indirect
29+
golang.org/x/net v0.43.0 // indirect
2930
golang.org/x/oauth2 v0.30.0 // indirect
3031
golang.org/x/sync v0.16.0 // indirect
31-
golang.org/x/sys v0.33.0 // indirect
32-
golang.org/x/text v0.25.0 // indirect
33-
google.golang.org/protobuf v1.36.6 // indirect
34-
gopkg.in/yaml.v2 v2.4.0 // indirect
32+
golang.org/x/sys v0.35.0 // indirect
33+
golang.org/x/text v0.28.0 // indirect
34+
google.golang.org/protobuf v1.36.8 // indirect
3535
)

0 commit comments

Comments
 (0)