Skip to content

Commit 9230a5f

Browse files
authored
chore(exporter): update osvschema version for protojson change (#4231)
The vulnerability.proto in osv-schema now has `json_name`s to make the multi-word fields snake_case, so we don't need to `UseProtoNames` anymore.
1 parent 713c9d7 commit 9230a5f

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

go/cmd/exporter/worker.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,9 @@ func (w *allEcosystemWorker) Finish() {
194194
close(w.inCh)
195195
}
196196

197-
var protoMarshaller = protojson.MarshalOptions{
198-
UseProtoNames: true, // TODO(michaelkedar): https://github.com/ossf/osv-schema/pull/442
199-
}
200-
201197
// marshalToJSON marshals the vulnerability proto to formatted JSON bytes.
202198
func marshalToJSON(vuln *osvschema.Vulnerability) ([]byte, error) {
203-
b, err := protoMarshaller.Marshal(vuln)
199+
b, err := protojson.Marshal(vuln)
204200
if err != nil {
205201
return nil, err
206202
}

go/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
cloud.google.com/go/pubsub/v2 v2.2.1
88
cloud.google.com/go/storage v1.57.0
99
github.com/charmbracelet/lipgloss v1.1.0
10-
github.com/ossf/osv-schema/bindings/go v0.0.0-20251021042217-ed6345fb08ca
10+
github.com/ossf/osv-schema/bindings/go v0.0.0-20251023235818-d5eaee79a3a5
1111
google.golang.org/api v0.252.0
1212
google.golang.org/protobuf v1.36.10
1313
)

go/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6T
121121
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
122122
github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
123123
github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
124-
github.com/ossf/osv-schema/bindings/go v0.0.0-20251021042217-ed6345fb08ca h1:SRgWTKiWfQFjtJi95PolKubEo9qOAgE+V0APAnI3ThM=
125-
github.com/ossf/osv-schema/bindings/go v0.0.0-20251021042217-ed6345fb08ca/go.mod h1:Eo7R19vlnflsCRdHW1ynyNUyoRwxdaTmTWD9MtKnJTc=
124+
github.com/ossf/osv-schema/bindings/go v0.0.0-20251023235818-d5eaee79a3a5 h1:FLTrCJwXqCpxVwaZXmYDKaNJSypW2Ffzu0B5SntW/sg=
125+
github.com/ossf/osv-schema/bindings/go v0.0.0-20251023235818-d5eaee79a3a5/go.mod h1:Eo7R19vlnflsCRdHW1ynyNUyoRwxdaTmTWD9MtKnJTc=
126126
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
127127
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
128128
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

0 commit comments

Comments
 (0)