Skip to content

Commit 8c124c2

Browse files
dhurleydhurley
committed
Merge branch 'main' into improve-logging
2 parents 1378268 + 6cbcd8b commit 8c124c2

File tree

15 files changed

+183
-106
lines changed

15 files changed

+183
-106
lines changed

‎.github/workflows/assertion.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464

6565
- name: Download nginx-agent binary artifacts
6666
if: ${{ inputs.runId != '' }}
67-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # 6.0.0
67+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # 7.0.0
6868
with:
6969
name: nginx-agent-binaries-${{ inputs.packageVersion }}-${{ matrix.osarch }}
7070
path: binaries

‎.github/workflows/ci.yml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
run: go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
4848
- name: Fix golang dependency permissions
4949
run: chmod -R 0755 ~/go/pkg/mod ~/.cache/go-build
50-
- uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
50+
- uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
5151
with:
5252
path: |
5353
~/.cache/go-build
@@ -71,7 +71,7 @@ jobs:
7171
with:
7272
go-version-file: 'go.mod'
7373
cache: false
74-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
74+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
7575
with:
7676
path: |
7777
~/.cache/go-build
@@ -107,7 +107,7 @@ jobs:
107107
with:
108108
go-version-file: 'go.mod'
109109
cache: false
110-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
110+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
111111
with:
112112
path: |
113113
~/.cache/go-build
@@ -116,7 +116,7 @@ jobs:
116116
- name: Run Unit Tests
117117
run: make unit-test
118118
- name: Uplaod Test Coverage
119-
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
119+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
120120
with:
121121
files: ./build/test/coverage.out
122122
token: ${{ secrets.CODECOV_TOKEN }}
@@ -136,7 +136,7 @@ jobs:
136136
with:
137137
go-version-file: 'go.mod'
138138
cache: false
139-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
139+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
140140
with:
141141
path: |
142142
~/.cache/go-build
@@ -168,7 +168,7 @@ jobs:
168168
run: go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
169169
- name: Fix golang dependency permissions
170170
run: chmod -R 0755 ~/go/pkg/mod ~/.cache/go-build
171-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
171+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
172172
with:
173173
path: |
174174
~/.cache/go-build
@@ -178,7 +178,7 @@ jobs:
178178
run: |
179179
make clean local-deb-package local-rpm-package local-apk-package
180180
- name: Upload Artifacts
181-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
181+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
182182
with:
183183
name: nginx-agent-unsigned-snapshots
184184
path: build
@@ -196,7 +196,7 @@ jobs:
196196
- image: "redhatenterprise"
197197
version: "9"
198198
- image: "alpine"
199-
version: "3.22"
199+
version: "3.23"
200200
steps:
201201
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
202202
- name: Configure Go Proxy
@@ -209,14 +209,14 @@ jobs:
209209
with:
210210
go-version-file: 'go.mod'
211211
cache: false
212-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
212+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
213213
with:
214214
path: |
215215
~/.cache/go-build
216216
~/go/pkg/mod
217217
key: ${{ runner.os }}-go-
218218
- name: Download Packages
219-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
219+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
220220
with:
221221
name: nginx-agent-unsigned-snapshots
222222
path: build
@@ -265,14 +265,14 @@ jobs:
265265
with:
266266
go-version-file: 'go.mod'
267267
cache: false
268-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
268+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
269269
with:
270270
path: |
271271
~/.cache/go-build
272272
~/go/pkg/mod
273273
key: ${{ runner.os }}-go-
274274
- name: Download Packages
275-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
275+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
276276
with:
277277
name: nginx-agent-unsigned-snapshots
278278
path: build
@@ -328,14 +328,14 @@ jobs:
328328
with:
329329
go-version-file: 'go.mod'
330330
cache: false
331-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
331+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
332332
with:
333333
path: |
334334
~/.cache/go-build
335335
~/go/pkg/mod
336336
key: ${{ runner.os }}-go-
337337
- name: Download Packages
338-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
338+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
339339
with:
340340
name: nginx-agent-unsigned-snapshots
341341
path: build
@@ -401,14 +401,14 @@ jobs:
401401
with:
402402
go-version-file: 'go.mod'
403403
cache: false
404-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
404+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
405405
with:
406406
path: |
407407
~/.cache/go-build
408408
~/go/pkg/mod
409409
key: ${{ runner.os }}-go-
410410
- name: Download Packages
411-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
411+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
412412
with:
413413
name: nginx-agent-unsigned-snapshots
414414
path: build
@@ -473,14 +473,14 @@ jobs:
473473
with:
474474
go-version-file: 'go.mod'
475475
cache: false
476-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
476+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
477477
with:
478478
path: |
479479
~/.cache/go-build
480480
~/go/pkg/mod
481481
key: ${{ runner.os }}-go-
482482
- name: Download Packages
483-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
483+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
484484
with:
485485
name: nginx-agent-unsigned-snapshots
486486
path: build
@@ -546,14 +546,14 @@ jobs:
546546
with:
547547
go-version-file: 'go.mod'
548548
cache: false
549-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
549+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
550550
with:
551551
path: |
552552
~/.cache/go-build
553553
~/go/pkg/mod
554554
key: ${{ runner.os }}-go-
555555
- name: Download Packages
556-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
556+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
557557
with:
558558
name: nginx-agent-unsigned-snapshots
559559
path: build
@@ -604,7 +604,7 @@ jobs:
604604
with:
605605
go-version-file: 'go.mod'
606606
cache: false
607-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
607+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
608608
with:
609609
path: |
610610
~/.cache/go-build
@@ -643,15 +643,15 @@ jobs:
643643
go-version-file: 'go.mod'
644644
cache: false
645645

