diff --git a/.golangci.yml b/.golangci.yml new file mode 100644 index 0000000..c373cef --- /dev/null +++ b/.golangci.yml @@ -0,0 +1,6 @@ +--- +run: + skip-files: + # Skip autogenerated files. + - ^.*\.(pb|y)\.go$ + diff --git a/go/examples/go.mod b/go/examples/go.mod index b8b1200..7859f6e 100644 --- a/go/examples/go.mod +++ b/go/examples/go.mod @@ -4,7 +4,6 @@ go 1.19 require ( github.com/alecthomas/kingpin/v2 v2.3.2 - github.com/golang/protobuf v1.4.3 github.com/openproto/protoconfig/go v0.0.0-00010101000000-000000000000 google.golang.org/protobuf v1.25.0 ) diff --git a/go/examples/go.sum b/go/examples/go.sum index 3a806fc..3aaaa6f 100644 --- a/go/examples/go.sum +++ b/go/examples/go.sum @@ -20,8 +20,6 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -72,7 +70,6 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= diff --git a/go/examples/helloworld/helloworld.pb.go b/go/examples/helloworld/helloworld.pb.go index 5bb9b7e..7da4f6b 100644 --- a/go/examples/helloworld/helloworld.pb.go +++ b/go/examples/helloworld/helloworld.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.13.0 +// protoc-gen-go v1.30.0 +// protoc v3.17.3 // source: examples/helloworld/v1/helloworld.proto package helloworldpb import ( - proto "github.com/golang/protobuf/proto" _ "github.com/openproto/protoconfig/go" _ "github.com/openproto/protoconfig/go/kingpinv2" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -23,10 +22,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type Lang int32 const ( @@ -85,6 +80,7 @@ type HelloWorldConfiguration struct { unknownFields protoimpl.UnknownFields // Types that are assignable to Command: + // // *HelloWorldConfiguration_Hello // *HelloWorldConfiguration_Bye Command isHelloWorldConfiguration_Command `protobuf_oneof:"command"` @@ -168,7 +164,7 @@ type HelloCommand struct { Year int64 `protobuf:"varint,2,opt,name=year,proto3" json:"year,omitempty"` World string `protobuf:"bytes,3,opt,name=world,proto3" json:"world,omitempty"` Lang Lang `protobuf:"varint,4,opt,name=lang,proto3,enum=examples.helloworld.v1.Lang" json:"lang,omitempty"` - // Deprecated: Do not use. + // Deprecated: Marked as deprecated in examples/helloworld/v1/helloworld.proto. PleaseAddReally bool `protobuf:"varint,5,opt,name=please_add_really,json=pleaseAddReally,proto3" json:"please_add_really,omitempty"` AddReally bool `protobuf:"varint,6,opt,name=add_really,json=addReally,proto3" json:"add_really,omitempty"` } @@ -233,7 +229,7 @@ func (x *HelloCommand) GetLang() Lang { return Lang_UNSPECIFIED } -// Deprecated: Do not use. +// Deprecated: Marked as deprecated in examples/helloworld/v1/helloworld.proto. func (x *HelloCommand) GetPleaseAddReally() bool { if x != nil { return x.PleaseAddReally @@ -255,6 +251,7 @@ type ByeCommand struct { Lang Lang `protobuf:"varint,1,opt,name=lang,proto3,enum=examples.helloworld.v1.Lang" json:"lang,omitempty"` // Types that are assignable to Command: + // // *ByeCommand_Just // *ByeCommand_Configurable Command isByeCommand_Command `protobuf_oneof:"command"` diff --git a/go/extensions.pb.go b/go/extensions.pb.go index fec8fa2..a42eadd 100644 --- a/go/extensions.pb.go +++ b/go/extensions.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.13.0 +// protoc-gen-go v1.30.0 +// protoc v3.17.3 // source: protoconfig/v1/extensions.proto // Proto Config Extensions Format 1.0. @@ -19,10 +19,9 @@ package protoconfig import ( - proto "github.com/golang/protobuf/proto" - 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" ) @@ -34,10 +33,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // / Metadata is an Message option that when put on message indicates an entry point for certain configuration. // / One `Configuration Proto Definition` can have many structs marked as this option. // / TODO(bwplotka): Make it non pointers (in Go). @@ -46,18 +41,19 @@ type Metadata struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - /// name represents name of annotated configuration entry point. - /// It's recommended to use executable name here. + // / name represents name of annotated configuration entry point. + // / It's recommended to use executable name here. Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - /// version is the semantic version of the annotated configuration. + // / version is the semantic version of the annotated configuration. Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` - /// delivery_mechanism optionally specifies the delivery that is implemented by configurable that consumes this - /// configuration. This allows `Configurator` to discover how to pass the `Encoded Configuration Message` - /// without extra information outside of definition. + // / delivery_mechanism optionally specifies the delivery that is implemented by configurable that consumes this + // / configuration. This allows `Configurator` to discover how to pass the `Encoded Configuration Message` + // / without extra information outside of definition. // TODO(bwplotka): This might be blocking reusability. Rethink? // // Types that are assignable to DeliveryMechanism: + // // *Metadata_StdinDelivery // *Metadata_FlagDelivery DeliveryMechanism isMetadata_DeliveryMechanism `protobuf_oneof:"delivery_mechanism"` @@ -196,7 +192,7 @@ type FlagDelivery struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - /// name represents custom flag name (including `-` if any) for a flag that consumes bytes of `Encoded Configuration Message` + // / name represents custom flag name (including `-` if any) for a flag that consumes bytes of `Encoded Configuration Message` // ProtoConfig 1.0 recommends `--protoconfigv1` name. Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` } @@ -242,7 +238,7 @@ func (x *FlagDelivery) GetName() string { var file_protoconfig_v1_extensions_proto_extTypes = []protoimpl.ExtensionInfo{ { - ExtendedType: (*descriptor.MessageOptions)(nil), + ExtendedType: (*descriptorpb.MessageOptions)(nil), ExtensionType: (*Metadata)(nil), Field: 5000, Name: "protoconfig.v1.metadata", @@ -250,7 +246,7 @@ var file_protoconfig_v1_extensions_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "protoconfig/v1/extensions.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*string)(nil), Field: 5000, Name: "protoconfig.v1.default", @@ -258,7 +254,7 @@ var file_protoconfig_v1_extensions_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "protoconfig/v1/extensions.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 5001, Name: "protoconfig.v1.hidden", @@ -266,7 +262,7 @@ var file_protoconfig_v1_extensions_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "protoconfig/v1/extensions.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 5002, Name: "protoconfig.v1.required", @@ -274,7 +270,7 @@ var file_protoconfig_v1_extensions_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "protoconfig/v1/extensions.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 5003, Name: "protoconfig.v1.experimental", @@ -283,31 +279,31 @@ var file_protoconfig_v1_extensions_proto_extTypes = []protoimpl.ExtensionInfo{ }, } -// Extension fields to descriptor.MessageOptions. +// Extension fields to descriptorpb.MessageOptions. var ( - /// metadata represents + // / metadata represents // // optional protoconfig.v1.Metadata metadata = 5000; E_Metadata = &file_protoconfig_v1_extensions_proto_extTypes[0] ) -// Extension fields to descriptor.FieldOptions. +// Extension fields to descriptorpb.FieldOptions. var ( - /// default represents an option that sets a default value for the field. + // / default represents an option that sets a default value for the field. // // optional string default = 5000; E_Default = &file_protoconfig_v1_extensions_proto_extTypes[1] - /// hidden represents an option that marks a field as hidden. What it actually causes is up to the Configurable. - /// ProtoConfig 1.0 recommends hiding it from the documentation. + // / hidden represents an option that marks a field as hidden. What it actually causes is up to the Configurable. + // / ProtoConfig 1.0 recommends hiding it from the documentation. // // optional bool hidden = 5001; E_Hidden = &file_protoconfig_v1_extensions_proto_extTypes[2] - /// required represents an option that marks a field as mandatory and if empty, Configurable does not accept the whole configuration. + // / required represents an option that marks a field as mandatory and if empty, Configurable does not accept the whole configuration. // // optional bool required = 5002; E_Required = &file_protoconfig_v1_extensions_proto_extTypes[3] - /// experimental represents an option that marks a field as experimental. What it actually causes is up to the Configurable. - /// ProtoConfig 1.0 recommends warning in the documentation. + // / experimental represents an option that marks a field as experimental. What it actually causes is up to the Configurable. + // / ProtoConfig 1.0 recommends warning in the documentation. // // optional bool experimental = 5003; E_Experimental = &file_protoconfig_v1_extensions_proto_extTypes[4] @@ -381,11 +377,11 @@ func file_protoconfig_v1_extensions_proto_rawDescGZIP() []byte { var file_protoconfig_v1_extensions_proto_msgTypes = make([]protoimpl.MessageInfo, 3) var file_protoconfig_v1_extensions_proto_goTypes = []interface{}{ - (*Metadata)(nil), // 0: protoconfig.v1.Metadata - (*StdinDelivery)(nil), // 1: protoconfig.v1.StdinDelivery - (*FlagDelivery)(nil), // 2: protoconfig.v1.FlagDelivery - (*descriptor.MessageOptions)(nil), // 3: google.protobuf.MessageOptions - (*descriptor.FieldOptions)(nil), // 4: google.protobuf.FieldOptions + (*Metadata)(nil), // 0: protoconfig.v1.Metadata + (*StdinDelivery)(nil), // 1: protoconfig.v1.StdinDelivery + (*FlagDelivery)(nil), // 2: protoconfig.v1.FlagDelivery + (*descriptorpb.MessageOptions)(nil), // 3: google.protobuf.MessageOptions + (*descriptorpb.FieldOptions)(nil), // 4: google.protobuf.FieldOptions } var file_protoconfig_v1_extensions_proto_depIdxs = []int32{ 1, // 0: protoconfig.v1.Metadata.stdin_delivery:type_name -> protoconfig.v1.StdinDelivery diff --git a/go/go.mod b/go/go.mod index 4e0b0e6..9e15aba 100644 --- a/go/go.mod +++ b/go/go.mod @@ -4,7 +4,6 @@ go 1.19 require ( github.com/alecthomas/kingpin/v2 v2.3.2 - github.com/golang/protobuf v1.4.3 google.golang.org/protobuf v1.25.0 ) diff --git a/go/go.sum b/go/go.sum index 3a806fc..3aaaa6f 100644 --- a/go/go.sum +++ b/go/go.sum @@ -20,8 +20,6 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -72,7 +70,6 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= diff --git a/go/kingpinv2/extensions.pb.go b/go/kingpinv2/extensions.pb.go index 4722f6f..665e7bc 100644 --- a/go/kingpinv2/extensions.pb.go +++ b/go/kingpinv2/extensions.pb.go @@ -1,19 +1,18 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.13.0 +// protoc-gen-go v1.30.0 +// protoc v3.17.3 // source: protoconfig/go/kingpinv2/v1/extensions.proto -// Extensions based on https://pkg.go.dev/github.com/alecthomas/kingpin/v2 +// Extensions based on https://pkg.go.dev/gopkg.in/alecthomas/kingpin.v2 package kingpinv2 import ( - proto "github.com/golang/protobuf/proto" - descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" - any "github.com/golang/protobuf/ptypes/any" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + descriptorpb "google.golang.org/protobuf/types/descriptorpb" + anypb "google.golang.org/protobuf/types/known/anypb" reflect "reflect" sync "sync" ) @@ -25,17 +24,13 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Content is byte steam created from PathOrContent flag, a custom extension built on top of kingpin.v2 flags type. type Content struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Content *any.Any `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"` // any proto.Message + Content *anypb.Any `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"` // any proto.Message } func (x *Content) Reset() { @@ -70,21 +65,21 @@ func (*Content) Descriptor() ([]byte, []int) { return file_protoconfig_go_kingpinv2_v1_extensions_proto_rawDescGZIP(), []int{0} } -func (x *Content) GetContent() *any.Any { +func (x *Content) GetContent() *anypb.Any { if x != nil { return x.Content } return nil } -// ExistingFile represents https://pkg.go.dev/github.com/alecthomas/kingpin/v2#ArgClause.ExistingFile. -// repeated ExistingFile represents https://pkg.go.dev/github.com/alecthomas/kingpin/v2#ArgClause.ExistingFiles. +// ExistingFile represents https://pkg.go.dev/gopkg.in/alecthomas/kingpin.v2#ArgClause.ExistingFile. +// repeated ExistingFile represents https://pkg.go.dev/gopkg.in/alecthomas/kingpin.v2#ArgClause.ExistingFiles. type ExistingFile struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - File *any.Any `protobuf:"bytes,1,opt,name=file,proto3" json:"file,omitempty"` // *os.File + File *anypb.Any `protobuf:"bytes,1,opt,name=file,proto3" json:"file,omitempty"` // *os.File } func (x *ExistingFile) Reset() { @@ -119,21 +114,21 @@ func (*ExistingFile) Descriptor() ([]byte, []int) { return file_protoconfig_go_kingpinv2_v1_extensions_proto_rawDescGZIP(), []int{1} } -func (x *ExistingFile) GetFile() *any.Any { +func (x *ExistingFile) GetFile() *anypb.Any { if x != nil { return x.File } return nil } -// IP represents https://pkg.go.dev/github.com/alecthomas/kingpin/v2#ArgClause.IP. -// repeated IP represents https://pkg.go.dev/github.com/alecthomas/kingpin/v2#ArgClause.IPList. +// IP represents https://pkg.go.dev/gopkg.in/alecthomas/kingpin.v2#ArgClause.IP. +// repeated IP represents https://pkg.go.dev/gopkg.in/alecthomas/kingpin.v2#ArgClause.IPList. type IP struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Ip *any.Any `protobuf:"bytes,1,opt,name=ip,proto3" json:"ip,omitempty"` // *net.IP + Ip *anypb.Any `protobuf:"bytes,1,opt,name=ip,proto3" json:"ip,omitempty"` // *net.IP } func (x *IP) Reset() { @@ -168,21 +163,21 @@ func (*IP) Descriptor() ([]byte, []int) { return file_protoconfig_go_kingpinv2_v1_extensions_proto_rawDescGZIP(), []int{2} } -func (x *IP) GetIp() *any.Any { +func (x *IP) GetIp() *anypb.Any { if x != nil { return x.Ip } return nil } -// Regexp represents https://pkg.go.dev/github.com/alecthomas/kingpin/v2#ArgClause.Regexp. -// repeated Regexp represents https://pkg.go.dev/github.com/alecthomas/kingpin/v2#ArgClause.RegexpList. +// Regexp represents https://pkg.go.dev/gopkg.in/alecthomas/kingpin.v2#ArgClause.Regexp. +// repeated Regexp represents https://pkg.go.dev/gopkg.in/alecthomas/kingpin.v2#ArgClause.RegexpList. type Regexp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Regexp *any.Any `protobuf:"bytes,1,opt,name=regexp,proto3" json:"regexp,omitempty"` // **regexp.Regexp + Regexp *anypb.Any `protobuf:"bytes,1,opt,name=regexp,proto3" json:"regexp,omitempty"` // **regexp.Regexp } func (x *Regexp) Reset() { @@ -217,7 +212,7 @@ func (*Regexp) Descriptor() ([]byte, []int) { return file_protoconfig_go_kingpinv2_v1_extensions_proto_rawDescGZIP(), []int{3} } -func (x *Regexp) GetRegexp() *any.Any { +func (x *Regexp) GetRegexp() *anypb.Any { if x != nil { return x.Regexp } @@ -273,7 +268,7 @@ func (x *Command) GetName() string { var file_protoconfig_go_kingpinv2_v1_extensions_proto_extTypes = []protoimpl.ExtensionInfo{ { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*string)(nil), Field: 6000, Name: "protoconfig.go.kingpinv2.v1.placeholder", @@ -281,7 +276,7 @@ var file_protoconfig_go_kingpinv2_v1_extensions_proto_extTypes = []protoimpl.Ext Filename: "protoconfig/go/kingpinv2/v1/extensions.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*string)(nil), Field: 6001, Name: "protoconfig.go.kingpinv2.v1.envvar", @@ -289,7 +284,7 @@ var file_protoconfig_go_kingpinv2_v1_extensions_proto_extTypes = []protoimpl.Ext Filename: "protoconfig/go/kingpinv2/v1/extensions.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 6002, Name: "protoconfig.go.kingpinv2.v1.argument", @@ -297,7 +292,7 @@ var file_protoconfig_go_kingpinv2_v1_extensions_proto_extTypes = []protoimpl.Ext Filename: "protoconfig/go/kingpinv2/v1/extensions.proto", }, { - ExtendedType: (*descriptor.MessageOptions)(nil), + ExtendedType: (*descriptorpb.MessageOptions)(nil), ExtensionType: (*Command)(nil), Field: 6002, Name: "protoconfig.go.kingpinv2.v1.command", @@ -306,7 +301,7 @@ var file_protoconfig_go_kingpinv2_v1_extensions_proto_extTypes = []protoimpl.Ext }, } -// Extension fields to descriptor.FieldOptions. +// Extension fields to descriptorpb.FieldOptions. var ( // optional string placeholder = 6000; E_Placeholder = &file_protoconfig_go_kingpinv2_v1_extensions_proto_extTypes[0] @@ -318,7 +313,7 @@ var ( E_Argument = &file_protoconfig_go_kingpinv2_v1_extensions_proto_extTypes[2] ) -// Extension fields to descriptor.MessageOptions. +// Extension fields to descriptorpb.MessageOptions. var ( // By default message represents just complex configuration type. If command_name is specified // such message becomes a kingpin.v2 command. @@ -393,14 +388,14 @@ func file_protoconfig_go_kingpinv2_v1_extensions_proto_rawDescGZIP() []byte { var file_protoconfig_go_kingpinv2_v1_extensions_proto_msgTypes = make([]protoimpl.MessageInfo, 5) var file_protoconfig_go_kingpinv2_v1_extensions_proto_goTypes = []interface{}{ - (*Content)(nil), // 0: protoconfig.go.kingpinv2.v1.Content - (*ExistingFile)(nil), // 1: protoconfig.go.kingpinv2.v1.ExistingFile - (*IP)(nil), // 2: protoconfig.go.kingpinv2.v1.IP - (*Regexp)(nil), // 3: protoconfig.go.kingpinv2.v1.Regexp - (*Command)(nil), // 4: protoconfig.go.kingpinv2.v1.Command - (*any.Any)(nil), // 5: google.protobuf.Any - (*descriptor.FieldOptions)(nil), // 6: google.protobuf.FieldOptions - (*descriptor.MessageOptions)(nil), // 7: google.protobuf.MessageOptions + (*Content)(nil), // 0: protoconfig.go.kingpinv2.v1.Content + (*ExistingFile)(nil), // 1: protoconfig.go.kingpinv2.v1.ExistingFile + (*IP)(nil), // 2: protoconfig.go.kingpinv2.v1.IP + (*Regexp)(nil), // 3: protoconfig.go.kingpinv2.v1.Regexp + (*Command)(nil), // 4: protoconfig.go.kingpinv2.v1.Command + (*anypb.Any)(nil), // 5: google.protobuf.Any + (*descriptorpb.FieldOptions)(nil), // 6: google.protobuf.FieldOptions + (*descriptorpb.MessageOptions)(nil), // 7: google.protobuf.MessageOptions } var file_protoconfig_go_kingpinv2_v1_extensions_proto_depIdxs = []int32{ 5, // 0: protoconfig.go.kingpinv2.v1.Content.content:type_name -> google.protobuf.Any