From d6def3b84a53919d5332753e6eaaddcd8a1dab89 Mon Sep 17 00:00:00 2001 From: Joshua Humphries Date: Tue, 15 Feb 2022 13:21:26 -0500 Subject: [PATCH] update to newer protoc v3.19 (#497) --- .../testfiles/descriptor-compact.proto | 19 +-- .../testfiles/descriptor-custom-sort.proto | 20 +-- .../testfiles/descriptor-default.proto | 20 +-- .../descriptor-multiline-style-comments.proto | 20 +-- .../descriptor-no-trailing-comments.proto | 20 +-- .../descriptor-only-doc-comments.proto | 20 +-- ...-sorted-AND-multiline-style-comments.proto | 20 +-- .../testfiles/descriptor-sorted.proto | 20 +-- .../descriptor-trailing-on-next-line.proto | 20 +-- internal/testprotos/desc_test1.pb.go | 2 +- internal/testprotos/desc_test2.pb.go | 2 +- internal/testprotos/desc_test_comments.pb.go | 18 +-- .../testprotos/desc_test_comments.protoset | Bin 60742 -> 60947 bytes internal/testprotos/desc_test_complex.pb.go | 120 +++++++++--------- .../desc_test_complex_source_info.protoset | Bin 68896 -> 69094 bytes internal/testprotos/desc_test_defaults.pb.go | 2 +- .../testprotos/desc_test_field_types.pb.go | 2 +- internal/testprotos/desc_test_oneof.pb.go | 2 +- internal/testprotos/desc_test_options.pb.go | 82 ++++++------ internal/testprotos/desc_test_proto3.pb.go | 2 +- internal/testprotos/desc_test_value.pb.go | 12 +- .../testprotos/desc_test_wellknowntypes.pb.go | 92 +++++++------- internal/testprotos/descriptor.protoset | Bin 49671 -> 49869 bytes internal/testprotos/duration.protoset | 6 +- internal/testprotos/grpc/test.pb.go | 2 +- internal/testprotos/make_protos.sh | 2 +- .../testprotos/nopkg/desc_test_nopkg.pb.go | 2 +- .../nopkg/desc_test_nopkg_new.pb.go | 2 +- internal/testprotos/pkg/desc_test_pkg.pb.go | 2 +- .../desc_test_proto3_optional.protoset | Bin 50292 -> 50490 bytes 30 files changed, 271 insertions(+), 260 deletions(-) diff --git a/desc/protoprint/testfiles/descriptor-compact.proto b/desc/protoprint/testfiles/descriptor-compact.proto index fd789ad1..600587e5 100644 --- a/desc/protoprint/testfiles/descriptor-compact.proto +++ b/desc/protoprint/testfiles/descriptor-compact.proto @@ -36,7 +36,7 @@ // without any other information (e.g. without reading its imports). syntax = "proto2"; package google.protobuf; -option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor"; +option go_package = "google.golang.org/protobuf/types/descriptorpb"; option java_package = "com.google.protobuf"; option java_outer_classname = "DescriptorProtos"; option csharp_namespace = "Google.Protobuf.Reflection"; @@ -289,16 +289,16 @@ message FileOptions { // inappropriate because proto packages do not normally start with backwards // domain names. optional string java_package = 1; - // If set, all the classes from the .proto file are wrapped in a single - // outer class with the given name. This applies to both Proto1 - // (equivalent to the old "--one_java_file" option) and Proto2 (where - // a .proto always translates to a single class, but you may want to - // explicitly choose the class name). + // Controls the name of the wrapper Java class generated for the .proto file. + // That class will always contain the .proto file's getDescriptor() method as + // well as any top-level extensions defined in the .proto file. + // If java_multiple_files is disabled, then all the other classes from the + // .proto file will be nested inside the single wrapper outer class. optional string java_outer_classname = 8; - // If set true, then the Java code generator will generate a separate .java + // If enabled, then the Java code generator will generate a separate .java // file for each top-level message, enum, and service defined in the .proto - // file. Thus, these types will *not* be nested inside the outer class - // named by java_outer_classname. However, the outer class will still be + // file. Thus, these types will *not* be nested inside the wrapper class + // named by java_outer_classname. However, the wrapper class will still be // generated to contain the file's getDescriptor() method as well as any // top-level extensions defined in the file. optional bool java_multiple_files = 10 [default = false]; @@ -407,6 +407,7 @@ message MessageOptions { // for the message, or it will be completely ignored; in the very least, // this is a formalization for deprecating messages. optional bool deprecated = 3 [default = false]; + reserved 4, 5, 6; // Whether the message is an automatically generated map entry type for the // maps field. // diff --git a/desc/protoprint/testfiles/descriptor-custom-sort.proto b/desc/protoprint/testfiles/descriptor-custom-sort.proto index e2e58df3..f8432e2f 100644 --- a/desc/protoprint/testfiles/descriptor-custom-sort.proto +++ b/desc/protoprint/testfiles/descriptor-custom-sort.proto @@ -304,7 +304,7 @@ message MethodDescriptorProto { } message MessageOptions { - reserved 9, 8; + reserved 9, 8, 6, 5, 4; extensions 1000 to max; @@ -493,17 +493,17 @@ message FileOptions { // domain names. optional string java_package = 1; - // If set, all the classes from the .proto file are wrapped in a single - // outer class with the given name. This applies to both Proto1 - // (equivalent to the old "--one_java_file" option) and Proto2 (where - // a .proto always translates to a single class, but you may want to - // explicitly choose the class name). + // Controls the name of the wrapper Java class generated for the .proto file. + // That class will always contain the .proto file's getDescriptor() method as + // well as any top-level extensions defined in the .proto file. + // If java_multiple_files is disabled, then all the other classes from the + // .proto file will be nested inside the single wrapper outer class. optional string java_outer_classname = 8; - // If set true, then the Java code generator will generate a separate .java + // If enabled, then the Java code generator will generate a separate .java // file for each top-level message, enum, and service defined in the .proto - // file. Thus, these types will *not* be nested inside the outer class - // named by java_outer_classname. However, the outer class will still be + // file. Thus, these types will *not* be nested inside the wrapper class + // named by java_outer_classname. However, the wrapper class will still be // generated to contain the file's getDescriptor() method as well as any // top-level extensions defined in the file. optional bool java_multiple_files = 10 [default = false]; @@ -938,7 +938,7 @@ option java_package = "com.google.protobuf"; option java_outer_classname = "DescriptorProtos"; -option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor"; +option go_package = "google.golang.org/protobuf/types/descriptorpb"; option csharp_namespace = "Google.Protobuf.Reflection"; diff --git a/desc/protoprint/testfiles/descriptor-default.proto b/desc/protoprint/testfiles/descriptor-default.proto index f1fcfd1b..73abc8d2 100644 --- a/desc/protoprint/testfiles/descriptor-default.proto +++ b/desc/protoprint/testfiles/descriptor-default.proto @@ -40,7 +40,7 @@ syntax = "proto2"; package google.protobuf; -option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor"; +option go_package = "google.golang.org/protobuf/types/descriptorpb"; option java_package = "com.google.protobuf"; @@ -386,17 +386,17 @@ message FileOptions { // domain names. optional string java_package = 1; - // If set, all the classes from the .proto file are wrapped in a single - // outer class with the given name. This applies to both Proto1 - // (equivalent to the old "--one_java_file" option) and Proto2 (where - // a .proto always translates to a single class, but you may want to - // explicitly choose the class name). + // Controls the name of the wrapper Java class generated for the .proto file. + // That class will always contain the .proto file's getDescriptor() method as + // well as any top-level extensions defined in the .proto file. + // If java_multiple_files is disabled, then all the other classes from the + // .proto file will be nested inside the single wrapper outer class. optional string java_outer_classname = 8; - // If set true, then the Java code generator will generate a separate .java + // If enabled, then the Java code generator will generate a separate .java // file for each top-level message, enum, and service defined in the .proto - // file. Thus, these types will *not* be nested inside the outer class - // named by java_outer_classname. However, the outer class will still be + // file. Thus, these types will *not* be nested inside the wrapper class + // named by java_outer_classname. However, the wrapper class will still be // generated to contain the file's getDescriptor() method as well as any // top-level extensions defined in the file. optional bool java_multiple_files = 10 [default = false]; @@ -532,6 +532,8 @@ message MessageOptions { // this is a formalization for deprecating messages. optional bool deprecated = 3 [default = false]; + reserved 4, 5, 6; + // Whether the message is an automatically generated map entry type for the // maps field. // diff --git a/desc/protoprint/testfiles/descriptor-multiline-style-comments.proto b/desc/protoprint/testfiles/descriptor-multiline-style-comments.proto index b8f75039..2665f059 100644 --- a/desc/protoprint/testfiles/descriptor-multiline-style-comments.proto +++ b/desc/protoprint/testfiles/descriptor-multiline-style-comments.proto @@ -44,7 +44,7 @@ syntax = "proto2"; package google.protobuf; -option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor"; +option go_package = "google.golang.org/protobuf/types/descriptorpb"; option java_package = "com.google.protobuf"; @@ -441,19 +441,19 @@ message FileOptions { optional string java_package = 1; /* - * If set, all the classes from the .proto file are wrapped in a single - * outer class with the given name. This applies to both Proto1 - * (equivalent to the old "--one_java_file" option) and Proto2 (where - * a .proto always translates to a single class, but you may want to - * explicitly choose the class name). + * Controls the name of the wrapper Java class generated for the .proto file. + * That class will always contain the .proto file's getDescriptor() method as + * well as any top-level extensions defined in the .proto file. + * If java_multiple_files is disabled, then all the other classes from the + * .proto file will be nested inside the single wrapper outer class. */ optional string java_outer_classname = 8; /* - * If set true, then the Java code generator will generate a separate .java + * If enabled, then the Java code generator will generate a separate .java * file for each top-level message, enum, and service defined in the .proto - * file. Thus, these types will *not* be nested inside the outer class - * named by java_outer_classname. However, the outer class will still be + * file. Thus, these types will *not* be nested inside the wrapper class + * named by java_outer_classname. However, the wrapper class will still be * generated to contain the file's getDescriptor() method as well as any * top-level extensions defined in the file. */ @@ -620,6 +620,8 @@ message MessageOptions { */ optional bool deprecated = 3 [default = false]; + reserved 4, 5, 6; + /* * Whether the message is an automatically generated map entry type for the * maps field. diff --git a/desc/protoprint/testfiles/descriptor-no-trailing-comments.proto b/desc/protoprint/testfiles/descriptor-no-trailing-comments.proto index 3743e4ad..82d5fec6 100644 --- a/desc/protoprint/testfiles/descriptor-no-trailing-comments.proto +++ b/desc/protoprint/testfiles/descriptor-no-trailing-comments.proto @@ -40,7 +40,7 @@ syntax = "proto2"; package google.protobuf; -option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor"; +option go_package = "google.golang.org/protobuf/types/descriptorpb"; option java_package = "com.google.protobuf"; @@ -386,17 +386,17 @@ message FileOptions { // domain names. optional string java_package = 1; - // If set, all the classes from the .proto file are wrapped in a single - // outer class with the given name. This applies to both Proto1 - // (equivalent to the old "--one_java_file" option) and Proto2 (where - // a .proto always translates to a single class, but you may want to - // explicitly choose the class name). + // Controls the name of the wrapper Java class generated for the .proto file. + // That class will always contain the .proto file's getDescriptor() method as + // well as any top-level extensions defined in the .proto file. + // If java_multiple_files is disabled, then all the other classes from the + // .proto file will be nested inside the single wrapper outer class. optional string java_outer_classname = 8; - // If set true, then the Java code generator will generate a separate .java + // If enabled, then the Java code generator will generate a separate .java // file for each top-level message, enum, and service defined in the .proto - // file. Thus, these types will *not* be nested inside the outer class - // named by java_outer_classname. However, the outer class will still be + // file. Thus, these types will *not* be nested inside the wrapper class + // named by java_outer_classname. However, the wrapper class will still be // generated to contain the file's getDescriptor() method as well as any // top-level extensions defined in the file. optional bool java_multiple_files = 10 [default = false]; @@ -532,6 +532,8 @@ message MessageOptions { // this is a formalization for deprecating messages. optional bool deprecated = 3 [default = false]; + reserved 4, 5, 6; + // Whether the message is an automatically generated map entry type for the // maps field. // diff --git a/desc/protoprint/testfiles/descriptor-only-doc-comments.proto b/desc/protoprint/testfiles/descriptor-only-doc-comments.proto index e9fa2201..588130c2 100644 --- a/desc/protoprint/testfiles/descriptor-only-doc-comments.proto +++ b/desc/protoprint/testfiles/descriptor-only-doc-comments.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package google.protobuf; -option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor"; +option go_package = "google.golang.org/protobuf/types/descriptorpb"; option java_package = "com.google.protobuf"; @@ -314,17 +314,17 @@ message FileOptions { // domain names. optional string java_package = 1; - // If set, all the classes from the .proto file are wrapped in a single - // outer class with the given name. This applies to both Proto1 - // (equivalent to the old "--one_java_file" option) and Proto2 (where - // a .proto always translates to a single class, but you may want to - // explicitly choose the class name). + // Controls the name of the wrapper Java class generated for the .proto file. + // That class will always contain the .proto file's getDescriptor() method as + // well as any top-level extensions defined in the .proto file. + // If java_multiple_files is disabled, then all the other classes from the + // .proto file will be nested inside the single wrapper outer class. optional string java_outer_classname = 8; - // If set true, then the Java code generator will generate a separate .java + // If enabled, then the Java code generator will generate a separate .java // file for each top-level message, enum, and service defined in the .proto - // file. Thus, these types will *not* be nested inside the outer class - // named by java_outer_classname. However, the outer class will still be + // file. Thus, these types will *not* be nested inside the wrapper class + // named by java_outer_classname. However, the wrapper class will still be // generated to contain the file's getDescriptor() method as well as any // top-level extensions defined in the file. optional bool java_multiple_files = 10 [default = false]; @@ -460,6 +460,8 @@ message MessageOptions { // this is a formalization for deprecating messages. optional bool deprecated = 3 [default = false]; + reserved 4, 5, 6; + // Whether the message is an automatically generated map entry type for the // maps field. // diff --git a/desc/protoprint/testfiles/descriptor-sorted-AND-multiline-style-comments.proto b/desc/protoprint/testfiles/descriptor-sorted-AND-multiline-style-comments.proto index a3eaea18..24159173 100644 --- a/desc/protoprint/testfiles/descriptor-sorted-AND-multiline-style-comments.proto +++ b/desc/protoprint/testfiles/descriptor-sorted-AND-multiline-style-comments.proto @@ -48,7 +48,7 @@ option cc_enable_arenas = true; option csharp_namespace = "Google.Protobuf.Reflection"; -option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor"; +option go_package = "google.golang.org/protobuf/types/descriptorpb"; option java_outer_classname = "DescriptorProtos"; @@ -546,21 +546,21 @@ message FileOptions { optional string java_package = 1; /* - * If set, all the classes from the .proto file are wrapped in a single - * outer class with the given name. This applies to both Proto1 - * (equivalent to the old "--one_java_file" option) and Proto2 (where - * a .proto always translates to a single class, but you may want to - * explicitly choose the class name). + * Controls the name of the wrapper Java class generated for the .proto file. + * That class will always contain the .proto file's getDescriptor() method as + * well as any top-level extensions defined in the .proto file. + * If java_multiple_files is disabled, then all the other classes from the + * .proto file will be nested inside the single wrapper outer class. */ optional string java_outer_classname = 8; optional OptimizeMode optimize_for = 9 [default = SPEED]; /* - * If set true, then the Java code generator will generate a separate .java + * If enabled, then the Java code generator will generate a separate .java * file for each top-level message, enum, and service defined in the .proto - * file. Thus, these types will *not* be nested inside the outer class - * named by java_outer_classname. However, the outer class will still be + * file. Thus, these types will *not* be nested inside the wrapper class + * named by java_outer_classname. However, the wrapper class will still be * generated to contain the file's getDescriptor() method as well as any * top-level extensions defined in the file. */ @@ -792,7 +792,7 @@ message MessageOptions { extensions 1000 to max; - reserved 8, 9; + reserved 4, 5, 6, 8, 9; } /* Describes a method of a service. */ diff --git a/desc/protoprint/testfiles/descriptor-sorted.proto b/desc/protoprint/testfiles/descriptor-sorted.proto index 03681209..ccd65cfd 100644 --- a/desc/protoprint/testfiles/descriptor-sorted.proto +++ b/desc/protoprint/testfiles/descriptor-sorted.proto @@ -6,7 +6,7 @@ option cc_enable_arenas = true; option csharp_namespace = "Google.Protobuf.Reflection"; -option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor"; +option go_package = "google.golang.org/protobuf/types/descriptorpb"; option java_outer_classname = "DescriptorProtos"; @@ -407,19 +407,19 @@ message FileOptions { // domain names. optional string java_package = 1; - // If set, all the classes from the .proto file are wrapped in a single - // outer class with the given name. This applies to both Proto1 - // (equivalent to the old "--one_java_file" option) and Proto2 (where - // a .proto always translates to a single class, but you may want to - // explicitly choose the class name). + // Controls the name of the wrapper Java class generated for the .proto file. + // That class will always contain the .proto file's getDescriptor() method as + // well as any top-level extensions defined in the .proto file. + // If java_multiple_files is disabled, then all the other classes from the + // .proto file will be nested inside the single wrapper outer class. optional string java_outer_classname = 8; optional OptimizeMode optimize_for = 9 [default = SPEED]; - // If set true, then the Java code generator will generate a separate .java + // If enabled, then the Java code generator will generate a separate .java // file for each top-level message, enum, and service defined in the .proto - // file. Thus, these types will *not* be nested inside the outer class - // named by java_outer_classname. However, the outer class will still be + // file. Thus, these types will *not* be nested inside the wrapper class + // named by java_outer_classname. However, the wrapper class will still be // generated to contain the file's getDescriptor() method as well as any // top-level extensions defined in the file. optional bool java_multiple_files = 10 [default = false]; @@ -608,7 +608,7 @@ message MessageOptions { extensions 1000 to max; - reserved 8, 9; + reserved 4, 5, 6, 8, 9; } // Describes a method of a service. diff --git a/desc/protoprint/testfiles/descriptor-trailing-on-next-line.proto b/desc/protoprint/testfiles/descriptor-trailing-on-next-line.proto index 62c988f5..1740a38e 100644 --- a/desc/protoprint/testfiles/descriptor-trailing-on-next-line.proto +++ b/desc/protoprint/testfiles/descriptor-trailing-on-next-line.proto @@ -40,7 +40,7 @@ syntax = "proto2"; package google.protobuf; -option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor"; +option go_package = "google.golang.org/protobuf/types/descriptorpb"; option java_package = "com.google.protobuf"; @@ -397,17 +397,17 @@ message FileOptions { // domain names. optional string java_package = 1; - // If set, all the classes from the .proto file are wrapped in a single - // outer class with the given name. This applies to both Proto1 - // (equivalent to the old "--one_java_file" option) and Proto2 (where - // a .proto always translates to a single class, but you may want to - // explicitly choose the class name). + // Controls the name of the wrapper Java class generated for the .proto file. + // That class will always contain the .proto file's getDescriptor() method as + // well as any top-level extensions defined in the .proto file. + // If java_multiple_files is disabled, then all the other classes from the + // .proto file will be nested inside the single wrapper outer class. optional string java_outer_classname = 8; - // If set true, then the Java code generator will generate a separate .java + // If enabled, then the Java code generator will generate a separate .java // file for each top-level message, enum, and service defined in the .proto - // file. Thus, these types will *not* be nested inside the outer class - // named by java_outer_classname. However, the outer class will still be + // file. Thus, these types will *not* be nested inside the wrapper class + // named by java_outer_classname. However, the wrapper class will still be // generated to contain the file's getDescriptor() method as well as any // top-level extensions defined in the file. optional bool java_multiple_files = 10 [default = false]; @@ -546,6 +546,8 @@ message MessageOptions { // this is a formalization for deprecating messages. optional bool deprecated = 3 [default = false]; + reserved 4, 5, 6; + // Whether the message is an automatically generated map entry type for the // maps field. // diff --git a/internal/testprotos/desc_test1.pb.go b/internal/testprotos/desc_test1.pb.go index 7a3ab711..e715e3f1 100644 --- a/internal/testprotos/desc_test1.pb.go +++ b/internal/testprotos/desc_test1.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.0 +// protoc v3.19.0 // source: desc_test1.proto package testprotos diff --git a/internal/testprotos/desc_test2.pb.go b/internal/testprotos/desc_test2.pb.go index e930542e..1732fb9f 100644 --- a/internal/testprotos/desc_test2.pb.go +++ b/internal/testprotos/desc_test2.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.0 +// protoc v3.19.0 // source: desc_test2.proto package testprotos diff --git a/internal/testprotos/desc_test_comments.pb.go b/internal/testprotos/desc_test_comments.pb.go index 9bf5bba5..c624573e 100644 --- a/internal/testprotos/desc_test_comments.pb.go +++ b/internal/testprotos/desc_test_comments.pb.go @@ -10,7 +10,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.0 +// protoc v3.19.0 // source: desc_test_comments.proto // And now the package declaration @@ -19,13 +19,13 @@ package testprotos import ( context "context" - empty "github.com/golang/protobuf/ptypes/empty" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoiface "google.golang.org/protobuf/runtime/protoiface" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" reflect "reflect" sync "sync" ) @@ -39,7 +39,7 @@ const ( // Symbols defined in public import of google/protobuf/empty.proto. -type Empty = empty.Empty +type Empty = emptypb.Empty type Request_MarioCharacters int32 @@ -533,7 +533,7 @@ var file_desc_test_comments_proto_goTypes = []interface{}{ (*AnEmptyMessage)(nil), // 2: foo.bar.AnEmptyMessage (*Request_Extras)(nil), // 3: foo.bar.Request.Extras nil, // 4: foo.bar.Request.ThingsEntry - (*empty.Empty)(nil), // 5: google.protobuf.Empty + (*emptypb.Empty)(nil), // 5: google.protobuf.Empty } var file_desc_test_comments_proto_depIdxs = []int32{ 3, // 0: foo.bar.Request.extras:type_name -> foo.bar.Request.Extras @@ -640,7 +640,7 @@ type RpcServiceClient interface { // Method comment StreamingRpc(ctx context.Context, opts ...grpc.CallOption) (RpcService_StreamingRpcClient, error) // Deprecated: Do not use. - UnaryRpc(ctx context.Context, in *Request, opts ...grpc.CallOption) (*empty.Empty, error) + UnaryRpc(ctx context.Context, in *Request, opts ...grpc.CallOption) (*emptypb.Empty, error) } type rpcServiceClient struct { @@ -686,8 +686,8 @@ func (x *rpcServiceStreamingRpcClient) CloseAndRecv() (*Request, error) { } // Deprecated: Do not use. -func (c *rpcServiceClient) UnaryRpc(ctx context.Context, in *Request, opts ...grpc.CallOption) (*empty.Empty, error) { - out := new(empty.Empty) +func (c *rpcServiceClient) UnaryRpc(ctx context.Context, in *Request, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, "/foo.bar.RpcService/UnaryRpc", in, out, opts...) if err != nil { return nil, err @@ -700,7 +700,7 @@ type RpcServiceServer interface { // Method comment StreamingRpc(RpcService_StreamingRpcServer) error // Deprecated: Do not use. - UnaryRpc(context.Context, *Request) (*empty.Empty, error) + UnaryRpc(context.Context, *Request) (*emptypb.Empty, error) } // UnimplementedRpcServiceServer can be embedded to have forward compatible implementations. @@ -710,7 +710,7 @@ type UnimplementedRpcServiceServer struct { func (*UnimplementedRpcServiceServer) StreamingRpc(RpcService_StreamingRpcServer) error { return status.Errorf(codes.Unimplemented, "method StreamingRpc not implemented") } -func (*UnimplementedRpcServiceServer) UnaryRpc(context.Context, *Request) (*empty.Empty, error) { +func (*UnimplementedRpcServiceServer) UnaryRpc(context.Context, *Request) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method UnaryRpc not implemented") } diff --git a/internal/testprotos/desc_test_comments.protoset b/internal/testprotos/desc_test_comments.protoset index b4e093b6f5c49ee28b0729d65e68848eab23a913..4120bc4d9c4644ccb36dc5770f1939091ee79e8a 100644 GIT binary patch delta 5391 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 delta 5323 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 diff --git a/internal/testprotos/desc_test_complex.pb.go b/internal/testprotos/desc_test_complex.pb.go index d579856c..ca1f2a54 100644 --- a/internal/testprotos/desc_test_complex.pb.go +++ b/internal/testprotos/desc_test_complex.pb.go @@ -1,20 +1,20 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.0 +// protoc v3.19.0 // source: desc_test_complex.proto package testprotos import ( context "context" - descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoiface "google.golang.org/protobuf/runtime/protoiface" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + descriptorpb "google.golang.org/protobuf/types/descriptorpb" reflect "reflect" sync "sync" ) @@ -1537,7 +1537,7 @@ func (x *Rule_FloatRule) GetMaxVal() float64 { var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ { - ExtendedType: (*descriptor.ExtensionRangeOptions)(nil), + ExtendedType: (*descriptorpb.ExtensionRangeOptions)(nil), ExtensionType: (*string)(nil), Field: 20000, Name: "foo.bar.label", @@ -1545,7 +1545,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.MessageOptions)(nil), + ExtendedType: (*descriptorpb.MessageOptions)(nil), ExtensionType: ([]*Test)(nil), Field: 20002, Name: "foo.bar.rept", @@ -1553,7 +1553,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.MessageOptions)(nil), + ExtendedType: (*descriptorpb.MessageOptions)(nil), ExtensionType: (*Test_Nested_XNestedNested_EEE)(nil), Field: 20010, Name: "foo.bar.eee", @@ -1561,7 +1561,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.MessageOptions)(nil), + ExtendedType: (*descriptorpb.MessageOptions)(nil), ExtensionType: (*Another)(nil), Field: 20020, Name: "foo.bar.a", @@ -1569,7 +1569,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.MessageOptions)(nil), + ExtendedType: (*descriptorpb.MessageOptions)(nil), ExtensionType: (*MessageWithMap)(nil), Field: 20030, Name: "foo.bar.map_vals", @@ -1577,7 +1577,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.MethodOptions)(nil), + ExtendedType: (*descriptorpb.MethodOptions)(nil), ExtensionType: (*Validator)(nil), Field: 12345, Name: "foo.bar.validator", @@ -1585,7 +1585,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*Rule)(nil), Field: 1234, Name: "foo.bar.rules", @@ -1593,7 +1593,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 20001, Name: "foo.bar.syntax", @@ -1601,7 +1601,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 20002, Name: "foo.bar.import", @@ -1609,7 +1609,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 20003, Name: "foo.bar.public", @@ -1617,7 +1617,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 20004, Name: "foo.bar.weak", @@ -1625,7 +1625,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 20005, Name: "foo.bar.package", @@ -1633,7 +1633,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*string)(nil), Field: 20006, Name: "foo.bar.string", @@ -1641,7 +1641,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: ([]byte)(nil), Field: 20007, Name: "foo.bar.bytes", @@ -1649,7 +1649,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*int32)(nil), Field: 20008, Name: "foo.bar.int32", @@ -1657,7 +1657,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*int64)(nil), Field: 20009, Name: "foo.bar.int64", @@ -1665,7 +1665,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*uint32)(nil), Field: 20010, Name: "foo.bar.uint32", @@ -1673,7 +1673,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*uint64)(nil), Field: 20011, Name: "foo.bar.uint64", @@ -1681,7 +1681,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*int32)(nil), Field: 20012, Name: "foo.bar.sint32", @@ -1689,7 +1689,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*int64)(nil), Field: 20013, Name: "foo.bar.sint64", @@ -1697,7 +1697,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*uint32)(nil), Field: 20014, Name: "foo.bar.fixed32", @@ -1705,7 +1705,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*uint64)(nil), Field: 20015, Name: "foo.bar.fixed64", @@ -1713,7 +1713,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*int32)(nil), Field: 20016, Name: "foo.bar.sfixed32", @@ -1721,7 +1721,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*int64)(nil), Field: 20017, Name: "foo.bar.sfixed64", @@ -1729,7 +1729,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 20018, Name: "foo.bar.bool", @@ -1737,7 +1737,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*float32)(nil), Field: 20019, Name: "foo.bar.float", @@ -1745,7 +1745,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*float64)(nil), Field: 20020, Name: "foo.bar.double", @@ -1753,7 +1753,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 20021, Name: "foo.bar.optional", @@ -1761,7 +1761,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 20022, Name: "foo.bar.repeated", @@ -1769,7 +1769,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 20023, Name: "foo.bar.required", @@ -1777,7 +1777,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 20024, Name: "foo.bar.message", @@ -1785,7 +1785,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 20025, Name: "foo.bar.enum", @@ -1793,7 +1793,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 20026, Name: "foo.bar.service", @@ -1801,7 +1801,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 20027, Name: "foo.bar.rpc", @@ -1809,7 +1809,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 20028, Name: "foo.bar.option", @@ -1817,7 +1817,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 20029, Name: "foo.bar.extend", @@ -1825,7 +1825,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 20030, Name: "foo.bar.extensions", @@ -1833,7 +1833,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 20031, Name: "foo.bar.reserved", @@ -1841,7 +1841,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 20032, Name: "foo.bar.to", @@ -1849,7 +1849,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*int32)(nil), Field: 20033, Name: "foo.bar.true", @@ -1857,7 +1857,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*int32)(nil), Field: 20034, Name: "foo.bar.false", @@ -1865,7 +1865,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*int32)(nil), Field: 20035, Name: "foo.bar.default", @@ -1873,7 +1873,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*KeywordCollisions)(nil), Field: 20036, Name: "foo.bar.boom", @@ -1881,7 +1881,7 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_complex.proto", }, { - ExtendedType: (*descriptor.MessageOptions)(nil), + ExtendedType: (*descriptorpb.MessageOptions)(nil), ExtensionType: (*int32)(nil), Field: 20003, Name: "foo.bar.Test.Nested.fooblez", @@ -1898,13 +1898,13 @@ var file_desc_test_complex_proto_extTypes = []protoimpl.ExtensionInfo{ }, } -// Extension fields to descriptor.ExtensionRangeOptions. +// Extension fields to descriptorpb.ExtensionRangeOptions. var ( // optional string label = 20000; E_Label = &file_desc_test_complex_proto_extTypes[0] ) -// Extension fields to descriptor.MessageOptions. +// Extension fields to descriptorpb.MessageOptions. var ( // repeated foo.bar.Test rept = 20002; E_Rept = &file_desc_test_complex_proto_extTypes[1] @@ -1918,13 +1918,13 @@ var ( E_Test_Nested_Fooblez = &file_desc_test_complex_proto_extTypes[43] ) -// Extension fields to descriptor.MethodOptions. +// Extension fields to descriptorpb.MethodOptions. var ( // optional foo.bar.Validator validator = 12345; E_Validator = &file_desc_test_complex_proto_extTypes[5] ) -// Extension fields to descriptor.FieldOptions. +// Extension fields to descriptorpb.FieldOptions. var ( // optional foo.bar.Rule rules = 1234; E_Rules = &file_desc_test_complex_proto_extTypes[6] @@ -2450,16 +2450,16 @@ var file_desc_test_complex_proto_goTypes = []interface{}{ (*Test_Nested)(nil), // 14: foo.bar.Test.Nested (*Test_Nested_XNestedNested)(nil), // 15: foo.bar.Test.Nested._NestedNested (*Test_Nested_XNestedNested_NestedNestedNested)(nil), // 16: foo.bar.Test.Nested._NestedNested.NestedNestedNested - nil, // 17: foo.bar.MessageWithMap.ValsEntry - (*Validator_Permission)(nil), // 18: foo.bar.Validator.Permission - (*Rule_StringRule)(nil), // 19: foo.bar.Rule.StringRule - (*Rule_IntRule)(nil), // 20: foo.bar.Rule.IntRule - (*Rule_RepeatedRule)(nil), // 21: foo.bar.Rule.RepeatedRule - (*Rule_FloatRule)(nil), // 22: foo.bar.Rule.FloatRule - (*descriptor.ExtensionRangeOptions)(nil), // 23: google.protobuf.ExtensionRangeOptions - (*descriptor.MessageOptions)(nil), // 24: google.protobuf.MessageOptions - (*descriptor.MethodOptions)(nil), // 25: google.protobuf.MethodOptions - (*descriptor.FieldOptions)(nil), // 26: google.protobuf.FieldOptions + nil, // 17: foo.bar.MessageWithMap.ValsEntry + (*Validator_Permission)(nil), // 18: foo.bar.Validator.Permission + (*Rule_StringRule)(nil), // 19: foo.bar.Rule.StringRule + (*Rule_IntRule)(nil), // 20: foo.bar.Rule.IntRule + (*Rule_RepeatedRule)(nil), // 21: foo.bar.Rule.RepeatedRule + (*Rule_FloatRule)(nil), // 22: foo.bar.Rule.FloatRule + (*descriptorpb.ExtensionRangeOptions)(nil), // 23: google.protobuf.ExtensionRangeOptions + (*descriptorpb.MessageOptions)(nil), // 24: google.protobuf.MessageOptions + (*descriptorpb.MethodOptions)(nil), // 25: google.protobuf.MethodOptions + (*descriptorpb.FieldOptions)(nil), // 26: google.protobuf.FieldOptions } var file_desc_test_complex_proto_depIdxs = []int32{ 3, // 0: foo.bar.Test.s:type_name -> foo.bar.Simple diff --git a/internal/testprotos/desc_test_complex_source_info.protoset b/internal/testprotos/desc_test_complex_source_info.protoset index 5086a5a0acb9b6e9c994fff69d2c8865fa3384ec..a9acec1189cf2a447ff2c85bb23aba2e3e672de7 100644 GIT binary patch delta 5673 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 google.protobuf.MessageOptions diff --git a/internal/testprotos/desc_test_proto3.pb.go b/internal/testprotos/desc_test_proto3.pb.go index 9f520c94..8d709d0c 100644 --- a/internal/testprotos/desc_test_proto3.pb.go +++ b/internal/testprotos/desc_test_proto3.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.0 +// protoc v3.19.0 // source: desc_test_proto3.proto package testprotos diff --git a/internal/testprotos/desc_test_value.pb.go b/internal/testprotos/desc_test_value.pb.go index f8f7ee5d..f095ef45 100644 --- a/internal/testprotos/desc_test_value.pb.go +++ b/internal/testprotos/desc_test_value.pb.go @@ -1,15 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.0 +// protoc v3.19.0 // source: desc_test_value.proto package testprotos import ( - _struct "github.com/golang/protobuf/ptypes/struct" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -26,7 +26,7 @@ type SimpleValue struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - List *_struct.Value `protobuf:"bytes,1,opt,name=list,proto3" json:"list,omitempty"` + List *structpb.Value `protobuf:"bytes,1,opt,name=list,proto3" json:"list,omitempty"` } func (x *SimpleValue) Reset() { @@ -61,7 +61,7 @@ func (*SimpleValue) Descriptor() ([]byte, []int) { return file_desc_test_value_proto_rawDescGZIP(), []int{0} } -func (x *SimpleValue) GetList() *_struct.Value { +func (x *SimpleValue) GetList() *structpb.Value { if x != nil { return x.List } @@ -99,8 +99,8 @@ func file_desc_test_value_proto_rawDescGZIP() []byte { var file_desc_test_value_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_desc_test_value_proto_goTypes = []interface{}{ - (*SimpleValue)(nil), // 0: testprotos.SimpleValue - (*_struct.Value)(nil), // 1: google.protobuf.Value + (*SimpleValue)(nil), // 0: testprotos.SimpleValue + (*structpb.Value)(nil), // 1: google.protobuf.Value } var file_desc_test_value_proto_depIdxs = []int32{ 1, // 0: testprotos.SimpleValue.list:type_name -> google.protobuf.Value diff --git a/internal/testprotos/desc_test_wellknowntypes.pb.go b/internal/testprotos/desc_test_wellknowntypes.pb.go index ee21369d..b239d84c 100644 --- a/internal/testprotos/desc_test_wellknowntypes.pb.go +++ b/internal/testprotos/desc_test_wellknowntypes.pb.go @@ -1,19 +1,19 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.0 +// protoc v3.19.0 // source: desc_test_wellknowntypes.proto package testprotos import ( - any "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" - timestamp "github.com/golang/protobuf/ptypes/timestamp" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -30,19 +30,19 @@ type TestWellKnownTypes struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"` - Elapsed *duration.Duration `protobuf:"bytes,2,opt,name=elapsed,proto3" json:"elapsed,omitempty"` - Dbl *wrappers.DoubleValue `protobuf:"bytes,3,opt,name=dbl,proto3" json:"dbl,omitempty"` - Flt *wrappers.FloatValue `protobuf:"bytes,4,opt,name=flt,proto3" json:"flt,omitempty"` - Bl *wrappers.BoolValue `protobuf:"bytes,5,opt,name=bl,proto3" json:"bl,omitempty"` - I32 *wrappers.Int32Value `protobuf:"bytes,6,opt,name=i32,proto3" json:"i32,omitempty"` - I64 *wrappers.Int64Value `protobuf:"bytes,7,opt,name=i64,proto3" json:"i64,omitempty"` - U32 *wrappers.UInt32Value `protobuf:"bytes,8,opt,name=u32,proto3" json:"u32,omitempty"` - U64 *wrappers.UInt64Value `protobuf:"bytes,9,opt,name=u64,proto3" json:"u64,omitempty"` - Str *wrappers.StringValue `protobuf:"bytes,10,opt,name=str,proto3" json:"str,omitempty"` - Byt *wrappers.BytesValue `protobuf:"bytes,11,opt,name=byt,proto3" json:"byt,omitempty"` - Json []*_struct.Value `protobuf:"bytes,12,rep,name=json,proto3" json:"json,omitempty"` - Extras []*any.Any `protobuf:"bytes,13,rep,name=extras,proto3" json:"extras,omitempty"` + StartTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"` + Elapsed *durationpb.Duration `protobuf:"bytes,2,opt,name=elapsed,proto3" json:"elapsed,omitempty"` + Dbl *wrapperspb.DoubleValue `protobuf:"bytes,3,opt,name=dbl,proto3" json:"dbl,omitempty"` + Flt *wrapperspb.FloatValue `protobuf:"bytes,4,opt,name=flt,proto3" json:"flt,omitempty"` + Bl *wrapperspb.BoolValue `protobuf:"bytes,5,opt,name=bl,proto3" json:"bl,omitempty"` + I32 *wrapperspb.Int32Value `protobuf:"bytes,6,opt,name=i32,proto3" json:"i32,omitempty"` + I64 *wrapperspb.Int64Value `protobuf:"bytes,7,opt,name=i64,proto3" json:"i64,omitempty"` + U32 *wrapperspb.UInt32Value `protobuf:"bytes,8,opt,name=u32,proto3" json:"u32,omitempty"` + U64 *wrapperspb.UInt64Value `protobuf:"bytes,9,opt,name=u64,proto3" json:"u64,omitempty"` + Str *wrapperspb.StringValue `protobuf:"bytes,10,opt,name=str,proto3" json:"str,omitempty"` + Byt *wrapperspb.BytesValue `protobuf:"bytes,11,opt,name=byt,proto3" json:"byt,omitempty"` + Json []*structpb.Value `protobuf:"bytes,12,rep,name=json,proto3" json:"json,omitempty"` + Extras []*anypb.Any `protobuf:"bytes,13,rep,name=extras,proto3" json:"extras,omitempty"` } func (x *TestWellKnownTypes) Reset() { @@ -77,91 +77,91 @@ func (*TestWellKnownTypes) Descriptor() ([]byte, []int) { return file_desc_test_wellknowntypes_proto_rawDescGZIP(), []int{0} } -func (x *TestWellKnownTypes) GetStartTime() *timestamp.Timestamp { +func (x *TestWellKnownTypes) GetStartTime() *timestamppb.Timestamp { if x != nil { return x.StartTime } return nil } -func (x *TestWellKnownTypes) GetElapsed() *duration.Duration { +func (x *TestWellKnownTypes) GetElapsed() *durationpb.Duration { if x != nil { return x.Elapsed } return nil } -func (x *TestWellKnownTypes) GetDbl() *wrappers.DoubleValue { +func (x *TestWellKnownTypes) GetDbl() *wrapperspb.DoubleValue { if x != nil { return x.Dbl } return nil } -func (x *TestWellKnownTypes) GetFlt() *wrappers.FloatValue { +func (x *TestWellKnownTypes) GetFlt() *wrapperspb.FloatValue { if x != nil { return x.Flt } return nil } -func (x *TestWellKnownTypes) GetBl() *wrappers.BoolValue { +func (x *TestWellKnownTypes) GetBl() *wrapperspb.BoolValue { if x != nil { return x.Bl } return nil } -func (x *TestWellKnownTypes) GetI32() *wrappers.Int32Value { +func (x *TestWellKnownTypes) GetI32() *wrapperspb.Int32Value { if x != nil { return x.I32 } return nil } -func (x *TestWellKnownTypes) GetI64() *wrappers.Int64Value { +func (x *TestWellKnownTypes) GetI64() *wrapperspb.Int64Value { if x != nil { return x.I64 } return nil } -func (x *TestWellKnownTypes) GetU32() *wrappers.UInt32Value { +func (x *TestWellKnownTypes) GetU32() *wrapperspb.UInt32Value { if x != nil { return x.U32 } return nil } -func (x *TestWellKnownTypes) GetU64() *wrappers.UInt64Value { +func (x *TestWellKnownTypes) GetU64() *wrapperspb.UInt64Value { if x != nil { return x.U64 } return nil } -func (x *TestWellKnownTypes) GetStr() *wrappers.StringValue { +func (x *TestWellKnownTypes) GetStr() *wrapperspb.StringValue { if x != nil { return x.Str } return nil } -func (x *TestWellKnownTypes) GetByt() *wrappers.BytesValue { +func (x *TestWellKnownTypes) GetByt() *wrapperspb.BytesValue { if x != nil { return x.Byt } return nil } -func (x *TestWellKnownTypes) GetJson() []*_struct.Value { +func (x *TestWellKnownTypes) GetJson() []*structpb.Value { if x != nil { return x.Json } return nil } -func (x *TestWellKnownTypes) GetExtras() []*any.Any { +func (x *TestWellKnownTypes) GetExtras() []*anypb.Any { if x != nil { return x.Extras } @@ -244,20 +244,20 @@ func file_desc_test_wellknowntypes_proto_rawDescGZIP() []byte { var file_desc_test_wellknowntypes_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_desc_test_wellknowntypes_proto_goTypes = []interface{}{ - (*TestWellKnownTypes)(nil), // 0: testprotos.TestWellKnownTypes - (*timestamp.Timestamp)(nil), // 1: google.protobuf.Timestamp - (*duration.Duration)(nil), // 2: google.protobuf.Duration - (*wrappers.DoubleValue)(nil), // 3: google.protobuf.DoubleValue - (*wrappers.FloatValue)(nil), // 4: google.protobuf.FloatValue - (*wrappers.BoolValue)(nil), // 5: google.protobuf.BoolValue - (*wrappers.Int32Value)(nil), // 6: google.protobuf.Int32Value - (*wrappers.Int64Value)(nil), // 7: google.protobuf.Int64Value - (*wrappers.UInt32Value)(nil), // 8: google.protobuf.UInt32Value - (*wrappers.UInt64Value)(nil), // 9: google.protobuf.UInt64Value - (*wrappers.StringValue)(nil), // 10: google.protobuf.StringValue - (*wrappers.BytesValue)(nil), // 11: google.protobuf.BytesValue - (*_struct.Value)(nil), // 12: google.protobuf.Value - (*any.Any)(nil), // 13: google.protobuf.Any + (*TestWellKnownTypes)(nil), // 0: testprotos.TestWellKnownTypes + (*timestamppb.Timestamp)(nil), // 1: google.protobuf.Timestamp + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration + (*wrapperspb.DoubleValue)(nil), // 3: google.protobuf.DoubleValue + (*wrapperspb.FloatValue)(nil), // 4: google.protobuf.FloatValue + (*wrapperspb.BoolValue)(nil), // 5: google.protobuf.BoolValue + (*wrapperspb.Int32Value)(nil), // 6: google.protobuf.Int32Value + (*wrapperspb.Int64Value)(nil), // 7: google.protobuf.Int64Value + (*wrapperspb.UInt32Value)(nil), // 8: google.protobuf.UInt32Value + (*wrapperspb.UInt64Value)(nil), // 9: google.protobuf.UInt64Value + (*wrapperspb.StringValue)(nil), // 10: google.protobuf.StringValue + (*wrapperspb.BytesValue)(nil), // 11: google.protobuf.BytesValue + (*structpb.Value)(nil), // 12: google.protobuf.Value + (*anypb.Any)(nil), // 13: google.protobuf.Any } var file_desc_test_wellknowntypes_proto_depIdxs = []int32{ 1, // 0: testprotos.TestWellKnownTypes.start_time:type_name -> google.protobuf.Timestamp diff --git a/internal/testprotos/descriptor.protoset b/internal/testprotos/descriptor.protoset index 011b94c8cc5dba3260df199a4ecef8f78e08f888..281e9e151438b966b1e1f054391ddca6e7bf661e 100644 GIT binary patch delta 5324 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 diff --git a/internal/testprotos/duration.protoset b/internal/testprotos/duration.protoset index 8b2a5e18..30f9d1f4 100644 --- a/internal/testprotos/duration.protoset +++ b/internal/testprotos/duration.protoset @@ -1,7 +1,7 @@ -� +� google/protobuf/duration.protogoogle.protobuf": Duration seconds (Rseconds -nanos (RnanosB| -com.google.protobufB DurationProtoPZ*github.com/golang/protobuf/ptypes/duration��GPB�Google.Protobuf.WellKnownTypesbproto3 \ No newline at end of file +nanos (RnanosB� +com.google.protobufB DurationProtoPZ1google.golang.org/protobuf/types/known/durationpb��GPB�Google.Protobuf.WellKnownTypesbproto3 \ No newline at end of file diff --git a/internal/testprotos/grpc/test.pb.go b/internal/testprotos/grpc/test.pb.go index 366aaff9..e87e7c07 100644 --- a/internal/testprotos/grpc/test.pb.go +++ b/internal/testprotos/grpc/test.pb.go @@ -18,7 +18,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.0 +// protoc v3.19.0 // source: grpc/test.proto package grpc diff --git a/internal/testprotos/make_protos.sh b/internal/testprotos/make_protos.sh index 66b4a95f..287ed7e3 100755 --- a/internal/testprotos/make_protos.sh +++ b/internal/testprotos/make_protos.sh @@ -4,7 +4,7 @@ set -e cd $(dirname $0) -PROTOC_VERSION="3.12.0" +PROTOC_VERSION="3.19.0" PROTOC_OS="$(uname -s)" PROTOC_ARCH="$(uname -m)" case "${PROTOC_OS}" in diff --git a/internal/testprotos/nopkg/desc_test_nopkg.pb.go b/internal/testprotos/nopkg/desc_test_nopkg.pb.go index 5dd6e918..f21b2077 100644 --- a/internal/testprotos/nopkg/desc_test_nopkg.pb.go +++ b/internal/testprotos/nopkg/desc_test_nopkg.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.0 +// protoc v3.19.0 // source: nopkg/desc_test_nopkg.proto package nopkg diff --git a/internal/testprotos/nopkg/desc_test_nopkg_new.pb.go b/internal/testprotos/nopkg/desc_test_nopkg_new.pb.go index ec590e03..2b14ac3b 100644 --- a/internal/testprotos/nopkg/desc_test_nopkg_new.pb.go +++ b/internal/testprotos/nopkg/desc_test_nopkg_new.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.0 +// protoc v3.19.0 // source: nopkg/desc_test_nopkg_new.proto package nopkg diff --git a/internal/testprotos/pkg/desc_test_pkg.pb.go b/internal/testprotos/pkg/desc_test_pkg.pb.go index 29c4f9a2..d99f4c47 100644 --- a/internal/testprotos/pkg/desc_test_pkg.pb.go +++ b/internal/testprotos/pkg/desc_test_pkg.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.0 +// protoc v3.19.0 // source: pkg/desc_test_pkg.proto package pkg diff --git a/internal/testprotos/proto3_optional/desc_test_proto3_optional.protoset b/internal/testprotos/proto3_optional/desc_test_proto3_optional.protoset index 952ead671005ac8fef9d593f86891a668a4f22de..5a3d8a42e113a992acd250932a691aed923a2403 100644 GIT binary patch delta 5332 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 delta 5249 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