Follow a change in protoc-gen-go

Follows golang/protobuf@59b73b3, which introduces an incompatible change in generated codes
grpc-ecosystem · Sep 3, 2015 · 6e59041 · 6e59041
1 parent 9078b50
commit 6e59041
Show file tree

Hide file tree

Showing 7 changed files with 226 additions and 27 deletions.
diff --git a/examples/examplepb/a_bit_of_everything.pb.go b/examples/examplepb/a_bit_of_everything.pb.go
diff --git a/examples/examplepb/echo_service.pb.go b/examples/examplepb/echo_service.pb.go
diff --git a/examples/examplepb/flow_combination.pb.go b/examples/examplepb/flow_combination.pb.go
diff --git a/examples/sub/message.pb.go b/examples/sub/message.pb.go
diff --git a/protoc-gen-grpc-gateway/descriptor/services.go b/protoc-gen-grpc-gateway/descriptor/services.go
@@ -72,35 +72,36 @@ func (r *Registry) newMethod(svc *Service, md *descriptor.MethodDescriptorProto,
 			pathTemplate string
 		)
 		switch {
-		case opts.Get != "":
+		case opts.GetGet() != "":
 			httpMethod = "GET"
-			pathTemplate = opts.Get
+			pathTemplate = opts.GetGet()
 			if opts.Body != "" {
 				return nil, fmt.Errorf("needs request body even though http method is GET: %s", md.GetName())
 			}
 
-		case opts.Put != "":
+		case opts.GetPut() != "":
 			httpMethod = "PUT"
-			pathTemplate = opts.Put
+			pathTemplate = opts.GetPut()
 
-		case opts.Post != "":
+		case opts.GetPost() != "":
 			httpMethod = "POST"
-			pathTemplate = opts.Post
+			pathTemplate = opts.GetPost()
 
-		case opts.Delete != "":
+		case opts.GetDelete() != "":
 			httpMethod = "DELETE"
-			pathTemplate = opts.Delete
+			pathTemplate = opts.GetDelete()
 			if opts.Body != "" {
 				return nil, fmt.Errorf("needs request body even though http method is DELETE: %s", md.GetName())
 			}
 
-		case opts.Patch != "":
+		case opts.GetPatch() != "":
 			httpMethod = "PATCH"
-			pathTemplate = opts.Patch
+			pathTemplate = opts.GetPatch()
 
-		case opts.Custom != nil:
-			httpMethod = opts.Custom.Kind
-			pathTemplate = opts.Custom.Path
+		case opts.GetCustom() != nil:
+			custom := opts.GetCustom()
+			httpMethod = custom.Kind
+			pathTemplate = custom.Path
 
 		default:
 			glog.Errorf("No pattern specified in google.api.HttpRule: %s", md.GetName())

diff --git a/third_party/googleapis/google/api/annotations.pb.go b/third_party/googleapis/google/api/annotations.pb.go
diff --git a/third_party/googleapis/google/api/http.pb.go b/third_party/googleapis/google/api/http.pb.go