Skip to content

Commit eb5828b

Browse files
authored
protoc: Change protoc to include generated call option (#6960)
1 parent cce1632 commit eb5828b

File tree

18 files changed

+157
-97
lines changed

18 files changed

+157
-97
lines changed

balancer/grpclb/grpc_lb_v1/load_balancer_grpc.pb.go

+4-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

channelz/grpc_channelz_v1/channelz_grpc.pb.go

+16-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/protoc-gen-go-grpc/grpc.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ func generateFileContent(gen *protogen.Plugin, file *protogen.File, g *protogen.
170170

171171
g.P("// This is a compile-time assertion to ensure that this generated file")
172172
g.P("// is compatible with the grpc package it is being compiled against.")
173-
g.P("// Requires gRPC-Go v1.32.0 or later.")
174-
g.P("const _ = ", grpcPackage.Ident("SupportPackageIsVersion7")) // When changing, update version number above.
173+
g.P("// Requires gRPC-Go v1.62.0 or later.")
174+
g.P("const _ = ", grpcPackage.Ident("SupportPackageIsVersion8")) // When changing, update version number above.
175175
g.P()
176176
for _, service := range file.Services {
177177
genService(gen, file, g, service)
@@ -309,9 +309,10 @@ func genClientMethod(gen *protogen.Plugin, file *protogen.File, g *protogen.Gene
309309
g.P(deprecationComment)
310310
}
311311
g.P("func (c *", unexport(service.GoName), "Client) ", clientSignature(g, method), "{")
312+
g.P("cOpts := append([]", grpcPackage.Ident("CallOption"), "{", grpcPackage.Ident("StaticMethod()"), "}, opts...)")
312313
if !method.Desc.IsStreamingServer() && !method.Desc.IsStreamingClient() {
313314
g.P("out := new(", method.Output.GoIdent, ")")
314-
g.P(`err := c.cc.Invoke(ctx, `, fmSymbol, `, in, out, opts...)`)
315+
g.P(`err := c.cc.Invoke(ctx, `, fmSymbol, `, in, out, cOpts...)`)
315316
g.P("if err != nil { return nil, err }")
316317
g.P("return out, nil")
317318
g.P("}")
@@ -320,7 +321,7 @@ func genClientMethod(gen *protogen.Plugin, file *protogen.File, g *protogen.Gene
320321
}
321322
streamType := unexport(service.GoName) + method.GoName + "Client"
322323
serviceDescVar := service.GoName + "_ServiceDesc"
323-
g.P("stream, err := c.cc.NewStream(ctx, &", serviceDescVar, ".Streams[", index, `], `, fmSymbol, `, opts...)`)
324+
g.P("stream, err := c.cc.NewStream(ctx, &", serviceDescVar, ".Streams[", index, `], `, fmSymbol, `, cOpts...)`)
324325
g.P("if err != nil { return nil, err }")
325326
g.P("x := &", streamType, "{stream}")
326327
if !method.Desc.IsStreamingClient() {

credentials/alts/internal/proto/grpc_gcp/handshaker_grpc.pb.go

+4-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/features/proto/echo/echo_grpc.pb.go

+10-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/helloworld/helloworld/helloworld_grpc.pb.go

+4-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/route_guide/routeguide/route_guide_grpc.pb.go

+10-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

health/grpc_health_v1/health_grpc.pb.go

+6-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/proto/grpc_lookup_v1/rls_grpc.pb.go

+4-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)