Skip to content

Commit b3729e8

Browse files
committed
Merge branch 'main' into add-dependency-assertion
2 parents ec9162b + a520f9b commit b3729e8

File tree

13 files changed

+120
-102
lines changed

13 files changed

+120
-102
lines changed

.github/workflows/ci.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3434
with:
3535
fetch-tags: 'true'
36-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
36+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
3737
with:
3838
go-version-file: 'go.mod'
3939
cache: false
@@ -46,7 +46,7 @@ jobs:
4646
runs-on: ubuntu-22.04
4747
steps:
4848
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
49-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
49+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
5050
with:
5151
go-version-file: 'go.mod'
5252
cache: false
@@ -62,7 +62,7 @@ jobs:
6262
contents: write
6363
steps:
6464
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
65-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
65+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
6666
with:
6767
go-version-file: 'go.mod'
6868
cache: false
@@ -82,7 +82,7 @@ jobs:
8282
runs-on: ubuntu-22.04
8383
steps:
8484
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
85-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
85+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
8686
with:
8787
go-version-file: 'go.mod'
8888
cache: false
@@ -96,7 +96,7 @@ jobs:
9696
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
9797
with:
9898
fetch-tags: 'true'
99-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
99+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
100100
with:
101101
go-version-file: 'go.mod'
102102
cache: false
@@ -127,7 +127,7 @@ jobs:
127127
version: "3.22"
128128
steps:
129129
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
130-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
130+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
131131
with:
132132
go-version-file: 'go.mod'
133133
cache: false
@@ -171,7 +171,7 @@ jobs:
171171
version: "3.22"
172172
steps:
173173
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
174-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
174+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
175175
with:
176176
go-version-file: 'go.mod'
177177
cache: false
@@ -222,7 +222,7 @@ jobs:
222222
release: "alpine"
223223
steps:
224224
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
225-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
225+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
226226
with:
227227
go-version-file: 'go.mod'
228228
cache: false
@@ -283,7 +283,7 @@ jobs:
283283
path: "/nginx-plus/agent"
284284
steps:
285285
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
286-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
286+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
287287
with:
288288
go-version-file: 'go.mod'
289289
cache: false
@@ -343,7 +343,7 @@ jobs:
343343
release: "alpine"
344344
steps:
345345
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
346-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
346+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
347347
with:
348348
go-version-file: 'go.mod'
349349
cache: false
@@ -404,7 +404,7 @@ jobs:
404404
path: "/nginx-plus/agent"
405405
steps:
406406
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
407-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
407+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
408408
with:
409409
go-version-file: 'go.mod'
410410
cache: false
@@ -449,7 +449,7 @@ jobs:
449449
contents: write
450450
steps:
451451
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
452-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
452+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
453453
with:
454454
go-version-file: 'go.mod'
455455
cache: false
@@ -481,7 +481,7 @@ jobs:
481481

482482
steps:
483483
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
484-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
484+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
485485
with:
486486
go-version-file: 'go.mod'
487487
cache: false
@@ -493,7 +493,7 @@ jobs:
493493
path: build
494494

495495
- name: Set up Docker Build
496-
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
496+
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
497497

498498
- name: Set env
499499
run: echo "GO_VERSION=$(cat go.mod | grep toolchain | sed 's/toolchain //; s/go//')" >> $GITHUB_ENV

.github/workflows/label-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
pull-requests: write
1515
runs-on: ubuntu-22.04
1616
steps:
17-
- uses: release-drafter/release-drafter@09c613e259eb8d4e7c81c2cb00618eb5fc4575a7 # v5.25.0
17+
- uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0
1818
with:
1919
disable-releaser: true
2020
env:

.github/workflows/release-branch.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ jobs:
218218
ref: ${{ inputs.releaseBranch }}
219219

220220
- name: Setup go
221-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
221+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
222222
with:
223223
go-version-file: 'go.mod'
224224
cache: false
@@ -233,7 +233,7 @@ jobs:
233233
nfpm --version
234234
235235
- name: Docker Buildx
236-
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
236+
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
237237

238238
- name: Build Docker Image
239239
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0

.github/workflows/upload-release-assets.yml

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

9898
- name: Azure Upload
9999
if: ${{ inputs.uploadAzure == true }}
100-
uses: azure/CLI@965c8d7571d2231a54e321ddd07f7b10317f34d9 # v2.0.0
100+
uses: azure/CLI@9f7ce6f37c31b777ec6c6b6d1dfe7db79f497956 # v2.2.0
101101
with:
102102
inlineScript: |
103103
for i in $(find ${{inputs.pkgRepo}}/nginx-agent | grep -e "nginx-agent[_-]${{inputs.pkgVersion}}"); do

go.mod

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ module github.com/nginx/agent/v3
22

33
go 1.24.0
44

5-
toolchain go1.24.6
5+
toolchain go1.24.7
66

