cmd/protoc-gen-go-grpc: enable edition 2023 support (#7351)

grpc · Jun 26, 2024 · 98e5dee · 98e5dee
1 parent 5f5d4d2
commit 98e5dee
Show file tree

Hide file tree

Showing 51 changed files with 70 additions and 65 deletions.
diff --git a/balancer/grpclb/grpc_lb_v1/load_balancer.pb.go b/balancer/grpclb/grpc_lb_v1/load_balancer.pb.go
diff --git a/balancer/grpclb/grpc_lb_v1/load_balancer_grpc.pb.go b/balancer/grpclb/grpc_lb_v1/load_balancer_grpc.pb.go
diff --git a/binarylog/grpc_binarylog_v1/binarylog.pb.go b/binarylog/grpc_binarylog_v1/binarylog.pb.go
diff --git a/channelz/grpc_channelz_v1/channelz.pb.go b/channelz/grpc_channelz_v1/channelz.pb.go
diff --git a/channelz/grpc_channelz_v1/channelz_grpc.pb.go b/channelz/grpc_channelz_v1/channelz_grpc.pb.go
diff --git a/cmd/protoc-gen-go-grpc/main.go b/cmd/protoc-gen-go-grpc/main.go
@@ -38,6 +38,7 @@ import (
  "fmt"
 
  "google.golang.org/protobuf/compiler/protogen"
+ "google.golang.org/protobuf/types/descriptorpb"
  "google.golang.org/protobuf/types/pluginpb"
 )
 
@@ -61,7 +62,9 @@ func main() {
  protogen.Options{
  ParamFunc: flags.Set,
  }.Run(func(gen *protogen.Plugin) error {
- gen.SupportedFeatures = uint64(pluginpb.CodeGeneratorResponse_FEATURE_PROTO3_OPTIONAL)
+ gen.SupportedFeatures = uint64(pluginpb.CodeGeneratorResponse_FEATURE_PROTO3_OPTIONAL) | uint64(pluginpb.CodeGeneratorResponse_FEATURE_SUPPORTS_EDITIONS)
+ gen.SupportedEditionsMinimum = descriptorpb.Edition_EDITION_PROTO2
+ gen.SupportedEditionsMaximum = descriptorpb.Edition_EDITION_2023
  for _, f := range gen.Files {
  if !f.Generate {
  continue

diff --git a/credentials/alts/internal/proto/grpc_gcp/altscontext.pb.go b/credentials/alts/internal/proto/grpc_gcp/altscontext.pb.go
diff --git a/credentials/alts/internal/proto/grpc_gcp/handshaker.pb.go b/credentials/alts/internal/proto/grpc_gcp/handshaker.pb.go
diff --git a/credentials/alts/internal/proto/grpc_gcp/handshaker_grpc.pb.go b/credentials/alts/internal/proto/grpc_gcp/handshaker_grpc.pb.go
diff --git a/credentials/alts/internal/proto/grpc_gcp/transport_security_common.pb.go b/credentials/alts/internal/proto/grpc_gcp/transport_security_common.pb.go
diff --git a/examples/features/proto/echo/echo.pb.go b/examples/features/proto/echo/echo.pb.go
diff --git a/examples/features/proto/echo/echo_grpc.pb.go b/examples/features/proto/echo/echo_grpc.pb.go
diff --git a/examples/helloworld/helloworld/helloworld.pb.go b/examples/helloworld/helloworld/helloworld.pb.go
diff --git a/examples/helloworld/helloworld/helloworld_grpc.pb.go b/examples/helloworld/helloworld/helloworld_grpc.pb.go
diff --git a/examples/route_guide/routeguide/route_guide.pb.go b/examples/route_guide/routeguide/route_guide.pb.go
diff --git a/examples/route_guide/routeguide/route_guide.proto b/examples/route_guide/routeguide/route_guide.proto
@@ -12,8 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-syntax = "proto3";
+edition = "2023";
 
+option features.field_presence = IMPLICIT;
 option go_package = "google.golang.org/grpc/examples/route_guide/routeguide";
 option java_multiple_files = true;
 option java_package = "io.grpc.examples.routeguide";

diff --git a/examples/route_guide/routeguide/route_guide_grpc.pb.go b/examples/route_guide/routeguide/route_guide_grpc.pb.go
diff --git a/health/grpc_health_v1/health.pb.go b/health/grpc_health_v1/health.pb.go
diff --git a/health/grpc_health_v1/health_grpc.pb.go b/health/grpc_health_v1/health_grpc.pb.go
diff --git a/internal/proto/grpc_lookup_v1/rls.pb.go b/internal/proto/grpc_lookup_v1/rls.pb.go
diff --git a/internal/proto/grpc_lookup_v1/rls_config.pb.go b/internal/proto/grpc_lookup_v1/rls_config.pb.go
diff --git a/internal/proto/grpc_lookup_v1/rls_grpc.pb.go b/internal/proto/grpc_lookup_v1/rls_grpc.pb.go
diff --git a/interop/grpc_testing/benchmark_service.pb.go b/interop/grpc_testing/benchmark_service.pb.go
diff --git a/interop/grpc_testing/benchmark_service_grpc.pb.go b/interop/grpc_testing/benchmark_service_grpc.pb.go
diff --git a/interop/grpc_testing/control.pb.go b/interop/grpc_testing/control.pb.go
diff --git a/interop/grpc_testing/core/stats.pb.go b/interop/grpc_testing/core/stats.pb.go
diff --git a/interop/grpc_testing/empty.pb.go b/interop/grpc_testing/empty.pb.go
diff --git a/interop/grpc_testing/messages.pb.go b/interop/grpc_testing/messages.pb.go
diff --git a/interop/grpc_testing/payloads.pb.go b/interop/grpc_testing/payloads.pb.go
diff --git a/interop/grpc_testing/report_qps_scenario_service.pb.go b/interop/grpc_testing/report_qps_scenario_service.pb.go
diff --git a/interop/grpc_testing/report_qps_scenario_service_grpc.pb.go b/interop/grpc_testing/report_qps_scenario_service_grpc.pb.go
diff --git a/interop/grpc_testing/stats.pb.go b/interop/grpc_testing/stats.pb.go
diff --git a/interop/grpc_testing/test.pb.go b/interop/grpc_testing/test.pb.go