diff --git a/README.md b/README.md index 3effd32..a0c9cd7 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # GCI -GCI, a tool that control golang package import order and make it always deterministic. +GCI, a tool that controls golang package import order and makes it always deterministic. -It handles empty lines more smartly than `goimport` does. +The desired output format is highly configurable and allows for more custom formatting than `goimport` does. ## Download @@ -11,19 +11,81 @@ $ go get github.com/daixiang0/gci ``` ## Usage +GCI supports three modes of operation +```shell +$ gci print -h +Print outputs the formatted file. If you want to apply the changes to a file use write instead! + +Usage: + gci print path... [flags] + +Aliases: + print, output + +Flags: + --NoInlineComments Drops inline comments while formatting + --NoPrefixComments Drops comment lines above an import statement while formatting + -s, --Section strings Sections define how inputs will be processed. Section names are case-insensitive and may contain parameters in (). A section can contain a Prefix and a Suffix section which is delimited by ":". These sections can be used for formatting and will only be rendered if the main section contains an entry. + Comment(your text here) | CommentLine(your text here) - Prints the specified indented comment + Def | Default - Contains all imports that could not be matched to another section type + NL | NewLine - Prints an empty line + Prefix(gitlab.com/myorg) | pkgPrefix(gitlab.com/myorg) - Groups all imports with the specified Prefix. Imports will be matched to the longest Prefix. + Std | Standard - Captures all standard packages if they do not match another section + (default [Standard,Default]) + -x, --SectionSeparator strings SectionSeparators are inserted between Sections (default [NewLine]) + -h, --help help for print +``` + +```shell +$ gci write -h +Write modifies the specified files in-place + +Usage: + gci write path... [flags] + +Aliases: + write, overwrite + +Flags: + --NoInlineComments Drops inline comments while formatting + --NoPrefixComments Drops comment lines above an import statement while formatting + -s, --Section strings Sections define how inputs will be processed. Section names are case-insensitive and may contain parameters in (). A section can contain a Prefix and a Suffix section which is delimited by ":". These sections can be used for formatting and will only be rendered if the main section contains an entry. + Comment(your text here) | CommentLine(your text here) - Prints the specified indented comment + Def | Default - Contains all imports that could not be matched to another section type + NL | NewLine - Prints an empty line + Prefix(gitlab.com/myorg) | pkgPrefix(gitlab.com/myorg) - Groups all imports with the specified Prefix. Imports will be matched to the longest Prefix. + Std | Standard - Captures all standard packages if they do not match another section + (default [Standard,Default]) + -x, --SectionSeparator strings SectionSeparators are inserted between Sections (default [NewLine]) + -h, --help help for write +``` ```shell -$ gci -h -usage: gci [flags] [path ...] - -d display diffs instead of rewriting files - -local string - put imports beginning with this string after 3rd-party packages, only support one string - -w write result to (source) file instead of stdout +$ gci diff -h +Diff prints a patch in the style of the diff tool that contains the required changes to the file to make it adhere to the specified formatting. + +Usage: + gci diff path... [flags] + +Flags: + --NoInlineComments Drops inline comments while formatting + --NoPrefixComments Drops comment lines above an import statement while formatting + -s, --Section strings Sections define how inputs will be processed. Section names are case-insensitive and may contain parameters in (). A section can contain a Prefix and a Suffix section which is delimited by ":". These sections can be used for formatting and will only be rendered if the main section contains an entry. + Comment(your text here) | CommentLine(your text here) - Prints the specified indented comment + Def | Default - Contains all imports that could not be matched to another section type + NL | NewLine - Prints an empty line + Prefix(gitlab.com/myorg) | pkgPrefix(gitlab.com/myorg) - Groups all imports with the specified Prefix. Imports will be matched to the longest Prefix. + Std | Standard - Captures all standard packages if they do not match another section + (default [Standard,Default]) + -x, --SectionSeparator strings SectionSeparators are inserted between Sections (default [NewLine]) + -d, --debug Enables debug output from the formatter + -h, --help help for diff ``` +Support for the old CLI style is still present if you do not specify the subcommands. The only difference is that `--local` requires two dashes now. ## Examples -Run `gci -w -local github.com/daixiang0/gci main.go` and you will handle following cases. +Run `gci write --Section Standard --Section Default --Section "Prefix(github.com/daixiang0/gci)" main.go` and you will handle following cases: ### simple case @@ -58,60 +120,10 @@ package main import ( "fmt" go "github.com/golang" - "github.com/daixiang0" -) -``` - -to - -```go -package main -import ( - "fmt" - - go "github.com/golang" - - "github.com/daixiang0/gci" -) -``` - -### with comment and alias - -```go -package main -import ( - "fmt" - _ "github.com/golang" // golang - "github.com/daixiang0" -) -``` - -to - -```go -package main -import ( - "fmt" - - // golang - _ "github.com/golang" - "github.com/daixiang0/gci" ) ``` -### with above comment and alias - -```go -package main -import ( - "fmt" - // golang - _ "github.com/golang" - "github.com/daixiang0" -) -``` - to ```go @@ -119,8 +131,7 @@ package main import ( "fmt" - // golang - _ "github.com/golang" + go "github.com/golang" "github.com/daixiang0/gci" ) @@ -128,6 +139,4 @@ import ( ## TODO -- Support multi-3rd-party packages -- Support multiple lines of comment in import block -- Add testcases +- Add more testcases diff --git a/cmd/gci/completion.go b/cmd/gci/completion.go new file mode 100644 index 0000000..5992105 --- /dev/null +++ b/cmd/gci/completion.go @@ -0,0 +1,26 @@ +package gci + +import ( + "strings" + + "github.com/spf13/cobra" +) + +func subCommandOrGoFileCompletion(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { + var commandAliases []string + for _, subCmd := range cmd.Commands() { + commandAliases = append(commandAliases, subCmd.Name()) + commandAliases = append(commandAliases, subCmd.Aliases...) + } + for _, subCmdStr := range commandAliases { + if strings.HasPrefix(subCmdStr, toComplete) { + // completion for commands is already provided by cobra + // do not return file completion + return []string{}, cobra.ShellCompDirectiveNoFileComp + } + } + return goFileCompletion(cmd, args, toComplete) +} +func goFileCompletion(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { + return []string{"go"}, cobra.ShellCompDirectiveFilterFileExt +} diff --git a/cmd/gci/diff.go b/cmd/gci/diff.go new file mode 100644 index 0000000..d4a05ec --- /dev/null +++ b/cmd/gci/diff.go @@ -0,0 +1,16 @@ +package gci + +import ( + "github.com/daixiang0/gci/pkg/gci" +) + +// diffCmd represents the diff command +func (e *Executor) initDiff() { + e.newGciCommand( + "diff path...", + "Prints a git style diff to STDOUT", + "Diff prints a patch in the style of the diff tool that contains the required changes to the file to make it adhere to the specified formatting.", + []string{}, + true, + gci.DiffFormattedFiles) +} diff --git a/cmd/gci/gcicommand.go b/cmd/gci/gcicommand.go new file mode 100644 index 0000000..28074ab --- /dev/null +++ b/cmd/gci/gcicommand.go @@ -0,0 +1,54 @@ +package gci + +import ( + "fmt" + + "github.com/daixiang0/gci/pkg/configuration" + "github.com/daixiang0/gci/pkg/constants" + "github.com/daixiang0/gci/pkg/gci" + sectionsPkg "github.com/daixiang0/gci/pkg/gci/sections" + + "github.com/spf13/cobra" +) + +type processingFunc = func(args []string, gciCfg gci.GciConfiguration) error + +func (e *Executor) newGciCommand(use, short, long string, aliases []string, stdInSupport bool, processingFunc processingFunc) *cobra.Command { + var noInlineComments, noPrefixComments, debug *bool + var sectionStrings, sectionSeparatorStrings *[]string + cmd := cobra.Command{ + Use: use, + Aliases: aliases, + Short: short, + Long: long, + ValidArgsFunction: goFileCompletion, + RunE: func(cmd *cobra.Command, args []string) error { + fmtCfg := configuration.FormatterConfiguration{*noInlineComments, *noPrefixComments, *debug} + gciCfg, err := gci.GciStringConfiguration{fmtCfg, *sectionStrings, *sectionSeparatorStrings}.Parse() + if err != nil { + return err + } + return processingFunc(args, *gciCfg) + }, + } + if !stdInSupport { + cmd.Args = cobra.MinimumNArgs(1) + } + + // register command as subcommand + e.rootCmd.AddCommand(&cmd) + + sectionHelp := "Sections define how inputs will be processed. " + + "Section names are case-insensitive and may contain parameters in (). " + + fmt.Sprintf("A section can contain a Prefix and a Suffix section which is delimited by %q. ", constants.SectionSeparator) + + "These sections can be used for formatting and will only be rendered if the main section contains an entry." + + "\n" + + sectionsPkg.SectionParserInst.SectionHelpTexts() + // add flags + debug = cmd.Flags().BoolP("debug", "d", false, "Enables debug output from the formatter") + noInlineComments = cmd.Flags().Bool("NoInlineComments", false, "Drops inline comments while formatting") + noPrefixComments = cmd.Flags().Bool("NoPrefixComments", false, "Drops comment lines above an import statement while formatting") + sectionStrings = cmd.Flags().StringSliceP("Section", "s", gci.DefaultSections().String(), sectionHelp) + sectionSeparatorStrings = cmd.Flags().StringSliceP("SectionSeparator", "x", gci.DefaultSectionSeparators().String(), "SectionSeparators are inserted between Sections") + return &cmd +} diff --git a/cmd/gci/print.go b/cmd/gci/print.go new file mode 100644 index 0000000..a1f3106 --- /dev/null +++ b/cmd/gci/print.go @@ -0,0 +1,16 @@ +package gci + +import ( + "github.com/daixiang0/gci/pkg/gci" +) + +// printCmd represents the print command +func (e *Executor) initPrint() { + e.newGciCommand( + "print path...", + "Outputs the formatted file to STDOUT", + "Print outputs the formatted file. If you want to apply the changes to a file use write instead!", + []string{"output"}, + true, + gci.PrintFormattedFiles) +} diff --git a/cmd/gci/root.go b/cmd/gci/root.go new file mode 100644 index 0000000..dfff1f6 --- /dev/null +++ b/cmd/gci/root.go @@ -0,0 +1,67 @@ +package gci + +import ( + "fmt" + "os" + + "github.com/daixiang0/gci/pkg/configuration" + "github.com/daixiang0/gci/pkg/gci" + + "github.com/spf13/cobra" +) + +type Executor struct { + rootCmd *cobra.Command + diffMode *bool + writeMode *bool + localFlags *[]string +} + +func NewExecutor(version string) *Executor { + e := Executor{} + rootCmd := cobra.Command{ + Use: "gci [-diff | -write] [-local localPackageURLs] path...", + Short: "Gci controls golang package import order and makes it always deterministic", + Long: "Gci enables automatic formatting of imports in a deterministic manner" + + "\n" + + "If you want to integrate this as part of your CI take a look at golangci-lint.", + ValidArgsFunction: subCommandOrGoFileCompletion, + Args: cobra.MinimumNArgs(1), + Version: version, + RunE: e.runInCompatibilityMode, + } + e.rootCmd = &rootCmd + e.diffMode = rootCmd.Flags().BoolP("diff", "d", false, "display diffs instead of rewriting files") + e.writeMode = rootCmd.Flags().BoolP("write", "w", false, "write result to (source) file instead of stdout") + e.localFlags = rootCmd.Flags().StringSliceP("local", "l", []string{}, "put imports beginning with this string after 3rd-party packages, separate imports by comma") + e.initDiff() + e.initPrint() + e.initWrite() + return &e +} + +// Execute adds all child commands to the root command and sets flags appropriately. +// This is called by main.main(). It only needs to happen once to the rootCmd. +func (e *Executor) Execute() error { + return e.rootCmd.Execute() +} + +func (e *Executor) runInCompatibilityMode(cmd *cobra.Command, args []string) error { + // Workaround since the Deprecation message in Cobra can not be printed to STDERR + _, _ = fmt.Fprintln(os.Stderr, "Using the old parameters is deprecated, please use the named subcommands!") + + if *e.writeMode && *e.diffMode { + return fmt.Errorf("diff and write must not be specified at the same time") + } + // generate section specification from old localFlags format + sections := gci.LocalFlagsToSections(*e.localFlags) + sectionSeparators := gci.DefaultSectionSeparators() + cfg := gci.GciConfiguration{configuration.FormatterConfiguration{false, false, false}, sections, sectionSeparators} + if *e.writeMode { + return gci.WriteFormattedFiles(args, cfg) + } + if *e.diffMode { + return gci.DiffFormattedFiles(args, cfg) + } + return gci.PrintFormattedFiles(args, cfg) +} diff --git a/cmd/gci/write.go b/cmd/gci/write.go new file mode 100644 index 0000000..103bbb9 --- /dev/null +++ b/cmd/gci/write.go @@ -0,0 +1,16 @@ +package gci + +import ( + "github.com/daixiang0/gci/pkg/gci" +) + +// writeCmd represents the write command +func (e *Executor) initWrite() { + e.newGciCommand( + "write path...", + "Formats the specified files in-place", + "Write modifies the specified files in-place", + []string{"overwrite"}, + false, + gci.WriteFormattedFiles) +} diff --git a/go.mod b/go.mod index 8eae436..e90b9d2 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,24 @@ module github.com/daixiang0/gci -go 1.14 +go 1.17 -require golang.org/x/tools v0.0.0-20201118003311-bd56c0adb394 +require ( + github.com/hexops/gotextdiff v1.0.3 + github.com/spf13/cobra v1.3.0 + github.com/stretchr/testify v1.7.0 + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c + golang.org/x/tools v0.1.5 + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b +) + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/kr/pretty v0.2.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + golang.org/x/mod v0.5.0 // indirect + golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect +) diff --git a/go.sum b/go.sum index bfc445e..f087357 100644 --- a/go.sum +++ b/go.sum @@ -1,24 +1,773 @@ +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/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/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/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/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= +github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= +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/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/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/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/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/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v1.3.0 h1:R7cSvGu+Vv+qX0gW5R/85dx2kmmJT5z5NM8ifdYjdn0= +github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= +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/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/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/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= +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 h1:UG21uOlmZabA4fW5i7ZX6bjw1xELEGg/ZLgZq9auk/Q= +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 h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= +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/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-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/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-20201118003311-bd56c0adb394 h1:O3VD5Fds21mB1WVRTbkiz/HTXESx6Jql5ucPZi69oiM= -golang.org/x/tools v0.0.0-20201118003311-bd56c0adb394/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +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 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA= +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 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= 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/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/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/internal/generate.go b/internal/generate.go index ca6a696..16f15b9 100644 --- a/internal/generate.go +++ b/internal/generate.go @@ -13,10 +13,10 @@ import ( //go:generate go run . -const outputFile = "../pkg/gci/std.go" +const outputFile = "../pkg/gci/sections/standardpackage_list.go" const stdTemplate = ` -package gci +package sections // Code generated based on {{ .Version }}. DO NOT EDIT. @@ -26,10 +26,6 @@ var standardPackages = map[string]struct{}{ {{- end}} } -func isStandardPackage(pkg string) bool { - _, ok := standardPackages[pkg] - return ok -} ` func main() { diff --git a/main.go b/main.go index 2b3bb93..5ef3c31 100644 --- a/main.go +++ b/main.go @@ -1,74 +1,20 @@ package main import ( - "flag" - "fmt" - "go/scanner" "os" - "github.com/daixiang0/gci/pkg/gci" + "github.com/daixiang0/gci/cmd/gci" ) var ( - doWrite = flag.Bool("w", false, "doWrite result to (source) file instead of stdout") - doDiff = flag.Bool("d", false, "display diffs instead of rewriting files") - - localFlag []string - - exitCode = 0 + version = "0.3" ) -func report(err error) { - if err == nil { - return - } - scanner.PrintError(os.Stderr, err) - exitCode = 1 -} - -func parseFlags() []string { - var localFlagStr string - flag.StringVar(&localFlagStr, "local", "", "put imports beginning with this string after 3rd-party packages; comma-separated list") - - flag.Parse() - localFlag = gci.ParseLocalFlag(localFlagStr) - return flag.Args() -} - -func usage() { - _, _ = fmt.Fprintf(os.Stderr, "usage: gci [flags] [path ...]\n") - flag.PrintDefaults() - os.Exit(2) -} - func main() { - flag.Usage = usage - paths := parseFlags() - - flagSet := &gci.FlagSet{ - LocalFlag: localFlag, - DoWrite: doWrite, - DoDiff: doDiff, - } - - if len(paths) == 0 { - if err := gci.ProcessFile("", os.Stdin, os.Stdout, flagSet); err != nil { - report(err) - } - os.Exit(exitCode) - } + e := gci.NewExecutor(version) - for _, path := range paths { - switch dir, err := os.Stat(path); { - case err != nil: - report(err) - case dir.IsDir(): - report(gci.WalkDir(path, flagSet)) - default: - if err := gci.ProcessFile(path, nil, os.Stdout, flagSet); err != nil { - report(err) - } - } + err := e.Execute() + if err != nil { + os.Exit(1) } - os.Exit(exitCode) } diff --git a/pkg/analyzer/analyzer.go b/pkg/analyzer/analyzer.go index 577f74c..10818a7 100644 --- a/pkg/analyzer/analyzer.go +++ b/pkg/analyzer/analyzer.go @@ -1,12 +1,131 @@ package analyzer import ( + "bytes" + "fmt" + "go/token" + "strings" + + "github.com/daixiang0/gci/pkg/configuration" + "github.com/daixiang0/gci/pkg/gci" + "github.com/daixiang0/gci/pkg/io" + "golang.org/x/tools/go/analysis" "golang.org/x/tools/go/analysis/passes/inspect" ) +const ( + NoInlineCommentsFlag = "noInlineComments" + NoPrefixCommentsFlag = "noPrefixComments" + SectionsFlag = "Sections" + SectionSeparatorsFlag = "SectionSeparators" + SectionDelimiter = ";" +) + +var ( + noInlineComments bool + noPrefixComments bool + sectionsStr string + sectionSeparatorsStr string +) + +func init() { + Analyzer.Flags.BoolVar(&noInlineComments, NoInlineCommentsFlag, false, "If comments in the same line as the input should be present") + Analyzer.Flags.BoolVar(&noPrefixComments, NoPrefixCommentsFlag, false, "If comments above an input should be present") + Analyzer.Flags.StringVar(§ionsStr, SectionsFlag, "", "Specify the Sections format that should be used to check the file formatting") + Analyzer.Flags.StringVar(§ionSeparatorsStr, SectionSeparatorsFlag, "", "Specify the Sections that are inserted as Separators between Sections") +} + var Analyzer = &analysis.Analyzer{ Name: "gci", Doc: "A tool that control golang package import order and make it always deterministic.", Requires: []*analysis.Analyzer{inspect.Analyzer}, + Run: runAnalysis, +} + +func runAnalysis(pass *analysis.Pass) (interface{}, error) { + // TODO input validation + + var fileReferences []*token.File + // extract file references for all files in the analyzer pass + for _, pkgFile := range pass.Files { + fileForPos := pass.Fset.File(pkgFile.Package) + if fileForPos != nil { + fileReferences = append(fileReferences, fileForPos) + } + } + expectedNumFiles := len(pass.Files) + foundNumFiles := len(fileReferences) + if expectedNumFiles != foundNumFiles { + return nil, InvalidNumberOfFilesInAnalysis{expectedNumFiles, foundNumFiles} + } + + // read configuration options + gciCfg, err := parseGciConfiguration() + if err != nil { + return nil, err + } + + for _, file := range fileReferences { + filePath := file.Name() + unmodifiedFile, formattedFile, err := gci.LoadFormatGoFile(io.File{filePath}, *gciCfg) + if err != nil { + return nil, err + } + // search for a difference + fileRunes := bytes.Runes(unmodifiedFile) + formattedRunes := bytes.Runes(formattedFile) + diffIdx := compareRunes(fileRunes, formattedRunes) + switch diffIdx { + case -1: + // no difference + default: + diffPos := file.Position(file.Pos(diffIdx)) + // prevent invalid access to array + fileRune := "nil" + formattedRune := "nil" + if len(fileRunes)-1 >= diffIdx { + fileRune = fmt.Sprintf("%q", fileRunes[diffIdx]) + } + if len(formattedRunes)-1 >= diffIdx { + formattedRune = fmt.Sprintf("%q", formattedRunes[diffIdx]) + } + pass.Reportf(file.Pos(diffIdx), "Expected %s, Found %s at %s[line %d,col %d]", formattedRune, fileRune, filePath, diffPos.Line, diffPos.Column) + } + } + return nil, nil +} + +func compareRunes(a, b []rune) (differencePos int) { + // check shorter rune slice first to prevent invalid array access + shorterRune := a + if len(b) < len(a) { + shorterRune = b + } + // check for differences up to where the length is identical + for idx := 0; idx < len(shorterRune); idx++ { + if a[idx] != b[idx] { + return idx + } + } + // check that we have compared two equally long rune arrays + if len(a) != len(b) { + return len(shorterRune) + 1 + } + return -1 +} + +func parseGciConfiguration() (*gci.GciConfiguration, error) { + fmtCfg := configuration.FormatterConfiguration{noInlineComments, noPrefixComments, false} + + var sectionStrings []string + if sectionsStr != "" { + sectionStrings = strings.Split(sectionsStr, SectionDelimiter) + } + + var sectionSeparatorStrings []string + if sectionSeparatorsStr != "" { + sectionSeparatorStrings = strings.Split(sectionSeparatorsStr, SectionDelimiter) + } + return gci.GciStringConfiguration{fmtCfg, sectionStrings, sectionSeparatorStrings}.Parse() } diff --git a/pkg/analyzer/errors.go b/pkg/analyzer/errors.go new file mode 100644 index 0000000..83d7830 --- /dev/null +++ b/pkg/analyzer/errors.go @@ -0,0 +1,16 @@ +package analyzer + +import "fmt" + +type InvalidNumberOfFilesInAnalysis struct { + expectedNumFiles, foundNumFiles int +} + +func (i InvalidNumberOfFilesInAnalysis) Error() string { + return fmt.Sprintf("Expected %d files in Analyzer input, Found %d", i.expectedNumFiles, i.foundNumFiles) +} + +func (i InvalidNumberOfFilesInAnalysis) Is(err error) bool { + _, ok := err.(InvalidNumberOfFilesInAnalysis) + return ok +} diff --git a/pkg/analyzer/errors_test.go b/pkg/analyzer/errors_test.go new file mode 100644 index 0000000..64967ea --- /dev/null +++ b/pkg/analyzer/errors_test.go @@ -0,0 +1,12 @@ +package analyzer + +import ( + "errors" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestErrorMatching(t *testing.T) { + assert.True(t, errors.Is(InvalidNumberOfFilesInAnalysis{1, 2}, InvalidNumberOfFilesInAnalysis{})) +} diff --git a/pkg/configuration/formatter.go b/pkg/configuration/formatter.go new file mode 100644 index 0000000..6ac0484 --- /dev/null +++ b/pkg/configuration/formatter.go @@ -0,0 +1,7 @@ +package configuration + +type FormatterConfiguration struct { + NoInlineComments bool `yaml:"no-inlineComments"` + NoPrefixComments bool `yaml:"no-prefixComments"` + Debug bool `yaml:"-"` +} diff --git a/pkg/constants/sequences.go b/pkg/constants/sequences.go new file mode 100644 index 0000000..512d6d1 --- /dev/null +++ b/pkg/constants/sequences.go @@ -0,0 +1,16 @@ +package constants + +const ( + CommentFlag = "//" + ImportStartFlag = "\nimport (\n" + ImportEndFlag = "\n)" + + Blank = " " + Indent = "\t" + Linebreak = "\n" + + SectionSeparator = ":" + + ParameterOpeningBrackets = "(" + ParameterClosingBrackets = ")" +) diff --git a/pkg/gci/configuration.go b/pkg/gci/configuration.go new file mode 100644 index 0000000..f1ef7ed --- /dev/null +++ b/pkg/gci/configuration.go @@ -0,0 +1,58 @@ +package gci + +import ( + "io/ioutil" + + "github.com/daixiang0/gci/pkg/configuration" + sectionsPkg "github.com/daixiang0/gci/pkg/gci/sections" + + "gopkg.in/yaml.v3" +) + +type GciConfiguration struct { + configuration.FormatterConfiguration + Sections SectionList + SectionSeparators SectionList +} + +type GciStringConfiguration struct { + Cfg configuration.FormatterConfiguration `yaml:",inline"` + SectionStrings []string `yaml:"sections"` + SectionSeparatorStrings []string `yaml:"sectionseparators"` +} + +func (g GciStringConfiguration) Parse() (*GciConfiguration, error) { + sections := DefaultSections() + var err error + if len(g.SectionStrings) > 0 { + sections, err = sectionsPkg.SectionParserInst.ParseSectionStrings(g.SectionStrings, true, true) + if err != nil { + return nil, err + } + } + sectionSeparators := DefaultSectionSeparators() + if len(g.SectionSeparatorStrings) > 0 { + sectionSeparators, err = sectionsPkg.SectionParserInst.ParseSectionStrings(g.SectionSeparatorStrings, false, false) + if err != nil { + return nil, err + } + } + return &GciConfiguration{g.Cfg, sections, sectionSeparators}, nil +} + +func initializeGciConfigFromYAML(filePath string) (*GciConfiguration, error) { + yamlCfg := GciStringConfiguration{} + yamlData, err := ioutil.ReadFile(filePath) + if err != nil { + return nil, err + } + err = yaml.Unmarshal(yamlData, &yamlCfg) + if err != nil { + return nil, err + } + gciCfg, err := yamlCfg.Parse() + if err != nil { + return nil, err + } + return gciCfg, nil +} diff --git a/pkg/gci/errors.go b/pkg/gci/errors.go new file mode 100644 index 0000000..6fde84f --- /dev/null +++ b/pkg/gci/errors.go @@ -0,0 +1,78 @@ +package gci + +import ( + "errors" + "fmt" + + importPkg "github.com/daixiang0/gci/pkg/gci/imports" + sectionsPkg "github.com/daixiang0/gci/pkg/gci/sections" +) + +type EqualSpecificityMatchError struct { + importDef importPkg.ImportDef + sectionA, sectionB sectionsPkg.Section +} + +func (e EqualSpecificityMatchError) Error() string { + return fmt.Sprintf("Import %s matched section %s and %s equally", e.importDef, e.sectionA, e.sectionB) +} + +func (e EqualSpecificityMatchError) Is(err error) bool { + _, ok := err.(EqualSpecificityMatchError) + return ok +} + +type NoMatchingSectionForImportError struct { + importDef importPkg.ImportDef +} + +func (n NoMatchingSectionForImportError) Error() string { + return fmt.Sprintf("No section found for Import: %v", n.importDef) +} + +func (n NoMatchingSectionForImportError) Is(err error) bool { + _, ok := err.(NoMatchingSectionForImportError) + return ok +} + +type InvalidImportSplitError struct { + segments []string +} + +func (i InvalidImportSplitError) Error() string { + return fmt.Sprintf("seperating the inline comment from the import yielded an invalid number of segments: %v", i.segments) +} + +func (i InvalidImportSplitError) Is(err error) bool { + _, ok := err.(InvalidImportSplitError) + return ok +} + +type InvalidAliasSplitError struct { + segments []string +} + +func (i InvalidAliasSplitError) Error() string { + return fmt.Sprintf("seperating the alias from the path yielded an invalid number of segments: %v", i.segments) +} + +func (i InvalidAliasSplitError) Is(err error) bool { + _, ok := err.(InvalidAliasSplitError) + return ok +} + +var MissingImportStatementError = FileParsingError{errors.New("no import statement present in File")} +var ImportStatementNotClosedError = FileParsingError{errors.New("import statement not closed")} + +type FileParsingError struct { + error +} + +func (f FileParsingError) Unwrap() error { + return f.error +} + +func (f FileParsingError) Is(err error) bool { + _, ok := err.(FileParsingError) + return ok +} diff --git a/pkg/gci/errors_test.go b/pkg/gci/errors_test.go new file mode 100644 index 0000000..b67bddb --- /dev/null +++ b/pkg/gci/errors_test.go @@ -0,0 +1,33 @@ +package gci + +import ( + "errors" + "testing" + + importPkg "github.com/daixiang0/gci/pkg/gci/imports" + sectionsPkg "github.com/daixiang0/gci/pkg/gci/sections" + + "github.com/stretchr/testify/assert" +) + +func TestErrorMatching(t *testing.T) { + section := sectionsPkg.DefaultSection{} + importDef := importPkg.ImportDef{"abc", "abc.com", []string{}, ""} + assert.True(t, errors.Is(EqualSpecificityMatchError{importDef, section, section}, EqualSpecificityMatchError{})) + assert.True(t, errors.Is(NoMatchingSectionForImportError{importDef}, NoMatchingSectionForImportError{})) + assert.True(t, errors.Is(InvalidImportSplitError{[]string{"a"}}, InvalidImportSplitError{})) + assert.True(t, errors.Is(InvalidAliasSplitError{[]string{"a"}}, InvalidAliasSplitError{})) + assert.True(t, errors.Is(MissingImportStatementError, MissingImportStatementError)) + assert.True(t, errors.Is(ImportStatementNotClosedError, ImportStatementNotClosedError)) +} + +func TestErrorClass(t *testing.T) { + subError := errors.New("test") + errorGroup := FileParsingError{subError} + assert.True(t, errors.Is(errorGroup, FileParsingError{})) + assert.True(t, errors.Is(errorGroup, subError)) + assert.True(t, errors.Is(errorGroup, MissingImportStatementError)) + assert.True(t, errors.Is(errorGroup, ImportStatementNotClosedError)) + // unavoidable with the current implementation + assert.True(t, errors.Is(MissingImportStatementError, ImportStatementNotClosedError)) +} diff --git a/pkg/gci/format.go b/pkg/gci/format.go new file mode 100644 index 0000000..78573da --- /dev/null +++ b/pkg/gci/format.go @@ -0,0 +1,98 @@ +package gci + +import ( + "bytes" + "fmt" + "log" + "strings" + + "github.com/daixiang0/gci/pkg/constants" + importPkg "github.com/daixiang0/gci/pkg/gci/imports" + sectionsPkg "github.com/daixiang0/gci/pkg/gci/sections" + "github.com/daixiang0/gci/pkg/gci/specificity" +) + +// Formats the import section of a Go file +func formatGoFile(input []byte, cfg GciConfiguration) ([]byte, error) { + startIndex := bytes.Index(input, []byte(constants.ImportStartFlag)) + if startIndex < 0 { + return nil, MissingImportStatementError + } + endIndexFromStart := bytes.Index(input[startIndex:], []byte(constants.ImportEndFlag)) + if endIndexFromStart < 0 { + return nil, ImportStatementNotClosedError + } + endIndex := startIndex + endIndexFromStart + + unformattedImports := input[startIndex+len(constants.ImportStartFlag) : endIndex] + formattedImports, err := formatImportBlock(unformattedImports, cfg) + if err != nil { + return nil, err + } + + var output []byte + output = append(output, input[:startIndex+len(constants.ImportStartFlag)]...) + output = append(output, formattedImports...) + output = append(output, input[endIndex+1:]...) + return output, nil +} + +// Takes unsorted imports as byte array and formats them according to the specified sections +func formatImportBlock(input []byte, cfg GciConfiguration) ([]byte, error) { + //strings.ReplaceAll(input, "\r\n", linebreak) + lines := strings.Split(string(input), constants.Linebreak) + imports, err := parseToImportDefinitions(lines) + if err != nil { + return nil, fmt.Errorf("an error occured while trying to parse imports: %w", err) + } + if cfg.Debug { + log.Println("Parsed imports in file:", imports) + } + // create mapping between sections and imports + sectionMap := make(map[sectionsPkg.Section][]importPkg.ImportDef, len(cfg.Sections)) + // find matching section for every importSpec + for _, i := range imports { + // determine match specificity for every available section + var bestSection sectionsPkg.Section + var bestSectionSpecificity specificity.MatchSpecificity = specificity.MisMatch{} + for _, section := range cfg.Sections { + sectionSpecificity := section.MatchSpecificity(i) + if sectionSpecificity.IsMoreSpecific(specificity.MisMatch{}) && sectionSpecificity.Equal(bestSectionSpecificity) { + // specificity is identical + return nil, EqualSpecificityMatchError{i, bestSection, section} + } + if sectionSpecificity.IsMoreSpecific(bestSectionSpecificity) { + // better match found + bestSectionSpecificity = sectionSpecificity + bestSection = section + } + } + if bestSection == nil { + return nil, NoMatchingSectionForImportError{i} + } + if cfg.Debug { + log.Printf("Matched import %s to section %s", i, bestSection) + } + sectionMap[bestSection] = append(sectionMap[bestSection], i) + } + // format every section to a str + var sectionStrings []string + for _, section := range cfg.Sections { + sectionStr := section.Format(sectionMap[section], cfg.FormatterConfiguration) + // prevent adding an empty section which would cause a separator to be inserted + if sectionStr != "" { + if cfg.Debug { + log.Printf("Formatting section %s with imports: %v", section, sectionMap[section]) + } + sectionStrings = append(sectionStrings, sectionStr) + } + } + // format sectionSeparators + var sectionSeparatorStr string + for _, sectionSep := range cfg.SectionSeparators { + sectionSeparatorStr += sectionSep.Format([]importPkg.ImportDef{}, cfg.FormatterConfiguration) + } + // generate output by joining the sections + output := strings.Join(sectionStrings, sectionSeparatorStr) + return []byte(output), nil +} diff --git a/pkg/gci/gci.go b/pkg/gci/gci.go index 67ba91e..68c839f 100644 --- a/pkg/gci/gci.go +++ b/pkg/gci/gci.go @@ -2,385 +2,126 @@ package gci import ( "bytes" + "errors" "fmt" - "io" - "io/ioutil" + "log" "os" - "os/exec" - "path/filepath" - "sort" - "strings" -) - -const ( - // pkg type: standard, remote, local - standard int = iota - // 3rd-party packages - remote - local - commentFlag = "//" -) + sectionsPkg "github.com/daixiang0/gci/pkg/gci/sections" + "github.com/daixiang0/gci/pkg/io" -var ( - importStartFlag = []byte(` -import ( -`) - importEndFlag = []byte(` + "github.com/hexops/gotextdiff" + "github.com/hexops/gotextdiff/myers" + "github.com/hexops/gotextdiff/span" + "golang.org/x/sync/errgroup" ) -`) -) - -type FlagSet struct { - LocalFlag []string - DoWrite, DoDiff *bool -} -type pkg struct { - list map[int][]string - comment map[string]string - alias map[string]string -} - -// ParseLocalFlag takes a comma-separated list of -// package-name-prefixes (as passed to the "-local" flag), and splits -// it in to a list. This is different than strings.Split in that it -// handles the empty string and empty entries in the list. -func ParseLocalFlag(str string) []string { - return strings.FieldsFunc(str, func(c rune) bool { return c == ',' }) -} +type SectionList []sectionsPkg.Section -func newPkg(data [][]byte, localFlag []string) *pkg { - listMap := make(map[int][]string) - commentMap := make(map[string]string) - aliasMap := make(map[string]string) - p := &pkg{ - list: listMap, - comment: commentMap, - alias: aliasMap, +func (list SectionList) String() []string { + var output []string + for _, section := range list { + output = append(output, section.String()) } - - formatData := make([]string, 0) - // remove all empty lines - for _, v := range data { - if len(v) > 0 { - formatData = append(formatData, strings.TrimSpace(string(v))) - } - } - - n := len(formatData) - for i := n - 1; i >= 0; i-- { - line := formatData[i] - - // check commentFlag: - // 1. one line commentFlag - // 2. commentFlag after import path - commentIndex := strings.Index(line, commentFlag) - if commentIndex == 0 { - // comment in the last line is useless, ignore it - if i+1 >= n { - continue - } - pkg, _, _ := getPkgInfo(formatData[i+1], strings.Index(formatData[i+1], commentFlag) >= 0) - p.comment[pkg] = line - continue - } else if commentIndex > 0 { - pkg, alias, comment := getPkgInfo(line, true) - if alias != "" { - p.alias[pkg] = alias - } - - p.comment[pkg] = comment - pkgType := getPkgType(pkg, localFlag) - p.list[pkgType] = append(p.list[pkgType], pkg) - continue - } - - pkg, alias, _ := getPkgInfo(line, false) - - if alias != "" { - p.alias[pkg] = alias - } - - pkgType := getPkgType(pkg, localFlag) - p.list[pkgType] = append(p.list[pkgType], pkg) - } - - return p + return output } -// fmt format import pkgs as expected -func (p *pkg) fmt() []byte { - ret := make([]string, 0, 100) - - for pkgType := range []int{standard, remote, local} { - sort.Strings(p.list[pkgType]) - for _, s := range p.list[pkgType] { - if p.comment[s] != "" { - l := fmt.Sprintf("%s%s%s%s", linebreak, indent, p.comment[s], linebreak) - ret = append(ret, l) - } - - if p.alias[s] != "" { - s = fmt.Sprintf("%s%s%s%s%s", indent, p.alias[s], blank, s, linebreak) - } else { - s = fmt.Sprintf("%s%s%s", indent, s, linebreak) - } - - ret = append(ret, s) - } - - if len(p.list[pkgType]) > 0 { - ret = append(ret, linebreak) - } - } - if len(ret) > 0 && ret[len(ret)-1] == linebreak { - ret = ret[:len(ret)-1] - } - - // remove duplicate empty lines - s1 := fmt.Sprintf("%s%s%s%s", linebreak, linebreak, linebreak, indent) - s2 := fmt.Sprintf("%s%s%s", linebreak, linebreak, indent) - return []byte(strings.ReplaceAll(strings.Join(ret, ""), s1, s2)) +func DefaultSections() SectionList { + return SectionList{sectionsPkg.StandardPackage{}, sectionsPkg.DefaultSection{nil, nil}} } -// getPkgInfo assume line is a import path, and return (path, alias, comment) -func getPkgInfo(line string, comment bool) (string, string, string) { - if comment { - s := strings.Split(line, commentFlag) - pkgArray := strings.Split(s[0], blank) - if len(pkgArray) > 1 { - return pkgArray[1], pkgArray[0], fmt.Sprintf("%s%s%s", commentFlag, blank, strings.TrimSpace(s[1])) - } else { - return strings.TrimSpace(pkgArray[0]), "", fmt.Sprintf("%s%s%s", commentFlag, blank, strings.TrimSpace(s[1])) - } - } else { - pkgArray := strings.Split(line, blank) - if len(pkgArray) > 1 { - return pkgArray[1], pkgArray[0], "" - } else { - return pkgArray[0], "", "" - } - } +func DefaultSectionSeparators() SectionList { + return SectionList{sectionsPkg.NewLine{}} } - -func getPkgType(line string, localFlag []string) int { - pkgName := strings.Trim(line, "\"\\`") - - for _, localPkg := range localFlag { - if strings.HasPrefix(pkgName, localPkg) { - return local - } - } - - if isStandardPackage(pkgName) { - return standard +func LocalFlagsToSections(localFlags []string) SectionList { + sections := DefaultSections() + // Add all local arguments as ImportPrefix sections + for _, prefix := range localFlags { + sections = append(sections, sectionsPkg.Prefix{prefix, nil, nil}) } - - return remote + return sections } -const ( - blank = " " - indent = "\t" - linebreak = "\n" -) - -func diff(b1, b2 []byte, filename string) (data []byte, err error) { - f1, err := writeTempFile("", "gci", b1) - if err != nil { - return - } - defer os.Remove(f1) - - f2, err := writeTempFile("", "gci", b2) - if err != nil { - return - } - defer os.Remove(f2) - - cmd := "diff" - - data, err = exec.Command(cmd, "-u", f1, f2).CombinedOutput() - if len(data) > 0 { - // diff exits with a non-zero status when the files don't match. - // Ignore that failure as long as we get output. - return replaceTempFilename(data, filename) - } - return -} - -func writeTempFile(dir, prefix string, data []byte) (string, error) { - file, err := ioutil.TempFile(dir, prefix) - if err != nil { - return "", err - } - _, err = file.Write(data) - if err1 := file.Close(); err == nil { - err = err1 - } - if err != nil { - os.Remove(file.Name()) - return "", err - } - return file.Name(), nil -} - -// replaceTempFilename replaces temporary filenames in diff with actual one. -// -// --- /tmp/gofmt316145376 2017-02-03 19:13:00.280468375 -0500 -// +++ /tmp/gofmt617882815 2017-02-03 19:13:00.280468375 -0500 -// ... -// -> -// --- path/to/file.go.orig 2017-02-03 19:13:00.280468375 -0500 -// +++ path/to/file.go 2017-02-03 19:13:00.280468375 -0500 -// ... -func replaceTempFilename(diff []byte, filename string) ([]byte, error) { - bs := bytes.SplitN(diff, []byte{'\n'}, 3) - if len(bs) < 3 { - return nil, fmt.Errorf("got unexpected diff for %s", filename) - } - // Preserve timestamps. - var t0, t1 []byte - if i := bytes.LastIndexByte(bs[0], '\t'); i != -1 { - t0 = bs[0][i:] - } - if i := bytes.LastIndexByte(bs[1], '\t'); i != -1 { - t1 = bs[1][i:] - } - // Always print filepath with slash separator. - f := filepath.ToSlash(filename) - bs[0] = []byte(fmt.Sprintf("--- %s%s", f+".orig", t0)) - bs[1] = []byte(fmt.Sprintf("+++ %s%s", f, t1)) - return bytes.Join(bs, []byte{'\n'}), nil +func PrintFormattedFiles(paths []string, cfg GciConfiguration) error { + return processStdInAndGoFilesInPaths(paths, cfg, func(filePath string, unmodifiedFile, formattedFile []byte) error { + fmt.Print(string(formattedFile)) + return nil + }) } -func visitFile(set *FlagSet) filepath.WalkFunc { - return func(path string, f os.FileInfo, err error) error { - if err == nil && isGoFile(f) { - err = processFile(path, nil, os.Stdout, set) +func WriteFormattedFiles(paths []string, cfg GciConfiguration) error { + return processGoFilesInPaths(paths, cfg, func(filePath string, unmodifiedFile, formattedFile []byte) error { + if bytes.Equal(unmodifiedFile, formattedFile) { + log.Printf("Skipping correctly formatted File: %s", filePath) + return nil } - return err - } + log.Printf("Writing formatted File: %s", filePath) + return os.WriteFile(filePath, formattedFile, 0644) + }) } -func WalkDir(path string, set *FlagSet) error { - return filepath.Walk(path, visitFile(set)) +func DiffFormattedFiles(paths []string, cfg GciConfiguration) error { + return processStdInAndGoFilesInPaths(paths, cfg, func(filePath string, unmodifiedFile, formattedFile []byte) error { + fileURI := span.URIFromPath(filePath) + edits := myers.ComputeEdits(fileURI, string(unmodifiedFile), string(formattedFile)) + unifiedEdits := gotextdiff.ToUnified(filePath, filePath, string(unmodifiedFile), edits) + fmt.Printf("%v", unifiedEdits) + return nil + }) } -func isGoFile(f os.FileInfo) bool { - // ignore non-Go files - name := f.Name() - return !f.IsDir() && !strings.HasPrefix(name, ".") && strings.HasSuffix(name, ".go") -} +type fileFormattingFunc func(filePath string, unmodifiedFile, formattedFile []byte) error -func ProcessFile(filename string, in io.Reader, out io.Writer, set *FlagSet) error { - return processFile(filename, in, out, set) +func processStdInAndGoFilesInPaths(paths []string, cfg GciConfiguration, fileFunc fileFormattingFunc) error { + return processFiles(io.StdInGenerator.Combine(io.GoFilesInPathsGenerator(paths)), cfg, fileFunc) } -func processFile(filename string, in io.Reader, out io.Writer, set *FlagSet) error { - var err error - - if in == nil { - f, err := os.Open(filename) - if err != nil { - return err - } - defer f.Close() - in = f - } +func processGoFilesInPaths(paths []string, cfg GciConfiguration, fileFunc fileFormattingFunc) error { + return processFiles(io.GoFilesInPathsGenerator(paths), cfg, fileFunc) +} - src, err := ioutil.ReadAll(in) +func processFiles(fileGenerator io.FileGeneratorFunc, cfg GciConfiguration, fileFunc fileFormattingFunc) error { + var taskGroup errgroup.Group + files, err := fileGenerator() if err != nil { return err } - - ori := make([]byte, len(src)) - copy(ori, src) - start := bytes.Index(src, importStartFlag) - // in case no importStartFlag or importStartFlag exist in the commentFlag - if start < 0 { - fmt.Printf("skip file %s since no import\n", filename) - return nil + for _, file := range files { + // run file processing in parallel + taskGroup.Go(processingFunc(file, cfg, fileFunc)) } - end := bytes.Index(src[start:], importEndFlag) + start - - ret := bytes.Split(src[start+len(importStartFlag):end], []byte(linebreak)) - - p := newPkg(ret, set.LocalFlag) - - res := append(src[:start+len(importStartFlag)], append(p.fmt(), src[end+1:]...)...) + return taskGroup.Wait() +} - if !bytes.Equal(ori, res) { - if *set.DoWrite { - // On Windows, we need to re-set the permissions from the file. See golang/go#38225. - var perms os.FileMode - if fi, err := os.Stat(filename); err == nil { - perms = fi.Mode() & os.ModePerm - } - err = ioutil.WriteFile(filename, res, perms) - if err != nil { - return err - } - } - if *set.DoDiff { - data, err := diff(ori, res, filename) - if err != nil { - return fmt.Errorf("failed to diff: %v", err) - } - fmt.Printf("diff -u %s %s\n", filepath.ToSlash(filename+".orig"), filepath.ToSlash(filename)) - if _, err := out.Write(data); err != nil { - return fmt.Errorf("failed to write: %v", err) +func processingFunc(file io.FileObj, cfg GciConfiguration, formattingFunc fileFormattingFunc) func() error { + return func() error { + unmodifiedFile, formattedFile, err := LoadFormatGoFile(file, cfg) + if err != nil { + if errors.Is(err, FileParsingError{}) { + // do not process files that are improperly formatted + return nil } + return err } + return formattingFunc(file.Path(), unmodifiedFile, formattedFile) } - if !*set.DoWrite && !*set.DoDiff { - if _, err = out.Write(res); err != nil { - return fmt.Errorf("failed to write: %v", err) - } - } - - return err } -// Run return source and result in []byte if succeed -func Run(filename string, set *FlagSet) ([]byte, []byte, error) { - var err error - - f, err := os.Open(filename) +func LoadFormatGoFile(file io.FileObj, cfg GciConfiguration) (unmodifiedFile, formattedFile []byte, err error) { + unmodifiedFile, err = file.Load() + log.Printf("Loaded File: %s", file.Path()) if err != nil { return nil, nil, err } - defer f.Close() - src, err := ioutil.ReadAll(f) + formattedFile, err = formatGoFile(unmodifiedFile, cfg) if err != nil { - return nil, nil, err - } - - ori := make([]byte, len(src)) - copy(ori, src) - start := bytes.Index(src, importStartFlag) - // in case no importStartFlag or importStartFlag exist in the commentFlag - if start < 0 { - return nil, nil, nil - } - end := bytes.Index(src[start:], importEndFlag) + start - - // in case import flags are part of a codegen template, or otherwise "wrong" - if start+len(importStartFlag) > end { - return nil, nil, nil - } - - ret := bytes.Split(src[start+len(importStartFlag):end], []byte(linebreak)) - - p := newPkg(ret, set.LocalFlag) - - res := append(src[:start+len(importStartFlag)], append(p.fmt(), src[end+1:]...)...) - - if bytes.Equal(ori, res) { - return ori, nil, nil + // ignore missing import statements + if !errors.Is(err, MissingImportStatementError) { + return unmodifiedFile, nil, err + } + log.Printf("File does not contain an import statement: %s", file.Path()) + formattedFile = unmodifiedFile } - - return ori, res, nil + return unmodifiedFile, formattedFile, nil } diff --git a/pkg/gci/gci_test.go b/pkg/gci/gci_test.go index b8644b8..3fb34f9 100644 --- a/pkg/gci/gci_test.go +++ b/pkg/gci/gci_test.go @@ -1,64 +1,115 @@ package gci import ( - "fmt" + "io/ioutil" + "os" + "path" + "strings" "testing" + + "github.com/daixiang0/gci/pkg/gci/sections" + "github.com/daixiang0/gci/pkg/io" + + "github.com/stretchr/testify/assert" ) -func TestGetPkgType(t *testing.T) { - testCases := []struct { - Line string - LocalFlag string - ExpectedResult int - }{ - {Line: `"foo/pkg/bar"`, LocalFlag: "", ExpectedResult: remote}, - {Line: `"foo/pkg/bar"`, LocalFlag: "foo", ExpectedResult: local}, - {Line: `"foo/pkg/bar"`, LocalFlag: "bar", ExpectedResult: remote}, - {Line: `"foo/pkg/bar"`, LocalFlag: "github.com/foo/bar", ExpectedResult: remote}, - {Line: `"foo/pkg/bar"`, LocalFlag: "github.com/foo", ExpectedResult: remote}, - {Line: `"foo/pkg/bar"`, LocalFlag: "github.com/bar", ExpectedResult: remote}, - {Line: `"foo/pkg/bar"`, LocalFlag: "github.com/foo,github.com/bar", ExpectedResult: remote}, - {Line: `"foo/pkg/bar"`, LocalFlag: "github.com/foo,,github.com/bar", ExpectedResult: remote}, - - {Line: `"github.com/foo/bar"`, LocalFlag: "", ExpectedResult: remote}, - {Line: `"github.com/foo/bar"`, LocalFlag: "foo", ExpectedResult: remote}, - {Line: `"github.com/foo/bar"`, LocalFlag: "bar", ExpectedResult: remote}, - {Line: `"github.com/foo/bar"`, LocalFlag: "github.com/foo/bar", ExpectedResult: local}, - {Line: `"github.com/foo/bar"`, LocalFlag: "github.com/foo", ExpectedResult: local}, - {Line: `"github.com/foo/bar"`, LocalFlag: "github.com/bar", ExpectedResult: remote}, - {Line: `"github.com/foo/bar"`, LocalFlag: "github.com/foo,github.com/bar", ExpectedResult: local}, - {Line: `"github.com/foo/bar"`, LocalFlag: "github.com/foo,,github.com/bar", ExpectedResult: local}, - - {Line: `"context"`, LocalFlag: "", ExpectedResult: standard}, - {Line: `"context"`, LocalFlag: "context", ExpectedResult: local}, - {Line: `"context"`, LocalFlag: "foo", ExpectedResult: standard}, - {Line: `"context"`, LocalFlag: "bar", ExpectedResult: standard}, - {Line: `"context"`, LocalFlag: "github.com/foo/bar", ExpectedResult: standard}, - {Line: `"context"`, LocalFlag: "github.com/foo", ExpectedResult: standard}, - {Line: `"context"`, LocalFlag: "github.com/bar", ExpectedResult: standard}, - {Line: `"context"`, LocalFlag: "github.com/foo,github.com/bar", ExpectedResult: standard}, - {Line: `"context"`, LocalFlag: "github.com/foo,,github.com/bar", ExpectedResult: standard}, - - {Line: `"os/signal"`, LocalFlag: "", ExpectedResult: standard}, - {Line: `"os/signal"`, LocalFlag: "os/signal", ExpectedResult: local}, - {Line: `"os/signal"`, LocalFlag: "foo", ExpectedResult: standard}, - {Line: `"os/signal"`, LocalFlag: "bar", ExpectedResult: standard}, - {Line: `"os/signal"`, LocalFlag: "github.com/foo/bar", ExpectedResult: standard}, - {Line: `"os/signal"`, LocalFlag: "github.com/foo", ExpectedResult: standard}, - {Line: `"os/signal"`, LocalFlag: "github.com/bar", ExpectedResult: standard}, - {Line: `"os/signal"`, LocalFlag: "github.com/foo,github.com/bar", ExpectedResult: standard}, - {Line: `"os/signal"`, LocalFlag: "github.com/foo,,github.com/bar", ExpectedResult: standard}, - } +var testFilesPath = "internal/testdata" - for _, tc := range testCases { - tc := tc - t.Run(fmt.Sprintf("%s:%s", tc.Line, tc.LocalFlag), func(t *testing.T) { +func isTestInputFile(file os.FileInfo) bool { + return !file.IsDir() && strings.HasSuffix(file.Name(), ".in.go") +} + +func TestRun(t *testing.T) { + testFiles, err := io.FindFilesForPath(testFilesPath, isTestInputFile) + if err != nil { + t.Fatal(err) + } + for _, testFile := range testFiles { + fileBaseName := strings.TrimSuffix(testFile, ".in.go") + t.Run(fileBaseName, func(t *testing.T) { t.Parallel() - result := getPkgType(tc.Line, ParseLocalFlag(tc.LocalFlag)) - if got, want := result, tc.ExpectedResult; got != want { - t.Errorf("bad result: %d, expected: %d", got, want) + gciCfg, err := initializeGciConfigFromYAML(fileBaseName + ".cfg.yaml") + if err != nil { + t.Fatal(err) } + + _, formattedFile, err := LoadFormatGoFile(io.File{fileBaseName + ".in.go"}, *gciCfg) + if err != nil { + t.Fatal(err) + } + expectedOutput, err := ioutil.ReadFile(fileBaseName + ".out.go") + if err != nil { + t.Fatal(err) + } + assert.Equal(t, string(expectedOutput), string(formattedFile), "output") + assert.NoError(t, err) }) } } + +func TestInitGciConfigFromEmptyYAML(t *testing.T) { + gciCfg, err := initializeGciConfigFromYAML(path.Join(testFilesPath, "defaultValues.cfg.yaml")) + assert.NoError(t, err) + _ = gciCfg + assert.Equal(t, DefaultSections(), gciCfg.Sections) + assert.Equal(t, DefaultSectionSeparators(), gciCfg.SectionSeparators) + assert.False(t, gciCfg.Debug) + assert.False(t, gciCfg.NoInlineComments) + assert.False(t, gciCfg.NoPrefixComments) +} + +func TestInitGciConfigFromYAML(t *testing.T) { + gciCfg, err := initializeGciConfigFromYAML(path.Join(testFilesPath, "configTest.cfg.yaml")) + assert.NoError(t, err) + _ = gciCfg + assert.Equal(t, SectionList{sections.DefaultSection{}}, gciCfg.Sections) + assert.Equal(t, SectionList{sections.CommentLine{"---"}}, gciCfg.SectionSeparators) + assert.False(t, gciCfg.Debug) + assert.True(t, gciCfg.NoInlineComments) + assert.True(t, gciCfg.NoPrefixComments) +} + +func TestSkippingOverIncorrectlyFormattedFiles(t *testing.T) { + cfg, err := GciStringConfiguration{}.Parse() + assert.NoError(t, err) + validFileProcessedChan := make(chan bool, 1) + + var importUnclosedCtr, noImportCtr, validCtr int + var files []io.FileObj + files = append(files, TestFile{io.File{"internal/skipTest/import-unclosed.testgo"}, &importUnclosedCtr}) + files = append(files, TestFile{io.File{"internal/skipTest/no-import.testgo"}, &noImportCtr}) + files = append(files, TestFile{io.File{"internal/skipTest/valid.testgo"}, &validCtr}) + + generatorFunc := func() ([]io.FileObj, error) { + return files, nil + } + fileAccessTestFunc := func(filePath string, unmodifiedFile, formattedFile []byte) error { + assert.Equal(t, "internal/skipTest/valid.testgo", filePath, "file should not have been processed") + validFileProcessedChan <- true + return nil + } + err = processFiles(generatorFunc, *cfg, fileAccessTestFunc) + + assert.NoError(t, err) + // check all files have been accessed + assert.Equal(t, importUnclosedCtr, 1) + assert.Equal(t, noImportCtr, 1) + assert.Equal(t, validCtr, 1) + // check that processing for the valid file was called + assert.True(t, <-validFileProcessedChan) +} + +type TestFile struct { + wrappedFile io.File + accessCounter *int +} + +func (t TestFile) Load() ([]byte, error) { + *t.accessCounter++ + return t.wrappedFile.Load() +} + +func (t TestFile) Path() string { + return t.wrappedFile.Path() +} diff --git a/pkg/gci/imports/errors.go b/pkg/gci/imports/errors.go new file mode 100644 index 0000000..49baa6d --- /dev/null +++ b/pkg/gci/imports/errors.go @@ -0,0 +1,37 @@ +package imports + +import ( + "errors" + "fmt" +) + +type ValidationError struct { + error +} + +func (v ValidationError) Unwrap() error { + return v.error +} + +func (v ValidationError) Is(err error) bool { + _, ok := err.(ValidationError) + return ok +} + +var MissingOpeningQuotesError = ValidationError{errors.New("path is missing starting quotes")} + +var MissingClosingQuotesError = ValidationError{errors.New("path is missing closing quotes")} + +type InvalidCharacterError struct { + char rune + alias string +} + +func (i InvalidCharacterError) Error() string { + return fmt.Sprintf("Found non-letter character %q in Alias: %s", i.char, i.alias) +} + +func (i InvalidCharacterError) Is(err error) bool { + _, ok := err.(InvalidCharacterError) + return ok +} diff --git a/pkg/gci/imports/errors_test.go b/pkg/gci/imports/errors_test.go new file mode 100644 index 0000000..412aa3e --- /dev/null +++ b/pkg/gci/imports/errors_test.go @@ -0,0 +1,24 @@ +package imports + +import ( + "errors" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestErrorMatching(t *testing.T) { + assert.True(t, errors.Is(InvalidCharacterError{'a', "abc"}, InvalidCharacterError{})) + assert.True(t, errors.Is(ValidationError{MissingOpeningQuotesError}, ValidationError{})) + assert.True(t, errors.Is(MissingOpeningQuotesError, MissingOpeningQuotesError)) + assert.True(t, errors.Is(MissingClosingQuotesError, MissingClosingQuotesError)) +} + +func TestErrorClass(t *testing.T) { + subError := errors.New("test") + errorGroup := ValidationError{subError} + assert.True(t, errors.Is(errorGroup, ValidationError{})) + assert.True(t, errors.Is(errorGroup, subError)) + assert.True(t, errors.Is(MissingOpeningQuotesError, ValidationError{})) + assert.True(t, errors.Is(MissingClosingQuotesError, ValidationError{})) +} diff --git a/pkg/gci/imports/import.go b/pkg/gci/imports/import.go new file mode 100644 index 0000000..fa29767 --- /dev/null +++ b/pkg/gci/imports/import.go @@ -0,0 +1,86 @@ +package imports + +import ( + "sort" + "strings" + "unicode" + + "github.com/daixiang0/gci/pkg/configuration" + "github.com/daixiang0/gci/pkg/constants" +) + +type ImportDef struct { + Alias string + QuotedPath string + PrefixComment []string + InlineComment string +} + +func (i ImportDef) Path() string { + return strings.TrimSuffix(strings.TrimPrefix(i.QuotedPath, string('"')), string('"')) +} + +// Validate checks whether the contents are valid for an import +func (i ImportDef) Validate() error { + err := checkAlias(i.Alias) + if err != nil { + return ValidationError{err} + } + if !strings.HasPrefix(i.QuotedPath, string('"')) { + return MissingOpeningQuotesError + } + if !strings.HasSuffix(i.QuotedPath, string('"')) { + return MissingClosingQuotesError + } + return nil +} + +func checkAlias(alias string) error { + for idx, r := range alias { + if !unicode.IsLetter(r) { + if r != '_' { + if idx == 0 || !unicode.IsDigit(r) { + // aliases may not start with a digit + return InvalidCharacterError{r, alias} + } + } + } + } + return nil +} + +func (i ImportDef) String() string { + return i.QuotedPath +} + +func (i ImportDef) Format(cfg configuration.FormatterConfiguration) string { + linePrefix := constants.Indent + var output string + if cfg.NoPrefixComments == false { + for _, prefixComment := range i.PrefixComment { + output += linePrefix + prefixComment + constants.Linebreak + } + } + output += linePrefix + if i.Alias != "" { + output += i.Alias + constants.Blank + } + output += i.QuotedPath + if cfg.NoInlineComments == false { + if i.InlineComment != "" { + output += constants.Blank + i.InlineComment + } + } + output += constants.Linebreak + return output +} + +func SortImportsByPath(imports []ImportDef) []ImportDef { + sort.Slice( + imports, + func(i, j int) bool { + return sort.StringsAreSorted([]string{imports[i].Path(), imports[j].Path()}) + }, + ) + return imports +} diff --git a/pkg/gci/internal/skipTest/import-unclosed.testgo b/pkg/gci/internal/skipTest/import-unclosed.testgo new file mode 100644 index 0000000..289dd46 --- /dev/null +++ b/pkg/gci/internal/skipTest/import-unclosed.testgo @@ -0,0 +1,8 @@ +package main +import ( + "golang.org/x/tools" + + "fmt" + + "github.com/daixiang0/gci" + diff --git a/pkg/gci/internal/skipTest/no-import.testgo b/pkg/gci/internal/skipTest/no-import.testgo new file mode 100644 index 0000000..c6146b4 --- /dev/null +++ b/pkg/gci/internal/skipTest/no-import.testgo @@ -0,0 +1,4 @@ +package main + +func X() { +} \ No newline at end of file diff --git a/pkg/gci/internal/skipTest/valid.testgo b/pkg/gci/internal/skipTest/valid.testgo new file mode 100644 index 0000000..52cc6c0 --- /dev/null +++ b/pkg/gci/internal/skipTest/valid.testgo @@ -0,0 +1,8 @@ +package main +import ( + "golang.org/x/tools" + + "fmt" + + "github.com/daixiang0/gci" +) \ No newline at end of file diff --git a/pkg/gci/internal/testdata/already-good.cfg.yaml b/pkg/gci/internal/testdata/already-good.cfg.yaml new file mode 100644 index 0000000..433a81e --- /dev/null +++ b/pkg/gci/internal/testdata/already-good.cfg.yaml @@ -0,0 +1,5 @@ +sections: + - Standard + - Default + - Prefix(github.com/local) + - Prefix(github.com/daixiang0) \ No newline at end of file diff --git a/pkg/gci/internal/testdata/already-good.in.go b/pkg/gci/internal/testdata/already-good.in.go new file mode 100644 index 0000000..89de7a0 --- /dev/null +++ b/pkg/gci/internal/testdata/already-good.in.go @@ -0,0 +1,8 @@ +package main +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/gci" +) diff --git a/pkg/gci/internal/testdata/already-good.out.go b/pkg/gci/internal/testdata/already-good.out.go new file mode 100644 index 0000000..89de7a0 --- /dev/null +++ b/pkg/gci/internal/testdata/already-good.out.go @@ -0,0 +1,8 @@ +package main +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/gci" +) diff --git a/pkg/gci/internal/testdata/comment-whithout-whitespace.cfg.yaml b/pkg/gci/internal/testdata/comment-whithout-whitespace.cfg.yaml new file mode 100644 index 0000000..4632119 --- /dev/null +++ b/pkg/gci/internal/testdata/comment-whithout-whitespace.cfg.yaml @@ -0,0 +1,2 @@ +sections: + - Default \ No newline at end of file diff --git a/pkg/gci/internal/testdata/comment-whithout-whitespace.in.go b/pkg/gci/internal/testdata/comment-whithout-whitespace.in.go new file mode 100644 index 0000000..6ea46c9 --- /dev/null +++ b/pkg/gci/internal/testdata/comment-whithout-whitespace.in.go @@ -0,0 +1,5 @@ +package proc + +import ( + "context"// no separating whitespace here //nolint:confusion +) diff --git a/pkg/gci/internal/testdata/comment-whithout-whitespace.out.go b/pkg/gci/internal/testdata/comment-whithout-whitespace.out.go new file mode 100644 index 0000000..0b0d6ce --- /dev/null +++ b/pkg/gci/internal/testdata/comment-whithout-whitespace.out.go @@ -0,0 +1,5 @@ +package proc + +import ( + "context" // no separating whitespace here //nolint:confusion +) diff --git a/pkg/gci/internal/testdata/comment-with-slashslash.cfg.yaml b/pkg/gci/internal/testdata/comment-with-slashslash.cfg.yaml new file mode 100644 index 0000000..433a81e --- /dev/null +++ b/pkg/gci/internal/testdata/comment-with-slashslash.cfg.yaml @@ -0,0 +1,5 @@ +sections: + - Standard + - Default + - Prefix(github.com/local) + - Prefix(github.com/daixiang0) \ No newline at end of file diff --git a/pkg/gci/internal/testdata/comment-with-slashslash.in.go b/pkg/gci/internal/testdata/comment-with-slashslash.in.go new file mode 100644 index 0000000..73464d9 --- /dev/null +++ b/pkg/gci/internal/testdata/comment-with-slashslash.in.go @@ -0,0 +1,5 @@ +package main + +import ( + "fmt" // https://pkg.go.dev/fmt +) diff --git a/pkg/gci/internal/testdata/comment-with-slashslash.out.go b/pkg/gci/internal/testdata/comment-with-slashslash.out.go new file mode 100644 index 0000000..73464d9 --- /dev/null +++ b/pkg/gci/internal/testdata/comment-with-slashslash.out.go @@ -0,0 +1,5 @@ +package main + +import ( + "fmt" // https://pkg.go.dev/fmt +) diff --git a/pkg/gci/internal/testdata/comment.cfg.yaml b/pkg/gci/internal/testdata/comment.cfg.yaml new file mode 100644 index 0000000..b99088a --- /dev/null +++ b/pkg/gci/internal/testdata/comment.cfg.yaml @@ -0,0 +1,5 @@ +sections: + - comment( Do not forget to run Gci) + - default +sectionseparators: [] +no-prefixComments: true \ No newline at end of file diff --git a/pkg/gci/internal/testdata/comment.in.go b/pkg/gci/internal/testdata/comment.in.go new file mode 100644 index 0000000..38fd716 --- /dev/null +++ b/pkg/gci/internal/testdata/comment.in.go @@ -0,0 +1,5 @@ +package main +import ( + //Do not forget to run Gci + "fmt" +) diff --git a/pkg/gci/internal/testdata/comment.out.go b/pkg/gci/internal/testdata/comment.out.go new file mode 100644 index 0000000..e6e7839 --- /dev/null +++ b/pkg/gci/internal/testdata/comment.out.go @@ -0,0 +1,6 @@ +package main +import ( + // Do not forget to run Gci + + "fmt" +) diff --git a/pkg/gci/internal/testdata/configTest.cfg.yaml b/pkg/gci/internal/testdata/configTest.cfg.yaml new file mode 100644 index 0000000..766f46e --- /dev/null +++ b/pkg/gci/internal/testdata/configTest.cfg.yaml @@ -0,0 +1,7 @@ +sections: + - default +sectionseparators: + - comment(---) +no-inlineComments: true +no-prefixComments: true +Debug: true \ No newline at end of file diff --git a/pkg/gci/internal/testdata/defaultValues.cfg.yaml b/pkg/gci/internal/testdata/defaultValues.cfg.yaml new file mode 100644 index 0000000..e69de29 diff --git a/pkg/gci/internal/testdata/drop-prefix-comments.cfg.yaml b/pkg/gci/internal/testdata/drop-prefix-comments.cfg.yaml new file mode 100644 index 0000000..52f15be --- /dev/null +++ b/pkg/gci/internal/testdata/drop-prefix-comments.cfg.yaml @@ -0,0 +1,8 @@ +sections: + - comment( Std imports):std:comment( Std imports) + - comment( Github):prefix(github.com):comment( Github) +sectionseparators: + - newline + - comment( --------------------------) + - newline +no-prefixComments: true \ No newline at end of file diff --git a/pkg/gci/internal/testdata/drop-prefix-comments.in.go b/pkg/gci/internal/testdata/drop-prefix-comments.in.go new file mode 100644 index 0000000..fbd1c05 --- /dev/null +++ b/pkg/gci/internal/testdata/drop-prefix-comments.in.go @@ -0,0 +1,16 @@ +package proc + +import ( + // Std imports + "os" + "context" // is required + "fmt" + // Std imports + + // -------------------------- + + // Github + "github.com/local/dlib/dexec" + "github.com/daixiang0/gci" + // Github +) diff --git a/pkg/gci/internal/testdata/drop-prefix-comments.out.go b/pkg/gci/internal/testdata/drop-prefix-comments.out.go new file mode 100644 index 0000000..cba2a3a --- /dev/null +++ b/pkg/gci/internal/testdata/drop-prefix-comments.out.go @@ -0,0 +1,16 @@ +package proc + +import ( + // Std imports + "context" // is required + "fmt" + "os" + // Std imports + + // -------------------------- + + // Github + "github.com/daixiang0/gci" + "github.com/local/dlib/dexec" + // Github +) diff --git a/pkg/gci/internal/testdata/leading-comment.cfg.yaml b/pkg/gci/internal/testdata/leading-comment.cfg.yaml new file mode 100644 index 0000000..433a81e --- /dev/null +++ b/pkg/gci/internal/testdata/leading-comment.cfg.yaml @@ -0,0 +1,5 @@ +sections: + - Standard + - Default + - Prefix(github.com/local) + - Prefix(github.com/daixiang0) \ No newline at end of file diff --git a/pkg/gci/internal/testdata/leading-comment.in.go b/pkg/gci/internal/testdata/leading-comment.in.go new file mode 100644 index 0000000..b1aa143 --- /dev/null +++ b/pkg/gci/internal/testdata/leading-comment.in.go @@ -0,0 +1,6 @@ +package main + +import ( + // foo + "fmt" +) diff --git a/pkg/gci/internal/testdata/leading-comment.out.go b/pkg/gci/internal/testdata/leading-comment.out.go new file mode 100644 index 0000000..b1aa143 --- /dev/null +++ b/pkg/gci/internal/testdata/leading-comment.out.go @@ -0,0 +1,6 @@ +package main + +import ( + // foo + "fmt" +) diff --git a/pkg/gci/internal/testdata/multi-line-comment.cfg.yaml b/pkg/gci/internal/testdata/multi-line-comment.cfg.yaml new file mode 100644 index 0000000..433a81e --- /dev/null +++ b/pkg/gci/internal/testdata/multi-line-comment.cfg.yaml @@ -0,0 +1,5 @@ +sections: + - Standard + - Default + - Prefix(github.com/local) + - Prefix(github.com/daixiang0) \ No newline at end of file diff --git a/pkg/gci/internal/testdata/multi-line-comment.in.go b/pkg/gci/internal/testdata/multi-line-comment.in.go new file mode 100644 index 0000000..0a952e7 --- /dev/null +++ b/pkg/gci/internal/testdata/multi-line-comment.in.go @@ -0,0 +1,15 @@ +package proc + +import ( + "context" // in-line comment + "fmt" + "os" + + //nolint:depguard // A multi-line comment explaining why in + // this one case it's OK to use os/exec even though depguard + // is configured to force us to use dlib/exec instead. + "os/exec" + + "golang.org/x/sys/unix" + "github.com/local/dlib/dexec" +) diff --git a/pkg/gci/internal/testdata/multi-line-comment.out.go b/pkg/gci/internal/testdata/multi-line-comment.out.go new file mode 100644 index 0000000..e96ac31 --- /dev/null +++ b/pkg/gci/internal/testdata/multi-line-comment.out.go @@ -0,0 +1,15 @@ +package proc + +import ( + "context" // in-line comment + "fmt" + "os" + //nolint:depguard // A multi-line comment explaining why in + // this one case it's OK to use os/exec even though depguard + // is configured to force us to use dlib/exec instead. + "os/exec" + + "golang.org/x/sys/unix" + + "github.com/local/dlib/dexec" +) diff --git a/pkg/gci/internal/testdata/nochar-after-import.cfg.yaml b/pkg/gci/internal/testdata/nochar-after-import.cfg.yaml new file mode 100644 index 0000000..433a81e --- /dev/null +++ b/pkg/gci/internal/testdata/nochar-after-import.cfg.yaml @@ -0,0 +1,5 @@ +sections: + - Standard + - Default + - Prefix(github.com/local) + - Prefix(github.com/daixiang0) \ No newline at end of file diff --git a/pkg/gci/internal/testdata/nochar-after-import.in.go b/pkg/gci/internal/testdata/nochar-after-import.in.go new file mode 100644 index 0000000..e4ce80a --- /dev/null +++ b/pkg/gci/internal/testdata/nochar-after-import.in.go @@ -0,0 +1,5 @@ +package main + +import ( + "fmt" +) \ No newline at end of file diff --git a/pkg/gci/internal/testdata/nochar-after-import.out.go b/pkg/gci/internal/testdata/nochar-after-import.out.go new file mode 100644 index 0000000..e4ce80a --- /dev/null +++ b/pkg/gci/internal/testdata/nochar-after-import.out.go @@ -0,0 +1,5 @@ +package main + +import ( + "fmt" +) \ No newline at end of file diff --git a/pkg/gci/internal/testdata/nolint.cfg.yaml b/pkg/gci/internal/testdata/nolint.cfg.yaml new file mode 100644 index 0000000..433a81e --- /dev/null +++ b/pkg/gci/internal/testdata/nolint.cfg.yaml @@ -0,0 +1,5 @@ +sections: + - Standard + - Default + - Prefix(github.com/local) + - Prefix(github.com/daixiang0) \ No newline at end of file diff --git a/pkg/gci/internal/testdata/nolint.in.go b/pkg/gci/internal/testdata/nolint.in.go new file mode 100644 index 0000000..96c3dec --- /dev/null +++ b/pkg/gci/internal/testdata/nolint.in.go @@ -0,0 +1,9 @@ +package main + +import ( + "fmt" + + "github.com/forbidden/pkg" //nolint:depguard + + _ "github.com/daixiang0/gci" //nolint:depguard +) diff --git a/pkg/gci/internal/testdata/nolint.out.go b/pkg/gci/internal/testdata/nolint.out.go new file mode 100644 index 0000000..96c3dec --- /dev/null +++ b/pkg/gci/internal/testdata/nolint.out.go @@ -0,0 +1,9 @@ +package main + +import ( + "fmt" + + "github.com/forbidden/pkg" //nolint:depguard + + _ "github.com/daixiang0/gci" //nolint:depguard +) diff --git a/pkg/gci/internal/testdata/not.a.go.file b/pkg/gci/internal/testdata/not.a.go.file new file mode 100644 index 0000000..e69de29 diff --git a/pkg/gci/internal/testdata/number-in-alias.cfg.yaml b/pkg/gci/internal/testdata/number-in-alias.cfg.yaml new file mode 100644 index 0000000..433a81e --- /dev/null +++ b/pkg/gci/internal/testdata/number-in-alias.cfg.yaml @@ -0,0 +1,5 @@ +sections: + - Standard + - Default + - Prefix(github.com/local) + - Prefix(github.com/daixiang0) \ No newline at end of file diff --git a/pkg/gci/internal/testdata/number-in-alias.in.go b/pkg/gci/internal/testdata/number-in-alias.in.go new file mode 100644 index 0000000..91026c4 --- /dev/null +++ b/pkg/gci/internal/testdata/number-in-alias.in.go @@ -0,0 +1,8 @@ +package main +import ( + "fmt" + + go_V1 "github.com/golang" + + "github.com/daixiang0/gci" +) diff --git a/pkg/gci/internal/testdata/number-in-alias.out.go b/pkg/gci/internal/testdata/number-in-alias.out.go new file mode 100644 index 0000000..91026c4 --- /dev/null +++ b/pkg/gci/internal/testdata/number-in-alias.out.go @@ -0,0 +1,8 @@ +package main +import ( + "fmt" + + go_V1 "github.com/golang" + + "github.com/daixiang0/gci" +) diff --git a/pkg/gci/internal/testdata/simple-case.cfg.yaml b/pkg/gci/internal/testdata/simple-case.cfg.yaml new file mode 100644 index 0000000..5995b1a --- /dev/null +++ b/pkg/gci/internal/testdata/simple-case.cfg.yaml @@ -0,0 +1,4 @@ +sections: + - Standard + - Default + - Prefix(github.com/daixiang0/gci) \ No newline at end of file diff --git a/pkg/gci/internal/testdata/simple-case.in.go b/pkg/gci/internal/testdata/simple-case.in.go new file mode 100644 index 0000000..c29b5f9 --- /dev/null +++ b/pkg/gci/internal/testdata/simple-case.in.go @@ -0,0 +1,8 @@ +package main +import ( + "golang.org/x/tools" + + "fmt" + + "github.com/daixiang0/gci" +) diff --git a/pkg/gci/internal/testdata/simple-case.out.go b/pkg/gci/internal/testdata/simple-case.out.go new file mode 100644 index 0000000..1c0e49f --- /dev/null +++ b/pkg/gci/internal/testdata/simple-case.out.go @@ -0,0 +1,8 @@ +package main +import ( + "fmt" + + "golang.org/x/tools" + + "github.com/daixiang0/gci" +) diff --git a/pkg/gci/internal/testdata/whitespace-test.cfg.yaml b/pkg/gci/internal/testdata/whitespace-test.cfg.yaml new file mode 100644 index 0000000..433a81e --- /dev/null +++ b/pkg/gci/internal/testdata/whitespace-test.cfg.yaml @@ -0,0 +1,5 @@ +sections: + - Standard + - Default + - Prefix(github.com/local) + - Prefix(github.com/daixiang0) \ No newline at end of file diff --git a/pkg/gci/internal/testdata/whitespace-test.in.go b/pkg/gci/internal/testdata/whitespace-test.in.go new file mode 100644 index 0000000..f4a4918 --- /dev/null +++ b/pkg/gci/internal/testdata/whitespace-test.in.go @@ -0,0 +1,7 @@ +package main + +import ( + "fmt" + "github.com/golang" // golang + alias "github.com/daixiang0/gci" +) diff --git a/pkg/gci/internal/testdata/whitespace-test.out.go b/pkg/gci/internal/testdata/whitespace-test.out.go new file mode 100644 index 0000000..0347b51 --- /dev/null +++ b/pkg/gci/internal/testdata/whitespace-test.out.go @@ -0,0 +1,9 @@ +package main + +import ( + "fmt" + + "github.com/golang" // golang + + alias "github.com/daixiang0/gci" +) diff --git a/pkg/gci/internal/testdata/with-above-comment-and-alias.cfg.yaml b/pkg/gci/internal/testdata/with-above-comment-and-alias.cfg.yaml new file mode 100644 index 0000000..433a81e --- /dev/null +++ b/pkg/gci/internal/testdata/with-above-comment-and-alias.cfg.yaml @@ -0,0 +1,5 @@ +sections: + - Standard + - Default + - Prefix(github.com/local) + - Prefix(github.com/daixiang0) \ No newline at end of file diff --git a/pkg/gci/internal/testdata/with-above-comment-and-alias.in.go b/pkg/gci/internal/testdata/with-above-comment-and-alias.in.go new file mode 100644 index 0000000..ab81ae9 --- /dev/null +++ b/pkg/gci/internal/testdata/with-above-comment-and-alias.in.go @@ -0,0 +1,7 @@ +package main +import ( + "fmt" + // golang + _ "github.com/golang" + "github.com/daixiang0/gci" +) diff --git a/pkg/gci/internal/testdata/with-above-comment-and-alias.out.go b/pkg/gci/internal/testdata/with-above-comment-and-alias.out.go new file mode 100644 index 0000000..13c89f9 --- /dev/null +++ b/pkg/gci/internal/testdata/with-above-comment-and-alias.out.go @@ -0,0 +1,9 @@ +package main +import ( + "fmt" + + // golang + _ "github.com/golang" + + "github.com/daixiang0/gci" +) diff --git a/pkg/gci/internal/testdata/with-alias.cfg.yaml b/pkg/gci/internal/testdata/with-alias.cfg.yaml new file mode 100644 index 0000000..5995b1a --- /dev/null +++ b/pkg/gci/internal/testdata/with-alias.cfg.yaml @@ -0,0 +1,4 @@ +sections: + - Standard + - Default + - Prefix(github.com/daixiang0/gci) \ No newline at end of file diff --git a/pkg/gci/internal/testdata/with-alias.in.go b/pkg/gci/internal/testdata/with-alias.in.go new file mode 100644 index 0000000..43d0c20 --- /dev/null +++ b/pkg/gci/internal/testdata/with-alias.in.go @@ -0,0 +1,6 @@ +package main +import ( + "fmt" + go "github.com/golang" + "github.com/daixiang0/gci" +) diff --git a/pkg/gci/internal/testdata/with-alias.out.go b/pkg/gci/internal/testdata/with-alias.out.go new file mode 100644 index 0000000..3a87e0b --- /dev/null +++ b/pkg/gci/internal/testdata/with-alias.out.go @@ -0,0 +1,8 @@ +package main +import ( + "fmt" + + go "github.com/golang" + + "github.com/daixiang0/gci" +) diff --git a/pkg/gci/internal/testdata/with-comment-and-alias.cfg.yaml b/pkg/gci/internal/testdata/with-comment-and-alias.cfg.yaml new file mode 100644 index 0000000..433a81e --- /dev/null +++ b/pkg/gci/internal/testdata/with-comment-and-alias.cfg.yaml @@ -0,0 +1,5 @@ +sections: + - Standard + - Default + - Prefix(github.com/local) + - Prefix(github.com/daixiang0) \ No newline at end of file diff --git a/pkg/gci/internal/testdata/with-comment-and-alias.in.go b/pkg/gci/internal/testdata/with-comment-and-alias.in.go new file mode 100644 index 0000000..5457ded --- /dev/null +++ b/pkg/gci/internal/testdata/with-comment-and-alias.in.go @@ -0,0 +1,6 @@ +package main +import ( + "fmt" + _ "github.com/golang" // golang + "github.com/daixiang0/gci" +) diff --git a/pkg/gci/internal/testdata/with-comment-and-alias.out.go b/pkg/gci/internal/testdata/with-comment-and-alias.out.go new file mode 100644 index 0000000..6b2c628 --- /dev/null +++ b/pkg/gci/internal/testdata/with-comment-and-alias.out.go @@ -0,0 +1,8 @@ +package main +import ( + "fmt" + + _ "github.com/golang" // golang + + "github.com/daixiang0/gci" +) diff --git a/pkg/gci/parse.go b/pkg/gci/parse.go new file mode 100644 index 0000000..2ab183d --- /dev/null +++ b/pkg/gci/parse.go @@ -0,0 +1,56 @@ +package gci + +import ( + "strings" + + "github.com/daixiang0/gci/pkg/constants" + importPkg "github.com/daixiang0/gci/pkg/gci/imports" +) + +// Recursively parses import lines into a list of ImportDefs +func parseToImportDefinitions(unformattedLines []string) ([]importPkg.ImportDef, error) { + newImport := importPkg.ImportDef{} + for index, unformattedLine := range unformattedLines { + line := strings.TrimSpace(unformattedLine) + if line == "" { + //empty line --> starts a new import + return parseToImportDefinitions(unformattedLines[index+1:]) + } + if strings.HasPrefix(line, constants.CommentFlag) { + // comment line + newImport.PrefixComment = append(newImport.PrefixComment, line) + continue + } + // split inline comment from import + importSegments := strings.SplitN(line, constants.CommentFlag, 2) + switch len(importSegments) { + case 1: + // no inline comment + case 2: + // inline comment present + newImport.InlineComment = constants.CommentFlag + importSegments[1] + default: + return nil, InvalidImportSplitError{importSegments} + } + // split alias from path + pkgArray := strings.Fields(importSegments[0]) + switch len(pkgArray) { + case 1: + // only a path + newImport.QuotedPath = pkgArray[0] + case 2: + // alias + path + newImport.Alias = pkgArray[0] + newImport.QuotedPath = pkgArray[1] + default: + return nil, InvalidAliasSplitError{pkgArray} + } + err := newImport.Validate() + if err != nil { + return nil, err + } + followingImports, err := parseToImportDefinitions(unformattedLines[index+1:]) + return append([]importPkg.ImportDef{newImport}, followingImports...), err + } + return nil, nil +} diff --git a/pkg/gci/sections/commentline.go b/pkg/gci/sections/commentline.go new file mode 100644 index 0000000..428644b --- /dev/null +++ b/pkg/gci/sections/commentline.go @@ -0,0 +1,51 @@ +package sections + +import ( + "fmt" + "strings" + + "github.com/daixiang0/gci/pkg/configuration" + "github.com/daixiang0/gci/pkg/constants" + importPkg "github.com/daixiang0/gci/pkg/gci/imports" + "github.com/daixiang0/gci/pkg/gci/specificity" +) + +func init() { + commentLineType := SectionType{ + generatorFun: func(parameter string, sectionPrefix, sectionSuffix Section) (Section, error) { + return CommentLine{parameter}, nil + }, + aliases: []string{"Comment", "CommentLine"}, + parameterHelp: "your text here", + description: "Prints the specified indented comment", + }.StandAloneSection() + SectionParserInst.registerSectionWithoutErr(&commentLineType) +} + +type CommentLine struct { + Comment string +} + +func (c CommentLine) MatchSpecificity(spec importPkg.ImportDef) specificity.MatchSpecificity { + return specificity.MisMatch{} +} + +func (c CommentLine) Format(imports []importPkg.ImportDef, cfg configuration.FormatterConfiguration) string { + comment := constants.Indent + "//" + c.Comment + if !strings.HasSuffix(comment, constants.Linebreak) { + comment += constants.Linebreak + } + return comment +} + +func (c CommentLine) sectionPrefix() Section { + return nil +} + +func (c CommentLine) sectionSuffix() Section { + return nil +} + +func (c CommentLine) String() string { + return fmt.Sprintf("CommentLine(%s)", c.Comment) +} diff --git a/pkg/gci/sections/commentline_test.go b/pkg/gci/sections/commentline_test.go new file mode 100644 index 0000000..cf4464f --- /dev/null +++ b/pkg/gci/sections/commentline_test.go @@ -0,0 +1,33 @@ +package sections + +import ( + "testing" + + "github.com/daixiang0/gci/pkg/gci/specificity" +) + +func TestCommentLineSpecificity(t *testing.T) { + testCases := []specificityTestData{ + {`""`, CommentLine{""}, specificity.MisMatch{}}, + {`"x"`, CommentLine{""}, specificity.MisMatch{}}, + {`"//"`, CommentLine{""}, specificity.MisMatch{}}, + {`"/"`, CommentLine{""}, specificity.MisMatch{}}, + } + testSpecificity(t, testCases) +} + +func TestCommentLineParsing(t *testing.T) { + testCases := []sectionTestData{ + {"commentline", CommentLine{""}, nil}, + {"Commentline(abc)", CommentLine{"abc"}, nil}, + {"cOmMenT(x)", CommentLine{"x"}, nil}, + {"Comment:Comment", nil, SectionTypeDoesNotAcceptPrefixError}, + {"Comment:Comment:Comment()", nil, SectionTypeDoesNotAcceptPrefixError}, + } + testSectionParser(t, testCases) +} + +func TestCommentLineToString(t *testing.T) { + testSectionToString(t, CommentLine{""}) + testSectionToString(t, CommentLine{"abc"}) +} diff --git a/pkg/gci/sections/default.go b/pkg/gci/sections/default.go new file mode 100644 index 0000000..aca04f4 --- /dev/null +++ b/pkg/gci/sections/default.go @@ -0,0 +1,43 @@ +package sections + +import ( + "github.com/daixiang0/gci/pkg/configuration" + importPkg "github.com/daixiang0/gci/pkg/gci/imports" + "github.com/daixiang0/gci/pkg/gci/specificity" +) + +func init() { + defaultSectionType := SectionType{ + generatorFun: func(parameter string, sectionPrefix, sectionSuffix Section) (Section, error) { + return DefaultSection{sectionPrefix, sectionSuffix}, nil + }, + aliases: []string{"Def", "Default"}, + description: "Contains all imports that could not be matched to another section type", + }.WithoutParameter() + SectionParserInst.registerSectionWithoutErr(&defaultSectionType) +} + +type DefaultSection struct { + Prefix Section + Suffix Section +} + +func (d DefaultSection) sectionPrefix() Section { + return d.Prefix +} + +func (d DefaultSection) sectionSuffix() Section { + return d.Suffix +} + +func (d DefaultSection) MatchSpecificity(spec importPkg.ImportDef) specificity.MatchSpecificity { + return specificity.Default{} +} + +func (d DefaultSection) Format(imports []importPkg.ImportDef, cfg configuration.FormatterConfiguration) string { + return inorderSectionFormat(d, imports, cfg) +} + +func (d DefaultSection) String() string { + return sectionStringWithPrefixSuffix("Default", d) +} diff --git a/pkg/gci/sections/default_test.go b/pkg/gci/sections/default_test.go new file mode 100644 index 0000000..0d5edd9 --- /dev/null +++ b/pkg/gci/sections/default_test.go @@ -0,0 +1,31 @@ +package sections + +import ( + "testing" + + "github.com/daixiang0/gci/pkg/gci/specificity" +) + +func TestDefaultSpecificity(t *testing.T) { + testCases := []specificityTestData{ + {`""`, DefaultSection{}, specificity.Default{}}, + {`"x"`, DefaultSection{}, specificity.Default{}}, + } + testSpecificity(t, testCases) +} + +func TestDefaultSectionParsing(t *testing.T) { + testCases := []sectionTestData{ + {"def", DefaultSection{}, nil}, + {"defAult", DefaultSection{nil, nil}, nil}, + {"defAult(invalid)", nil, SectionTypeDoesNotAcceptParametersError}, + } + testSectionParser(t, testCases) +} + +func TestDefaultSectionToString(t *testing.T) { + testSectionToString(t, DefaultSection{}) + testSectionToString(t, DefaultSection{nil, nil}) + testSectionToString(t, DefaultSection{nil, NewLine{}}) + testSectionToString(t, DefaultSection{CommentLine{"a"}, CommentLine{"b"}}) +} diff --git a/pkg/gci/sections/errors.go b/pkg/gci/sections/errors.go new file mode 100644 index 0000000..3cc720d --- /dev/null +++ b/pkg/gci/sections/errors.go @@ -0,0 +1,68 @@ +package sections + +import ( + "errors" + "fmt" + + "github.com/daixiang0/gci/pkg/constants" +) + +type SectionParsingError struct { + error +} + +func (s SectionParsingError) Unwrap() error { + return s.error +} + +func (s SectionParsingError) Wrap(sectionStr string) error { + return fmt.Errorf("failed to parse section %q: %w", sectionStr, s) +} + +func (s SectionParsingError) Is(err error) bool { + _, ok := err.(SectionParsingError) + return ok +} + +type TypeAlreadyRegisteredError struct { + duplicateAlias string + newType, existingType SectionType +} + +func (t TypeAlreadyRegisteredError) Error() string { + return fmt.Sprintf("New type %q could not be registered because alias %q was already defined in %q", t.newType, t.duplicateAlias, t.existingType) +} + +func (t TypeAlreadyRegisteredError) Is(err error) bool { + _, ok := err.(TypeAlreadyRegisteredError) + return ok +} + +var PrefixNotAllowedError = errors.New("section may not contain a Prefix") + +var SuffixNotAllowedError = errors.New("section may not contain a Suffix") + +var SectionFormatInvalidError = errors.New("section Definition does not match format [FormattingSection:]Section[:FormattingSection]") + +type SectionAliasNotRegisteredWithParser struct { + missingAlias string +} + +func (s SectionAliasNotRegisteredWithParser) Error() string { + return fmt.Sprintf("section alias %q not registered with parser", s.missingAlias) +} + +func (s SectionAliasNotRegisteredWithParser) Is(err error) bool { + _, ok := err.(SectionAliasNotRegisteredWithParser) + return ok +} + +var MissingParameterClosingBracketsError = fmt.Errorf("section parameter is missing closing %q", constants.ParameterClosingBrackets) + +var MoreThanOneOpeningQuotesError = fmt.Errorf("found more than one %q parameter start sequences", constants.ParameterClosingBrackets) + +var SectionTypeDoesNotAcceptParametersError = errors.New("section type does not accept a parameter") + +var SectionTypeDoesNotAcceptPrefixError = errors.New("section may not contain a Prefix") + +var SectionTypeDoesNotAcceptSuffixError = errors.New("section may not contain a Suffix") diff --git a/pkg/gci/sections/errors_test.go b/pkg/gci/sections/errors_test.go new file mode 100644 index 0000000..3ab8cad --- /dev/null +++ b/pkg/gci/sections/errors_test.go @@ -0,0 +1,30 @@ +package sections + +import ( + "errors" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestErrorMatching(t *testing.T) { + assert.True(t, errors.Is(TypeAlreadyRegisteredError{"abc", SectionType{}, SectionType{}}, TypeAlreadyRegisteredError{})) + assert.True(t, errors.Is(PrefixNotAllowedError, PrefixNotAllowedError)) + assert.True(t, errors.Is(SuffixNotAllowedError, SuffixNotAllowedError)) + assert.True(t, errors.Is(SectionFormatInvalidError, SectionFormatInvalidError)) + assert.True(t, errors.Is(SectionAliasNotRegisteredWithParser{"x"}, SectionAliasNotRegisteredWithParser{})) + assert.True(t, errors.Is(MissingParameterClosingBracketsError, MissingParameterClosingBracketsError)) + assert.True(t, errors.Is(MoreThanOneOpeningQuotesError, MoreThanOneOpeningQuotesError)) + assert.True(t, errors.Is(SectionTypeDoesNotAcceptParametersError, SectionTypeDoesNotAcceptParametersError)) + assert.True(t, errors.Is(SectionTypeDoesNotAcceptPrefixError, SectionTypeDoesNotAcceptPrefixError)) + assert.True(t, errors.Is(SectionTypeDoesNotAcceptSuffixError, SectionTypeDoesNotAcceptSuffixError)) +} + +func TestErrorClass(t *testing.T) { + subError := MissingParameterClosingBracketsError + errorGroup := SectionParsingError{subError} + assert.True(t, errors.Is(errorGroup, SectionParsingError{})) + assert.True(t, errors.Is(errorGroup, subError)) + assert.True(t, errors.Is(errorGroup.Wrap("x"), SectionParsingError{})) + assert.True(t, errors.Is(errorGroup.Wrap("x"), subError)) +} diff --git a/pkg/gci/sections/newline.go b/pkg/gci/sections/newline.go new file mode 100644 index 0000000..b54788b --- /dev/null +++ b/pkg/gci/sections/newline.go @@ -0,0 +1,41 @@ +package sections + +import ( + "github.com/daixiang0/gci/pkg/configuration" + "github.com/daixiang0/gci/pkg/constants" + importPkg "github.com/daixiang0/gci/pkg/gci/imports" + "github.com/daixiang0/gci/pkg/gci/specificity" +) + +func init() { + newLineType := SectionType{ + generatorFun: func(parameter string, sectionPrefix, sectionSuffix Section) (Section, error) { + return NewLine{}, nil + }, + aliases: []string{"NL", "NewLine"}, + description: "Prints an empty line", + }.StandAloneSection().WithoutParameter() + SectionParserInst.registerSectionWithoutErr(&newLineType) +} + +type NewLine struct{} + +func (n NewLine) sectionPrefix() Section { + return nil +} + +func (n NewLine) sectionSuffix() Section { + return nil +} + +func (n NewLine) MatchSpecificity(spec importPkg.ImportDef) specificity.MatchSpecificity { + return specificity.MisMatch{} +} + +func (n NewLine) Format(imports []importPkg.ImportDef, cfg configuration.FormatterConfiguration) string { + return constants.Linebreak +} + +func (n NewLine) String() string { + return "NewLine" +} diff --git a/pkg/gci/sections/newline_test.go b/pkg/gci/sections/newline_test.go new file mode 100644 index 0000000..a13b4cc --- /dev/null +++ b/pkg/gci/sections/newline_test.go @@ -0,0 +1,29 @@ +package sections + +import ( + "testing" + + "github.com/daixiang0/gci/pkg/gci/specificity" +) + +func TestNewLineSpecificity(t *testing.T) { + testCases := []specificityTestData{ + {`""`, NewLine{}, specificity.MisMatch{}}, + {`"x"`, NewLine{}, specificity.MisMatch{}}, + {`"\n"`, NewLine{}, specificity.MisMatch{}}, + } + testSpecificity(t, testCases) +} +func TestNewLineParsing(t *testing.T) { + testCases := []sectionTestData{ + {"nl", NewLine{}, nil}, + {"newLine", NewLine{}, nil}, + {"newLine:nl", nil, SectionTypeDoesNotAcceptPrefixError}, + {"NL(invalid)", nil, SectionTypeDoesNotAcceptParametersError}, + } + testSectionParser(t, testCases) +} + +func TestNewLineToString(t *testing.T) { + testSectionToString(t, NewLine{}) +} diff --git a/pkg/gci/sections/prefix.go b/pkg/gci/sections/prefix.go new file mode 100644 index 0000000..49b30b2 --- /dev/null +++ b/pkg/gci/sections/prefix.go @@ -0,0 +1,51 @@ +package sections + +import ( + "fmt" + "strings" + + "github.com/daixiang0/gci/pkg/configuration" + importPkg "github.com/daixiang0/gci/pkg/gci/imports" + "github.com/daixiang0/gci/pkg/gci/specificity" +) + +func init() { + prefixType := &SectionType{ + generatorFun: func(parameter string, sectionPrefix, sectionSuffix Section) (Section, error) { + return Prefix{parameter, sectionPrefix, sectionSuffix}, nil + }, + aliases: []string{"Prefix", "pkgPrefix"}, + parameterHelp: "gitlab.com/myorg", + description: "Groups all imports with the specified Prefix. Imports will be matched to the longest Prefix.", + } + SectionParserInst.registerSectionWithoutErr(prefixType) +} + +type Prefix struct { + ImportPrefix string + Prefix Section + Suffix Section +} + +func (p Prefix) sectionPrefix() Section { + return p.Prefix +} + +func (p Prefix) sectionSuffix() Section { + return p.Suffix +} + +func (p Prefix) MatchSpecificity(spec importPkg.ImportDef) specificity.MatchSpecificity { + if len(p.ImportPrefix) > 0 && strings.HasPrefix(spec.Path(), p.ImportPrefix) { + return specificity.Match{len(p.ImportPrefix)} + } + return specificity.MisMatch{} +} + +func (p Prefix) Format(imports []importPkg.ImportDef, cfg configuration.FormatterConfiguration) string { + return inorderSectionFormat(p, imports, cfg) +} + +func (p Prefix) String() string { + return sectionStringWithPrefixSuffix(fmt.Sprintf("Prefix(%s)", p.ImportPrefix), p) +} diff --git a/pkg/gci/sections/prefix_test.go b/pkg/gci/sections/prefix_test.go new file mode 100644 index 0000000..250c7bd --- /dev/null +++ b/pkg/gci/sections/prefix_test.go @@ -0,0 +1,35 @@ +package sections + +import ( + "testing" + + "github.com/daixiang0/gci/pkg/gci/specificity" +) + +func TestPrefixSpecificity(t *testing.T) { + testCases := []specificityTestData{ + {`"foo/pkg/bar"`, Prefix{"", nil, nil}, specificity.MisMatch{}}, + {`"foo/pkg/bar"`, Prefix{"foo", nil, nil}, specificity.Match{3}}, + {`"foo/pkg/bar"`, Prefix{"bar", nil, nil}, specificity.MisMatch{}}, + {`"foo/pkg/bar"`, Prefix{"github.com/foo/bar", nil, nil}, specificity.MisMatch{}}, + {`"foo/pkg/bar"`, Prefix{"github.com/foo", nil, nil}, specificity.MisMatch{}}, + {`"foo/pkg/bar"`, Prefix{"github.com/bar", nil, nil}, specificity.MisMatch{}}, + } + testSpecificity(t, testCases) +} + +func TestPrefixParsing(t *testing.T) { + testCases := []sectionTestData{ + {"pkgPREFIX", Prefix{"", nil, nil}, nil}, + {"prefix(test.com)", Prefix{"test.com", nil, nil}, nil}, + } + testSectionParser(t, testCases) +} + +func TestPrefixToString(t *testing.T) { + testSectionToString(t, Prefix{}) + testSectionToString(t, Prefix{"", nil, nil}) + testSectionToString(t, Prefix{"abc.org", nil, nil}) + testSectionToString(t, Prefix{"abc.org", nil, CommentLine{"a"}}) + testSectionToString(t, Prefix{"abc.org", CommentLine{"a"}, NewLine{}}) +} diff --git a/pkg/gci/sections/section.go b/pkg/gci/sections/section.go new file mode 100644 index 0000000..cbfd467 --- /dev/null +++ b/pkg/gci/sections/section.go @@ -0,0 +1,58 @@ +package sections + +import ( + "fmt" + + "github.com/daixiang0/gci/pkg/configuration" + importPkg "github.com/daixiang0/gci/pkg/gci/imports" + "github.com/daixiang0/gci/pkg/gci/specificity" +) + +// Section defines a part of the formatted output. +type Section interface { + // MatchSpecificity returns how well an Import matches to this Section + MatchSpecificity(spec importPkg.ImportDef) specificity.MatchSpecificity + // Format receives the array of imports that have matched this section and formats them according to it´s rules + Format(imports []importPkg.ImportDef, cfg configuration.FormatterConfiguration) string + // Returns the Section that will be prefixed if this section is rendered + sectionPrefix() Section + // Returns the Section that will be suffixed if this section is rendered + sectionSuffix() Section + // String Implements the stringer interface + String() string +} + +//Unbound methods that are required until interface methods are supported + +// Default method for formatting a section +func inorderSectionFormat(section Section, imports []importPkg.ImportDef, cfg configuration.FormatterConfiguration) string { + imports = importPkg.SortImportsByPath(imports) + var output string + if len(imports) > 0 && section.sectionPrefix() != nil { + // imports are not passed to a prefix section to prevent rendering them twice + output += section.sectionPrefix().Format([]importPkg.ImportDef{}, cfg) + } + for _, importDef := range imports { + output += importDef.Format(cfg) + } + if len(imports) > 0 && section.sectionSuffix() != nil { + // imports are not passed to a suffix section to prevent rendering them twice + output += section.sectionSuffix().Format([]importPkg.ImportDef{}, cfg) + } + return output +} + +// Default method for converting a section to a String representation +func sectionStringWithPrefixSuffix(mainSectionStr string, section Section) (output string) { + if section.sectionPrefix() != nil { + output += fmt.Sprintf("%v:", section.sectionPrefix()) + } else if section.sectionSuffix() != nil { + // insert empty prefix to make suffix distinguishable from prefix + output += ":" + } + output += mainSectionStr + if section.sectionSuffix() != nil { + output += fmt.Sprintf(":%v", section.sectionSuffix()) + } + return output +} diff --git a/pkg/gci/sections/section_test.go b/pkg/gci/sections/section_test.go new file mode 100644 index 0000000..344e248 --- /dev/null +++ b/pkg/gci/sections/section_test.go @@ -0,0 +1,32 @@ +package sections + +import ( + "fmt" + "testing" + + importPkg "github.com/daixiang0/gci/pkg/gci/imports" + "github.com/daixiang0/gci/pkg/gci/specificity" +) + +type specificityTestData struct { + importPath string + section Section + expectedSpecificity specificity.MatchSpecificity +} + +func testSpecificity(t *testing.T, testCases []specificityTestData) { + for _, test := range testCases { + testName := fmt.Sprintf("%s:%v", test.importPath, test.section) + t.Run(testName, testSpecificityCase(test)) + } +} + +func testSpecificityCase(testData specificityTestData) func(t *testing.T) { + return func(t *testing.T) { + t.Parallel() + detectedSpecificity := testData.section.MatchSpecificity(importPkg.ImportDef{QuotedPath: testData.importPath}) + if detectedSpecificity != testData.expectedSpecificity { + t.Errorf("Specificity is %v and not %v", detectedSpecificity, testData.expectedSpecificity) + } + } +} diff --git a/pkg/gci/sections/sectionparser.go b/pkg/gci/sections/sectionparser.go new file mode 100644 index 0000000..b0b89a1 --- /dev/null +++ b/pkg/gci/sections/sectionparser.go @@ -0,0 +1,139 @@ +package sections + +import ( + "fmt" + "strings" + + "github.com/daixiang0/gci/pkg/constants" +) + +var SectionParserInst = SectionParser{} + +type SectionParser struct { + sectionTypes []SectionType +} + +func (s *SectionParser) RegisterSection(newSectionType *SectionType) error { + for _, existingSectionType := range s.sectionTypes { + for _, alias := range existingSectionType.aliases { + for _, newAlias := range newSectionType.aliases { + if alias == newAlias { + return TypeAlreadyRegisteredError{alias, *newSectionType, existingSectionType} + } + } + } + } + s.sectionTypes = append(s.sectionTypes, *newSectionType) + return nil +} + +func (s *SectionParser) registerSectionWithoutErr(newSectionType *SectionType) { + err := s.RegisterSection(newSectionType) + if err != nil { + panic(err) + } +} + +func (s *SectionParser) ParseSectionStrings(sectionStrings []string, withSuffix, withPrefix bool) ([]Section, error) { + var parsedSections []Section + for _, sectionStr := range sectionStrings { + section, err := s.parseSectionString(sectionStr, withSuffix, withPrefix) + if err != nil { + return nil, SectionParsingError{err}.Wrap(sectionStr) + } + parsedSections = append(parsedSections, section) + } + return parsedSections, nil +} + +func (s *SectionParser) parseSectionString(sectionStr string, withSuffix, withPrefix bool) (Section, error) { + trimmedSection := strings.TrimSpace(sectionStr) + sectionSegments := strings.Split(trimmedSection, constants.SectionSeparator) + switch len(sectionSegments) { + case 1: + // section + return s.parseSectionStringComponents("", sectionSegments[0], "") + case 2: + // prefix + section + if !withPrefix { + return nil, PrefixNotAllowedError + } + return s.parseSectionStringComponents(sectionSegments[0], sectionSegments[1], "") + case 3: + // prefix + section + suffix + if !withPrefix { + return nil, PrefixNotAllowedError + } + if !withSuffix { + return nil, SuffixNotAllowedError + } + return s.parseSectionStringComponents(sectionSegments[0], sectionSegments[1], sectionSegments[2]) + } + return nil, SectionFormatInvalidError +} + +func (s *SectionParser) parseSectionStringComponents(sectionPrefixStr string, sectionStr string, sectionSuffixStr string) (Section, error) { + var sectionPrefix, sectionSuffix Section + var err error + if len(sectionPrefixStr) > 0 { + sectionPrefix, err = s.createSectionFromString(sectionPrefixStr, nil, nil) + if err != nil { + return nil, fmt.Errorf("section prefix %q could not be parsed: %w", sectionPrefixStr, err) + } + } + if len(sectionSuffixStr) > 0 { + sectionSuffix, err = s.createSectionFromString(sectionSuffixStr, nil, nil) + if err != nil { + return nil, fmt.Errorf("section suffix %q could not be parsed: %w", sectionSuffixStr, err) + } + } + section, err := s.createSectionFromString(sectionStr, sectionPrefix, sectionSuffix) + if err != nil { + return nil, err + } + return section, nil +} + +func (s *SectionParser) createSectionFromString(sectionStr string, prefixSection, suffixSection Section) (Section, error) { + // create map of all aliases + aliasMap := map[string]SectionType{} + for _, sectionType := range s.sectionTypes { + for _, alias := range sectionType.aliases { + aliasMap[strings.ToLower(alias)] = sectionType + } + } + // parse everything before the parameter brackets + sectionComponents := strings.Split(sectionStr, constants.ParameterOpeningBrackets) + alias := sectionComponents[0] + sectionType, exists := aliasMap[strings.ToLower(alias)] + if !exists { + return nil, SectionAliasNotRegisteredWithParser{alias} + } + switch len(sectionComponents) { + case 1: + return sectionType.generatorFun("", prefixSection, suffixSection) + case 2: + if strings.HasSuffix(sectionComponents[1], constants.ParameterClosingBrackets) { + return sectionType.generatorFun(strings.TrimSuffix(sectionComponents[1], constants.ParameterClosingBrackets), prefixSection, suffixSection) + } else { + return nil, MissingParameterClosingBracketsError + } + } + return nil, MoreThanOneOpeningQuotesError +} + +func (s *SectionParser) SectionHelpTexts() string { + help := "" + for _, sectionType := range s.sectionTypes { + var aliasesWithParameters []string + for _, alias := range sectionType.aliases { + parameterSuffix := "" + if sectionType.parameterHelp != "" { + parameterSuffix = "(" + sectionType.parameterHelp + ")" + } + aliasesWithParameters = append(aliasesWithParameters, alias+parameterSuffix) + } + help += fmt.Sprintf("%s - %s\n", strings.Join(aliasesWithParameters, " | "), sectionType.description) + } + return help +} diff --git a/pkg/gci/sections/sectionparser_test.go b/pkg/gci/sections/sectionparser_test.go new file mode 100644 index 0000000..44e0a00 --- /dev/null +++ b/pkg/gci/sections/sectionparser_test.go @@ -0,0 +1,60 @@ +package sections + +import ( + "errors" + "fmt" + "testing" + + "github.com/stretchr/testify/assert" +) + +type sectionTestData struct { + sectionDef string + expectedSection Section + expectedError error +} + +func testSectionParser(t *testing.T, testCases []sectionTestData) { + for _, test := range testCases { + testName := fmt.Sprintf("%q-->(%v,%v)", test.sectionDef, test.expectedSection, test.expectedError) + t.Run(testName, func(t *testing.T) { + parsedSection, err := SectionParserInst.parseSectionString(test.sectionDef, true, true) + assert.Equal(t, test.expectedSection, parsedSection) + assert.True(t, errors.Is(err, test.expectedError)) + }) + } +} + +func testSectionToString(t *testing.T, section Section) { + testName := fmt.Sprintf("%#v", section) + t.Run(testName, func(t *testing.T) { + sectionStr := section.String() + parsedSection, err := SectionParserInst.parseSectionString(sectionStr, true, true) + assert.NoError(t, err) + assert.Equal(t, section, parsedSection) + }) +} + +func TestComplexParsingCases(t *testing.T) { + testCases := []sectionTestData{ + {"Comment:defAult", DefaultSection{CommentLine{""}, nil}, nil}, + {":defAult:Comment(u)", DefaultSection{nil, CommentLine{"u"}}, nil}, + } + testSectionParser(t, testCases) +} + +func TestRegisterSectionAliasTwice(t *testing.T) { + parser := SectionParser{} + t1 := SectionType{ + aliases: []string{"a", "x"}, + } + err := parser.RegisterSection(&t1) + assert.NoError(t, err) + err = parser.RegisterSection(&t1) + assert.True(t, errors.Is(err, TypeAlreadyRegisteredError{})) + t2 := SectionType{ + aliases: []string{"b", "x"}, + } + err = parser.RegisterSection(&t2) + assert.True(t, errors.Is(err, TypeAlreadyRegisteredError{})) +} diff --git a/pkg/gci/sections/sectiontype.go b/pkg/gci/sections/sectiontype.go new file mode 100644 index 0000000..3028767 --- /dev/null +++ b/pkg/gci/sections/sectiontype.go @@ -0,0 +1,40 @@ +package sections + +import ( + "fmt" +) + +// A SectionType is used to dynamically register Sections with the parser +type SectionType struct { + generatorFun func(parameter string, sectionPrefix, sectionSuffix Section) (Section, error) + aliases []string + parameterHelp string + description string +} + +func (t SectionType) WithoutParameter() SectionType { + generatorFun := func(parameter string, sectionPrefix, sectionSuffix Section) (Section, error) { + if parameter != "" { + return nil, SectionTypeDoesNotAcceptParametersError + } + return t.generatorFun(parameter, sectionPrefix, sectionSuffix) + } + return SectionType{generatorFun, t.aliases, "", t.description} +} + +func (t SectionType) StandAloneSection() SectionType { + generatorFun := func(parameter string, sectionPrefix, sectionSuffix Section) (Section, error) { + if sectionPrefix != nil { + return nil, SectionTypeDoesNotAcceptPrefixError + } + if sectionSuffix != nil { + return nil, SectionTypeDoesNotAcceptSuffixError + } + return t.generatorFun(parameter, sectionPrefix, sectionSuffix) + } + return SectionType{generatorFun, t.aliases, t.parameterHelp, t.description} +} + +func (t SectionType) String() string { + return fmt.Sprintf("Sectiontype(aliases: %v,description: %s)", t.aliases, t.description) +} diff --git a/pkg/gci/sections/standardpackage.go b/pkg/gci/sections/standardpackage.go new file mode 100644 index 0000000..b53475b --- /dev/null +++ b/pkg/gci/sections/standardpackage.go @@ -0,0 +1,51 @@ +package sections + +import ( + "github.com/daixiang0/gci/pkg/configuration" + importPkg "github.com/daixiang0/gci/pkg/gci/imports" + "github.com/daixiang0/gci/pkg/gci/specificity" +) + +func init() { + standardPackageType := SectionType{ + generatorFun: func(parameter string, sectionPrefix, sectionSuffix Section) (Section, error) { + return StandardPackage{sectionPrefix, sectionSuffix}, nil + }, + aliases: []string{"Std", "Standard"}, + description: "Captures all standard packages if they do not match another section", + }.WithoutParameter() + SectionParserInst.registerSectionWithoutErr(&standardPackageType) +} + +type StandardPackage struct { + prefix Section + suffix Section +} + +func (s StandardPackage) sectionPrefix() Section { + return s.prefix +} + +func (s StandardPackage) sectionSuffix() Section { + return s.suffix +} + +func (s StandardPackage) MatchSpecificity(spec importPkg.ImportDef) specificity.MatchSpecificity { + if isStandardPackage(spec.Path()) { + return specificity.StandardPackageMatch{} + } + return specificity.MisMatch{} +} + +func (s StandardPackage) Format(imports []importPkg.ImportDef, cfg configuration.FormatterConfiguration) string { + return inorderSectionFormat(s, imports, cfg) +} + +func (s StandardPackage) String() string { + return sectionStringWithPrefixSuffix("Standard", s) +} + +func isStandardPackage(pkg string) bool { + _, ok := standardPackages[pkg] + return ok +} diff --git a/pkg/gci/std.go b/pkg/gci/sections/standardpackage_list.go similarity index 96% rename from pkg/gci/std.go rename to pkg/gci/sections/standardpackage_list.go index ac96b55..a501f29 100644 --- a/pkg/gci/std.go +++ b/pkg/gci/sections/standardpackage_list.go @@ -1,6 +1,6 @@ -package gci +package sections -// Code generated based on go1.16beta1. DO NOT EDIT. +// Code generated based on go1.17.5. DO NOT EDIT. var standardPackages = map[string]struct{}{ "archive/tar": {}, @@ -63,6 +63,7 @@ var standardPackages = map[string]struct{}{ "fmt": {}, "go/ast": {}, "go/build": {}, + "go/build/constraint": {}, "go/constant": {}, "go/doc": {}, "go/format": {}, @@ -154,8 +155,3 @@ var standardPackages = map[string]struct{}{ "unicode/utf8": {}, "unsafe": {}, } - -func isStandardPackage(pkg string) bool { - _, ok := standardPackages[pkg] - return ok -} diff --git a/pkg/gci/sections/standardpackage_test.go b/pkg/gci/sections/standardpackage_test.go new file mode 100644 index 0000000..4387669 --- /dev/null +++ b/pkg/gci/sections/standardpackage_test.go @@ -0,0 +1,35 @@ +package sections + +import ( + "testing" + + "github.com/daixiang0/gci/pkg/gci/specificity" +) + +func TestStandardPackageSpecificity(t *testing.T) { + testCases := []specificityTestData{ + {`"context"`, StandardPackage{}, specificity.StandardPackageMatch{}}, + {`"contexts"`, StandardPackage{}, specificity.MisMatch{}}, + {`"crypto"`, StandardPackage{}, specificity.StandardPackageMatch{}}, + {`"crypto1"`, StandardPackage{}, specificity.MisMatch{}}, + {`"crypto/ae"`, StandardPackage{}, specificity.MisMatch{}}, + {`"crypto/aes"`, StandardPackage{}, specificity.StandardPackageMatch{}}, + {`"crypto/aes2"`, StandardPackage{}, specificity.MisMatch{}}, + } + testSpecificity(t, testCases) +} + +func TestStandardPackageParsing(t *testing.T) { + testCases := []sectionTestData{ + {"sTd", StandardPackage{}, nil}, + {"STANDARD", StandardPackage{}, nil}, + {"Std(i)", nil, SectionTypeDoesNotAcceptParametersError}, + } + testSectionParser(t, testCases) +} + +func TestStandardPackageToString(t *testing.T) { + testSectionToString(t, StandardPackage{}) + testSectionToString(t, StandardPackage{nil, CommentLine{"a"}}) + testSectionToString(t, StandardPackage{CommentLine{"a"}, NewLine{}}) +} diff --git a/pkg/gci/specificity/default.go b/pkg/gci/specificity/default.go new file mode 100644 index 0000000..2d91bd8 --- /dev/null +++ b/pkg/gci/specificity/default.go @@ -0,0 +1,19 @@ +package specificity + +type Default struct { +} + +func (d Default) IsMoreSpecific(than MatchSpecificity) bool { + return isMoreSpecific(d, than) +} +func (d Default) Equal(to MatchSpecificity) bool { + return equalSpecificity(d, to) +} + +func (d Default) class() specificityClass { + return DefaultClass +} + +func (d Default) String() string { + return "Default" +} diff --git a/pkg/gci/specificity/match.go b/pkg/gci/specificity/match.go new file mode 100644 index 0000000..f08d2b6 --- /dev/null +++ b/pkg/gci/specificity/match.go @@ -0,0 +1,24 @@ +package specificity + +import "fmt" + +type Match struct { + Length int +} + +func (m Match) IsMoreSpecific(than MatchSpecificity) bool { + otherMatch, isMatch := than.(Match) + return isMoreSpecific(m, than) || (isMatch && m.Length > otherMatch.Length) +} + +func (m Match) Equal(to MatchSpecificity) bool { + return equalSpecificity(m, to) +} + +func (m Match) class() specificityClass { + return MatchClass +} + +func (m Match) String() string { + return fmt.Sprintf("Match(length: %d)", m.Length) +} diff --git a/pkg/gci/specificity/mismatch.go b/pkg/gci/specificity/mismatch.go new file mode 100644 index 0000000..78013e3 --- /dev/null +++ b/pkg/gci/specificity/mismatch.go @@ -0,0 +1,21 @@ +package specificity + +type MisMatch struct { +} + +func (m MisMatch) IsMoreSpecific(than MatchSpecificity) bool { + return isMoreSpecific(m, than) +} + +func (m MisMatch) Equal(to MatchSpecificity) bool { + return equalSpecificity(m, to) +} + +func (m MisMatch) class() specificityClass { + return MisMatchClass +} + +func (m MisMatch) String() string { + return "Mismatch" + +} diff --git a/pkg/gci/specificity/specificity.go b/pkg/gci/specificity/specificity.go new file mode 100644 index 0000000..32b6e28 --- /dev/null +++ b/pkg/gci/specificity/specificity.go @@ -0,0 +1,28 @@ +package specificity + +type specificityClass int + +const ( + MisMatchClass = 0 + DefaultClass = 10 + StandardPackageClass = 20 + MatchClass = 30 +) + +// MatchSpecificity is used to determine which section matches an import best +type MatchSpecificity interface { + IsMoreSpecific(than MatchSpecificity) bool + Equal(to MatchSpecificity) bool + class() specificityClass +} + +//Unbound methods that are required until interface methods are supported + +func isMoreSpecific(this, than MatchSpecificity) bool { + return this.class() > than.class() +} + +func equalSpecificity(base, to MatchSpecificity) bool { + // m.class() == to.class() would not work for Match + return !base.IsMoreSpecific(to) && !to.IsMoreSpecific(base) +} diff --git a/pkg/gci/specificity/specificity_test.go b/pkg/gci/specificity/specificity_test.go new file mode 100644 index 0000000..f6a1cb2 --- /dev/null +++ b/pkg/gci/specificity/specificity_test.go @@ -0,0 +1,29 @@ +package specificity + +import ( + "fmt" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestSpecificityOrder(t *testing.T) { + testCases := testCasesInSpecificityOrder() + for i := 1; i < len(testCases); i++ { + t.Run(fmt.Sprintf("Specificity(%v)>Specificity(%v)", testCases[i], testCases[i-1]), func(t *testing.T) { + assert.True(t, testCases[i].IsMoreSpecific(testCases[i-1])) + }) + } +} + +func TestSpecificityEquality(t *testing.T) { + for _, testCase := range testCasesInSpecificityOrder() { + t.Run(fmt.Sprintf("Specificity(%v)==Specificity(%v)", testCase, testCase), func(t *testing.T) { + assert.True(t, testCase.Equal(testCase)) + }) + } +} + +func testCasesInSpecificityOrder() []MatchSpecificity { + return []MatchSpecificity{MisMatch{}, Default{}, StandardPackageMatch{}, Match{0}, Match{1}} +} diff --git a/pkg/gci/specificity/standard.go b/pkg/gci/specificity/standard.go new file mode 100644 index 0000000..30e8f8f --- /dev/null +++ b/pkg/gci/specificity/standard.go @@ -0,0 +1,20 @@ +package specificity + +type StandardPackageMatch struct { +} + +func (s StandardPackageMatch) IsMoreSpecific(than MatchSpecificity) bool { + return isMoreSpecific(s, than) +} + +func (s StandardPackageMatch) Equal(to MatchSpecificity) bool { + return equalSpecificity(s, to) +} + +func (s StandardPackageMatch) class() specificityClass { + return StandardPackageClass +} + +func (s StandardPackageMatch) String() string { + return "Standard" +} diff --git a/pkg/io/file.go b/pkg/io/file.go new file mode 100644 index 0000000..f92d16e --- /dev/null +++ b/pkg/io/file.go @@ -0,0 +1,59 @@ +package io + +import "io/ioutil" + +// FileObj allows mocking the access to files +type FileObj interface { + Load() ([]byte, error) + Path() string +} + +// File represents a file that can be loaded from the file system +type File struct { + FilePath string +} + +func (f File) Path() string { + return f.FilePath +} + +func (f File) Load() ([]byte, error) { + return ioutil.ReadFile(f.FilePath) +} + +// FileGeneratorFunc returns a list of files that can be loaded and processed +type FileGeneratorFunc func() ([]FileObj, error) + +func (a FileGeneratorFunc) Combine(b FileGeneratorFunc) FileGeneratorFunc { + return func() ([]FileObj, error) { + files, err := a() + if err != nil { + return nil, err + } + additionalFiles, err := b() + if err != nil { + return nil, err + } + files = append(files, additionalFiles...) + return files, err + } +} + +func GoFilesInPathsGenerator(paths []string) FileGeneratorFunc { + return FilesInPathsGenerator(paths, isGoFile) +} + +func FilesInPathsGenerator(paths []string, fileCheckFun fileCheckFunction) FileGeneratorFunc { + return func() (foundFiles []FileObj, err error) { + for _, path := range paths { + files, err := FindFilesForPath(path, fileCheckFun) + if err != nil { + return nil, err + } + for _, filePath := range files { + foundFiles = append(foundFiles, File{filePath}) + } + } + return foundFiles, nil + } +} diff --git a/pkg/io/search.go b/pkg/io/search.go new file mode 100644 index 0000000..04f0058 --- /dev/null +++ b/pkg/io/search.go @@ -0,0 +1,47 @@ +package io + +import ( + "io/fs" + "os" + "path/filepath" +) + +type fileCheckFunction func(file os.FileInfo) bool + +func FindFilesForPath(path string, fileCheckFun fileCheckFunction) ([]string, error) { + switch entry, err := os.Stat(path); { + case err != nil: + return nil, err + case entry.IsDir(): + return findFilesForDirectory(path, fileCheckFun) + case fileCheckFun(entry): + return []string{filepath.Clean(path)}, nil + default: + return []string{}, nil + } +} + +func findFilesForDirectory(dirPath string, fileCheckFun fileCheckFunction) ([]string, error) { + var filePaths []string + err := filepath.WalkDir(dirPath, func(path string, entry fs.DirEntry, err error) error { + if err != nil { + return err + } + file, err := entry.Info() + if err != nil { + return err + } + if !entry.IsDir() && fileCheckFun(file) { + filePaths = append(filePaths, filepath.Clean(path)) + } + return nil + }) + if err != nil { + return nil, err + } + return filePaths, nil +} + +func isGoFile(file os.FileInfo) bool { + return !file.IsDir() && filepath.Ext(file.Name()) == ".go" +} diff --git a/pkg/io/stdin.go b/pkg/io/stdin.go new file mode 100644 index 0000000..5d92768 --- /dev/null +++ b/pkg/io/stdin.go @@ -0,0 +1,28 @@ +package io + +import ( + "io/ioutil" + "os" +) + +type stdInFile struct { +} + +func (s stdInFile) Load() ([]byte, error) { + return ioutil.ReadAll(os.Stdin) +} + +func (s stdInFile) Path() string { + return "StdIn" +} + +var StdInGenerator FileGeneratorFunc = func() ([]FileObj, error) { + stat, err := os.Stdin.Stat() + if err != nil { + return nil, err + } + if (stat.Mode() & os.ModeCharDevice) == 0 { + return []FileObj{stdInFile{}}, nil + } + return []FileObj{}, nil +}