[](https://gitter.im/go-playground/validator?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
+
[](https://travis-ci.org/go-playground/validator)
[](https://coveralls.io/github/go-playground/validator?branch=master)
[](https://goreportcard.com/report/github.com/go-playground/validator)
diff --git a/vendor/github.com/go-playground/validator/v10/go.mod b/vendor/github.com/go-playground/validator/v10/go.mod
index ddecff628..e281ec0e1 100644
--- a/vendor/github.com/go-playground/validator/v10/go.mod
+++ b/vendor/github.com/go-playground/validator/v10/go.mod
@@ -11,9 +11,9 @@ require (
github.com/leodido/go-urn v1.2.1
github.com/rogpeppe/go-internal v1.8.0 // indirect
github.com/stretchr/testify v1.7.0 // indirect
- golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
+ golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 // indirect
- golang.org/x/text v0.3.6
+ golang.org/x/text v0.3.7
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
)
diff --git a/vendor/github.com/go-playground/validator/v10/go.sum b/vendor/github.com/go-playground/validator/v10/go.sum
index 57500933f..a1c43c320 100644
--- a/vendor/github.com/go-playground/validator/v10/go.sum
+++ b/vendor/github.com/go-playground/validator/v10/go.sum
@@ -28,17 +28,19 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M=
+golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 h1:siQdpVirKtzPhKl3lZWozZraCFObP8S1v6PRp0bLrtU=
golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
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=
diff --git a/vendor/github.com/goccy/go-json/.golangci.yml b/vendor/github.com/goccy/go-json/.golangci.yml
index 44ae40f69..57ae5a528 100644
--- a/vendor/github.com/goccy/go-json/.golangci.yml
+++ b/vendor/github.com/goccy/go-json/.golangci.yml
@@ -48,6 +48,14 @@ linters:
- nlreturn
- testpackage
- wsl
+ - varnamelen
+ - nilnil
+ - ireturn
+ - govet
+ - forcetypeassert
+ - cyclop
+ - containedctx
+ - revive
issues:
exclude-rules:
diff --git a/vendor/github.com/goccy/go-json/CHANGELOG.md b/vendor/github.com/goccy/go-json/CHANGELOG.md
index fd6aa9d6c..9139b9b25 100644
--- a/vendor/github.com/goccy/go-json/CHANGELOG.md
+++ b/vendor/github.com/goccy/go-json/CHANGELOG.md
@@ -1,3 +1,106 @@
+# v0.9.6 - 2022/03/22
+
+### Fix bugs
+
+* Correct the handling of the minimum value of int type for decoder ( #344 )
+* Fix bugs of stream decoder's bufferSize ( #349 )
+* Add a guard to use typeptr more safely ( #351 )
+
+### Improve decoder performance
+
+* Improve escapeString's performance ( #345 )
+
+### Others
+
+* Update go version for CI ( #347 )
+
+# v0.9.5 - 2022/03/04
+
+### Fix bugs
+
+* Fix panic when decoding time.Time with context ( #328 )
+* Fix reading the next character in buffer to nul consideration ( #338 )
+* Fix incorrect handling on skipValue ( #341 )
+
+### Improve decoder performance
+
+* Improve performance when a payload contains escape sequence ( #334 )
+
+# v0.9.4 - 2022/01/21
+
+* Fix IsNilForMarshaler for string type with omitempty ( #323 )
+* Fix the case where the embedded field is at the end ( #326 )
+
+# v0.9.3 - 2022/01/14
+
+* Fix logic of removing struct field for decoder ( #322 )
+
+# v0.9.2 - 2022/01/14
+
+* Add invalid decoder to delay type error judgment at decode ( #321 )
+
+# v0.9.1 - 2022/01/11
+
+* Fix encoding of MarshalText/MarshalJSON operation with head offset ( #319 )
+
+# v0.9.0 - 2022/01/05
+
+### New feature
+
+* Supports dynamic filtering of struct fields ( #314 )
+
+### Improve encoding performance
+
+* Improve map encoding performance ( #310 )
+* Optimize encoding path for escaped string ( #311 )
+* Add encoding option for performance ( #312 )
+
+### Fix bugs
+
+* Fix panic at encoding map value on 1.18 ( #310 )
+* Fix MarshalIndent for interface type ( #317 )
+
+# v0.8.1 - 2021/12/05
+
+* Fix operation conversion from PtrHead to Head in Recursive type ( #305 )
+
+# v0.8.0 - 2021/12/02
+
+* Fix embedded field conflict behavior ( #300 )
+* Refactor compiler for encoder ( #301 #302 )
+
+# v0.7.10 - 2021/10/16
+
+* Fix conversion from pointer to uint64 ( #294 )
+
+# v0.7.9 - 2021/09/28
+
+* Fix encoding of nil value about interface type that has method ( #291 )
+
+# v0.7.8 - 2021/09/01
+
+* Fix mapassign_faststr for indirect struct type ( #283 )
+* Fix encoding of not empty interface type ( #284 )
+* Fix encoding of empty struct interface type ( #286 )
+
+# v0.7.7 - 2021/08/25
+
+* Fix invalid utf8 on stream decoder ( #279 )
+* Fix buffer length bug on string stream decoder ( #280 )
+
+Thank you @orisano !!
+
+# v0.7.6 - 2021/08/13
+
+* Fix nil slice assignment ( #276 )
+* Improve error message ( #277 )
+
+# v0.7.5 - 2021/08/12
+
+* Fix encoding of embedded struct with tags ( #265 )
+* Fix encoding of embedded struct that isn't first field ( #272 )
+* Fix decoding of binary type with escaped char ( #273 )
+
# v0.7.4 - 2021/07/06
* Fix encoding of indirect layout structure ( #264 )
diff --git a/vendor/github.com/goccy/go-json/README.md b/vendor/github.com/goccy/go-json/README.md
index 418854e52..568623773 100644
--- a/vendor/github.com/goccy/go-json/README.md
+++ b/vendor/github.com/goccy/go-json/README.md
@@ -13,7 +13,7 @@ Fast JSON encoder/decoder compatible with encoding/json for Go
```
* version ( expected release date )
-* v0.7.0
+* v0.9.0
|
| while maintaining compatibility with encoding/json, we will add convenient APIs
|
@@ -21,9 +21,8 @@ Fast JSON encoder/decoder compatible with encoding/json for Go
* v1.0.0
```
-We are accepting requests for features that will be implemented between v0.7.0 and v.1.0.0.
+We are accepting requests for features that will be implemented between v0.9.0 and v.1.0.0.
If you have the API you need, please submit your issue [here](https://github.com/goccy/go-json/issues).
-For example, I'm thinking of supporting `context.Context` of `json.Marshaler` and decoding using JSON Path.
# Features
@@ -32,6 +31,7 @@ For example, I'm thinking of supporting `context.Context` of `json.Marshaler` an
- Flexible customization with options
- Coloring the encoded string
- Can propagate context.Context to `MarshalJSON` or `UnmarshalJSON`
+- Can dynamically filter the fields of the structure type-safely
# Installation
diff --git a/vendor/github.com/goccy/go-json/encode.go b/vendor/github.com/goccy/go-json/encode.go
index 7f198bdca..4bd899f38 100644
--- a/vendor/github.com/goccy/go-json/encode.go
+++ b/vendor/github.com/goccy/go-json/encode.go
@@ -3,6 +3,7 @@ package json
import (
"context"
"io"
+ "os"
"unsafe"
"github.com/goccy/go-json/internal/encoder"
@@ -61,6 +62,8 @@ func (e *Encoder) encodeWithOption(ctx *encoder.RuntimeContext, v interface{}, o
if e.enabledHTMLEscape {
ctx.Option.Flag |= encoder.HTMLEscapeOption
}
+ ctx.Option.Flag |= encoder.NormalizeUTF8Option
+ ctx.Option.DebugOut = os.Stdout
for _, optFunc := range optFuncs {
optFunc(ctx.Option)
}
@@ -111,7 +114,7 @@ func (e *Encoder) SetIndent(prefix, indent string) {
func marshalContext(ctx context.Context, v interface{}, optFuncs ...EncodeOptionFunc) ([]byte, error) {
rctx := encoder.TakeRuntimeContext()
rctx.Option.Flag = 0
- rctx.Option.Flag = encoder.HTMLEscapeOption | encoder.ContextOption
+ rctx.Option.Flag = encoder.HTMLEscapeOption | encoder.NormalizeUTF8Option | encoder.ContextOption
rctx.Option.Context = ctx
for _, optFunc := range optFuncs {
optFunc(rctx.Option)
@@ -139,7 +142,7 @@ func marshal(v interface{}, optFuncs ...EncodeOptionFunc) ([]byte, error) {
ctx := encoder.TakeRuntimeContext()
ctx.Option.Flag = 0
- ctx.Option.Flag |= encoder.HTMLEscapeOption
+ ctx.Option.Flag |= (encoder.HTMLEscapeOption | encoder.NormalizeUTF8Option)
for _, optFunc := range optFuncs {
optFunc(ctx.Option)
}
@@ -166,7 +169,7 @@ func marshalNoEscape(v interface{}) ([]byte, error) {
ctx := encoder.TakeRuntimeContext()
ctx.Option.Flag = 0
- ctx.Option.Flag |= encoder.HTMLEscapeOption
+ ctx.Option.Flag |= (encoder.HTMLEscapeOption | encoder.NormalizeUTF8Option)
buf, err := encodeNoEscape(ctx, v)
if err != nil {
@@ -190,7 +193,7 @@ func marshalIndent(v interface{}, prefix, indent string, optFuncs ...EncodeOptio
ctx := encoder.TakeRuntimeContext()
ctx.Option.Flag = 0
- ctx.Option.Flag |= (encoder.HTMLEscapeOption | encoder.IndentOption)
+ ctx.Option.Flag |= (encoder.HTMLEscapeOption | encoder.NormalizeUTF8Option | encoder.IndentOption)
for _, optFunc := range optFuncs {
optFunc(ctx.Option)
}
@@ -220,7 +223,7 @@ func encode(ctx *encoder.RuntimeContext, v interface{}) ([]byte, error) {
typ := header.typ
typeptr := uintptr(unsafe.Pointer(typ))
- codeSet, err := encoder.CompileToGetCodeSet(typeptr)
+ codeSet, err := encoder.CompileToGetCodeSet(ctx, typeptr)
if err != nil {
return nil, err
}
@@ -248,7 +251,7 @@ func encodeNoEscape(ctx *encoder.RuntimeContext, v interface{}) ([]byte, error)
typ := header.typ
typeptr := uintptr(unsafe.Pointer(typ))
- codeSet, err := encoder.CompileToGetCodeSet(typeptr)
+ codeSet, err := encoder.CompileToGetCodeSet(ctx, typeptr)
if err != nil {
return nil, err
}
@@ -275,7 +278,7 @@ func encodeIndent(ctx *encoder.RuntimeContext, v interface{}, prefix, indent str
typ := header.typ
typeptr := uintptr(unsafe.Pointer(typ))
- codeSet, err := encoder.CompileToGetCodeSet(typeptr)
+ codeSet, err := encoder.CompileToGetCodeSet(ctx, typeptr)
if err != nil {
return nil, err
}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/bytes.go b/vendor/github.com/goccy/go-json/internal/decoder/bytes.go
index 0c4681a11..92c7dcf64 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/bytes.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/bytes.go
@@ -9,10 +9,11 @@ import (
)
type bytesDecoder struct {
- typ *runtime.Type
- sliceDecoder Decoder
- structName string
- fieldName string
+ typ *runtime.Type
+ sliceDecoder Decoder
+ stringDecoder *stringDecoder
+ structName string
+ fieldName string
}
func byteUnmarshalerSliceDecoder(typ *runtime.Type, structName string, fieldName string) Decoder {
@@ -22,19 +23,19 @@ func byteUnmarshalerSliceDecoder(typ *runtime.Type, structName string, fieldName
unmarshalDecoder = newUnmarshalJSONDecoder(runtime.PtrTo(typ), structName, fieldName)
case runtime.PtrTo(typ).Implements(unmarshalTextType):
unmarshalDecoder = newUnmarshalTextDecoder(runtime.PtrTo(typ), structName, fieldName)
- }
- if unmarshalDecoder == nil {
- return nil
+ default:
+ unmarshalDecoder, _ = compileUint8(typ, structName, fieldName)
}
return newSliceDecoder(unmarshalDecoder, typ, 1, structName, fieldName)
}
func newBytesDecoder(typ *runtime.Type, structName string, fieldName string) *bytesDecoder {
return &bytesDecoder{
- typ: typ,
- sliceDecoder: byteUnmarshalerSliceDecoder(typ, structName, fieldName),
- structName: structName,
- fieldName: fieldName,
+ typ: typ,
+ sliceDecoder: byteUnmarshalerSliceDecoder(typ, structName, fieldName),
+ stringDecoder: newStringDecoder(structName, fieldName),
+ structName: structName,
+ fieldName: fieldName,
}
}
@@ -77,101 +78,36 @@ func (d *bytesDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsafe
return cursor, nil
}
-func binaryBytes(s *Stream) ([]byte, error) {
- s.cursor++
- start := s.cursor
- for {
- switch s.char() {
- case '"':
- literal := s.buf[start:s.cursor]
- s.cursor++
- return literal, nil
- case nul:
- if s.read() {
- continue
- }
- goto ERROR
- }
- s.cursor++
- }
-ERROR:
- return nil, errors.ErrUnexpectedEndOfJSON("[]byte", s.totalOffset())
-}
-
func (d *bytesDecoder) decodeStreamBinary(s *Stream, depth int64, p unsafe.Pointer) ([]byte, error) {
- for {
- switch s.char() {
- case ' ', '\n', '\t', '\r':
- s.cursor++
- continue
- case '"':
- return binaryBytes(s)
- case 'n':
- if err := nullBytes(s); err != nil {
- return nil, err
- }
- return nil, nil
- case '[':
- if d.sliceDecoder == nil {
- return nil, &errors.UnmarshalTypeError{
- Type: runtime.RType2Type(d.typ),
- Offset: s.totalOffset(),
- }
- }
- if err := d.sliceDecoder.DecodeStream(s, depth, p); err != nil {
- return nil, err
- }
- return nil, nil
- case nul:
- if s.read() {
- continue
+ c := s.skipWhiteSpace()
+ if c == '[' {
+ if d.sliceDecoder == nil {
+ return nil, &errors.UnmarshalTypeError{
+ Type: runtime.RType2Type(d.typ),
+ Offset: s.totalOffset(),
}
}
- break
+ err := d.sliceDecoder.DecodeStream(s, depth, p)
+ return nil, err
}
- return nil, errors.ErrNotAtBeginningOfValue(s.totalOffset())
+ return d.stringDecoder.decodeStreamByte(s)
}
func (d *bytesDecoder) decodeBinary(ctx *RuntimeContext, cursor, depth int64, p unsafe.Pointer) ([]byte, int64, error) {
buf := ctx.Buf
- for {
- switch buf[cursor] {
- case ' ', '\n', '\t', '\r':
- cursor++
- case '"':
- cursor++
- start := cursor
- for {
- switch buf[cursor] {
- case '"':
- literal := buf[start:cursor]
- cursor++
- return literal, cursor, nil
- case nul:
- return nil, 0, errors.ErrUnexpectedEndOfJSON("[]byte", cursor)
- }
- cursor++
+ cursor = skipWhiteSpace(buf, cursor)
+ if buf[cursor] == '[' {
+ if d.sliceDecoder == nil {
+ return nil, 0, &errors.UnmarshalTypeError{
+ Type: runtime.RType2Type(d.typ),
+ Offset: cursor,
}
- case '[':
- if d.sliceDecoder == nil {
- return nil, 0, &errors.UnmarshalTypeError{
- Type: runtime.RType2Type(d.typ),
- Offset: cursor,
- }
- }
- c, err := d.sliceDecoder.Decode(ctx, cursor, depth, p)
- if err != nil {
- return nil, 0, err
- }
- return nil, c, nil
- case 'n':
- if err := validateNull(buf, cursor); err != nil {
- return nil, 0, err
- }
- cursor += 4
- return nil, cursor, nil
- default:
- return nil, 0, errors.ErrNotAtBeginningOfValue(cursor)
}
+ c, err := d.sliceDecoder.Decode(ctx, cursor, depth, p)
+ if err != nil {
+ return nil, 0, err
+ }
+ return nil, c, nil
}
+ return d.stringDecoder.decodeByte(buf, cursor)
}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/compile.go b/vendor/github.com/goccy/go-json/internal/decoder/compile.go
index 08dd044e6..bf17d1b29 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/compile.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/compile.go
@@ -9,7 +9,6 @@ import (
"unicode"
"unsafe"
- "github.com/goccy/go-json/internal/errors"
"github.com/goccy/go-json/internal/runtime"
)
@@ -126,13 +125,7 @@ func compile(typ *runtime.Type, structName, fieldName string, structTypeToDecode
case reflect.Func:
return compileFunc(typ, structName, fieldName)
}
- return nil, &errors.UnmarshalTypeError{
- Value: "object",
- Type: runtime.RType2Type(typ),
- Offset: 0,
- Struct: structName,
- Field: fieldName,
- }
+ return newInvalidDecoder(typ, structName, fieldName), nil
}
func isStringTagSupportedType(typ *runtime.Type) bool {
@@ -161,6 +154,9 @@ func compileMapKey(typ *runtime.Type, structName, fieldName string, structTypeTo
if runtime.PtrTo(typ).Implements(unmarshalTextType) {
return newUnmarshalTextDecoder(runtime.PtrTo(typ), structName, fieldName), nil
}
+ if typ.Kind() == reflect.String {
+ return newStringDecoder(structName, fieldName), nil
+ }
dec, err := compile(typ, structName, fieldName, structTypeToDecoder)
if err != nil {
return nil, err
@@ -174,17 +170,9 @@ func compileMapKey(typ *runtime.Type, structName, fieldName string, structTypeTo
case *ptrDecoder:
dec = t.dec
default:
- goto ERROR
+ return newInvalidDecoder(typ, structName, fieldName), nil
}
}
-ERROR:
- return nil, &errors.UnmarshalTypeError{
- Value: "object",
- Type: runtime.RType2Type(typ),
- Offset: 0,
- Struct: structName,
- Field: fieldName,
- }
}
func compilePtr(typ *runtime.Type, structName, fieldName string, structTypeToDecoder map[uintptr]Decoder) (Decoder, error) {
@@ -322,64 +310,21 @@ func compileFunc(typ *runtime.Type, strutName, fieldName string) (Decoder, error
return newFuncDecoder(typ, strutName, fieldName), nil
}
-func removeConflictFields(fieldMap map[string]*structFieldSet, conflictedMap map[string]struct{}, dec *structDecoder, field reflect.StructField) {
- for k, v := range dec.fieldMap {
- if _, exists := conflictedMap[k]; exists {
- // already conflicted key
+func typeToStructTags(typ *runtime.Type) runtime.StructTags {
+ tags := runtime.StructTags{}
+ fieldNum := typ.NumField()
+ for i := 0; i < fieldNum; i++ {
+ field := typ.Field(i)
+ if runtime.IsIgnoredStructField(field) {
continue
}
- set, exists := fieldMap[k]
- if !exists {
- fieldSet := &structFieldSet{
- dec: v.dec,
- offset: field.Offset + v.offset,
- isTaggedKey: v.isTaggedKey,
- key: k,
- keyLen: int64(len(k)),
- }
- fieldMap[k] = fieldSet
- lower := strings.ToLower(k)
- if _, exists := fieldMap[lower]; !exists {
- fieldMap[lower] = fieldSet
- }
- continue
- }
- if set.isTaggedKey {
- if v.isTaggedKey {
- // conflict tag key
- delete(fieldMap, k)
- delete(fieldMap, strings.ToLower(k))
- conflictedMap[k] = struct{}{}
- conflictedMap[strings.ToLower(k)] = struct{}{}
- }
- } else {
- if v.isTaggedKey {
- fieldSet := &structFieldSet{
- dec: v.dec,
- offset: field.Offset + v.offset,
- isTaggedKey: v.isTaggedKey,
- key: k,
- keyLen: int64(len(k)),
- }
- fieldMap[k] = fieldSet
- lower := strings.ToLower(k)
- if _, exists := fieldMap[lower]; !exists {
- fieldMap[lower] = fieldSet
- }
- } else {
- // conflict tag key
- delete(fieldMap, k)
- delete(fieldMap, strings.ToLower(k))
- conflictedMap[k] = struct{}{}
- conflictedMap[strings.ToLower(k)] = struct{}{}
- }
- }
+ tags = append(tags, runtime.StructTagFromField(field))
}
+ return tags
}
func compileStruct(typ *runtime.Type, structName, fieldName string, structTypeToDecoder map[uintptr]Decoder) (Decoder, error) {
fieldNum := typ.NumField()
- conflictedMap := map[string]struct{}{}
fieldMap := map[string]*structFieldSet{}
typeptr := uintptr(unsafe.Pointer(typ))
if dec, exists := structTypeToDecoder[typeptr]; exists {
@@ -388,6 +333,8 @@ func compileStruct(typ *runtime.Type, structName, fieldName string, structTypeTo
structDec := newStructDecoder(structName, fieldName, fieldMap)
structTypeToDecoder[typeptr] = structDec
structName = typ.Name()
+ tags := typeToStructTags(typ)
+ allFields := []*structFieldSet{}
for i := 0; i < fieldNum; i++ {
field := typ.Field(i)
if runtime.IsIgnoredStructField(field) {
@@ -405,7 +352,19 @@ func compileStruct(typ *runtime.Type, structName, fieldName string, structTypeTo
// recursive definition
continue
}
- removeConflictFields(fieldMap, conflictedMap, stDec, field)
+ for k, v := range stDec.fieldMap {
+ if tags.ExistsKey(k) {
+ continue
+ }
+ fieldSet := &structFieldSet{
+ dec: v.dec,
+ offset: field.Offset + v.offset,
+ isTaggedKey: v.isTaggedKey,
+ key: k,
+ keyLen: int64(len(k)),
+ }
+ allFields = append(allFields, fieldSet)
+ }
} else if pdec, ok := dec.(*ptrDecoder); ok {
contentDec := pdec.contentDecoder()
if pdec.typ == typ {
@@ -421,58 +380,18 @@ func compileStruct(typ *runtime.Type, structName, fieldName string, structTypeTo
}
if dec, ok := contentDec.(*structDecoder); ok {
for k, v := range dec.fieldMap {
- if _, exists := conflictedMap[k]; exists {
- // already conflicted key
+ if tags.ExistsKey(k) {
continue
}
- set, exists := fieldMap[k]
- if !exists {
- fieldSet := &structFieldSet{
- dec: newAnonymousFieldDecoder(pdec.typ, v.offset, v.dec),
- offset: field.Offset,
- isTaggedKey: v.isTaggedKey,
- key: k,
- keyLen: int64(len(k)),
- err: fieldSetErr,
- }
- fieldMap[k] = fieldSet
- lower := strings.ToLower(k)
- if _, exists := fieldMap[lower]; !exists {
- fieldMap[lower] = fieldSet
- }
- continue
- }
- if set.isTaggedKey {
- if v.isTaggedKey {
- // conflict tag key
- delete(fieldMap, k)
- delete(fieldMap, strings.ToLower(k))
- conflictedMap[k] = struct{}{}
- conflictedMap[strings.ToLower(k)] = struct{}{}
- }
- } else {
- if v.isTaggedKey {
- fieldSet := &structFieldSet{
- dec: newAnonymousFieldDecoder(pdec.typ, v.offset, v.dec),
- offset: field.Offset,
- isTaggedKey: v.isTaggedKey,
- key: k,
- keyLen: int64(len(k)),
- err: fieldSetErr,
- }
- fieldMap[k] = fieldSet
- lower := strings.ToLower(k)
- if _, exists := fieldMap[lower]; !exists {
- fieldMap[lower] = fieldSet
- }
- } else {
- // conflict tag key
- delete(fieldMap, k)
- delete(fieldMap, strings.ToLower(k))
- conflictedMap[k] = struct{}{}
- conflictedMap[strings.ToLower(k)] = struct{}{}
- }
+ fieldSet := &structFieldSet{
+ dec: newAnonymousFieldDecoder(pdec.typ, v.offset, v.dec),
+ offset: field.Offset,
+ isTaggedKey: v.isTaggedKey,
+ key: k,
+ keyLen: int64(len(k)),
+ err: fieldSetErr,
}
+ allFields = append(allFields, fieldSet)
}
}
}
@@ -493,11 +412,15 @@ func compileStruct(typ *runtime.Type, structName, fieldName string, structTypeTo
key: key,
keyLen: int64(len(key)),
}
- fieldMap[key] = fieldSet
- lower := strings.ToLower(key)
- if _, exists := fieldMap[lower]; !exists {
- fieldMap[lower] = fieldSet
- }
+ allFields = append(allFields, fieldSet)
+ }
+ }
+ for _, set := range filterDuplicatedFields(allFields) {
+ fieldMap[set.key] = set
+ lower := strings.ToLower(set.key)
+ if _, exists := fieldMap[lower]; !exists {
+ // first win
+ fieldMap[lower] = set
}
}
delete(structTypeToDecoder, typeptr)
@@ -505,6 +428,42 @@ func compileStruct(typ *runtime.Type, structName, fieldName string, structTypeTo
return structDec, nil
}
+func filterDuplicatedFields(allFields []*structFieldSet) []*structFieldSet {
+ fieldMap := map[string][]*structFieldSet{}
+ for _, field := range allFields {
+ fieldMap[field.key] = append(fieldMap[field.key], field)
+ }
+ duplicatedFieldMap := map[string]struct{}{}
+ for k, sets := range fieldMap {
+ sets = filterFieldSets(sets)
+ if len(sets) != 1 {
+ duplicatedFieldMap[k] = struct{}{}
+ }
+ }
+
+ filtered := make([]*structFieldSet, 0, len(allFields))
+ for _, field := range allFields {
+ if _, exists := duplicatedFieldMap[field.key]; exists {
+ continue
+ }
+ filtered = append(filtered, field)
+ }
+ return filtered
+}
+
+func filterFieldSets(sets []*structFieldSet) []*structFieldSet {
+ if len(sets) == 1 {
+ return sets
+ }
+ filtered := make([]*structFieldSet, 0, len(sets))
+ for _, set := range sets {
+ if set.isTaggedKey {
+ filtered = append(filtered, set)
+ }
+ }
+ return filtered
+}
+
func implementsUnmarshalJSONType(typ *runtime.Type) bool {
return typ.Implements(unmarshalJSONType) || typ.Implements(unmarshalJSONContextType)
}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/compile_norace.go b/vendor/github.com/goccy/go-json/internal/decoder/compile_norace.go
index 592f63737..eb7e2b134 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/compile_norace.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/compile_norace.go
@@ -1,3 +1,4 @@
+//go:build !race
// +build !race
package decoder
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/compile_race.go b/vendor/github.com/goccy/go-json/internal/decoder/compile_race.go
index b691bc947..49cdda4a1 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/compile_race.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/compile_race.go
@@ -1,3 +1,4 @@
+//go:build race
// +build race
package decoder
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/func.go b/vendor/github.com/goccy/go-json/internal/decoder/func.go
index 75afe75cd..ee3563711 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/func.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/func.go
@@ -76,7 +76,7 @@ func (d *funcDecoder) DecodeStream(s *Stream, depth int64, p unsafe.Pointer) err
}
}
}
- return errors.ErrNotAtBeginningOfValue(start)
+ return errors.ErrInvalidBeginningOfValue(s.buf[s.cursor], s.totalOffset())
}
func (d *funcDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsafe.Pointer) (int64, error) {
@@ -137,5 +137,5 @@ func (d *funcDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsafe.
}
}
}
- return 0, errors.ErrNotAtBeginningOfValue(start)
+ return cursor, errors.ErrInvalidBeginningOfValue(buf[cursor], cursor)
}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/int.go b/vendor/github.com/goccy/go-json/internal/decoder/int.go
index 7edfb0411..509b753d6 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/int.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/int.go
@@ -192,15 +192,15 @@ func (d *intDecoder) DecodeStream(s *Stream, depth int64, p unsafe.Pointer) erro
}
switch d.kind {
case reflect.Int8:
- if i64 <= -1*(1<<7) || (1<<7) <= i64 {
+ if i64 < -1*(1<<7) || (1<<7) <= i64 {
return d.typeError(bytes, s.totalOffset())
}
case reflect.Int16:
- if i64 <= -1*(1<<15) || (1<<15) <= i64 {
+ if i64 < -1*(1<<15) || (1<<15) <= i64 {
return d.typeError(bytes, s.totalOffset())
}
case reflect.Int32:
- if i64 <= -1*(1<<31) || (1<<31) <= i64 {
+ if i64 < -1*(1<<31) || (1<<31) <= i64 {
return d.typeError(bytes, s.totalOffset())
}
}
@@ -225,15 +225,15 @@ func (d *intDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsafe.P
}
switch d.kind {
case reflect.Int8:
- if i64 <= -1*(1<<7) || (1<<7) <= i64 {
+ if i64 < -1*(1<<7) || (1<<7) <= i64 {
return 0, d.typeError(bytes, cursor)
}
case reflect.Int16:
- if i64 <= -1*(1<<15) || (1<<15) <= i64 {
+ if i64 < -1*(1<<15) || (1<<15) <= i64 {
return 0, d.typeError(bytes, cursor)
}
case reflect.Int32:
- if i64 <= -1*(1<<31) || (1<<31) <= i64 {
+ if i64 < -1*(1<<31) || (1<<31) <= i64 {
return 0, d.typeError(bytes, cursor)
}
}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/interface.go b/vendor/github.com/goccy/go-json/internal/decoder/interface.go
index ea1b4aa57..4dbb4be4a 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/interface.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/interface.go
@@ -277,7 +277,7 @@ func (d *interfaceDecoder) decodeStreamEmptyInterface(s *Stream, depth int64, p
}
break
}
- return errors.ErrNotAtBeginningOfValue(s.totalOffset())
+ return errors.ErrInvalidBeginningOfValue(c, s.totalOffset())
}
type emptyInterface struct {
@@ -454,5 +454,5 @@ func (d *interfaceDecoder) decodeEmptyInterface(ctx *RuntimeContext, cursor, dep
**(**interface{})(unsafe.Pointer(&p)) = nil
return cursor, nil
}
- return cursor, errors.ErrNotAtBeginningOfValue(cursor)
+ return cursor, errors.ErrInvalidBeginningOfValue(buf[cursor], cursor)
}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/invalid.go b/vendor/github.com/goccy/go-json/internal/decoder/invalid.go
new file mode 100644
index 000000000..1ef50a7d3
--- /dev/null
+++ b/vendor/github.com/goccy/go-json/internal/decoder/invalid.go
@@ -0,0 +1,45 @@
+package decoder
+
+import (
+ "reflect"
+ "unsafe"
+
+ "github.com/goccy/go-json/internal/errors"
+ "github.com/goccy/go-json/internal/runtime"
+)
+
+type invalidDecoder struct {
+ typ *runtime.Type
+ kind reflect.Kind
+ structName string
+ fieldName string
+}
+
+func newInvalidDecoder(typ *runtime.Type, structName, fieldName string) *invalidDecoder {
+ return &invalidDecoder{
+ typ: typ,
+ kind: typ.Kind(),
+ structName: structName,
+ fieldName: fieldName,
+ }
+}
+
+func (d *invalidDecoder) DecodeStream(s *Stream, depth int64, p unsafe.Pointer) error {
+ return &errors.UnmarshalTypeError{
+ Value: "object",
+ Type: runtime.RType2Type(d.typ),
+ Offset: s.totalOffset(),
+ Struct: d.structName,
+ Field: d.fieldName,
+ }
+}
+
+func (d *invalidDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsafe.Pointer) (int64, error) {
+ return 0, &errors.UnmarshalTypeError{
+ Value: "object",
+ Type: runtime.RType2Type(d.typ),
+ Offset: cursor,
+ Struct: d.structName,
+ Field: d.fieldName,
+ }
+}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/map.go b/vendor/github.com/goccy/go-json/internal/decoder/map.go
index dd480e168..cb55ef006 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/map.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/map.go
@@ -9,29 +9,42 @@ import (
)
type mapDecoder struct {
- mapType *runtime.Type
- keyType *runtime.Type
- valueType *runtime.Type
- stringKeyType bool
- keyDecoder Decoder
- valueDecoder Decoder
- structName string
- fieldName string
+ mapType *runtime.Type
+ keyType *runtime.Type
+ valueType *runtime.Type
+ canUseAssignFaststrType bool
+ keyDecoder Decoder
+ valueDecoder Decoder
+ structName string
+ fieldName string
}
func newMapDecoder(mapType *runtime.Type, keyType *runtime.Type, keyDec Decoder, valueType *runtime.Type, valueDec Decoder, structName, fieldName string) *mapDecoder {
return &mapDecoder{
- mapType: mapType,
- keyDecoder: keyDec,
- keyType: keyType,
- stringKeyType: keyType.Kind() == reflect.String,
- valueType: valueType,
- valueDecoder: valueDec,
- structName: structName,
- fieldName: fieldName,
+ mapType: mapType,
+ keyDecoder: keyDec,
+ keyType: keyType,
+ canUseAssignFaststrType: canUseAssignFaststrType(keyType, valueType),
+ valueType: valueType,
+ valueDecoder: valueDec,
+ structName: structName,
+ fieldName: fieldName,
}
}
+const (
+ mapMaxElemSize = 128
+)
+
+// See detail: https://github.com/goccy/go-json/pull/283
+func canUseAssignFaststrType(key *runtime.Type, value *runtime.Type) bool {
+ indirectElem := value.Size() > mapMaxElemSize
+ if indirectElem {
+ return false
+ }
+ return key.Kind() == reflect.String
+}
+
//go:linkname makemap reflect.makemap
func makemap(*runtime.Type, int) unsafe.Pointer
@@ -45,8 +58,8 @@ func mapassign_faststr(t *runtime.Type, m unsafe.Pointer, s string) unsafe.Point
func mapassign(t *runtime.Type, m unsafe.Pointer, k, v unsafe.Pointer)
func (d *mapDecoder) mapassign(t *runtime.Type, m, k, v unsafe.Pointer) {
- if d.stringKeyType {
- mapV := mapassign_faststr(d.mapType, m, *(*string)(k))
+ if d.canUseAssignFaststrType {
+ mapV := mapassign_faststr(t, m, *(*string)(k))
typedmemmove(d.valueType, mapV, v)
} else {
mapassign(t, m, k, v)
@@ -74,13 +87,13 @@ func (d *mapDecoder) DecodeStream(s *Stream, depth int64, p unsafe.Pointer) erro
if mapValue == nil {
mapValue = makemap(d.mapType, 0)
}
- if s.buf[s.cursor+1] == '}' {
+ s.cursor++
+ if s.equalChar('}') {
*(*unsafe.Pointer)(p) = mapValue
- s.cursor += 2
+ s.cursor++
return nil
}
for {
- s.cursor++
k := unsafe_New(d.keyType)
if err := d.keyDecoder.DecodeStream(s, depth, k); err != nil {
return err
@@ -104,6 +117,7 @@ func (d *mapDecoder) DecodeStream(s *Stream, depth int64, p unsafe.Pointer) erro
if !s.equalChar(',') {
return errors.ErrExpected("comma after object value", s.totalOffset())
}
+ s.cursor++
}
}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/number.go b/vendor/github.com/goccy/go-json/internal/decoder/number.go
index c50d62b99..bf63773e3 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/number.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/number.go
@@ -52,6 +52,7 @@ func (d *numberDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsaf
}
func (d *numberDecoder) decodeStreamByte(s *Stream) ([]byte, error) {
+ start := s.cursor
for {
switch s.char() {
case ' ', '\n', '\t', '\r':
@@ -76,6 +77,9 @@ func (d *numberDecoder) decodeStreamByte(s *Stream) ([]byte, error) {
}
}
ERROR:
+ if s.cursor == start {
+ return nil, errors.ErrInvalidBeginningOfValue(s.char(), s.totalOffset())
+ }
return nil, errors.ErrUnexpectedEndOfJSON("json.Number", s.totalOffset())
}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/slice.go b/vendor/github.com/goccy/go-json/internal/decoder/slice.go
index 853a555ec..85b6e1119 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/slice.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/slice.go
@@ -9,6 +9,13 @@ import (
"github.com/goccy/go-json/internal/runtime"
)
+var (
+ sliceType = runtime.Type2RType(
+ reflect.TypeOf((*sliceHeader)(nil)).Elem(),
+ )
+ nilSlice = unsafe.Pointer(&sliceHeader{})
+)
+
type sliceDecoder struct {
elemType *runtime.Type
isElemPointerType bool
@@ -107,7 +114,7 @@ func (d *sliceDecoder) DecodeStream(s *Stream, depth int64, p unsafe.Pointer) er
if err := nullBytes(s); err != nil {
return err
}
- *(*unsafe.Pointer)(p) = nil
+ typedmemmove(sliceType, p, nilSlice)
return nil
case '[':
s.cursor++
@@ -216,7 +223,7 @@ func (d *sliceDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsafe
return 0, err
}
cursor += 4
- *(*unsafe.Pointer)(p) = nil
+ typedmemmove(sliceType, p, nilSlice)
return cursor, nil
case '[':
cursor++
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/stream.go b/vendor/github.com/goccy/go-json/internal/decoder/stream.go
index c27468348..332d47d89 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/stream.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/stream.go
@@ -103,7 +103,7 @@ func (s *Stream) statForRetry() ([]byte, int64, unsafe.Pointer) {
func (s *Stream) Reset() {
s.reset()
- s.bufSize = initBufSize
+ s.bufSize = int64(len(s.buf))
}
func (s *Stream) More() bool {
@@ -423,7 +423,6 @@ func (s *Stream) skipValue(depth int64) error {
continue
} else if c == nul {
if s.read() {
- s.cursor-- // for retry current character
_, cursor, p = s.stat()
continue
}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/string.go b/vendor/github.com/goccy/go-json/internal/decoder/string.go
index 1e1ce157d..a55ac5565 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/string.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/string.go
@@ -1,6 +1,7 @@
package decoder
import (
+ "bytes"
"reflect"
"unicode"
"unicode/utf16"
@@ -170,6 +171,7 @@ RETRY:
s.buf = append(s.buf[:s.cursor-1], s.buf[s.cursor:]...)
s.length--
s.cursor--
+ p = s.bufptr()
return p, nil
}
@@ -238,14 +240,23 @@ func stringBytes(s *Stream) ([]byte, error) {
fallthrough
default:
// multi bytes character
- r, _ := utf8.DecodeRune(s.buf[cursor:])
- b := []byte(string(r))
- if r == utf8.RuneError {
- s.buf = append(append(append([]byte{}, s.buf[:cursor]...), b...), s.buf[cursor+1:]...)
- _, _, p = s.stat()
+ if !utf8.FullRune(s.buf[cursor : len(s.buf)-1]) {
+ s.cursor = cursor
+ if s.read() {
+ _, cursor, p = s.stat()
+ continue
+ }
+ goto ERROR
+ }
+ r, size := utf8.DecodeRune(s.buf[cursor:])
+ if r == utf8.RuneError {
+ s.buf = append(append(append([]byte{}, s.buf[:cursor]...), runeErrBytes...), s.buf[cursor+1:]...)
+ cursor += runeErrBytesLen
+ s.length += runeErrBytesLen
+ _, _, p = s.stat()
+ } else {
+ cursor += int64(size)
}
- cursor += int64(len(b))
- s.length += int64(len(b))
continue
}
cursor++
@@ -280,7 +291,7 @@ func (d *stringDecoder) decodeStreamByte(s *Stream) ([]byte, error) {
}
break
}
- return nil, errors.ErrNotAtBeginningOfValue(s.totalOffset())
+ return nil, errors.ErrInvalidBeginningOfValue(s.char(), s.totalOffset())
}
func (d *stringDecoder) decodeByte(buf []byte, cursor int64) ([]byte, int64, error) {
@@ -298,49 +309,30 @@ func (d *stringDecoder) decodeByte(buf []byte, cursor int64) ([]byte, int64, err
cursor++
start := cursor
b := (*sliceHeader)(unsafe.Pointer(&buf)).data
+ escaped := 0
for {
switch char(b, cursor) {
case '\\':
+ escaped++
cursor++
switch char(b, cursor) {
- case '"':
- buf[cursor] = '"'
- buf = append(buf[:cursor-1], buf[cursor:]...)
- case '\\':
- buf[cursor] = '\\'
- buf = append(buf[:cursor-1], buf[cursor:]...)
- case '/':
- buf[cursor] = '/'
- buf = append(buf[:cursor-1], buf[cursor:]...)
- case 'b':
- buf[cursor] = '\b'
- buf = append(buf[:cursor-1], buf[cursor:]...)
- case 'f':
- buf[cursor] = '\f'
- buf = append(buf[:cursor-1], buf[cursor:]...)
- case 'n':
- buf[cursor] = '\n'
- buf = append(buf[:cursor-1], buf[cursor:]...)
- case 'r':
- buf[cursor] = '\r'
- buf = append(buf[:cursor-1], buf[cursor:]...)
- case 't':
- buf[cursor] = '\t'
- buf = append(buf[:cursor-1], buf[cursor:]...)
+ case '"', '\\', '/', 'b', 'f', 'n', 'r', 't':
+ cursor++
case 'u':
buflen := int64(len(buf))
if cursor+5 >= buflen {
return nil, 0, errors.ErrUnexpectedEndOfJSON("escaped string", cursor)
}
- code := unicodeToRune(buf[cursor+1 : cursor+5])
- unicode := []byte(string(code))
- buf = append(append(buf[:cursor-1], unicode...), buf[cursor+5:]...)
+ cursor += 5
default:
return nil, 0, errors.ErrUnexpectedEndOfJSON("escaped string", cursor)
}
continue
case '"':
literal := buf[start:cursor]
+ if escaped > 0 {
+ literal = literal[:unescapeString(literal)]
+ }
cursor++
return literal, cursor, nil
case nul:
@@ -355,7 +347,68 @@ func (d *stringDecoder) decodeByte(buf []byte, cursor int64) ([]byte, int64, err
cursor += 4
return nil, cursor, nil
default:
- return nil, 0, errors.ErrNotAtBeginningOfValue(cursor)
+ return nil, 0, errors.ErrInvalidBeginningOfValue(buf[cursor], cursor)
}
}
}
+
+var unescapeMap = [256]byte{
+ '"': '"',
+ '\\': '\\',
+ '/': '/',
+ 'b': '\b',
+ 'f': '\f',
+ 'n': '\n',
+ 'r': '\r',
+ 't': '\t',
+}
+
+func unsafeAdd(ptr unsafe.Pointer, offset int) unsafe.Pointer {
+ return unsafe.Pointer(uintptr(ptr) + uintptr(offset))
+}
+
+func unescapeString(buf []byte) int {
+ p := (*sliceHeader)(unsafe.Pointer(&buf)).data
+ end := unsafeAdd(p, len(buf))
+ src := unsafeAdd(p, bytes.IndexByte(buf, '\\'))
+ dst := src
+ for src != end {
+ c := char(src, 0)
+ if c == '\\' {
+ escapeChar := char(src, 1)
+ if escapeChar != 'u' {
+ *(*byte)(dst) = unescapeMap[escapeChar]
+ src = unsafeAdd(src, 2)
+ dst = unsafeAdd(dst, 1)
+ } else {
+ v1 := hexToInt[char(src, 2)]
+ v2 := hexToInt[char(src, 3)]
+ v3 := hexToInt[char(src, 4)]
+ v4 := hexToInt[char(src, 5)]
+ code := rune((v1 << 12) | (v2 << 8) | (v3 << 4) | v4)
+ var b [utf8.UTFMax]byte
+ n := utf8.EncodeRune(b[:], code)
+ switch n {
+ case 4:
+ *(*byte)(unsafeAdd(dst, 3)) = b[3]
+ fallthrough
+ case 3:
+ *(*byte)(unsafeAdd(dst, 2)) = b[2]
+ fallthrough
+ case 2:
+ *(*byte)(unsafeAdd(dst, 1)) = b[1]
+ fallthrough
+ case 1:
+ *(*byte)(unsafeAdd(dst, 0)) = b[0]
+ }
+ src = unsafeAdd(src, 6)
+ dst = unsafeAdd(dst, n)
+ }
+ } else {
+ *(*byte)(dst) = c
+ src = unsafeAdd(src, 1)
+ dst = unsafeAdd(dst, 1)
+ }
+ }
+ return int(uintptr(dst) - uintptr(p))
+}
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/struct.go b/vendor/github.com/goccy/go-json/internal/decoder/struct.go
index d467b0d25..2c6468045 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/struct.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/struct.go
@@ -261,7 +261,7 @@ func decodeKeyByBitmapUint8(d *structDecoder, buf []byte, cursor int64) (int64,
cursor++
}
default:
- return cursor, nil, errors.ErrNotAtBeginningOfValue(cursor)
+ return cursor, nil, errors.ErrInvalidBeginningOfValue(char(b, cursor), cursor)
}
}
}
@@ -324,7 +324,7 @@ func decodeKeyByBitmapUint16(d *structDecoder, buf []byte, cursor int64) (int64,
cursor++
}
default:
- return cursor, nil, errors.ErrNotAtBeginningOfValue(cursor)
+ return cursor, nil, errors.ErrInvalidBeginningOfValue(char(b, cursor), cursor)
}
}
}
@@ -376,7 +376,7 @@ func decodeKeyByBitmapUint8Stream(d *structDecoder, s *Stream) (*structFieldSet,
_, cursor, p = s.stat()
continue
}
- return nil, "", errors.ErrNotAtBeginningOfValue(s.totalOffset())
+ return nil, "", errors.ErrInvalidBeginningOfValue(char(p, cursor), s.totalOffset())
case '"':
cursor++
FIRST_CHAR:
@@ -443,7 +443,7 @@ func decodeKeyByBitmapUint8Stream(d *structDecoder, s *Stream) (*structFieldSet,
cursor++
}
default:
- return nil, "", errors.ErrNotAtBeginningOfValue(s.totalOffset())
+ return nil, "", errors.ErrInvalidBeginningOfValue(char(p, cursor), s.totalOffset())
}
}
}
@@ -463,7 +463,7 @@ func decodeKeyByBitmapUint16Stream(d *structDecoder, s *Stream) (*structFieldSet
_, cursor, p = s.stat()
continue
}
- return nil, "", errors.ErrNotAtBeginningOfValue(s.totalOffset())
+ return nil, "", errors.ErrInvalidBeginningOfValue(char(p, cursor), s.totalOffset())
case '"':
cursor++
FIRST_CHAR:
@@ -530,7 +530,7 @@ func decodeKeyByBitmapUint16Stream(d *structDecoder, s *Stream) (*structFieldSet
cursor++
}
default:
- return nil, "", errors.ErrNotAtBeginningOfValue(s.totalOffset())
+ return nil, "", errors.ErrInvalidBeginningOfValue(char(p, cursor), s.totalOffset())
}
}
}
@@ -653,7 +653,7 @@ func (d *structDecoder) DecodeStream(s *Stream, depth int64, p unsafe.Pointer) e
return nil
default:
if s.char() != '{' {
- return errors.ErrNotAtBeginningOfValue(s.totalOffset())
+ return errors.ErrInvalidBeginningOfValue(s.char(), s.totalOffset())
}
}
s.cursor++
@@ -740,7 +740,7 @@ func (d *structDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsaf
return cursor, nil
case '{':
default:
- return 0, errors.ErrNotAtBeginningOfValue(cursor)
+ return 0, errors.ErrInvalidBeginningOfValue(char(b, cursor), cursor)
}
cursor++
cursor = skipWhiteSpace(buf, cursor)
diff --git a/vendor/github.com/goccy/go-json/internal/decoder/unmarshal_json.go b/vendor/github.com/goccy/go-json/internal/decoder/unmarshal_json.go
index d90f39cc5..e9b25c68f 100644
--- a/vendor/github.com/goccy/go-json/internal/decoder/unmarshal_json.go
+++ b/vendor/github.com/goccy/go-json/internal/decoder/unmarshal_json.go
@@ -1,6 +1,7 @@
package decoder
import (
+ "context"
"encoding/json"
"unsafe"
@@ -46,13 +47,20 @@ func (d *unmarshalJSONDecoder) DecodeStream(s *Stream, depth int64, p unsafe.Poi
typ: d.typ,
ptr: p,
}))
- if (s.Option.Flags & ContextOption) != 0 {
- if err := v.(unmarshalerContext).UnmarshalJSON(s.Option.Context, dst); err != nil {
+ switch v := v.(type) {
+ case unmarshalerContext:
+ var ctx context.Context
+ if (s.Option.Flags & ContextOption) != 0 {
+ ctx = s.Option.Context
+ } else {
+ ctx = context.Background()
+ }
+ if err := v.UnmarshalJSON(ctx, dst); err != nil {
d.annotateError(s.cursor, err)
return err
}
- } else {
- if err := v.(json.Unmarshaler).UnmarshalJSON(dst); err != nil {
+ case json.Unmarshaler:
+ if err := v.UnmarshalJSON(dst); err != nil {
d.annotateError(s.cursor, err)
return err
}
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/code.go b/vendor/github.com/goccy/go-json/internal/encoder/code.go
new file mode 100644
index 000000000..a00e38a96
--- /dev/null
+++ b/vendor/github.com/goccy/go-json/internal/encoder/code.go
@@ -0,0 +1,1005 @@
+package encoder
+
+import (
+ "fmt"
+ "unsafe"
+
+ "github.com/goccy/go-json/internal/runtime"
+)
+
+type Code interface {
+ Kind() CodeKind
+ ToOpcode(*compileContext) Opcodes
+ Filter(*FieldQuery) Code
+}
+
+type AnonymousCode interface {
+ ToAnonymousOpcode(*compileContext) Opcodes
+}
+
+type Opcodes []*Opcode
+
+func (o Opcodes) First() *Opcode {
+ if len(o) == 0 {
+ return nil
+ }
+ return o[0]
+}
+
+func (o Opcodes) Last() *Opcode {
+ if len(o) == 0 {
+ return nil
+ }
+ return o[len(o)-1]
+}
+
+func (o Opcodes) Add(codes ...*Opcode) Opcodes {
+ return append(o, codes...)
+}
+
+type CodeKind int
+
+const (
+ CodeKindInterface CodeKind = iota
+ CodeKindPtr
+ CodeKindInt
+ CodeKindUint
+ CodeKindFloat
+ CodeKindString
+ CodeKindBool
+ CodeKindStruct
+ CodeKindMap
+ CodeKindSlice
+ CodeKindArray
+ CodeKindBytes
+ CodeKindMarshalJSON
+ CodeKindMarshalText
+ CodeKindRecursive
+)
+
+type IntCode struct {
+ typ *runtime.Type
+ bitSize uint8
+ isString bool
+ isPtr bool
+}
+
+func (c *IntCode) Kind() CodeKind {
+ return CodeKindInt
+}
+
+func (c *IntCode) ToOpcode(ctx *compileContext) Opcodes {
+ var code *Opcode
+ switch {
+ case c.isPtr:
+ code = newOpCode(ctx, c.typ, OpIntPtr)
+ case c.isString:
+ code = newOpCode(ctx, c.typ, OpIntString)
+ default:
+ code = newOpCode(ctx, c.typ, OpInt)
+ }
+ code.NumBitSize = c.bitSize
+ ctx.incIndex()
+ return Opcodes{code}
+}
+
+func (c *IntCode) Filter(_ *FieldQuery) Code {
+ return c
+}
+
+type UintCode struct {
+ typ *runtime.Type
+ bitSize uint8
+ isString bool
+ isPtr bool
+}
+
+func (c *UintCode) Kind() CodeKind {
+ return CodeKindUint
+}
+
+func (c *UintCode) ToOpcode(ctx *compileContext) Opcodes {
+ var code *Opcode
+ switch {
+ case c.isPtr:
+ code = newOpCode(ctx, c.typ, OpUintPtr)
+ case c.isString:
+ code = newOpCode(ctx, c.typ, OpUintString)
+ default:
+ code = newOpCode(ctx, c.typ, OpUint)
+ }
+ code.NumBitSize = c.bitSize
+ ctx.incIndex()
+ return Opcodes{code}
+}
+
+func (c *UintCode) Filter(_ *FieldQuery) Code {
+ return c
+}
+
+type FloatCode struct {
+ typ *runtime.Type
+ bitSize uint8
+ isPtr bool
+}
+
+func (c *FloatCode) Kind() CodeKind {
+ return CodeKindFloat
+}
+
+func (c *FloatCode) ToOpcode(ctx *compileContext) Opcodes {
+ var code *Opcode
+ switch {
+ case c.isPtr:
+ switch c.bitSize {
+ case 32:
+ code = newOpCode(ctx, c.typ, OpFloat32Ptr)
+ default:
+ code = newOpCode(ctx, c.typ, OpFloat64Ptr)
+ }
+ default:
+ switch c.bitSize {
+ case 32:
+ code = newOpCode(ctx, c.typ, OpFloat32)
+ default:
+ code = newOpCode(ctx, c.typ, OpFloat64)
+ }
+ }
+ ctx.incIndex()
+ return Opcodes{code}
+}
+
+func (c *FloatCode) Filter(_ *FieldQuery) Code {
+ return c
+}
+
+type StringCode struct {
+ typ *runtime.Type
+ isPtr bool
+}
+
+func (c *StringCode) Kind() CodeKind {
+ return CodeKindString
+}
+
+func (c *StringCode) ToOpcode(ctx *compileContext) Opcodes {
+ isJSONNumberType := c.typ == runtime.Type2RType(jsonNumberType)
+ var code *Opcode
+ if c.isPtr {
+ if isJSONNumberType {
+ code = newOpCode(ctx, c.typ, OpNumberPtr)
+ } else {
+ code = newOpCode(ctx, c.typ, OpStringPtr)
+ }
+ } else {
+ if isJSONNumberType {
+ code = newOpCode(ctx, c.typ, OpNumber)
+ } else {
+ code = newOpCode(ctx, c.typ, OpString)
+ }
+ }
+ ctx.incIndex()
+ return Opcodes{code}
+}
+
+func (c *StringCode) Filter(_ *FieldQuery) Code {
+ return c
+}
+
+type BoolCode struct {
+ typ *runtime.Type
+ isPtr bool
+}
+
+func (c *BoolCode) Kind() CodeKind {
+ return CodeKindBool
+}
+
+func (c *BoolCode) ToOpcode(ctx *compileContext) Opcodes {
+ var code *Opcode
+ switch {
+ case c.isPtr:
+ code = newOpCode(ctx, c.typ, OpBoolPtr)
+ default:
+ code = newOpCode(ctx, c.typ, OpBool)
+ }
+ ctx.incIndex()
+ return Opcodes{code}
+}
+
+func (c *BoolCode) Filter(_ *FieldQuery) Code {
+ return c
+}
+
+type BytesCode struct {
+ typ *runtime.Type
+ isPtr bool
+}
+
+func (c *BytesCode) Kind() CodeKind {
+ return CodeKindBytes
+}
+
+func (c *BytesCode) ToOpcode(ctx *compileContext) Opcodes {
+ var code *Opcode
+ switch {
+ case c.isPtr:
+ code = newOpCode(ctx, c.typ, OpBytesPtr)
+ default:
+ code = newOpCode(ctx, c.typ, OpBytes)
+ }
+ ctx.incIndex()
+ return Opcodes{code}
+}
+
+func (c *BytesCode) Filter(_ *FieldQuery) Code {
+ return c
+}
+
+type SliceCode struct {
+ typ *runtime.Type
+ value Code
+}
+
+func (c *SliceCode) Kind() CodeKind {
+ return CodeKindSlice
+}
+
+func (c *SliceCode) ToOpcode(ctx *compileContext) Opcodes {
+ // header => opcode => elem => end
+ // ^ |
+ // |________|
+ size := c.typ.Elem().Size()
+ header := newSliceHeaderCode(ctx, c.typ)
+ ctx.incIndex()
+
+ ctx.incIndent()
+ codes := c.value.ToOpcode(ctx)
+ ctx.decIndent()
+
+ codes.First().Flags |= IndirectFlags
+ elemCode := newSliceElemCode(ctx, c.typ.Elem(), header, size)
+ ctx.incIndex()
+ end := newOpCode(ctx, c.typ, OpSliceEnd)
+ ctx.incIndex()
+ header.End = end
+ header.Next = codes.First()
+ codes.Last().Next = elemCode
+ elemCode.Next = codes.First()
+ elemCode.End = end
+ return Opcodes{header}.Add(codes...).Add(elemCode).Add(end)
+}
+
+func (c *SliceCode) Filter(_ *FieldQuery) Code {
+ return c
+}
+
+type ArrayCode struct {
+ typ *runtime.Type
+ value Code
+}
+
+func (c *ArrayCode) Kind() CodeKind {
+ return CodeKindArray
+}
+
+func (c *ArrayCode) ToOpcode(ctx *compileContext) Opcodes {
+ // header => opcode => elem => end
+ // ^ |
+ // |________|
+ elem := c.typ.Elem()
+ alen := c.typ.Len()
+ size := elem.Size()
+
+ header := newArrayHeaderCode(ctx, c.typ, alen)
+ ctx.incIndex()
+
+ ctx.incIndent()
+ codes := c.value.ToOpcode(ctx)
+ ctx.decIndent()
+
+ codes.First().Flags |= IndirectFlags
+
+ elemCode := newArrayElemCode(ctx, elem, header, alen, size)
+ ctx.incIndex()
+
+ end := newOpCode(ctx, c.typ, OpArrayEnd)
+ ctx.incIndex()
+
+ header.End = end
+ header.Next = codes.First()
+ codes.Last().Next = elemCode
+ elemCode.Next = codes.First()
+ elemCode.End = end
+
+ return Opcodes{header}.Add(codes...).Add(elemCode).Add(end)
+}
+
+func (c *ArrayCode) Filter(_ *FieldQuery) Code {
+ return c
+}
+
+type MapCode struct {
+ typ *runtime.Type
+ key Code
+ value Code
+}
+
+func (c *MapCode) Kind() CodeKind {
+ return CodeKindMap
+}
+
+func (c *MapCode) ToOpcode(ctx *compileContext) Opcodes {
+ // header => code => value => code => key => code => value => code => end
+ // ^ |
+ // |_______________________|
+ header := newMapHeaderCode(ctx, c.typ)
+ ctx.incIndex()
+
+ keyCodes := c.key.ToOpcode(ctx)
+
+ value := newMapValueCode(ctx, c.typ.Elem(), header)
+ ctx.incIndex()
+
+ ctx.incIndent()
+ valueCodes := c.value.ToOpcode(ctx)
+ ctx.decIndent()
+
+ valueCodes.First().Flags |= IndirectFlags
+
+ key := newMapKeyCode(ctx, c.typ.Key(), header)
+ ctx.incIndex()
+
+ end := newMapEndCode(ctx, c.typ, header)
+ ctx.incIndex()
+
+ header.Next = keyCodes.First()
+ keyCodes.Last().Next = value
+ value.Next = valueCodes.First()
+ valueCodes.Last().Next = key
+ key.Next = keyCodes.First()
+
+ header.End = end
+ key.End = end
+ value.End = end
+ return Opcodes{header}.Add(keyCodes...).Add(value).Add(valueCodes...).Add(key).Add(end)
+}
+
+func (c *MapCode) Filter(_ *FieldQuery) Code {
+ return c
+}
+
+type StructCode struct {
+ typ *runtime.Type
+ fields []*StructFieldCode
+ isPtr bool
+ disableIndirectConversion bool
+ isIndirect bool
+ isRecursive bool
+}
+
+func (c *StructCode) Kind() CodeKind {
+ return CodeKindStruct
+}
+
+func (c *StructCode) lastFieldCode(field *StructFieldCode, firstField *Opcode) *Opcode {
+ if field.isAnonymous {
+ return c.lastAnonymousFieldCode(firstField)
+ }
+ lastField := firstField
+ for lastField.NextField != nil {
+ lastField = lastField.NextField
+ }
+ return lastField
+}
+
+func (c *StructCode) lastAnonymousFieldCode(firstField *Opcode) *Opcode {
+ // firstField is special StructHead operation for anonymous structure.
+ // So, StructHead's next operation is truly struct head operation.
+ lastField := firstField.Next
+ for lastField.NextField != nil {
+ lastField = lastField.NextField
+ }
+ return lastField
+}
+
+func (c *StructCode) ToOpcode(ctx *compileContext) Opcodes {
+ // header => code => structField => code => end
+ // ^ |
+ // |__________|
+ if c.isRecursive {
+ recursive := newRecursiveCode(ctx, c.typ, &CompiledCode{})
+ recursive.Type = c.typ
+ ctx.incIndex()
+ *ctx.recursiveCodes = append(*ctx.recursiveCodes, recursive)
+ return Opcodes{recursive}
+ }
+ codes := Opcodes{}
+ var prevField *Opcode
+ ctx.incIndent()
+ for idx, field := range c.fields {
+ isFirstField := idx == 0
+ isEndField := idx == len(c.fields)-1
+ fieldCodes := field.ToOpcode(ctx, isFirstField, isEndField)
+ for _, code := range fieldCodes {
+ if c.isIndirect {
+ code.Flags |= IndirectFlags
+ }
+ }
+ firstField := fieldCodes.First()
+ if len(codes) > 0 {
+ codes.Last().Next = firstField
+ firstField.Idx = codes.First().Idx
+ }
+ if prevField != nil {
+ prevField.NextField = firstField
+ }
+ if isEndField {
+ endField := fieldCodes.Last()
+ if field.isAnonymous {
+ firstField.End = endField
+ lastField := c.lastAnonymousFieldCode(firstField)
+ lastField.NextField = endField
+ }
+ if len(codes) > 0 {
+ codes.First().End = endField
+ } else {
+ firstField.End = endField
+ }
+ codes = codes.Add(fieldCodes...)
+ break
+ }
+ prevField = c.lastFieldCode(field, firstField)
+ codes = codes.Add(fieldCodes...)
+ }
+ if len(codes) == 0 {
+ head := &Opcode{
+ Op: OpStructHead,
+ Idx: opcodeOffset(ctx.ptrIndex),
+ Type: c.typ,
+ DisplayIdx: ctx.opcodeIndex,
+ Indent: ctx.indent,
+ }
+ ctx.incOpcodeIndex()
+ end := &Opcode{
+ Op: OpStructEnd,
+ Idx: opcodeOffset(ctx.ptrIndex),
+ DisplayIdx: ctx.opcodeIndex,
+ Indent: ctx.indent,
+ }
+ head.NextField = end
+ head.Next = end
+ head.End = end
+ codes = codes.Add(head, end)
+ ctx.incIndex()
+ }
+ ctx.decIndent()
+ ctx.structTypeToCodes[uintptr(unsafe.Pointer(c.typ))] = codes
+ return codes
+}
+
+func (c *StructCode) ToAnonymousOpcode(ctx *compileContext) Opcodes {
+ // header => code => structField => code => end
+ // ^ |
+ // |__________|
+ if c.isRecursive {
+ recursive := newRecursiveCode(ctx, c.typ, &CompiledCode{})
+ recursive.Type = c.typ
+ ctx.incIndex()
+ *ctx.recursiveCodes = append(*ctx.recursiveCodes, recursive)
+ return Opcodes{recursive}
+ }
+ codes := Opcodes{}
+ var prevField *Opcode
+ for idx, field := range c.fields {
+ isFirstField := idx == 0
+ isEndField := idx == len(c.fields)-1
+ fieldCodes := field.ToAnonymousOpcode(ctx, isFirstField, isEndField)
+ for _, code := range fieldCodes {
+ if c.isIndirect {
+ code.Flags |= IndirectFlags
+ }
+ }
+ firstField := fieldCodes.First()
+ if len(codes) > 0 {
+ codes.Last().Next = firstField
+ firstField.Idx = codes.First().Idx
+ }
+ if prevField != nil {
+ prevField.NextField = firstField
+ }
+ if isEndField {
+ lastField := fieldCodes.Last()
+ if len(codes) > 0 {
+ codes.First().End = lastField
+ } else {
+ firstField.End = lastField
+ }
+ }
+ prevField = firstField
+ codes = codes.Add(fieldCodes...)
+ }
+ return codes
+}
+
+func (c *StructCode) removeFieldsByTags(tags runtime.StructTags) {
+ fields := make([]*StructFieldCode, 0, len(c.fields))
+ for _, field := range c.fields {
+ if field.isAnonymous {
+ structCode := field.getAnonymousStruct()
+ if structCode != nil && !structCode.isRecursive {
+ structCode.removeFieldsByTags(tags)
+ if len(structCode.fields) > 0 {
+ fields = append(fields, field)
+ }
+ continue
+ }
+ }
+ if tags.ExistsKey(field.key) {
+ continue
+ }
+ fields = append(fields, field)
+ }
+ c.fields = fields
+}
+
+func (c *StructCode) enableIndirect() {
+ if c.isIndirect {
+ return
+ }
+ c.isIndirect = true
+ if len(c.fields) == 0 {
+ return
+ }
+ structCode := c.fields[0].getStruct()
+ if structCode == nil {
+ return
+ }
+ structCode.enableIndirect()
+}
+
+func (c *StructCode) Filter(query *FieldQuery) Code {
+ fieldMap := map[string]*FieldQuery{}
+ for _, field := range query.Fields {
+ fieldMap[field.Name] = field
+ }
+ fields := make([]*StructFieldCode, 0, len(c.fields))
+ for _, field := range c.fields {
+ query, exists := fieldMap[field.key]
+ if !exists {
+ continue
+ }
+ fieldCode := &StructFieldCode{
+ typ: field.typ,
+ key: field.key,
+ tag: field.tag,
+ value: field.value,
+ offset: field.offset,
+ isAnonymous: field.isAnonymous,
+ isTaggedKey: field.isTaggedKey,
+ isNilableType: field.isNilableType,
+ isNilCheck: field.isNilCheck,
+ isAddrForMarshaler: field.isAddrForMarshaler,
+ isNextOpPtrType: field.isNextOpPtrType,
+ }
+ if len(query.Fields) > 0 {
+ fieldCode.value = fieldCode.value.Filter(query)
+ }
+ fields = append(fields, fieldCode)
+ }
+ return &StructCode{
+ typ: c.typ,
+ fields: fields,
+ isPtr: c.isPtr,
+ disableIndirectConversion: c.disableIndirectConversion,
+ isIndirect: c.isIndirect,
+ isRecursive: c.isRecursive,
+ }
+}
+
+type StructFieldCode struct {
+ typ *runtime.Type
+ key string
+ tag *runtime.StructTag
+ value Code
+ offset uintptr
+ isAnonymous bool
+ isTaggedKey bool
+ isNilableType bool
+ isNilCheck bool
+ isAddrForMarshaler bool
+ isNextOpPtrType bool
+ isMarshalerContext bool
+}
+
+func (c *StructFieldCode) getStruct() *StructCode {
+ value := c.value
+ ptr, ok := value.(*PtrCode)
+ if ok {
+ value = ptr.value
+ }
+ structCode, ok := value.(*StructCode)
+ if ok {
+ return structCode
+ }
+ return nil
+}
+
+func (c *StructFieldCode) getAnonymousStruct() *StructCode {
+ if !c.isAnonymous {
+ return nil
+ }
+ return c.getStruct()
+}
+
+func optimizeStructHeader(code *Opcode, tag *runtime.StructTag) OpType {
+ headType := code.ToHeaderType(tag.IsString)
+ if tag.IsOmitEmpty {
+ headType = headType.HeadToOmitEmptyHead()
+ }
+ return headType
+}
+
+func optimizeStructField(code *Opcode, tag *runtime.StructTag) OpType {
+ fieldType := code.ToFieldType(tag.IsString)
+ if tag.IsOmitEmpty {
+ fieldType = fieldType.FieldToOmitEmptyField()
+ }
+ return fieldType
+}
+
+func (c *StructFieldCode) headerOpcodes(ctx *compileContext, field *Opcode, valueCodes Opcodes) Opcodes {
+ value := valueCodes.First()
+ op := optimizeStructHeader(value, c.tag)
+ field.Op = op
+ if value.Flags&MarshalerContextFlags != 0 {
+ field.Flags |= MarshalerContextFlags
+ }
+ field.NumBitSize = value.NumBitSize
+ field.PtrNum = value.PtrNum
+ field.FieldQuery = value.FieldQuery
+ fieldCodes := Opcodes{field}
+ if op.IsMultipleOpHead() {
+ field.Next = value
+ fieldCodes = fieldCodes.Add(valueCodes...)
+ } else {
+ ctx.decIndex()
+ }
+ return fieldCodes
+}
+
+func (c *StructFieldCode) fieldOpcodes(ctx *compileContext, field *Opcode, valueCodes Opcodes) Opcodes {
+ value := valueCodes.First()
+ op := optimizeStructField(value, c.tag)
+ field.Op = op
+ if value.Flags&MarshalerContextFlags != 0 {
+ field.Flags |= MarshalerContextFlags
+ }
+ field.NumBitSize = value.NumBitSize
+ field.PtrNum = value.PtrNum
+ field.FieldQuery = value.FieldQuery
+
+ fieldCodes := Opcodes{field}
+ if op.IsMultipleOpField() {
+ field.Next = value
+ fieldCodes = fieldCodes.Add(valueCodes...)
+ } else {
+ ctx.decIndex()
+ }
+ return fieldCodes
+}
+
+func (c *StructFieldCode) addStructEndCode(ctx *compileContext, codes Opcodes) Opcodes {
+ end := &Opcode{
+ Op: OpStructEnd,
+ Idx: opcodeOffset(ctx.ptrIndex),
+ DisplayIdx: ctx.opcodeIndex,
+ Indent: ctx.indent,
+ }
+ codes.Last().Next = end
+ codes.First().NextField = end
+ codes = codes.Add(end)
+ ctx.incOpcodeIndex()
+ return codes
+}
+
+func (c *StructFieldCode) structKey(ctx *compileContext) string {
+ if ctx.escapeKey {
+ rctx := &RuntimeContext{Option: &Option{Flag: HTMLEscapeOption}}
+ return fmt.Sprintf(`%s:`, string(AppendString(rctx, []byte{}, c.key)))
+ }
+ return fmt.Sprintf(`"%s":`, c.key)
+}
+
+func (c *StructFieldCode) flags() OpFlags {
+ var flags OpFlags
+ if c.isTaggedKey {
+ flags |= IsTaggedKeyFlags
+ }
+ if c.isNilableType {
+ flags |= IsNilableTypeFlags
+ }
+ if c.isNilCheck {
+ flags |= NilCheckFlags
+ }
+ if c.isAddrForMarshaler {
+ flags |= AddrForMarshalerFlags
+ }
+ if c.isNextOpPtrType {
+ flags |= IsNextOpPtrTypeFlags
+ }
+ if c.isAnonymous {
+ flags |= AnonymousKeyFlags
+ }
+ if c.isMarshalerContext {
+ flags |= MarshalerContextFlags
+ }
+ return flags
+}
+
+func (c *StructFieldCode) toValueOpcodes(ctx *compileContext) Opcodes {
+ if c.isAnonymous {
+ anonymCode, ok := c.value.(AnonymousCode)
+ if ok {
+ return anonymCode.ToAnonymousOpcode(ctx)
+ }
+ }
+ return c.value.ToOpcode(ctx)
+}
+
+func (c *StructFieldCode) ToOpcode(ctx *compileContext, isFirstField, isEndField bool) Opcodes {
+ field := &Opcode{
+ Idx: opcodeOffset(ctx.ptrIndex),
+ Flags: c.flags(),
+ Key: c.structKey(ctx),
+ Offset: uint32(c.offset),
+ Type: c.typ,
+ DisplayIdx: ctx.opcodeIndex,
+ Indent: ctx.indent,
+ DisplayKey: c.key,
+ }
+ ctx.incIndex()
+ valueCodes := c.toValueOpcodes(ctx)
+ if isFirstField {
+ codes := c.headerOpcodes(ctx, field, valueCodes)
+ if isEndField {
+ codes = c.addStructEndCode(ctx, codes)
+ }
+ return codes
+ }
+ codes := c.fieldOpcodes(ctx, field, valueCodes)
+ if isEndField {
+ if isEnableStructEndOptimization(c.value) {
+ field.Op = field.Op.FieldToEnd()
+ } else {
+ codes = c.addStructEndCode(ctx, codes)
+ }
+ }
+ return codes
+}
+
+func (c *StructFieldCode) ToAnonymousOpcode(ctx *compileContext, isFirstField, isEndField bool) Opcodes {
+ field := &Opcode{
+ Idx: opcodeOffset(ctx.ptrIndex),
+ Flags: c.flags() | AnonymousHeadFlags,
+ Key: c.structKey(ctx),
+ Offset: uint32(c.offset),
+ Type: c.typ,
+ DisplayIdx: ctx.opcodeIndex,
+ Indent: ctx.indent,
+ DisplayKey: c.key,
+ }
+ ctx.incIndex()
+ valueCodes := c.toValueOpcodes(ctx)
+ if isFirstField {
+ return c.headerOpcodes(ctx, field, valueCodes)
+ }
+ return c.fieldOpcodes(ctx, field, valueCodes)
+}
+
+func isEnableStructEndOptimization(value Code) bool {
+ switch value.Kind() {
+ case CodeKindInt,
+ CodeKindUint,
+ CodeKindFloat,
+ CodeKindString,
+ CodeKindBool,
+ CodeKindBytes:
+ return true
+ case CodeKindPtr:
+ return isEnableStructEndOptimization(value.(*PtrCode).value)
+ default:
+ return false
+ }
+}
+
+type InterfaceCode struct {
+ typ *runtime.Type
+ fieldQuery *FieldQuery
+ isPtr bool
+}
+
+func (c *InterfaceCode) Kind() CodeKind {
+ return CodeKindInterface
+}
+
+func (c *InterfaceCode) ToOpcode(ctx *compileContext) Opcodes {
+ var code *Opcode
+ switch {
+ case c.isPtr:
+ code = newOpCode(ctx, c.typ, OpInterfacePtr)
+ default:
+ code = newOpCode(ctx, c.typ, OpInterface)
+ }
+ code.FieldQuery = c.fieldQuery
+ if c.typ.NumMethod() > 0 {
+ code.Flags |= NonEmptyInterfaceFlags
+ }
+ ctx.incIndex()
+ return Opcodes{code}
+}
+
+func (c *InterfaceCode) Filter(query *FieldQuery) Code {
+ return &InterfaceCode{
+ typ: c.typ,
+ fieldQuery: query,
+ isPtr: c.isPtr,
+ }
+}
+
+type MarshalJSONCode struct {
+ typ *runtime.Type
+ fieldQuery *FieldQuery
+ isAddrForMarshaler bool
+ isNilableType bool
+ isMarshalerContext bool
+}
+
+func (c *MarshalJSONCode) Kind() CodeKind {
+ return CodeKindMarshalJSON
+}
+
+func (c *MarshalJSONCode) ToOpcode(ctx *compileContext) Opcodes {
+ code := newOpCode(ctx, c.typ, OpMarshalJSON)
+ code.FieldQuery = c.fieldQuery
+ if c.isAddrForMarshaler {
+ code.Flags |= AddrForMarshalerFlags
+ }
+ if c.isMarshalerContext {
+ code.Flags |= MarshalerContextFlags
+ }
+ if c.isNilableType {
+ code.Flags |= IsNilableTypeFlags
+ } else {
+ code.Flags &= ^IsNilableTypeFlags
+ }
+ ctx.incIndex()
+ return Opcodes{code}
+}
+
+func (c *MarshalJSONCode) Filter(query *FieldQuery) Code {
+ return &MarshalJSONCode{
+ typ: c.typ,
+ fieldQuery: query,
+ isAddrForMarshaler: c.isAddrForMarshaler,
+ isNilableType: c.isNilableType,
+ isMarshalerContext: c.isMarshalerContext,
+ }
+}
+
+type MarshalTextCode struct {
+ typ *runtime.Type
+ fieldQuery *FieldQuery
+ isAddrForMarshaler bool
+ isNilableType bool
+}
+
+func (c *MarshalTextCode) Kind() CodeKind {
+ return CodeKindMarshalText
+}
+
+func (c *MarshalTextCode) ToOpcode(ctx *compileContext) Opcodes {
+ code := newOpCode(ctx, c.typ, OpMarshalText)
+ code.FieldQuery = c.fieldQuery
+ if c.isAddrForMarshaler {
+ code.Flags |= AddrForMarshalerFlags
+ }
+ if c.isNilableType {
+ code.Flags |= IsNilableTypeFlags
+ } else {
+ code.Flags &= ^IsNilableTypeFlags
+ }
+ ctx.incIndex()
+ return Opcodes{code}
+}
+
+func (c *MarshalTextCode) Filter(query *FieldQuery) Code {
+ return &MarshalTextCode{
+ typ: c.typ,
+ fieldQuery: query,
+ isAddrForMarshaler: c.isAddrForMarshaler,
+ isNilableType: c.isNilableType,
+ }
+}
+
+type PtrCode struct {
+ typ *runtime.Type
+ value Code
+ ptrNum uint8
+}
+
+func (c *PtrCode) Kind() CodeKind {
+ return CodeKindPtr
+}
+
+func (c *PtrCode) ToOpcode(ctx *compileContext) Opcodes {
+ codes := c.value.ToOpcode(ctx)
+ codes.First().Op = convertPtrOp(codes.First())
+ codes.First().PtrNum = c.ptrNum
+ return codes
+}
+
+func (c *PtrCode) ToAnonymousOpcode(ctx *compileContext) Opcodes {
+ var codes Opcodes
+ anonymCode, ok := c.value.(AnonymousCode)
+ if ok {
+ codes = anonymCode.ToAnonymousOpcode(ctx)
+ } else {
+ codes = c.value.ToOpcode(ctx)
+ }
+ codes.First().Op = convertPtrOp(codes.First())
+ codes.First().PtrNum = c.ptrNum
+ return codes
+}
+
+func (c *PtrCode) Filter(query *FieldQuery) Code {
+ return &PtrCode{
+ typ: c.typ,
+ value: c.value.Filter(query),
+ ptrNum: c.ptrNum,
+ }
+}
+
+func convertPtrOp(code *Opcode) OpType {
+ ptrHeadOp := code.Op.HeadToPtrHead()
+ if code.Op != ptrHeadOp {
+ if code.PtrNum > 0 {
+ // ptr field and ptr head
+ code.PtrNum--
+ }
+ return ptrHeadOp
+ }
+ switch code.Op {
+ case OpInt:
+ return OpIntPtr
+ case OpUint:
+ return OpUintPtr
+ case OpFloat32:
+ return OpFloat32Ptr
+ case OpFloat64:
+ return OpFloat64Ptr
+ case OpString:
+ return OpStringPtr
+ case OpBool:
+ return OpBoolPtr
+ case OpBytes:
+ return OpBytesPtr
+ case OpNumber:
+ return OpNumberPtr
+ case OpArray:
+ return OpArrayPtr
+ case OpSlice:
+ return OpSlicePtr
+ case OpMap:
+ return OpMapPtr
+ case OpMarshalJSON:
+ return OpMarshalJSONPtr
+ case OpMarshalText:
+ return OpMarshalTextPtr
+ case OpInterface:
+ return OpInterfacePtr
+ case OpRecursive:
+ return OpRecursivePtr
+ }
+ return code.Op
+}
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/compiler.go b/vendor/github.com/goccy/go-json/internal/encoder/compiler.go
index 01a5d4b28..0eb3d90ff 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/compiler.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/compiler.go
@@ -4,9 +4,7 @@ import (
"context"
"encoding"
"encoding/json"
- "fmt"
"reflect"
- "strings"
"sync/atomic"
"unsafe"
@@ -57,25 +55,68 @@ func compileToGetCodeSetSlowPath(typeptr uintptr) (*OpcodeSet, error) {
if codeSet, exists := opcodeMap[typeptr]; exists {
return codeSet, nil
}
+ codeSet, err := newCompiler().compile(typeptr)
+ if err != nil {
+ return nil, err
+ }
+ storeOpcodeSet(typeptr, codeSet, opcodeMap)
+ return codeSet, nil
+}
+func getFilteredCodeSetIfNeeded(ctx *RuntimeContext, codeSet *OpcodeSet) (*OpcodeSet, error) {
+ if (ctx.Option.Flag & ContextOption) == 0 {
+ return codeSet, nil
+ }
+ query := FieldQueryFromContext(ctx.Option.Context)
+ if query == nil {
+ return codeSet, nil
+ }
+ ctx.Option.Flag |= FieldQueryOption
+ cacheCodeSet := codeSet.getQueryCache(query.Hash())
+ if cacheCodeSet != nil {
+ return cacheCodeSet, nil
+ }
+ queryCodeSet, err := newCompiler().codeToOpcodeSet(codeSet.Type, codeSet.Code.Filter(query))
+ if err != nil {
+ return nil, err
+ }
+ codeSet.setQueryCache(query.Hash(), queryCodeSet)
+ return queryCodeSet, nil
+}
+
+type Compiler struct {
+ structTypeToCode map[uintptr]*StructCode
+}
+
+func newCompiler() *Compiler {
+ return &Compiler{
+ structTypeToCode: map[uintptr]*StructCode{},
+ }
+}
+
+func (c *Compiler) compile(typeptr uintptr) (*OpcodeSet, error) {
// noescape trick for header.typ ( reflect.*rtype )
- copiedType := *(**runtime.Type)(unsafe.Pointer(&typeptr))
+ typ := *(**runtime.Type)(unsafe.Pointer(&typeptr))
+ code, err := c.typeToCode(typ)
+ if err != nil {
+ return nil, err
+ }
+ return c.codeToOpcodeSet(typ, code)
+}
- noescapeKeyCode, err := compileHead(&compileContext{
- typ: copiedType,
- structTypeToCompiledCode: map[uintptr]*CompiledCode{},
- })
- if err != nil {
- return nil, err
- }
- escapeKeyCode, err := compileHead(&compileContext{
- typ: copiedType,
- structTypeToCompiledCode: map[uintptr]*CompiledCode{},
- escapeKey: true,
- })
- if err != nil {
+func (c *Compiler) codeToOpcodeSet(typ *runtime.Type, code Code) (*OpcodeSet, error) {
+ noescapeKeyCode := c.codeToOpcode(&compileContext{
+ structTypeToCodes: map[uintptr]Opcodes{},
+ recursiveCodes: &Opcodes{},
+ }, typ, code)
+ if err := noescapeKeyCode.Validate(); err != nil {
return nil, err
}
+ escapeKeyCode := c.codeToOpcode(&compileContext{
+ structTypeToCodes: map[uintptr]Opcodes{},
+ recursiveCodes: &Opcodes{},
+ escapeKey: true,
+ }, typ, code)
noescapeKeyCode = copyOpcode(noescapeKeyCode)
escapeKeyCode = copyOpcode(escapeKeyCode)
setTotalLengthToInterfaceOp(noescapeKeyCode)
@@ -83,26 +124,25 @@ func compileToGetCodeSetSlowPath(typeptr uintptr) (*OpcodeSet, error) {
interfaceNoescapeKeyCode := copyToInterfaceOpcode(noescapeKeyCode)
interfaceEscapeKeyCode := copyToInterfaceOpcode(escapeKeyCode)
codeLength := noescapeKeyCode.TotalLength()
- codeSet := &OpcodeSet{
- Type: copiedType,
+ return &OpcodeSet{
+ Type: typ,
NoescapeKeyCode: noescapeKeyCode,
EscapeKeyCode: escapeKeyCode,
InterfaceNoescapeKeyCode: interfaceNoescapeKeyCode,
InterfaceEscapeKeyCode: interfaceEscapeKeyCode,
CodeLength: codeLength,
EndCode: ToEndCode(interfaceNoescapeKeyCode),
- }
- storeOpcodeSet(typeptr, codeSet, opcodeMap)
- return codeSet, nil
+ Code: code,
+ QueryCache: map[string]*OpcodeSet{},
+ }, nil
}
-func compileHead(ctx *compileContext) (*Opcode, error) {
- typ := ctx.typ
+func (c *Compiler) typeToCode(typ *runtime.Type) (Code, error) {
switch {
- case implementsMarshalJSON(typ):
- return compileMarshalJSON(ctx)
- case implementsMarshalText(typ):
- return compileMarshalText(ctx)
+ case c.implementsMarshalJSON(typ):
+ return c.marshalJSONCode(typ)
+ case c.implementsMarshalText(typ):
+ return c.marshalTextCode(typ)
}
isPtr := false
@@ -112,262 +152,692 @@ func compileHead(ctx *compileContext) (*Opcode, error) {
isPtr = true
}
switch {
- case implementsMarshalJSON(typ):
- return compileMarshalJSON(ctx)
- case implementsMarshalText(typ):
- return compileMarshalText(ctx)
+ case c.implementsMarshalJSON(typ):
+ return c.marshalJSONCode(orgType)
+ case c.implementsMarshalText(typ):
+ return c.marshalTextCode(orgType)
}
switch typ.Kind() {
case reflect.Slice:
- ctx := ctx.withType(typ)
elem := typ.Elem()
if elem.Kind() == reflect.Uint8 {
p := runtime.PtrTo(elem)
- if !implementsMarshalJSONType(p) && !p.Implements(marshalTextType) {
- if isPtr {
- return compileBytesPtr(ctx)
- }
- return compileBytes(ctx)
+ if !c.implementsMarshalJSONType(p) && !p.Implements(marshalTextType) {
+ return c.bytesCode(typ, isPtr)
}
}
- code, err := compileSlice(ctx)
- if err != nil {
- return nil, err
- }
- optimizeStructEnd(code)
- linkRecursiveCode(code)
- return code, nil
+ return c.sliceCode(typ)
case reflect.Map:
if isPtr {
- return compilePtr(ctx.withType(runtime.PtrTo(typ)))
+ return c.ptrCode(runtime.PtrTo(typ))
}
- code, err := compileMap(ctx.withType(typ))
- if err != nil {
- return nil, err
- }
- optimizeStructEnd(code)
- linkRecursiveCode(code)
- return code, nil
+ return c.mapCode(typ)
case reflect.Struct:
- code, err := compileStruct(ctx.withType(typ), isPtr)
- if err != nil {
- return nil, err
- }
- optimizeStructEnd(code)
- linkRecursiveCode(code)
- return code, nil
+ return c.structCode(typ, isPtr)
case reflect.Int:
- ctx := ctx.withType(typ)
- if isPtr {
- return compileIntPtr(ctx)
- }
- return compileInt(ctx)
+ return c.intCode(typ, isPtr)
case reflect.Int8:
- ctx := ctx.withType(typ)
- if isPtr {
- return compileInt8Ptr(ctx)
- }
- return compileInt8(ctx)
+ return c.int8Code(typ, isPtr)
case reflect.Int16:
- ctx := ctx.withType(typ)
- if isPtr {
- return compileInt16Ptr(ctx)
- }
- return compileInt16(ctx)
+ return c.int16Code(typ, isPtr)
case reflect.Int32:
- ctx := ctx.withType(typ)
- if isPtr {
- return compileInt32Ptr(ctx)
- }
- return compileInt32(ctx)
+ return c.int32Code(typ, isPtr)
case reflect.Int64:
- ctx := ctx.withType(typ)
- if isPtr {
- return compileInt64Ptr(ctx)
- }
- return compileInt64(ctx)
+ return c.int64Code(typ, isPtr)
case reflect.Uint, reflect.Uintptr:
- ctx := ctx.withType(typ)
- if isPtr {
- return compileUintPtr(ctx)
- }
- return compileUint(ctx)
+ return c.uintCode(typ, isPtr)
case reflect.Uint8:
- ctx := ctx.withType(typ)
- if isPtr {
- return compileUint8Ptr(ctx)
- }
- return compileUint8(ctx)
+ return c.uint8Code(typ, isPtr)
case reflect.Uint16:
- ctx := ctx.withType(typ)
- if isPtr {
- return compileUint16Ptr(ctx)
- }
- return compileUint16(ctx)
+ return c.uint16Code(typ, isPtr)
case reflect.Uint32:
- ctx := ctx.withType(typ)
- if isPtr {
- return compileUint32Ptr(ctx)
- }
- return compileUint32(ctx)
+ return c.uint32Code(typ, isPtr)
case reflect.Uint64:
- ctx := ctx.withType(typ)
- if isPtr {
- return compileUint64Ptr(ctx)
- }
- return compileUint64(ctx)
+ return c.uint64Code(typ, isPtr)
case reflect.Float32:
- ctx := ctx.withType(typ)
- if isPtr {
- return compileFloat32Ptr(ctx)
- }
- return compileFloat32(ctx)
+ return c.float32Code(typ, isPtr)
case reflect.Float64:
- ctx := ctx.withType(typ)
- if isPtr {
- return compileFloat64Ptr(ctx)
- }
- return compileFloat64(ctx)
+ return c.float64Code(typ, isPtr)
case reflect.String:
- ctx := ctx.withType(typ)
- if isPtr {
- return compileStringPtr(ctx)
- }
- return compileString(ctx)
+ return c.stringCode(typ, isPtr)
case reflect.Bool:
- ctx := ctx.withType(typ)
- if isPtr {
- return compileBoolPtr(ctx)
- }
- return compileBool(ctx)
+ return c.boolCode(typ, isPtr)
case reflect.Interface:
- ctx := ctx.withType(typ)
- if isPtr {
- return compileInterfacePtr(ctx)
- }
- return compileInterface(ctx)
+ return c.interfaceCode(typ, isPtr)
default:
if isPtr && typ.Implements(marshalTextType) {
typ = orgType
}
- code, err := compile(ctx.withType(typ), isPtr)
+ return c.typeToCodeWithPtr(typ, isPtr)
+ }
+}
+
+func (c *Compiler) typeToCodeWithPtr(typ *runtime.Type, isPtr bool) (Code, error) {
+ switch {
+ case c.implementsMarshalJSON(typ):
+ return c.marshalJSONCode(typ)
+ case c.implementsMarshalText(typ):
+ return c.marshalTextCode(typ)
+ }
+ switch typ.Kind() {
+ case reflect.Ptr:
+ return c.ptrCode(typ)
+ case reflect.Slice:
+ elem := typ.Elem()
+ if elem.Kind() == reflect.Uint8 {
+ p := runtime.PtrTo(elem)
+ if !c.implementsMarshalJSONType(p) && !p.Implements(marshalTextType) {
+ return c.bytesCode(typ, false)
+ }
+ }
+ return c.sliceCode(typ)
+ case reflect.Array:
+ return c.arrayCode(typ)
+ case reflect.Map:
+ return c.mapCode(typ)
+ case reflect.Struct:
+ return c.structCode(typ, isPtr)
+ case reflect.Interface:
+ return c.interfaceCode(typ, false)
+ case reflect.Int:
+ return c.intCode(typ, false)
+ case reflect.Int8:
+ return c.int8Code(typ, false)
+ case reflect.Int16:
+ return c.int16Code(typ, false)
+ case reflect.Int32:
+ return c.int32Code(typ, false)
+ case reflect.Int64:
+ return c.int64Code(typ, false)
+ case reflect.Uint:
+ return c.uintCode(typ, false)
+ case reflect.Uint8:
+ return c.uint8Code(typ, false)
+ case reflect.Uint16:
+ return c.uint16Code(typ, false)
+ case reflect.Uint32:
+ return c.uint32Code(typ, false)
+ case reflect.Uint64:
+ return c.uint64Code(typ, false)
+ case reflect.Uintptr:
+ return c.uintCode(typ, false)
+ case reflect.Float32:
+ return c.float32Code(typ, false)
+ case reflect.Float64:
+ return c.float64Code(typ, false)
+ case reflect.String:
+ return c.stringCode(typ, false)
+ case reflect.Bool:
+ return c.boolCode(typ, false)
+ }
+ return nil, &errors.UnsupportedTypeError{Type: runtime.RType2Type(typ)}
+}
+
+const intSize = 32 << (^uint(0) >> 63)
+
+//nolint:unparam
+func (c *Compiler) intCode(typ *runtime.Type, isPtr bool) (*IntCode, error) {
+ return &IntCode{typ: typ, bitSize: intSize, isPtr: isPtr}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) int8Code(typ *runtime.Type, isPtr bool) (*IntCode, error) {
+ return &IntCode{typ: typ, bitSize: 8, isPtr: isPtr}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) int16Code(typ *runtime.Type, isPtr bool) (*IntCode, error) {
+ return &IntCode{typ: typ, bitSize: 16, isPtr: isPtr}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) int32Code(typ *runtime.Type, isPtr bool) (*IntCode, error) {
+ return &IntCode{typ: typ, bitSize: 32, isPtr: isPtr}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) int64Code(typ *runtime.Type, isPtr bool) (*IntCode, error) {
+ return &IntCode{typ: typ, bitSize: 64, isPtr: isPtr}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) uintCode(typ *runtime.Type, isPtr bool) (*UintCode, error) {
+ return &UintCode{typ: typ, bitSize: intSize, isPtr: isPtr}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) uint8Code(typ *runtime.Type, isPtr bool) (*UintCode, error) {
+ return &UintCode{typ: typ, bitSize: 8, isPtr: isPtr}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) uint16Code(typ *runtime.Type, isPtr bool) (*UintCode, error) {
+ return &UintCode{typ: typ, bitSize: 16, isPtr: isPtr}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) uint32Code(typ *runtime.Type, isPtr bool) (*UintCode, error) {
+ return &UintCode{typ: typ, bitSize: 32, isPtr: isPtr}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) uint64Code(typ *runtime.Type, isPtr bool) (*UintCode, error) {
+ return &UintCode{typ: typ, bitSize: 64, isPtr: isPtr}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) float32Code(typ *runtime.Type, isPtr bool) (*FloatCode, error) {
+ return &FloatCode{typ: typ, bitSize: 32, isPtr: isPtr}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) float64Code(typ *runtime.Type, isPtr bool) (*FloatCode, error) {
+ return &FloatCode{typ: typ, bitSize: 64, isPtr: isPtr}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) stringCode(typ *runtime.Type, isPtr bool) (*StringCode, error) {
+ return &StringCode{typ: typ, isPtr: isPtr}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) boolCode(typ *runtime.Type, isPtr bool) (*BoolCode, error) {
+ return &BoolCode{typ: typ, isPtr: isPtr}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) intStringCode(typ *runtime.Type) (*IntCode, error) {
+ return &IntCode{typ: typ, bitSize: intSize, isString: true}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) int8StringCode(typ *runtime.Type) (*IntCode, error) {
+ return &IntCode{typ: typ, bitSize: 8, isString: true}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) int16StringCode(typ *runtime.Type) (*IntCode, error) {
+ return &IntCode{typ: typ, bitSize: 16, isString: true}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) int32StringCode(typ *runtime.Type) (*IntCode, error) {
+ return &IntCode{typ: typ, bitSize: 32, isString: true}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) int64StringCode(typ *runtime.Type) (*IntCode, error) {
+ return &IntCode{typ: typ, bitSize: 64, isString: true}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) uintStringCode(typ *runtime.Type) (*UintCode, error) {
+ return &UintCode{typ: typ, bitSize: intSize, isString: true}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) uint8StringCode(typ *runtime.Type) (*UintCode, error) {
+ return &UintCode{typ: typ, bitSize: 8, isString: true}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) uint16StringCode(typ *runtime.Type) (*UintCode, error) {
+ return &UintCode{typ: typ, bitSize: 16, isString: true}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) uint32StringCode(typ *runtime.Type) (*UintCode, error) {
+ return &UintCode{typ: typ, bitSize: 32, isString: true}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) uint64StringCode(typ *runtime.Type) (*UintCode, error) {
+ return &UintCode{typ: typ, bitSize: 64, isString: true}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) bytesCode(typ *runtime.Type, isPtr bool) (*BytesCode, error) {
+ return &BytesCode{typ: typ, isPtr: isPtr}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) interfaceCode(typ *runtime.Type, isPtr bool) (*InterfaceCode, error) {
+ return &InterfaceCode{typ: typ, isPtr: isPtr}, nil
+}
+
+//nolint:unparam
+func (c *Compiler) marshalJSONCode(typ *runtime.Type) (*MarshalJSONCode, error) {
+ return &MarshalJSONCode{
+ typ: typ,
+ isAddrForMarshaler: c.isPtrMarshalJSONType(typ),
+ isNilableType: c.isNilableType(typ),
+ isMarshalerContext: typ.Implements(marshalJSONContextType) || runtime.PtrTo(typ).Implements(marshalJSONContextType),
+ }, nil
+}
+
+//nolint:unparam
+func (c *Compiler) marshalTextCode(typ *runtime.Type) (*MarshalTextCode, error) {
+ return &MarshalTextCode{
+ typ: typ,
+ isAddrForMarshaler: c.isPtrMarshalTextType(typ),
+ isNilableType: c.isNilableType(typ),
+ }, nil
+}
+
+func (c *Compiler) ptrCode(typ *runtime.Type) (*PtrCode, error) {
+ code, err := c.typeToCodeWithPtr(typ.Elem(), true)
+ if err != nil {
+ return nil, err
+ }
+ ptr, ok := code.(*PtrCode)
+ if ok {
+ return &PtrCode{typ: typ, value: ptr.value, ptrNum: ptr.ptrNum + 1}, nil
+ }
+ return &PtrCode{typ: typ, value: code, ptrNum: 1}, nil
+}
+
+func (c *Compiler) sliceCode(typ *runtime.Type) (*SliceCode, error) {
+ elem := typ.Elem()
+ code, err := c.listElemCode(elem)
+ if err != nil {
+ return nil, err
+ }
+ if code.Kind() == CodeKindStruct {
+ structCode := code.(*StructCode)
+ structCode.enableIndirect()
+ }
+ return &SliceCode{typ: typ, value: code}, nil
+}
+
+func (c *Compiler) arrayCode(typ *runtime.Type) (*ArrayCode, error) {
+ elem := typ.Elem()
+ code, err := c.listElemCode(elem)
+ if err != nil {
+ return nil, err
+ }
+ if code.Kind() == CodeKindStruct {
+ structCode := code.(*StructCode)
+ structCode.enableIndirect()
+ }
+ return &ArrayCode{typ: typ, value: code}, nil
+}
+
+func (c *Compiler) mapCode(typ *runtime.Type) (*MapCode, error) {
+ keyCode, err := c.mapKeyCode(typ.Key())
+ if err != nil {
+ return nil, err
+ }
+ valueCode, err := c.mapValueCode(typ.Elem())
+ if err != nil {
+ return nil, err
+ }
+ if valueCode.Kind() == CodeKindStruct {
+ structCode := valueCode.(*StructCode)
+ structCode.enableIndirect()
+ }
+ return &MapCode{typ: typ, key: keyCode, value: valueCode}, nil
+}
+
+func (c *Compiler) listElemCode(typ *runtime.Type) (Code, error) {
+ switch {
+ case c.isPtrMarshalJSONType(typ):
+ return c.marshalJSONCode(typ)
+ case !typ.Implements(marshalTextType) && runtime.PtrTo(typ).Implements(marshalTextType):
+ return c.marshalTextCode(typ)
+ case typ.Kind() == reflect.Map:
+ return c.ptrCode(runtime.PtrTo(typ))
+ default:
+ code, err := c.typeToCodeWithPtr(typ, false)
if err != nil {
return nil, err
}
- optimizeStructEnd(code)
- linkRecursiveCode(code)
+ ptr, ok := code.(*PtrCode)
+ if ok {
+ if ptr.value.Kind() == CodeKindMap {
+ ptr.ptrNum++
+ }
+ }
return code, nil
}
}
-func linkRecursiveCode(c *Opcode) {
- for code := c; code.Op != OpEnd && code.Op != OpRecursiveEnd; {
- switch code.Op {
- case OpRecursive, OpRecursivePtr:
- if code.Jmp.Linked {
- code = code.Next
- continue
+func (c *Compiler) mapKeyCode(typ *runtime.Type) (Code, error) {
+ switch {
+ case c.implementsMarshalJSON(typ):
+ return c.marshalJSONCode(typ)
+ case c.implementsMarshalText(typ):
+ return c.marshalTextCode(typ)
+ }
+ switch typ.Kind() {
+ case reflect.Ptr:
+ return c.ptrCode(typ)
+ case reflect.String:
+ return c.stringCode(typ, false)
+ case reflect.Int:
+ return c.intStringCode(typ)
+ case reflect.Int8:
+ return c.int8StringCode(typ)
+ case reflect.Int16:
+ return c.int16StringCode(typ)
+ case reflect.Int32:
+ return c.int32StringCode(typ)
+ case reflect.Int64:
+ return c.int64StringCode(typ)
+ case reflect.Uint:
+ return c.uintStringCode(typ)
+ case reflect.Uint8:
+ return c.uint8StringCode(typ)
+ case reflect.Uint16:
+ return c.uint16StringCode(typ)
+ case reflect.Uint32:
+ return c.uint32StringCode(typ)
+ case reflect.Uint64:
+ return c.uint64StringCode(typ)
+ case reflect.Uintptr:
+ return c.uintStringCode(typ)
+ }
+ return nil, &errors.UnsupportedTypeError{Type: runtime.RType2Type(typ)}
+}
+
+func (c *Compiler) mapValueCode(typ *runtime.Type) (Code, error) {
+ switch typ.Kind() {
+ case reflect.Map:
+ return c.ptrCode(runtime.PtrTo(typ))
+ default:
+ code, err := c.typeToCodeWithPtr(typ, false)
+ if err != nil {
+ return nil, err
+ }
+ ptr, ok := code.(*PtrCode)
+ if ok {
+ if ptr.value.Kind() == CodeKindMap {
+ ptr.ptrNum++
}
- code.Jmp.Code = copyOpcode(code.Jmp.Code)
+ }
+ return code, nil
+ }
+}
- c := code.Jmp.Code
- c.End.Next = newEndOp(&compileContext{})
- c.Op = c.Op.PtrHeadToHead()
+func (c *Compiler) structCode(typ *runtime.Type, isPtr bool) (*StructCode, error) {
+ typeptr := uintptr(unsafe.Pointer(typ))
+ if code, exists := c.structTypeToCode[typeptr]; exists {
+ derefCode := *code
+ derefCode.isRecursive = true
+ return &derefCode, nil
+ }
+ indirect := runtime.IfaceIndir(typ)
+ code := &StructCode{typ: typ, isPtr: isPtr, isIndirect: indirect}
+ c.structTypeToCode[typeptr] = code
- beforeLastCode := c.End
- lastCode := beforeLastCode.Next
+ fieldNum := typ.NumField()
+ tags := c.typeToStructTags(typ)
+ fields := []*StructFieldCode{}
+ for i, tag := range tags {
+ isOnlyOneFirstField := i == 0 && fieldNum == 1
+ field, err := c.structFieldCode(code, tag, isPtr, isOnlyOneFirstField)
+ if err != nil {
+ return nil, err
+ }
+ if field.isAnonymous {
+ structCode := field.getAnonymousStruct()
+ if structCode != nil {
+ structCode.removeFieldsByTags(tags)
+ if c.isAssignableIndirect(field, isPtr) {
+ if indirect {
+ structCode.isIndirect = true
+ } else {
+ structCode.isIndirect = false
+ }
+ }
+ }
+ } else {
+ structCode := field.getStruct()
+ if structCode != nil {
+ if indirect {
+ // if parent is indirect type, set child indirect property to true
+ structCode.isIndirect = true
+ } else {
+ // if parent is not indirect type, set child indirect property to false.
+ // but if parent's indirect is false and isPtr is true, then indirect must be true.
+ // Do this only if indirectConversion is enabled at the end of compileStruct.
+ structCode.isIndirect = false
+ }
+ }
+ }
+ fields = append(fields, field)
+ }
+ fieldMap := c.getFieldMap(fields)
+ duplicatedFieldMap := c.getDuplicatedFieldMap(fieldMap)
+ code.fields = c.filteredDuplicatedFields(fields, duplicatedFieldMap)
+ if !code.disableIndirectConversion && !indirect && isPtr {
+ code.enableIndirect()
+ }
+ delete(c.structTypeToCode, typeptr)
+ return code, nil
+}
- lastCode.Idx = beforeLastCode.Idx + uintptrSize
- lastCode.ElemIdx = lastCode.Idx + uintptrSize
- lastCode.Length = lastCode.Idx + 2*uintptrSize
+func (c *Compiler) structFieldCode(structCode *StructCode, tag *runtime.StructTag, isPtr, isOnlyOneFirstField bool) (*StructFieldCode, error) {
+ field := tag.Field
+ fieldType := runtime.Type2RType(field.Type)
+ isIndirectSpecialCase := isPtr && isOnlyOneFirstField
+ fieldCode := &StructFieldCode{
+ typ: fieldType,
+ key: tag.Key,
+ tag: tag,
+ offset: field.Offset,
+ isAnonymous: field.Anonymous && !tag.IsTaggedKey,
+ isTaggedKey: tag.IsTaggedKey,
+ isNilableType: c.isNilableType(fieldType),
+ isNilCheck: true,
+ }
+ switch {
+ case c.isMovePointerPositionFromHeadToFirstMarshalJSONFieldCase(fieldType, isIndirectSpecialCase):
+ code, err := c.marshalJSONCode(fieldType)
+ if err != nil {
+ return nil, err
+ }
+ fieldCode.value = code
+ fieldCode.isAddrForMarshaler = true
+ fieldCode.isNilCheck = false
+ structCode.isIndirect = false
+ structCode.disableIndirectConversion = true
+ case c.isMovePointerPositionFromHeadToFirstMarshalTextFieldCase(fieldType, isIndirectSpecialCase):
+ code, err := c.marshalTextCode(fieldType)
+ if err != nil {
+ return nil, err
+ }
+ fieldCode.value = code
+ fieldCode.isAddrForMarshaler = true
+ fieldCode.isNilCheck = false
+ structCode.isIndirect = false
+ structCode.disableIndirectConversion = true
+ case isPtr && c.isPtrMarshalJSONType(fieldType):
+ // *struct{ field T }
+ // func (*T) MarshalJSON() ([]byte, error)
+ code, err := c.marshalJSONCode(fieldType)
+ if err != nil {
+ return nil, err
+ }
+ fieldCode.value = code
+ fieldCode.isAddrForMarshaler = true
+ fieldCode.isNilCheck = false
+ case isPtr && c.isPtrMarshalTextType(fieldType):
+ // *struct{ field T }
+ // func (*T) MarshalText() ([]byte, error)
+ code, err := c.marshalTextCode(fieldType)
+ if err != nil {
+ return nil, err
+ }
+ fieldCode.value = code
+ fieldCode.isAddrForMarshaler = true
+ fieldCode.isNilCheck = false
+ default:
+ code, err := c.typeToCodeWithPtr(fieldType, isPtr)
+ if err != nil {
+ return nil, err
+ }
+ switch code.Kind() {
+ case CodeKindPtr, CodeKindInterface:
+ fieldCode.isNextOpPtrType = true
+ }
+ fieldCode.value = code
+ }
+ return fieldCode, nil
+}
- // extend length to alloc slot for elemIdx + length
- totalLength := uintptr(code.TotalLength() + 3)
- nextTotalLength := uintptr(c.TotalLength() + 3)
+func (c *Compiler) isAssignableIndirect(fieldCode *StructFieldCode, isPtr bool) bool {
+ if isPtr {
+ return false
+ }
+ codeType := fieldCode.value.Kind()
+ if codeType == CodeKindMarshalJSON {
+ return false
+ }
+ if codeType == CodeKindMarshalText {
+ return false
+ }
+ return true
+}
- c.End.Next.Op = OpRecursiveEnd
-
- code.Jmp.CurLen = totalLength
- code.Jmp.NextLen = nextTotalLength
- code.Jmp.Linked = true
-
- linkRecursiveCode(code.Jmp.Code)
-
- code = code.Next
+func (c *Compiler) getFieldMap(fields []*StructFieldCode) map[string][]*StructFieldCode {
+ fieldMap := map[string][]*StructFieldCode{}
+ for _, field := range fields {
+ if field.isAnonymous {
+ for k, v := range c.getAnonymousFieldMap(field) {
+ fieldMap[k] = append(fieldMap[k], v...)
+ }
continue
}
- switch code.Op.CodeType() {
- case CodeArrayElem, CodeSliceElem, CodeMapKey:
- code = code.End
- default:
- code = code.Next
- }
+ fieldMap[field.key] = append(fieldMap[field.key], field)
}
+ return fieldMap
}
-func optimizeStructEnd(c *Opcode) {
- for code := c; code.Op != OpEnd; {
- if code.Op == OpRecursive || code.Op == OpRecursivePtr {
- // ignore if exists recursive operation
- return
- }
- switch code.Op.CodeType() {
- case CodeArrayElem, CodeSliceElem, CodeMapKey:
- code = code.End
- default:
- code = code.Next
- }
+func (c *Compiler) getAnonymousFieldMap(field *StructFieldCode) map[string][]*StructFieldCode {
+ fieldMap := map[string][]*StructFieldCode{}
+ structCode := field.getAnonymousStruct()
+ if structCode == nil || structCode.isRecursive {
+ fieldMap[field.key] = append(fieldMap[field.key], field)
+ return fieldMap
}
+ for k, v := range c.getFieldMapFromAnonymousParent(structCode.fields) {
+ fieldMap[k] = append(fieldMap[k], v...)
+ }
+ return fieldMap
+}
- for code := c; code.Op != OpEnd; {
- switch code.Op.CodeType() {
- case CodeArrayElem, CodeSliceElem, CodeMapKey:
- code = code.End
- case CodeStructEnd:
- switch code.Op {
- case OpStructEnd:
- prev := code.PrevField
- prevOp := prev.Op.String()
- if strings.Contains(prevOp, "Head") ||
- strings.Contains(prevOp, "Slice") ||
- strings.Contains(prevOp, "Array") ||
- strings.Contains(prevOp, "Map") ||
- strings.Contains(prevOp, "MarshalJSON") ||
- strings.Contains(prevOp, "MarshalText") {
- // not exists field
- code = code.Next
- break
+func (c *Compiler) getFieldMapFromAnonymousParent(fields []*StructFieldCode) map[string][]*StructFieldCode {
+ fieldMap := map[string][]*StructFieldCode{}
+ for _, field := range fields {
+ if field.isAnonymous {
+ for k, v := range c.getAnonymousFieldMap(field) {
+ // Do not handle tagged key when embedding more than once
+ for _, vv := range v {
+ vv.isTaggedKey = false
}
- if prev.Op != prev.Op.FieldToEnd() {
- prev.Op = prev.Op.FieldToEnd()
- prev.Next = code.Next
- }
- code = code.Next
- default:
- code = code.Next
+ fieldMap[k] = append(fieldMap[k], v...)
}
- default:
- code = code.Next
+ continue
}
+ fieldMap[field.key] = append(fieldMap[field.key], field)
}
+ return fieldMap
}
-func implementsMarshalJSON(typ *runtime.Type) bool {
- if !implementsMarshalJSONType(typ) {
+func (c *Compiler) getDuplicatedFieldMap(fieldMap map[string][]*StructFieldCode) map[*StructFieldCode]struct{} {
+ duplicatedFieldMap := map[*StructFieldCode]struct{}{}
+ for _, fields := range fieldMap {
+ if len(fields) == 1 {
+ continue
+ }
+ if c.isTaggedKeyOnly(fields) {
+ for _, field := range fields {
+ if field.isTaggedKey {
+ continue
+ }
+ duplicatedFieldMap[field] = struct{}{}
+ }
+ } else {
+ for _, field := range fields {
+ duplicatedFieldMap[field] = struct{}{}
+ }
+ }
+ }
+ return duplicatedFieldMap
+}
+
+func (c *Compiler) filteredDuplicatedFields(fields []*StructFieldCode, duplicatedFieldMap map[*StructFieldCode]struct{}) []*StructFieldCode {
+ filteredFields := make([]*StructFieldCode, 0, len(fields))
+ for _, field := range fields {
+ if field.isAnonymous {
+ structCode := field.getAnonymousStruct()
+ if structCode != nil && !structCode.isRecursive {
+ structCode.fields = c.filteredDuplicatedFields(structCode.fields, duplicatedFieldMap)
+ if len(structCode.fields) > 0 {
+ filteredFields = append(filteredFields, field)
+ }
+ continue
+ }
+ }
+ if _, exists := duplicatedFieldMap[field]; exists {
+ continue
+ }
+ filteredFields = append(filteredFields, field)
+ }
+ return filteredFields
+}
+
+func (c *Compiler) isTaggedKeyOnly(fields []*StructFieldCode) bool {
+ var taggedKeyFieldCount int
+ for _, field := range fields {
+ if field.isTaggedKey {
+ taggedKeyFieldCount++
+ }
+ }
+ return taggedKeyFieldCount == 1
+}
+
+func (c *Compiler) typeToStructTags(typ *runtime.Type) runtime.StructTags {
+ tags := runtime.StructTags{}
+ fieldNum := typ.NumField()
+ for i := 0; i < fieldNum; i++ {
+ field := typ.Field(i)
+ if runtime.IsIgnoredStructField(field) {
+ continue
+ }
+ tags = append(tags, runtime.StructTagFromField(field))
+ }
+ return tags
+}
+
+// *struct{ field T } => struct { field *T }
+// func (*T) MarshalJSON() ([]byte, error)
+func (c *Compiler) isMovePointerPositionFromHeadToFirstMarshalJSONFieldCase(typ *runtime.Type, isIndirectSpecialCase bool) bool {
+ return isIndirectSpecialCase && !c.isNilableType(typ) && c.isPtrMarshalJSONType(typ)
+}
+
+// *struct{ field T } => struct { field *T }
+// func (*T) MarshalText() ([]byte, error)
+func (c *Compiler) isMovePointerPositionFromHeadToFirstMarshalTextFieldCase(typ *runtime.Type, isIndirectSpecialCase bool) bool {
+ return isIndirectSpecialCase && !c.isNilableType(typ) && c.isPtrMarshalTextType(typ)
+}
+
+func (c *Compiler) implementsMarshalJSON(typ *runtime.Type) bool {
+ if !c.implementsMarshalJSONType(typ) {
return false
}
if typ.Kind() != reflect.Ptr {
return true
}
// type kind is reflect.Ptr
- if !implementsMarshalJSONType(typ.Elem()) {
+ if !c.implementsMarshalJSONType(typ.Elem()) {
return true
}
// needs to dereference
return false
}
-func implementsMarshalText(typ *runtime.Type) bool {
+func (c *Compiler) implementsMarshalText(typ *runtime.Type) bool {
if !typ.Implements(marshalTextType) {
return false
}
@@ -382,931 +852,7 @@ func implementsMarshalText(typ *runtime.Type) bool {
return false
}
-func compile(ctx *compileContext, isPtr bool) (*Opcode, error) {
- typ := ctx.typ
- switch {
- case implementsMarshalJSON(typ):
- return compileMarshalJSON(ctx)
- case implementsMarshalText(typ):
- return compileMarshalText(ctx)
- }
- switch typ.Kind() {
- case reflect.Ptr:
- return compilePtr(ctx)
- case reflect.Slice:
- elem := typ.Elem()
- if elem.Kind() == reflect.Uint8 {
- p := runtime.PtrTo(elem)
- if !implementsMarshalJSONType(p) && !p.Implements(marshalTextType) {
- return compileBytes(ctx)
- }
- }
- return compileSlice(ctx)
- case reflect.Array:
- return compileArray(ctx)
- case reflect.Map:
- return compileMap(ctx)
- case reflect.Struct:
- return compileStruct(ctx, isPtr)
- case reflect.Interface:
- return compileInterface(ctx)
- case reflect.Int:
- return compileInt(ctx)
- case reflect.Int8:
- return compileInt8(ctx)
- case reflect.Int16:
- return compileInt16(ctx)
- case reflect.Int32:
- return compileInt32(ctx)
- case reflect.Int64:
- return compileInt64(ctx)
- case reflect.Uint:
- return compileUint(ctx)
- case reflect.Uint8:
- return compileUint8(ctx)
- case reflect.Uint16:
- return compileUint16(ctx)
- case reflect.Uint32:
- return compileUint32(ctx)
- case reflect.Uint64:
- return compileUint64(ctx)
- case reflect.Uintptr:
- return compileUint(ctx)
- case reflect.Float32:
- return compileFloat32(ctx)
- case reflect.Float64:
- return compileFloat64(ctx)
- case reflect.String:
- return compileString(ctx)
- case reflect.Bool:
- return compileBool(ctx)
- }
- return nil, &errors.UnsupportedTypeError{Type: runtime.RType2Type(typ)}
-}
-
-func convertPtrOp(code *Opcode) OpType {
- ptrHeadOp := code.Op.HeadToPtrHead()
- if code.Op != ptrHeadOp {
- if code.PtrNum > 0 {
- // ptr field and ptr head
- code.PtrNum--
- }
- return ptrHeadOp
- }
- switch code.Op {
- case OpInt:
- return OpIntPtr
- case OpUint:
- return OpUintPtr
- case OpFloat32:
- return OpFloat32Ptr
- case OpFloat64:
- return OpFloat64Ptr
- case OpString:
- return OpStringPtr
- case OpBool:
- return OpBoolPtr
- case OpBytes:
- return OpBytesPtr
- case OpNumber:
- return OpNumberPtr
- case OpArray:
- return OpArrayPtr
- case OpSlice:
- return OpSlicePtr
- case OpMap:
- return OpMapPtr
- case OpMarshalJSON:
- return OpMarshalJSONPtr
- case OpMarshalText:
- return OpMarshalTextPtr
- case OpInterface:
- return OpInterfacePtr
- case OpRecursive:
- return OpRecursivePtr
- }
- return code.Op
-}
-
-func compileKey(ctx *compileContext) (*Opcode, error) {
- typ := ctx.typ
- switch {
- case implementsMarshalJSON(typ):
- return compileMarshalJSON(ctx)
- case implementsMarshalText(typ):
- return compileMarshalText(ctx)
- }
- switch typ.Kind() {
- case reflect.Ptr:
- return compilePtr(ctx)
- case reflect.String:
- return compileString(ctx)
- case reflect.Int:
- return compileIntString(ctx)
- case reflect.Int8:
- return compileInt8String(ctx)
- case reflect.Int16:
- return compileInt16String(ctx)
- case reflect.Int32:
- return compileInt32String(ctx)
- case reflect.Int64:
- return compileInt64String(ctx)
- case reflect.Uint:
- return compileUintString(ctx)
- case reflect.Uint8:
- return compileUint8String(ctx)
- case reflect.Uint16:
- return compileUint16String(ctx)
- case reflect.Uint32:
- return compileUint32String(ctx)
- case reflect.Uint64:
- return compileUint64String(ctx)
- case reflect.Uintptr:
- return compileUintString(ctx)
- }
- return nil, &errors.UnsupportedTypeError{Type: runtime.RType2Type(typ)}
-}
-
-func compilePtr(ctx *compileContext) (*Opcode, error) {
- code, err := compile(ctx.withType(ctx.typ.Elem()), true)
- if err != nil {
- return nil, err
- }
- code.Op = convertPtrOp(code)
- code.PtrNum++
- return code, nil
-}
-
-func compileMarshalJSON(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpMarshalJSON)
- typ := ctx.typ
- if isPtrMarshalJSONType(typ) {
- code.Flags |= AddrForMarshalerFlags
- }
- if typ.Implements(marshalJSONContextType) || runtime.PtrTo(typ).Implements(marshalJSONContextType) {
- code.Flags |= MarshalerContextFlags
- }
- if isNilableType(typ) {
- code.Flags |= IsNilableTypeFlags
- } else {
- code.Flags &= ^IsNilableTypeFlags
- }
- ctx.incIndex()
- return code, nil
-}
-
-func compileMarshalText(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpMarshalText)
- typ := ctx.typ
- if !typ.Implements(marshalTextType) && runtime.PtrTo(typ).Implements(marshalTextType) {
- code.Flags |= AddrForMarshalerFlags
- }
- if isNilableType(typ) {
- code.Flags |= IsNilableTypeFlags
- } else {
- code.Flags &= ^IsNilableTypeFlags
- }
- ctx.incIndex()
- return code, nil
-}
-
-const intSize = 32 << (^uint(0) >> 63)
-
-func compileInt(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpInt)
- code.NumBitSize = intSize
- ctx.incIndex()
- return code, nil
-}
-
-func compileIntPtr(ctx *compileContext) (*Opcode, error) {
- code, err := compileInt(ctx)
- if err != nil {
- return nil, err
- }
- code.Op = OpIntPtr
- return code, nil
-}
-
-func compileInt8(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpInt)
- code.NumBitSize = 8
- ctx.incIndex()
- return code, nil
-}
-
-func compileInt8Ptr(ctx *compileContext) (*Opcode, error) {
- code, err := compileInt8(ctx)
- if err != nil {
- return nil, err
- }
- code.Op = OpIntPtr
- return code, nil
-}
-
-func compileInt16(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpInt)
- code.NumBitSize = 16
- ctx.incIndex()
- return code, nil
-}
-
-func compileInt16Ptr(ctx *compileContext) (*Opcode, error) {
- code, err := compileInt16(ctx)
- if err != nil {
- return nil, err
- }
- code.Op = OpIntPtr
- return code, nil
-}
-
-func compileInt32(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpInt)
- code.NumBitSize = 32
- ctx.incIndex()
- return code, nil
-}
-
-func compileInt32Ptr(ctx *compileContext) (*Opcode, error) {
- code, err := compileInt32(ctx)
- if err != nil {
- return nil, err
- }
- code.Op = OpIntPtr
- return code, nil
-}
-
-func compileInt64(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpInt)
- code.NumBitSize = 64
- ctx.incIndex()
- return code, nil
-}
-
-func compileInt64Ptr(ctx *compileContext) (*Opcode, error) {
- code, err := compileInt64(ctx)
- if err != nil {
- return nil, err
- }
- code.Op = OpIntPtr
- return code, nil
-}
-
-func compileUint(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpUint)
- code.NumBitSize = intSize
- ctx.incIndex()
- return code, nil
-}
-
-func compileUintPtr(ctx *compileContext) (*Opcode, error) {
- code, err := compileUint(ctx)
- if err != nil {
- return nil, err
- }
- code.Op = OpUintPtr
- return code, nil
-}
-
-func compileUint8(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpUint)
- code.NumBitSize = 8
- ctx.incIndex()
- return code, nil
-}
-
-func compileUint8Ptr(ctx *compileContext) (*Opcode, error) {
- code, err := compileUint8(ctx)
- if err != nil {
- return nil, err
- }
- code.Op = OpUintPtr
- return code, nil
-}
-
-func compileUint16(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpUint)
- code.NumBitSize = 16
- ctx.incIndex()
- return code, nil
-}
-
-func compileUint16Ptr(ctx *compileContext) (*Opcode, error) {
- code, err := compileUint16(ctx)
- if err != nil {
- return nil, err
- }
- code.Op = OpUintPtr
- return code, nil
-}
-
-func compileUint32(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpUint)
- code.NumBitSize = 32
- ctx.incIndex()
- return code, nil
-}
-
-func compileUint32Ptr(ctx *compileContext) (*Opcode, error) {
- code, err := compileUint32(ctx)
- if err != nil {
- return nil, err
- }
- code.Op = OpUintPtr
- return code, nil
-}
-
-func compileUint64(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpUint)
- code.NumBitSize = 64
- ctx.incIndex()
- return code, nil
-}
-
-func compileUint64Ptr(ctx *compileContext) (*Opcode, error) {
- code, err := compileUint64(ctx)
- if err != nil {
- return nil, err
- }
- code.Op = OpUintPtr
- return code, nil
-}
-
-func compileIntString(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpIntString)
- code.NumBitSize = intSize
- ctx.incIndex()
- return code, nil
-}
-
-func compileInt8String(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpIntString)
- code.NumBitSize = 8
- ctx.incIndex()
- return code, nil
-}
-
-func compileInt16String(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpIntString)
- code.NumBitSize = 16
- ctx.incIndex()
- return code, nil
-}
-
-func compileInt32String(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpIntString)
- code.NumBitSize = 32
- ctx.incIndex()
- return code, nil
-}
-
-func compileInt64String(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpIntString)
- code.NumBitSize = 64
- ctx.incIndex()
- return code, nil
-}
-
-func compileUintString(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpUintString)
- code.NumBitSize = intSize
- ctx.incIndex()
- return code, nil
-}
-
-func compileUint8String(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpUintString)
- code.NumBitSize = 8
- ctx.incIndex()
- return code, nil
-}
-
-func compileUint16String(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpUintString)
- code.NumBitSize = 16
- ctx.incIndex()
- return code, nil
-}
-
-func compileUint32String(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpUintString)
- code.NumBitSize = 32
- ctx.incIndex()
- return code, nil
-}
-
-func compileUint64String(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpUintString)
- code.NumBitSize = 64
- ctx.incIndex()
- return code, nil
-}
-
-func compileFloat32(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpFloat32)
- ctx.incIndex()
- return code, nil
-}
-
-func compileFloat32Ptr(ctx *compileContext) (*Opcode, error) {
- code, err := compileFloat32(ctx)
- if err != nil {
- return nil, err
- }
- code.Op = OpFloat32Ptr
- return code, nil
-}
-
-func compileFloat64(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpFloat64)
- ctx.incIndex()
- return code, nil
-}
-
-func compileFloat64Ptr(ctx *compileContext) (*Opcode, error) {
- code, err := compileFloat64(ctx)
- if err != nil {
- return nil, err
- }
- code.Op = OpFloat64Ptr
- return code, nil
-}
-
-func compileString(ctx *compileContext) (*Opcode, error) {
- var op OpType
- if ctx.typ == runtime.Type2RType(jsonNumberType) {
- op = OpNumber
- } else {
- op = OpString
- }
- code := newOpCode(ctx, op)
- ctx.incIndex()
- return code, nil
-}
-
-func compileStringPtr(ctx *compileContext) (*Opcode, error) {
- code, err := compileString(ctx)
- if err != nil {
- return nil, err
- }
- if code.Op == OpNumber {
- code.Op = OpNumberPtr
- } else {
- code.Op = OpStringPtr
- }
- return code, nil
-}
-
-func compileBool(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpBool)
- ctx.incIndex()
- return code, nil
-}
-
-func compileBoolPtr(ctx *compileContext) (*Opcode, error) {
- code, err := compileBool(ctx)
- if err != nil {
- return nil, err
- }
- code.Op = OpBoolPtr
- return code, nil
-}
-
-func compileBytes(ctx *compileContext) (*Opcode, error) {
- code := newOpCode(ctx, OpBytes)
- ctx.incIndex()
- return code, nil
-}
-
-func compileBytesPtr(ctx *compileContext) (*Opcode, error) {
- code, err := compileBytes(ctx)
- if err != nil {
- return nil, err
- }
- code.Op = OpBytesPtr
- return code, nil
-}
-
-func compileInterface(ctx *compileContext) (*Opcode, error) {
- code := newInterfaceCode(ctx)
- ctx.incIndex()
- return code, nil
-}
-
-func compileInterfacePtr(ctx *compileContext) (*Opcode, error) {
- code, err := compileInterface(ctx)
- if err != nil {
- return nil, err
- }
- code.Op = OpInterfacePtr
- return code, nil
-}
-
-func compileSlice(ctx *compileContext) (*Opcode, error) {
- elem := ctx.typ.Elem()
- size := elem.Size()
-
- header := newSliceHeaderCode(ctx)
- ctx.incIndex()
-
- code, err := compileListElem(ctx.withType(elem).incIndent())
- if err != nil {
- return nil, err
- }
- code.Flags |= IndirectFlags
-
- // header => opcode => elem => end
- // ^ |
- // |________|
-
- elemCode := newSliceElemCode(ctx, header, size)
- ctx.incIndex()
-
- end := newOpCode(ctx, OpSliceEnd)
- ctx.incIndex()
-
- header.End = end
- header.Next = code
- code.BeforeLastCode().Next = (*Opcode)(unsafe.Pointer(elemCode))
- elemCode.Next = code
- elemCode.End = end
- return (*Opcode)(unsafe.Pointer(header)), nil
-}
-
-func compileListElem(ctx *compileContext) (*Opcode, error) {
- typ := ctx.typ
- switch {
- case isPtrMarshalJSONType(typ):
- return compileMarshalJSON(ctx)
- case !typ.Implements(marshalTextType) && runtime.PtrTo(typ).Implements(marshalTextType):
- return compileMarshalText(ctx)
- case typ.Kind() == reflect.Map:
- return compilePtr(ctx.withType(runtime.PtrTo(typ)))
- default:
- code, err := compile(ctx, false)
- if err != nil {
- return nil, err
- }
- if code.Op == OpMapPtr {
- code.PtrNum++
- }
- return code, nil
- }
-}
-
-func compileArray(ctx *compileContext) (*Opcode, error) {
- typ := ctx.typ
- elem := typ.Elem()
- alen := typ.Len()
- size := elem.Size()
-
- header := newArrayHeaderCode(ctx, alen)
- ctx.incIndex()
-
- code, err := compileListElem(ctx.withType(elem).incIndent())
- if err != nil {
- return nil, err
- }
- code.Flags |= IndirectFlags
- // header => opcode => elem => end
- // ^ |
- // |________|
-
- elemCode := newArrayElemCode(ctx, header, alen, size)
- ctx.incIndex()
-
- end := newOpCode(ctx, OpArrayEnd)
- ctx.incIndex()
-
- header.End = end
- header.Next = code
- code.BeforeLastCode().Next = (*Opcode)(unsafe.Pointer(elemCode))
- elemCode.Next = code
- elemCode.End = end
- return (*Opcode)(unsafe.Pointer(header)), nil
-}
-
-func compileMap(ctx *compileContext) (*Opcode, error) {
- // header => code => value => code => key => code => value => code => end
- // ^ |
- // |_______________________|
- ctx = ctx.incIndent()
- header := newMapHeaderCode(ctx)
- ctx.incIndex()
-
- typ := ctx.typ
- keyType := ctx.typ.Key()
- keyCode, err := compileKey(ctx.withType(keyType))
- if err != nil {
- return nil, err
- }
-
- value := newMapValueCode(ctx, header)
- ctx.incIndex()
-
- valueCode, err := compileMapValue(ctx.withType(typ.Elem()))
- if err != nil {
- return nil, err
- }
- valueCode.Flags |= IndirectFlags
-
- key := newMapKeyCode(ctx, header)
- ctx.incIndex()
-
- ctx = ctx.decIndent()
-
- end := newMapEndCode(ctx, header)
- ctx.incIndex()
-
- header.Next = keyCode
- keyCode.BeforeLastCode().Next = (*Opcode)(unsafe.Pointer(value))
- value.Next = valueCode
- valueCode.BeforeLastCode().Next = (*Opcode)(unsafe.Pointer(key))
- key.Next = keyCode
-
- header.End = end
- key.End = end
- value.End = end
-
- return (*Opcode)(unsafe.Pointer(header)), nil
-}
-
-func compileMapValue(ctx *compileContext) (*Opcode, error) {
- switch ctx.typ.Kind() {
- case reflect.Map:
- return compilePtr(ctx.withType(runtime.PtrTo(ctx.typ)))
- default:
- code, err := compile(ctx, false)
- if err != nil {
- return nil, err
- }
- if code.Op == OpMapPtr {
- code.PtrNum++
- }
- return code, nil
- }
-}
-
-func optimizeStructHeader(code *Opcode, tag *runtime.StructTag) OpType {
- headType := code.ToHeaderType(tag.IsString)
- if tag.IsOmitEmpty {
- headType = headType.HeadToOmitEmptyHead()
- }
- return headType
-}
-
-func optimizeStructField(code *Opcode, tag *runtime.StructTag) OpType {
- fieldType := code.ToFieldType(tag.IsString)
- if tag.IsOmitEmpty {
- fieldType = fieldType.FieldToOmitEmptyField()
- }
- return fieldType
-}
-
-func recursiveCode(ctx *compileContext, jmp *CompiledCode) *Opcode {
- code := newRecursiveCode(ctx, jmp)
- ctx.incIndex()
- return code
-}
-
-func compiledCode(ctx *compileContext) *Opcode {
- typ := ctx.typ
- typeptr := uintptr(unsafe.Pointer(typ))
- if cc, exists := ctx.structTypeToCompiledCode[typeptr]; exists {
- return recursiveCode(ctx, cc)
- }
- return nil
-}
-
-func structHeader(ctx *compileContext, fieldCode *Opcode, valueCode *Opcode, tag *runtime.StructTag) *Opcode {
- op := optimizeStructHeader(valueCode, tag)
- fieldCode.Op = op
- fieldCode.NumBitSize = valueCode.NumBitSize
- fieldCode.PtrNum = valueCode.PtrNum
- if op.IsMultipleOpHead() {
- return valueCode.BeforeLastCode()
- }
- ctx.decOpcodeIndex()
- return fieldCode
-}
-
-func structField(ctx *compileContext, fieldCode *Opcode, valueCode *Opcode, tag *runtime.StructTag) *Opcode {
- op := optimizeStructField(valueCode, tag)
- fieldCode.Op = op
- fieldCode.NumBitSize = valueCode.NumBitSize
- fieldCode.PtrNum = valueCode.PtrNum
- if op.IsMultipleOpField() {
- return valueCode.BeforeLastCode()
- }
- ctx.decIndex()
- return fieldCode
-}
-
-func isNotExistsField(head *Opcode) bool {
- if head == nil {
- return false
- }
- if head.Op != OpStructHead {
- return false
- }
- if (head.Flags & AnonymousHeadFlags) == 0 {
- return false
- }
- if head.Next == nil {
- return false
- }
- if head.NextField == nil {
- return false
- }
- if head.NextField.Op != OpStructAnonymousEnd {
- return false
- }
- if head.Next.Op == OpStructAnonymousEnd {
- return true
- }
- if head.Next.Op.CodeType() != CodeStructField {
- return false
- }
- return isNotExistsField(head.Next)
-}
-
-func optimizeAnonymousFields(head *Opcode) {
- code := head
- var prev *Opcode
- removedFields := map[*Opcode]struct{}{}
- for {
- if code.Op == OpStructEnd {
- break
- }
- if code.Op == OpStructField {
- codeType := code.Next.Op.CodeType()
- if codeType == CodeStructField {
- if isNotExistsField(code.Next) {
- code.Next = code.NextField
- diff := code.Next.DisplayIdx - code.DisplayIdx
- for i := uint32(0); i < diff; i++ {
- code.Next.decOpcodeIndex()
- }
- linkPrevToNextField(code, removedFields)
- code = prev
- }
- }
- }
- prev = code
- code = code.NextField
- }
-}
-
-type structFieldPair struct {
- prevField *Opcode
- curField *Opcode
- isTaggedKey bool
- linked bool
-}
-
-func anonymousStructFieldPairMap(tags runtime.StructTags, named string, valueCode *Opcode) map[string][]structFieldPair {
- anonymousFields := map[string][]structFieldPair{}
- f := valueCode
- var prevAnonymousField *Opcode
- removedFields := map[*Opcode]struct{}{}
- for {
- existsKey := tags.ExistsKey(f.DisplayKey)
- isHeadOp := strings.Contains(f.Op.String(), "Head")
- if existsKey && f.Next != nil && strings.Contains(f.Next.Op.String(), "Recursive") {
- // through
- } else if isHeadOp && (f.Flags&AnonymousHeadFlags) == 0 {
- if existsKey {
- // TODO: need to remove this head
- f.Op = OpStructHead
- f.Flags |= AnonymousKeyFlags
- f.Flags |= AnonymousHeadFlags
- } else if named == "" {
- f.Flags |= AnonymousHeadFlags
- }
- } else if named == "" && f.Op == OpStructEnd {
- f.Op = OpStructAnonymousEnd
- } else if existsKey {
- diff := f.NextField.DisplayIdx - f.DisplayIdx
- for i := uint32(0); i < diff; i++ {
- f.NextField.decOpcodeIndex()
- }
- linkPrevToNextField(f, removedFields)
- }
-
- if f.DisplayKey == "" {
- if f.NextField == nil {
- break
- }
- prevAnonymousField = f
- f = f.NextField
- continue
- }
-
- key := fmt.Sprintf("%s.%s", named, f.DisplayKey)
- anonymousFields[key] = append(anonymousFields[key], structFieldPair{
- prevField: prevAnonymousField,
- curField: f,
- isTaggedKey: (f.Flags & IsTaggedKeyFlags) != 0,
- })
- if f.Next != nil && f.NextField != f.Next && f.Next.Op.CodeType() == CodeStructField {
- for k, v := range anonymousFieldPairRecursively(named, f.Next) {
- anonymousFields[k] = append(anonymousFields[k], v...)
- }
- }
- if f.NextField == nil {
- break
- }
- prevAnonymousField = f
- f = f.NextField
- }
- return anonymousFields
-}
-
-func anonymousFieldPairRecursively(named string, valueCode *Opcode) map[string][]structFieldPair {
- anonymousFields := map[string][]structFieldPair{}
- f := valueCode
- var prevAnonymousField *Opcode
- for {
- if f.DisplayKey != "" && (f.Flags&AnonymousHeadFlags) != 0 {
- key := fmt.Sprintf("%s.%s", named, f.DisplayKey)
- anonymousFields[key] = append(anonymousFields[key], structFieldPair{
- prevField: prevAnonymousField,
- curField: f,
- isTaggedKey: (f.Flags & IsTaggedKeyFlags) != 0,
- })
- if f.Next != nil && f.NextField != f.Next && f.Next.Op.CodeType() == CodeStructField {
- for k, v := range anonymousFieldPairRecursively(named, f.Next) {
- anonymousFields[k] = append(anonymousFields[k], v...)
- }
- }
- }
- if f.NextField == nil {
- break
- }
- prevAnonymousField = f
- f = f.NextField
- }
- return anonymousFields
-}
-
-func optimizeConflictAnonymousFields(anonymousFields map[string][]structFieldPair) {
- removedFields := map[*Opcode]struct{}{}
- for _, fieldPairs := range anonymousFields {
- if len(fieldPairs) == 1 {
- continue
- }
- // conflict anonymous fields
- taggedPairs := []structFieldPair{}
- for _, fieldPair := range fieldPairs {
- if fieldPair.isTaggedKey {
- taggedPairs = append(taggedPairs, fieldPair)
- } else {
- if !fieldPair.linked {
- if fieldPair.prevField == nil {
- // head operation
- fieldPair.curField.Op = OpStructHead
- fieldPair.curField.Flags |= AnonymousHeadFlags
- fieldPair.curField.Flags |= AnonymousKeyFlags
- } else {
- diff := fieldPair.curField.NextField.DisplayIdx - fieldPair.curField.DisplayIdx
- for i := uint32(0); i < diff; i++ {
- fieldPair.curField.NextField.decOpcodeIndex()
- }
- removedFields[fieldPair.curField] = struct{}{}
- linkPrevToNextField(fieldPair.curField, removedFields)
- }
- fieldPair.linked = true
- }
- }
- }
- if len(taggedPairs) > 1 {
- for _, fieldPair := range taggedPairs {
- if !fieldPair.linked {
- if fieldPair.prevField == nil {
- // head operation
- fieldPair.curField.Op = OpStructHead
- fieldPair.curField.Flags |= AnonymousHeadFlags
- fieldPair.curField.Flags |= AnonymousKeyFlags
- } else {
- diff := fieldPair.curField.NextField.DisplayIdx - fieldPair.curField.DisplayIdx
- removedFields[fieldPair.curField] = struct{}{}
- for i := uint32(0); i < diff; i++ {
- fieldPair.curField.NextField.decOpcodeIndex()
- }
- linkPrevToNextField(fieldPair.curField, removedFields)
- }
- fieldPair.linked = true
- }
- }
- } else {
- for _, fieldPair := range taggedPairs {
- fieldPair.curField.Flags &= ^IsTaggedKeyFlags
- }
- }
- }
-}
-
-func isNilableType(typ *runtime.Type) bool {
+func (c *Compiler) isNilableType(typ *runtime.Type) bool {
switch typ.Kind() {
case reflect.Ptr:
return true
@@ -1319,251 +865,49 @@ func isNilableType(typ *runtime.Type) bool {
}
}
-func compileStruct(ctx *compileContext, isPtr bool) (*Opcode, error) {
- if code := compiledCode(ctx); code != nil {
- return code, nil
- }
- typ := ctx.typ
- typeptr := uintptr(unsafe.Pointer(typ))
- compiled := &CompiledCode{}
- ctx.structTypeToCompiledCode[typeptr] = compiled
- // header => code => structField => code => end
- // ^ |
- // |__________|
- fieldNum := typ.NumField()
- indirect := runtime.IfaceIndir(typ)
- fieldIdx := 0
- disableIndirectConversion := false
- var (
- head *Opcode
- code *Opcode
- prevField *Opcode
- )
- ctx = ctx.incIndent()
- tags := runtime.StructTags{}
- anonymousFields := map[string][]structFieldPair{}
- for i := 0; i < fieldNum; i++ {
- field := typ.Field(i)
- if runtime.IsIgnoredStructField(field) {
- continue
- }
- tags = append(tags, runtime.StructTagFromField(field))
- }
- for i, tag := range tags {
- field := tag.Field
- fieldType := runtime.Type2RType(field.Type)
- fieldOpcodeIndex := ctx.opcodeIndex
- fieldPtrIndex := ctx.ptrIndex
- ctx.incIndex()
-
- nilcheck := true
- addrForMarshaler := false
- isIndirectSpecialCase := isPtr && i == 0 && fieldNum == 1
- isNilableType := isNilableType(fieldType)
-
- var valueCode *Opcode
- switch {
- case isIndirectSpecialCase && !isNilableType && isPtrMarshalJSONType(fieldType):
- // *struct{ field T } => struct { field *T }
- // func (*T) MarshalJSON() ([]byte, error)
- // move pointer position from head to first field
- code, err := compileMarshalJSON(ctx.withType(fieldType))
- if err != nil {
- return nil, err
- }
- addrForMarshaler = true
- valueCode = code
- nilcheck = false
- indirect = false
- disableIndirectConversion = true
- case isIndirectSpecialCase && !isNilableType && isPtrMarshalTextType(fieldType):
- // *struct{ field T } => struct { field *T }
- // func (*T) MarshalText() ([]byte, error)
- // move pointer position from head to first field
- code, err := compileMarshalText(ctx.withType(fieldType))
- if err != nil {
- return nil, err
- }
- addrForMarshaler = true
- valueCode = code
- nilcheck = false
- indirect = false
- disableIndirectConversion = true
- case isPtr && isPtrMarshalJSONType(fieldType):
- // *struct{ field T }
- // func (*T) MarshalJSON() ([]byte, error)
- code, err := compileMarshalJSON(ctx.withType(fieldType))
- if err != nil {
- return nil, err
- }
- addrForMarshaler = true
- nilcheck = false
- valueCode = code
- case isPtr && isPtrMarshalTextType(fieldType):
- // *struct{ field T }
- // func (*T) MarshalText() ([]byte, error)
- code, err := compileMarshalText(ctx.withType(fieldType))
- if err != nil {
- return nil, err
- }
- addrForMarshaler = true
- nilcheck = false
- valueCode = code
- default:
- code, err := compile(ctx.withType(fieldType), isPtr)
- if err != nil {
- return nil, err
- }
- valueCode = code
- }
-
- if field.Anonymous {
- tagKey := ""
- if tag.IsTaggedKey {
- tagKey = tag.Key
- }
- for k, v := range anonymousStructFieldPairMap(tags, tagKey, valueCode) {
- anonymousFields[k] = append(anonymousFields[k], v...)
- }
- valueCode.decIndent()
-
- // fix issue144
- if !(isPtr && strings.Contains(valueCode.Op.String(), "Marshal")) {
- if indirect {
- valueCode.Flags |= IndirectFlags
- } else {
- valueCode.Flags &= ^IndirectFlags
- }
- }
- } else {
- if indirect {
- // if parent is indirect type, set child indirect property to true
- valueCode.Flags |= IndirectFlags
- } else {
- // if parent is not indirect type, set child indirect property to false.
- // but if parent's indirect is false and isPtr is true, then indirect must be true.
- // Do this only if indirectConversion is enabled at the end of compileStruct.
- if i == 0 {
- valueCode.Flags &= ^IndirectFlags
- }
- }
- }
- var flags OpFlags
- if indirect {
- flags |= IndirectFlags
- }
- if field.Anonymous {
- flags |= AnonymousKeyFlags
- }
- if tag.IsTaggedKey {
- flags |= IsTaggedKeyFlags
- }
- if nilcheck {
- flags |= NilCheckFlags
- }
- if addrForMarshaler {
- flags |= AddrForMarshalerFlags
- }
- if strings.Contains(valueCode.Op.String(), "Ptr") || valueCode.Op == OpInterface {
- flags |= IsNextOpPtrTypeFlags
- }
- if isNilableType {
- flags |= IsNilableTypeFlags
- }
- var key string
- if ctx.escapeKey {
- rctx := &RuntimeContext{Option: &Option{Flag: HTMLEscapeOption}}
- key = fmt.Sprintf(`%s:`, string(AppendString(rctx, []byte{}, tag.Key)))
- } else {
- key = fmt.Sprintf(`"%s":`, tag.Key)
- }
- fieldCode := &Opcode{
- Idx: opcodeOffset(fieldPtrIndex),
- Next: valueCode,
- Flags: flags,
- Key: key,
- Offset: uint32(field.Offset),
- Type: valueCode.Type,
- DisplayIdx: fieldOpcodeIndex,
- Indent: ctx.indent,
- DisplayKey: tag.Key,
- }
- if fieldIdx == 0 {
- code = structHeader(ctx, fieldCode, valueCode, tag)
- head = fieldCode
- prevField = fieldCode
- } else {
- fieldCode.Idx = head.Idx
- code.Next = fieldCode
- code = structField(ctx, fieldCode, valueCode, tag)
- prevField.NextField = fieldCode
- fieldCode.PrevField = prevField
- prevField = fieldCode
- }
- fieldIdx++
- }
-
- structEndCode := &Opcode{
- Op: OpStructEnd,
- Next: newEndOp(ctx),
- Type: nil,
- Indent: ctx.indent,
- }
-
- ctx = ctx.decIndent()
-
- // no struct field
- if head == nil {
- head = &Opcode{
- Op: OpStructHead,
- Idx: opcodeOffset(ctx.ptrIndex),
- NextField: structEndCode,
- Type: typ,
- DisplayIdx: ctx.opcodeIndex,
- Indent: ctx.indent,
- }
- structEndCode.PrevField = head
- ctx.incIndex()
- code = head
- }
-
- structEndCode.DisplayIdx = ctx.opcodeIndex
- structEndCode.Idx = opcodeOffset(ctx.ptrIndex)
- ctx.incIndex()
-
- if prevField != nil && prevField.NextField == nil {
- prevField.NextField = structEndCode
- structEndCode.PrevField = prevField
- }
-
- head.End = structEndCode
- code.Next = structEndCode
- optimizeConflictAnonymousFields(anonymousFields)
- optimizeAnonymousFields(head)
- ret := (*Opcode)(unsafe.Pointer(head))
- compiled.Code = ret
-
- delete(ctx.structTypeToCompiledCode, typeptr)
-
- if !disableIndirectConversion && (head.Flags&IndirectFlags == 0) && isPtr {
- headCode := head
- for strings.Contains(headCode.Op.String(), "Head") {
- headCode.Flags |= IndirectFlags
- headCode = headCode.Next
- }
- }
-
- return ret, nil
-}
-
-func implementsMarshalJSONType(typ *runtime.Type) bool {
+func (c *Compiler) implementsMarshalJSONType(typ *runtime.Type) bool {
return typ.Implements(marshalJSONType) || typ.Implements(marshalJSONContextType)
}
-func isPtrMarshalJSONType(typ *runtime.Type) bool {
- return !implementsMarshalJSONType(typ) && implementsMarshalJSONType(runtime.PtrTo(typ))
+func (c *Compiler) isPtrMarshalJSONType(typ *runtime.Type) bool {
+ return !c.implementsMarshalJSONType(typ) && c.implementsMarshalJSONType(runtime.PtrTo(typ))
}
-func isPtrMarshalTextType(typ *runtime.Type) bool {
+func (c *Compiler) isPtrMarshalTextType(typ *runtime.Type) bool {
return !typ.Implements(marshalTextType) && runtime.PtrTo(typ).Implements(marshalTextType)
}
+
+func (c *Compiler) codeToOpcode(ctx *compileContext, typ *runtime.Type, code Code) *Opcode {
+ codes := code.ToOpcode(ctx)
+ codes.Last().Next = newEndOp(ctx, typ)
+ c.linkRecursiveCode(ctx)
+ return codes.First()
+}
+
+func (c *Compiler) linkRecursiveCode(ctx *compileContext) {
+ for _, recursive := range *ctx.recursiveCodes {
+ typeptr := uintptr(unsafe.Pointer(recursive.Type))
+ codes := ctx.structTypeToCodes[typeptr]
+ compiled := recursive.Jmp
+ compiled.Code = copyOpcode(codes.First())
+ code := compiled.Code
+ code.End.Next = newEndOp(&compileContext{}, recursive.Type)
+ code.Op = code.Op.PtrHeadToHead()
+
+ beforeLastCode := code.End
+ lastCode := beforeLastCode.Next
+
+ totalLength := code.TotalLength()
+ lastCode.Idx = uint32((totalLength + 1) * uintptrSize)
+ lastCode.ElemIdx = lastCode.Idx + uintptrSize
+ lastCode.Length = lastCode.Idx + 2*uintptrSize
+ code.End.Next.Op = OpRecursiveEnd
+
+ // extend length to alloc slot for elemIdx + length
+ curTotalLength := uintptr(recursive.TotalLength()) + 3
+ nextTotalLength := uintptr(totalLength) + 3
+ compiled.CurLen = curTotalLength
+ compiled.NextLen = nextTotalLength
+ compiled.Linked = true
+ }
+}
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/compiler_norace.go b/vendor/github.com/goccy/go-json/internal/encoder/compiler_norace.go
index 9d337f12b..20c93cbf7 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/compiler_norace.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/compiler_norace.go
@@ -1,56 +1,32 @@
+//go:build !race
// +build !race
package encoder
-import (
- "unsafe"
-
- "github.com/goccy/go-json/internal/runtime"
-)
-
-func CompileToGetCodeSet(typeptr uintptr) (*OpcodeSet, error) {
- if typeptr > typeAddr.MaxTypeAddr {
- return compileToGetCodeSetSlowPath(typeptr)
+func CompileToGetCodeSet(ctx *RuntimeContext, typeptr uintptr) (*OpcodeSet, error) {
+ if typeptr > typeAddr.MaxTypeAddr || typeptr < typeAddr.BaseTypeAddr {
+ codeSet, err := compileToGetCodeSetSlowPath(typeptr)
+ if err != nil {
+ return nil, err
+ }
+ return getFilteredCodeSetIfNeeded(ctx, codeSet)
}
index := (typeptr - typeAddr.BaseTypeAddr) >> typeAddr.AddrShift
if codeSet := cachedOpcodeSets[index]; codeSet != nil {
- return codeSet, nil
+ filtered, err := getFilteredCodeSetIfNeeded(ctx, codeSet)
+ if err != nil {
+ return nil, err
+ }
+ return filtered, nil
}
-
- // noescape trick for header.typ ( reflect.*rtype )
- copiedType := *(**runtime.Type)(unsafe.Pointer(&typeptr))
-
- noescapeKeyCode, err := compileHead(&compileContext{
- typ: copiedType,
- structTypeToCompiledCode: map[uintptr]*CompiledCode{},
- })
+ codeSet, err := newCompiler().compile(typeptr)
if err != nil {
return nil, err
}
- escapeKeyCode, err := compileHead(&compileContext{
- typ: copiedType,
- structTypeToCompiledCode: map[uintptr]*CompiledCode{},
- escapeKey: true,
- })
+ filtered, err := getFilteredCodeSetIfNeeded(ctx, codeSet)
if err != nil {
return nil, err
}
- noescapeKeyCode = copyOpcode(noescapeKeyCode)
- escapeKeyCode = copyOpcode(escapeKeyCode)
- setTotalLengthToInterfaceOp(noescapeKeyCode)
- setTotalLengthToInterfaceOp(escapeKeyCode)
- interfaceNoescapeKeyCode := copyToInterfaceOpcode(noescapeKeyCode)
- interfaceEscapeKeyCode := copyToInterfaceOpcode(escapeKeyCode)
- codeLength := noescapeKeyCode.TotalLength()
- codeSet := &OpcodeSet{
- Type: copiedType,
- NoescapeKeyCode: noescapeKeyCode,
- EscapeKeyCode: escapeKeyCode,
- InterfaceNoescapeKeyCode: interfaceNoescapeKeyCode,
- InterfaceEscapeKeyCode: interfaceEscapeKeyCode,
- CodeLength: codeLength,
- EndCode: ToEndCode(interfaceNoescapeKeyCode),
- }
cachedOpcodeSets[index] = codeSet
- return codeSet, nil
+ return filtered, nil
}
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/compiler_race.go b/vendor/github.com/goccy/go-json/internal/encoder/compiler_race.go
index 3a239e9d9..13ba23fdf 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/compiler_race.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/compiler_race.go
@@ -1,65 +1,45 @@
+//go:build race
// +build race
package encoder
import (
"sync"
- "unsafe"
-
- "github.com/goccy/go-json/internal/runtime"
)
var setsMu sync.RWMutex
-func CompileToGetCodeSet(typeptr uintptr) (*OpcodeSet, error) {
- if typeptr > typeAddr.MaxTypeAddr {
- return compileToGetCodeSetSlowPath(typeptr)
+func CompileToGetCodeSet(ctx *RuntimeContext, typeptr uintptr) (*OpcodeSet, error) {
+ if typeptr > typeAddr.MaxTypeAddr || typeptr < typeAddr.BaseTypeAddr {
+ codeSet, err := compileToGetCodeSetSlowPath(typeptr)
+ if err != nil {
+ return nil, err
+ }
+ return getFilteredCodeSetIfNeeded(ctx, codeSet)
}
index := (typeptr - typeAddr.BaseTypeAddr) >> typeAddr.AddrShift
setsMu.RLock()
if codeSet := cachedOpcodeSets[index]; codeSet != nil {
+ filtered, err := getFilteredCodeSetIfNeeded(ctx, codeSet)
+ if err != nil {
+ setsMu.RUnlock()
+ return nil, err
+ }
setsMu.RUnlock()
- return codeSet, nil
+ return filtered, nil
}
setsMu.RUnlock()
- // noescape trick for header.typ ( reflect.*rtype )
- copiedType := *(**runtime.Type)(unsafe.Pointer(&typeptr))
-
- noescapeKeyCode, err := compileHead(&compileContext{
- typ: copiedType,
- structTypeToCompiledCode: map[uintptr]*CompiledCode{},
- })
+ codeSet, err := newCompiler().compile(typeptr)
if err != nil {
return nil, err
}
- escapeKeyCode, err := compileHead(&compileContext{
- typ: copiedType,
- structTypeToCompiledCode: map[uintptr]*CompiledCode{},
- escapeKey: true,
- })
+ filtered, err := getFilteredCodeSetIfNeeded(ctx, codeSet)
if err != nil {
return nil, err
}
-
- noescapeKeyCode = copyOpcode(noescapeKeyCode)
- escapeKeyCode = copyOpcode(escapeKeyCode)
- setTotalLengthToInterfaceOp(noescapeKeyCode)
- setTotalLengthToInterfaceOp(escapeKeyCode)
- interfaceNoescapeKeyCode := copyToInterfaceOpcode(noescapeKeyCode)
- interfaceEscapeKeyCode := copyToInterfaceOpcode(escapeKeyCode)
- codeLength := noescapeKeyCode.TotalLength()
- codeSet := &OpcodeSet{
- Type: copiedType,
- NoescapeKeyCode: noescapeKeyCode,
- EscapeKeyCode: escapeKeyCode,
- InterfaceNoescapeKeyCode: interfaceNoescapeKeyCode,
- InterfaceEscapeKeyCode: interfaceEscapeKeyCode,
- CodeLength: codeLength,
- EndCode: ToEndCode(interfaceNoescapeKeyCode),
- }
setsMu.Lock()
cachedOpcodeSets[index] = codeSet
setsMu.Unlock()
- return codeSet, nil
+ return filtered, nil
}
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/context.go b/vendor/github.com/goccy/go-json/internal/encoder/context.go
index 61b890806..3833d0c86 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/context.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/context.go
@@ -9,44 +9,20 @@ import (
)
type compileContext struct {
- typ *runtime.Type
- opcodeIndex uint32
- ptrIndex int
- indent uint32
- escapeKey bool
- structTypeToCompiledCode map[uintptr]*CompiledCode
-
- parent *compileContext
+ opcodeIndex uint32
+ ptrIndex int
+ indent uint32
+ escapeKey bool
+ structTypeToCodes map[uintptr]Opcodes
+ recursiveCodes *Opcodes
}
-func (c *compileContext) context() *compileContext {
- return &compileContext{
- typ: c.typ,
- opcodeIndex: c.opcodeIndex,
- ptrIndex: c.ptrIndex,
- indent: c.indent,
- escapeKey: c.escapeKey,
- structTypeToCompiledCode: c.structTypeToCompiledCode,
- parent: c,
- }
+func (c *compileContext) incIndent() {
+ c.indent++
}
-func (c *compileContext) withType(typ *runtime.Type) *compileContext {
- ctx := c.context()
- ctx.typ = typ
- return ctx
-}
-
-func (c *compileContext) incIndent() *compileContext {
- ctx := c.context()
- ctx.indent++
- return ctx
-}
-
-func (c *compileContext) decIndent() *compileContext {
- ctx := c.context()
- ctx.indent--
- return ctx
+func (c *compileContext) decIndent() {
+ c.indent--
}
func (c *compileContext) incIndex() {
@@ -61,30 +37,18 @@ func (c *compileContext) decIndex() {
func (c *compileContext) incOpcodeIndex() {
c.opcodeIndex++
- if c.parent != nil {
- c.parent.incOpcodeIndex()
- }
}
func (c *compileContext) decOpcodeIndex() {
c.opcodeIndex--
- if c.parent != nil {
- c.parent.decOpcodeIndex()
- }
}
func (c *compileContext) incPtrIndex() {
c.ptrIndex++
- if c.parent != nil {
- c.parent.incPtrIndex()
- }
}
func (c *compileContext) decPtrIndex() {
c.ptrIndex--
- if c.parent != nil {
- c.parent.decPtrIndex()
- }
}
const (
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/decode_rune.go b/vendor/github.com/goccy/go-json/internal/encoder/decode_rune.go
new file mode 100644
index 000000000..35c959d48
--- /dev/null
+++ b/vendor/github.com/goccy/go-json/internal/encoder/decode_rune.go
@@ -0,0 +1,126 @@
+package encoder
+
+import "unicode/utf8"
+
+const (
+ // The default lowest and highest continuation byte.
+ locb = 128 //0b10000000
+ hicb = 191 //0b10111111
+
+ // These names of these constants are chosen to give nice alignment in the
+ // table below. The first nibble is an index into acceptRanges or F for
+ // special one-byte cases. The second nibble is the Rune length or the
+ // Status for the special one-byte case.
+ xx = 0xF1 // invalid: size 1
+ as = 0xF0 // ASCII: size 1
+ s1 = 0x02 // accept 0, size 2
+ s2 = 0x13 // accept 1, size 3
+ s3 = 0x03 // accept 0, size 3
+ s4 = 0x23 // accept 2, size 3
+ s5 = 0x34 // accept 3, size 4
+ s6 = 0x04 // accept 0, size 4
+ s7 = 0x44 // accept 4, size 4
+)
+
+// first is information about the first byte in a UTF-8 sequence.
+var first = [256]uint8{
+ // 1 2 3 4 5 6 7 8 9 A B C D E F
+ as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x00-0x0F
+ as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x10-0x1F
+ as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x20-0x2F
+ as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x30-0x3F
+ as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x40-0x4F
+ as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x50-0x5F
+ as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x60-0x6F
+ as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x70-0x7F
+ // 1 2 3 4 5 6 7 8 9 A B C D E F
+ xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, // 0x80-0x8F
+ xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, // 0x90-0x9F
+ xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, // 0xA0-0xAF
+ xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, // 0xB0-0xBF
+ xx, xx, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, // 0xC0-0xCF
+ s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, // 0xD0-0xDF
+ s2, s3, s3, s3, s3, s3, s3, s3, s3, s3, s3, s3, s3, s4, s3, s3, // 0xE0-0xEF
+ s5, s6, s6, s6, s7, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, // 0xF0-0xFF
+}
+
+const (
+ lineSep = byte(168) //'\u2028'
+ paragraphSep = byte(169) //'\u2029'
+)
+
+type decodeRuneState int
+
+const (
+ validUTF8State decodeRuneState = iota
+ runeErrorState
+ lineSepState
+ paragraphSepState
+)
+
+func decodeRuneInString(s string) (decodeRuneState, int) {
+ n := len(s)
+ s0 := s[0]
+ x := first[s0]
+ if x >= as {
+ // The following code simulates an additional check for x == xx and
+ // handling the ASCII and invalid cases accordingly. This mask-and-or
+ // approach prevents an additional branch.
+ mask := rune(x) << 31 >> 31 // Create 0x0000 or 0xFFFF.
+ if rune(s[0])&^mask|utf8.RuneError&mask == utf8.RuneError {
+ return runeErrorState, 1
+ }
+ return validUTF8State, 1
+ }
+ sz := int(x & 7)
+ if n < sz {
+ return runeErrorState, 1
+ }
+ s1 := s[1]
+ switch x >> 4 {
+ case 0:
+ if s1 < locb || hicb < s1 {
+ return runeErrorState, 1
+ }
+ case 1:
+ if s1 < 0xA0 || hicb < s1 {
+ return runeErrorState, 1
+ }
+ case 2:
+ if s1 < locb || 0x9F < s1 {
+ return runeErrorState, 1
+ }
+ case 3:
+ if s1 < 0x90 || hicb < s1 {
+ return runeErrorState, 1
+ }
+ case 4:
+ if s1 < locb || 0x8F < s1 {
+ return runeErrorState, 1
+ }
+ }
+ if sz <= 2 {
+ return validUTF8State, 2
+ }
+ s2 := s[2]
+ if s2 < locb || hicb < s2 {
+ return runeErrorState, 1
+ }
+ if sz <= 3 {
+ // separator character prefixes: [2]byte{226, 128}
+ if s0 == 226 && s1 == 128 {
+ switch s2 {
+ case lineSep:
+ return lineSepState, 3
+ case paragraphSep:
+ return paragraphSepState, 3
+ }
+ }
+ return validUTF8State, 3
+ }
+ s3 := s[3]
+ if s3 < locb || hicb < s3 {
+ return runeErrorState, 1
+ }
+ return validUTF8State, 4
+}
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/encoder.go b/vendor/github.com/goccy/go-json/internal/encoder/encoder.go
index b7fa99a96..14eb6a0d6 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/encoder.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/encoder.go
@@ -101,6 +101,22 @@ type OpcodeSet struct {
InterfaceEscapeKeyCode *Opcode
CodeLength int
EndCode *Opcode
+ Code Code
+ QueryCache map[string]*OpcodeSet
+ cacheMu sync.RWMutex
+}
+
+func (s *OpcodeSet) getQueryCache(hash string) *OpcodeSet {
+ s.cacheMu.RLock()
+ codeSet := s.QueryCache[hash]
+ s.cacheMu.RUnlock()
+ return codeSet
+}
+
+func (s *OpcodeSet) setQueryCache(hash string, codeSet *OpcodeSet) {
+ s.cacheMu.Lock()
+ s.QueryCache[hash] = codeSet
+ s.cacheMu.Unlock()
}
type CompiledCode struct {
@@ -222,33 +238,56 @@ func (m *Mapslice) Swap(i, j int) {
m.Items[i], m.Items[j] = m.Items[j], m.Items[i]
}
+//nolint:structcheck,unused
+type mapIter struct {
+ key unsafe.Pointer
+ elem unsafe.Pointer
+ t unsafe.Pointer
+ h unsafe.Pointer
+ buckets unsafe.Pointer
+ bptr unsafe.Pointer
+ overflow unsafe.Pointer
+ oldoverflow unsafe.Pointer
+ startBucket uintptr
+ offset uint8
+ wrapped bool
+ B uint8
+ i uint8
+ bucket uintptr
+ checkBucket uintptr
+}
+
type MapContext struct {
- Pos []int
+ Start int
+ First int
+ Idx int
Slice *Mapslice
Buf []byte
+ Len int
+ Iter mapIter
}
var mapContextPool = sync.Pool{
New: func() interface{} {
- return &MapContext{}
+ return &MapContext{
+ Slice: &Mapslice{},
+ }
},
}
-func NewMapContext(mapLen int) *MapContext {
+func NewMapContext(mapLen int, unorderedMap bool) *MapContext {
ctx := mapContextPool.Get().(*MapContext)
- if ctx.Slice == nil {
- ctx.Slice = &Mapslice{
- Items: make([]MapItem, 0, mapLen),
+ if !unorderedMap {
+ if len(ctx.Slice.Items) < mapLen {
+ ctx.Slice.Items = make([]MapItem, mapLen)
+ } else {
+ ctx.Slice.Items = ctx.Slice.Items[:mapLen]
}
}
- if cap(ctx.Pos) < (mapLen*2 + 1) {
- ctx.Pos = make([]int, 0, mapLen*2+1)
- ctx.Slice.Items = make([]MapItem, 0, mapLen)
- } else {
- ctx.Pos = ctx.Pos[:0]
- ctx.Slice.Items = ctx.Slice.Items[:0]
- }
ctx.Buf = ctx.Buf[:0]
+ ctx.Iter = mapIter{}
+ ctx.Idx = 0
+ ctx.Len = mapLen
return ctx
}
@@ -256,17 +295,17 @@ func ReleaseMapContext(c *MapContext) {
mapContextPool.Put(c)
}
-//go:linkname MapIterInit reflect.mapiterinit
+//go:linkname MapIterInit runtime.mapiterinit
//go:noescape
-func MapIterInit(mapType *runtime.Type, m unsafe.Pointer) unsafe.Pointer
+func MapIterInit(mapType *runtime.Type, m unsafe.Pointer, it *mapIter)
//go:linkname MapIterKey reflect.mapiterkey
//go:noescape
-func MapIterKey(it unsafe.Pointer) unsafe.Pointer
+func MapIterKey(it *mapIter) unsafe.Pointer
//go:linkname MapIterNext reflect.mapiternext
//go:noescape
-func MapIterNext(it unsafe.Pointer)
+func MapIterNext(it *mapIter)
//go:linkname MapLen reflect.maplen
//go:noescape
@@ -374,7 +413,11 @@ func AppendMarshalJSON(ctx *RuntimeContext, code *Opcode, b []byte, v interface{
if !ok {
return AppendNull(ctx, b), nil
}
- b, err := marshaler.MarshalJSON(ctx.Option.Context)
+ stdctx := ctx.Option.Context
+ if ctx.Option.Flag&FieldQueryOption != 0 {
+ stdctx = SetFieldQueryToContext(stdctx, code.FieldQuery)
+ }
+ b, err := marshaler.MarshalJSON(stdctx)
if err != nil {
return nil, &errors.MarshalerError{Type: reflect.TypeOf(v), Err: err}
}
@@ -546,6 +589,8 @@ func IsNilForMarshaler(v interface{}) bool {
return rv.IsNil()
case reflect.Slice:
return rv.IsNil() || rv.Len() == 0
+ case reflect.String:
+ return rv.Len() == 0
}
return false
}
diff --git a/vendor/github.com/goccy/go-json/internal/encoder/int.go b/vendor/github.com/goccy/go-json/internal/encoder/int.go
index 3a3482d5b..85f079609 100644
--- a/vendor/github.com/goccy/go-json/internal/encoder/int.go
+++ b/vendor/github.com/goccy/go-json/internal/encoder/int.go
@@ -53,7 +53,18 @@ func numMask(numBitSize uint8) uint64 {
return 1<-
**
- sqlite3_errcode() **
- sqlite3_extended_errcode() **
- sqlite3_errmsg() **
- sqlite3_errmsg16() +**
- sqlite3_error_offset() **
+** SQLITE_STMTSTATUS_FILTER_MISS
-
+**
If the constraint comes from a WHERE clause expression that contains +** a [COLLATE operator], then the name of the collation specified by +** that COLLATE operator is returned. +**
If there is no COLLATE operator, but the column that is the subject +** of the constraint specifies an alternative collating sequence via +** a [COLLATE clause] on the column definition within the CREATE TABLE +** statement that was passed into [sqlite3_declare_vtab()], then the +** name of that alternative collating sequence is returned. +**
Otherwise, "BINARY" is returned. +**
+** ^If the sqlite3_vtab_distinct() interface returns 0, that means +** that the query planner needs the virtual table to return all rows in the +** sort order defined by the "nOrderBy" and "aOrderBy" fields of the +** [sqlite3_index_info] object. This is the default expectation. If the +** virtual table outputs all rows in sorted order, then it is always safe for +** the xBestIndex method to set the "orderByConsumed" flag, regardless of +** the return value from sqlite3_vtab_distinct(). +**
+** ^(If the sqlite3_vtab_distinct() interface returns 1, that means +** that the query planner does not need the rows to be returned in sorted order +** as long as all rows with the same values in all columns identified by the +** "aOrderBy" field are adjacent.)^ This mode is used when the query planner +** is doing a GROUP BY. +**
+** ^(If the sqlite3_vtab_distinct() interface returns 2, that means +** that the query planner does not need the rows returned in any particular +** order, as long as rows with the same values in all "aOrderBy" columns +** are adjacent.)^ ^(Furthermore, only a single row for each particular +** combination of values in the columns identified by the "aOrderBy" field +** needs to be returned.)^ ^It is always ok for two or more rows with the same +** values in all "aOrderBy" columns to be returned, as long as all such rows +** are adjacent. ^The virtual table may, if it chooses, omit extra rows +** that have the same value for all columns identified by "aOrderBy". +** ^However omitting the extra rows is optional. +** This mode is used for a DISTINCT query. +**
-
+**
+** ^A call to sqlite3_vtab_in(P,N,-1) will return true (non-zero) +** if and only if the [sqlite3_index_info|P->aConstraint][N] constraint +** is an [IN operator] that can be processed all at once. ^In other words, +** sqlite3_vtab_in() with -1 in the third argument is a mechanism +** by which the virtual table can ask SQLite if all-at-once processing +** of the IN operator is even possible. +** +**
+** ^A call to sqlite3_vtab_in(P,N,F) with F==1 or F==0 indicates +** to SQLite that the virtual table does or does not want to process +** the IN operator all-at-once, respectively. ^Thus when the third +** parameter (F) is non-negative, this interface is the mechanism by +** which the virtual table tells SQLite how it wants to process the +** IN operator. +**
-
+**
The P->aConstraintUsage[N].argvIndex value is set to a positive +** integer. This is how the virtual table tells SQLite that it wants to +** use the N-th constraint. +** +**
The last call to sqlite3_vtab_in(P,N,F) for which F was +** non-negative had F>=1. +**
+** for(rc=sqlite3_vtab_in_first(pList, &pVal);
+** rc==SQLITE_OK && pVal
+** rc=sqlite3_vtab_in_next(pList, &pVal)
+** ){
+** // do something with pVal
+** }
+** if( rc!=SQLITE_OK ){
+** // an error has occurred
+** }
+** -
**
- sqlite3_errcode() **
- sqlite3_extended_errcode() **
- sqlite3_errmsg() **
- sqlite3_errmsg16() +**
- sqlite3_error_offset() **
+** SQLITE_STMTSTATUS_FILTER_MISS
-
+**
If the constraint comes from a WHERE clause expression that contains +** a [COLLATE operator], then the name of the collation specified by +** that COLLATE operator is returned. +**
If there is no COLLATE operator, but the column that is the subject +** of the constraint specifies an alternative collating sequence via +** a [COLLATE clause] on the column definition within the CREATE TABLE +** statement that was passed into [sqlite3_declare_vtab()], then the +** name of that alternative collating sequence is returned. +**
Otherwise, "BINARY" is returned. +**
+** ^If the sqlite3_vtab_distinct() interface returns 0, that means +** that the query planner needs the virtual table to return all rows in the +** sort order defined by the "nOrderBy" and "aOrderBy" fields of the +** [sqlite3_index_info] object. This is the default expectation. If the +** virtual table outputs all rows in sorted order, then it is always safe for +** the xBestIndex method to set the "orderByConsumed" flag, regardless of +** the return value from sqlite3_vtab_distinct(). +**
+** ^(If the sqlite3_vtab_distinct() interface returns 1, that means +** that the query planner does not need the rows to be returned in sorted order +** as long as all rows with the same values in all columns identified by the +** "aOrderBy" field are adjacent.)^ This mode is used when the query planner +** is doing a GROUP BY. +**
+** ^(If the sqlite3_vtab_distinct() interface returns 2, that means +** that the query planner does not need the rows returned in any particular +** order, as long as rows with the same values in all "aOrderBy" columns +** are adjacent.)^ ^(Furthermore, only a single row for each particular +** combination of values in the columns identified by the "aOrderBy" field +** needs to be returned.)^ ^It is always ok for two or more rows with the same +** values in all "aOrderBy" columns to be returned, as long as all such rows +** are adjacent. ^The virtual table may, if it chooses, omit extra rows +** that have the same value for all columns identified by "aOrderBy". +** ^However omitting the extra rows is optional. +** This mode is used for a DISTINCT query. +**
-
+**
+** ^A call to sqlite3_vtab_in(P,N,-1) will return true (non-zero) +** if and only if the [sqlite3_index_info|P->aConstraint][N] constraint +** is an [IN operator] that can be processed all at once. ^In other words, +** sqlite3_vtab_in() with -1 in the third argument is a mechanism +** by which the virtual table can ask SQLite if all-at-once processing +** of the IN operator is even possible. +** +**
+** ^A call to sqlite3_vtab_in(P,N,F) with F==1 or F==0 indicates +** to SQLite that the virtual table does or does not want to process +** the IN operator all-at-once, respectively. ^Thus when the third +** parameter (F) is non-negative, this interface is the mechanism by +** which the virtual table tells SQLite how it wants to process the +** IN operator. +**
-
+**
The P->aConstraintUsage[N].argvIndex value is set to a positive +** integer. This is how the virtual table tells SQLite that it wants to +** use the N-th constraint. +** +**
The last call to sqlite3_vtab_in(P,N,F) for which F was +** non-negative had F>=1. +**
+** for(rc=sqlite3_vtab_in_first(pList, &pVal);
+** rc==SQLITE_OK && pVal
+** rc=sqlite3_vtab_in_next(pList, &pVal)
+** ){
+** // do something with pVal
+** }
+** if( rc!=SQLITE_OK ){
+** // an error has occurred
+** }
+** 
+
diff --git a/vendor/github.com/securego/gosec/v2/analyzer.go b/vendor/github.com/securego/gosec/v2/analyzer.go
index e696e3de5..0f9fef2d1 100644
--- a/vendor/github.com/securego/gosec/v2/analyzer.go
+++ b/vendor/github.com/securego/gosec/v2/analyzer.go
@@ -29,6 +29,7 @@ import (
"regexp"
"strconv"
"strings"
+ "sync"
"golang.org/x/tools/go/packages"
)
@@ -88,6 +89,7 @@ type Analyzer struct {
excludeGenerated bool
showIgnored bool
trackSuppressions bool
+ concurrency int
}
// SuppressionInfo object is to record the kind and the justification that used
@@ -98,7 +100,7 @@ type SuppressionInfo struct {
}
// NewAnalyzer builds a new analyzer.
-func NewAnalyzer(conf Config, tests bool, excludeGenerated bool, trackSuppressions bool, logger *log.Logger) *Analyzer {
+func NewAnalyzer(conf Config, tests bool, excludeGenerated bool, trackSuppressions bool, concurrency int, logger *log.Logger) *Analyzer {
ignoreNoSec := false
if enabled, err := conf.IsGlobalEnabled(Nosec); err == nil {
ignoreNoSec = enabled
@@ -121,6 +123,7 @@ func NewAnalyzer(conf Config, tests bool, excludeGenerated bool, trackSuppressio
stats: &Metrics{},
errors: make(map[string][]Error),
tests: tests,
+ concurrency: concurrency,
excludeGenerated: excludeGenerated,
trackSuppressions: trackSuppressions,
}
@@ -153,15 +156,64 @@ func (gosec *Analyzer) Process(buildTags []string, packagePaths ...string) error
Tests: gosec.tests,
}
- for _, pkgPath := range packagePaths {
- pkgs, err := gosec.load(pkgPath, config)
- if err != nil {
- gosec.AppendError(pkgPath, err)
+ type result struct {
+ pkgPath string
+ pkgs []*packages.Package
+ err error
+ }
+
+ results := make(chan result)
+ jobs := make(chan string, len(packagePaths))
+ quit := make(chan struct{})
+
+ var wg sync.WaitGroup
+
+ worker := func(j chan string, r chan result, quit chan struct{}) {
+ for {
+ select {
+ case s := <-j:
+ packages, err := gosec.load(s, config)
+ select {
+ case r <- result{pkgPath: s, pkgs: packages, err: err}:
+ case <-quit:
+ // we've been told to stop, probably an error while
+ // processing a previous result.
+ wg.Done()
+ return
+ }
+ default:
+ // j is empty and there are no jobs left
+ wg.Done()
+ return
+ }
}
- for _, pkg := range pkgs {
+ }
+
+ // fill the buffer
+ for _, pkgPath := range packagePaths {
+ jobs <- pkgPath
+ }
+
+ for i := 0; i < gosec.concurrency; i++ {
+ wg.Add(1)
+ go worker(jobs, results, quit)
+ }
+
+ go func() {
+ wg.Wait()
+ close(results)
+ }()
+
+ for r := range results {
+ if r.err != nil {
+ gosec.AppendError(r.pkgPath, r.err)
+ }
+ for _, pkg := range r.pkgs {
if pkg.Name != "" {
err := gosec.ParseErrors(pkg)
if err != nil {
+ close(quit)
+ wg.Wait() // wait for the goroutines to stop
return fmt.Errorf("parsing errors in pkg %q: %w", pkg.Name, err)
}
gosec.Check(pkg)
diff --git a/vendor/github.com/securego/gosec/v2/cosign.pub b/vendor/github.com/securego/gosec/v2/cosign.pub
new file mode 100644
index 000000000..c6fd55988
--- /dev/null
+++ b/vendor/github.com/securego/gosec/v2/cosign.pub
@@ -0,0 +1,4 @@
+-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEFphl7f2VuFRfsi4wqiLUCQ9xHQgV
+O2VMDNcvh+kxiymLXa+GkPzSKExFYIlVwfg13URvCiB+kFvITmLzuLiGQg==
+-----END PUBLIC KEY-----
diff --git a/vendor/github.com/securego/gosec/v2/go.mod b/vendor/github.com/securego/gosec/v2/go.mod
index 612e4dc36..7f49d4cd2 100644
--- a/vendor/github.com/securego/gosec/v2/go.mod
+++ b/vendor/github.com/securego/gosec/v2/go.mod
@@ -6,12 +6,12 @@ require (
github.com/lib/pq v1.10.4
github.com/mozilla/tls-observatory v0.0.0-20210609171429-7bc42856d2e5
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354
- github.com/onsi/ginkgo/v2 v2.0.0
- github.com/onsi/gomega v1.17.0
- golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce
+ github.com/onsi/ginkgo/v2 v2.1.3
+ github.com/onsi/gomega v1.18.1
+ golang.org/x/crypto v0.0.0-20220214200702-86341886e292
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
golang.org/x/text v0.3.7
- golang.org/x/tools v0.1.8
+ golang.org/x/tools v0.1.9
gopkg.in/yaml.v2 v2.4.0
)
diff --git a/vendor/github.com/securego/gosec/v2/go.sum b/vendor/github.com/securego/gosec/v2/go.sum
index 43777ef19..2595fffbd 100644
--- a/vendor/github.com/securego/gosec/v2/go.sum
+++ b/vendor/github.com/securego/gosec/v2/go.sum
@@ -89,7 +89,6 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/fullstorydev/grpcurl v1.6.0/go.mod h1:ZQ+ayqbKMJNhzLmbpCiurTVlaK2M/3nqZCxaQ2Ze/sM=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -258,7 +257,6 @@ github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 h1:4kuARK6Y6Fx
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354/go.mod h1:KSVJerMDfblTH7p5MZaTt+8zaT2iEk3AkVb9PQdZuE8=
github.com/nishanths/predeclared v0.0.0-20190419143655-18a43bb90ffc/go.mod h1:62PewwiQTlm/7Rj+cxVYqZvDIUc+JjZq6GHAC1fsObQ=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
-github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
@@ -268,12 +266,14 @@ github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
-github.com/onsi/ginkgo/v2 v2.0.0 h1:CcuG/HvWNkkaqCUpJifQY8z7qEMBJya6aLPx6ftGyjQ=
github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
+github.com/onsi/ginkgo/v2 v2.1.3 h1:e/3Cwtogj0HA+25nMP1jCMDIf8RtRYbGwGGuBIFztkc=
+github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.17.0 h1:9Luw4uT5HTjHTN8+aNcSThgH1vdXnmdJ8xIfZ4wyTRE=
github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
+github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
+github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
@@ -376,8 +376,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce h1:Roh6XWxHFKrPgC/EQhVubSAGQ6Ozk6IdxHSzt1mR0EI=
-golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE=
+golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -515,8 +515,9 @@ golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 h1:id054HUawV2/6IGm2IV8KZQjqtwAOo2CYlOToYqa0d0=
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -580,8 +581,8 @@ golang.org/x/tools v0.0.0-20200626171337-aa94e735be7f/go.mod h1:EkVYQZoAsY45+roY
golang.org/x/tools v0.0.0-20200630154851-b2d8b0336632/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20200706234117-b22de6825cf7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.8 h1:P1HhGGuLW4aAclzjtmJdf0mJOjVUZUzOTqkAkWL+l6w=
-golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
+golang.org/x/tools v0.1.9 h1:j9KsMiaP1c3B0OTQGth0/k+miLGTgLsAFUCrF2vLcF8=
+golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -679,7 +680,6 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
diff --git a/vendor/github.com/securego/gosec/v2/rules/tls.go b/vendor/github.com/securego/gosec/v2/rules/tls.go
index 55a6786ad..21af8e54f 100644
--- a/vendor/github.com/securego/gosec/v2/rules/tls.go
+++ b/vendor/github.com/securego/gosec/v2/rules/tls.go
@@ -88,7 +88,16 @@ func (t *insecureConfigTLS) processTLSConfVal(n *ast.KeyValueExpr, c *gosec.Cont
case "MinVersion":
if d, ok := n.Value.(*ast.Ident); ok {
- if vs, ok := d.Obj.Decl.(*ast.ValueSpec); ok && len(vs.Values) > 0 {
+ obj := d.Obj
+ if obj == nil {
+ for _, f := range c.PkgFiles {
+ obj = f.Scope.Lookup(d.Name)
+ if obj != nil {
+ break
+ }
+ }
+ }
+ if vs, ok := obj.Decl.(*ast.ValueSpec); ok && len(vs.Values) > 0 {
if s, ok := vs.Values[0].(*ast.SelectorExpr); ok {
x := s.X.(*ast.Ident).Name
sel := s.Sel.Name
diff --git a/vendor/github.com/sivchari/containedctx/README.md b/vendor/github.com/sivchari/containedctx/README.md
index 8f40499fb..0c2dd208d 100644
--- a/vendor/github.com/sivchari/containedctx/README.md
+++ b/vendor/github.com/sivchari/containedctx/README.md
@@ -2,7 +2,9 @@
[](https://github.com/sivchari/containedctx/actions/workflows/ci.yml)
-containedctx is a linter that detects struct contained context.Context field
+containedctx is a linter that detects struct contained context.Context field.
+This is discouraged technique in favour of passing context as first argument of method or function.
+For rationale please read [Contexts and structs](https://go.dev/blog/context-and-structs) the Go blog post.
## Instruction
diff --git a/vendor/github.com/spf13/cobra/MAINTAINERS b/vendor/github.com/spf13/cobra/MAINTAINERS
new file mode 100644
index 000000000..4c5ac3dd9
--- /dev/null
+++ b/vendor/github.com/spf13/cobra/MAINTAINERS
@@ -0,0 +1,13 @@
+maintainers:
+- spf13
+- johnSchnake
+- jpmcb
+- marckhouzam
+inactive:
+- anthonyfok
+- bep
+- bogem
+- broady
+- eparis
+- jharshman
+- wfernandes
diff --git a/vendor/github.com/spf13/cobra/Makefile b/vendor/github.com/spf13/cobra/Makefile
index 5880f04eb..443ef1a98 100644
--- a/vendor/github.com/spf13/cobra/Makefile
+++ b/vendor/github.com/spf13/cobra/Makefile
@@ -9,11 +9,11 @@ ifeq (, $(shell which richgo))
$(warning "could not find richgo in $(PATH), run: go get github.com/kyoh86/richgo")
endif
-.PHONY: fmt lint test cobra_generator install_deps clean
+.PHONY: fmt lint test install_deps clean
default: all
-all: fmt test cobra_generator
+all: fmt test
fmt:
$(info ******************** checking formatting ********************)
@@ -27,11 +27,6 @@ test: install_deps
$(info ******************** running tests ********************)
richgo test -v ./...
-cobra_generator: install_deps
- $(info ******************** building generator ********************)
- mkdir -p $(BIN)
- make -C cobra all
-
install_deps:
$(info ******************** downloading dependencies ********************)
go get -v ./...
diff --git a/vendor/github.com/spf13/cobra/README.md b/vendor/github.com/spf13/cobra/README.md
index 1ade1081c..7adef143b 100644
--- a/vendor/github.com/spf13/cobra/README.md
+++ b/vendor/github.com/spf13/cobra/README.md
@@ -1,13 +1,13 @@
-Cobra is both a library for creating powerful modern CLI applications as well as a program to generate applications and command files.
+Cobra is a library for creating powerful modern CLI applications.
Cobra is used in many Go projects such as [Kubernetes](http://kubernetes.io/),
[Hugo](https://gohugo.io), and [Github CLI](https://github.com/cli/cli) to
name a few. [This list](./projects_using_cobra.md) contains a more extensive list of projects using Cobra.
[](https://github.com/spf13/cobra/actions?query=workflow%3ATest)
-[](https://godoc.org/github.com/spf13/cobra)
+[](https://pkg.go.dev/github.com/spf13/cobra)
[](https://goreportcard.com/report/github.com/spf13/cobra)
[](https://gophers.slack.com/archives/CD3LP1199)
@@ -16,15 +16,11 @@ name a few. [This list](./projects_using_cobra.md) contains a more extensive lis
Cobra is a library providing a simple interface to create powerful modern CLI
interfaces similar to git & go tools.
-Cobra is also an application that will generate your application scaffolding to rapidly
-develop a Cobra-based application.
-
Cobra provides:
* Easy subcommand-based CLIs: `app server`, `app fetch`, etc.
* Fully POSIX-compliant flags (including short & long versions)
* Nested subcommands
* Global, local and cascading flags
-* Easy generation of applications & commands with `cobra init` & `cobra add cmdname`
* Intelligent suggestions (`app srver`... did you mean `app server`?)
* Automatic help generation for commands and flags
* Automatic help flag recognition of `-h`, `--help`, etc.
@@ -83,10 +79,11 @@ which maintains the same interface while adding POSIX compliance.
# Installing
Using Cobra is easy. First, use `go get` to install the latest version
-of the library. This command will install the `cobra` generator executable
-along with the library and its dependencies:
+of the library.
- go get -u github.com/spf13/cobra
+```
+go get -u github.com/spf13/cobra@latest
+```
Next, include Cobra in your application:
@@ -95,10 +92,17 @@ import "github.com/spf13/cobra"
```
# Usage
-Cobra provides its own program that will create your application and add any
-commands you want. It's the easiest way to incorporate Cobra into your application.
+`cobra-cli` is a command line program to generate cobra applications and command files.
+It will bootstrap your application scaffolding to rapidly
+develop a Cobra-based application. It is the easiest way to incorporate Cobra into your application.
-For complete details on using the Cobra generator, please read [The Cobra Generator README](https://github.com/spf13/cobra/blob/master/cobra/README.md)
+It can be installed by running:
+
+```
+go install github.com/spf13/cobra-cli@latest
+```
+
+For complete details on using the Cobra-CLI generator, please read [The Cobra Generator README](https://github.com/spf13/cobra-cli/blob/master/README.md)
For complete details on using the Cobra library, please read the [The Cobra User Guide](user_guide.md).
diff --git a/vendor/github.com/spf13/cobra/go.mod b/vendor/github.com/spf13/cobra/go.mod
index 85e169eba..2d6855911 100644
--- a/vendor/github.com/spf13/cobra/go.mod
+++ b/vendor/github.com/spf13/cobra/go.mod
@@ -6,6 +6,5 @@ require (
github.com/cpuguy83/go-md2man/v2 v2.0.1
github.com/inconshreveable/mousetrap v1.0.0
github.com/spf13/pflag v1.0.5
- github.com/spf13/viper v1.10.0
gopkg.in/yaml.v2 v2.4.0
)
diff --git a/vendor/github.com/spf13/cobra/go.sum b/vendor/github.com/spf13/cobra/go.sum
index 0ba92a6ae..431058ed0 100644
--- a/vendor/github.com/spf13/cobra/go.sum
+++ b/vendor/github.com/spf13/cobra/go.sum
@@ -1,779 +1,18 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
-cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
-cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
-cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
-cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
-cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
-cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
-cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
-cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
-cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
-cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
-cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
-cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
-cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
-cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
-cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
-cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY=
-cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM=
-cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY=
-cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ=
-cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI=
-cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4=
-cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
-cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM=
-cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
-cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
-cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
-cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
-cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
-cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
-cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY=
-cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
-cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
-cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
-cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
-cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
-cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
-cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
-cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
-github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
-github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
-github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
-github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/cpuguy83/go-md2man/v2 v2.0.1 h1:r/myEWzV9lfsM1tFLgDyu0atFtJ1fXn261LKYj/3DxU=
github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
-github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
-github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws=
-github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
-github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
-github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
-github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
-github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
-github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-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.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-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=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
-github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M=
-github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
-github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
-github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
-github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
-github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
-github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
-github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
-github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
-github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
-github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
-github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY=
-github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
-github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
-github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
-github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk=
-github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
-github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
-github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w=
-github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls=
-github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
-github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
-github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
-github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
-github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
-github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs=
-github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM=
-github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
-github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
-github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig=
-github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
-github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY=
-github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
-github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA=
-github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
-github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.10.0 h1:mXH0UwHS4D2HwWZa75im4xIQynLfblmWV7qcWpfv0yk=
-github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
-github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
-github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
-go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
-go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs=
-go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
-go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
-go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
-golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
-golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
-golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
-golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
-golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/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-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/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-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-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-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211205182925-97ca703d548d h1:FjkYO/PPp4Wi0EAUOVLxePm7qVW4r4ctbWpURyuOD0E=
-golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
-golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
-golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
-google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
-google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
-google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
-google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
-google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
-google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
-google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
-google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo=
-google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4=
-google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw=
-google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU=
-google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k=
-google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
-google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
-google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI=
-google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU=
-google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I=
-google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
-google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
-google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
-google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A=
-google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
-google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
-google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
-google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
-google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
-google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w=
-google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
-google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
-google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
-google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
-google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
-google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
-google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-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.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
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-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI=
-gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
-rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
diff --git a/vendor/github.com/spf13/cobra/projects_using_cobra.md b/vendor/github.com/spf13/cobra/projects_using_cobra.md
index 8410c9938..9674c348c 100644
--- a/vendor/github.com/spf13/cobra/projects_using_cobra.md
+++ b/vendor/github.com/spf13/cobra/projects_using_cobra.md
@@ -35,6 +35,7 @@
- [OpenShift](https://www.openshift.com/)
- [Ory Hydra](https://github.com/ory/hydra)
- [Ory Kratos](https://github.com/ory/kratos)
+- [Pixie](https://github.com/pixie-io/pixie)
- [Pouch](https://github.com/alibaba/pouch)
- [ProjectAtomic (enterprise)](http://www.projectatomic.io/)
- [Prototool](https://github.com/uber/prototool)
diff --git a/vendor/github.com/spf13/cobra/shell_completions.md b/vendor/github.com/spf13/cobra/shell_completions.md
index 03add869b..33a4c65a5 100644
--- a/vendor/github.com/spf13/cobra/shell_completions.md
+++ b/vendor/github.com/spf13/cobra/shell_completions.md
@@ -16,10 +16,12 @@ If you do not wish to use the default `completion` command, you can choose to
provide your own, which will take precedence over the default one. (This also provides
backwards-compatibility with programs that already have their own `completion` command.)
-If you are using the generator, you can create a completion command by running
+If you are using the `cobra-cli` generator,
+which can be found at [spf13/cobra-cli](https://github.com/spf13/cobra-cli),
+you can create a completion command by running
```bash
-cobra add completion
+cobra-cli add completion
```
and then modifying the generated `cmd/completion.go` file to look something like this
(writing the shell script to stdout allows the most flexible use):
diff --git a/vendor/github.com/spf13/cobra/user_guide.md b/vendor/github.com/spf13/cobra/user_guide.md
index e87cdf218..4a3c2b0da 100644
--- a/vendor/github.com/spf13/cobra/user_guide.md
+++ b/vendor/github.com/spf13/cobra/user_guide.md
@@ -29,10 +29,10 @@ func main() {
## Using the Cobra Generator
-Cobra provides its own program that will create your application and add any
+Cobra-CLI is its own program that will create your application and add any
commands you want. It's the easiest way to incorporate Cobra into your application.
-For complete details on using the Cobra generator, please read [The Cobra Generator README](https://github.com/spf13/cobra/blob/master/cobra/README.md)
+For complete details on using the Cobra generator, please refer to [The Cobra-CLI Generator README](https://github.com/spf13/cobra-cli/blob/master/README.md)
## Using the Cobra Library
@@ -86,7 +86,7 @@ var (
userLicense string
rootCmd = &cobra.Command{
- Use: "cobra",
+ Use: "cobra-cli",
Short: "A generator for Cobra based Applications",
Long: `Cobra is a CLI library for Go that empowers applications.
This application is a tool to generate the needed files
diff --git a/vendor/github.com/stretchr/testify/assert/assertion_compare.go b/vendor/github.com/stretchr/testify/assert/assertion_compare.go
index 41649d267..3bb22a971 100644
--- a/vendor/github.com/stretchr/testify/assert/assertion_compare.go
+++ b/vendor/github.com/stretchr/testify/assert/assertion_compare.go
@@ -3,6 +3,7 @@ package assert
import (
"fmt"
"reflect"
+ "time"
)
type CompareType int
@@ -30,6 +31,8 @@ var (
float64Type = reflect.TypeOf(float64(1))
stringType = reflect.TypeOf("")
+
+ timeType = reflect.TypeOf(time.Time{})
)
func compare(obj1, obj2 interface{}, kind reflect.Kind) (CompareType, bool) {
@@ -299,6 +302,27 @@ func compare(obj1, obj2 interface{}, kind reflect.Kind) (CompareType, bool) {
return compareLess, true
}
}
+ // Check for known struct types we can check for compare results.
+ case reflect.Struct:
+ {
+ // All structs enter here. We're not interested in most types.
+ if !canConvert(obj1Value, timeType) {
+ break
+ }
+
+ // time.Time can compared!
+ timeObj1, ok := obj1.(time.Time)
+ if !ok {
+ timeObj1 = obj1Value.Convert(timeType).Interface().(time.Time)
+ }
+
+ timeObj2, ok := obj2.(time.Time)
+ if !ok {
+ timeObj2 = obj2Value.Convert(timeType).Interface().(time.Time)
+ }
+
+ return compare(timeObj1.UnixNano(), timeObj2.UnixNano(), reflect.Int64)
+ }
}
return compareEqual, false
@@ -310,7 +334,10 @@ func compare(obj1, obj2 interface{}, kind reflect.Kind) (CompareType, bool) {
// assert.Greater(t, float64(2), float64(1))
// assert.Greater(t, "b", "a")
func Greater(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) bool {
- return compareTwoValues(t, e1, e2, []CompareType{compareGreater}, "\"%v\" is not greater than \"%v\"", msgAndArgs)
+ if h, ok := t.(tHelper); ok {
+ h.Helper()
+ }
+ return compareTwoValues(t, e1, e2, []CompareType{compareGreater}, "\"%v\" is not greater than \"%v\"", msgAndArgs...)
}
// GreaterOrEqual asserts that the first element is greater than or equal to the second
@@ -320,7 +347,10 @@ func Greater(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface
// assert.GreaterOrEqual(t, "b", "a")
// assert.GreaterOrEqual(t, "b", "b")
func GreaterOrEqual(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) bool {
- return compareTwoValues(t, e1, e2, []CompareType{compareGreater, compareEqual}, "\"%v\" is not greater than or equal to \"%v\"", msgAndArgs)
+ if h, ok := t.(tHelper); ok {
+ h.Helper()
+ }
+ return compareTwoValues(t, e1, e2, []CompareType{compareGreater, compareEqual}, "\"%v\" is not greater than or equal to \"%v\"", msgAndArgs...)
}
// Less asserts that the first element is less than the second
@@ -329,7 +359,10 @@ func GreaterOrEqual(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...in
// assert.Less(t, float64(1), float64(2))
// assert.Less(t, "a", "b")
func Less(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) bool {
- return compareTwoValues(t, e1, e2, []CompareType{compareLess}, "\"%v\" is not less than \"%v\"", msgAndArgs)
+ if h, ok := t.(tHelper); ok {
+ h.Helper()
+ }
+ return compareTwoValues(t, e1, e2, []CompareType{compareLess}, "\"%v\" is not less than \"%v\"", msgAndArgs...)
}
// LessOrEqual asserts that the first element is less than or equal to the second
@@ -339,7 +372,10 @@ func Less(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface{})
// assert.LessOrEqual(t, "a", "b")
// assert.LessOrEqual(t, "b", "b")
func LessOrEqual(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) bool {
- return compareTwoValues(t, e1, e2, []CompareType{compareLess, compareEqual}, "\"%v\" is not less than or equal to \"%v\"", msgAndArgs)
+ if h, ok := t.(tHelper); ok {
+ h.Helper()
+ }
+ return compareTwoValues(t, e1, e2, []CompareType{compareLess, compareEqual}, "\"%v\" is not less than or equal to \"%v\"", msgAndArgs...)
}
// Positive asserts that the specified element is positive
@@ -347,8 +383,11 @@ func LessOrEqual(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...inter
// assert.Positive(t, 1)
// assert.Positive(t, 1.23)
func Positive(t TestingT, e interface{}, msgAndArgs ...interface{}) bool {
+ if h, ok := t.(tHelper); ok {
+ h.Helper()
+ }
zero := reflect.Zero(reflect.TypeOf(e))
- return compareTwoValues(t, e, zero.Interface(), []CompareType{compareGreater}, "\"%v\" is not positive", msgAndArgs)
+ return compareTwoValues(t, e, zero.Interface(), []CompareType{compareGreater}, "\"%v\" is not positive", msgAndArgs...)
}
// Negative asserts that the specified element is negative
@@ -356,8 +395,11 @@ func Positive(t TestingT, e interface{}, msgAndArgs ...interface{}) bool {
// assert.Negative(t, -1)
// assert.Negative(t, -1.23)
func Negative(t TestingT, e interface{}, msgAndArgs ...interface{}) bool {
+ if h, ok := t.(tHelper); ok {
+ h.Helper()
+ }
zero := reflect.Zero(reflect.TypeOf(e))
- return compareTwoValues(t, e, zero.Interface(), []CompareType{compareLess}, "\"%v\" is not negative", msgAndArgs)
+ return compareTwoValues(t, e, zero.Interface(), []CompareType{compareLess}, "\"%v\" is not negative", msgAndArgs...)
}
func compareTwoValues(t TestingT, e1 interface{}, e2 interface{}, allowedComparesResults []CompareType, failMessage string, msgAndArgs ...interface{}) bool {
diff --git a/vendor/github.com/stretchr/testify/assert/assertion_compare_can_convert.go b/vendor/github.com/stretchr/testify/assert/assertion_compare_can_convert.go
new file mode 100644
index 000000000..df22c47fc
--- /dev/null
+++ b/vendor/github.com/stretchr/testify/assert/assertion_compare_can_convert.go
@@ -0,0 +1,16 @@
+//go:build go1.17
+// +build go1.17
+
+// TODO: once support for Go 1.16 is dropped, this file can be
+// merged/removed with assertion_compare_go1.17_test.go and
+// assertion_compare_legacy.go
+
+package assert
+
+import "reflect"
+
+// Wrapper around reflect.Value.CanConvert, for compatability
+// reasons.
+func canConvert(value reflect.Value, to reflect.Type) bool {
+ return value.CanConvert(to)
+}
diff --git a/vendor/github.com/stretchr/testify/assert/assertion_compare_legacy.go b/vendor/github.com/stretchr/testify/assert/assertion_compare_legacy.go
new file mode 100644
index 000000000..1701af2a3
--- /dev/null
+++ b/vendor/github.com/stretchr/testify/assert/assertion_compare_legacy.go
@@ -0,0 +1,16 @@
+//go:build !go1.17
+// +build !go1.17
+
+// TODO: once support for Go 1.16 is dropped, this file can be
+// merged/removed with assertion_compare_go1.17_test.go and
+// assertion_compare_can_convert.go
+
+package assert
+
+import "reflect"
+
+// Older versions of Go does not have the reflect.Value.CanConvert
+// method.
+func canConvert(value reflect.Value, to reflect.Type) bool {
+ return false
+}
diff --git a/vendor/github.com/stretchr/testify/assert/assertion_format.go b/vendor/github.com/stretchr/testify/assert/assertion_format.go
index 4dfd1229a..27e2420ed 100644
--- a/vendor/github.com/stretchr/testify/assert/assertion_format.go
+++ b/vendor/github.com/stretchr/testify/assert/assertion_format.go
@@ -123,6 +123,18 @@ func ErrorAsf(t TestingT, err error, target interface{}, msg string, args ...int
return ErrorAs(t, err, target, append([]interface{}{msg}, args...)...)
}
+// ErrorContainsf asserts that a function returned an error (i.e. not `nil`)
+// and that the error contains the specified substring.
+//
+// actualObj, err := SomeFunction()
+// assert.ErrorContainsf(t, err, expectedErrorSubString, "error message %s", "formatted")
+func ErrorContainsf(t TestingT, theError error, contains string, msg string, args ...interface{}) bool {
+ if h, ok := t.(tHelper); ok {
+ h.Helper()
+ }
+ return ErrorContains(t, theError, contains, append([]interface{}{msg}, args...)...)
+}
+
// ErrorIsf asserts that at least one of the errors in err's chain matches target.
// This is a wrapper for errors.Is.
func ErrorIsf(t TestingT, err error, target error, msg string, args ...interface{}) bool {
diff --git a/vendor/github.com/stretchr/testify/assert/assertion_forward.go b/vendor/github.com/stretchr/testify/assert/assertion_forward.go
index 25337a6f0..d9ea368d0 100644
--- a/vendor/github.com/stretchr/testify/assert/assertion_forward.go
+++ b/vendor/github.com/stretchr/testify/assert/assertion_forward.go
@@ -222,6 +222,30 @@ func (a *Assertions) ErrorAsf(err error, target interface{}, msg string, args ..
return ErrorAsf(a.t, err, target, msg, args...)
}
+// ErrorContains asserts that a function returned an error (i.e. not `nil`)
+// and that the error contains the specified substring.
+//
+// actualObj, err := SomeFunction()
+// a.ErrorContains(err, expectedErrorSubString)
+func (a *Assertions) ErrorContains(theError error, contains string, msgAndArgs ...interface{}) bool {
+ if h, ok := a.t.(tHelper); ok {
+ h.Helper()
+ }
+ return ErrorContains(a.t, theError, contains, msgAndArgs...)
+}
+
+// ErrorContainsf asserts that a function returned an error (i.e. not `nil`)
+// and that the error contains the specified substring.
+//
+// actualObj, err := SomeFunction()
+// a.ErrorContainsf(err, expectedErrorSubString, "error message %s", "formatted")
+func (a *Assertions) ErrorContainsf(theError error, contains string, msg string, args ...interface{}) bool {
+ if h, ok := a.t.(tHelper); ok {
+ h.Helper()
+ }
+ return ErrorContainsf(a.t, theError, contains, msg, args...)
+}
+
// ErrorIs asserts that at least one of the errors in err's chain matches target.
// This is a wrapper for errors.Is.
func (a *Assertions) ErrorIs(err error, target error, msgAndArgs ...interface{}) bool {
diff --git a/vendor/github.com/stretchr/testify/assert/assertion_order.go b/vendor/github.com/stretchr/testify/assert/assertion_order.go
index 1c3b47182..759448783 100644
--- a/vendor/github.com/stretchr/testify/assert/assertion_order.go
+++ b/vendor/github.com/stretchr/testify/assert/assertion_order.go
@@ -50,7 +50,7 @@ func isOrdered(t TestingT, object interface{}, allowedComparesResults []CompareT
// assert.IsIncreasing(t, []float{1, 2})
// assert.IsIncreasing(t, []string{"a", "b"})
func IsIncreasing(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
- return isOrdered(t, object, []CompareType{compareLess}, "\"%v\" is not less than \"%v\"", msgAndArgs)
+ return isOrdered(t, object, []CompareType{compareLess}, "\"%v\" is not less than \"%v\"", msgAndArgs...)
}
// IsNonIncreasing asserts that the collection is not increasing
@@ -59,7 +59,7 @@ func IsIncreasing(t TestingT, object interface{}, msgAndArgs ...interface{}) boo
// assert.IsNonIncreasing(t, []float{2, 1})
// assert.IsNonIncreasing(t, []string{"b", "a"})
func IsNonIncreasing(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
- return isOrdered(t, object, []CompareType{compareEqual, compareGreater}, "\"%v\" is not greater than or equal to \"%v\"", msgAndArgs)
+ return isOrdered(t, object, []CompareType{compareEqual, compareGreater}, "\"%v\" is not greater than or equal to \"%v\"", msgAndArgs...)
}
// IsDecreasing asserts that the collection is decreasing
@@ -68,7 +68,7 @@ func IsNonIncreasing(t TestingT, object interface{}, msgAndArgs ...interface{})
// assert.IsDecreasing(t, []float{2, 1})
// assert.IsDecreasing(t, []string{"b", "a"})
func IsDecreasing(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
- return isOrdered(t, object, []CompareType{compareGreater}, "\"%v\" is not greater than \"%v\"", msgAndArgs)
+ return isOrdered(t, object, []CompareType{compareGreater}, "\"%v\" is not greater than \"%v\"", msgAndArgs...)
}
// IsNonDecreasing asserts that the collection is not decreasing
@@ -77,5 +77,5 @@ func IsDecreasing(t TestingT, object interface{}, msgAndArgs ...interface{}) boo
// assert.IsNonDecreasing(t, []float{1, 2})
// assert.IsNonDecreasing(t, []string{"a", "b"})
func IsNonDecreasing(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
- return isOrdered(t, object, []CompareType{compareLess, compareEqual}, "\"%v\" is not less than or equal to \"%v\"", msgAndArgs)
+ return isOrdered(t, object, []CompareType{compareLess, compareEqual}, "\"%v\" is not less than or equal to \"%v\"", msgAndArgs...)
}
diff --git a/vendor/github.com/stretchr/testify/assert/assertions.go b/vendor/github.com/stretchr/testify/assert/assertions.go
index bcac4401f..0357b2231 100644
--- a/vendor/github.com/stretchr/testify/assert/assertions.go
+++ b/vendor/github.com/stretchr/testify/assert/assertions.go
@@ -718,10 +718,14 @@ func NotEqualValues(t TestingT, expected, actual interface{}, msgAndArgs ...inte
// return (false, false) if impossible.
// return (true, false) if element was not found.
// return (true, true) if element was found.
-func includeElement(list interface{}, element interface{}) (ok, found bool) {
+func containsElement(list interface{}, element interface{}) (ok, found bool) {
listValue := reflect.ValueOf(list)
- listKind := reflect.TypeOf(list).Kind()
+ listType := reflect.TypeOf(list)
+ if listType == nil {
+ return false, false
+ }
+ listKind := listType.Kind()
defer func() {
if e := recover(); e != nil {
ok = false
@@ -764,7 +768,7 @@ func Contains(t TestingT, s, contains interface{}, msgAndArgs ...interface{}) bo
h.Helper()
}
- ok, found := includeElement(s, contains)
+ ok, found := containsElement(s, contains)
if !ok {
return Fail(t, fmt.Sprintf("%#v could not be applied builtin len()", s), msgAndArgs...)
}
@@ -787,7 +791,7 @@ func NotContains(t TestingT, s, contains interface{}, msgAndArgs ...interface{})
h.Helper()
}
- ok, found := includeElement(s, contains)
+ ok, found := containsElement(s, contains)
if !ok {
return Fail(t, fmt.Sprintf("\"%s\" could not be applied builtin len()", s), msgAndArgs...)
}
@@ -831,7 +835,7 @@ func Subset(t TestingT, list, subset interface{}, msgAndArgs ...interface{}) (ok
for i := 0; i < subsetValue.Len(); i++ {
element := subsetValue.Index(i).Interface()
- ok, found := includeElement(list, element)
+ ok, found := containsElement(list, element)
if !ok {
return Fail(t, fmt.Sprintf("\"%s\" could not be applied builtin len()", list), msgAndArgs...)
}
@@ -852,7 +856,7 @@ func NotSubset(t TestingT, list, subset interface{}, msgAndArgs ...interface{})
h.Helper()
}
if subset == nil {
- return Fail(t, fmt.Sprintf("nil is the empty set which is a subset of every set"), msgAndArgs...)
+ return Fail(t, "nil is the empty set which is a subset of every set", msgAndArgs...)
}
subsetValue := reflect.ValueOf(subset)
@@ -875,7 +879,7 @@ func NotSubset(t TestingT, list, subset interface{}, msgAndArgs ...interface{})
for i := 0; i < subsetValue.Len(); i++ {
element := subsetValue.Index(i).Interface()
- ok, found := includeElement(list, element)
+ ok, found := containsElement(list, element)
if !ok {
return Fail(t, fmt.Sprintf("\"%s\" could not be applied builtin len()", list), msgAndArgs...)
}
@@ -1000,27 +1004,21 @@ func Condition(t TestingT, comp Comparison, msgAndArgs ...interface{}) bool {
type PanicTestFunc func()
// didPanic returns true if the function passed to it panics. Otherwise, it returns false.
-func didPanic(f PanicTestFunc) (bool, interface{}, string) {
-
- didPanic := false
- var message interface{}
- var stack string
- func() {
-
- defer func() {
- if message = recover(); message != nil {
- didPanic = true
- stack = string(debug.Stack())
- }
- }()
-
- // call the target function
- f()
+func didPanic(f PanicTestFunc) (didPanic bool, message interface{}, stack string) {
+ didPanic = true
+ defer func() {
+ message = recover()
+ if didPanic {
+ stack = string(debug.Stack())
+ }
}()
- return didPanic, message, stack
+ // call the target function
+ f()
+ didPanic = false
+ return
}
// Panics asserts that the code inside the specified PanicTestFunc panics.
@@ -1161,11 +1159,15 @@ func InDelta(t TestingT, expected, actual interface{}, delta float64, msgAndArgs
bf, bok := toFloat(actual)
if !aok || !bok {
- return Fail(t, fmt.Sprintf("Parameters must be numerical"), msgAndArgs...)
+ return Fail(t, "Parameters must be numerical", msgAndArgs...)
+ }
+
+ if math.IsNaN(af) && math.IsNaN(bf) {
+ return true
}
if math.IsNaN(af) {
- return Fail(t, fmt.Sprintf("Expected must not be NaN"), msgAndArgs...)
+ return Fail(t, "Expected must not be NaN", msgAndArgs...)
}
if math.IsNaN(bf) {
@@ -1188,7 +1190,7 @@ func InDeltaSlice(t TestingT, expected, actual interface{}, delta float64, msgAn
if expected == nil || actual == nil ||
reflect.TypeOf(actual).Kind() != reflect.Slice ||
reflect.TypeOf(expected).Kind() != reflect.Slice {
- return Fail(t, fmt.Sprintf("Parameters must be slice"), msgAndArgs...)
+ return Fail(t, "Parameters must be slice", msgAndArgs...)
}
actualSlice := reflect.ValueOf(actual)
@@ -1250,8 +1252,12 @@ func InDeltaMapValues(t TestingT, expected, actual interface{}, delta float64, m
func calcRelativeError(expected, actual interface{}) (float64, error) {
af, aok := toFloat(expected)
- if !aok {
- return 0, fmt.Errorf("expected value %q cannot be converted to float", expected)
+ bf, bok := toFloat(actual)
+ if !aok || !bok {
+ return 0, fmt.Errorf("Parameters must be numerical")
+ }
+ if math.IsNaN(af) && math.IsNaN(bf) {
+ return 0, nil
}
if math.IsNaN(af) {
return 0, errors.New("expected value must not be NaN")
@@ -1259,10 +1265,6 @@ func calcRelativeError(expected, actual interface{}) (float64, error) {
if af == 0 {
return 0, fmt.Errorf("expected value must have a value other than zero to calculate the relative error")
}
- bf, bok := toFloat(actual)
- if !bok {
- return 0, fmt.Errorf("actual value %q cannot be converted to float", actual)
- }
if math.IsNaN(bf) {
return 0, errors.New("actual value must not be NaN")
}
@@ -1298,7 +1300,7 @@ func InEpsilonSlice(t TestingT, expected, actual interface{}, epsilon float64, m
if expected == nil || actual == nil ||
reflect.TypeOf(actual).Kind() != reflect.Slice ||
reflect.TypeOf(expected).Kind() != reflect.Slice {
- return Fail(t, fmt.Sprintf("Parameters must be slice"), msgAndArgs...)
+ return Fail(t, "Parameters must be slice", msgAndArgs...)
}
actualSlice := reflect.ValueOf(actual)
@@ -1375,6 +1377,27 @@ func EqualError(t TestingT, theError error, errString string, msgAndArgs ...inte
return true
}
+// ErrorContains asserts that a function returned an error (i.e. not `nil`)
+// and that the error contains the specified substring.
+//
+// actualObj, err := SomeFunction()
+// assert.ErrorContains(t, err, expectedErrorSubString)
+func ErrorContains(t TestingT, theError error, contains string, msgAndArgs ...interface{}) bool {
+ if h, ok := t.(tHelper); ok {
+ h.Helper()
+ }
+ if !Error(t, theError, msgAndArgs...) {
+ return false
+ }
+
+ actual := theError.Error()
+ if !strings.Contains(actual, contains) {
+ return Fail(t, fmt.Sprintf("Error %#v does not contain %#v", actual, contains), msgAndArgs...)
+ }
+
+ return true
+}
+
// matchRegexp return true if a specified regexp matches a string.
func matchRegexp(rx interface{}, str interface{}) bool {
@@ -1588,12 +1611,17 @@ func diff(expected interface{}, actual interface{}) string {
}
var e, a string
- if et != reflect.TypeOf("") {
- e = spewConfig.Sdump(expected)
- a = spewConfig.Sdump(actual)
- } else {
+
+ switch et {
+ case reflect.TypeOf(""):
e = reflect.ValueOf(expected).String()
a = reflect.ValueOf(actual).String()
+ case reflect.TypeOf(time.Time{}):
+ e = spewConfigStringerEnabled.Sdump(expected)
+ a = spewConfigStringerEnabled.Sdump(actual)
+ default:
+ e = spewConfig.Sdump(expected)
+ a = spewConfig.Sdump(actual)
}
diff, _ := difflib.GetUnifiedDiffString(difflib.UnifiedDiff{
@@ -1625,6 +1653,14 @@ var spewConfig = spew.ConfigState{
MaxDepth: 10,
}
+var spewConfigStringerEnabled = spew.ConfigState{
+ Indent: " ",
+ DisablePointerAddresses: true,
+ DisableCapacities: true,
+ SortKeys: true,
+ MaxDepth: 10,
+}
+
type tHelper interface {
Helper()
}
diff --git a/vendor/github.com/stretchr/testify/mock/mock.go b/vendor/github.com/stretchr/testify/mock/mock.go
index e2e6a2d23..853da6cce 100644
--- a/vendor/github.com/stretchr/testify/mock/mock.go
+++ b/vendor/github.com/stretchr/testify/mock/mock.go
@@ -221,6 +221,14 @@ type Mock struct {
mutex sync.Mutex
}
+// String provides a %v format string for Mock.
+// Note: this is used implicitly by Arguments.Diff if a Mock is passed.
+// It exists because go's default %v formatting traverses the struct
+// without acquiring the mutex, which is detected by go test -race.
+func (m *Mock) String() string {
+ return fmt.Sprintf("%[1]T<%[1]p>", m)
+}
+
// TestData holds any data that might be useful for testing. Testify ignores
// this data completely allowing you to do whatever you like with it.
func (m *Mock) TestData() objx.Map {
@@ -720,7 +728,7 @@ func (f argumentMatcher) Matches(argument interface{}) bool {
}
func (f argumentMatcher) String() string {
- return fmt.Sprintf("func(%s) bool", f.fn.Type().In(0).Name())
+ return fmt.Sprintf("func(%s) bool", f.fn.Type().In(0).String())
}
// MatchedBy can be used to match a mock call based on only certain properties
diff --git a/vendor/github.com/tomarrell/wrapcheck/v2/wrapcheck/wrapcheck.go b/vendor/github.com/tomarrell/wrapcheck/v2/wrapcheck/wrapcheck.go
index 8168da335..8a6310501 100644
--- a/vendor/github.com/tomarrell/wrapcheck/v2/wrapcheck/wrapcheck.go
+++ b/vendor/github.com/tomarrell/wrapcheck/v2/wrapcheck/wrapcheck.go
@@ -1,6 +1,7 @@
package wrapcheck
import (
+ "fmt"
"go/ast"
"go/token"
"go/types"
@@ -13,18 +14,16 @@ import (
"golang.org/x/tools/go/analysis"
)
-var (
- DefaultIgnoreSigs = []string{
- ".Errorf(",
- "errors.New(",
- "errors.Unwrap(",
- ".Wrap(",
- ".Wrapf(",
- ".WithMessage(",
- ".WithMessagef(",
- ".WithStack(",
- }
-)
+var DefaultIgnoreSigs = []string{
+ ".Errorf(",
+ "errors.New(",
+ "errors.Unwrap(",
+ ".Wrap(",
+ ".Wrapf(",
+ ".WithMessage(",
+ ".WithMessagef(",
+ ".WithStack(",
+}
// WrapcheckConfig is the set of configuration values which configure the
// behaviour of the linter.
@@ -91,13 +90,16 @@ func NewAnalyzer(cfg WrapcheckConfig) *analysis.Analyzer {
}
func run(cfg WrapcheckConfig) func(*analysis.Pass) (interface{}, error) {
+ // Precompile the regexps, report the error
+ ignoreSigRegexp, err := compileRegexps(cfg.IgnoreSigRegexps)
+
return func(pass *analysis.Pass) (interface{}, error) {
+ if err != nil {
+ return nil, err
+ }
+
for _, file := range pass.Files {
ast.Inspect(file, func(n ast.Node) bool {
- if _, ok := n.(*ast.AssignStmt); ok {
- return true
- }
-
ret, ok := n.(*ast.ReturnStmt)
if !ok {
return true
@@ -116,8 +118,9 @@ func run(cfg WrapcheckConfig) func(*analysis.Pass) (interface{}, error) {
// If the return type of the function is a single error. This will not
// match an error within multiple return values, for that, the below
// tuple check is required.
+
if isError(pass.TypesInfo.TypeOf(expr)) {
- reportUnwrapped(pass, retFn, retFn.Pos(), cfg)
+ reportUnwrapped(pass, retFn, retFn.Pos(), cfg, ignoreSigRegexp)
return true
}
@@ -135,7 +138,7 @@ func run(cfg WrapcheckConfig) func(*analysis.Pass) (interface{}, error) {
return true
}
if isError(v.Type()) {
- reportUnwrapped(pass, retFn, expr.Pos(), cfg)
+ reportUnwrapped(pass, retFn, expr.Pos(), cfg, ignoreSigRegexp)
return true
}
}
@@ -150,9 +153,7 @@ func run(cfg WrapcheckConfig) func(*analysis.Pass) (interface{}, error) {
return true
}
- var (
- call *ast.CallExpr
- )
+ var call *ast.CallExpr
// Attempt to find the most recent short assign
if shortAss := prevErrAssign(pass, file, ident); shortAss != nil {
@@ -199,7 +200,7 @@ func run(cfg WrapcheckConfig) func(*analysis.Pass) (interface{}, error) {
return true
}
- reportUnwrapped(pass, call, ident.NamePos, cfg)
+ reportUnwrapped(pass, call, ident.NamePos, cfg, ignoreSigRegexp)
}
return true
@@ -212,7 +213,7 @@ func run(cfg WrapcheckConfig) func(*analysis.Pass) (interface{}, error) {
// Report unwrapped takes a call expression and an identifier and reports
// if the call is unwrapped.
-func reportUnwrapped(pass *analysis.Pass, call *ast.CallExpr, tokenPos token.Pos, cfg WrapcheckConfig) {
+func reportUnwrapped(pass *analysis.Pass, call *ast.CallExpr, tokenPos token.Pos, cfg WrapcheckConfig, regexps []*regexp.Regexp) {
sel, ok := call.Fun.(*ast.SelectorExpr)
if !ok {
return
@@ -220,9 +221,10 @@ func reportUnwrapped(pass *analysis.Pass, call *ast.CallExpr, tokenPos token.Pos
// Check for ignored signatures
fnSig := pass.TypesInfo.ObjectOf(sel.Sel).String()
+
if contains(cfg.IgnoreSigs, fnSig) {
return
- } else if containsMatch(cfg.IgnoreSigRegexps, fnSig) {
+ } else if containsMatch(regexps, fnSig) {
return
}
@@ -249,6 +251,9 @@ func isInterface(pass *analysis.Pass, sel *ast.SelectorExpr) bool {
return ok
}
+// isFromotherPkg returns whether the function is defined in the pacakge
+// currently under analysis or is considered external. It will ignore packages
+// defined in config.IgnorePackageGlobs.
func isFromOtherPkg(pass *analysis.Pass, sel *ast.SelectorExpr, config WrapcheckConfig) bool {
// The package of the function that we are calling which returns the error
fn := pass.TypesInfo.ObjectOf(sel.Sel)
@@ -335,14 +340,8 @@ func contains(slice []string, el string) bool {
return false
}
-func containsMatch(slice []string, el string) bool {
- for _, s := range slice {
- re, err := regexp.Compile(s)
- if err != nil {
- log.Printf("unable to parse regexp: %s\n", s)
- os.Exit(1)
- }
-
+func containsMatch(regexps []*regexp.Regexp, el string) bool {
+ for _, re := range regexps {
if re.MatchString(el) {
return true
}
@@ -369,3 +368,19 @@ func isUnresolved(file *ast.File, ident *ast.Ident) bool {
return false
}
+
+// compileRegexps compiles a set of regular expressions returning them for use,
+// or the first encountered error due to an invalid expression.
+func compileRegexps(regexps []string) ([]*regexp.Regexp, error) {
+ var compiledRegexps []*regexp.Regexp
+ for _, reg := range regexps {
+ re, err := regexp.Compile(reg)
+ if err != nil {
+ return nil, fmt.Errorf("unable to compile regexp %s: %v\n", reg, err)
+ }
+
+ compiledRegexps = append(compiledRegexps, re)
+ }
+
+ return compiledRegexps, nil
+}
diff --git a/vendor/github.com/ugorji/go/codec/binc.go b/vendor/github.com/ugorji/go/codec/binc.go
index 93d85cb4a..e54215dd4 100644
--- a/vendor/github.com/ugorji/go/codec/binc.go
+++ b/vendor/github.com/ugorji/go/codec/binc.go
@@ -811,6 +811,9 @@ func (d *bincDecDriver) DecodeBytes(bs []byte) (bsOut []byte) {
for i := 0; i < slen; i++ {
bs[i] = uint8(chkOvf.UintV(d.DecodeUint64(), 8))
}
+ for i := len(bs); i < slen; i++ {
+ bs = append(bs, uint8(chkOvf.UintV(d.DecodeUint64(), 8)))
+ }
return bs
}
var clen int
diff --git a/vendor/github.com/ugorji/go/codec/cbor.go b/vendor/github.com/ugorji/go/codec/cbor.go
index 0be358ec4..45eb822b9 100644
--- a/vendor/github.com/ugorji/go/codec/cbor.go
+++ b/vendor/github.com/ugorji/go/codec/cbor.go
@@ -610,6 +610,9 @@ func (d *cborDecDriver) DecodeBytes(bs []byte) (bsOut []byte) {
for i := 0; i < len(bs); i++ {
bs[i] = uint8(chkOvf.UintV(d.DecodeUint64(), 8))
}
+ for i := len(bs); i < slen; i++ {
+ bs = append(bs, uint8(chkOvf.UintV(d.DecodeUint64(), 8)))
+ }
return bs
}
clen := d.decLen()
diff --git a/vendor/github.com/ugorji/go/codec/decimal.go b/vendor/github.com/ugorji/go/codec/decimal.go
index 6b617f5a9..dbb338049 100644
--- a/vendor/github.com/ugorji/go/codec/decimal.go
+++ b/vendor/github.com/ugorji/go/codec/decimal.go
@@ -132,12 +132,20 @@ var fi64 = floatinfo{52, 22, 15, false, 1<<52 - 1}
var fi64u = floatinfo{0, 19, 0, true, fUint64Cutoff}
func noFrac64(fbits uint64) bool {
+ if fbits == 0 {
+ return true
+ }
+
exp := uint64(fbits>>52)&0x7FF - 1023 // uint(x>>shift)&mask - bias
// clear top 12+e bits, the integer part; if the rest is 0, then no fraction.
return exp < 52 && fbits<<(12+exp) == 0 // means there's no fractional part
}
func noFrac32(fbits uint32) bool {
+ if fbits == 0 {
+ return true
+ }
+
exp := uint32(fbits>>23)&0xFF - 127 // uint(x>>shift)&mask - bias
// clear top 9+e bits, the integer part; if the rest is 0, then no fraction.
return exp < 23 && fbits<<(9+exp) == 0 // means there's no fractional part
diff --git a/vendor/github.com/ugorji/go/codec/gen-dec-array.go.tmpl b/vendor/github.com/ugorji/go/codec/gen-dec-array.go.tmpl
index d2caa0b66..e92175059 100644
--- a/vendor/github.com/ugorji/go/codec/gen-dec-array.go.tmpl
+++ b/vendor/github.com/ugorji/go/codec/gen-dec-array.go.tmpl
@@ -78,7 +78,7 @@ if {{var "l"}} == 0 {
{{var "v"}} = {{var "v"}}[:{{var "j"}}]
{{var "c"}} = true
} else if {{var "j"}} == 0 && {{var "v"}} == nil {
- {{var "v"}} = make([]{{ .Typ }}, 0)
+ {{var "v"}} = []{{ .Typ }}{}
{{var "c"}} = true
}
{{end -}}
diff --git a/vendor/github.com/ugorji/go/codec/gen.generated.go b/vendor/github.com/ugorji/go/codec/gen.generated.go
index e72d00305..0ea79e75d 100644
--- a/vendor/github.com/ugorji/go/codec/gen.generated.go
+++ b/vendor/github.com/ugorji/go/codec/gen.generated.go
@@ -149,7 +149,7 @@ if {{var "l"}} == 0 {
{{var "v"}} = {{var "v"}}[:{{var "j"}}]
{{var "c"}} = true
} else if {{var "j"}} == 0 && {{var "v"}} == nil {
- {{var "v"}} = make([]{{ .Typ }}, 0)
+ {{var "v"}} = []{{ .Typ }}{}
{{var "c"}} = true
}
{{end -}}
diff --git a/vendor/github.com/ugorji/go/codec/go.mod b/vendor/github.com/ugorji/go/codec/go.mod
index 7fcabb473..2b3d9244c 100644
--- a/vendor/github.com/ugorji/go/codec/go.mod
+++ b/vendor/github.com/ugorji/go/codec/go.mod
@@ -2,4 +2,4 @@ module github.com/ugorji/go/codec
go 1.11
-require github.com/ugorji/go v1.2.6
+require github.com/ugorji/go v1.2.7
diff --git a/vendor/github.com/ugorji/go/codec/helper.go b/vendor/github.com/ugorji/go/codec/helper.go
index 68025c5d8..dc485a5ef 100644
--- a/vendor/github.com/ugorji/go/codec/helper.go
+++ b/vendor/github.com/ugorji/go/codec/helper.go
@@ -943,13 +943,18 @@ func (x *basicHandleRuntimeState) setExt(rt reflect.Type, tag uint64, ext Ext) (
}
rtid := rt2id(rt)
+ // handle all natively supported type appropriately, so they cannot have an extension.
+ // However, we do not return an error for these, as we do not document that.
+ // Instead, we silently treat as a no-op, and return.
switch rtid {
- case timeTypId, rawTypId, rawExtTypId:
- // these are all natively supported type, so they cannot have an extension.
- // However, we do not return an error for these, as we do not document that.
- // Instead, we silently treat as a no-op, and return.
+ case rawTypId, rawExtTypId:
return
+ case timeTypId:
+ if x.timeBuiltin {
+ return
+ }
}
+
for i := range x.extHandle {
v := &x.extHandle[i]
if v.rtid == rtid {
@@ -1966,7 +1971,7 @@ func (ti *typeInfo) init(x []structFieldInfo, n int) {
// Handling flagCanTransient
//
// We support transient optimization if the kind of the type is
-// a number, bool, string, or slice.
+// a number, bool, string, or slice (of number/bool).
// In addition, we also support if the kind is struct or array,
// and the type does not contain any pointers recursively).
//
@@ -1976,15 +1981,20 @@ func (ti *typeInfo) init(x []structFieldInfo, n int) {
// when GC tries to follow a "transient" pointer which may become a non-pointer soon after.
//
-func isCanTransient(t reflect.Type, k reflect.Kind) (v bool) {
- var bs *bitset32
+func transientBitsetFlags() *bitset32 {
if transientValueHasStringSlice {
- bs = &numBoolStrSliceBitset
- } else {
- bs = &numBoolBitset
+ return &numBoolStrSliceBitset
}
+ return &numBoolBitset
+}
+
+func isCanTransient(t reflect.Type, k reflect.Kind) (v bool) {
+ var bs = transientBitsetFlags()
if bs.isset(byte(k)) {
v = true
+ } else if k == reflect.Slice {
+ elem := t.Elem()
+ v = numBoolBitset.isset(byte(elem.Kind()))
} else if k == reflect.Array {
elem := t.Elem()
v = isCanTransient(elem, elem.Kind())
@@ -2010,8 +2020,7 @@ func (ti *typeInfo) doSetFlagCanTransient() {
ti.flagCanTransient = true
}
if ti.flagCanTransient {
- // if ti kind is a num, bool, string or slice, then it is flagCanTransient
- if !numBoolStrSliceBitset.isset(ti.kind) {
+ if !transientBitsetFlags().isset(ti.kind) {
ti.flagCanTransient = isCanTransient(ti.rt, reflect.Kind(ti.kind))
}
}
@@ -2472,13 +2481,19 @@ func panicValToErr(h errDecorator, v interface{}, err *error) {
}
func usableByteSlice(bs []byte, slen int) (out []byte, changed bool) {
+ const maxCap = 1024 * 1024 * 64 // 64MB
+ const skipMaxCap = false // allow to test
if slen <= 0 {
return []byte{}, true
}
- if cap(bs) < slen {
+ if slen <= cap(bs) {
+ return bs[:slen], false
+ }
+ // slen > cap(bs) ... handle memory overload appropriately
+ if skipMaxCap || slen <= maxCap {
return make([]byte, slen), true
}
- return bs[:slen], false
+ return make([]byte, maxCap), true
}
func mapKeyFastKindFor(k reflect.Kind) mapKeyFastKind {
diff --git a/vendor/github.com/ugorji/go/codec/helper_unsafe.go b/vendor/github.com/ugorji/go/codec/helper_unsafe.go
index 352cf4b3c..34cda6e27 100644
--- a/vendor/github.com/ugorji/go/codec/helper_unsafe.go
+++ b/vendor/github.com/ugorji/go/codec/helper_unsafe.go
@@ -376,6 +376,7 @@ func i2rtid(i interface{}) uintptr {
// --------------------------
func unsafeCmpZero(ptr unsafe.Pointer, size int) bool {
+ // verified that size is always within right range, so no chance of OOM
var s1 = unsafeString{ptr, size}
var s2 = unsafeString{unsafeZeroAddr, size}
if size > len(unsafeZeroArr) {
diff --git a/vendor/github.com/ugorji/go/codec/msgpack.go b/vendor/github.com/ugorji/go/codec/msgpack.go
index df78885a9..dc25530e7 100644
--- a/vendor/github.com/ugorji/go/codec/msgpack.go
+++ b/vendor/github.com/ugorji/go/codec/msgpack.go
@@ -851,6 +851,9 @@ func (d *msgpackDecDriver) DecodeBytes(bs []byte) (bsOut []byte) {
for i := 0; i < len(bs); i++ {
bs[i] = uint8(chkOvf.UintV(d.DecodeUint64(), 8))
}
+ for i := len(bs); i < slen; i++ {
+ bs = append(bs, uint8(chkOvf.UintV(d.DecodeUint64(), 8)))
+ }
return bs
} else {
d.d.errorf("invalid byte descriptor for decoding bytes, got: 0x%x", d.bd)
diff --git a/vendor/github.com/ugorji/go/codec/reader.go b/vendor/github.com/ugorji/go/codec/reader.go
index 802938c7d..a683d9a2a 100644
--- a/vendor/github.com/ugorji/go/codec/reader.go
+++ b/vendor/github.com/ugorji/go/codec/reader.go
@@ -8,9 +8,11 @@ import "io"
// decReader abstracts the reading source, allowing implementations that can
// read from an io.Reader or directly off a byte slice with zero-copying.
type decReader interface {
- // readx will use the implementation scratch buffer if possible i.e. n < len(scratchbuf), OR
- // just return a view of the []byte being decoded from.
+ // readx will return a view of the []byte if decoding from a []byte, OR
+ // read into the implementation scratch buffer if possible i.e. n < len(scratchbuf), OR
+ // create a new []byte and read into that
readx(n uint) []byte
+
readb([]byte)
readn1() byte
diff --git a/vendor/github.com/ugorji/go/codec/simple.go b/vendor/github.com/ugorji/go/codec/simple.go
index c3c09f1cf..e8a63717e 100644
--- a/vendor/github.com/ugorji/go/codec/simple.go
+++ b/vendor/github.com/ugorji/go/codec/simple.go
@@ -449,6 +449,9 @@ func (d *simpleDecDriver) DecodeBytes(bs []byte) (bsOut []byte) {
for i := 0; i < len(bs); i++ {
bs[i] = uint8(chkOvf.UintV(d.DecodeUint64(), 8))
}
+ for i := len(bs); i < slen; i++ {
+ bs = append(bs, uint8(chkOvf.UintV(d.DecodeUint64(), 8)))
+ }
return bs
}
diff --git a/vendor/github.com/urfave/cli/v2/.gitignore b/vendor/github.com/urfave/cli/v2/.gitignore
index 2d5e149b4..e0c50aba4 100644
--- a/vendor/github.com/urfave/cli/v2/.gitignore
+++ b/vendor/github.com/urfave/cli/v2/.gitignore
@@ -5,3 +5,6 @@ vendor
.idea
internal/*/built-example
coverage.txt
+/.local/
+
+*.exe
diff --git a/vendor/github.com/urfave/cli/v2/LICENSE b/vendor/github.com/urfave/cli/v2/LICENSE
index 42a597e29..2c84c78a1 100644
--- a/vendor/github.com/urfave/cli/v2/LICENSE
+++ b/vendor/github.com/urfave/cli/v2/LICENSE
@@ -1,6 +1,6 @@
MIT License
-Copyright (c) 2016 Jeremy Saenz & Contributors
+Copyright (c) 2022 urfave/cli maintainers
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/github.com/urfave/cli/v2/README.md b/vendor/github.com/urfave/cli/v2/README.md
index 408668bc3..6e4d698c2 100644
--- a/vendor/github.com/urfave/cli/v2/README.md
+++ b/vendor/github.com/urfave/cli/v2/README.md
@@ -1,10 +1,10 @@
cli
===
-[](https://godoc.org/github.com/urfave/cli)
+[](https://pkg.go.dev/github.com/urfave/cli/v2)
[](https://codebeat.co/projects/github-com-urfave-cli)
[](https://goreportcard.com/report/urfave/cli)
-[](https://codecov.io/gh/urfave/cli)
+[](https://codecov.io/gh/urfave/cli)
cli is a simple, fast, and fun package for building command line apps in Go. The
goal is to enable developers to write fast and distributable command line
@@ -12,7 +12,7 @@ applications in an expressive way.
## Usage Documentation
-Usage documentation exists for each major version. Don't know what version you're on? You're probably using the version from the `master` branch, which is currently `v2`.
+Usage documentation exists for each major version. Don't know what version you're on? You're probably using the version from the `main` branch, which is currently `v2`.
- `v2` - [./docs/v2/manual.md](./docs/v2/manual.md)
- `v1` - [./docs/v1/manual.md](./docs/v1/manual.md)
@@ -30,7 +30,7 @@ Go Modules are required when using this package. [See the go blog guide on using
### Using `v2` releases
```
-$ GO111MODULE=on go get github.com/urfave/cli/v2
+$ go get github.com/urfave/cli/v2
```
```go
@@ -44,7 +44,7 @@ import (
### Using `v1` releases
```
-$ GO111MODULE=on go get github.com/urfave/cli
+$ go get github.com/urfave/cli
```
```go
@@ -55,6 +55,16 @@ import (
...
```
+### Build tags
+
+You can use the following build tags:
+
+#### `urfave_cli_no_docs`
+
+When set, this removes `ToMarkdown` and `ToMan` methods, so your application
+won't be able to call those. This reduces the resulting binary size by about
+300-400 KB (measured using Go 1.18.1 on Linux/amd64), due to less dependencies.
+
### GOPATH
Make sure your `PATH` includes the `$GOPATH/bin` directory so your commands can
@@ -67,4 +77,8 @@ export PATH=$PATH:$GOPATH/bin
cli is tested against multiple versions of Go on Linux, and against the latest
released version of Go on OS X and Windows. This project uses Github Actions for
-builds. To see our currently supported go versions and platforms, look at the [./.github/workflows/cli.yml](https://github.com/urfave/cli/blob/master/.github/workflows/cli.yml).
+builds. To see our currently supported go versions and platforms, look at the [./.github/workflows/cli.yml](https://github.com/urfave/cli/blob/main/.github/workflows/cli.yml).
+
+## License
+
+See [`LICENSE`](./LICENSE)
diff --git a/vendor/github.com/urfave/cli/v2/app.go b/vendor/github.com/urfave/cli/v2/app.go
index f801fce91..52ef1b0fa 100644
--- a/vendor/github.com/urfave/cli/v2/app.go
+++ b/vendor/github.com/urfave/cli/v2/app.go
@@ -12,7 +12,7 @@ import (
)
var (
- changeLogURL = "https://github.com/urfave/cli/blob/master/docs/CHANGELOG.md"
+ changeLogURL = "https://github.com/urfave/cli/blob/main/docs/CHANGELOG.md"
appActionDeprecationURL = fmt.Sprintf("%s#deprecated-cli-app-action-signature", changeLogURL)
contactSysadmin = "This is an error in the application. Please contact the distributor of this application if this is not you."
errInvalidActionType = NewExitError("ERROR invalid Action type. "+
@@ -140,7 +140,7 @@ func (a *App) Setup() {
}
if a.HelpName == "" {
- a.HelpName = filepath.Base(os.Args[0])
+ a.HelpName = a.Name
}
if a.Usage == "" {
@@ -245,48 +245,48 @@ func (a *App) RunContext(ctx context.Context, arguments []string) (err error) {
err = parseIter(set, a, arguments[1:], shellComplete)
nerr := normalizeFlags(a.Flags, set)
- context := NewContext(a, set, &Context{Context: ctx})
+ cCtx := NewContext(a, set, &Context{Context: ctx})
if nerr != nil {
_, _ = fmt.Fprintln(a.Writer, nerr)
- _ = ShowAppHelp(context)
+ _ = ShowAppHelp(cCtx)
return nerr
}
- context.shellComplete = shellComplete
+ cCtx.shellComplete = shellComplete
- if checkCompletions(context) {
+ if checkCompletions(cCtx) {
return nil
}
if err != nil {
if a.OnUsageError != nil {
- err := a.OnUsageError(context, err, false)
- a.handleExitCoder(context, err)
+ err := a.OnUsageError(cCtx, err, false)
+ a.handleExitCoder(cCtx, err)
return err
}
_, _ = fmt.Fprintf(a.Writer, "%s %s\n\n", "Incorrect Usage.", err.Error())
- _ = ShowAppHelp(context)
+ _ = ShowAppHelp(cCtx)
return err
}
- if !a.HideHelp && checkHelp(context) {
- _ = ShowAppHelp(context)
+ if !a.HideHelp && checkHelp(cCtx) {
+ _ = ShowAppHelp(cCtx)
return nil
}
- if !a.HideVersion && checkVersion(context) {
- ShowVersion(context)
+ if !a.HideVersion && checkVersion(cCtx) {
+ ShowVersion(cCtx)
return nil
}
- cerr := checkRequiredFlags(a.Flags, context)
+ cerr := cCtx.checkRequiredFlags(a.Flags)
if cerr != nil {
- _ = ShowAppHelp(context)
+ _ = ShowAppHelp(cCtx)
return cerr
}
if a.After != nil {
defer func() {
- if afterErr := a.After(context); afterErr != nil {
+ if afterErr := a.After(cCtx); afterErr != nil {
if err != nil {
err = newMultiError(err, afterErr)
} else {
@@ -297,20 +297,20 @@ func (a *App) RunContext(ctx context.Context, arguments []string) (err error) {
}
if a.Before != nil {
- beforeErr := a.Before(context)
+ beforeErr := a.Before(cCtx)
if beforeErr != nil {
- a.handleExitCoder(context, beforeErr)
+ a.handleExitCoder(cCtx, beforeErr)
err = beforeErr
return err
}
}
- args := context.Args()
+ args := cCtx.Args()
if args.Present() {
name := args.First()
c := a.Command(name)
if c != nil {
- return c.Run(context)
+ return c.Run(cCtx)
}
}
@@ -319,16 +319,16 @@ func (a *App) RunContext(ctx context.Context, arguments []string) (err error) {
}
// Run default Action
- err = a.Action(context)
+ err = a.Action(cCtx)
- a.handleExitCoder(context, err)
+ a.handleExitCoder(cCtx, err)
return err
}
// RunAndExitOnError calls .Run() and exits non-zero if an error was returned
//
// Deprecated: instead you should return an error that fulfills cli.ExitCoder
-// to cli.App.Run. This will cause the application to exit with the given eror
+// to cli.App.Run. This will cause the application to exit with the given error
// code in the cli.ExitCoder
func (a *App) RunAndExitOnError() {
if err := a.Run(os.Args); err != nil {
@@ -359,55 +359,55 @@ func (a *App) RunAsSubcommand(ctx *Context) (err error) {
err = parseIter(set, a, ctx.Args().Tail(), ctx.shellComplete)
nerr := normalizeFlags(a.Flags, set)
- context := NewContext(a, set, ctx)
+ cCtx := NewContext(a, set, ctx)
if nerr != nil {
_, _ = fmt.Fprintln(a.Writer, nerr)
_, _ = fmt.Fprintln(a.Writer)
if len(a.Commands) > 0 {
- _ = ShowSubcommandHelp(context)
+ _ = ShowSubcommandHelp(cCtx)
} else {
- _ = ShowCommandHelp(ctx, context.Args().First())
+ _ = ShowCommandHelp(ctx, cCtx.Args().First())
}
return nerr
}
- if checkCompletions(context) {
+ if checkCompletions(cCtx) {
return nil
}
if err != nil {
if a.OnUsageError != nil {
- err = a.OnUsageError(context, err, true)
- a.handleExitCoder(context, err)
+ err = a.OnUsageError(cCtx, err, true)
+ a.handleExitCoder(cCtx, err)
return err
}
_, _ = fmt.Fprintf(a.Writer, "%s %s\n\n", "Incorrect Usage.", err.Error())
- _ = ShowSubcommandHelp(context)
+ _ = ShowSubcommandHelp(cCtx)
return err
}
if len(a.Commands) > 0 {
- if checkSubcommandHelp(context) {
+ if checkSubcommandHelp(cCtx) {
return nil
}
} else {
- if checkCommandHelp(ctx, context.Args().First()) {
+ if checkCommandHelp(ctx, cCtx.Args().First()) {
return nil
}
}
- cerr := checkRequiredFlags(a.Flags, context)
+ cerr := cCtx.checkRequiredFlags(a.Flags)
if cerr != nil {
- _ = ShowSubcommandHelp(context)
+ _ = ShowSubcommandHelp(cCtx)
return cerr
}
if a.After != nil {
defer func() {
- afterErr := a.After(context)
+ afterErr := a.After(cCtx)
if afterErr != nil {
- a.handleExitCoder(context, err)
+ a.handleExitCoder(cCtx, err)
if err != nil {
err = newMultiError(err, afterErr)
} else {
@@ -418,27 +418,27 @@ func (a *App) RunAsSubcommand(ctx *Context) (err error) {
}
if a.Before != nil {
- beforeErr := a.Before(context)
+ beforeErr := a.Before(cCtx)
if beforeErr != nil {
- a.handleExitCoder(context, beforeErr)
+ a.handleExitCoder(cCtx, beforeErr)
err = beforeErr
return err
}
}
- args := context.Args()
+ args := cCtx.Args()
if args.Present() {
name := args.First()
c := a.Command(name)
if c != nil {
- return c.Run(context)
+ return c.Run(cCtx)
}
}
// Run default Action
- err = a.Action(context)
+ err = a.Action(cCtx)
- a.handleExitCoder(context, err)
+ a.handleExitCoder(cCtx, err)
return err
}
@@ -498,9 +498,9 @@ func (a *App) appendCommand(c *Command) {
}
}
-func (a *App) handleExitCoder(context *Context, err error) {
+func (a *App) handleExitCoder(cCtx *Context, err error) {
if a.ExitErrHandler != nil {
- a.ExitErrHandler(context, err)
+ a.ExitErrHandler(cCtx, err)
} else {
HandleExitCoder(err)
}
@@ -525,14 +525,14 @@ func (a *Author) String() string {
// HandleAction attempts to figure out which Action signature was used. If
// it's an ActionFunc or a func with the legacy signature for Action, the func
// is run!
-func HandleAction(action interface{}, context *Context) (err error) {
+func HandleAction(action interface{}, cCtx *Context) (err error) {
switch a := action.(type) {
case ActionFunc:
- return a(context)
+ return a(cCtx)
case func(*Context) error:
- return a(context)
+ return a(cCtx)
case func(*Context): // deprecated function signature
- a(context)
+ a(cCtx)
return nil
}
diff --git a/vendor/github.com/urfave/cli/v2/command.go b/vendor/github.com/urfave/cli/v2/command.go
index dda2f49a0..ba0169bb1 100644
--- a/vendor/github.com/urfave/cli/v2/command.go
+++ b/vendor/github.com/urfave/cli/v2/command.go
@@ -105,39 +105,39 @@ func (c *Command) Run(ctx *Context) (err error) {
set, err := c.parseFlags(ctx.Args(), ctx.shellComplete)
- context := NewContext(ctx.App, set, ctx)
- context.Command = c
- if checkCommandCompletions(context, c.Name) {
+ cCtx := NewContext(ctx.App, set, ctx)
+ cCtx.Command = c
+ if checkCommandCompletions(cCtx, c.Name) {
return nil
}
if err != nil {
if c.OnUsageError != nil {
- err = c.OnUsageError(context, err, false)
- context.App.handleExitCoder(context, err)
+ err = c.OnUsageError(cCtx, err, false)
+ cCtx.App.handleExitCoder(cCtx, err)
return err
}
- _, _ = fmt.Fprintln(context.App.Writer, "Incorrect Usage:", err.Error())
- _, _ = fmt.Fprintln(context.App.Writer)
- _ = ShowCommandHelp(context, c.Name)
+ _, _ = fmt.Fprintln(cCtx.App.Writer, "Incorrect Usage:", err.Error())
+ _, _ = fmt.Fprintln(cCtx.App.Writer)
+ _ = ShowCommandHelp(cCtx, c.Name)
return err
}
- if checkCommandHelp(context, c.Name) {
+ if checkCommandHelp(cCtx, c.Name) {
return nil
}
- cerr := checkRequiredFlags(c.Flags, context)
+ cerr := cCtx.checkRequiredFlags(c.Flags)
if cerr != nil {
- _ = ShowCommandHelp(context, c.Name)
+ _ = ShowCommandHelp(cCtx, c.Name)
return cerr
}
if c.After != nil {
defer func() {
- afterErr := c.After(context)
+ afterErr := c.After(cCtx)
if afterErr != nil {
- context.App.handleExitCoder(context, err)
+ cCtx.App.handleExitCoder(cCtx, err)
if err != nil {
err = newMultiError(err, afterErr)
} else {
@@ -148,9 +148,9 @@ func (c *Command) Run(ctx *Context) (err error) {
}
if c.Before != nil {
- err = c.Before(context)
+ err = c.Before(cCtx)
if err != nil {
- context.App.handleExitCoder(context, err)
+ cCtx.App.handleExitCoder(cCtx, err)
return err
}
}
@@ -159,11 +159,11 @@ func (c *Command) Run(ctx *Context) (err error) {
c.Action = helpSubcommand.Action
}
- context.Command = c
- err = c.Action(context)
+ cCtx.Command = c
+ err = c.Action(cCtx)
if err != nil {
- context.App.handleExitCoder(context, err)
+ cCtx.App.handleExitCoder(cCtx, err)
}
return err
}
@@ -227,6 +227,7 @@ func (c *Command) startApp(ctx *Context) error {
}
app.Usage = c.Usage
+ app.UsageText = c.UsageText
app.Description = c.Description
app.ArgsUsage = c.ArgsUsage
@@ -243,6 +244,7 @@ func (c *Command) startApp(ctx *Context) error {
app.Version = ctx.App.Version
app.HideVersion = true
app.Compiled = ctx.App.Compiled
+ app.Reader = ctx.App.Reader
app.Writer = ctx.App.Writer
app.ErrWriter = ctx.App.ErrWriter
app.ExitErrHandler = ctx.App.ExitErrHandler
diff --git a/vendor/github.com/urfave/cli/v2/context.go b/vendor/github.com/urfave/cli/v2/context.go
index 74ed51912..6b497ed20 100644
--- a/vendor/github.com/urfave/cli/v2/context.go
+++ b/vendor/github.com/urfave/cli/v2/context.go
@@ -2,9 +2,7 @@ package cli
import (
"context"
- "errors"
"flag"
- "fmt"
"strings"
)
@@ -42,31 +40,29 @@ func NewContext(app *App, set *flag.FlagSet, parentCtx *Context) *Context {
}
// NumFlags returns the number of flags set
-func (c *Context) NumFlags() int {
- return c.flagSet.NFlag()
+func (cCtx *Context) NumFlags() int {
+ return cCtx.flagSet.NFlag()
}
// Set sets a context flag to a value.
-func (c *Context) Set(name, value string) error {
- return c.flagSet.Set(name, value)
+func (cCtx *Context) Set(name, value string) error {
+ return cCtx.flagSet.Set(name, value)
}
// IsSet determines if the flag was actually set
-func (c *Context) IsSet(name string) bool {
- if fs := lookupFlagSet(name, c); fs != nil {
- if fs := lookupFlagSet(name, c); fs != nil {
- isSet := false
- fs.Visit(func(f *flag.Flag) {
- if f.Name == name {
- isSet = true
- }
- })
- if isSet {
- return true
+func (cCtx *Context) IsSet(name string) bool {
+ if fs := cCtx.lookupFlagSet(name); fs != nil {
+ isSet := false
+ fs.Visit(func(f *flag.Flag) {
+ if f.Name == name {
+ isSet = true
}
+ })
+ if isSet {
+ return true
}
- f := lookupFlag(name, c)
+ f := cCtx.lookupFlag(name)
if f == nil {
return false
}
@@ -78,28 +74,28 @@ func (c *Context) IsSet(name string) bool {
}
// LocalFlagNames returns a slice of flag names used in this context.
-func (c *Context) LocalFlagNames() []string {
+func (cCtx *Context) LocalFlagNames() []string {
var names []string
- c.flagSet.Visit(makeFlagNameVisitor(&names))
+ cCtx.flagSet.Visit(makeFlagNameVisitor(&names))
return names
}
// FlagNames returns a slice of flag names used by the this context and all of
// its parent contexts.
-func (c *Context) FlagNames() []string {
+func (cCtx *Context) FlagNames() []string {
var names []string
- for _, ctx := range c.Lineage() {
- ctx.flagSet.Visit(makeFlagNameVisitor(&names))
+ for _, pCtx := range cCtx.Lineage() {
+ pCtx.flagSet.Visit(makeFlagNameVisitor(&names))
}
return names
}
// Lineage returns *this* context and all of its ancestor contexts in order from
// child to parent
-func (c *Context) Lineage() []*Context {
+func (cCtx *Context) Lineage() []*Context {
var lineage []*Context
- for cur := c; cur != nil; cur = cur.parentContext {
+ for cur := cCtx; cur != nil; cur = cur.parentContext {
lineage = append(lineage, cur)
}
@@ -107,23 +103,26 @@ func (c *Context) Lineage() []*Context {
}
// Value returns the value of the flag corresponding to `name`
-func (c *Context) Value(name string) interface{} {
- return c.flagSet.Lookup(name).Value.(flag.Getter).Get()
+func (cCtx *Context) Value(name string) interface{} {
+ if fs := cCtx.lookupFlagSet(name); fs != nil {
+ return fs.Lookup(name).Value.(flag.Getter).Get()
+ }
+ return nil
}
// Args returns the command line arguments associated with the context.
-func (c *Context) Args() Args {
- ret := args(c.flagSet.Args())
+func (cCtx *Context) Args() Args {
+ ret := args(cCtx.flagSet.Args())
return &ret
}
// NArg returns the number of the command line arguments.
-func (c *Context) NArg() int {
- return c.Args().Len()
+func (cCtx *Context) NArg() int {
+ return cCtx.Args().Len()
}
-func lookupFlag(name string, ctx *Context) Flag {
- for _, c := range ctx.Lineage() {
+func (cCtx *Context) lookupFlag(name string) Flag {
+ for _, c := range cCtx.Lineage() {
if c.Command == nil {
continue
}
@@ -137,8 +136,8 @@ func lookupFlag(name string, ctx *Context) Flag {
}
}
- if ctx.App != nil {
- for _, f := range ctx.App.Flags {
+ if cCtx.App != nil {
+ for _, f := range cCtx.App.Flags {
for _, n := range f.Names() {
if n == name {
return f
@@ -150,8 +149,11 @@ func lookupFlag(name string, ctx *Context) Flag {
return nil
}
-func lookupFlagSet(name string, ctx *Context) *flag.FlagSet {
- for _, c := range ctx.Lineage() {
+func (cCtx *Context) lookupFlagSet(name string) *flag.FlagSet {
+ for _, c := range cCtx.Lineage() {
+ if c.flagSet == nil {
+ continue
+ }
if f := c.flagSet.Lookup(name); f != nil {
return c.flagSet
}
@@ -160,45 +162,33 @@ func lookupFlagSet(name string, ctx *Context) *flag.FlagSet {
return nil
}
-func copyFlag(name string, ff *flag.Flag, set *flag.FlagSet) {
- switch ff.Value.(type) {
- case Serializer:
- _ = set.Set(name, ff.Value.(Serializer).Serialize())
- default:
- _ = set.Set(name, ff.Value.String())
- }
-}
-
-func normalizeFlags(flags []Flag, set *flag.FlagSet) error {
- visited := make(map[string]bool)
- set.Visit(func(f *flag.Flag) {
- visited[f.Name] = true
- })
+func (cCtx *Context) checkRequiredFlags(flags []Flag) requiredFlagsErr {
+ var missingFlags []string
for _, f := range flags {
- parts := f.Names()
- if len(parts) == 1 {
- continue
- }
- var ff *flag.Flag
- for _, name := range parts {
- name = strings.Trim(name, " ")
- if visited[name] {
- if ff != nil {
- return errors.New("Cannot use two forms of the same flag: " + name + " " + ff.Name)
+ if rf, ok := f.(RequiredFlag); ok && rf.IsRequired() {
+ var flagPresent bool
+ var flagName string
+
+ for _, key := range f.Names() {
+ if len(key) > 1 {
+ flagName = key
+ }
+
+ if cCtx.IsSet(strings.TrimSpace(key)) {
+ flagPresent = true
}
- ff = set.Lookup(name)
}
- }
- if ff == nil {
- continue
- }
- for _, name := range parts {
- name = strings.Trim(name, " ")
- if !visited[name] {
- copyFlag(name, ff, set)
+
+ if !flagPresent && flagName != "" {
+ missingFlags = append(missingFlags, flagName)
}
}
}
+
+ if len(missingFlags) != 0 {
+ return &errRequiredFlags{missingFlags: missingFlags}
+ }
+
return nil
}
@@ -219,55 +209,3 @@ func makeFlagNameVisitor(names *[]string) func(*flag.Flag) {
}
}
}
-
-type requiredFlagsErr interface {
- error
- getMissingFlags() []string
-}
-
-type errRequiredFlags struct {
- missingFlags []string
-}
-
-func (e *errRequiredFlags) Error() string {
- numberOfMissingFlags := len(e.missingFlags)
- if numberOfMissingFlags == 1 {
- return fmt.Sprintf("Required flag %q not set", e.missingFlags[0])
- }
- joinedMissingFlags := strings.Join(e.missingFlags, ", ")
- return fmt.Sprintf("Required flags %q not set", joinedMissingFlags)
-}
-
-func (e *errRequiredFlags) getMissingFlags() []string {
- return e.missingFlags
-}
-
-func checkRequiredFlags(flags []Flag, context *Context) requiredFlagsErr {
- var missingFlags []string
- for _, f := range flags {
- if rf, ok := f.(RequiredFlag); ok && rf.IsRequired() {
- var flagPresent bool
- var flagName string
-
- for _, key := range f.Names() {
- if len(key) > 1 {
- flagName = key
- }
-
- if context.IsSet(strings.TrimSpace(key)) {
- flagPresent = true
- }
- }
-
- if !flagPresent && flagName != "" {
- missingFlags = append(missingFlags, flagName)
- }
- }
- }
-
- if len(missingFlags) != 0 {
- return &errRequiredFlags{missingFlags: missingFlags}
- }
-
- return nil
-}
diff --git a/vendor/github.com/urfave/cli/v2/docs.go b/vendor/github.com/urfave/cli/v2/docs.go
index dc16fc82d..8b1c9c8a2 100644
--- a/vendor/github.com/urfave/cli/v2/docs.go
+++ b/vendor/github.com/urfave/cli/v2/docs.go
@@ -1,3 +1,6 @@
+//go:build !urfave_cli_no_docs
+// +build !urfave_cli_no_docs
+
package cli
import (
@@ -15,31 +18,39 @@ import (
// The function errors if either parsing or writing of the string fails.
func (a *App) ToMarkdown() (string, error) {
var w bytes.Buffer
- if err := a.writeDocTemplate(&w); err != nil {
+ if err := a.writeDocTemplate(&w, 0); err != nil {
return "", err
}
return w.String(), nil
}
-// ToMan creates a man page string for the `*App`
+// ToMan creates a man page string with section number for the `*App`
// The function errors if either parsing or writing of the string fails.
-func (a *App) ToMan() (string, error) {
+func (a *App) ToManWithSection(sectionNumber int) (string, error) {
var w bytes.Buffer
- if err := a.writeDocTemplate(&w); err != nil {
+ if err := a.writeDocTemplate(&w, sectionNumber); err != nil {
return "", err
}
man := md2man.Render(w.Bytes())
return string(man), nil
}
+// ToMan creates a man page string for the `*App`
+// The function errors if either parsing or writing of the string fails.
+func (a *App) ToMan() (string, error) {
+ man, err := a.ToManWithSection(8)
+ return man, err
+}
+
type cliTemplate struct {
App *App
+ SectionNum int
Commands []string
GlobalArgs []string
SynopsisArgs []string
}
-func (a *App) writeDocTemplate(w io.Writer) error {
+func (a *App) writeDocTemplate(w io.Writer, sectionNum int) error {
const name = "cli"
t, err := template.New(name).Parse(MarkdownDocTemplate)
if err != nil {
@@ -47,6 +58,7 @@ func (a *App) writeDocTemplate(w io.Writer) error {
}
return t.ExecuteTemplate(w, name, &cliTemplate{
App: a,
+ SectionNum: sectionNum,
Commands: prepareCommands(a.Commands, 0),
GlobalArgs: prepareArgsWithValues(a.VisibleFlags()),
SynopsisArgs: prepareArgsSynopsis(a.VisibleFlags()),
@@ -59,25 +71,26 @@ func prepareCommands(commands []*Command, level int) []string {
if command.Hidden {
continue
}
- usage := ""
- if command.Usage != "" {
- usage = command.Usage
- }
- prepared := fmt.Sprintf("%s %s\n\n%s\n",
+ usageText := prepareUsageText(command)
+
+ usage := prepareUsage(command, usageText)
+
+ prepared := fmt.Sprintf("%s %s\n\n%s%s",
strings.Repeat("#", level+2),
strings.Join(command.Names(), ", "),
usage,
+ usageText,
)
- flags := prepareArgsWithValues(command.Flags)
+ flags := prepareArgsWithValues(command.VisibleFlags())
if len(flags) > 0 {
prepared += fmt.Sprintf("\n%s", strings.Join(flags, "\n"))
}
coms = append(coms, prepared)
- // recursevly iterate subcommands
+ // recursively iterate subcommands
if len(command.Subcommands) > 0 {
coms = append(
coms,
@@ -146,3 +159,40 @@ func flagDetails(flag DocGenerationFlag) string {
}
return ": " + description
}
+
+func prepareUsageText(command *Command) string {
+ if command.UsageText == "" {
+ return ""
+ }
+
+ // Remove leading and trailing newlines
+ preparedUsageText := strings.Trim(command.UsageText, "\n")
+
+ var usageText string
+ if strings.Contains(preparedUsageText, "\n") {
+ // Format multi-line string as a code block using the 4 space schema to allow for embedded markdown such
+ // that it will not break the continuous code block.
+ for _, ln := range strings.Split(preparedUsageText, "\n") {
+ usageText += fmt.Sprintf(" %s\n", ln)
+ }
+ } else {
+ // Style a single line as a note
+ usageText = fmt.Sprintf(">%s\n", preparedUsageText)
+ }
+
+ return usageText
+}
+
+func prepareUsage(command *Command, usageText string) string {
+ if command.Usage == "" {
+ return ""
+ }
+
+ usage := command.Usage + "\n"
+ // Add a newline to the Usage IFF there is a UsageText
+ if usageText != "" {
+ usage += "\n"
+ }
+
+ return usage
+}
diff --git a/vendor/github.com/urfave/cli/v2/errors.go b/vendor/github.com/urfave/cli/v2/errors.go
index 751ef9b16..8f641fb64 100644
--- a/vendor/github.com/urfave/cli/v2/errors.go
+++ b/vendor/github.com/urfave/cli/v2/errors.go
@@ -47,6 +47,28 @@ func (m *multiError) Errors() []error {
return errs
}
+type requiredFlagsErr interface {
+ error
+ getMissingFlags() []string
+}
+
+type errRequiredFlags struct {
+ missingFlags []string
+}
+
+func (e *errRequiredFlags) Error() string {
+ numberOfMissingFlags := len(e.missingFlags)
+ if numberOfMissingFlags == 1 {
+ return fmt.Sprintf("Required flag %q not set", e.missingFlags[0])
+ }
+ joinedMissingFlags := strings.Join(e.missingFlags, ", ")
+ return fmt.Sprintf("Required flags %q not set", joinedMissingFlags)
+}
+
+func (e *errRequiredFlags) getMissingFlags() []string {
+ return e.missingFlags
+}
+
// ErrorFormatter is the interface that will suitably format the error output
type ErrorFormatter interface {
Format(s fmt.State, verb rune)
diff --git a/vendor/github.com/urfave/cli/v2/fish.go b/vendor/github.com/urfave/cli/v2/fish.go
index 588e070ea..eec3253cd 100644
--- a/vendor/github.com/urfave/cli/v2/fish.go
+++ b/vendor/github.com/urfave/cli/v2/fish.go
@@ -95,7 +95,7 @@ func (a *App) prepareFishCommands(commands []*Command, allCommands *[]string, pr
completions = append(completions, completion.String())
completions = append(
completions,
- a.prepareFishFlags(command.Flags, command.Names())...,
+ a.prepareFishFlags(command.VisibleFlags(), command.Names())...,
)
// recursevly iterate subcommands
diff --git a/vendor/github.com/urfave/cli/v2/flag.go b/vendor/github.com/urfave/cli/v2/flag.go
index ad97c2d05..d2a33f01f 100644
--- a/vendor/github.com/urfave/cli/v2/flag.go
+++ b/vendor/github.com/urfave/cli/v2/flag.go
@@ -1,10 +1,10 @@
package cli
import (
+ "errors"
"flag"
"fmt"
"io/ioutil"
- "reflect"
"regexp"
"runtime"
"strconv"
@@ -116,6 +116,20 @@ type DocGenerationFlag interface {
// GetValue returns the flags value as string representation and an empty
// string if the flag takes no value at all.
GetValue() string
+
+ // GetDefaultText returns the default text for this flag
+ GetDefaultText() string
+
+ // GetEnvVars returns the env vars for this flag
+ GetEnvVars() []string
+}
+
+// VisibleFlag is an interface that allows to check if a flag is visible
+type VisibleFlag interface {
+ Flag
+
+ // IsVisible returns true if the flag is not hidden, otherwise false
+ IsVisible() bool
}
func flagSet(name string, flags []Flag) (*flag.FlagSet, error) {
@@ -130,11 +144,52 @@ func flagSet(name string, flags []Flag) (*flag.FlagSet, error) {
return set, nil
}
+func copyFlag(name string, ff *flag.Flag, set *flag.FlagSet) {
+ switch ff.Value.(type) {
+ case Serializer:
+ _ = set.Set(name, ff.Value.(Serializer).Serialize())
+ default:
+ _ = set.Set(name, ff.Value.String())
+ }
+}
+
+func normalizeFlags(flags []Flag, set *flag.FlagSet) error {
+ visited := make(map[string]bool)
+ set.Visit(func(f *flag.Flag) {
+ visited[f.Name] = true
+ })
+ for _, f := range flags {
+ parts := f.Names()
+ if len(parts) == 1 {
+ continue
+ }
+ var ff *flag.Flag
+ for _, name := range parts {
+ name = strings.Trim(name, " ")
+ if visited[name] {
+ if ff != nil {
+ return errors.New("Cannot use two forms of the same flag: " + name + " " + ff.Name)
+ }
+ ff = set.Lookup(name)
+ }
+ }
+ if ff == nil {
+ continue
+ }
+ for _, name := range parts {
+ name = strings.Trim(name, " ")
+ if !visited[name] {
+ copyFlag(name, ff, set)
+ }
+ }
+ }
+ return nil
+}
+
func visibleFlags(fl []Flag) []Flag {
var visible []Flag
for _, f := range fl {
- field := flagValue(f).FieldByName("Hidden")
- if !field.IsValid() || !field.Bool() {
+ if vf, ok := f.(VisibleFlag); ok && vf.IsVisible() {
visible = append(visible, f)
}
}
@@ -188,7 +243,7 @@ func prefixedNames(names []string, placeholder string) string {
func withEnvHint(envVars []string, str string) string {
envText := ""
- if envVars != nil && len(envVars) > 0 {
+ if len(envVars) > 0 {
prefix := "$"
suffix := ""
sep := ", $"
@@ -217,17 +272,6 @@ func flagNames(name string, aliases []string) []string {
return ret
}
-func flagStringSliceField(f Flag, name string) []string {
- fv := flagValue(f)
- field := fv.FieldByName(name)
-
- if field.IsValid() {
- return field.Interface().([]string)
- }
-
- return []string{}
-}
-
func withFileHint(filePath, str string) string {
fileText := ""
if filePath != "" {
@@ -236,68 +280,34 @@ func withFileHint(filePath, str string) string {
return str + fileText
}
-func flagValue(f Flag) reflect.Value {
- fv := reflect.ValueOf(f)
- for fv.Kind() == reflect.Ptr {
- fv = reflect.Indirect(fv)
- }
- return fv
-}
-
func formatDefault(format string) string {
return " (default: " + format + ")"
}
func stringifyFlag(f Flag) string {
- fv := flagValue(f)
-
- switch f := f.(type) {
- case *IntSliceFlag:
- return withEnvHint(flagStringSliceField(f, "EnvVars"),
- stringifyIntSliceFlag(f))
- case *Int64SliceFlag:
- return withEnvHint(flagStringSliceField(f, "EnvVars"),
- stringifyInt64SliceFlag(f))
- case *Float64SliceFlag:
- return withEnvHint(flagStringSliceField(f, "EnvVars"),
- stringifyFloat64SliceFlag(f))
- case *StringSliceFlag:
- return withEnvHint(flagStringSliceField(f, "EnvVars"),
- stringifyStringSliceFlag(f))
+ // enforce DocGeneration interface on flags to avoid reflection
+ df, ok := f.(DocGenerationFlag)
+ if !ok {
+ return ""
}
- placeholder, usage := unquoteUsage(fv.FieldByName("Usage").String())
-
- needsPlaceholder := false
- defaultValueString := ""
- val := fv.FieldByName("Value")
- if val.IsValid() {
- needsPlaceholder = val.Kind() != reflect.Bool
- defaultValueString = fmt.Sprintf(formatDefault("%v"), val.Interface())
-
- if val.Kind() == reflect.String && val.String() != "" {
- defaultValueString = fmt.Sprintf(formatDefault("%q"), val.String())
- }
- }
-
- helpText := fv.FieldByName("DefaultText")
- if helpText.IsValid() && helpText.String() != "" {
- needsPlaceholder = val.Kind() != reflect.Bool
- defaultValueString = fmt.Sprintf(formatDefault("%s"), helpText.String())
- }
-
- if defaultValueString == formatDefault("") {
- defaultValueString = ""
- }
+ placeholder, usage := unquoteUsage(df.GetUsage())
+ needsPlaceholder := df.TakesValue()
if needsPlaceholder && placeholder == "" {
placeholder = defaultPlaceholder
}
+ defaultValueString := ""
+
+ if s := df.GetDefaultText(); s != "" {
+ defaultValueString = fmt.Sprintf(formatDefault("%s"), s)
+ }
+
usageWithDefault := strings.TrimSpace(usage + defaultValueString)
- return withEnvHint(flagStringSliceField(f, "EnvVars"),
- fmt.Sprintf("%s\t%s", prefixedNames(f.Names(), placeholder), usageWithDefault))
+ return withEnvHint(df.GetEnvVars(),
+ fmt.Sprintf("%s\t%s", prefixedNames(df.Names(), placeholder), usageWithDefault))
}
func stringifyIntSliceFlag(f *IntSliceFlag) string {
@@ -359,7 +369,11 @@ func stringifySliceFlag(usage string, names, defaultVals []string) string {
}
usageWithDefault := strings.TrimSpace(fmt.Sprintf("%s%s", usage, defaultVal))
- return fmt.Sprintf("%s\t%s", prefixedNames(names, placeholder), usageWithDefault)
+ multiInputString := "(accepts multiple inputs)"
+ if usageWithDefault != "" {
+ multiInputString = "\t" + multiInputString
+ }
+ return fmt.Sprintf("%s\t%s%s", prefixedNames(names, placeholder), usageWithDefault, multiInputString)
}
func hasFlag(flags []Flag, fl Flag) bool {
@@ -380,9 +394,15 @@ func flagFromEnvOrFile(envVars []string, filePath string) (val string, ok bool)
}
}
for _, fileVar := range strings.Split(filePath, ",") {
- if data, err := ioutil.ReadFile(fileVar); err == nil {
- return string(data), true
+ if fileVar != "" {
+ if data, err := ioutil.ReadFile(fileVar); err == nil {
+ return string(data), true
+ }
}
}
return "", false
}
+
+func flagSplitMultiValues(val string) []string {
+ return strings.Split(val, ",")
+}
diff --git a/vendor/github.com/urfave/cli/v2/flag_bool.go b/vendor/github.com/urfave/cli/v2/flag_bool.go
index bc9ea35d0..6e832f964 100644
--- a/vendor/github.com/urfave/cli/v2/flag_bool.go
+++ b/vendor/github.com/urfave/cli/v2/flag_bool.go
@@ -58,6 +58,24 @@ func (f *BoolFlag) GetValue() string {
return ""
}
+// IsVisible returns true if the flag is not hidden, otherwise false
+func (f *BoolFlag) IsVisible() bool {
+ return !f.Hidden
+}
+
+// GetDefaultText returns the default text for this flag
+func (f *BoolFlag) GetDefaultText() string {
+ if f.DefaultText != "" {
+ return f.DefaultText
+ }
+ return fmt.Sprintf("%v", f.Value)
+}
+
+// GetEnvVars returns the env vars for this flag
+func (f *BoolFlag) GetEnvVars() []string {
+ return f.EnvVars
+}
+
// Apply populates the flag given the flag set and environment
func (f *BoolFlag) Apply(set *flag.FlagSet) error {
if val, ok := flagFromEnvOrFile(f.EnvVars, f.FilePath); ok {
@@ -86,8 +104,8 @@ func (f *BoolFlag) Apply(set *flag.FlagSet) error {
// Bool looks up the value of a local BoolFlag, returns
// false if not found
-func (c *Context) Bool(name string) bool {
- if fs := lookupFlagSet(name, c); fs != nil {
+func (cCtx *Context) Bool(name string) bool {
+ if fs := cCtx.lookupFlagSet(name); fs != nil {
return lookupBool(name, fs)
}
return false
diff --git a/vendor/github.com/urfave/cli/v2/flag_duration.go b/vendor/github.com/urfave/cli/v2/flag_duration.go
index 22a2e6720..d30bd1d6c 100644
--- a/vendor/github.com/urfave/cli/v2/flag_duration.go
+++ b/vendor/github.com/urfave/cli/v2/flag_duration.go
@@ -58,6 +58,24 @@ func (f *DurationFlag) GetValue() string {
return f.Value.String()
}
+// IsVisible returns true if the flag is not hidden, otherwise false
+func (f *DurationFlag) IsVisible() bool {
+ return !f.Hidden
+}
+
+// GetDefaultText returns the default text for this flag
+func (f *DurationFlag) GetDefaultText() string {
+ if f.DefaultText != "" {
+ return f.DefaultText
+ }
+ return f.GetValue()
+}
+
+// GetEnvVars returns the env vars for this flag
+func (f *DurationFlag) GetEnvVars() []string {
+ return f.EnvVars
+}
+
// Apply populates the flag given the flag set and environment
func (f *DurationFlag) Apply(set *flag.FlagSet) error {
if val, ok := flagFromEnvOrFile(f.EnvVars, f.FilePath); ok {
@@ -85,8 +103,8 @@ func (f *DurationFlag) Apply(set *flag.FlagSet) error {
// Duration looks up the value of a local DurationFlag, returns
// 0 if not found
-func (c *Context) Duration(name string) time.Duration {
- if fs := lookupFlagSet(name, c); fs != nil {
+func (cCtx *Context) Duration(name string) time.Duration {
+ if fs := cCtx.lookupFlagSet(name); fs != nil {
return lookupDuration(name, fs)
}
return 0
diff --git a/vendor/github.com/urfave/cli/v2/flag_float64.go b/vendor/github.com/urfave/cli/v2/flag_float64.go
index 91c778c87..f11bef3a7 100644
--- a/vendor/github.com/urfave/cli/v2/flag_float64.go
+++ b/vendor/github.com/urfave/cli/v2/flag_float64.go
@@ -55,15 +55,32 @@ func (f *Float64Flag) GetUsage() string {
// GetValue returns the flags value as string representation and an empty
// string if the flag takes no value at all.
func (f *Float64Flag) GetValue() string {
- return fmt.Sprintf("%f", f.Value)
+ return fmt.Sprintf("%v", f.Value)
+}
+
+// GetDefaultText returns the default text for this flag
+func (f *Float64Flag) GetDefaultText() string {
+ if f.DefaultText != "" {
+ return f.DefaultText
+ }
+ return f.GetValue()
+}
+
+// GetEnvVars returns the env vars for this flag
+func (f *Float64Flag) GetEnvVars() []string {
+ return f.EnvVars
+}
+
+// IsVisible returns true if the flag is not hidden, otherwise false
+func (f *Float64Flag) IsVisible() bool {
+ return !f.Hidden
}
// Apply populates the flag given the flag set and environment
func (f *Float64Flag) Apply(set *flag.FlagSet) error {
if val, ok := flagFromEnvOrFile(f.EnvVars, f.FilePath); ok {
if val != "" {
- valFloat, err := strconv.ParseFloat(val, 10)
-
+ valFloat, err := strconv.ParseFloat(val, 64)
if err != nil {
return fmt.Errorf("could not parse %q as float64 value for flag %s: %s", val, f.Name, err)
}
@@ -86,8 +103,8 @@ func (f *Float64Flag) Apply(set *flag.FlagSet) error {
// Float64 looks up the value of a local Float64Flag, returns
// 0 if not found
-func (c *Context) Float64(name string) float64 {
- if fs := lookupFlagSet(name, c); fs != nil {
+func (cCtx *Context) Float64(name string) float64 {
+ if fs := cCtx.lookupFlagSet(name); fs != nil {
return lookupFloat64(name, fs)
}
return 0
diff --git a/vendor/github.com/urfave/cli/v2/flag_float64_slice.go b/vendor/github.com/urfave/cli/v2/flag_float64_slice.go
index 706ee6cd4..219c50150 100644
--- a/vendor/github.com/urfave/cli/v2/flag_float64_slice.go
+++ b/vendor/github.com/urfave/cli/v2/flag_float64_slice.go
@@ -19,6 +19,16 @@ func NewFloat64Slice(defaults ...float64) *Float64Slice {
return &Float64Slice{slice: append([]float64{}, defaults...)}
}
+// clone allocate a copy of self object
+func (f *Float64Slice) clone() *Float64Slice {
+ n := &Float64Slice{
+ slice: make([]float64, len(f.slice)),
+ hasBeenSet: f.hasBeenSet,
+ }
+ copy(n.slice, f.slice)
+ return n
+}
+
// Set parses the value into a float64 and appends it to the list of values
func (f *Float64Slice) Set(value string) error {
if !f.hasBeenSet {
@@ -33,12 +43,14 @@ func (f *Float64Slice) Set(value string) error {
return nil
}
- tmp, err := strconv.ParseFloat(value, 64)
- if err != nil {
- return err
- }
+ for _, s := range flagSplitMultiValues(value) {
+ tmp, err := strconv.ParseFloat(strings.TrimSpace(s), 64)
+ if err != nil {
+ return err
+ }
- f.slice = append(f.slice, tmp)
+ f.slice = append(f.slice, tmp)
+ }
return nil
}
@@ -85,7 +97,7 @@ func (f *Float64SliceFlag) IsSet() bool {
// String returns a readable representation of this value
// (for usage defaults)
func (f *Float64SliceFlag) String() string {
- return FlagStringer(f)
+ return withEnvHint(f.GetEnvVars(), stringifyFloat64SliceFlag(f))
}
// Names returns the names of the flag
@@ -117,27 +129,49 @@ func (f *Float64SliceFlag) GetValue() string {
return ""
}
+// IsVisible returns true if the flag is not hidden, otherwise false
+func (f *Float64SliceFlag) IsVisible() bool {
+ return !f.Hidden
+}
+
+// GetDefaultText returns the default text for this flag
+func (f *Float64SliceFlag) GetDefaultText() string {
+ if f.DefaultText != "" {
+ return f.DefaultText
+ }
+ return f.GetValue()
+}
+
+// GetEnvVars returns the env vars for this flag
+func (f *Float64SliceFlag) GetEnvVars() []string {
+ return f.EnvVars
+}
+
// Apply populates the flag given the flag set and environment
func (f *Float64SliceFlag) Apply(set *flag.FlagSet) error {
if val, ok := flagFromEnvOrFile(f.EnvVars, f.FilePath); ok {
if val != "" {
f.Value = &Float64Slice{}
- for _, s := range strings.Split(val, ",") {
+ for _, s := range flagSplitMultiValues(val) {
if err := f.Value.Set(strings.TrimSpace(s)); err != nil {
return fmt.Errorf("could not parse %q as float64 slice value for flag %s: %s", f.Value, f.Name, err)
}
}
+ // Set this to false so that we reset the slice if we then set values from
+ // flags that have already been set by the environment.
+ f.Value.hasBeenSet = false
f.HasBeenSet = true
}
}
+ if f.Value == nil {
+ f.Value = &Float64Slice{}
+ }
+ copyValue := f.Value.clone()
for _, name := range f.Names() {
- if f.Value == nil {
- f.Value = &Float64Slice{}
- }
- set.Var(f.Value, name, f.Usage)
+ set.Var(copyValue, name, f.Usage)
}
return nil
@@ -145,8 +179,8 @@ func (f *Float64SliceFlag) Apply(set *flag.FlagSet) error {
// Float64Slice looks up the value of a local Float64SliceFlag, returns
// nil if not found
-func (c *Context) Float64Slice(name string) []float64 {
- if fs := lookupFlagSet(name, c); fs != nil {
+func (cCtx *Context) Float64Slice(name string) []float64 {
+ if fs := cCtx.lookupFlagSet(name); fs != nil {
return lookupFloat64Slice(name, fs)
}
return nil
diff --git a/vendor/github.com/urfave/cli/v2/flag_generic.go b/vendor/github.com/urfave/cli/v2/flag_generic.go
index b0c8ff44d..e44e7d751 100644
--- a/vendor/github.com/urfave/cli/v2/flag_generic.go
+++ b/vendor/github.com/urfave/cli/v2/flag_generic.go
@@ -66,6 +66,24 @@ func (f *GenericFlag) GetValue() string {
return ""
}
+// IsVisible returns true if the flag is not hidden, otherwise false
+func (f *GenericFlag) IsVisible() bool {
+ return !f.Hidden
+}
+
+// GetDefaultText returns the default text for this flag
+func (f *GenericFlag) GetDefaultText() string {
+ if f.DefaultText != "" {
+ return f.DefaultText
+ }
+ return f.GetValue()
+}
+
+// GetEnvVars returns the env vars for this flag
+func (f *GenericFlag) GetEnvVars() []string {
+ return f.EnvVars
+}
+
// Apply takes the flagset and calls Set on the generic flag with the value
// provided by the user for parsing by the flag
func (f GenericFlag) Apply(set *flag.FlagSet) error {
@@ -88,8 +106,8 @@ func (f GenericFlag) Apply(set *flag.FlagSet) error {
// Generic looks up the value of a local GenericFlag, returns
// nil if not found
-func (c *Context) Generic(name string) interface{} {
- if fs := lookupFlagSet(name, c); fs != nil {
+func (cCtx *Context) Generic(name string) interface{} {
+ if fs := cCtx.lookupFlagSet(name); fs != nil {
return lookupGeneric(name, fs)
}
return nil
diff --git a/vendor/github.com/urfave/cli/v2/flag_int.go b/vendor/github.com/urfave/cli/v2/flag_int.go
index ac39d4a9e..2c4e60271 100644
--- a/vendor/github.com/urfave/cli/v2/flag_int.go
+++ b/vendor/github.com/urfave/cli/v2/flag_int.go
@@ -58,6 +58,24 @@ func (f *IntFlag) GetValue() string {
return fmt.Sprintf("%d", f.Value)
}
+// IsVisible returns true if the flag is not hidden, otherwise false
+func (f *IntFlag) IsVisible() bool {
+ return !f.Hidden
+}
+
+// GetDefaultText returns the default text for this flag
+func (f *IntFlag) GetDefaultText() string {
+ if f.DefaultText != "" {
+ return f.DefaultText
+ }
+ return f.GetValue()
+}
+
+// GetEnvVars returns the env vars for this flag
+func (f *IntFlag) GetEnvVars() []string {
+ return f.EnvVars
+}
+
// Apply populates the flag given the flag set and environment
func (f *IntFlag) Apply(set *flag.FlagSet) error {
if val, ok := flagFromEnvOrFile(f.EnvVars, f.FilePath); ok {
@@ -86,8 +104,8 @@ func (f *IntFlag) Apply(set *flag.FlagSet) error {
// Int looks up the value of a local IntFlag, returns
// 0 if not found
-func (c *Context) Int(name string) int {
- if fs := lookupFlagSet(name, c); fs != nil {
+func (cCtx *Context) Int(name string) int {
+ if fs := cCtx.lookupFlagSet(name); fs != nil {
return lookupInt(name, fs)
}
return 0
diff --git a/vendor/github.com/urfave/cli/v2/flag_int64.go b/vendor/github.com/urfave/cli/v2/flag_int64.go
index e09991269..f21e7e44f 100644
--- a/vendor/github.com/urfave/cli/v2/flag_int64.go
+++ b/vendor/github.com/urfave/cli/v2/flag_int64.go
@@ -58,6 +58,24 @@ func (f *Int64Flag) GetValue() string {
return fmt.Sprintf("%d", f.Value)
}
+// IsVisible returns true if the flag is not hidden, otherwise false
+func (f *Int64Flag) IsVisible() bool {
+ return !f.Hidden
+}
+
+// GetDefaultText returns the default text for this flag
+func (f *Int64Flag) GetDefaultText() string {
+ if f.DefaultText != "" {
+ return f.DefaultText
+ }
+ return f.GetValue()
+}
+
+// GetEnvVars returns the env vars for this flag
+func (f *Int64Flag) GetEnvVars() []string {
+ return f.EnvVars
+}
+
// Apply populates the flag given the flag set and environment
func (f *Int64Flag) Apply(set *flag.FlagSet) error {
if val, ok := flagFromEnvOrFile(f.EnvVars, f.FilePath); ok {
@@ -85,8 +103,8 @@ func (f *Int64Flag) Apply(set *flag.FlagSet) error {
// Int64 looks up the value of a local Int64Flag, returns
// 0 if not found
-func (c *Context) Int64(name string) int64 {
- if fs := lookupFlagSet(name, c); fs != nil {
+func (cCtx *Context) Int64(name string) int64 {
+ if fs := cCtx.lookupFlagSet(name); fs != nil {
return lookupInt64(name, fs)
}
return 0
diff --git a/vendor/github.com/urfave/cli/v2/flag_int64_slice.go b/vendor/github.com/urfave/cli/v2/flag_int64_slice.go
index 6c7fd9376..6ea7ae8b9 100644
--- a/vendor/github.com/urfave/cli/v2/flag_int64_slice.go
+++ b/vendor/github.com/urfave/cli/v2/flag_int64_slice.go
@@ -19,6 +19,16 @@ func NewInt64Slice(defaults ...int64) *Int64Slice {
return &Int64Slice{slice: append([]int64{}, defaults...)}
}
+// clone allocate a copy of self object
+func (i *Int64Slice) clone() *Int64Slice {
+ n := &Int64Slice{
+ slice: make([]int64, len(i.slice)),
+ hasBeenSet: i.hasBeenSet,
+ }
+ copy(n.slice, i.slice)
+ return n
+}
+
// Set parses the value into an integer and appends it to the list of values
func (i *Int64Slice) Set(value string) error {
if !i.hasBeenSet {
@@ -33,12 +43,14 @@ func (i *Int64Slice) Set(value string) error {
return nil
}
- tmp, err := strconv.ParseInt(value, 0, 64)
- if err != nil {
- return err
- }
+ for _, s := range flagSplitMultiValues(value) {
+ tmp, err := strconv.ParseInt(strings.TrimSpace(s), 0, 64)
+ if err != nil {
+ return err
+ }
- i.slice = append(i.slice, tmp)
+ i.slice = append(i.slice, tmp)
+ }
return nil
}
@@ -86,7 +98,7 @@ func (f *Int64SliceFlag) IsSet() bool {
// String returns a readable representation of this value
// (for usage defaults)
func (f *Int64SliceFlag) String() string {
- return FlagStringer(f)
+ return withEnvHint(f.GetEnvVars(), stringifyInt64SliceFlag(f))
}
// Names returns the names of the flag
@@ -118,25 +130,47 @@ func (f *Int64SliceFlag) GetValue() string {
return ""
}
+// IsVisible returns true if the flag is not hidden, otherwise false
+func (f *Int64SliceFlag) IsVisible() bool {
+ return !f.Hidden
+}
+
+// GetDefaultText returns the default text for this flag
+func (f *Int64SliceFlag) GetDefaultText() string {
+ if f.DefaultText != "" {
+ return f.DefaultText
+ }
+ return f.GetValue()
+}
+
+// GetEnvVars returns the env vars for this flag
+func (f *Int64SliceFlag) GetEnvVars() []string {
+ return f.EnvVars
+}
+
// Apply populates the flag given the flag set and environment
func (f *Int64SliceFlag) Apply(set *flag.FlagSet) error {
if val, ok := flagFromEnvOrFile(f.EnvVars, f.FilePath); ok {
f.Value = &Int64Slice{}
- for _, s := range strings.Split(val, ",") {
+ for _, s := range flagSplitMultiValues(val) {
if err := f.Value.Set(strings.TrimSpace(s)); err != nil {
return fmt.Errorf("could not parse %q as int64 slice value for flag %s: %s", val, f.Name, err)
}
}
+ // Set this to false so that we reset the slice if we then set values from
+ // flags that have already been set by the environment.
+ f.Value.hasBeenSet = false
f.HasBeenSet = true
}
+ if f.Value == nil {
+ f.Value = &Int64Slice{}
+ }
+ copyValue := f.Value.clone()
for _, name := range f.Names() {
- if f.Value == nil {
- f.Value = &Int64Slice{}
- }
- set.Var(f.Value, name, f.Usage)
+ set.Var(copyValue, name, f.Usage)
}
return nil
@@ -144,8 +178,11 @@ func (f *Int64SliceFlag) Apply(set *flag.FlagSet) error {
// Int64Slice looks up the value of a local Int64SliceFlag, returns
// nil if not found
-func (c *Context) Int64Slice(name string) []int64 {
- return lookupInt64Slice(name, c.flagSet)
+func (cCtx *Context) Int64Slice(name string) []int64 {
+ if fs := cCtx.lookupFlagSet(name); fs != nil {
+ return lookupInt64Slice(name, fs)
+ }
+ return nil
}
func lookupInt64Slice(name string, set *flag.FlagSet) []int64 {
diff --git a/vendor/github.com/urfave/cli/v2/flag_int_slice.go b/vendor/github.com/urfave/cli/v2/flag_int_slice.go
index 4e0afc021..38f6a33b0 100644
--- a/vendor/github.com/urfave/cli/v2/flag_int_slice.go
+++ b/vendor/github.com/urfave/cli/v2/flag_int_slice.go
@@ -19,6 +19,16 @@ func NewIntSlice(defaults ...int) *IntSlice {
return &IntSlice{slice: append([]int{}, defaults...)}
}
+// clone allocate a copy of self object
+func (i *IntSlice) clone() *IntSlice {
+ n := &IntSlice{
+ slice: make([]int, len(i.slice)),
+ hasBeenSet: i.hasBeenSet,
+ }
+ copy(n.slice, i.slice)
+ return n
+}
+
// TODO: Consistently have specific Set function for Int64 and Float64 ?
// SetInt directly adds an integer to the list of values
func (i *IntSlice) SetInt(value int) {
@@ -44,12 +54,14 @@ func (i *IntSlice) Set(value string) error {
return nil
}
- tmp, err := strconv.ParseInt(value, 0, 64)
- if err != nil {
- return err
- }
+ for _, s := range flagSplitMultiValues(value) {
+ tmp, err := strconv.ParseInt(strings.TrimSpace(s), 0, 64)
+ if err != nil {
+ return err
+ }
- i.slice = append(i.slice, int(tmp))
+ i.slice = append(i.slice, int(tmp))
+ }
return nil
}
@@ -97,7 +109,7 @@ func (f *IntSliceFlag) IsSet() bool {
// String returns a readable representation of this value
// (for usage defaults)
func (f *IntSliceFlag) String() string {
- return FlagStringer(f)
+ return withEnvHint(f.GetEnvVars(), stringifyIntSliceFlag(f))
}
// Names returns the names of the flag
@@ -129,25 +141,47 @@ func (f *IntSliceFlag) GetValue() string {
return ""
}
+// IsVisible returns true if the flag is not hidden, otherwise false
+func (f *IntSliceFlag) IsVisible() bool {
+ return !f.Hidden
+}
+
+// GetDefaultText returns the default text for this flag
+func (f *IntSliceFlag) GetDefaultText() string {
+ if f.DefaultText != "" {
+ return f.DefaultText
+ }
+ return f.GetValue()
+}
+
+// GetEnvVars returns the env vars for this flag
+func (f *IntSliceFlag) GetEnvVars() []string {
+ return f.EnvVars
+}
+
// Apply populates the flag given the flag set and environment
func (f *IntSliceFlag) Apply(set *flag.FlagSet) error {
if val, ok := flagFromEnvOrFile(f.EnvVars, f.FilePath); ok {
f.Value = &IntSlice{}
- for _, s := range strings.Split(val, ",") {
+ for _, s := range flagSplitMultiValues(val) {
if err := f.Value.Set(strings.TrimSpace(s)); err != nil {
return fmt.Errorf("could not parse %q as int slice value for flag %s: %s", val, f.Name, err)
}
}
+ // Set this to false so that we reset the slice if we then set values from
+ // flags that have already been set by the environment.
+ f.Value.hasBeenSet = false
f.HasBeenSet = true
}
+ if f.Value == nil {
+ f.Value = &IntSlice{}
+ }
+ copyValue := f.Value.clone()
for _, name := range f.Names() {
- if f.Value == nil {
- f.Value = &IntSlice{}
- }
- set.Var(f.Value, name, f.Usage)
+ set.Var(copyValue, name, f.Usage)
}
return nil
@@ -155,9 +189,9 @@ func (f *IntSliceFlag) Apply(set *flag.FlagSet) error {
// IntSlice looks up the value of a local IntSliceFlag, returns
// nil if not found
-func (c *Context) IntSlice(name string) []int {
- if fs := lookupFlagSet(name, c); fs != nil {
- return lookupIntSlice(name, c.flagSet)
+func (cCtx *Context) IntSlice(name string) []int {
+ if fs := cCtx.lookupFlagSet(name); fs != nil {
+ return lookupIntSlice(name, fs)
}
return nil
}
diff --git a/vendor/github.com/urfave/cli/v2/flag_path.go b/vendor/github.com/urfave/cli/v2/flag_path.go
index 8070dc4b0..de19eea21 100644
--- a/vendor/github.com/urfave/cli/v2/flag_path.go
+++ b/vendor/github.com/urfave/cli/v2/flag_path.go
@@ -1,6 +1,9 @@
package cli
-import "flag"
+import (
+ "flag"
+ "fmt"
+)
type PathFlag struct {
Name string
@@ -54,6 +57,27 @@ func (f *PathFlag) GetValue() string {
return f.Value
}
+// IsVisible returns true if the flag is not hidden, otherwise false
+func (f *PathFlag) IsVisible() bool {
+ return !f.Hidden
+}
+
+// GetDefaultText returns the default text for this flag
+func (f *PathFlag) GetDefaultText() string {
+ if f.DefaultText != "" {
+ return f.DefaultText
+ }
+ if f.Value == "" {
+ return f.Value
+ }
+ return fmt.Sprintf("%q", f.Value)
+}
+
+// GetEnvVars returns the env vars for this flag
+func (f *PathFlag) GetEnvVars() []string {
+ return f.EnvVars
+}
+
// Apply populates the flag given the flag set and environment
func (f *PathFlag) Apply(set *flag.FlagSet) error {
if val, ok := flagFromEnvOrFile(f.EnvVars, f.FilePath); ok {
@@ -74,8 +98,8 @@ func (f *PathFlag) Apply(set *flag.FlagSet) error {
// Path looks up the value of a local PathFlag, returns
// "" if not found
-func (c *Context) Path(name string) string {
- if fs := lookupFlagSet(name, c); fs != nil {
+func (cCtx *Context) Path(name string) string {
+ if fs := cCtx.lookupFlagSet(name); fs != nil {
return lookupPath(name, fs)
}
diff --git a/vendor/github.com/urfave/cli/v2/flag_string.go b/vendor/github.com/urfave/cli/v2/flag_string.go
index 400bb532e..936ce728a 100644
--- a/vendor/github.com/urfave/cli/v2/flag_string.go
+++ b/vendor/github.com/urfave/cli/v2/flag_string.go
@@ -1,6 +1,9 @@
package cli
-import "flag"
+import (
+ "flag"
+ "fmt"
+)
// StringFlag is a flag with type string
type StringFlag struct {
@@ -55,6 +58,27 @@ func (f *StringFlag) GetValue() string {
return f.Value
}
+// IsVisible returns true if the flag is not hidden, otherwise false
+func (f *StringFlag) IsVisible() bool {
+ return !f.Hidden
+}
+
+// GetDefaultText returns the default text for this flag
+func (f *StringFlag) GetDefaultText() string {
+ if f.DefaultText != "" {
+ return f.DefaultText
+ }
+ if f.Value == "" {
+ return f.Value
+ }
+ return fmt.Sprintf("%q", f.Value)
+}
+
+// GetEnvVars returns the env vars for this flag
+func (f *StringFlag) GetEnvVars() []string {
+ return f.EnvVars
+}
+
// Apply populates the flag given the flag set and environment
func (f *StringFlag) Apply(set *flag.FlagSet) error {
if val, ok := flagFromEnvOrFile(f.EnvVars, f.FilePath); ok {
@@ -75,8 +99,8 @@ func (f *StringFlag) Apply(set *flag.FlagSet) error {
// String looks up the value of a local StringFlag, returns
// "" if not found
-func (c *Context) String(name string) string {
- if fs := lookupFlagSet(name, c); fs != nil {
+func (cCtx *Context) String(name string) string {
+ if fs := cCtx.lookupFlagSet(name); fs != nil {
return lookupString(name, fs)
}
return ""
@@ -85,10 +109,7 @@ func (c *Context) String(name string) string {
func lookupString(name string, set *flag.FlagSet) string {
f := set.Lookup(name)
if f != nil {
- parsed, err := f.Value.String(), error(nil)
- if err != nil {
- return ""
- }
+ parsed := f.Value.String()
return parsed
}
return ""
diff --git a/vendor/github.com/urfave/cli/v2/flag_string_slice.go b/vendor/github.com/urfave/cli/v2/flag_string_slice.go
index 35497032c..ff0a4b7da 100644
--- a/vendor/github.com/urfave/cli/v2/flag_string_slice.go
+++ b/vendor/github.com/urfave/cli/v2/flag_string_slice.go
@@ -18,6 +18,16 @@ func NewStringSlice(defaults ...string) *StringSlice {
return &StringSlice{slice: append([]string{}, defaults...)}
}
+// clone allocate a copy of self object
+func (s *StringSlice) clone() *StringSlice {
+ n := &StringSlice{
+ slice: make([]string, len(s.slice)),
+ hasBeenSet: s.hasBeenSet,
+ }
+ copy(n.slice, s.slice)
+ return n
+}
+
// Set appends the string value to the list of values
func (s *StringSlice) Set(value string) error {
if !s.hasBeenSet {
@@ -32,7 +42,9 @@ func (s *StringSlice) Set(value string) error {
return nil
}
- s.slice = append(s.slice, value)
+ for _, t := range flagSplitMultiValues(value) {
+ s.slice = append(s.slice, strings.TrimSpace(t))
+ }
return nil
}
@@ -82,7 +94,7 @@ func (f *StringSliceFlag) IsSet() bool {
// String returns a readable representation of this value
// (for usage defaults)
func (f *StringSliceFlag) String() string {
- return FlagStringer(f)
+ return withEnvHint(f.GetEnvVars(), stringifyStringSliceFlag(f))
}
// Names returns the names of the flag
@@ -114,6 +126,24 @@ func (f *StringSliceFlag) GetValue() string {
return ""
}
+// IsVisible returns true if the flag is not hidden, otherwise false
+func (f *StringSliceFlag) IsVisible() bool {
+ return !f.Hidden
+}
+
+// GetDefaultText returns the default text for this flag
+func (f *StringSliceFlag) GetDefaultText() string {
+ if f.DefaultText != "" {
+ return f.DefaultText
+ }
+ return f.GetValue()
+}
+
+// GetEnvVars returns the env vars for this flag
+func (f *StringSliceFlag) GetEnvVars() []string {
+ return f.EnvVars
+}
+
// Apply populates the flag given the flag set and environment
func (f *StringSliceFlag) Apply(set *flag.FlagSet) error {
@@ -132,7 +162,7 @@ func (f *StringSliceFlag) Apply(set *flag.FlagSet) error {
destination = f.Destination
}
- for _, s := range strings.Split(val, ",") {
+ for _, s := range flagSplitMultiValues(val) {
if err := destination.Set(strings.TrimSpace(s)); err != nil {
return fmt.Errorf("could not parse %q as string value for flag %s: %s", val, f.Name, err)
}
@@ -144,17 +174,15 @@ func (f *StringSliceFlag) Apply(set *flag.FlagSet) error {
f.HasBeenSet = true
}
+ if f.Value == nil {
+ f.Value = &StringSlice{}
+ }
+ setValue := f.Destination
+ if f.Destination == nil {
+ setValue = f.Value.clone()
+ }
for _, name := range f.Names() {
- if f.Value == nil {
- f.Value = &StringSlice{}
- }
-
- if f.Destination != nil {
- set.Var(f.Destination, name, f.Usage)
- continue
- }
-
- set.Var(f.Value, name, f.Usage)
+ set.Var(setValue, name, f.Usage)
}
return nil
@@ -162,8 +190,8 @@ func (f *StringSliceFlag) Apply(set *flag.FlagSet) error {
// StringSlice looks up the value of a local StringSliceFlag, returns
// nil if not found
-func (c *Context) StringSlice(name string) []string {
- if fs := lookupFlagSet(name, c); fs != nil {
+func (cCtx *Context) StringSlice(name string) []string {
+ if fs := cCtx.lookupFlagSet(name); fs != nil {
return lookupStringSlice(name, fs)
}
return nil
diff --git a/vendor/github.com/urfave/cli/v2/flag_timestamp.go b/vendor/github.com/urfave/cli/v2/flag_timestamp.go
index 0382a6b9d..dcb9d8415 100644
--- a/vendor/github.com/urfave/cli/v2/flag_timestamp.go
+++ b/vendor/github.com/urfave/cli/v2/flag_timestamp.go
@@ -71,6 +71,7 @@ type TimestampFlag struct {
Value *Timestamp
DefaultText string
HasBeenSet bool
+ Destination *Timestamp
}
// IsSet returns whether or not the flag has been set through env or file
@@ -113,6 +114,24 @@ func (f *TimestampFlag) GetValue() string {
return ""
}
+// IsVisible returns true if the flag is not hidden, otherwise false
+func (f *TimestampFlag) IsVisible() bool {
+ return !f.Hidden
+}
+
+// GetDefaultText returns the default text for this flag
+func (f *TimestampFlag) GetDefaultText() string {
+ if f.DefaultText != "" {
+ return f.DefaultText
+ }
+ return f.GetValue()
+}
+
+// GetEnvVars returns the env vars for this flag
+func (f *TimestampFlag) GetEnvVars() []string {
+ return f.EnvVars
+}
+
// Apply populates the flag given the flag set and environment
func (f *TimestampFlag) Apply(set *flag.FlagSet) error {
if f.Layout == "" {
@@ -123,6 +142,10 @@ func (f *TimestampFlag) Apply(set *flag.FlagSet) error {
}
f.Value.SetLayout(f.Layout)
+ if f.Destination != nil {
+ f.Destination.SetLayout(f.Layout)
+ }
+
if val, ok := flagFromEnvOrFile(f.EnvVars, f.FilePath); ok {
if err := f.Value.Set(val); err != nil {
return fmt.Errorf("could not parse %q as timestamp value for flag %s: %s", val, f.Name, err)
@@ -131,14 +154,19 @@ func (f *TimestampFlag) Apply(set *flag.FlagSet) error {
}
for _, name := range f.Names() {
+ if f.Destination != nil {
+ set.Var(f.Destination, name, f.Usage)
+ continue
+ }
+
set.Var(f.Value, name, f.Usage)
}
return nil
}
// Timestamp gets the timestamp from a flag name
-func (c *Context) Timestamp(name string) *time.Time {
- if fs := lookupFlagSet(name, c); fs != nil {
+func (cCtx *Context) Timestamp(name string) *time.Time {
+ if fs := cCtx.lookupFlagSet(name); fs != nil {
return lookupTimestamp(name, fs)
}
return nil
diff --git a/vendor/github.com/urfave/cli/v2/flag_uint.go b/vendor/github.com/urfave/cli/v2/flag_uint.go
index 2e5e76b0e..e9ce9fec7 100644
--- a/vendor/github.com/urfave/cli/v2/flag_uint.go
+++ b/vendor/github.com/urfave/cli/v2/flag_uint.go
@@ -52,6 +52,11 @@ func (f *UintFlag) GetUsage() string {
return f.Usage
}
+// IsVisible returns true if the flag is not hidden, otherwise false
+func (f *UintFlag) IsVisible() bool {
+ return !f.Hidden
+}
+
// Apply populates the flag given the flag set and environment
func (f *UintFlag) Apply(set *flag.FlagSet) error {
if val, ok := flagFromEnvOrFile(f.EnvVars, f.FilePath); ok {
@@ -83,10 +88,23 @@ func (f *UintFlag) GetValue() string {
return fmt.Sprintf("%d", f.Value)
}
+// GetDefaultText returns the default text for this flag
+func (f *UintFlag) GetDefaultText() string {
+ if f.DefaultText != "" {
+ return f.DefaultText
+ }
+ return f.GetValue()
+}
+
+// GetEnvVars returns the env vars for this flag
+func (f *UintFlag) GetEnvVars() []string {
+ return f.EnvVars
+}
+
// Uint looks up the value of a local UintFlag, returns
// 0 if not found
-func (c *Context) Uint(name string) uint {
- if fs := lookupFlagSet(name, c); fs != nil {
+func (cCtx *Context) Uint(name string) uint {
+ if fs := cCtx.lookupFlagSet(name); fs != nil {
return lookupUint(name, fs)
}
return 0
diff --git a/vendor/github.com/urfave/cli/v2/flag_uint64.go b/vendor/github.com/urfave/cli/v2/flag_uint64.go
index 8fc3289d8..2a2669fd2 100644
--- a/vendor/github.com/urfave/cli/v2/flag_uint64.go
+++ b/vendor/github.com/urfave/cli/v2/flag_uint64.go
@@ -52,6 +52,11 @@ func (f *Uint64Flag) GetUsage() string {
return f.Usage
}
+// IsVisible returns true if the flag is not hidden, otherwise false
+func (f *Uint64Flag) IsVisible() bool {
+ return !f.Hidden
+}
+
// Apply populates the flag given the flag set and environment
func (f *Uint64Flag) Apply(set *flag.FlagSet) error {
if val, ok := flagFromEnvOrFile(f.EnvVars, f.FilePath); ok {
@@ -83,10 +88,23 @@ func (f *Uint64Flag) GetValue() string {
return fmt.Sprintf("%d", f.Value)
}
+// GetDefaultText returns the default text for this flag
+func (f *Uint64Flag) GetDefaultText() string {
+ if f.DefaultText != "" {
+ return f.DefaultText
+ }
+ return f.GetValue()
+}
+
+// GetEnvVars returns the env vars for this flag
+func (f *Uint64Flag) GetEnvVars() []string {
+ return f.EnvVars
+}
+
// Uint64 looks up the value of a local Uint64Flag, returns
// 0 if not found
-func (c *Context) Uint64(name string) uint64 {
- if fs := lookupFlagSet(name, c); fs != nil {
+func (cCtx *Context) Uint64(name string) uint64 {
+ if fs := cCtx.lookupFlagSet(name); fs != nil {
return lookupUint64(name, fs)
}
return 0
diff --git a/vendor/github.com/urfave/cli/v2/funcs.go b/vendor/github.com/urfave/cli/v2/funcs.go
index 474c48faf..0a9b22c94 100644
--- a/vendor/github.com/urfave/cli/v2/funcs.go
+++ b/vendor/github.com/urfave/cli/v2/funcs.go
@@ -17,15 +17,15 @@ type ActionFunc func(*Context) error
// CommandNotFoundFunc is executed if the proper command cannot be found
type CommandNotFoundFunc func(*Context, string)
-// OnUsageErrorFunc is executed if an usage error occurs. This is useful for displaying
+// OnUsageErrorFunc is executed if a usage error occurs. This is useful for displaying
// customized usage error messages. This function is able to replace the
// original error messages. If this function is not set, the "Incorrect usage"
// is displayed and the execution is interrupted.
-type OnUsageErrorFunc func(context *Context, err error, isSubcommand bool) error
+type OnUsageErrorFunc func(cCtx *Context, err error, isSubcommand bool) error
// ExitErrHandlerFunc is executed if provided in order to handle exitError values
// returned by Actions and Before/After functions.
-type ExitErrHandlerFunc func(context *Context, err error)
+type ExitErrHandlerFunc func(cCtx *Context, err error)
// FlagStringFunc is used by the help generation to display a flag, which is
// expected to be a single line.
diff --git a/vendor/github.com/urfave/cli/v2/go.mod b/vendor/github.com/urfave/cli/v2/go.mod
index 113966432..7a4b88bbf 100644
--- a/vendor/github.com/urfave/cli/v2/go.mod
+++ b/vendor/github.com/urfave/cli/v2/go.mod
@@ -1,9 +1,11 @@
module github.com/urfave/cli/v2
-go 1.11
+go 1.18
require (
- github.com/BurntSushi/toml v0.3.1
- github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d
- gopkg.in/yaml.v2 v2.2.3
+ github.com/BurntSushi/toml v1.1.0
+ github.com/cpuguy83/go-md2man/v2 v2.0.1
+ gopkg.in/yaml.v2 v2.4.0
)
+
+require github.com/russross/blackfriday/v2 v2.1.0 // indirect
diff --git a/vendor/github.com/urfave/cli/v2/go.sum b/vendor/github.com/urfave/cli/v2/go.sum
index 663ad7276..bde502bd2 100644
--- a/vendor/github.com/urfave/cli/v2/go.sum
+++ b/vendor/github.com/urfave/cli/v2/go.sum
@@ -1,14 +1,12 @@
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
+github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/cpuguy83/go-md2man/v2 v2.0.1 h1:r/myEWzV9lfsM1tFLgDyu0atFtJ1fXn261LKYj/3DxU=
+github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.3 h1:fvjTMHxHEw/mxHbtzPi3JCcKXQRAnQTBRo6YCJSVHKI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
diff --git a/vendor/github.com/urfave/cli/v2/help.go b/vendor/github.com/urfave/cli/v2/help.go
index 0a421ee99..2f8156fca 100644
--- a/vendor/github.com/urfave/cli/v2/help.go
+++ b/vendor/github.com/urfave/cli/v2/help.go
@@ -15,13 +15,13 @@ var helpCommand = &Command{
Aliases: []string{"h"},
Usage: "Shows a list of commands or help for one command",
ArgsUsage: "[command]",
- Action: func(c *Context) error {
- args := c.Args()
+ Action: func(cCtx *Context) error {
+ args := cCtx.Args()
if args.Present() {
- return ShowCommandHelp(c, args.First())
+ return ShowCommandHelp(cCtx, args.First())
}
- _ = ShowAppHelp(c)
+ _ = ShowAppHelp(cCtx)
return nil
},
}
@@ -31,13 +31,13 @@ var helpSubcommand = &Command{
Aliases: []string{"h"},
Usage: "Shows a list of commands or help for one command",
ArgsUsage: "[command]",
- Action: func(c *Context) error {
- args := c.Args()
+ Action: func(cCtx *Context) error {
+ args := cCtx.Args()
if args.Present() {
- return ShowCommandHelp(c, args.First())
+ return ShowCommandHelp(cCtx, args.First())
}
- return ShowSubcommandHelp(c)
+ return ShowSubcommandHelp(cCtx)
},
}
@@ -71,30 +71,30 @@ func ShowAppHelpAndExit(c *Context, exitCode int) {
}
// ShowAppHelp is an action that displays the help.
-func ShowAppHelp(c *Context) error {
- tpl := c.App.CustomAppHelpTemplate
+func ShowAppHelp(cCtx *Context) error {
+ tpl := cCtx.App.CustomAppHelpTemplate
if tpl == "" {
tpl = AppHelpTemplate
}
- if c.App.ExtraInfo == nil {
- HelpPrinter(c.App.Writer, tpl, c.App)
+ if cCtx.App.ExtraInfo == nil {
+ HelpPrinter(cCtx.App.Writer, tpl, cCtx.App)
return nil
}
customAppData := func() map[string]interface{} {
return map[string]interface{}{
- "ExtraInfo": c.App.ExtraInfo,
+ "ExtraInfo": cCtx.App.ExtraInfo,
}
}
- HelpPrinterCustom(c.App.Writer, tpl, c.App, customAppData())
+ HelpPrinterCustom(cCtx.App.Writer, tpl, cCtx.App, customAppData())
return nil
}
// DefaultAppComplete prints the list of subcommands as the default app completion method
-func DefaultAppComplete(c *Context) {
- DefaultCompleteWithFlags(nil)(c)
+func DefaultAppComplete(cCtx *Context) {
+ DefaultCompleteWithFlags(nil)(cCtx)
}
func printCommandSuggestions(commands []*Command, writer io.Writer) {
@@ -159,23 +159,30 @@ func printFlagSuggestions(lastArg string, flags []Flag, writer io.Writer) {
}
}
-func DefaultCompleteWithFlags(cmd *Command) func(c *Context) {
- return func(c *Context) {
+func DefaultCompleteWithFlags(cmd *Command) func(cCtx *Context) {
+ return func(cCtx *Context) {
if len(os.Args) > 2 {
lastArg := os.Args[len(os.Args)-2]
+
if strings.HasPrefix(lastArg, "-") {
- printFlagSuggestions(lastArg, c.App.Flags, c.App.Writer)
if cmd != nil {
- printFlagSuggestions(lastArg, cmd.Flags, c.App.Writer)
+ printFlagSuggestions(lastArg, cmd.Flags, cCtx.App.Writer)
+
+ return
}
+
+ printFlagSuggestions(lastArg, cCtx.App.Flags, cCtx.App.Writer)
+
return
}
}
+
if cmd != nil {
- printCommandSuggestions(cmd.Subcommands, c.App.Writer)
- } else {
- printCommandSuggestions(c.App.Commands, c.App.Writer)
+ printCommandSuggestions(cmd.Subcommands, cCtx.App.Writer)
+ return
}
+
+ printCommandSuggestions(cCtx.App.Commands, cCtx.App.Writer)
}
}
@@ -221,32 +228,32 @@ func ShowSubcommandHelpAndExit(c *Context, exitCode int) {
}
// ShowSubcommandHelp prints help for the given subcommand
-func ShowSubcommandHelp(c *Context) error {
- if c == nil {
+func ShowSubcommandHelp(cCtx *Context) error {
+ if cCtx == nil {
return nil
}
- if c.Command != nil {
- return ShowCommandHelp(c, c.Command.Name)
+ if cCtx.Command != nil {
+ return ShowCommandHelp(cCtx, cCtx.Command.Name)
}
- return ShowCommandHelp(c, "")
+ return ShowCommandHelp(cCtx, "")
}
// ShowVersion prints the version number of the App
-func ShowVersion(c *Context) {
- VersionPrinter(c)
+func ShowVersion(cCtx *Context) {
+ VersionPrinter(cCtx)
}
-func printVersion(c *Context) {
- _, _ = fmt.Fprintf(c.App.Writer, "%v version %v\n", c.App.Name, c.App.Version)
+func printVersion(cCtx *Context) {
+ _, _ = fmt.Fprintf(cCtx.App.Writer, "%v version %v\n", cCtx.App.Name, cCtx.App.Version)
}
// ShowCompletions prints the lists of commands within a given context
-func ShowCompletions(c *Context) {
- a := c.App
+func ShowCompletions(cCtx *Context) {
+ a := cCtx.App
if a != nil && a.BashComplete != nil {
- a.BashComplete(c)
+ a.BashComplete(cCtx)
}
}
@@ -297,20 +304,20 @@ func printHelp(out io.Writer, templ string, data interface{}) {
HelpPrinterCustom(out, templ, data, nil)
}
-func checkVersion(c *Context) bool {
+func checkVersion(cCtx *Context) bool {
found := false
for _, name := range VersionFlag.Names() {
- if c.Bool(name) {
+ if cCtx.Bool(name) {
found = true
}
}
return found
}
-func checkHelp(c *Context) bool {
+func checkHelp(cCtx *Context) bool {
found := false
for _, name := range HelpFlag.Names() {
- if c.Bool(name) {
+ if cCtx.Bool(name) {
found = true
}
}
@@ -326,9 +333,9 @@ func checkCommandHelp(c *Context, name string) bool {
return false
}
-func checkSubcommandHelp(c *Context) bool {
- if c.Bool("h") || c.Bool("help") {
- _ = ShowSubcommandHelp(c)
+func checkSubcommandHelp(cCtx *Context) bool {
+ if cCtx.Bool("h") || cCtx.Bool("help") {
+ _ = ShowSubcommandHelp(cCtx)
return true
}
@@ -350,20 +357,20 @@ func checkShellCompleteFlag(a *App, arguments []string) (bool, []string) {
return true, arguments[:pos]
}
-func checkCompletions(c *Context) bool {
- if !c.shellComplete {
+func checkCompletions(cCtx *Context) bool {
+ if !cCtx.shellComplete {
return false
}
- if args := c.Args(); args.Present() {
+ if args := cCtx.Args(); args.Present() {
name := args.First()
- if cmd := c.App.Command(name); cmd != nil {
+ if cmd := cCtx.App.Command(name); cmd != nil {
// let the command handle the completion
return false
}
}
- ShowCompletions(c)
+ ShowCompletions(cCtx)
return true
}
diff --git a/vendor/github.com/urfave/cli/v2/template.go b/vendor/github.com/urfave/cli/v2/template.go
index 31c03f81c..39fa4db08 100644
--- a/vendor/github.com/urfave/cli/v2/template.go
+++ b/vendor/github.com/urfave/cli/v2/template.go
@@ -7,7 +7,7 @@ var AppHelpTemplate = `NAME:
{{.Name}}{{if .Usage}} - {{.Usage}}{{end}}
USAGE:
- {{if .UsageText}}{{.UsageText}}{{else}}{{.HelpName}} {{if .VisibleFlags}}[global options]{{end}}{{if .Commands}} command [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}{{end}}{{if .Version}}{{if not .HideVersion}}
+ {{if .UsageText}}{{.UsageText | nindent 3 | trim}}{{else}}{{.HelpName}} {{if .VisibleFlags}}[global options]{{end}}{{if .Commands}} command [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}{{end}}{{if .Version}}{{if not .HideVersion}}
VERSION:
{{.Version}}{{end}}{{end}}{{if .Description}}
@@ -39,7 +39,7 @@ var CommandHelpTemplate = `NAME:
{{.HelpName}} - {{.Usage}}
USAGE:
- {{if .UsageText}}{{.UsageText}}{{else}}{{.HelpName}}{{if .VisibleFlags}} [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}{{end}}{{if .Category}}
+ {{if .UsageText}}{{.UsageText | nindent 3 | trim}}{{else}}{{.HelpName}}{{if .VisibleFlags}} [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}{{end}}{{if .Category}}
CATEGORY:
{{.Category}}{{end}}{{if .Description}}
@@ -59,7 +59,7 @@ var SubcommandHelpTemplate = `NAME:
{{.HelpName}} - {{.Usage}}
USAGE:
- {{if .UsageText}}{{.UsageText}}{{else}}{{.HelpName}} command{{if .VisibleFlags}} [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}{{end}}{{if .Description}}
+ {{if .UsageText}}{{.UsageText | nindent 3 | trim}}{{else}}{{.HelpName}} command{{if .VisibleFlags}} [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}{{end}}{{if .Description}}
DESCRIPTION:
{{.Description | nindent 3 | trim}}{{end}}
@@ -74,9 +74,9 @@ OPTIONS:
{{end}}{{end}}
`
-var MarkdownDocTemplate = `% {{ .App.Name }} 8
+var MarkdownDocTemplate = `{{if gt .SectionNum 0}}% {{ .App.Name }} {{ .SectionNum }}
-# NAME
+{{end}}# NAME
{{ .App.Name }}{{ if .App.Usage }} - {{ .App.Usage }}{{ end }}
@@ -86,16 +86,18 @@ var MarkdownDocTemplate = `% {{ .App.Name }} 8
{{ if .SynopsisArgs }}
` + "```" + `
{{ range $v := .SynopsisArgs }}{{ $v }}{{ end }}` + "```" + `
-{{ end }}{{ if .App.UsageText }}
+{{ end }}{{ if .App.Description }}
# DESCRIPTION
-{{ .App.UsageText }}
+{{ .App.Description }}
{{ end }}
**Usage**:
-` + "```" + `
+` + "```" + `{{ if .App.UsageText }}
+{{ .App.UsageText }}
+{{ else }}
{{ .App.Name }} [GLOBAL OPTIONS] command [COMMAND OPTIONS] [ARGUMENTS...]
-` + "```" + `
+{{ end }}` + "```" + `
{{ if .GlobalArgs }}
# GLOBAL OPTIONS
{{ range $v := .GlobalArgs }}
diff --git a/vendor/github.com/xanzy/go-gitlab/README.md b/vendor/github.com/xanzy/go-gitlab/README.md
index 19f6ad2a6..cd409e8e0 100644
--- a/vendor/github.com/xanzy/go-gitlab/README.md
+++ b/vendor/github.com/xanzy/go-gitlab/README.md
@@ -27,13 +27,13 @@ to add new and/or missing endpoints. Currently, the following services are suppo
- [x] Custom Attributes
- [x] Deploy Keys
- [x] Deployments
-- [ ] Discussions (threaded comments)
+- [x] Discussions (threaded comments)
- [x] Environments
-- [ ] Epic Issues
-- [ ] Epics
+- [x] Epic Issues
+- [x] Epics
- [x] Events
- [x] Feature Flags
-- [ ] Geo Nodes
+- [x] Geo Nodes
- [x] Generic Packages
- [x] GitLab CI Config Templates
- [x] Gitignores Templates
diff --git a/vendor/github.com/xanzy/go-gitlab/commits.go b/vendor/github.com/xanzy/go-gitlab/commits.go
index fd26624ae..7ff5c380d 100644
--- a/vendor/github.com/xanzy/go-gitlab/commits.go
+++ b/vendor/github.com/xanzy/go-gitlab/commits.go
@@ -399,6 +399,7 @@ type CommitStatus struct {
FinishedAt *time.Time `json:"finished_at"`
Name string `json:"name"`
AllowFailure bool `json:"allow_failure"`
+ Coverage float64 `json:"coverage"`
Author Author `json:"author"`
Description string `json:"description"`
TargetURL string `json:"target_url"`
diff --git a/vendor/github.com/xanzy/go-gitlab/deploy_keys.go b/vendor/github.com/xanzy/go-gitlab/deploy_keys.go
index 14ba0c8a0..52b27c3aa 100644
--- a/vendor/github.com/xanzy/go-gitlab/deploy_keys.go
+++ b/vendor/github.com/xanzy/go-gitlab/deploy_keys.go
@@ -30,30 +30,70 @@ type DeployKeysService struct {
client *Client
}
-// DeployKey represents a GitLab deploy key.
-type DeployKey struct {
+// InstanceDeployKey represents a GitLab deploy key with the associated
+// projects it has write access to.
+type InstanceDeployKey struct {
+ ID int `json:"id"`
+ Title string `json:"title"`
+ CreatedAt *time.Time `json:"created_at"`
+ Key string `json:"key"`
+ Fingerprint string `json:"fingerprint"`
+ ProjectsWithWriteAccess []*DeployKeyProject `json:"projects_with_write_access"`
+}
+
+func (k InstanceDeployKey) String() string {
+ return Stringify(k)
+}
+
+// DeployKeyProject refers to a project an InstanceDeployKey has write access to.
+type DeployKeyProject struct {
+ ID int `json:"id"`
+ Description string `json:"description"`
+ Name string `json:"name"`
+ NameWithNamespace string `json:"name_with_namespace"`
+ Path string `json:"path"`
+ PathWithNamespace string `json:"path_with_namespace"`
+ CreatedAt *time.Time `json:"created_at"`
+}
+
+func (k DeployKeyProject) String() string {
+ return Stringify(k)
+}
+
+// ProjectDeployKey represents a GitLab project deploy key.
+type ProjectDeployKey struct {
ID int `json:"id"`
Title string `json:"title"`
Key string `json:"key"`
- CanPush *bool `json:"can_push"`
CreatedAt *time.Time `json:"created_at"`
+ CanPush bool `json:"can_push"`
}
-func (k DeployKey) String() string {
+func (k ProjectDeployKey) String() string {
return Stringify(k)
}
+// ListProjectDeployKeysOptions represents the available ListAllDeployKeys()
+// options.
+//
+// GitLab API docs:
+// https://docs.gitlab.com/ce/api/deploy_keys.html#list-all-deploy-keys
+type ListInstanceDeployKeysOptions struct {
+ ListOptions
+ Public *bool `url:"public,omitempty" json:"public,omitempty"`
+}
+
// ListAllDeployKeys gets a list of all deploy keys
//
// GitLab API docs:
// https://docs.gitlab.com/ce/api/deploy_keys.html#list-all-deploy-keys
-func (s *DeployKeysService) ListAllDeployKeys(options ...RequestOptionFunc) ([]*DeployKey, *Response, error) {
- req, err := s.client.NewRequest(http.MethodGet, "deploy_keys", nil, options)
+func (s *DeployKeysService) ListAllDeployKeys(opt *ListInstanceDeployKeysOptions, options ...RequestOptionFunc) ([]*InstanceDeployKey, *Response, error) {
+ req, err := s.client.NewRequest(http.MethodGet, "deploy_keys", opt, options)
if err != nil {
return nil, nil, err
}
- var ks []*DeployKey
+ var ks []*InstanceDeployKey
resp, err := s.client.Do(req, &ks)
if err != nil {
return nil, resp, err
@@ -73,7 +113,7 @@ type ListProjectDeployKeysOptions ListOptions
//
// GitLab API docs:
// https://docs.gitlab.com/ce/api/deploy_keys.html#list-project-deploy-keys
-func (s *DeployKeysService) ListProjectDeployKeys(pid interface{}, opt *ListProjectDeployKeysOptions, options ...RequestOptionFunc) ([]*DeployKey, *Response, error) {
+func (s *DeployKeysService) ListProjectDeployKeys(pid interface{}, opt *ListProjectDeployKeysOptions, options ...RequestOptionFunc) ([]*ProjectDeployKey, *Response, error) {
project, err := parseID(pid)
if err != nil {
return nil, nil, err
@@ -85,7 +125,7 @@ func (s *DeployKeysService) ListProjectDeployKeys(pid interface{}, opt *ListProj
return nil, nil, err
}
- var ks []*DeployKey
+ var ks []*ProjectDeployKey
resp, err := s.client.Do(req, &ks)
if err != nil {
return nil, resp, err
@@ -98,7 +138,7 @@ func (s *DeployKeysService) ListProjectDeployKeys(pid interface{}, opt *ListProj
//
// GitLab API docs:
// https://docs.gitlab.com/ce/api/deploy_keys.html#single-deploy-key
-func (s *DeployKeysService) GetDeployKey(pid interface{}, deployKey int, options ...RequestOptionFunc) (*DeployKey, *Response, error) {
+func (s *DeployKeysService) GetDeployKey(pid interface{}, deployKey int, options ...RequestOptionFunc) (*ProjectDeployKey, *Response, error) {
project, err := parseID(pid)
if err != nil {
return nil, nil, err
@@ -110,7 +150,7 @@ func (s *DeployKeysService) GetDeployKey(pid interface{}, deployKey int, options
return nil, nil, err
}
- k := new(DeployKey)
+ k := new(ProjectDeployKey)
resp, err := s.client.Do(req, k)
if err != nil {
return nil, resp, err
@@ -135,7 +175,7 @@ type AddDeployKeyOptions struct {
//
// GitLab API docs:
// https://docs.gitlab.com/ce/api/deploy_keys.html#add-deploy-key
-func (s *DeployKeysService) AddDeployKey(pid interface{}, opt *AddDeployKeyOptions, options ...RequestOptionFunc) (*DeployKey, *Response, error) {
+func (s *DeployKeysService) AddDeployKey(pid interface{}, opt *AddDeployKeyOptions, options ...RequestOptionFunc) (*ProjectDeployKey, *Response, error) {
project, err := parseID(pid)
if err != nil {
return nil, nil, err
@@ -147,7 +187,7 @@ func (s *DeployKeysService) AddDeployKey(pid interface{}, opt *AddDeployKeyOptio
return nil, nil, err
}
- k := new(DeployKey)
+ k := new(ProjectDeployKey)
resp, err := s.client.Do(req, k)
if err != nil {
return nil, resp, err
@@ -179,7 +219,7 @@ func (s *DeployKeysService) DeleteDeployKey(pid interface{}, deployKey int, opti
//
// GitLab API docs:
// https://docs.gitlab.com/ce/api/deploy_keys.html#enable-a-deploy-key
-func (s *DeployKeysService) EnableDeployKey(pid interface{}, deployKey int, options ...RequestOptionFunc) (*DeployKey, *Response, error) {
+func (s *DeployKeysService) EnableDeployKey(pid interface{}, deployKey int, options ...RequestOptionFunc) (*ProjectDeployKey, *Response, error) {
project, err := parseID(pid)
if err != nil {
return nil, nil, err
@@ -191,7 +231,7 @@ func (s *DeployKeysService) EnableDeployKey(pid interface{}, deployKey int, opti
return nil, nil, err
}
- k := new(DeployKey)
+ k := new(ProjectDeployKey)
resp, err := s.client.Do(req, k)
if err != nil {
return nil, resp, err
@@ -213,7 +253,7 @@ type UpdateDeployKeyOptions struct {
//
// GitLab API docs:
// https://docs.gitlab.com/ce/api/deploy_keys.html#update-deploy-key
-func (s *DeployKeysService) UpdateDeployKey(pid interface{}, deployKey int, opt *UpdateDeployKeyOptions, options ...RequestOptionFunc) (*DeployKey, *Response, error) {
+func (s *DeployKeysService) UpdateDeployKey(pid interface{}, deployKey int, opt *UpdateDeployKeyOptions, options ...RequestOptionFunc) (*ProjectDeployKey, *Response, error) {
project, err := parseID(pid)
if err != nil {
return nil, nil, err
@@ -225,7 +265,7 @@ func (s *DeployKeysService) UpdateDeployKey(pid interface{}, deployKey int, opt
return nil, nil, err
}
- k := new(DeployKey)
+ k := new(ProjectDeployKey)
resp, err := s.client.Do(req, k)
if err != nil {
return nil, resp, err
diff --git a/vendor/github.com/xanzy/go-gitlab/deploy_tokens.go b/vendor/github.com/xanzy/go-gitlab/deploy_tokens.go
index 1b9943d56..f85102329 100644
--- a/vendor/github.com/xanzy/go-gitlab/deploy_tokens.go
+++ b/vendor/github.com/xanzy/go-gitlab/deploy_tokens.go
@@ -95,6 +95,31 @@ func (s *DeployTokensService) ListProjectDeployTokens(pid interface{}, opt *List
return ts, resp, err
}
+// GetProjectDeployToken gets a single deploy token.
+//
+// GitLab API docs:
+// https://docs.gitlab.com/ee/api/deploy_tokens.html#get-a-project-deploy-token
+func (s *DeployTokensService) GetProjectDeployToken(pid interface{}, deployToken int, options ...RequestOptionFunc) (*DeployToken, *Response, error) {
+ project, err := parseID(pid)
+ if err != nil {
+ return nil, nil, err
+ }
+ u := fmt.Sprintf("projects/%s/deploy_tokens/%d", PathEscape(project), deployToken)
+
+ req, err := s.client.NewRequest(http.MethodGet, u, nil, options)
+ if err != nil {
+ return nil, nil, err
+ }
+
+ t := new(DeployToken)
+ resp, err := s.client.Do(req, t)
+ if err != nil {
+ return nil, resp, err
+ }
+
+ return t, resp, err
+}
+
// CreateProjectDeployTokenOptions represents the available CreateProjectDeployToken() options.
//
// GitLab API docs:
@@ -182,6 +207,31 @@ func (s *DeployTokensService) ListGroupDeployTokens(gid interface{}, opt *ListGr
return ts, resp, err
}
+// GetGroupDeployToken gets a single deploy token.
+//
+// GitLab API docs:
+// https://docs.gitlab.com/ee/api/deploy_tokens.html#get-a-group-deploy-token
+func (s *DeployTokensService) GetGroupDeployToken(gid interface{}, deployToken int, options ...RequestOptionFunc) (*DeployToken, *Response, error) {
+ group, err := parseID(gid)
+ if err != nil {
+ return nil, nil, err
+ }
+ u := fmt.Sprintf("groups/%s/deploy_tokens/%d", PathEscape(group), deployToken)
+
+ req, err := s.client.NewRequest(http.MethodGet, u, nil, options)
+ if err != nil {
+ return nil, nil, err
+ }
+
+ t := new(DeployToken)
+ resp, err := s.client.Do(req, t)
+ if err != nil {
+ return nil, resp, err
+ }
+
+ return t, resp, err
+}
+
// CreateGroupDeployTokenOptions represents the available CreateGroupDeployToken() options.
//
// GitLab API docs:
diff --git a/vendor/github.com/xanzy/go-gitlab/environments.go b/vendor/github.com/xanzy/go-gitlab/environments.go
index d88129395..7e0b2675a 100644
--- a/vendor/github.com/xanzy/go-gitlab/environments.go
+++ b/vendor/github.com/xanzy/go-gitlab/environments.go
@@ -19,6 +19,7 @@ package gitlab
import (
"fmt"
"net/http"
+ "time"
)
// EnvironmentsService handles communication with the environment related methods
@@ -39,6 +40,8 @@ type Environment struct {
State string `json:"state"`
ExternalURL string `json:"external_url"`
Project *Project `json:"project"`
+ CreatedAt *time.Time `json:"created_at"`
+ UpdatedAt *time.Time `json:"updated_at"`
LastDeployment *Deployment `json:"last_deployment"`
}
diff --git a/vendor/github.com/xanzy/go-gitlab/event_parsing.go b/vendor/github.com/xanzy/go-gitlab/event_parsing.go
index 69259e0e0..e17a0f147 100644
--- a/vendor/github.com/xanzy/go-gitlab/event_parsing.go
+++ b/vendor/github.com/xanzy/go-gitlab/event_parsing.go
@@ -39,6 +39,7 @@ const (
EventTypePush EventType = "Push Hook"
EventTypeRelease EventType = "Release Hook"
EventTypeServiceHook EventType = "Service Hook"
+ EventTypeSubGroup EventType = "Subgroup Hook"
EventTypeSystemHook EventType = "System Hook"
EventTypeTagPush EventType = "Tag Push Hook"
EventTypeWikiPage EventType = "Wiki Page Hook"
@@ -265,6 +266,8 @@ func ParseWebhook(eventType EventType, payload []byte) (event interface{}, err e
default:
return nil, fmt.Errorf("unexpected service type %s", service.ObjectKind)
}
+ case EventTypeSubGroup:
+ event = &SubGroupEvent{}
case EventTypeTagPush:
event = &TagEvent{}
case EventTypeWikiPage:
diff --git a/vendor/github.com/xanzy/go-gitlab/event_systemhook_types.go b/vendor/github.com/xanzy/go-gitlab/event_systemhook_types.go
index fd99bc5e3..f3874a34c 100644
--- a/vendor/github.com/xanzy/go-gitlab/event_systemhook_types.go
+++ b/vendor/github.com/xanzy/go-gitlab/event_systemhook_types.go
@@ -16,6 +16,8 @@
package gitlab
+import "time"
+
// systemHookEvent is used to pre-process events to determine the
// system hook event type.
type systemHookEvent struct {
@@ -130,6 +132,41 @@ type UserTeamSystemEvent struct {
// https://docs.gitlab.com/ee/system_hooks/system_hooks.html
type PushSystemEvent struct {
BaseSystemEvent
+ Before string `json:"before"`
+ After string `json:"after"`
+ Ref string `json:"ref"`
+ CheckoutSHA string `json:"checkout_sha"`
+ UserID int `json:"user_id"`
+ UserName string `json:"user_name"`
+ UserUsername string `json:"user_username"`
+ UserEmail string `json:"user_email"`
+ UserAvatar string `json:"user_avatar"`
+ ProjectID int `json:"project_id"`
+ Project struct {
+ Name string `json:"name"`
+ Description string `json:"description"`
+ WebURL string `json:"web_url"`
+ AvatarURL string `json:"avatar_url"`
+ GitHTTPURL string `json:"git_http_url"`
+ GitSSHURL string `json:"git_ssh_url"`
+ Namespace string `json:"namespace"`
+ VisibilityLevel int `json:"visibility_level"`
+ PathWithNamespace string `json:"path_with_namespace"`
+ DefaultBranch string `json:"default_branch"`
+ Homepage string `json:"homepage"`
+ URL string `json:"url"`
+ } `json:"project"`
+ Commits []struct {
+ ID string `json:"id"`
+ Message string `json:"message"`
+ Timestamp time.Time `json:"timestamp"`
+ URL string `json:"url"`
+ Author struct {
+ Name string `json:"name"`
+ Email string `json:"email"`
+ } `json:"author"`
+ } `json:"commits"`
+ TotalCommitsCount int `json:"total_commits_count"`
}
// TagPushSystemEvent represents a tag push system event.
@@ -138,6 +175,41 @@ type PushSystemEvent struct {
// https://docs.gitlab.com/ee/system_hooks/system_hooks.html
type TagPushSystemEvent struct {
BaseSystemEvent
+ Before string `json:"before"`
+ After string `json:"after"`
+ Ref string `json:"ref"`
+ CheckoutSHA string `json:"checkout_sha"`
+ UserID int `json:"user_id"`
+ UserName string `json:"user_name"`
+ UserUsername string `json:"user_username"`
+ UserEmail string `json:"user_email"`
+ UserAvatar string `json:"user_avatar"`
+ ProjectID int `json:"project_id"`
+ Project struct {
+ Name string `json:"name"`
+ Description string `json:"description"`
+ WebURL string `json:"web_url"`
+ AvatarURL string `json:"avatar_url"`
+ GitHTTPURL string `json:"git_http_url"`
+ GitSSHURL string `json:"git_ssh_url"`
+ Namespace string `json:"namespace"`
+ VisibilityLevel int `json:"visibility_level"`
+ PathWithNamespace string `json:"path_with_namespace"`
+ DefaultBranch string `json:"default_branch"`
+ Homepage string `json:"homepage"`
+ URL string `json:"url"`
+ } `json:"project"`
+ Commits []struct {
+ ID string `json:"id"`
+ Message string `json:"message"`
+ Timestamp time.Time `json:"timestamp"`
+ URL string `json:"url"`
+ Author struct {
+ Name string `json:"name"`
+ Email string `json:"email"`
+ } `json:"author"`
+ } `json:"commits"`
+ TotalCommitsCount int `json:"total_commits_count"`
}
// RepositoryUpdateSystemEvent represents a repository updated system event.
@@ -146,4 +218,31 @@ type TagPushSystemEvent struct {
// https://docs.gitlab.com/ee/system_hooks/system_hooks.html
type RepositoryUpdateSystemEvent struct {
BaseSystemEvent
+ UserID int `json:"user_id"`
+ UserName string `json:"user_name"`
+ UserEmail string `json:"user_email"`
+ UserAvatar string `json:"user_avatar"`
+ ProjectID int `json:"project_id"`
+ Project struct {
+ ID int `json:"id"`
+ Name string `json:"name"`
+ Description string `json:"description"`
+ WebURL string `json:"web_url"`
+ AvatarURL string `json:"avatar_url"`
+ GitHTTPURL string `json:"git_http_url"`
+ GitSSHURL string `json:"git_ssh_url"`
+ Namespace string `json:"namespace"`
+ VisibilityLevel int `json:"visibility_level"`
+ PathWithNamespace string `json:"path_with_namespace"`
+ DefaultBranch string `json:"default_branch"`
+ CiConfigPath string `json:"ci_config_path"`
+ Homepage string `json:"homepage"`
+ URL string `json:"url"`
+ } `json:"project"`
+ Changes []struct {
+ Before string `json:"before"`
+ After string `json:"after"`
+ Ref string `json:"ref"`
+ } `json:"changes"`
+ Refs []string `json:"refs"`
}
diff --git a/vendor/github.com/xanzy/go-gitlab/event_webhook_types.go b/vendor/github.com/xanzy/go-gitlab/event_webhook_types.go
index 1a1405261..aff4c4d1b 100644
--- a/vendor/github.com/xanzy/go-gitlab/event_webhook_types.go
+++ b/vendor/github.com/xanzy/go-gitlab/event_webhook_types.go
@@ -61,7 +61,7 @@ type BuildEvent struct {
// CommitCommentEvent represents a comment on a commit event.
//
// GitLab API docs:
-// https://docs.gitlab.com/ce/user/project/integrations/webhooks.html#comment-on-commit
+// https://docs.gitlab.com/ce/user/project/integrations/webhook_events.html#comment-on-a-commit
type CommitCommentEvent struct {
ObjectKind string `json:"object_kind"`
User *User `json:"user"`
@@ -125,7 +125,7 @@ type CommitCommentEvent struct {
// DeploymentEvent represents a deployment event
//
// GitLab API docs:
-// https://docs.gitlab.com/ce/user/project/integrations/webhooks.html#deployment-events
+// https://docs.gitlab.com/ce/user/project/integrations/webhook_events.html#deployment-events
type DeploymentEvent struct {
ObjectKind string `json:"object_kind"`
Status string `json:"status"`
@@ -160,7 +160,7 @@ type DeploymentEvent struct {
// IssueCommentEvent represents a comment on an issue event.
//
// GitLab API docs:
-// https://docs.gitlab.com/ce/user/project/integrations/webhooks.html#comment-on-issue
+// https://docs.gitlab.com/ce/user/project/integrations/webhook_events.html#comment-on-an-issue
type IssueCommentEvent struct {
ObjectKind string `json:"object_kind"`
User *User `json:"user"`
@@ -230,7 +230,7 @@ type IssueCommentEvent struct {
// IssueEvent represents a issue event.
//
// GitLab API docs:
-// https://docs.gitlab.com/ce/user/project/integrations/webhooks.html#issues-events
+// https://docs.gitlab.com/ce/user/project/integrations/webhook_events.html#issue-events
type IssueEvent struct {
ObjectKind string `json:"object_kind"`
User *EventUser `json:"user"`
@@ -344,7 +344,7 @@ type JobEvent struct {
// MergeCommentEvent represents a comment on a merge event.
//
// GitLab API docs:
-// https://docs.gitlab.com/ce/user/project/integrations/webhooks.html#comment-on-merge-request
+// https://docs.gitlab.com/ee/user/project/integrations/webhook_events.html#comment-on-a-merge-request
type MergeCommentEvent struct {
ObjectKind string `json:"object_kind"`
User *EventUser `json:"user"`
@@ -430,6 +430,7 @@ type MergeCommentEvent struct {
Target *Repository `json:"target"`
LastCommit struct {
ID string `json:"id"`
+ Title string `json:"title"`
Message string `json:"message"`
Timestamp *time.Time `json:"timestamp"`
URL string `json:"url"`
@@ -447,7 +448,7 @@ type MergeCommentEvent struct {
// MergeEvent represents a merge event.
//
// GitLab API docs:
-// https://docs.gitlab.com/ce/user/project/integrations/webhooks.html#merge-request-events
+// https://docs.gitlab.com/ce/user/project/integrations/webhook_events.html#merge-request-events
type MergeEvent struct {
ObjectKind string `json:"object_kind"`
User *EventUser `json:"user"`
@@ -623,7 +624,7 @@ func (p *MergeParams) UnmarshalJSON(b []byte) error {
// PipelineEvent represents a pipeline event.
//
// GitLab API docs:
-// https://docs.gitlab.com/ce/user/project/integrations/webhooks.html#pipeline-events
+// https://docs.gitlab.com/ce/user/project/integrations/webhook_events.html#pipeline-events
type PipelineEvent struct {
ObjectKind string `json:"object_kind"`
ObjectAttributes struct {
@@ -720,7 +721,7 @@ type PipelineEvent struct {
// PushEvent represents a push event.
//
// GitLab API docs:
-// https://docs.gitlab.com/ce/user/project/integrations/webhooks.html#push-events
+// https://docs.gitlab.com/ce/user/project/integrations/webhook_events.html#push-events
type PushEvent struct {
ObjectKind string `json:"object_kind"`
Before string `json:"before"`
@@ -770,7 +771,7 @@ type PushEvent struct {
// ReleaseEvent represents a release event
//
// GitLab API docs:
-// https://docs.gitlab.com/ce/user/project/integrations/webhooks.html#release-events
+// https://docs.gitlab.com/ce/user/project/integrations/webhook_events.html#release-events
type ReleaseEvent struct {
ID int `json:"id"`
CreatedAt string `json:"created_at"` // Should be *time.Time (see Gitlab issue #21468)
@@ -829,7 +830,7 @@ type ReleaseEvent struct {
// SnippetCommentEvent represents a comment on a snippet event.
//
// GitLab API docs:
-// https://docs.gitlab.com/ce/user/project/integrations/webhooks.html#comment-on-code-snippet
+// https://docs.gitlab.com/ee/user/project/integrations/webhook_events.html#comment-on-a-code-snippet
type SnippetCommentEvent struct {
ObjectKind string `json:"object_kind"`
User *EventUser `json:"user"`
@@ -868,13 +869,46 @@ type SnippetCommentEvent struct {
Description string `json:"description"`
URL string `json:"url"`
} `json:"object_attributes"`
- Snippet *Snippet `json:"snippet"`
+ Snippet *struct {
+ ID int `json:"id"`
+ Title string `json:"title"`
+ Content string `json:"content"`
+ AuthorID int `json:"author_id"`
+ ProjectID int `json:"project_id"`
+ CreatedAt string `json:"created_at"`
+ UpdatedAt string `json:"updated_at"`
+ Filename string `json:"file_name"`
+ ExpiresAt string `json:"expires_at"`
+ Type string `json:"type"`
+ VisibilityLevel int `json:"visibility_level"`
+ Description string `json:"description"`
+ Secret bool `json:"secret"`
+ RepositoryReadOnly bool `json:"repository_read_only"`
+ } `json:"snippet"`
+}
+
+// SubGroupEvent represents a subgroup event.
+//
+// GitLab API docs:
+// https://docs.gitlab.com/ee/user/project/integrations/webhook_events.html#subgroup-events
+type SubGroupEvent struct {
+ CreatedAt *time.Time `json:"created_at"`
+ UpdatedAt *time.Time `json:"updated_at"`
+ EventName string `json:"event_name"`
+ Name string `json:"name"`
+ Path string `json:"path"`
+ FullPath string `json:"full_path"`
+ GroupID int `json:"group_id"`
+ ParentGroupID int `json:"parent_group_id"`
+ ParentName string `json:"parent_name"`
+ ParentPath string `json:"parent_path"`
+ ParentFullPath string `json:"parent_full_path"`
}
// TagEvent represents a tag event.
//
// GitLab API docs:
-// https://docs.gitlab.com/ce/user/project/integrations/webhooks.html#tag-events
+// https://docs.gitlab.com/ce/user/project/integrations/webhook_events.html#tag-events
type TagEvent struct {
ObjectKind string `json:"object_kind"`
Before string `json:"before"`
@@ -925,7 +959,7 @@ type TagEvent struct {
// WikiPageEvent represents a wiki page event.
//
// GitLab API docs:
-// https://docs.gitlab.com/ce/user/project/integrations/webhooks.html#wiki-page-events
+// https://docs.gitlab.com/ce/user/project/integrations/webhook_events.html#wiki-page-events
type WikiPageEvent struct {
ObjectKind string `json:"object_kind"`
User *EventUser `json:"user"`
diff --git a/vendor/github.com/xanzy/go-gitlab/gitlab.go b/vendor/github.com/xanzy/go-gitlab/gitlab.go
index 697e21df9..d1d59bb9d 100644
--- a/vendor/github.com/xanzy/go-gitlab/gitlab.go
+++ b/vendor/github.com/xanzy/go-gitlab/gitlab.go
@@ -101,104 +101,106 @@ type Client struct {
UserAgent string
// Services used for talking to different parts of the GitLab API.
- AccessRequests *AccessRequestsService
- Applications *ApplicationsService
- AuditEvents *AuditEventsService
- Avatar *AvatarRequestsService
- AwardEmoji *AwardEmojiService
- Boards *IssueBoardsService
- Branches *BranchesService
- BroadcastMessage *BroadcastMessagesService
- CIYMLTemplate *CIYMLTemplatesService
- Commits *CommitsService
- ContainerRegistry *ContainerRegistryService
- CustomAttribute *CustomAttributesService
- DeployKeys *DeployKeysService
- DeployTokens *DeployTokensService
- Deployments *DeploymentsService
- Discussions *DiscussionsService
- Environments *EnvironmentsService
- EpicIssues *EpicIssuesService
- Epics *EpicsService
- Events *EventsService
- ExternalStatusChecks *ExternalStatusChecksService
- Features *FeaturesService
- FreezePeriods *FreezePeriodsService
- GenericPackages *GenericPackagesService
- GeoNodes *GeoNodesService
- GitIgnoreTemplates *GitIgnoreTemplatesService
- GroupAccessTokens *GroupAccessTokensService
- GroupBadges *GroupBadgesService
- GroupCluster *GroupClustersService
- GroupImportExport *GroupImportExportService
- GroupIssueBoards *GroupIssueBoardsService
- GroupIterations *GroupIterationsService
- GroupLabels *GroupLabelsService
- GroupMembers *GroupMembersService
- GroupMilestones *GroupMilestonesService
- GroupVariables *GroupVariablesService
- GroupWikis *GroupWikisService
- Groups *GroupsService
- InstanceCluster *InstanceClustersService
- InstanceVariables *InstanceVariablesService
- Invites *InvitesService
- IssueLinks *IssueLinksService
- Issues *IssuesService
- IssuesStatistics *IssuesStatisticsService
- Jobs *JobsService
- Keys *KeysService
- Labels *LabelsService
- License *LicenseService
- LicenseTemplates *LicenseTemplatesService
- ManagedLicenses *ManagedLicensesService
- Markdown *MarkdownService
- MergeRequestApprovals *MergeRequestApprovalsService
- MergeRequests *MergeRequestsService
- Milestones *MilestonesService
- Namespaces *NamespacesService
- Notes *NotesService
- NotificationSettings *NotificationSettingsService
- Packages *PackagesService
- Pages *PagesService
- PagesDomains *PagesDomainsService
- PipelineSchedules *PipelineSchedulesService
- PipelineTriggers *PipelineTriggersService
- Pipelines *PipelinesService
- PlanLimits *PlanLimitsService
- ProjectBadges *ProjectBadgesService
- ProjectAccessTokens *ProjectAccessTokensService
- ProjectCluster *ProjectClustersService
- ProjectImportExport *ProjectImportExportService
- ProjectIterations *ProjectIterationsService
- ProjectMembers *ProjectMembersService
- ProjectMirrors *ProjectMirrorService
- ProjectSnippets *ProjectSnippetsService
- ProjectVariables *ProjectVariablesService
- Projects *ProjectsService
- ProtectedBranches *ProtectedBranchesService
- ProtectedEnvironments *ProtectedEnvironmentsService
- ProtectedTags *ProtectedTagsService
- ReleaseLinks *ReleaseLinksService
- Releases *ReleasesService
- Repositories *RepositoriesService
- RepositoryFiles *RepositoryFilesService
- RepositorySubmodules *RepositorySubmodulesService
- ResourceLabelEvents *ResourceLabelEventsService
- ResourceStateEvents *ResourceStateEventsService
- Runners *RunnersService
- Search *SearchService
- Services *ServicesService
- Settings *SettingsService
- Sidekiq *SidekiqService
- Snippets *SnippetsService
- SystemHooks *SystemHooksService
- Tags *TagsService
- Todos *TodosService
- Topics *TopicsService
- Users *UsersService
- Validate *ValidateService
- Version *VersionService
- Wikis *WikisService
+ AccessRequests *AccessRequestsService
+ Applications *ApplicationsService
+ AuditEvents *AuditEventsService
+ Avatar *AvatarRequestsService
+ AwardEmoji *AwardEmojiService
+ Boards *IssueBoardsService
+ Branches *BranchesService
+ BroadcastMessage *BroadcastMessagesService
+ CIYMLTemplate *CIYMLTemplatesService
+ Commits *CommitsService
+ ContainerRegistry *ContainerRegistryService
+ CustomAttribute *CustomAttributesService
+ DeployKeys *DeployKeysService
+ DeployTokens *DeployTokensService
+ Deployments *DeploymentsService
+ Discussions *DiscussionsService
+ Environments *EnvironmentsService
+ EpicIssues *EpicIssuesService
+ Epics *EpicsService
+ Events *EventsService
+ ExternalStatusChecks *ExternalStatusChecksService
+ Features *FeaturesService
+ FreezePeriods *FreezePeriodsService
+ GenericPackages *GenericPackagesService
+ GeoNodes *GeoNodesService
+ GitIgnoreTemplates *GitIgnoreTemplatesService
+ GroupAccessTokens *GroupAccessTokensService
+ GroupBadges *GroupBadgesService
+ GroupCluster *GroupClustersService
+ GroupImportExport *GroupImportExportService
+ GroupIssueBoards *GroupIssueBoardsService
+ GroupIterations *GroupIterationsService
+ GroupLabels *GroupLabelsService
+ GroupMembers *GroupMembersService
+ GroupMilestones *GroupMilestonesService
+ GroupVariables *GroupVariablesService
+ GroupWikis *GroupWikisService
+ Groups *GroupsService
+ InstanceCluster *InstanceClustersService
+ InstanceVariables *InstanceVariablesService
+ Invites *InvitesService
+ IssueLinks *IssueLinksService
+ Issues *IssuesService
+ IssuesStatistics *IssuesStatisticsService
+ Jobs *JobsService
+ Keys *KeysService
+ Labels *LabelsService
+ License *LicenseService
+ LicenseTemplates *LicenseTemplatesService
+ ManagedLicenses *ManagedLicensesService
+ Markdown *MarkdownService
+ MergeRequestApprovals *MergeRequestApprovalsService
+ MergeRequests *MergeRequestsService
+ Milestones *MilestonesService
+ Namespaces *NamespacesService
+ Notes *NotesService
+ NotificationSettings *NotificationSettingsService
+ Packages *PackagesService
+ Pages *PagesService
+ PagesDomains *PagesDomainsService
+ PersonalAccessTokens *PersonalAccessTokensService
+ PipelineSchedules *PipelineSchedulesService
+ PipelineTriggers *PipelineTriggersService
+ Pipelines *PipelinesService
+ PlanLimits *PlanLimitsService
+ ProjectBadges *ProjectBadgesService
+ ProjectAccessTokens *ProjectAccessTokensService
+ ProjectCluster *ProjectClustersService
+ ProjectImportExport *ProjectImportExportService
+ ProjectIterations *ProjectIterationsService
+ ProjectMembers *ProjectMembersService
+ ProjectMirrors *ProjectMirrorService
+ ProjectSnippets *ProjectSnippetsService
+ ProjectVariables *ProjectVariablesService
+ ProjectVulnerabilities *ProjectVulnerabilitiesService
+ Projects *ProjectsService
+ ProtectedBranches *ProtectedBranchesService
+ ProtectedEnvironments *ProtectedEnvironmentsService
+ ProtectedTags *ProtectedTagsService
+ ReleaseLinks *ReleaseLinksService
+ Releases *ReleasesService
+ Repositories *RepositoriesService
+ RepositoryFiles *RepositoryFilesService
+ RepositorySubmodules *RepositorySubmodulesService
+ ResourceLabelEvents *ResourceLabelEventsService
+ ResourceStateEvents *ResourceStateEventsService
+ Runners *RunnersService
+ Search *SearchService
+ Services *ServicesService
+ Settings *SettingsService
+ Sidekiq *SidekiqService
+ Snippets *SnippetsService
+ SystemHooks *SystemHooksService
+ Tags *TagsService
+ Todos *TodosService
+ Topics *TopicsService
+ Users *UsersService
+ Validate *ValidateService
+ Version *VersionService
+ Wikis *WikisService
}
// ListOptions specifies the optional parameters to various List methods that
@@ -358,6 +360,7 @@ func newClient(options ...ClientOptionFunc) (*Client, error) {
c.Packages = &PackagesService{client: c}
c.Pages = &PagesService{client: c}
c.PagesDomains = &PagesDomainsService{client: c}
+ c.PersonalAccessTokens = &PersonalAccessTokensService{client: c}
c.PipelineSchedules = &PipelineSchedulesService{client: c}
c.PipelineTriggers = &PipelineTriggersService{client: c}
c.Pipelines = &PipelinesService{client: c}
@@ -371,6 +374,7 @@ func newClient(options ...ClientOptionFunc) (*Client, error) {
c.ProjectMirrors = &ProjectMirrorService{client: c}
c.ProjectSnippets = &ProjectSnippetsService{client: c}
c.ProjectVariables = &ProjectVariablesService{client: c}
+ c.ProjectVulnerabilities = &ProjectVulnerabilitiesService{client: c}
c.Projects = &ProjectsService{client: c}
c.ProtectedBranches = &ProtectedBranchesService{client: c}
c.ProtectedEnvironments = &ProtectedEnvironmentsService{client: c}
diff --git a/vendor/github.com/xanzy/go-gitlab/group_access_tokens.go b/vendor/github.com/xanzy/go-gitlab/group_access_tokens.go
index 41532bf08..94c53fd71 100644
--- a/vendor/github.com/xanzy/go-gitlab/group_access_tokens.go
+++ b/vendor/github.com/xanzy/go-gitlab/group_access_tokens.go
@@ -30,7 +30,7 @@ type GroupAccessTokensService struct {
client *Client
}
-// GroupAccessToken represents a GitLab Group Access Token.
+// GroupAccessToken represents a GitLab group access token.
//
// GitLab API docs: https://docs.gitlab.com/ee/api/group_access_tokens.html
type GroupAccessToken struct {
@@ -40,6 +40,7 @@ type GroupAccessToken struct {
Scopes []string `json:"scopes"`
CreatedAt *time.Time `json:"created_at"`
ExpiresAt *ISOTime `json:"expires_at"`
+ LastUsedAt *time.Time `json:"last_used_at"`
Active bool `json:"active"`
Revoked bool `json:"revoked"`
Token string `json:"token"`
@@ -57,8 +58,7 @@ func (v GroupAccessToken) String() string {
// https://docs.gitlab.com/ee/api/group_access_tokens.html#list-group-access-tokens
type ListGroupAccessTokensOptions ListOptions
-// ListGroupAccessTokens gets a list of all Group Access Tokens in a
-// group.
+// ListGroupAccessTokens gets a list of all group access tokens in a group.
//
// GitLab API docs:
// https://docs.gitlab.com/ee/api/group_access_tokens.html#list-group-access-tokens
@@ -83,6 +83,31 @@ func (s *GroupAccessTokensService) ListGroupAccessTokens(gid interface{}, opt *L
return gats, resp, err
}
+// GetGroupAccessToken gets a single group access tokens in a group.
+//
+// GitLab API docs:
+// https://docs.gitlab.com/ee/api/group_access_tokens.html#get-a-group-access-token
+func (s *GroupAccessTokensService) GetGroupAccessToken(gid interface{}, id int, options ...RequestOptionFunc) (*GroupAccessToken, *Response, error) {
+ groups, err := parseID(gid)
+ if err != nil {
+ return nil, nil, err
+ }
+ u := fmt.Sprintf("groups/%s/access_tokens/%d", PathEscape(groups), id)
+
+ req, err := s.client.NewRequest(http.MethodGet, u, nil, options)
+ if err != nil {
+ return nil, nil, err
+ }
+
+ gat := new(GroupAccessToken)
+ resp, err := s.client.Do(req, &gat)
+ if err != nil {
+ return nil, resp, err
+ }
+
+ return gat, resp, err
+}
+
// CreateGroupAccessTokenOptions represents the available CreateVariable()
// options.
//
@@ -95,7 +120,7 @@ type CreateGroupAccessTokenOptions struct {
ExpiresAt *ISOTime `url:"expires_at,omitempty" json:"expires_at,omitempty"`
}
-// CreateGroupAccessToken creates a new Group Access Token.
+// CreateGroupAccessToken creates a new group access token.
//
// GitLab API docs:
// https://docs.gitlab.com/ee/api/group_access_tokens.html#create-a-group-access-token
@@ -120,11 +145,11 @@ func (s *GroupAccessTokensService) CreateGroupAccessToken(gid interface{}, opt *
return pat, resp, err
}
-// DeleteGroupAccessToken deletes a Group Access Token.
+// RevokeGroupAccessToken revokes a group access token.
//
// GitLab API docs:
// https://docs.gitlab.com/ee/api/group_access_tokens.html#revoke-a-group-access-token
-func (s *GroupAccessTokensService) DeleteGroupAccessToken(gid interface{}, id int, options ...RequestOptionFunc) (*Response, error) {
+func (s *GroupAccessTokensService) RevokeGroupAccessToken(gid interface{}, id int, options ...RequestOptionFunc) (*Response, error) {
groups, err := parseID(gid)
if err != nil {
return nil, err
diff --git a/vendor/github.com/xanzy/go-gitlab/group_hooks.go b/vendor/github.com/xanzy/go-gitlab/group_hooks.go
index 55c44f181..acb51d9a4 100644
--- a/vendor/github.com/xanzy/go-gitlab/group_hooks.go
+++ b/vendor/github.com/xanzy/go-gitlab/group_hooks.go
@@ -30,6 +30,7 @@ type GroupHook struct {
URL string `json:"url"`
GroupID int `json:"group_id"`
PushEvents bool `json:"push_events"`
+ PushEventsBranchFilter string `json:"push_events_branch_filter"`
IssuesEvents bool `json:"issues_events"`
ConfidentialIssuesEvents bool `json:"confidential_issues_events"`
ConfidentialNoteEvents bool `json:"confidential_note_events"`
@@ -41,6 +42,7 @@ type GroupHook struct {
WikiPageEvents bool `json:"wiki_page_events"`
DeploymentEvents bool `json:"deployment_events"`
ReleasesEvents bool `json:"releases_events"`
+ SubGroupEvents bool `json:"subgroup_events"`
EnableSSLVerification bool `json:"enable_ssl_verification"`
CreatedAt *time.Time `json:"created_at"`
}
@@ -99,6 +101,7 @@ func (s *GroupsService) GetGroupHook(pid interface{}, hook int, options ...Reque
type AddGroupHookOptions struct {
URL *string `url:"url,omitempty" json:"url,omitempty"`
PushEvents *bool `url:"push_events,omitempty" json:"push_events,omitempty"`
+ PushEventsBranchFilter *string `url:"push_events_branch_filter,omitempty" json:"push_events_branch_filter,omitempty"`
IssuesEvents *bool `url:"issues_events,omitempty" json:"issues_events,omitempty"`
ConfidentialIssuesEvents *bool `url:"confidential_issues_events,omitempty" json:"confidential_issues_events,omitempty"`
ConfidentialNoteEvents *bool `url:"confidential_note_events,omitempty" json:"confidential_note_events,omitempty"`
@@ -110,6 +113,7 @@ type AddGroupHookOptions struct {
WikiPageEvents *bool `url:"wiki_page_events,omitempty" json:"wiki_page_events,omitempty"`
DeploymentEvents *bool `url:"deployment_events,omitempty" json:"deployment_events,omitempty"`
ReleasesEvents *bool `url:"releases_events,omitempty" json:"releases_events,omitempty"`
+ SubGroupEvents *bool `url:"subgroup_events,omitempty" json:"subgroup_events,omitempty"`
EnableSSLVerification *bool `url:"enable_ssl_verification,omitempty" json:"enable_ssl_verification,omitempty"`
Token *string `url:"token,omitempty" json:"token,omitempty"`
}
@@ -145,6 +149,7 @@ func (s *GroupsService) AddGroupHook(gid interface{}, opt *AddGroupHookOptions,
type EditGroupHookOptions struct {
URL *string `url:"url,omitempty" json:"url,omitempty"`
PushEvents *bool `url:"push_events,omitempty" json:"push_events,omitempty"`
+ PushEventsBranchFilter *string `url:"push_events_branch_filter,omitempty" json:"push_events_branch_filter,omitempty"`
IssuesEvents *bool `url:"issues_events,omitempty" json:"issues_events,omitempty"`
ConfidentialIssuesEvents *bool `url:"confidential_issues_events,omitempty" json:"confidential_issues_events,omitempty"`
ConfidentialNoteEvents *bool `url:"confidential_note_events,omitempty" json:"confidential_note_events,omitempty"`
@@ -156,6 +161,7 @@ type EditGroupHookOptions struct {
WikiPageEvents *bool `url:"wiki_page_events,omitempty" json:"wiki_page_events,omitempty"`
DeploymentEvents *bool `url:"deployment_events,omitempty" json:"deployment_events,omitempty"`
ReleasesEvents *bool `url:"releases_events,omitempty" json:"releases_events,omitempty"`
+ SubGroupEvents *bool `url:"subgroup_events,omitempty" json:"subgroup_events,omitempty"`
EnableSSLVerification *bool `url:"enable_ssl_verification,omitempty" json:"enable_ssl_verification,omitempty"`
Token *string `url:"token,omitempty" json:"token,omitempty"`
}
diff --git a/vendor/github.com/xanzy/go-gitlab/group_wikis.go b/vendor/github.com/xanzy/go-gitlab/group_wikis.go
index 55e51dadd..ecf9c272c 100644
--- a/vendor/github.com/xanzy/go-gitlab/group_wikis.go
+++ b/vendor/github.com/xanzy/go-gitlab/group_wikis.go
@@ -33,10 +33,11 @@ type GroupWikisService struct {
//
// GitLab API docs: https://docs.gitlab.com/ee/api/group_wikis.html
type GroupWiki struct {
- Content string `json:"content"`
- Format WikiFormatValue `json:"format"`
- Slug string `json:"slug"`
- Title string `json:"title"`
+ Content string `json:"content"`
+ Encoding string `json:"encoding"`
+ Format WikiFormatValue `json:"format"`
+ Slug string `json:"slug"`
+ Title string `json:"title"`
}
func (w GroupWiki) String() string {
@@ -77,18 +78,27 @@ func (s *GroupWikisService) ListGroupWikis(gid interface{}, opt *ListGroupWikisO
return gws, resp, err
}
+// GetGroupWikiPageOptions represents options to GetGroupWikiPage
+//
+// GitLab API docs:
+// https://docs.gitlab.com/ee/api/group_wikis.html#get-a-wiki-page
+type GetGroupWikiPageOptions struct {
+ RenderHTML *bool `url:"render_html,omitempty" json:"render_html,omitempty"`
+ Version *string `url:"version,omitempty" json:"version,omitempty"`
+}
+
// GetGroupWikiPage gets a wiki page for a given group.
//
// GitLab API docs:
// https://docs.gitlab.com/ee/api/group_wikis.html#get-a-wiki-page
-func (s *GroupWikisService) GetGroupWikiPage(gid interface{}, slug string, options ...RequestOptionFunc) (*GroupWiki, *Response, error) {
+func (s *GroupWikisService) GetGroupWikiPage(gid interface{}, slug string, opt *GetGroupWikiPageOptions, options ...RequestOptionFunc) (*GroupWiki, *Response, error) {
group, err := parseID(gid)
if err != nil {
return nil, nil, err
}
u := fmt.Sprintf("groups/%s/wikis/%s", PathEscape(group), url.PathEscape(slug))
- req, err := s.client.NewRequest(http.MethodGet, u, nil, options)
+ req, err := s.client.NewRequest(http.MethodGet, u, opt, options)
if err != nil {
return nil, nil, err
}
@@ -116,7 +126,7 @@ type CreateGroupWikiPageOptions struct {
// the given title, slug, and content.
//
// GitLab API docs:
-// https://docs.gitlab.com/13.8/ee/api/group_wikis.html#create-a-new-wiki-page
+// https://docs.gitlab.com/ee/api/group_wikis.html#create-a-new-wiki-page
func (s *GroupWikisService) CreateGroupWikiPage(gid interface{}, opt *CreateGroupWikiPageOptions, options ...RequestOptionFunc) (*GroupWiki, *Response, error) {
group, err := parseID(gid)
if err != nil {
diff --git a/vendor/github.com/xanzy/go-gitlab/groups.go b/vendor/github.com/xanzy/go-gitlab/groups.go
index 92e910e92..11391c3ee 100644
--- a/vendor/github.com/xanzy/go-gitlab/groups.go
+++ b/vendor/github.com/xanzy/go-gitlab/groups.go
@@ -47,6 +47,7 @@ type Group struct {
RequestAccessEnabled bool `json:"request_access_enabled"`
FullName string `json:"full_name"`
FullPath string `json:"full_path"`
+ FileTemplateProjectID int `json:"file_template_project_id"`
ParentID int `json:"parent_id"`
Projects []*Project `json:"projects"`
Statistics *StorageStatistics `json:"statistics"`
@@ -61,6 +62,7 @@ type Group struct {
MentionsDisabled bool `json:"mentions_disabled"`
RunnersToken string `json:"runners_token"`
SharedProjects []*Project `json:"shared_projects"`
+ SharedRunnersEnabled bool `json:"shared_runners_enabled"`
SharedWithGroups []struct {
GroupID int `json:"group_id"`
GroupName string `json:"group_name"`
@@ -73,6 +75,7 @@ type Group struct {
LDAPGroupLinks []*LDAPGroupLink `json:"ldap_group_links"`
SharedRunnersMinutesLimit int `json:"shared_runners_minutes_limit"`
ExtraSharedRunnersMinutesLimit int `json:"extra_shared_runners_minutes_limit"`
+ PreventForkingOutsideGroup bool `json:"prevent_forking_outside_group"`
MarkedForDeletionOn *ISOTime `json:"marked_for_deletion_on"`
CreatedAt *time.Time `json:"created_at"`
}
@@ -123,17 +126,17 @@ func (s *GroupsService) ListGroups(opt *ListGroupsOptions, options ...RequestOpt
return gs, resp, err
}
-// ListSubgroupsOptions represents the available ListSubgroups() options.
+// ListSubGroupsOptions represents the available ListSubGroups() options.
//
// GitLab API docs:
// https://docs.gitlab.com/ce/api/groups.html#list-a-groups-s-subgroups
-type ListSubgroupsOptions ListGroupsOptions
+type ListSubGroupsOptions ListGroupsOptions
-// ListSubgroups gets a list of subgroups for a given group.
+// ListSubGroups gets a list of subgroups for a given group.
//
// GitLab API docs:
// https://docs.gitlab.com/ce/api/groups.html#list-a-groups-s-subgroups
-func (s *GroupsService) ListSubgroups(gid interface{}, opt *ListSubgroupsOptions, options ...RequestOptionFunc) ([]*Group, *Response, error) {
+func (s *GroupsService) ListSubGroups(gid interface{}, opt *ListSubGroupsOptions, options ...RequestOptionFunc) ([]*Group, *Response, error) {
group, err := parseID(gid)
if err != nil {
return nil, nil, err
@@ -193,7 +196,7 @@ func (s *GroupsService) ListDescendantGroups(gid interface{}, opt *ListDescendan
type ListGroupProjectsOptions struct {
ListOptions
Archived *bool `url:"archived,omitempty" json:"archived,omitempty"`
- IncludeSubgroups *bool `url:"include_subgroups,omitempty" json:"include_subgroups,omitempty"`
+ IncludeSubGroups *bool `url:"include_subgroups,omitempty" json:"include_subgroups,omitempty"`
MinAccessLevel *AccessLevelValue `url:"min_access_level,omitempty" json:"min_access_level,omitempty"`
OrderBy *string `url:"order_by,omitempty" json:"order_by,omitempty"`
Owned *bool `url:"owned,omitempty" json:"owned,omitempty"`
@@ -201,6 +204,7 @@ type ListGroupProjectsOptions struct {
Simple *bool `url:"simple,omitempty" json:"simple,omitempty"`
Sort *string `url:"sort,omitempty" json:"sort,omitempty"`
Starred *bool `url:"starred,omitempty" json:"starred,omitempty"`
+ Topic *string `url:"topic,omitempty" json:"topic,omitempty"`
Visibility *VisibilityValue `url:"visibility,omitempty" json:"visibility,omitempty"`
WithCustomAttributes *bool `url:"with_custom_attributes,omitempty" json:"with_custom_attributes,omitempty"`
WithIssuesEnabled *bool `url:"with_issues_enabled,omitempty" json:"with_issues_enabled,omitempty"`
diff --git a/vendor/github.com/xanzy/go-gitlab/issues.go b/vendor/github.com/xanzy/go-gitlab/issues.go
index 0165c3093..208c3d786 100644
--- a/vendor/github.com/xanzy/go-gitlab/issues.go
+++ b/vendor/github.com/xanzy/go-gitlab/issues.go
@@ -206,31 +206,32 @@ type LabelDetails struct {
// GitLab API docs: https://docs.gitlab.com/ce/api/issues.html#list-issues
type ListIssuesOptions struct {
ListOptions
- State *string `url:"state,omitempty" json:"state,omitempty"`
- Labels *Labels `url:"labels,comma,omitempty" json:"labels,omitempty"`
- NotLabels *Labels `url:"not[labels],comma,omitempty" json:"not[labels],omitempty"`
- WithLabelDetails *bool `url:"with_labels_details,omitempty" json:"with_labels_details,omitempty"`
- Milestone *string `url:"milestone,omitempty" json:"milestone,omitempty"`
- NotMilestone *string `url:"not[milestone],omitempty" json:"not[milestone],omitempty"`
- Scope *string `url:"scope,omitempty" json:"scope,omitempty"`
- AuthorID *int `url:"author_id,omitempty" json:"author_id,omitempty"`
- NotAuthorID *[]int `url:"not[author_id],omitempty" json:"not[author_id],omitempty"`
- AssigneeID *int `url:"assignee_id,omitempty" json:"assignee_id,omitempty"`
- NotAssigneeID *[]int `url:"not[assignee_id],omitempty" json:"not[assignee_id],omitempty"`
- AssigneeUsername *string `url:"assignee_username,omitempty" json:"assignee_username,omitempty"`
- MyReactionEmoji *string `url:"my_reaction_emoji,omitempty" json:"my_reaction_emoji,omitempty"`
- NotMyReactionEmoji *[]string `url:"not[my_reaction_emoji],omitempty" json:"not[my_reaction_emoji],omitempty"`
- IIDs *[]int `url:"iids[],omitempty" json:"iids,omitempty"`
- In *string `url:"in,omitempty" json:"in,omitempty"`
- OrderBy *string `url:"order_by,omitempty" json:"order_by,omitempty"`
- Sort *string `url:"sort,omitempty" json:"sort,omitempty"`
- Search *string `url:"search,omitempty" json:"search,omitempty"`
- CreatedAfter *time.Time `url:"created_after,omitempty" json:"created_after,omitempty"`
- CreatedBefore *time.Time `url:"created_before,omitempty" json:"created_before,omitempty"`
- UpdatedAfter *time.Time `url:"updated_after,omitempty" json:"updated_after,omitempty"`
- UpdatedBefore *time.Time `url:"updated_before,omitempty" json:"updated_before,omitempty"`
- Confidential *bool `url:"confidential,omitempty" json:"confidential,omitempty"`
- IssueType *string `url:"issue_type,omitempty" json:"issue_type,omitempty"`
+ State *string `url:"state,omitempty" json:"state,omitempty"`
+ Labels *Labels `url:"labels,comma,omitempty" json:"labels,omitempty"`
+ NotLabels *Labels `url:"not[labels],comma,omitempty" json:"not[labels],omitempty"`
+ WithLabelDetails *bool `url:"with_labels_details,omitempty" json:"with_labels_details,omitempty"`
+ Milestone *string `url:"milestone,omitempty" json:"milestone,omitempty"`
+ NotMilestone *string `url:"not[milestone],omitempty" json:"not[milestone],omitempty"`
+ Scope *string `url:"scope,omitempty" json:"scope,omitempty"`
+ AuthorID *int `url:"author_id,omitempty" json:"author_id,omitempty"`
+ AuthorUsername *string `url:"author_username,omitempty" json:"author_username,omitempty"`
+ NotAuthorID *[]int `url:"not[author_id],omitempty" json:"not[author_id],omitempty"`
+ AssigneeID *AssigneeIDValue `url:"assignee_id,omitempty" json:"assignee_id,omitempty"`
+ NotAssigneeID *[]int `url:"not[assignee_id],omitempty" json:"not[assignee_id],omitempty"`
+ AssigneeUsername *string `url:"assignee_username,omitempty" json:"assignee_username,omitempty"`
+ MyReactionEmoji *string `url:"my_reaction_emoji,omitempty" json:"my_reaction_emoji,omitempty"`
+ NotMyReactionEmoji *[]string `url:"not[my_reaction_emoji],omitempty" json:"not[my_reaction_emoji],omitempty"`
+ IIDs *[]int `url:"iids[],omitempty" json:"iids,omitempty"`
+ In *string `url:"in,omitempty" json:"in,omitempty"`
+ OrderBy *string `url:"order_by,omitempty" json:"order_by,omitempty"`
+ Sort *string `url:"sort,omitempty" json:"sort,omitempty"`
+ Search *string `url:"search,omitempty" json:"search,omitempty"`
+ CreatedAfter *time.Time `url:"created_after,omitempty" json:"created_after,omitempty"`
+ CreatedBefore *time.Time `url:"created_before,omitempty" json:"created_before,omitempty"`
+ UpdatedAfter *time.Time `url:"updated_after,omitempty" json:"updated_after,omitempty"`
+ UpdatedBefore *time.Time `url:"updated_before,omitempty" json:"updated_before,omitempty"`
+ Confidential *bool `url:"confidential,omitempty" json:"confidential,omitempty"`
+ IssueType *string `url:"issue_type,omitempty" json:"issue_type,omitempty"`
}
// ListIssues gets all issues created by authenticated user. This function
@@ -257,31 +258,32 @@ func (s *IssuesService) ListIssues(opt *ListIssuesOptions, options ...RequestOpt
// GitLab API docs: https://docs.gitlab.com/ce/api/issues.html#list-group-issues
type ListGroupIssuesOptions struct {
ListOptions
- State *string `url:"state,omitempty" json:"state,omitempty"`
- Labels *Labels `url:"labels,comma,omitempty" json:"labels,omitempty"`
- NotLabels *Labels `url:"not[labels],comma,omitempty" json:"not[labels],omitempty"`
- WithLabelDetails *bool `url:"with_labels_details,omitempty" json:"with_labels_details,omitempty"`
- IIDs *[]int `url:"iids[],omitempty" json:"iids,omitempty"`
- Milestone *string `url:"milestone,omitempty" json:"milestone,omitempty"`
- NotMilestone *string `url:"not[milestone],omitempty" json:"not[milestone],omitempty"`
- Scope *string `url:"scope,omitempty" json:"scope,omitempty"`
- AuthorID *int `url:"author_id,omitempty" json:"author_id,omitempty"`
- NotAuthorID *[]int `url:"not[author_id],omitempty" json:"not[author_id],omitempty"`
- AuthorUsername *string `url:"author_username,omitempty" json:"author_username,omitempty"`
- AssigneeID *int `url:"assignee_id,omitempty" json:"assignee_id,omitempty"`
- NotAssigneeID *[]int `url:"not[assignee_id],omitempty" json:"not[assignee_id],omitempty"`
- AssigneeUsername *string `url:"assignee_username,omitempty" json:"assignee_username,omitempty"`
- MyReactionEmoji *string `url:"my_reaction_emoji,omitempty" json:"my_reaction_emoji,omitempty"`
- NotMyReactionEmoji *[]string `url:"not[my_reaction_emoji],omitempty" json:"not[my_reaction_emoji],omitempty"`
- OrderBy *string `url:"order_by,omitempty" json:"order_by,omitempty"`
- Sort *string `url:"sort,omitempty" json:"sort,omitempty"`
- Search *string `url:"search,omitempty" json:"search,omitempty"`
- In *string `url:"in,omitempty" json:"in,omitempty"`
- CreatedAfter *time.Time `url:"created_after,omitempty" json:"created_after,omitempty"`
- CreatedBefore *time.Time `url:"created_before,omitempty" json:"created_before,omitempty"`
- UpdatedAfter *time.Time `url:"updated_after,omitempty" json:"updated_after,omitempty"`
- UpdatedBefore *time.Time `url:"updated_before,omitempty" json:"updated_before,omitempty"`
- IssueType *string `url:"issue_type,omitempty" json:"issue_type,omitempty"`
+ State *string `url:"state,omitempty" json:"state,omitempty"`
+ Labels *Labels `url:"labels,comma,omitempty" json:"labels,omitempty"`
+ NotLabels *Labels `url:"not[labels],comma,omitempty" json:"not[labels],omitempty"`
+ WithLabelDetails *bool `url:"with_labels_details,omitempty" json:"with_labels_details,omitempty"`
+ IIDs *[]int `url:"iids[],omitempty" json:"iids,omitempty"`
+ Milestone *string `url:"milestone,omitempty" json:"milestone,omitempty"`
+ NotMilestone *string `url:"not[milestone],omitempty" json:"not[milestone],omitempty"`
+ Scope *string `url:"scope,omitempty" json:"scope,omitempty"`
+ AuthorID *int `url:"author_id,omitempty" json:"author_id,omitempty"`
+ NotAuthorID *[]int `url:"not[author_id],omitempty" json:"not[author_id],omitempty"`
+ AuthorUsername *string `url:"author_username,omitempty" json:"author_username,omitempty"`
+
+ AssigneeID *AssigneeIDValue `url:"assignee_id,omitempty" json:"assignee_id,omitempty"`
+ NotAssigneeID *[]int `url:"not[assignee_id],omitempty" json:"not[assignee_id],omitempty"`
+ AssigneeUsername *string `url:"assignee_username,omitempty" json:"assignee_username,omitempty"`
+ MyReactionEmoji *string `url:"my_reaction_emoji,omitempty" json:"my_reaction_emoji,omitempty"`
+ NotMyReactionEmoji *[]string `url:"not[my_reaction_emoji],omitempty" json:"not[my_reaction_emoji],omitempty"`
+ OrderBy *string `url:"order_by,omitempty" json:"order_by,omitempty"`
+ Sort *string `url:"sort,omitempty" json:"sort,omitempty"`
+ Search *string `url:"search,omitempty" json:"search,omitempty"`
+ In *string `url:"in,omitempty" json:"in,omitempty"`
+ CreatedAfter *time.Time `url:"created_after,omitempty" json:"created_after,omitempty"`
+ CreatedBefore *time.Time `url:"created_before,omitempty" json:"created_before,omitempty"`
+ UpdatedAfter *time.Time `url:"updated_after,omitempty" json:"updated_after,omitempty"`
+ UpdatedBefore *time.Time `url:"updated_before,omitempty" json:"updated_before,omitempty"`
+ IssueType *string `url:"issue_type,omitempty" json:"issue_type,omitempty"`
}
// ListGroupIssues gets a list of group issues. This function accepts
@@ -314,32 +316,33 @@ func (s *IssuesService) ListGroupIssues(pid interface{}, opt *ListGroupIssuesOpt
// GitLab API docs: https://docs.gitlab.com/ce/api/issues.html#list-project-issues
type ListProjectIssuesOptions struct {
ListOptions
- IIDs *[]int `url:"iids[],omitempty" json:"iids,omitempty"`
- State *string `url:"state,omitempty" json:"state,omitempty"`
- Labels *Labels `url:"labels,comma,omitempty" json:"labels,omitempty"`
- NotLabels *Labels `url:"not[labels],comma,omitempty" json:"not[labels],omitempty"`
- WithLabelDetails *bool `url:"with_labels_details,omitempty" json:"with_labels_details,omitempty"`
- Milestone *string `url:"milestone,omitempty" json:"milestone,omitempty"`
- NotMilestone *[]string `url:"not[milestone],omitempty" json:"not[milestone],omitempty"`
- Scope *string `url:"scope,omitempty" json:"scope,omitempty"`
- AuthorID *int `url:"author_id,omitempty" json:"author_id,omitempty"`
- NotAuthorID *[]int `url:"not[author_id],omitempty" json:"not[author_id],omitempty"`
- AssigneeID *int `url:"assignee_id,omitempty" json:"assignee_id,omitempty"`
- NotAssigneeID *[]int `url:"not[assignee_id],omitempty" json:"not[assignee_id],omitempty"`
- AssigneeUsername *string `url:"assignee_username,omitempty" json:"assignee_username,omitempty"`
- MyReactionEmoji *string `url:"my_reaction_emoji,omitempty" json:"my_reaction_emoji,omitempty"`
- NotMyReactionEmoji *[]string `url:"not[my_reaction_emoji],omitempty" json:"not[my_reaction_emoji],omitempty"`
- OrderBy *string `url:"order_by,omitempty" json:"order_by,omitempty"`
- Sort *string `url:"sort,omitempty" json:"sort,omitempty"`
- Search *string `url:"search,omitempty" json:"search,omitempty"`
- In *string `url:"in,omitempty" json:"in,omitempty"`
- CreatedAfter *time.Time `url:"created_after,omitempty" json:"created_after,omitempty"`
- CreatedBefore *time.Time `url:"created_before,omitempty" json:"created_before,omitempty"`
- DueDate *string `url:"due_date,omitempty" json:"due_date,omitempty"`
- UpdatedAfter *time.Time `url:"updated_after,omitempty" json:"updated_after,omitempty"`
- UpdatedBefore *time.Time `url:"updated_before,omitempty" json:"updated_before,omitempty"`
- Confidential *bool `url:"confidential,omitempty" json:"confidential,omitempty"`
- IssueType *string `url:"issue_type,omitempty" json:"issue_type,omitempty"`
+ IIDs *[]int `url:"iids[],omitempty" json:"iids,omitempty"`
+ State *string `url:"state,omitempty" json:"state,omitempty"`
+ Labels *Labels `url:"labels,comma,omitempty" json:"labels,omitempty"`
+ NotLabels *Labels `url:"not[labels],comma,omitempty" json:"not[labels],omitempty"`
+ WithLabelDetails *bool `url:"with_labels_details,omitempty" json:"with_labels_details,omitempty"`
+ Milestone *string `url:"milestone,omitempty" json:"milestone,omitempty"`
+ NotMilestone *[]string `url:"not[milestone],omitempty" json:"not[milestone],omitempty"`
+ Scope *string `url:"scope,omitempty" json:"scope,omitempty"`
+ AuthorID *int `url:"author_id,omitempty" json:"author_id,omitempty"`
+ AuthorUsername *string `url:"author_username,omitempty" json:"author_username,omitempty"`
+ NotAuthorID *[]int `url:"not[author_id],omitempty" json:"not[author_id],omitempty"`
+ AssigneeID *AssigneeIDValue `url:"assignee_id,omitempty" json:"assignee_id,omitempty"`
+ NotAssigneeID *[]int `url:"not[assignee_id],omitempty" json:"not[assignee_id],omitempty"`
+ AssigneeUsername *string `url:"assignee_username,omitempty" json:"assignee_username,omitempty"`
+ MyReactionEmoji *string `url:"my_reaction_emoji,omitempty" json:"my_reaction_emoji,omitempty"`
+ NotMyReactionEmoji *[]string `url:"not[my_reaction_emoji],omitempty" json:"not[my_reaction_emoji],omitempty"`
+ OrderBy *string `url:"order_by,omitempty" json:"order_by,omitempty"`
+ Sort *string `url:"sort,omitempty" json:"sort,omitempty"`
+ Search *string `url:"search,omitempty" json:"search,omitempty"`
+ In *string `url:"in,omitempty" json:"in,omitempty"`
+ CreatedAfter *time.Time `url:"created_after,omitempty" json:"created_after,omitempty"`
+ CreatedBefore *time.Time `url:"created_before,omitempty" json:"created_before,omitempty"`
+ DueDate *string `url:"due_date,omitempty" json:"due_date,omitempty"`
+ UpdatedAfter *time.Time `url:"updated_after,omitempty" json:"updated_after,omitempty"`
+ UpdatedBefore *time.Time `url:"updated_before,omitempty" json:"updated_before,omitempty"`
+ Confidential *bool `url:"confidential,omitempty" json:"confidential,omitempty"`
+ IssueType *string `url:"issue_type,omitempty" json:"issue_type,omitempty"`
}
// ListProjectIssues gets a list of project issues. This function accepts
diff --git a/vendor/github.com/xanzy/go-gitlab/jobs.go b/vendor/github.com/xanzy/go-gitlab/jobs.go
index a68abcf7d..d50a43c97 100644
--- a/vendor/github.com/xanzy/go-gitlab/jobs.go
+++ b/vendor/github.com/xanzy/go-gitlab/jobs.go
@@ -333,6 +333,40 @@ func (s *JobsService) DownloadSingleArtifactsFile(pid interface{}, jobID int, ar
return bytes.NewReader(artifactBuf.Bytes()), resp, err
}
+// DownloadSingleArtifactsFile download a single artifact file for a specific
+// job of the latest successful pipeline for the given reference name from
+// inside the job’s artifacts archive. The file is extracted from the archive
+// and streamed to the client.
+//
+// GitLab API docs:
+// https://docs.gitlab.com/ce/api/job_artifacts.html#download-a-single-artifact-file-from-specific-tag-or-branch
+func (s *JobsService) DownloadSingleArtifactsFileByTagOrBranch(pid interface{}, refName string, artifactPath string, opt *DownloadArtifactsFileOptions, options ...RequestOptionFunc) (*bytes.Reader, *Response, error) {
+ project, err := parseID(pid)
+ if err != nil {
+ return nil, nil, err
+ }
+
+ u := fmt.Sprintf(
+ "projects/%s/jobs/artifacts/%s/raw/%s",
+ PathEscape(project),
+ PathEscape(refName),
+ artifactPath,
+ )
+
+ req, err := s.client.NewRequest(http.MethodGet, u, opt, options)
+ if err != nil {
+ return nil, nil, err
+ }
+
+ artifactBuf := new(bytes.Buffer)
+ resp, err := s.client.Do(req, artifactBuf)
+ if err != nil {
+ return nil, resp, err
+ }
+
+ return bytes.NewReader(artifactBuf.Bytes()), resp, err
+}
+
// GetTraceFile gets a trace of a specific job of a project
//
// GitLab API docs:
diff --git a/vendor/github.com/xanzy/go-gitlab/labels.go b/vendor/github.com/xanzy/go-gitlab/labels.go
index 66db47445..4868bdaaf 100644
--- a/vendor/github.com/xanzy/go-gitlab/labels.go
+++ b/vendor/github.com/xanzy/go-gitlab/labels.go
@@ -140,6 +140,7 @@ type CreateLabelOptions struct {
Name *string `url:"name,omitempty" json:"name,omitempty"`
Color *string `url:"color,omitempty" json:"color,omitempty"`
Description *string `url:"description,omitempty" json:"description,omitempty"`
+ Priority *int `url:"priority,omitempty" json:"priority,omitempty"`
}
// CreateLabel creates a new label for given repository with given name and
@@ -200,6 +201,7 @@ type UpdateLabelOptions struct {
NewName *string `url:"new_name,omitempty" json:"new_name,omitempty"`
Color *string `url:"color,omitempty" json:"color,omitempty"`
Description *string `url:"description,omitempty" json:"description,omitempty"`
+ Priority *int `url:"priority,omitempty" json:"priority,omitempty"`
}
// UpdateLabel updates an existing label with new name or now color. At least
diff --git a/vendor/github.com/xanzy/go-gitlab/merge_requests.go b/vendor/github.com/xanzy/go-gitlab/merge_requests.go
index 8c01fe7f9..efbc8fed6 100644
--- a/vendor/github.com/xanzy/go-gitlab/merge_requests.go
+++ b/vendor/github.com/xanzy/go-gitlab/merge_requests.go
@@ -524,14 +524,14 @@ func (s *MergeRequestsService) CreateMergeRequestPipeline(pid interface{}, merge
// options.
//
// GitLab API docs:
-// https://docs.gitlab.com/ce/api/merge_requests.html#list-issues-that-will-close-on-merge
+// https://docs.gitlab.com/ee/api/merge_requests.html#list-issues-that-close-on-merge
type GetIssuesClosedOnMergeOptions ListOptions
// GetIssuesClosedOnMerge gets all the issues that would be closed by merging the
// provided merge request.
//
// GitLab API docs:
-// https://docs.gitlab.com/ce/api/merge_requests.html#list-issues-that-will-close-on-merge
+// https://docs.gitlab.com/ee/api/merge_requests.html#list-issues-that-close-on-merge
func (s *MergeRequestsService) GetIssuesClosedOnMerge(pid interface{}, mergeRequest int, opt *GetIssuesClosedOnMergeOptions, options ...RequestOptionFunc) ([]*Issue, *Response, error) {
project, err := parseID(pid)
if err != nil {
@@ -670,7 +670,7 @@ func (s *MergeRequestsService) DeleteMergeRequest(pid interface{}, mergeRequest
// options.
//
// GitLab API docs:
-// https://docs.gitlab.com/ce/api/merge_requests.html#accept-mr
+// https://docs.gitlab.com/ee/api/merge_requests.html#merge-a-merge-request
type AcceptMergeRequestOptions struct {
MergeCommitMessage *string `url:"merge_commit_message,omitempty" json:"merge_commit_message,omitempty"`
SquashCommitMessage *string `url:"squash_commit_message,omitempty" json:"squash_commit_message,omitempty"`
@@ -686,7 +686,7 @@ type AcceptMergeRequestOptions struct {
// already merged or closed - you get 405 and error message 'Method Not Allowed'
//
// GitLab API docs:
-// https://docs.gitlab.com/ce/api/merge_requests.html#accept-mr
+// https://docs.gitlab.com/ee/api/merge_requests.html#merge-a-merge-request
func (s *MergeRequestsService) AcceptMergeRequest(pid interface{}, mergeRequest int, opt *AcceptMergeRequestOptions, options ...RequestOptionFunc) (*MergeRequest, *Response, error) {
project, err := parseID(pid)
if err != nil {
@@ -875,7 +875,7 @@ func (s *MergeRequestsService) UnsubscribeFromMergeRequest(pid interface{}, merg
// status code 304 is returned.
//
// GitLab API docs:
-// https://docs.gitlab.com/ce/api/merge_requests.html#create-a-todo
+// https://docs.gitlab.com/ee/api/merge_requests.html#create-a-to-do-item
func (s *MergeRequestsService) CreateTodo(pid interface{}, mergeRequest int, options ...RequestOptionFunc) (*Todo, *Response, error) {
project, err := parseID(pid)
if err != nil {
diff --git a/vendor/github.com/xanzy/go-gitlab/namespaces.go b/vendor/github.com/xanzy/go-gitlab/namespaces.go
index 946ee4c89..b7c8ccb0f 100644
--- a/vendor/github.com/xanzy/go-gitlab/namespaces.go
+++ b/vendor/github.com/xanzy/go-gitlab/namespaces.go
@@ -19,7 +19,6 @@ package gitlab
import (
"fmt"
"net/http"
- "time"
)
// NamespacesService handles communication with the namespace related methods
@@ -34,21 +33,21 @@ type NamespacesService struct {
//
// GitLab API docs: https://docs.gitlab.com/ce/api/namespaces.html
type Namespace struct {
- ID int `json:"id"`
- Name string `json:"name"`
- Path string `json:"path"`
- Kind string `json:"kind"`
- FullPath string `json:"full_path"`
- ParentID int `json:"parent_id"`
- AvatarURL *string `json:"avatar_url"`
- WebURL string `json:"web_url"`
- MembersCountWithDescendants int `json:"members_count_with_descendants"`
- BillableMembersCount int `json:"billable_members_count"`
- Plan string `json:"plan"`
- TrialEndsOn *time.Time `json:"trial_ends_on"`
- Trial bool `json:"trial"`
- MaxSeatsUsed *int `json:"max_seats_used"`
- SeatsInUse *int `json:"seats_in_use"`
+ ID int `json:"id"`
+ Name string `json:"name"`
+ Path string `json:"path"`
+ Kind string `json:"kind"`
+ FullPath string `json:"full_path"`
+ ParentID int `json:"parent_id"`
+ AvatarURL *string `json:"avatar_url"`
+ WebURL string `json:"web_url"`
+ MembersCountWithDescendants int `json:"members_count_with_descendants"`
+ BillableMembersCount int `json:"billable_members_count"`
+ Plan string `json:"plan"`
+ TrialEndsOn *ISOTime `json:"trial_ends_on"`
+ Trial bool `json:"trial"`
+ MaxSeatsUsed *int `json:"max_seats_used"`
+ SeatsInUse *int `json:"seats_in_use"`
}
func (n Namespace) String() string {
diff --git a/vendor/github.com/xanzy/go-gitlab/notes.go b/vendor/github.com/xanzy/go-gitlab/notes.go
index 1b77d2a73..40e41d49d 100644
--- a/vendor/github.com/xanzy/go-gitlab/notes.go
+++ b/vendor/github.com/xanzy/go-gitlab/notes.go
@@ -68,7 +68,8 @@ type Note struct {
AvatarURL string `json:"avatar_url"`
WebURL string `json:"web_url"`
} `json:"resolved_by"`
- NoteableIID int `json:"noteable_iid"`
+ ResolvedAt *time.Time `json:"resolved_at"`
+ NoteableIID int `json:"noteable_iid"`
}
// NotePosition represents the position attributes of a note.
diff --git a/vendor/github.com/xanzy/go-gitlab/packages.go b/vendor/github.com/xanzy/go-gitlab/packages.go
index 37fe0e00b..06a19376c 100644
--- a/vendor/github.com/xanzy/go-gitlab/packages.go
+++ b/vendor/github.com/xanzy/go-gitlab/packages.go
@@ -136,7 +136,7 @@ func (s *PackagesService) ListProjectPackages(pid interface{}, opt *ListProjectP
// https://docs.gitlab.com/ee/api/packages.html#within-a-group
type ListGroupPackagesOptions struct {
ListOptions
- ExcludeSubgroups *bool `url:"exclude_subgroups,omitempty" json:"exclude_subgroups,omitempty"`
+ ExcludeSubGroups *bool `url:"exclude_subgroups,omitempty" json:"exclude_subgroups,omitempty"`
OrderBy *string `url:"order_by,omitempty" json:"order_by,omitempty"`
Sort *string `url:"sort,omitempty" json:"sort,omitempty"`
PackageType *string `url:"package_type,omitempty" json:"package_type,omitempty"`
diff --git a/vendor/github.com/xanzy/go-gitlab/pages_domains.go b/vendor/github.com/xanzy/go-gitlab/pages_domains.go
index 3e1b04f61..b6cd3c8a3 100644
--- a/vendor/github.com/xanzy/go-gitlab/pages_domains.go
+++ b/vendor/github.com/xanzy/go-gitlab/pages_domains.go
@@ -129,7 +129,7 @@ func (s *PagesDomainsService) GetPagesDomain(pid interface{}, domain string, opt
type CreatePagesDomainOptions struct {
Domain *string `url:"domain,omitempty" json:"domain,omitempty"`
AutoSslEnabled *bool `url:"auto_ssl_enabled,omitempty" json:"auto_ssl_enabled,omitempty"`
- Certificate *string `url:"certifiate,omitempty" json:"certifiate,omitempty"`
+ Certificate *string `url:"certificate,omitempty" json:"certificate,omitempty"`
Key *string `url:"key,omitempty" json:"key,omitempty"`
}
@@ -164,7 +164,7 @@ func (s *PagesDomainsService) CreatePagesDomain(pid interface{}, opt *CreatePage
// https://docs.gitlab.com/ce/api/pages_domains.html#update-pages-domain
type UpdatePagesDomainOptions struct {
AutoSslEnabled *bool `url:"auto_ssl_enabled,omitempty" json:"auto_ssl_enabled,omitempty"`
- Certificate *string `url:"certifiate,omitempty" json:"certifiate,omitempty"`
+ Certificate *string `url:"certificate,omitempty" json:"certificate,omitempty"`
Key *string `url:"key,omitempty" json:"key,omitempty"`
}
diff --git a/vendor/github.com/xanzy/go-gitlab/personal_access_tokens.go b/vendor/github.com/xanzy/go-gitlab/personal_access_tokens.go
new file mode 100644
index 000000000..aceec135b
--- /dev/null
+++ b/vendor/github.com/xanzy/go-gitlab/personal_access_tokens.go
@@ -0,0 +1,95 @@
+//
+// Copyright 2022, Ryan Glab