encoding/prototext: add UnmarshalOptions.DiscardUnknown
This CL adds support for discarding unknown fields from the input.
We add support for parsing and resolving field numbers, so that
the DiscardUnknown option can ignore all unresolvable fields.
We continue to reject known fields identified by field number
since there are a number of edge cases that a difficult to resolve.
Change-Id: I5c88b7bae8656ce20e85e4b5c92d8564a5ff8bb6
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/195779
Reviewed-by: Herbie Ong <herbie@google.com>
diff --git a/encoding/prototext/decode_test.go b/encoding/prototext/decode_test.go
index 0b5dfd9..c9df319 100644
--- a/encoding/prototext/decode_test.go
+++ b/encoding/prototext/decode_test.go
@@ -175,6 +175,28 @@
inputText: "unknown_field: 456",
wantErr: true,
}, {
+ desc: "proto2 message contains discarded unknown field",
+ umo: prototext.UnmarshalOptions{DiscardUnknown: true},
+ inputMessage: &pb2.Scalars{},
+ inputText: `unknown_field:123 1000:"hello"`,
+ }, {
+ desc: "proto3 message contains discarded unknown field",
+ umo: prototext.UnmarshalOptions{DiscardUnknown: true},
+ inputMessage: &pb3.Scalars{},
+ inputText: `unknown_field:456 1000:"goodbye"`,
+ }, {
+ desc: "proto2 message cannot parse field number",
+ umo: prototext.UnmarshalOptions{DiscardUnknown: true},
+ inputMessage: &pb2.Scalars{},
+ inputText: `13:"hello"`,
+ wantErr: true,
+ }, {
+ desc: "proto3 message cannot parse field number",
+ umo: prototext.UnmarshalOptions{DiscardUnknown: true},
+ inputMessage: &pb3.Scalars{},
+ inputText: `13:"goodbye"`,
+ wantErr: true,
+ }, {
desc: "proto2 numeric key field",
inputMessage: &pb2.Scalars{},
inputText: "1: true",