[chore]: Bump golang.org/x/oauth2 from 0.9.0 to 0.10.0 (#1975)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
parent
f0dad439f6
commit
a29b5affc8
4
go.mod
4
go.mod
|
@ -63,7 +63,7 @@ require (
|
||||||
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
|
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
|
||||||
golang.org/x/image v0.9.0
|
golang.org/x/image v0.9.0
|
||||||
golang.org/x/net v0.12.0
|
golang.org/x/net v0.12.0
|
||||||
golang.org/x/oauth2 v0.9.0
|
golang.org/x/oauth2 v0.10.0
|
||||||
golang.org/x/text v0.11.0
|
golang.org/x/text v0.11.0
|
||||||
gopkg.in/mcuadros/go-syslog.v2 v2.3.0
|
gopkg.in/mcuadros/go-syslog.v2 v2.3.0
|
||||||
gopkg.in/yaml.v3 v3.0.1
|
gopkg.in/yaml.v3 v3.0.1
|
||||||
|
@ -169,7 +169,7 @@ require (
|
||||||
google.golang.org/appengine v1.6.7 // indirect
|
google.golang.org/appengine v1.6.7 // indirect
|
||||||
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
|
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
|
||||||
google.golang.org/grpc v1.55.0 // indirect
|
google.golang.org/grpc v1.55.0 // indirect
|
||||||
google.golang.org/protobuf v1.30.0 // indirect
|
google.golang.org/protobuf v1.31.0 // indirect
|
||||||
gopkg.in/ini.v1 v1.67.0 // indirect
|
gopkg.in/ini.v1 v1.67.0 // indirect
|
||||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
lukechampine.com/uint128 v1.2.0 // indirect
|
lukechampine.com/uint128 v1.2.0 // indirect
|
||||||
|
|
8
go.sum
8
go.sum
|
@ -788,8 +788,8 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ
|
||||||
golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
|
golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
|
||||||
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
|
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
|
||||||
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
|
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
|
||||||
golang.org/x/oauth2 v0.9.0 h1:BPpt2kU7oMRq3kCHAA1tbSEshXRw1LpG2ztgDwrzuAs=
|
golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8=
|
||||||
golang.org/x/oauth2 v0.9.0/go.mod h1:qYgFZaFiu6Wg24azG8bdV52QJXJGbZzIIsRCdVKzbLw=
|
golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI=
|
||||||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
@ -1047,8 +1047,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
|
||||||
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
||||||
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
||||||
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
|
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
|
||||||
google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
|
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
|
||||||
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
|
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
|
|
@ -106,13 +106,19 @@ func (o MarshalOptions) Format(m proto.Message) string {
|
||||||
// MarshalOptions. Do not depend on the output being stable. It may change over
|
// MarshalOptions. Do not depend on the output being stable. It may change over
|
||||||
// time across different versions of the program.
|
// time across different versions of the program.
|
||||||
func (o MarshalOptions) Marshal(m proto.Message) ([]byte, error) {
|
func (o MarshalOptions) Marshal(m proto.Message) ([]byte, error) {
|
||||||
return o.marshal(m)
|
return o.marshal(nil, m)
|
||||||
|
}
|
||||||
|
|
||||||
|
// MarshalAppend appends the JSON format encoding of m to b,
|
||||||
|
// returning the result.
|
||||||
|
func (o MarshalOptions) MarshalAppend(b []byte, m proto.Message) ([]byte, error) {
|
||||||
|
return o.marshal(b, m)
|
||||||
}
|
}
|
||||||
|
|
||||||
// marshal is a centralized function that all marshal operations go through.
|
// marshal is a centralized function that all marshal operations go through.
|
||||||
// For profiling purposes, avoid changing the name of this function or
|
// For profiling purposes, avoid changing the name of this function or
|
||||||
// introducing other code paths for marshal that do not go through this.
|
// introducing other code paths for marshal that do not go through this.
|
||||||
func (o MarshalOptions) marshal(m proto.Message) ([]byte, error) {
|
func (o MarshalOptions) marshal(b []byte, m proto.Message) ([]byte, error) {
|
||||||
if o.Multiline && o.Indent == "" {
|
if o.Multiline && o.Indent == "" {
|
||||||
o.Indent = defaultIndent
|
o.Indent = defaultIndent
|
||||||
}
|
}
|
||||||
|
@ -120,7 +126,7 @@ func (o MarshalOptions) marshal(m proto.Message) ([]byte, error) {
|
||||||
o.Resolver = protoregistry.GlobalTypes
|
o.Resolver = protoregistry.GlobalTypes
|
||||||
}
|
}
|
||||||
|
|
||||||
internalEnc, err := json.NewEncoder(o.Indent)
|
internalEnc, err := json.NewEncoder(b, o.Indent)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -128,7 +134,7 @@ func (o MarshalOptions) marshal(m proto.Message) ([]byte, error) {
|
||||||
// Treat nil message interface as an empty message,
|
// Treat nil message interface as an empty message,
|
||||||
// in which case the output in an empty JSON object.
|
// in which case the output in an empty JSON object.
|
||||||
if m == nil {
|
if m == nil {
|
||||||
return []byte("{}"), nil
|
return append(b, '{', '}'), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
enc := encoder{internalEnc, o}
|
enc := encoder{internalEnc, o}
|
||||||
|
|
|
@ -101,13 +101,19 @@ func (o MarshalOptions) Format(m proto.Message) string {
|
||||||
// MarshalOptions object. Do not depend on the output being stable. It may
|
// MarshalOptions object. Do not depend on the output being stable. It may
|
||||||
// change over time across different versions of the program.
|
// change over time across different versions of the program.
|
||||||
func (o MarshalOptions) Marshal(m proto.Message) ([]byte, error) {
|
func (o MarshalOptions) Marshal(m proto.Message) ([]byte, error) {
|
||||||
return o.marshal(m)
|
return o.marshal(nil, m)
|
||||||
|
}
|
||||||
|
|
||||||
|
// MarshalAppend appends the textproto format encoding of m to b,
|
||||||
|
// returning the result.
|
||||||
|
func (o MarshalOptions) MarshalAppend(b []byte, m proto.Message) ([]byte, error) {
|
||||||
|
return o.marshal(b, m)
|
||||||
}
|
}
|
||||||
|
|
||||||
// marshal is a centralized function that all marshal operations go through.
|
// marshal is a centralized function that all marshal operations go through.
|
||||||
// For profiling purposes, avoid changing the name of this function or
|
// For profiling purposes, avoid changing the name of this function or
|
||||||
// introducing other code paths for marshal that do not go through this.
|
// introducing other code paths for marshal that do not go through this.
|
||||||
func (o MarshalOptions) marshal(m proto.Message) ([]byte, error) {
|
func (o MarshalOptions) marshal(b []byte, m proto.Message) ([]byte, error) {
|
||||||
var delims = [2]byte{'{', '}'}
|
var delims = [2]byte{'{', '}'}
|
||||||
|
|
||||||
if o.Multiline && o.Indent == "" {
|
if o.Multiline && o.Indent == "" {
|
||||||
|
@ -117,7 +123,7 @@ func (o MarshalOptions) marshal(m proto.Message) ([]byte, error) {
|
||||||
o.Resolver = protoregistry.GlobalTypes
|
o.Resolver = protoregistry.GlobalTypes
|
||||||
}
|
}
|
||||||
|
|
||||||
internalEnc, err := text.NewEncoder(o.Indent, delims, o.EmitASCII)
|
internalEnc, err := text.NewEncoder(b, o.Indent, delims, o.EmitASCII)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -125,7 +131,7 @@ func (o MarshalOptions) marshal(m proto.Message) ([]byte, error) {
|
||||||
// Treat nil message interface as an empty message,
|
// Treat nil message interface as an empty message,
|
||||||
// in which case there is nothing to output.
|
// in which case there is nothing to output.
|
||||||
if m == nil {
|
if m == nil {
|
||||||
return []byte{}, nil
|
return b, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
enc := encoder{internalEnc, o}
|
enc := encoder{internalEnc, o}
|
||||||
|
|
|
@ -41,8 +41,10 @@ type Encoder struct {
|
||||||
//
|
//
|
||||||
// If indent is a non-empty string, it causes every entry for an Array or Object
|
// If indent is a non-empty string, it causes every entry for an Array or Object
|
||||||
// to be preceded by the indent and trailed by a newline.
|
// to be preceded by the indent and trailed by a newline.
|
||||||
func NewEncoder(indent string) (*Encoder, error) {
|
func NewEncoder(buf []byte, indent string) (*Encoder, error) {
|
||||||
e := &Encoder{}
|
e := &Encoder{
|
||||||
|
out: buf,
|
||||||
|
}
|
||||||
if len(indent) > 0 {
|
if len(indent) > 0 {
|
||||||
if strings.Trim(indent, " \t") != "" {
|
if strings.Trim(indent, " \t") != "" {
|
||||||
return nil, errors.New("indent may only be composed of space or tab characters")
|
return nil, errors.New("indent may only be composed of space or tab characters")
|
||||||
|
@ -176,13 +178,13 @@ func appendFloat(out []byte, n float64, bitSize int) []byte {
|
||||||
// WriteInt writes out the given signed integer in JSON number value.
|
// WriteInt writes out the given signed integer in JSON number value.
|
||||||
func (e *Encoder) WriteInt(n int64) {
|
func (e *Encoder) WriteInt(n int64) {
|
||||||
e.prepareNext(scalar)
|
e.prepareNext(scalar)
|
||||||
e.out = append(e.out, strconv.FormatInt(n, 10)...)
|
e.out = strconv.AppendInt(e.out, n, 10)
|
||||||
}
|
}
|
||||||
|
|
||||||
// WriteUint writes out the given unsigned integer in JSON number value.
|
// WriteUint writes out the given unsigned integer in JSON number value.
|
||||||
func (e *Encoder) WriteUint(n uint64) {
|
func (e *Encoder) WriteUint(n uint64) {
|
||||||
e.prepareNext(scalar)
|
e.prepareNext(scalar)
|
||||||
e.out = append(e.out, strconv.FormatUint(n, 10)...)
|
e.out = strconv.AppendUint(e.out, n, 10)
|
||||||
}
|
}
|
||||||
|
|
||||||
// StartObject writes out the '{' symbol.
|
// StartObject writes out the '{' symbol.
|
||||||
|
|
|
@ -53,8 +53,10 @@ type encoderState struct {
|
||||||
// If outputASCII is true, strings will be serialized in such a way that
|
// If outputASCII is true, strings will be serialized in such a way that
|
||||||
// multi-byte UTF-8 sequences are escaped. This property ensures that the
|
// multi-byte UTF-8 sequences are escaped. This property ensures that the
|
||||||
// overall output is ASCII (as opposed to UTF-8).
|
// overall output is ASCII (as opposed to UTF-8).
|
||||||
func NewEncoder(indent string, delims [2]byte, outputASCII bool) (*Encoder, error) {
|
func NewEncoder(buf []byte, indent string, delims [2]byte, outputASCII bool) (*Encoder, error) {
|
||||||
e := &Encoder{}
|
e := &Encoder{
|
||||||
|
encoderState: encoderState{out: buf},
|
||||||
|
}
|
||||||
if len(indent) > 0 {
|
if len(indent) > 0 {
|
||||||
if strings.Trim(indent, " \t") != "" {
|
if strings.Trim(indent, " \t") != "" {
|
||||||
return nil, errors.New("indent may only be composed of space and tab characters")
|
return nil, errors.New("indent may only be composed of space and tab characters")
|
||||||
|
@ -195,13 +197,13 @@ func appendFloat(out []byte, n float64, bitSize int) []byte {
|
||||||
// WriteInt writes out the given signed integer value.
|
// WriteInt writes out the given signed integer value.
|
||||||
func (e *Encoder) WriteInt(n int64) {
|
func (e *Encoder) WriteInt(n int64) {
|
||||||
e.prepareNext(scalar)
|
e.prepareNext(scalar)
|
||||||
e.out = append(e.out, strconv.FormatInt(n, 10)...)
|
e.out = strconv.AppendInt(e.out, n, 10)
|
||||||
}
|
}
|
||||||
|
|
||||||
// WriteUint writes out the given unsigned integer value.
|
// WriteUint writes out the given unsigned integer value.
|
||||||
func (e *Encoder) WriteUint(n uint64) {
|
func (e *Encoder) WriteUint(n uint64) {
|
||||||
e.prepareNext(scalar)
|
e.prepareNext(scalar)
|
||||||
e.out = append(e.out, strconv.FormatUint(n, 10)...)
|
e.out = strconv.AppendUint(e.out, n, 10)
|
||||||
}
|
}
|
||||||
|
|
||||||
// WriteLiteral writes out the given string as a literal value without quotes.
|
// WriteLiteral writes out the given string as a literal value without quotes.
|
||||||
|
|
|
@ -183,13 +183,58 @@ const (
|
||||||
// Field names for google.protobuf.ExtensionRangeOptions.
|
// Field names for google.protobuf.ExtensionRangeOptions.
|
||||||
const (
|
const (
|
||||||
ExtensionRangeOptions_UninterpretedOption_field_name protoreflect.Name = "uninterpreted_option"
|
ExtensionRangeOptions_UninterpretedOption_field_name protoreflect.Name = "uninterpreted_option"
|
||||||
|
ExtensionRangeOptions_Declaration_field_name protoreflect.Name = "declaration"
|
||||||
|
ExtensionRangeOptions_Verification_field_name protoreflect.Name = "verification"
|
||||||
|
|
||||||
ExtensionRangeOptions_UninterpretedOption_field_fullname protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.uninterpreted_option"
|
ExtensionRangeOptions_UninterpretedOption_field_fullname protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.uninterpreted_option"
|
||||||
|
ExtensionRangeOptions_Declaration_field_fullname protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.declaration"
|
||||||
|
ExtensionRangeOptions_Verification_field_fullname protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.verification"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Field numbers for google.protobuf.ExtensionRangeOptions.
|
// Field numbers for google.protobuf.ExtensionRangeOptions.
|
||||||
const (
|
const (
|
||||||
ExtensionRangeOptions_UninterpretedOption_field_number protoreflect.FieldNumber = 999
|
ExtensionRangeOptions_UninterpretedOption_field_number protoreflect.FieldNumber = 999
|
||||||
|
ExtensionRangeOptions_Declaration_field_number protoreflect.FieldNumber = 2
|
||||||
|
ExtensionRangeOptions_Verification_field_number protoreflect.FieldNumber = 3
|
||||||
|
)
|
||||||
|
|
||||||
|
// Full and short names for google.protobuf.ExtensionRangeOptions.VerificationState.
|
||||||
|
const (
|
||||||
|
ExtensionRangeOptions_VerificationState_enum_fullname = "google.protobuf.ExtensionRangeOptions.VerificationState"
|
||||||
|
ExtensionRangeOptions_VerificationState_enum_name = "VerificationState"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Names for google.protobuf.ExtensionRangeOptions.Declaration.
|
||||||
|
const (
|
||||||
|
ExtensionRangeOptions_Declaration_message_name protoreflect.Name = "Declaration"
|
||||||
|
ExtensionRangeOptions_Declaration_message_fullname protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Field names for google.protobuf.ExtensionRangeOptions.Declaration.
|
||||||
|
const (
|
||||||
|
ExtensionRangeOptions_Declaration_Number_field_name protoreflect.Name = "number"
|
||||||
|
ExtensionRangeOptions_Declaration_FullName_field_name protoreflect.Name = "full_name"
|
||||||
|
ExtensionRangeOptions_Declaration_Type_field_name protoreflect.Name = "type"
|
||||||
|
ExtensionRangeOptions_Declaration_IsRepeated_field_name protoreflect.Name = "is_repeated"
|
||||||
|
ExtensionRangeOptions_Declaration_Reserved_field_name protoreflect.Name = "reserved"
|
||||||
|
ExtensionRangeOptions_Declaration_Repeated_field_name protoreflect.Name = "repeated"
|
||||||
|
|
||||||
|
ExtensionRangeOptions_Declaration_Number_field_fullname protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration.number"
|
||||||
|
ExtensionRangeOptions_Declaration_FullName_field_fullname protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration.full_name"
|
||||||
|
ExtensionRangeOptions_Declaration_Type_field_fullname protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration.type"
|
||||||
|
ExtensionRangeOptions_Declaration_IsRepeated_field_fullname protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration.is_repeated"
|
||||||
|
ExtensionRangeOptions_Declaration_Reserved_field_fullname protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration.reserved"
|
||||||
|
ExtensionRangeOptions_Declaration_Repeated_field_fullname protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration.repeated"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Field numbers for google.protobuf.ExtensionRangeOptions.Declaration.
|
||||||
|
const (
|
||||||
|
ExtensionRangeOptions_Declaration_Number_field_number protoreflect.FieldNumber = 1
|
||||||
|
ExtensionRangeOptions_Declaration_FullName_field_number protoreflect.FieldNumber = 2
|
||||||
|
ExtensionRangeOptions_Declaration_Type_field_number protoreflect.FieldNumber = 3
|
||||||
|
ExtensionRangeOptions_Declaration_IsRepeated_field_number protoreflect.FieldNumber = 4
|
||||||
|
ExtensionRangeOptions_Declaration_Reserved_field_number protoreflect.FieldNumber = 5
|
||||||
|
ExtensionRangeOptions_Declaration_Repeated_field_number protoreflect.FieldNumber = 6
|
||||||
)
|
)
|
||||||
|
|
||||||
// Names for google.protobuf.FieldDescriptorProto.
|
// Names for google.protobuf.FieldDescriptorProto.
|
||||||
|
@ -540,6 +585,7 @@ const (
|
||||||
FieldOptions_DebugRedact_field_name protoreflect.Name = "debug_redact"
|
FieldOptions_DebugRedact_field_name protoreflect.Name = "debug_redact"
|
||||||
FieldOptions_Retention_field_name protoreflect.Name = "retention"
|
FieldOptions_Retention_field_name protoreflect.Name = "retention"
|
||||||
FieldOptions_Target_field_name protoreflect.Name = "target"
|
FieldOptions_Target_field_name protoreflect.Name = "target"
|
||||||
|
FieldOptions_Targets_field_name protoreflect.Name = "targets"
|
||||||
FieldOptions_UninterpretedOption_field_name protoreflect.Name = "uninterpreted_option"
|
FieldOptions_UninterpretedOption_field_name protoreflect.Name = "uninterpreted_option"
|
||||||
|
|
||||||
FieldOptions_Ctype_field_fullname protoreflect.FullName = "google.protobuf.FieldOptions.ctype"
|
FieldOptions_Ctype_field_fullname protoreflect.FullName = "google.protobuf.FieldOptions.ctype"
|
||||||
|
@ -552,6 +598,7 @@ const (
|
||||||
FieldOptions_DebugRedact_field_fullname protoreflect.FullName = "google.protobuf.FieldOptions.debug_redact"
|
FieldOptions_DebugRedact_field_fullname protoreflect.FullName = "google.protobuf.FieldOptions.debug_redact"
|
||||||
FieldOptions_Retention_field_fullname protoreflect.FullName = "google.protobuf.FieldOptions.retention"
|
FieldOptions_Retention_field_fullname protoreflect.FullName = "google.protobuf.FieldOptions.retention"
|
||||||
FieldOptions_Target_field_fullname protoreflect.FullName = "google.protobuf.FieldOptions.target"
|
FieldOptions_Target_field_fullname protoreflect.FullName = "google.protobuf.FieldOptions.target"
|
||||||
|
FieldOptions_Targets_field_fullname protoreflect.FullName = "google.protobuf.FieldOptions.targets"
|
||||||
FieldOptions_UninterpretedOption_field_fullname protoreflect.FullName = "google.protobuf.FieldOptions.uninterpreted_option"
|
FieldOptions_UninterpretedOption_field_fullname protoreflect.FullName = "google.protobuf.FieldOptions.uninterpreted_option"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -567,6 +614,7 @@ const (
|
||||||
FieldOptions_DebugRedact_field_number protoreflect.FieldNumber = 16
|
FieldOptions_DebugRedact_field_number protoreflect.FieldNumber = 16
|
||||||
FieldOptions_Retention_field_number protoreflect.FieldNumber = 17
|
FieldOptions_Retention_field_number protoreflect.FieldNumber = 17
|
||||||
FieldOptions_Target_field_number protoreflect.FieldNumber = 18
|
FieldOptions_Target_field_number protoreflect.FieldNumber = 18
|
||||||
|
FieldOptions_Targets_field_number protoreflect.FieldNumber = 19
|
||||||
FieldOptions_UninterpretedOption_field_number protoreflect.FieldNumber = 999
|
FieldOptions_UninterpretedOption_field_number protoreflect.FieldNumber = 999
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,7 @@ const (
|
||||||
Type_Options_field_name protoreflect.Name = "options"
|
Type_Options_field_name protoreflect.Name = "options"
|
||||||
Type_SourceContext_field_name protoreflect.Name = "source_context"
|
Type_SourceContext_field_name protoreflect.Name = "source_context"
|
||||||
Type_Syntax_field_name protoreflect.Name = "syntax"
|
Type_Syntax_field_name protoreflect.Name = "syntax"
|
||||||
|
Type_Edition_field_name protoreflect.Name = "edition"
|
||||||
|
|
||||||
Type_Name_field_fullname protoreflect.FullName = "google.protobuf.Type.name"
|
Type_Name_field_fullname protoreflect.FullName = "google.protobuf.Type.name"
|
||||||
Type_Fields_field_fullname protoreflect.FullName = "google.protobuf.Type.fields"
|
Type_Fields_field_fullname protoreflect.FullName = "google.protobuf.Type.fields"
|
||||||
|
@ -39,6 +40,7 @@ const (
|
||||||
Type_Options_field_fullname protoreflect.FullName = "google.protobuf.Type.options"
|
Type_Options_field_fullname protoreflect.FullName = "google.protobuf.Type.options"
|
||||||
Type_SourceContext_field_fullname protoreflect.FullName = "google.protobuf.Type.source_context"
|
Type_SourceContext_field_fullname protoreflect.FullName = "google.protobuf.Type.source_context"
|
||||||
Type_Syntax_field_fullname protoreflect.FullName = "google.protobuf.Type.syntax"
|
Type_Syntax_field_fullname protoreflect.FullName = "google.protobuf.Type.syntax"
|
||||||
|
Type_Edition_field_fullname protoreflect.FullName = "google.protobuf.Type.edition"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Field numbers for google.protobuf.Type.
|
// Field numbers for google.protobuf.Type.
|
||||||
|
@ -49,6 +51,7 @@ const (
|
||||||
Type_Options_field_number protoreflect.FieldNumber = 4
|
Type_Options_field_number protoreflect.FieldNumber = 4
|
||||||
Type_SourceContext_field_number protoreflect.FieldNumber = 5
|
Type_SourceContext_field_number protoreflect.FieldNumber = 5
|
||||||
Type_Syntax_field_number protoreflect.FieldNumber = 6
|
Type_Syntax_field_number protoreflect.FieldNumber = 6
|
||||||
|
Type_Edition_field_number protoreflect.FieldNumber = 7
|
||||||
)
|
)
|
||||||
|
|
||||||
// Names for google.protobuf.Field.
|
// Names for google.protobuf.Field.
|
||||||
|
@ -121,12 +124,14 @@ const (
|
||||||
Enum_Options_field_name protoreflect.Name = "options"
|
Enum_Options_field_name protoreflect.Name = "options"
|
||||||
Enum_SourceContext_field_name protoreflect.Name = "source_context"
|
Enum_SourceContext_field_name protoreflect.Name = "source_context"
|
||||||
Enum_Syntax_field_name protoreflect.Name = "syntax"
|
Enum_Syntax_field_name protoreflect.Name = "syntax"
|
||||||
|
Enum_Edition_field_name protoreflect.Name = "edition"
|
||||||
|
|
||||||
Enum_Name_field_fullname protoreflect.FullName = "google.protobuf.Enum.name"
|
Enum_Name_field_fullname protoreflect.FullName = "google.protobuf.Enum.name"
|
||||||
Enum_Enumvalue_field_fullname protoreflect.FullName = "google.protobuf.Enum.enumvalue"
|
Enum_Enumvalue_field_fullname protoreflect.FullName = "google.protobuf.Enum.enumvalue"
|
||||||
Enum_Options_field_fullname protoreflect.FullName = "google.protobuf.Enum.options"
|
Enum_Options_field_fullname protoreflect.FullName = "google.protobuf.Enum.options"
|
||||||
Enum_SourceContext_field_fullname protoreflect.FullName = "google.protobuf.Enum.source_context"
|
Enum_SourceContext_field_fullname protoreflect.FullName = "google.protobuf.Enum.source_context"
|
||||||
Enum_Syntax_field_fullname protoreflect.FullName = "google.protobuf.Enum.syntax"
|
Enum_Syntax_field_fullname protoreflect.FullName = "google.protobuf.Enum.syntax"
|
||||||
|
Enum_Edition_field_fullname protoreflect.FullName = "google.protobuf.Enum.edition"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Field numbers for google.protobuf.Enum.
|
// Field numbers for google.protobuf.Enum.
|
||||||
|
@ -136,6 +141,7 @@ const (
|
||||||
Enum_Options_field_number protoreflect.FieldNumber = 3
|
Enum_Options_field_number protoreflect.FieldNumber = 3
|
||||||
Enum_SourceContext_field_number protoreflect.FieldNumber = 4
|
Enum_SourceContext_field_number protoreflect.FieldNumber = 4
|
||||||
Enum_Syntax_field_number protoreflect.FieldNumber = 5
|
Enum_Syntax_field_number protoreflect.FieldNumber = 5
|
||||||
|
Enum_Edition_field_number protoreflect.FieldNumber = 6
|
||||||
)
|
)
|
||||||
|
|
||||||
// Names for google.protobuf.EnumValue.
|
// Names for google.protobuf.EnumValue.
|
||||||
|
|
|
@ -33,7 +33,7 @@ var (
|
||||||
return !inOneof(ox) && inOneof(oy)
|
return !inOneof(ox) && inOneof(oy)
|
||||||
}
|
}
|
||||||
// Fields in disjoint oneof sets are sorted by declaration index.
|
// Fields in disjoint oneof sets are sorted by declaration index.
|
||||||
if ox != nil && oy != nil && ox != oy {
|
if inOneof(ox) && inOneof(oy) && ox != oy {
|
||||||
return ox.Index() < oy.Index()
|
return ox.Index() < oy.Index()
|
||||||
}
|
}
|
||||||
// Fields sorted by field number.
|
// Fields sorted by field number.
|
||||||
|
|
|
@ -51,7 +51,7 @@ import (
|
||||||
// 10. Send out the CL for review and submit it.
|
// 10. Send out the CL for review and submit it.
|
||||||
const (
|
const (
|
||||||
Major = 1
|
Major = 1
|
||||||
Minor = 30
|
Minor = 31
|
||||||
Patch = 0
|
Patch = 0
|
||||||
PreRelease = ""
|
PreRelease = ""
|
||||||
)
|
)
|
||||||
|
|
|
@ -73,23 +73,27 @@ func (o MarshalOptions) sizeField(fd protoreflect.FieldDescriptor, value protore
|
||||||
}
|
}
|
||||||
|
|
||||||
func (o MarshalOptions) sizeList(num protowire.Number, fd protoreflect.FieldDescriptor, list protoreflect.List) (size int) {
|
func (o MarshalOptions) sizeList(num protowire.Number, fd protoreflect.FieldDescriptor, list protoreflect.List) (size int) {
|
||||||
|
sizeTag := protowire.SizeTag(num)
|
||||||
|
|
||||||
if fd.IsPacked() && list.Len() > 0 {
|
if fd.IsPacked() && list.Len() > 0 {
|
||||||
content := 0
|
content := 0
|
||||||
for i, llen := 0, list.Len(); i < llen; i++ {
|
for i, llen := 0, list.Len(); i < llen; i++ {
|
||||||
content += o.sizeSingular(num, fd.Kind(), list.Get(i))
|
content += o.sizeSingular(num, fd.Kind(), list.Get(i))
|
||||||
}
|
}
|
||||||
return protowire.SizeTag(num) + protowire.SizeBytes(content)
|
return sizeTag + protowire.SizeBytes(content)
|
||||||
}
|
}
|
||||||
|
|
||||||
for i, llen := 0, list.Len(); i < llen; i++ {
|
for i, llen := 0, list.Len(); i < llen; i++ {
|
||||||
size += protowire.SizeTag(num) + o.sizeSingular(num, fd.Kind(), list.Get(i))
|
size += sizeTag + o.sizeSingular(num, fd.Kind(), list.Get(i))
|
||||||
}
|
}
|
||||||
return size
|
return size
|
||||||
}
|
}
|
||||||
|
|
||||||
func (o MarshalOptions) sizeMap(num protowire.Number, fd protoreflect.FieldDescriptor, mapv protoreflect.Map) (size int) {
|
func (o MarshalOptions) sizeMap(num protowire.Number, fd protoreflect.FieldDescriptor, mapv protoreflect.Map) (size int) {
|
||||||
|
sizeTag := protowire.SizeTag(num)
|
||||||
|
|
||||||
mapv.Range(func(key protoreflect.MapKey, value protoreflect.Value) bool {
|
mapv.Range(func(key protoreflect.MapKey, value protoreflect.Value) bool {
|
||||||
size += protowire.SizeTag(num)
|
size += sizeTag
|
||||||
size += protowire.SizeBytes(o.sizeField(fd.MapKey(), key.Value()) + o.sizeField(fd.MapValue(), value))
|
size += protowire.SizeBytes(o.sizeField(fd.MapKey(), key.Value()) + o.sizeField(fd.MapValue(), value))
|
||||||
return true
|
return true
|
||||||
})
|
})
|
||||||
|
|
|
@ -363,6 +363,8 @@ func (p *SourcePath) appendFieldOptions(b []byte) []byte {
|
||||||
b = p.appendSingularField(b, "retention", nil)
|
b = p.appendSingularField(b, "retention", nil)
|
||||||
case 18:
|
case 18:
|
||||||
b = p.appendSingularField(b, "target", nil)
|
b = p.appendSingularField(b, "target", nil)
|
||||||
|
case 19:
|
||||||
|
b = p.appendRepeatedField(b, "targets", nil)
|
||||||
case 999:
|
case 999:
|
||||||
b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
|
b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
|
||||||
}
|
}
|
||||||
|
@ -418,6 +420,10 @@ func (p *SourcePath) appendExtensionRangeOptions(b []byte) []byte {
|
||||||
switch (*p)[0] {
|
switch (*p)[0] {
|
||||||
case 999:
|
case 999:
|
||||||
b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
|
b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
|
||||||
|
case 2:
|
||||||
|
b = p.appendRepeatedField(b, "declaration", (*SourcePath).appendExtensionRangeOptions_Declaration)
|
||||||
|
case 3:
|
||||||
|
b = p.appendSingularField(b, "verification", nil)
|
||||||
}
|
}
|
||||||
return b
|
return b
|
||||||
}
|
}
|
||||||
|
@ -473,3 +479,24 @@ func (p *SourcePath) appendUninterpretedOption_NamePart(b []byte) []byte {
|
||||||
}
|
}
|
||||||
return b
|
return b
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (p *SourcePath) appendExtensionRangeOptions_Declaration(b []byte) []byte {
|
||||||
|
if len(*p) == 0 {
|
||||||
|
return b
|
||||||
|
}
|
||||||
|
switch (*p)[0] {
|
||||||
|
case 1:
|
||||||
|
b = p.appendSingularField(b, "number", nil)
|
||||||
|
case 2:
|
||||||
|
b = p.appendSingularField(b, "full_name", nil)
|
||||||
|
case 3:
|
||||||
|
b = p.appendSingularField(b, "type", nil)
|
||||||
|
case 4:
|
||||||
|
b = p.appendSingularField(b, "is_repeated", nil)
|
||||||
|
case 5:
|
||||||
|
b = p.appendSingularField(b, "reserved", nil)
|
||||||
|
case 6:
|
||||||
|
b = p.appendSingularField(b, "repeated", nil)
|
||||||
|
}
|
||||||
|
return b
|
||||||
|
}
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -182,8 +182,8 @@ import (
|
||||||
// in the type URL, for example "foo.bar.com/x/y.z" will yield type
|
// in the type URL, for example "foo.bar.com/x/y.z" will yield type
|
||||||
// name "y.z".
|
// name "y.z".
|
||||||
//
|
//
|
||||||
// # JSON
|
// JSON
|
||||||
//
|
// ====
|
||||||
// The JSON representation of an `Any` value uses the regular
|
// The JSON representation of an `Any` value uses the regular
|
||||||
// representation of the deserialized, embedded message, with an
|
// representation of the deserialized, embedded message, with an
|
||||||
// additional field `@type` which contains the type URL. Example:
|
// additional field `@type` which contains the type URL. Example:
|
||||||
|
|
|
@ -167,7 +167,7 @@ import (
|
||||||
// [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with
|
// [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with
|
||||||
// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use
|
// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use
|
||||||
// the Joda Time's [`ISODateTimeFormat.dateTime()`](
|
// the Joda Time's [`ISODateTimeFormat.dateTime()`](
|
||||||
// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D
|
// http://joda-time.sourceforge.net/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime()
|
||||||
// ) to obtain a formatter capable of generating timestamps in this format.
|
// ) to obtain a formatter capable of generating timestamps in this format.
|
||||||
type Timestamp struct {
|
type Timestamp struct {
|
||||||
state protoimpl.MessageState
|
state protoimpl.MessageState
|
||||||
|
|
|
@ -890,7 +890,7 @@ golang.org/x/net/ipv4
|
||||||
golang.org/x/net/ipv6
|
golang.org/x/net/ipv6
|
||||||
golang.org/x/net/publicsuffix
|
golang.org/x/net/publicsuffix
|
||||||
golang.org/x/net/trace
|
golang.org/x/net/trace
|
||||||
# golang.org/x/oauth2 v0.9.0
|
# golang.org/x/oauth2 v0.10.0
|
||||||
## explicit; go 1.17
|
## explicit; go 1.17
|
||||||
golang.org/x/oauth2
|
golang.org/x/oauth2
|
||||||
golang.org/x/oauth2/internal
|
golang.org/x/oauth2/internal
|
||||||
|
@ -999,7 +999,7 @@ google.golang.org/grpc/serviceconfig
|
||||||
google.golang.org/grpc/stats
|
google.golang.org/grpc/stats
|
||||||
google.golang.org/grpc/status
|
google.golang.org/grpc/status
|
||||||
google.golang.org/grpc/tap
|
google.golang.org/grpc/tap
|
||||||
# google.golang.org/protobuf v1.30.0
|
# google.golang.org/protobuf v1.31.0
|
||||||
## explicit; go 1.11
|
## explicit; go 1.11
|
||||||
google.golang.org/protobuf/encoding/protojson
|
google.golang.org/protobuf/encoding/protojson
|
||||||
google.golang.org/protobuf/encoding/prototext
|
google.golang.org/protobuf/encoding/prototext
|
||||||
|
|
Loading…
Reference in New Issue