Skip to content

Patcher for fields of type google.protobuf.Any #2103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 22, 2021
Merged

Patcher for fields of type google.protobuf.Any #2103

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c2405f8
Merge pull request #1 from grpc-ecosystem/master
veith Apr 21, 2021
8cc870b
test type any
veith Apr 21, 2021
c11e878
feat: Patcher for type google.protobuf.Any
veith Apr 21, 2021
4a0de88
feat: Patcher for type google.protobuf.Any
veith Apr 21, 2021
1f0ec43
feat: Patcher for type google.protobuf.Any
veith Apr 21, 2021
15fc586
fix: add propper error message if someone sends only parts of a googl…
veith Apr 22, 2021
3de4a7b
Rerun generation
johanbrandhorst Apr 22, 2021
24a54b5
Rerun Bazel generation too
johanbrandhorst Apr 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions runtime/fieldmask.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ func FieldMaskFromRequestBody(r io.Reader, msg proto.Message) (*field_mask.Field
continue
}

if isProtobufAnyType(fd.Message()) {
queue = append(queue, fieldMaskPathItem{path: k})
continue
}

child := fieldMaskPathItem{
node: v,
}
Expand Down Expand Up @@ -97,6 +102,10 @@ func FieldMaskFromRequestBody(r io.Reader, msg proto.Message) (*field_mask.Field
return fm, nil
}

func isProtobufAnyType(md protoreflect.MessageDescriptor) bool {
return md != nil && (md.FullName() == "google.protobuf.Any")
}

func isDynamicProtoMessage(md protoreflect.MessageDescriptor) bool {
return md != nil && (md.FullName() == "google.protobuf.Struct" || md.FullName() == "google.protobuf.Value")
}
Expand Down
7 changes: 7 additions & 0 deletions runtime/fieldmask_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,13 @@ func TestFieldMaskFromRequestBody(t *testing.T) {
"nested",
),
},

{
name: "protobuf-any",
msg: &examplepb.ABitOfEverything{},
input: `{"anytype":{"@type": "xx.xx/examplepb.NestedOuter", "one":{"two":{"three":{"a":true, "b":false}}}}}`,
expected: newFieldMask("anytype"), //going deeper makes no sense
},
} {
t.Run(tc.name, func(t *testing.T) {
actual, err := FieldMaskFromRequestBody(bytes.NewReader([]byte(tc.input)), tc.msg)
Expand Down
Loading