Skip to content

Commit 803d920

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #935 from perdasilva/cve-fixes
OCPBUGS-46937, OCPBUGS-46930, OCPBUGS-47317: bump x/net to 0.34.0
2 parents 6156b61 + a1ef741 commit 803d920

File tree

96 files changed

+3861
-1279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+3861
-1279
lines changed

‎go.mod‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/operator-framework/operator-registry v1.48.0
1919
github.com/sirupsen/logrus v1.9.3
2020
github.com/spf13/cobra v1.8.1
21-
github.com/stretchr/testify v1.9.0
21+
github.com/stretchr/testify v1.10.0
2222
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
2323
google.golang.org/protobuf v1.35.1
2424
gopkg.in/yaml.v2 v2.4.0
@@ -85,9 +85,9 @@ require (
8585
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
8686
github.com/go-air/gini v1.0.4 // indirect
8787
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
88-
github.com/go-git/go-billy/v5 v5.5.0 // indirect
89-
github.com/go-git/go-git/v5 v5.11.0 // indirect
90-
github.com/go-jose/go-jose/v4 v4.0.2 // indirect
88+
github.com/go-git/go-billy/v5 v5.6.1 // indirect
89+
github.com/go-git/go-git/v5 v5.13.1 // indirect
90+
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
9191
github.com/go-logr/stdr v1.2.2 // indirect
9292
github.com/go-logr/zapr v1.3.0 // indirect
9393
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -118,7 +118,7 @@ require (
118118
github.com/itchyny/gojq v0.12.16 // indirect
119119
github.com/itchyny/timefmt-go v0.1.6 // indirect
120120
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
121-
github.com/joelanford/ignore v0.1.0 // indirect
121+
github.com/joelanford/ignore v0.1.1 // indirect
122122
github.com/josharian/intern v1.0.0 // indirect
123123
github.com/json-iterator/go v1.1.12 // indirect
124124
github.com/kisielk/errcheck v1.7.0 // indirect
@@ -180,24 +180,24 @@ require (
180180
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
181181
go.uber.org/multierr v1.11.0 // indirect
182182
go.uber.org/zap v1.26.0 // indirect
183-
golang.org/x/crypto v0.29.0 // indirect
184-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
183+
golang.org/x/crypto v0.32.0 // indirect
184+
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
185185
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
186-
golang.org/x/mod v0.21.0 // indirect
187-
golang.org/x/net v0.31.0 // indirect
188-
golang.org/x/oauth2 v0.23.0 // indirect
189-
golang.org/x/sync v0.9.0 // indirect
190-
golang.org/x/sys v0.27.0 // indirect
191-
golang.org/x/term v0.26.0 // indirect
192-
golang.org/x/text v0.20.0 // indirect
193-
golang.org/x/time v0.7.0 // indirect
194-
golang.org/x/tools v0.26.0 // indirect
186+
golang.org/x/mod v0.22.0 // indirect
187+
golang.org/x/net v0.34.0 // indirect
188+
golang.org/x/oauth2 v0.24.0 // indirect
189+
golang.org/x/sync v0.10.0 // indirect
190+
golang.org/x/sys v0.29.0 // indirect
191+
golang.org/x/term v0.28.0 // indirect
192+
golang.org/x/text v0.21.0 // indirect
193+
golang.org/x/time v0.8.0 // indirect
194+
golang.org/x/tools v0.28.0 // indirect
195195
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
196196
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
197-
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
198-
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
199-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
200-
google.golang.org/grpc v1.67.1 // indirect
197+
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
198+
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
199+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
200+
google.golang.org/grpc v1.68.1 // indirect
201201
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
202202
gopkg.in/inf.v0 v0.9.1 // indirect
203203
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect

‎go.sum‎

Lines changed: 38 additions & 37 deletions
Large diffs are not rendered by default.

‎staging/api/go.mod‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,16 @@ require (
7070
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
7171
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
7272
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
73-
golang.org/x/mod v0.17.0 // indirect
74-
golang.org/x/net v0.26.0 // indirect
75-
golang.org/x/oauth2 v0.21.0 // indirect
76-
golang.org/x/sync v0.7.0 // indirect
77-
golang.org/x/sys v0.21.0 // indirect
78-
golang.org/x/term v0.21.0 // indirect
79-
golang.org/x/text v0.16.0 // indirect
80-
golang.org/x/time v0.5.0 // indirect
81-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
82-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
73+
golang.org/x/mod v0.21.0 // indirect
74+
golang.org/x/net v0.34.0 // indirect
75+
golang.org/x/oauth2 v0.23.0 // indirect
76+
golang.org/x/sync v0.10.0 // indirect
77+
golang.org/x/sys v0.29.0 // indirect
78+
golang.org/x/term v0.28.0 // indirect
79+
golang.org/x/text v0.21.0 // indirect
80+
golang.org/x/time v0.7.0 // indirect
81+
golang.org/x/tools v0.26.0 // indirect
82+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
8383
google.golang.org/grpc v1.65.0 // indirect
8484
google.golang.org/protobuf v1.34.2 // indirect
8585
gopkg.in/inf.v0 v0.9.1 // indirect

‎staging/api/go.sum‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -170,52 +170,52 @@ golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPI
170170
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
171171
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
172172
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
173-
golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
174-
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
173+
golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
174+
golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
175175
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
176176
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
177177
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
178178
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
179-
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
180-
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
181-
golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
182-
golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
179+
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
180+
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
181+
golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
182+
golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
183183
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
184184
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
185185
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
186-
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
187-
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
186+
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
187+
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
188188
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
189189
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
190190
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
191191
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
192-
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
193-
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
194-
golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
195-
golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
192+
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
193+
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
194+
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
195+
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
196196
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
197197
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
198-
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
199-
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
200-
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
201-
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
198+
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
199+
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
200+
golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ=
201+
golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
202202
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
203203
golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
204204
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
205205
golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
206206
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
207207
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
208208
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
209-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
210-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
209+
golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
210+
golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
211211
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
212212
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
213213
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
214214
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
215215
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw=
216216
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU=
217-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA=
218-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
217+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 h1:2035KHhUv+EpyB+hWgJnaWKJOdX1E95w2S8Rr4uWKTs=
218+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
219219
google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
220220
google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
221221
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=

‎staging/operator-lifecycle-manager/go.mod‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ require (
3232
github.com/sirupsen/logrus v1.9.3
3333
github.com/spf13/cobra v1.8.1
3434
github.com/spf13/pflag v1.0.5
35-
github.com/stretchr/testify v1.9.0
36-
golang.org/x/net v0.31.0
37-
golang.org/x/sync v0.9.0
38-
golang.org/x/time v0.7.0
35+
github.com/stretchr/testify v1.10.0
36+
golang.org/x/net v0.34.0
37+
golang.org/x/sync v0.10.0
38+
golang.org/x/time v0.8.0
3939
google.golang.org/grpc v1.67.1
4040
gopkg.in/yaml.v2 v2.4.0
4141
k8s.io/api v0.31.2
@@ -155,14 +155,14 @@ require (
155155
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
156156
go.uber.org/multierr v1.11.0 // indirect
157157
go.uber.org/zap v1.26.0 // indirect
158-
golang.org/x/crypto v0.29.0 // indirect
159-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
160-
golang.org/x/mod v0.21.0 // indirect
161-
golang.org/x/oauth2 v0.23.0 // indirect
162-
golang.org/x/sys v0.27.0 // indirect
163-
golang.org/x/term v0.26.0 // indirect
164-
golang.org/x/text v0.20.0 // indirect
165-
golang.org/x/tools v0.26.0 // indirect
158+
golang.org/x/crypto v0.32.0 // indirect
159+
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
160+
golang.org/x/mod v0.22.0 // indirect
161+
golang.org/x/oauth2 v0.24.0 // indirect
162+
golang.org/x/sys v0.29.0 // indirect
163+
golang.org/x/term v0.28.0 // indirect
164+
golang.org/x/text v0.21.0 // indirect
165+
golang.org/x/tools v0.28.0 // indirect
166166
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
167167
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
168168
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect

0 commit comments

Comments
 (0)