Skip to content

Commit 30cc665

Browse files
authored
Bump various dependencies (#1836)
1 parent ab2d959 commit 30cc665

13 files changed

+102
-101
lines changed

.github/workflows/ci.yaml

+15-15
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
pre-build-updater:
4040
runs-on: ubuntu-latest
4141
container:
42-
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.5
42+
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.8
4343
steps:
4444
- name: Checkout
4545
uses: actions/checkout@v4
@@ -72,7 +72,7 @@ jobs:
7272
fail-fast: false
7373
matrix: ${{ fromJson(needs.define-scanner-job-matrix.outputs.matrix).build_and_push }}
7474
container:
75-
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.5
75+
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.8
7676
steps:
7777
- name: Checkout
7878
uses: actions/checkout@v4
@@ -101,7 +101,7 @@ jobs:
101101
style-check:
102102
runs-on: ubuntu-latest
103103
container:
104-
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.5
104+
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.8
105105
steps:
106106
- name: Checkout
107107
uses: actions/checkout@v4
@@ -120,7 +120,7 @@ jobs:
120120
unit-tests:
121121
runs-on: ubuntu-latest
122122
container:
123-
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.5
123+
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.8
124124
steps:
125125
- name: Checkout
126126
uses: actions/checkout@v4
@@ -139,7 +139,7 @@ jobs:
139139
db-integration-tests:
140140
runs-on: ubuntu-latest
141141
container:
142-
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.5
142+
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.8
143143
steps:
144144
- name: Checkout
145145
uses: actions/checkout@v4
@@ -167,7 +167,7 @@ jobs:
167167
needs:
168168
- pre-build-updater
169169
container:
170-
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.5
170+
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.8
171171
steps:
172172
- name: Checkout
173173
uses: actions/checkout@v4
@@ -209,7 +209,7 @@ jobs:
209209
needs:
210210
- generate-genesis-dump
211211
container:
212-
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.5
212+
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.8
213213
steps:
214214
- name: Checkout
215215
uses: actions/checkout@v4
@@ -257,7 +257,7 @@ jobs:
257257
fail-fast: false
258258
matrix: ${{ fromJson(needs.define-scanner-job-matrix.outputs.matrix).build_and_push }}
259259
container:
260-
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.5
260+
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.8
261261
steps:
262262
- name: Checkout
263263
uses: actions/checkout@v4
@@ -314,7 +314,7 @@ jobs:
314314
needs:
315315
- generate-db-dump
316316
container:
317-
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.5
317+
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.8
318318
steps:
319319
- name: Checkout
320320
uses: actions/checkout@v4
@@ -365,7 +365,7 @@ jobs:
365365
fail-fast: false
366366
matrix: ${{ fromJson(needs.define-scanner-job-matrix.outputs.matrix).build_and_push }}
367367
container:
368-
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.5
368+
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.8
369369
steps:
370370
- name: Checkout
371371
uses: actions/checkout@v4
@@ -438,7 +438,7 @@ jobs:
438438
- build-images
439439
runs-on: ubuntu-latest
440440
container:
441-
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.5
441+
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.8
442442
env:
443443
QUAY_RHACS_ENG_RW_USERNAME: ${{ secrets.QUAY_RHACS_ENG_RW_USERNAME }}
444444
QUAY_RHACS_ENG_RW_PASSWORD: ${{ secrets.QUAY_RHACS_ENG_RW_PASSWORD }}
@@ -484,7 +484,7 @@ jobs:
484484
needs:
485485
- generate-genesis-dump
486486
container:
487-
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.5
487+
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.8
488488
steps:
489489
- name: Checkout
490490
uses: actions/checkout@v4
@@ -602,7 +602,7 @@ jobs:
602602
needs:
603603
- generate-db-dump
604604
container:
605-
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.5
605+
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.8
606606
steps:
607607
- name: Checkout
608608
uses: actions/checkout@v4
@@ -630,7 +630,7 @@ jobs:
630630
needs:
631631
- generate-db-dump
632632
container:
633-
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.5
633+
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.8
634634
steps:
635635
- name: Checkout
636636
uses: actions/checkout@v4
@@ -664,7 +664,7 @@ jobs:
664664
needs:
665665
- generate-db-dump
666666
container:
667-
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.5
667+
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.8
668668
steps:
669669
- name: Checkout
670670
uses: actions/checkout@v4

.github/workflows/sanity-check-vuln-updates.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
SLACK_WEBHOOK_ONCALL: ${{ secrets.SLACK_ONCALL_SCANNER_WEBHOOK }}
1111
runs-on: ubuntu-latest
1212
container:
13-
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.5
13+
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.8
1414
steps:
1515
- name: Checkout
1616
uses: actions/checkout@v4

.openshift-ci/Dockerfile.build_root

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
# - `make update` and commit the results
1111
# - run `/test pj-rehearse-max` on the openshift/release PR to validate the change
1212

13-
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.4.5
13+
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.4.8

.openshift-ci/build/Dockerfile.build-bundle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.4.5
1+
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.4.8
22

33
COPY . /go/src/github.com/stackrox/scanner
44
WORKDIR /go/src/github.com/stackrox/scanner

.openshift-ci/build/Dockerfile.build-db-bundle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.4.5
1+
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.4.8
22

33
COPY . /go/src/github.com/stackrox/scanner
44
WORKDIR /go/src/github.com/stackrox/scanner

.openshift-ci/build/Dockerfile.generate-db-dump

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.4.5
1+
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.4.8
22

33
COPY . /go/src/github.com/stackrox/scanner
44
WORKDIR /go/src/github.com/stackrox/scanner

.openshift-ci/build/Dockerfile.generate-genesis-dump

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.4.5
1+
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.4.8
22

33
COPY . /go/src/github.com/stackrox/scanner
44
WORKDIR /go/src/github.com/stackrox/scanner

BUILD_IMAGE_VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
scanner-build-0.4.5
1+
scanner-build-0.4.8

go.mod

+24-25
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/stackrox/scanner
22

3-
go 1.23
3+
go 1.23.0
44

5-
toolchain go1.23.2
5+
toolchain go1.23.6
66

77
require (
88
cloud.google.com/go/storage v1.50.0
@@ -17,7 +17,7 @@ require (
1717
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
1818
github.com/go-git/go-billy/v5 v5.6.2
1919
github.com/go-git/go-git/v5 v5.13.2
20-
github.com/google/go-cmp v0.6.0
20+
github.com/google/go-cmp v0.7.0
2121
github.com/gorilla/mux v1.8.1
2222
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20210315223345-82c243799c99
2323
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1
@@ -48,19 +48,19 @@ require (
4848
go.uber.org/goleak v1.3.0
4949
go.uber.org/ratelimit v0.3.1
5050
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67
51-
golang.org/x/sys v0.30.0
52-
google.golang.org/api v0.221.0
51+
golang.org/x/sys v0.31.0
52+
google.golang.org/api v0.225.0
5353
google.golang.org/genproto/googleapis/api v0.0.0-20250204164813-702378808489
54-
google.golang.org/grpc v1.70.0
54+
google.golang.org/grpc v1.71.0
5555
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
5656
google.golang.org/protobuf v1.36.5
5757
gopkg.in/yaml.v2 v2.4.0
5858
)
5959

6060
require (
61-
cel.dev/expr v0.19.0 // indirect
61+
cel.dev/expr v0.19.1 // indirect
6262
cloud.google.com/go v0.116.0 // indirect
63-
cloud.google.com/go/auth v0.14.1 // indirect
63+
cloud.google.com/go/auth v0.15.0 // indirect
6464
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
6565
cloud.google.com/go/compute/metadata v0.6.0 // indirect
6666
cloud.google.com/go/iam v1.2.2 // indirect
@@ -75,11 +75,10 @@ require (
7575
github.com/andybalholm/cascadia v1.3.2 // indirect
7676
github.com/benbjohnson/clock v1.3.0 // indirect
7777
github.com/beorn7/perks v1.0.1 // indirect
78-
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
7978
github.com/cespare/xxhash/v2 v2.3.0 // indirect
8079
github.com/cloudflare/cfssl v1.6.5 // indirect
8180
github.com/cloudflare/circl v1.3.7 // indirect
82-
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
81+
github.com/cncf/xds/go v0.0.0-20241223141626-cff3c89139a3 // indirect
8382
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
8483
github.com/containers/ocicrypt v1.2.1 // indirect
8584
github.com/containers/storage v1.57.1 // indirect
@@ -89,8 +88,8 @@ require (
8988
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
9089
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
9190
github.com/emirpasic/gods v1.18.1 // indirect
92-
github.com/envoyproxy/go-control-plane v0.13.1 // indirect
93-
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
91+
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
92+
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
9493
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
9594
github.com/facebookincubator/flog v0.0.0-20190930132826-d2511d0ce33c // indirect
9695
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -111,7 +110,7 @@ require (
111110
github.com/google/gofuzz v1.2.0 // indirect
112111
github.com/google/s2a-go v0.1.9 // indirect
113112
github.com/google/uuid v1.6.0 // indirect
114-
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
113+
github.com/googleapis/enterprise-certificate-proxy v0.3.5 // indirect
115114
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
116115
github.com/graph-gophers/graphql-go v1.5.0 // indirect
117116
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
@@ -153,28 +152,28 @@ require (
153152
github.com/zmap/zlint/v3 v3.5.0 // indirect
154153
go.opencensus.io v0.24.0 // indirect
155154
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
156-
go.opentelemetry.io/contrib/detectors/gcp v1.32.0 // indirect
157-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
158-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
155+
go.opentelemetry.io/contrib/detectors/gcp v1.34.0 // indirect
156+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
157+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
159158
go.opentelemetry.io/otel v1.34.0 // indirect
160159
go.opentelemetry.io/otel/metric v1.34.0 // indirect
161160
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
162-
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
161+
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
163162
go.opentelemetry.io/otel/trace v1.34.0 // indirect
164163
go.uber.org/atomic v1.11.0 // indirect
165164
go.uber.org/mock v0.4.0 // indirect
166165
go.uber.org/multierr v1.11.0 // indirect
167166
go.uber.org/zap v1.27.0 // indirect
168-
golang.org/x/crypto v0.33.0 // indirect
169-
golang.org/x/net v0.35.0 // indirect
170-
golang.org/x/oauth2 v0.26.0 // indirect
171-
golang.org/x/sync v0.11.0 // indirect
172-
golang.org/x/term v0.29.0 // indirect
173-
golang.org/x/text v0.22.0 // indirect
174-
golang.org/x/time v0.10.0 // indirect
167+
golang.org/x/crypto v0.36.0 // indirect
168+
golang.org/x/net v0.37.0 // indirect
169+
golang.org/x/oauth2 v0.28.0 // indirect
170+
golang.org/x/sync v0.12.0 // indirect
171+
golang.org/x/term v0.30.0 // indirect
172+
golang.org/x/text v0.23.0 // indirect
173+
golang.org/x/time v0.11.0 // indirect
175174
golang.stackrox.io/grpc-http1 v0.3.12 // indirect
176175
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
177-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250207221924-e9438ea467c6 // indirect
176+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
178177
gopkg.in/inf.v0 v0.9.1 // indirect
179178
gopkg.in/warnings.v0 v0.1.2 // indirect
180179
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)