646-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
646+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
647647
with:
648648
path: |
649649
~/.cache/go-build
650650
~/go/pkg/mod
651651
key: ${{ runner.os }}-go-
652652

653653
- name: Download Packages
654-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
654+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
655655
with:
656656
name: nginx-agent-unsigned-snapshots
657657
path: build
@@ -687,7 +687,7 @@ jobs:
687687
echo "$results"
688688
689689
- name: Upload Load Test Results
690-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
690+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
691691
with:
692692
name: load-test-results
693693
path: benchmarks.json

‎.github/workflows/release-branch.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ jobs:
246246
find build/ -type f -name "nginx-agent*"
247247
248248
- name: Archive AMD64 Binaries
249-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
249+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
250250
with:
251251
name: nginx-agent-binaries-${{ inputs.packageVersion }}-amd64
252252
path: |
@@ -256,7 +256,7 @@ jobs:
256256
build/amd64/nginx-agent.buildend
257257
258258
- name: Archive ARM64 Binaries
259-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
259+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
260260
with:
261261
name: nginx-agent-binaries-${{ inputs.packageVersion }}-arm64
262262
path: |

‎.github/workflows/scorecards.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ jobs:
4747
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
4848
# format to the repository Actions tab.
4949
- name: "Upload artifact"
50-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
50+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
5151
with:
5252
name: SARIF file
5353
path: results.sarif
5454
retention-days: 5
5555

5656
# Upload the results to GitHub's code scanning dashboard.
5757
- name: "Upload to code-scanning"
58-
uses: github/codeql-action/upload-sarif@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
58+
uses: github/codeql-action/upload-sarif@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
5959
with:
6060
sarif_file: results.sarif

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ GOBIN ?= $$(go env GOPATH)/bin
2222
# | redhatenterprise | 8, 9, 10 | |
2323
# | rockylinux | 8, 9, 10 | |
2424
# | almalinux | 8, 9, 10 | |
25-
# | alpine | 3.20, 3.21 3.22 | |
25+
# | alpine | 3.20, 3.21 3.22 3.23 | |
2626
# | oraclelinux | 8, 9, 10 | |
2727
# | suse | sle15, sle16 | |
2828
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

