Skip to content

Commit 8d6fc14

Browse files
authored
fix(vulnfeeds): unmarshalling error in override upload + tests (#4975)
Thanks to the new logger errors, we discovered that the override upload is not using the right marshaller. This PR fixes that, and adds some tests for mocking uploads to GCS.
1 parent 71eeaad commit 8d6fc14

4 files changed

Lines changed: 460 additions & 9 deletions

File tree

vulnfeeds/go.mod

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,26 @@ require (
1616
github.com/knqyf263/go-cpe v0.0.0-20230627041855-cb0794d06872
1717
github.com/ossf/osv-schema/bindings/go v0.0.0-20260304051245-ec3272c283e4
1818
github.com/sethvargo/go-retry v0.3.0
19-
go.opentelemetry.io/contrib/detectors/gcp v1.38.0
19+
go.opentelemetry.io/contrib/detectors/gcp v1.39.0
2020
go.opentelemetry.io/otel v1.40.0
2121
go.opentelemetry.io/otel/sdk v1.40.0
2222
go.opentelemetry.io/otel/trace v1.40.0
23+
golang.org/x/sync v0.19.0
2324
google.golang.org/api v0.268.0
2425
google.golang.org/protobuf v1.36.11
2526
gopkg.in/dnaeon/go-vcr.v4 v4.0.6
2627
gopkg.in/yaml.v2 v2.4.0
2728
)
2829

2930
require (
30-
cel.dev/expr v0.24.0 // indirect
31+
cel.dev/expr v0.25.1 // indirect
3132
cloud.google.com/go v0.123.0 // indirect
3233
cloud.google.com/go/auth v0.18.1 // indirect
3334
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
3435
cloud.google.com/go/compute/metadata v0.9.0 // indirect
3536
cloud.google.com/go/iam v1.5.3 // indirect
3637
cloud.google.com/go/monitoring v1.24.3 // indirect
38+
cloud.google.com/go/pubsub/v2 v2.4.0 // indirect
3739
cloud.google.com/go/trace v1.11.7 // indirect
3840
dario.cat/mergo v1.0.2 // indirect
3941
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect
@@ -52,23 +54,27 @@ require (
5254
github.com/clipperhouse/displaywidth v0.11.0 // indirect
5355
github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
5456
github.com/cloudflare/circl v1.6.3 // indirect
55-
github.com/cncf/xds/go v0.0.0-20251022180443-0feb69152e9f // indirect
57+
github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 // indirect
5658
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
5759
github.com/emirpasic/gods v1.18.1 // indirect
58-
github.com/envoyproxy/go-control-plane/envoy v1.35.0 // indirect
59-
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
60+
github.com/envoyproxy/go-control-plane/envoy v1.36.0 // indirect
61+
github.com/envoyproxy/protoc-gen-validate v1.3.0 // indirect
6062
github.com/felixge/httpsnoop v1.0.4 // indirect
63+
github.com/fsouza/fake-gcs-server v1.54.0 // indirect
6164
github.com/gkampitakis/ciinfo v0.3.2 // indirect
6265
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
6366
github.com/go-git/go-billy/v5 v5.6.2 // indirect
6467
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
6568
github.com/go-logr/logr v1.4.3 // indirect
6669
github.com/go-logr/stdr v1.2.2 // indirect
6770
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
71+
github.com/google/renameio/v2 v2.0.0 // indirect
6872
github.com/google/s2a-go v0.1.9 // indirect
6973
github.com/google/uuid v1.6.0 // indirect
7074
github.com/googleapis/enterprise-certificate-proxy v0.3.11 // indirect
7175
github.com/googleapis/gax-go/v2 v2.17.0 // indirect
76+
github.com/gorilla/handlers v1.5.2 // indirect
77+
github.com/gorilla/mux v1.8.1 // indirect
7278
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
7379
github.com/kevinburke/ssh_config v1.2.0 // indirect
7480
github.com/kr/pretty v0.3.1 // indirect
@@ -79,6 +85,7 @@ require (
7985
github.com/muesli/cancelreader v0.2.2 // indirect
8086
github.com/pjbgf/sha1cd v0.3.2 // indirect
8187
github.com/pkg/errors v0.9.1 // indirect
88+
github.com/pkg/xattr v0.4.12 // indirect
8289
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
8390
github.com/rivo/uniseg v0.4.7 // indirect
8491
github.com/rogpeppe/go-internal v1.14.1 // indirect
@@ -91,6 +98,7 @@ require (
9198
github.com/tidwall/sjson v1.2.5 // indirect
9299
github.com/xanzy/ssh-agent v0.3.3 // indirect
93100
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
101+
go.opencensus.io v0.24.0 // indirect
94102
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
95103
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
96104
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
@@ -101,14 +109,13 @@ require (
101109
golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b // indirect
102110
golang.org/x/net v0.49.0 // indirect
103111
golang.org/x/oauth2 v0.35.0 // indirect
104-
golang.org/x/sync v0.19.0 // indirect
105112
golang.org/x/sys v0.41.0 // indirect
106113
golang.org/x/text v0.33.0 // indirect
107114
golang.org/x/time v0.14.0 // indirect
108115
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
109116
google.golang.org/genproto v0.0.0-20260128011058-8636f8732409 // indirect
110117
google.golang.org/genproto/googleapis/api v0.0.0-20260203192932-546029d2fa20 // indirect
111118
google.golang.org/genproto/googleapis/rpc v0.0.0-20260203192932-546029d2fa20 // indirect
112-
google.golang.org/grpc v1.78.0 // indirect
119+
google.golang.org/grpc v1.79.1 // indirect
113120
gopkg.in/warnings.v0 v0.1.2 // indirect
114121
)

0 commit comments

Comments
 (0)