runtime: rewrite fieldmask logic with protoreflect

Replace the use of the descriptorpb when we can use reflection instead. Also add more thorough test and support repeated fields.
grpc-ecosystem · May 14, 2020 · c950d28 · c950d28
1 parent 43ced79
commit c950d28
Show file tree

Hide file tree

Showing 27 changed files with 1,617 additions and 535 deletions.
diff --git a/Makefile b/Makefile
@@ -89,7 +89,8 @@ HELLOWORLD_GWSRCS=$(HELLOWORLD:.proto=.pb.gw.go)
 
 RUNTIME_TEST_PROTO=runtime/internal/examplepb/example.proto \
 	runtime/internal/examplepb/proto2.proto \
-	runtime/internal/examplepb/proto3.proto
+	runtime/internal/examplepb/proto3.proto \
+	runtime/internal/examplepb/non_standard_names.proto
 RUNTIME_TEST_SRCS=$(RUNTIME_TEST_PROTO:.proto=.pb.go)
 
 EXAMPLE_CLIENT_DIR=examples/internal/clients

diff --git a/examples/internal/helloworld/BUILD.bazel b/examples/internal/helloworld/BUILD.bazel
@@ -30,7 +30,6 @@ go_library(
     deps = [
         "//internal/utilities:go_default_library",
         "//runtime:go_default_library",
-        "@com_github_golang_protobuf//descriptor:go_default_library_gen",
         "@com_github_golang_protobuf//proto:go_default_library",
         "@org_golang_google_grpc//:go_default_library",
         "@org_golang_google_grpc//codes:go_default_library",

diff --git a/examples/internal/helloworld/helloworld.pb.gw.go b/examples/internal/helloworld/helloworld.pb.gw.go
diff --git a/examples/internal/integration/BUILD.bazel b/examples/internal/integration/BUILD.bazel
@@ -4,7 +4,6 @@ go_test(
     name = "go_default_test",
     srcs = [
         "client_test.go",
-        "fieldmask_test.go",
         "integration_test.go",
         "main_test.go",
     ],
@@ -19,7 +18,6 @@ go_test(
         "//examples/internal/server:go_default_library",
         "//runtime:go_default_library",
         "@com_github_golang_glog//:go_default_library",
-        "@com_github_golang_protobuf//descriptor:go_default_library_gen",
         "@com_github_golang_protobuf//jsonpb:go_default_library_gen",
         "@com_github_golang_protobuf//proto:go_default_library",
         "@com_github_google_go_cmp//cmp:go_default_library",

diff --git a/examples/internal/integration/fieldmask_test.go b/examples/internal/integration/fieldmask_test.go
diff --git a/examples/internal/proto/examplepb/BUILD.bazel b/examples/internal/proto/examplepb/BUILD.bazel
@@ -56,8 +56,8 @@ proto_library(
 go_proto_library(
     name = "examplepb_go_proto",
     compilers = [
-        "@io_bazel_rules_go//proto:go_grpc",
         "//protoc-gen-grpc-gateway:go_gen_grpc_gateway",  # keep
+        "@io_bazel_rules_go//proto:go_grpc",
     ],
     importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/proto/examplepb",
     proto = ":examplepb_proto",
@@ -80,7 +80,6 @@ go_library(
     deps = [
         "//internal/utilities:go_default_library",
         "//runtime:go_default_library",
-        "@com_github_golang_protobuf//descriptor:go_default_library_gen",
         "@com_github_golang_protobuf//proto:go_default_library",
         "@org_golang_google_grpc//:go_default_library",
         "@org_golang_google_grpc//codes:go_default_library",

diff --git a/examples/internal/proto/examplepb/a_bit_of_everything.pb.gw.go b/examples/internal/proto/examplepb/a_bit_of_everything.pb.gw.go
diff --git a/examples/internal/proto/examplepb/echo_service.pb.gw.go b/examples/internal/proto/examplepb/echo_service.pb.gw.go
diff --git a/examples/internal/proto/examplepb/flow_combination.pb.gw.go b/examples/internal/proto/examplepb/flow_combination.pb.gw.go
diff --git a/examples/internal/proto/examplepb/non_standard_names.pb.gw.go b/examples/internal/proto/examplepb/non_standard_names.pb.gw.go
diff --git a/examples/internal/proto/examplepb/response_body_service.pb.gw.go b/examples/internal/proto/examplepb/response_body_service.pb.gw.go