‎Makefile.packaging‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RPM_DISTROS ?= suse-15-x86_64 suse-16-x86_64
1818
RPM_ARCH := x86_64
1919
REDHAT_VERSIONS ?= redhatenterprise-8 redhatenterprise-9 redhatenterprise-10
2020
REDHAT_ARCHS ?= aarch64 x86_64
21-
APK_VERSIONS ?= 3.20 3.21 3.22
21+
APK_VERSIONS ?= 3.20 3.21 3.22 3.23
2222
APK_ARCHS ?= aarch64 x86_64
2323
APK_REVISION ?= 1
2424
AMAZON_VERSIONS ?= amazon-2 amazon-2023

‎go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.9-20250912141014-52f32327d4b0.1
99
buf.build/go/protovalidate v1.0.0
1010
github.com/cenkalti/backoff/v4 v4.3.0
11-
github.com/docker/docker v28.5.1+incompatible
11+
github.com/docker/docker v28.5.2+incompatible
1212
github.com/fsnotify/fsnotify v1.9.0
1313
github.com/go-resty/resty/v2 v2.16.5
1414
github.com/goccy/go-yaml v1.18.0
@@ -40,7 +40,7 @@ require (
4040
github.com/open-telemetry/opentelemetry-collector-contrib/testbed v0.141.0
4141
github.com/prometheus/client_model v0.6.2
4242
github.com/prometheus/common v0.67.4
43-
github.com/shirou/gopsutil/v4 v4.25.10
43+
github.com/shirou/gopsutil/v4 v4.25.11
4444
github.com/spf13/pflag v1.0.10
4545
github.com/stretchr/testify v1.11.1
4646
github.com/testcontainers/testcontainers-go v0.40.0
@@ -144,10 +144,10 @@ require (
144144
github.com/docker/go-connections v0.6.0 // indirect
145145
github.com/docker/go-units v0.5.0 // indirect
146146
github.com/dustin/go-humanize v1.0.1 // indirect
147-
github.com/ebitengine/purego v0.9.0 // indirect
147+
github.com/ebitengine/purego v0.9.1 // indirect
148148
github.com/elastic/go-grok v0.3.1 // indirect
149149
github.com/elastic/lunes v0.2.0 // indirect
150-
github.com/expr-lang/expr v1.17.6 // indirect
150+
github.com/expr-lang/expr v1.17.7 // indirect
151151
github.com/felixge/httpsnoop v1.0.4 // indirect
152152
github.com/foxboron/go-tpm-keyfiles v0.0.0-20250903184740-5d135037bd4d // indirect
153153
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
@@ -271,8 +271,8 @@ require (
271271
github.com/stretchr/objx v0.5.2 // indirect
272272
github.com/subosito/gotenv v1.6.0 // indirect
273273
github.com/tilinna/clock v1.1.0 // indirect
274-
github.com/tklauser/go-sysconf v0.3.15 // indirect
275-
github.com/tklauser/numcpus v0.10.0 // indirect
274+
github.com/tklauser/go-sysconf v0.3.16 // indirect
275+
github.com/tklauser/numcpus v0.11.0 // indirect
276276
github.com/trivago/tgo v1.0.7 // indirect
277277
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
278278
github.com/twmb/murmur3 v1.1.8 // indirect
@@ -379,7 +379,7 @@ require (
379379
github.com/nginxinc/nginx-go-crossplane v0.4.84
380380
github.com/prometheus/client_golang v1.23.2 // indirect
381381
github.com/samber/slog-gin v1.17.2
382-
github.com/spf13/cobra v1.10.1
382+
github.com/spf13/cobra v1.10.2
383383
github.com/spf13/viper v1.21.0
384384
github.com/vardius/message-bus v1.1.5
385385
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0 // indirect

0 commit comments

Comments
 (0)