all: replace all uses of golang/protobuf/proto

We have to keep using the old ptypes, descriptor and plugin packages since rules_go forces us to use them. Eventually rules_go should move to the new API and we can purge the use of the golang/protobuf package altogether.
grpc-ecosystem · May 19, 2020 · 899f1f0 · 899f1f0
1 parent c07ffed
commit 899f1f0
Show file tree

Hide file tree

Showing 62 changed files with 1,576 additions and 1,331 deletions.
diff --git a/examples/internal/helloworld/BUILD.bazel b/examples/internal/helloworld/BUILD.bazel
@@ -30,10 +30,10 @@ go_library(
     deps = [
         "//internal/utilities:go_default_library",
         "//runtime:go_default_library",
-        "@com_github_golang_protobuf//proto:go_default_library",
         "@org_golang_google_grpc//:go_default_library",
         "@org_golang_google_grpc//codes:go_default_library",
         "@org_golang_google_grpc//grpclog:go_default_library",
         "@org_golang_google_grpc//status:go_default_library",
+        "@org_golang_google_protobuf//proto: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
@@ -18,13 +18,13 @@ go_test(
         "//examples/internal/server:go_default_library",
         "//runtime:go_default_library",
         "@com_github_golang_glog//:go_default_library",
-        "@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",
         "@go_googleapis//google/rpc:status_go_proto",
         "@io_bazel_rules_go//proto/wkt:empty_go_proto",
         "@io_bazel_rules_go//proto/wkt:field_mask_go_proto",
         "@org_golang_google_grpc//codes:go_default_library",
+        "@org_golang_google_protobuf//encoding/protojson:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
         "@org_golang_google_protobuf//testing/protocmp:go_default_library",
     ],
 )
diff --git a/examples/internal/integration/client_test.go b/examples/internal/integration/client_test.go
@@ -111,7 +111,7 @@ func testABEClientCreate(t *testing.T, cl *abe.APIClient) {
 		want.EnumValueAnnotation.String(),
 	)
 	if err != nil {
-		t.Errorf("cl.Create(%#v) failed with %v; want success", want, err)
+		t.Fatalf("cl.Create(%#v) failed with %v; want success", want, err)
 	}
 	if resp.Uuid == "" {
 		t.Errorf("resp.Uuid is empty; want not empty")