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 b4e093b6..4120bc4d 100644 Binary files a/internal/testprotos/desc_test_comments.protoset and b/internal/testprotos/desc_test_comments.protoset differ 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 5086a5a0..a9acec11 100644 Binary files a/internal/testprotos/desc_test_complex_source_info.protoset and b/internal/testprotos/desc_test_complex_source_info.protoset differ diff --git a/internal/testprotos/desc_test_defaults.pb.go b/internal/testprotos/desc_test_defaults.pb.go index 63205a40..bbe3cb8b 100644 --- a/internal/testprotos/desc_test_defaults.pb.go +++ b/internal/testprotos/desc_test_defaults.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_defaults.proto package testprotos diff --git a/internal/testprotos/desc_test_field_types.pb.go b/internal/testprotos/desc_test_field_types.pb.go index a0aefc17..90fd3deb 100644 --- a/internal/testprotos/desc_test_field_types.pb.go +++ b/internal/testprotos/desc_test_field_types.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_field_types.proto package testprotos diff --git a/internal/testprotos/desc_test_oneof.pb.go b/internal/testprotos/desc_test_oneof.pb.go index 269e2429..f80592ec 100644 --- a/internal/testprotos/desc_test_oneof.pb.go +++ b/internal/testprotos/desc_test_oneof.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_oneof.proto package testprotos diff --git a/internal/testprotos/desc_test_options.pb.go b/internal/testprotos/desc_test_options.pb.go index 756ebb91..1db563e8 100644 --- a/internal/testprotos/desc_test_options.pb.go +++ b/internal/testprotos/desc_test_options.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_options.proto package testprotos import ( - descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + descriptorpb "google.golang.org/protobuf/types/descriptorpb" reflect "reflect" sync "sync" ) @@ -133,7 +133,7 @@ func (x *ReallySimpleMessage) GetName() string { var file_desc_test_options_proto_extTypes = []protoimpl.ExtensionInfo{ { - ExtendedType: (*descriptor.MessageOptions)(nil), + ExtendedType: (*descriptorpb.MessageOptions)(nil), ExtensionType: (*bool)(nil), Field: 10101, Name: "testprotos.mfubar", @@ -141,7 +141,7 @@ var file_desc_test_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_options.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: ([]string)(nil), Field: 10101, Name: "testprotos.ffubar", @@ -149,7 +149,7 @@ var file_desc_test_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_options.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: ([]byte)(nil), Field: 10102, Name: "testprotos.ffubarb", @@ -157,7 +157,7 @@ var file_desc_test_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_options.proto", }, { - ExtendedType: (*descriptor.EnumOptions)(nil), + ExtendedType: (*descriptorpb.EnumOptions)(nil), ExtensionType: (*int32)(nil), Field: 10101, Name: "testprotos.efubar", @@ -165,7 +165,7 @@ var file_desc_test_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_options.proto", }, { - ExtendedType: (*descriptor.EnumOptions)(nil), + ExtendedType: (*descriptorpb.EnumOptions)(nil), ExtensionType: (*int32)(nil), Field: 10102, Name: "testprotos.efubars", @@ -173,7 +173,7 @@ var file_desc_test_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_options.proto", }, { - ExtendedType: (*descriptor.EnumOptions)(nil), + ExtendedType: (*descriptorpb.EnumOptions)(nil), ExtensionType: (*int32)(nil), Field: 10103, Name: "testprotos.efubarsf", @@ -181,7 +181,7 @@ var file_desc_test_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_options.proto", }, { - ExtendedType: (*descriptor.EnumOptions)(nil), + ExtendedType: (*descriptorpb.EnumOptions)(nil), ExtensionType: (*uint32)(nil), Field: 10104, Name: "testprotos.efubaru", @@ -189,7 +189,7 @@ var file_desc_test_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_options.proto", }, { - ExtendedType: (*descriptor.EnumOptions)(nil), + ExtendedType: (*descriptorpb.EnumOptions)(nil), ExtensionType: (*uint32)(nil), Field: 10105, Name: "testprotos.efubaruf", @@ -197,7 +197,7 @@ var file_desc_test_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_options.proto", }, { - ExtendedType: (*descriptor.EnumValueOptions)(nil), + ExtendedType: (*descriptorpb.EnumValueOptions)(nil), ExtensionType: (*int64)(nil), Field: 10101, Name: "testprotos.evfubar", @@ -205,7 +205,7 @@ var file_desc_test_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_options.proto", }, { - ExtendedType: (*descriptor.EnumValueOptions)(nil), + ExtendedType: (*descriptorpb.EnumValueOptions)(nil), ExtensionType: (*int64)(nil), Field: 10102, Name: "testprotos.evfubars", @@ -213,7 +213,7 @@ var file_desc_test_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_options.proto", }, { - ExtendedType: (*descriptor.EnumValueOptions)(nil), + ExtendedType: (*descriptorpb.EnumValueOptions)(nil), ExtensionType: (*int64)(nil), Field: 10103, Name: "testprotos.evfubarsf", @@ -221,7 +221,7 @@ var file_desc_test_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_options.proto", }, { - ExtendedType: (*descriptor.EnumValueOptions)(nil), + ExtendedType: (*descriptorpb.EnumValueOptions)(nil), ExtensionType: (*uint64)(nil), Field: 10104, Name: "testprotos.evfubaru", @@ -229,7 +229,7 @@ var file_desc_test_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_options.proto", }, { - ExtendedType: (*descriptor.EnumValueOptions)(nil), + ExtendedType: (*descriptorpb.EnumValueOptions)(nil), ExtensionType: (*uint64)(nil), Field: 10105, Name: "testprotos.evfubaruf", @@ -237,7 +237,7 @@ var file_desc_test_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_options.proto", }, { - ExtendedType: (*descriptor.ServiceOptions)(nil), + ExtendedType: (*descriptorpb.ServiceOptions)(nil), ExtensionType: (*ReallySimpleMessage)(nil), Field: 10101, Name: "testprotos.sfubar", @@ -245,7 +245,7 @@ var file_desc_test_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_options.proto", }, { - ExtendedType: (*descriptor.ServiceOptions)(nil), + ExtendedType: (*descriptorpb.ServiceOptions)(nil), ExtensionType: (*ReallySimpleEnum)(nil), Field: 10102, Name: "testprotos.sfubare", @@ -253,7 +253,7 @@ var file_desc_test_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_options.proto", }, { - ExtendedType: (*descriptor.MethodOptions)(nil), + ExtendedType: (*descriptorpb.MethodOptions)(nil), ExtensionType: ([]float32)(nil), Field: 10101, Name: "testprotos.mtfubar", @@ -261,7 +261,7 @@ var file_desc_test_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_options.proto", }, { - ExtendedType: (*descriptor.MethodOptions)(nil), + ExtendedType: (*descriptorpb.MethodOptions)(nil), ExtensionType: (*float64)(nil), Field: 10102, Name: "testprotos.mtfubard", @@ -269,7 +269,7 @@ var file_desc_test_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_options.proto", }, { - ExtendedType: (*descriptor.ExtensionRangeOptions)(nil), + ExtendedType: (*descriptorpb.ExtensionRangeOptions)(nil), ExtensionType: ([]string)(nil), Field: 10101, Name: "testprotos.exfubar", @@ -277,7 +277,7 @@ var file_desc_test_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_options.proto", }, { - ExtendedType: (*descriptor.ExtensionRangeOptions)(nil), + ExtendedType: (*descriptorpb.ExtensionRangeOptions)(nil), ExtensionType: ([]byte)(nil), Field: 10102, Name: "testprotos.exfubarb", @@ -285,7 +285,7 @@ var file_desc_test_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_options.proto", }, { - ExtendedType: (*descriptor.OneofOptions)(nil), + ExtendedType: (*descriptorpb.OneofOptions)(nil), ExtensionType: ([]string)(nil), Field: 10101, Name: "testprotos.oofubar", @@ -293,7 +293,7 @@ var file_desc_test_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "desc_test_options.proto", }, { - ExtendedType: (*descriptor.OneofOptions)(nil), + ExtendedType: (*descriptorpb.OneofOptions)(nil), ExtensionType: ([]byte)(nil), Field: 10102, Name: "testprotos.oofubarb", @@ -302,13 +302,13 @@ var file_desc_test_options_proto_extTypes = []protoimpl.ExtensionInfo{ }, } -// Extension fields to descriptor.MessageOptions. +// Extension fields to descriptorpb.MessageOptions. var ( // optional bool mfubar = 10101; E_Mfubar = &file_desc_test_options_proto_extTypes[0] ) -// Extension fields to descriptor.FieldOptions. +// Extension fields to descriptorpb.FieldOptions. var ( // repeated string ffubar = 10101; E_Ffubar = &file_desc_test_options_proto_extTypes[1] @@ -316,7 +316,7 @@ var ( E_Ffubarb = &file_desc_test_options_proto_extTypes[2] ) -// Extension fields to descriptor.EnumOptions. +// Extension fields to descriptorpb.EnumOptions. var ( // optional int32 efubar = 10101; E_Efubar = &file_desc_test_options_proto_extTypes[3] @@ -330,7 +330,7 @@ var ( E_Efubaruf = &file_desc_test_options_proto_extTypes[7] ) -// Extension fields to descriptor.EnumValueOptions. +// Extension fields to descriptorpb.EnumValueOptions. var ( // optional int64 evfubar = 10101; E_Evfubar = &file_desc_test_options_proto_extTypes[8] @@ -344,7 +344,7 @@ var ( E_Evfubaruf = &file_desc_test_options_proto_extTypes[12] ) -// Extension fields to descriptor.ServiceOptions. +// Extension fields to descriptorpb.ServiceOptions. var ( // optional testprotos.ReallySimpleMessage sfubar = 10101; E_Sfubar = &file_desc_test_options_proto_extTypes[13] @@ -352,7 +352,7 @@ var ( E_Sfubare = &file_desc_test_options_proto_extTypes[14] ) -// Extension fields to descriptor.MethodOptions. +// Extension fields to descriptorpb.MethodOptions. var ( // repeated float mtfubar = 10101; E_Mtfubar = &file_desc_test_options_proto_extTypes[15] @@ -360,7 +360,7 @@ var ( E_Mtfubard = &file_desc_test_options_proto_extTypes[16] ) -// Extension fields to descriptor.ExtensionRangeOptions. +// Extension fields to descriptorpb.ExtensionRangeOptions. var ( // repeated string exfubar = 10101; E_Exfubar = &file_desc_test_options_proto_extTypes[17] @@ -368,7 +368,7 @@ var ( E_Exfubarb = &file_desc_test_options_proto_extTypes[18] ) -// Extension fields to descriptor.OneofOptions. +// Extension fields to descriptorpb.OneofOptions. var ( // repeated string oofubar = 10101; E_Oofubar = &file_desc_test_options_proto_extTypes[19] @@ -493,16 +493,16 @@ func file_desc_test_options_proto_rawDescGZIP() []byte { var file_desc_test_options_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_desc_test_options_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_desc_test_options_proto_goTypes = []interface{}{ - (ReallySimpleEnum)(0), // 0: testprotos.ReallySimpleEnum - (*ReallySimpleMessage)(nil), // 1: testprotos.ReallySimpleMessage - (*descriptor.MessageOptions)(nil), // 2: google.protobuf.MessageOptions - (*descriptor.FieldOptions)(nil), // 3: google.protobuf.FieldOptions - (*descriptor.EnumOptions)(nil), // 4: google.protobuf.EnumOptions - (*descriptor.EnumValueOptions)(nil), // 5: google.protobuf.EnumValueOptions - (*descriptor.ServiceOptions)(nil), // 6: google.protobuf.ServiceOptions - (*descriptor.MethodOptions)(nil), // 7: google.protobuf.MethodOptions - (*descriptor.ExtensionRangeOptions)(nil), // 8: google.protobuf.ExtensionRangeOptions - (*descriptor.OneofOptions)(nil), // 9: google.protobuf.OneofOptions + (ReallySimpleEnum)(0), // 0: testprotos.ReallySimpleEnum + (*ReallySimpleMessage)(nil), // 1: testprotos.ReallySimpleMessage + (*descriptorpb.MessageOptions)(nil), // 2: google.protobuf.MessageOptions + (*descriptorpb.FieldOptions)(nil), // 3: google.protobuf.FieldOptions + (*descriptorpb.EnumOptions)(nil), // 4: google.protobuf.EnumOptions + (*descriptorpb.EnumValueOptions)(nil), // 5: google.protobuf.EnumValueOptions + (*descriptorpb.ServiceOptions)(nil), // 6: google.protobuf.ServiceOptions + (*descriptorpb.MethodOptions)(nil), // 7: google.protobuf.MethodOptions + (*descriptorpb.ExtensionRangeOptions)(nil), // 8: google.protobuf.ExtensionRangeOptions + (*descriptorpb.OneofOptions)(nil), // 9: google.protobuf.OneofOptions } var file_desc_test_options_proto_depIdxs = []int32{ 2, // 0: testprotos.mfubar:extendee -> 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 011b94c8..281e9e15 100644 Binary files a/internal/testprotos/descriptor.protoset and b/internal/testprotos/descriptor.protoset differ 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 952ead67..5a3d8a42 100644 Binary files a/internal/testprotos/proto3_optional/desc_test_proto3_optional.protoset and b/internal/testprotos/proto3_optional/desc_test_proto3_optional.protoset differ