77
require (
8-
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.4-20250130201111-63bb56e20495.1
9-
github.com/bufbuild/protovalidate-go v0.9.1
8+
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.9-20250912141014-52f32327d4b0.1
9+
buf.build/go/protovalidate v1.0.0
1010
github.com/cenkalti/backoff/v4 v4.3.0
11-
github.com/docker/docker v28.3.3+incompatible
11+
github.com/docker/docker v28.4.0+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
1515
github.com/google/go-cmp v0.7.0
1616
github.com/google/uuid v1.6.0
1717
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
18-
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.1
18+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2
1919
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c
2020
github.com/nginxinc/nginx-plus-go-client/v2 v2.0.1
2121
github.com/nginxinc/nginx-prometheus-exporter v1.3.0
@@ -37,11 +37,11 @@ require (
3737
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.135.0
3838
github.com/open-telemetry/opentelemetry-collector-contrib/testbed v0.135.0
3939
github.com/prometheus/client_model v0.6.2
40-
github.com/prometheus/common v0.65.0
40+
github.com/prometheus/common v0.66.1
4141
github.com/shirou/gopsutil/v4 v4.25.8
4242
github.com/spf13/pflag v1.0.9
4343
github.com/stretchr/testify v1.11.1
44-
github.com/testcontainers/testcontainers-go v0.38.0
44+
github.com/testcontainers/testcontainers-go v0.39.0
4545
github.com/trivago/grok v1.0.0
4646
go.opentelemetry.io/collector/component v1.41.0
4747
go.opentelemetry.io/collector/component/componenttest v0.135.0
@@ -80,15 +80,15 @@ require (
8080
go.uber.org/multierr v1.11.0
8181
go.uber.org/zap v1.27.0
8282
golang.org/x/mod v0.28.0
83-
google.golang.org/protobuf v1.36.8
83+
google.golang.org/protobuf v1.36.9
8484
)
8585

8686
require (
8787
cel.dev/expr v0.24.0 // indirect
8888
cloud.google.com/go/auth v0.16.2 // indirect
8989
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
9090
cloud.google.com/go/compute/metadata v0.7.0 // indirect
91-
dario.cat/mergo v1.0.1 // indirect
91+
dario.cat/mergo v1.0.2 // indirect
9292
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 // indirect
9393
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1 // indirect
9494
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
@@ -102,7 +102,7 @@ require (
102102
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
103103
github.com/antchfx/xmlquery v1.4.4 // indirect
104104
github.com/antchfx/xpath v1.3.5 // indirect
105-
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
105+
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
106106
github.com/apache/thrift v0.22.0 // indirect
107107
github.com/aws/aws-sdk-go-v2 v1.37.0 // indirect
108108
github.com/aws/aws-sdk-go-v2/config v1.30.1 // indirect
@@ -157,7 +157,7 @@ require (
157157
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
158158
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
159159
github.com/golang/snappy v1.0.0 // indirect
160-
github.com/google/cel-go v0.23.0 // indirect
160+
github.com/google/cel-go v0.26.1 // indirect
161161
github.com/google/go-tpm v0.9.5 // indirect
162162
github.com/google/s2a-go v0.1.9 // indirect
163163
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
@@ -253,7 +253,7 @@ require (
253253
github.com/splunk/stef/go/otel v0.0.7 // indirect
254254
github.com/splunk/stef/go/pdata v0.0.7 // indirect
255255
github.com/splunk/stef/go/pkg v0.0.7 // indirect
256-
github.com/stoewer/go-strcase v1.3.0 // indirect
256+
github.com/stoewer/go-strcase v1.3.1 // indirect
257257
github.com/stretchr/objx v0.5.2 // indirect
258258
github.com/subosito/gotenv v1.6.0 // indirect
259259
github.com/tilinna/clock v1.1.0 // indirect
@@ -335,6 +335,7 @@ require (
335335
go.opentelemetry.io/otel/trace v1.38.0 // indirect
336336
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
337337
go.uber.org/atomic v1.11.0 // indirect
338+
go.yaml.in/yaml/v2 v2.4.2 // indirect
338339
go.yaml.in/yaml/v3 v3.0.4 // indirect
339340
golang.org/x/arch v0.12.0 // indirect
340341
golang.org/x/exp v0.0.0-20250808145144-a408d31f581a // indirect
@@ -371,7 +372,7 @@ require (
371372
go.opentelemetry.io/otel/sdk/metric v1.38.0
372373
golang.org/x/crypto v0.41.0 // indirect
373374
golang.org/x/net v0.43.0 // indirect
374-
golang.org/x/sys v0.35.0 // indirect
375+
golang.org/x/sys v0.36.0 // indirect
375376
golang.org/x/text v0.28.0 // indirect
376377
google.golang.org/grpc v1.75.0
377378
)

0 commit comments

Comments
 (0)