From bd9d305577e1b475b7950f38720c3dcda072ba4e Mon Sep 17 00:00:00 2001 From: "Andrew S. Brown" Date: Sat, 21 Nov 2020 18:13:37 -0800 Subject: [PATCH 1/8] Add Makezero linter --- .golangci.example.yml | 3 ++ .golangci.yml | 1 + go.mod | 3 +- go.sum | 13 +++++-- pkg/config/config.go | 5 +++ pkg/golinters/makezero.go | 60 ++++++++++++++++++++++++++++++++ pkg/lint/lintersdb/manager.go | 3 ++ test/testdata/makezero.go | 7 ++++ test/testdata/makezero_always.go | 7 ++++ 9 files changed, 99 insertions(+), 3 deletions(-) create mode 100644 pkg/golinters/makezero.go create mode 100644 test/testdata/makezero.go create mode 100644 test/testdata/makezero_always.go diff --git a/.golangci.example.yml b/.golangci.example.yml index ae8a9a3f0c6d..d257b9afa14f 100644 --- a/.golangci.example.yml +++ b/.golangci.example.yml @@ -341,6 +341,9 @@ linters-settings: errorlint: # Report non-wrapping error creation using fmt.Errorf errorf: true + makezero: + # Allow only slices initialized with a length of zero. Default is false. + always: false # The custom section can be used to define linter plugins to be loaded at runtime. See README doc # for more info. diff --git a/.golangci.yml b/.golangci.yml index 012255c281b4..e44018f2fc93 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -90,6 +90,7 @@ linters: - ineffassign - interfacer - lll + - makezero - misspell - nakedret - noctx diff --git a/go.mod b/go.mod index 842b71a68a92..6cff91d4c5f1 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,7 @@ require ( 4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a github.com/Djarvur/go-err113 v0.0.0-20200511133814-5174e21577d5 github.com/OpenPeeDeeP/depguard v1.0.1 + github.com/ashanbrown/makezero v0.0.0-20190918151423-218a01bf77ad github.com/bombsimon/wsl/v3 v3.1.0 github.com/daixiang0/gci v0.2.4 github.com/denis-tingajkin/go-header v0.3.1 @@ -64,7 +65,7 @@ require ( github.com/uudashr/gocognit v1.0.1 github.com/valyala/quicktemplate v1.6.3 golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 // indirect - golang.org/x/tools v0.0.0-20201013201025-64a9e34f3752 + golang.org/x/tools v0.0.0-20201121010211-780cb80bd7fb gopkg.in/yaml.v2 v2.3.0 honnef.co/go/tools v0.0.1-2020.1.6 mvdan.cc/gofumpt v0.0.0-20200802201014-ab5a8192947d diff --git a/go.sum b/go.sum index 0bf2a164e277..9dfab919931f 100644 --- a/go.sum +++ b/go.sum @@ -31,6 +31,8 @@ github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu 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-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/ashanbrown/makezero v0.0.0-20190918151423-218a01bf77ad h1:wjTV3qrCrFg9Vlqc0hxAmf/UpTKzzcKEhIYHfk7ufBQ= +github.com/ashanbrown/makezero v0.0.0-20190918151423-218a01bf77ad/go.mod h1:oG9Dnez7/ESBqc4EdrdNlryeo7d0KcW1ftXHm7nU/UU= 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/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= @@ -462,6 +464,8 @@ golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= 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= @@ -472,6 +476,7 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ 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-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/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= @@ -497,12 +502,15 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 h1:bNEHhJCnrwMKNMmOx3yAynp5vs5/gRy+XWFtZFu7NBM= golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 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 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= 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/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -527,6 +535,7 @@ golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/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-20190916130336-e45ffcd953cc/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-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -549,8 +558,8 @@ golang.org/x/tools v0.0.0-20201001104356-43ebab892c4c/go.mod h1:z6u4i615ZeAfBE4X golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20201007032633-0806396f153e/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20201011145850-ed2f50202694/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20201013201025-64a9e34f3752 h1:2ntEwh02rqo2jSsrYmp4yKHHjh0CbXP3ZtSUetSB+q8= -golang.org/x/tools v0.0.0-20201013201025-64a9e34f3752/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/tools v0.0.0-20201121010211-780cb80bd7fb h1:z5+u0pkAUPUWd3taoTialQ2JAMo4Wo1Z3L25U4ZV9r0= +golang.org/x/tools v0.0.0-20201121010211-780cb80bd7fb/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= 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= diff --git a/pkg/config/config.go b/pkg/config/config.go index 4ec378f7a687..6df0df4de83a 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -266,6 +266,7 @@ type LintersSettings struct { Exhaustive ExhaustiveSettings Gofumpt GofumptSettings ErrorLint ErrorLintSettings + Makezero MakezeroSettings Custom map[string]CustomLinterSettings } @@ -386,6 +387,10 @@ type ErrorLintSettings struct { Errorf bool `mapstructure:"errorf"` } +type MakezeroSettings struct { + Always bool +} + var defaultLintersSettings = LintersSettings{ Lll: LllSettings{ LineLength: 120, diff --git a/pkg/golinters/makezero.go b/pkg/golinters/makezero.go new file mode 100644 index 000000000000..54554795f357 --- /dev/null +++ b/pkg/golinters/makezero.go @@ -0,0 +1,60 @@ +package golinters + +import ( + "github.com/pkg/errors" + "sync" + + "github.com/ashanbrown/makezero/makezero" + "golang.org/x/tools/go/analysis" + + "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" + "github.com/golangci/golangci-lint/pkg/lint/linter" + "github.com/golangci/golangci-lint/pkg/result" +) + +const makezeroName = "makezero" + +func NewMakezero() *goanalysis.Linter { + var mu sync.Mutex + var resIssues []goanalysis.Issue + + analyzer := &analysis.Analyzer{ + Name: makezeroName, + Doc: goanalysis.TheOnlyanalyzerDoc, + } + return goanalysis.NewLinter( + makezeroName, + "Finds slice declarations with non-zero initial length", + []*analysis.Analyzer{analyzer}, + nil, + ).WithContextSetter(func(lintCtx *linter.Context) { + s := &lintCtx.Settings().Makezero + + analyzer.Run = func(pass *analysis.Pass) (interface{}, error) { + var res []goanalysis.Issue + linter := makezero.NewLinter(s.Always) + for _, file := range pass.Files { + hints, err := linter.Run(pass.Fset, pass.TypesInfo, file) + if err != nil { + return nil, errors.Wrapf(err, "makezero linter failed on file %q", file) + } + for _, hint := range hints { + res = append(res, goanalysis.NewIssue(&result.Issue{ + Pos: hint.Position(), + Text: hint.Details(), + FromLinter: makezeroName, + }, pass)) + } + } + if len(res) == 0 { + return nil, nil + } + mu.Lock() + resIssues = append(resIssues, res...) + mu.Unlock() + return nil, nil + } + }).WithIssuesReporter(func(*linter.Context) []goanalysis.Issue { + return resIssues + }).WithLoadMode(goanalysis.LoadModeSyntax | goanalysis.LoadModeTypesInfo) +} diff --git a/pkg/lint/lintersdb/manager.go b/pkg/lint/lintersdb/manager.go index 52a230bd8053..d0741f48d1b4 100644 --- a/pkg/lint/lintersdb/manager.go +++ b/pkg/lint/lintersdb/manager.go @@ -324,6 +324,9 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config { WithPresets(linter.PresetBugs). WithLoadForGoAnalysis(). WithURL("https://github.com/polyfloyd/go-errorlint"), + linter.NewConfig(golinters.NewMakezero()). + WithPresets(linter.PresetStyle, linter.PresetBugs). + WithURL("https://github.com/ashanbrown/makezero"), // nolintlint must be last because it looks at the results of all the previous linters for unused nolint directives linter.NewConfig(golinters.NewNoLintLint()). diff --git a/test/testdata/makezero.go b/test/testdata/makezero.go new file mode 100644 index 000000000000..1d7df932baba --- /dev/null +++ b/test/testdata/makezero.go @@ -0,0 +1,7 @@ +//args: -Emakezero +package testdata + +func Makezero() []int { + x := make([]int, 5) + return append(x, 1) +} diff --git a/test/testdata/makezero_always.go b/test/testdata/makezero_always.go new file mode 100644 index 000000000000..a561861766f5 --- /dev/null +++ b/test/testdata/makezero_always.go @@ -0,0 +1,7 @@ +//args: -Emakezero +//config: linters-settings.makezero.always=true +package testdata + +func MakezeroAlways() []int { + return make([]int, 5) +} From c34afcca026083c807935db03e1a736a3bfdc491 Mon Sep 17 00:00:00 2001 From: "Andrew S. Brown" Date: Sat, 21 Nov 2020 18:27:10 -0800 Subject: [PATCH 2/8] Add more tests --- test/testdata/makezero.go | 7 ++++++- test/testdata/makezero_always.go | 9 ++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/test/testdata/makezero.go b/test/testdata/makezero.go index 1d7df932baba..ca32eda3ec3e 100644 --- a/test/testdata/makezero.go +++ b/test/testdata/makezero.go @@ -3,5 +3,10 @@ package testdata func Makezero() []int { x := make([]int, 5) - return append(x, 1) + return append(x, 1) // ERROR "append to slice `x` with non-zero initialized length" +} + +func MakezeroNolint() []int { + x := make([]int, 5) + return append(x, 1) //nolint:makezero // ok that we're appending to an uninitialized slice } diff --git a/test/testdata/makezero_always.go b/test/testdata/makezero_always.go index a561861766f5..8f3e550f7e45 100644 --- a/test/testdata/makezero_always.go +++ b/test/testdata/makezero_always.go @@ -3,5 +3,12 @@ package testdata func MakezeroAlways() []int { - return make([]int, 5) + x := make([]int, 5) + return x // ERROR "slice `x` does not have non-zero initial length" +} + + +func MakezeroAlwaysNolint() []int { + x := make([]int, 5) + return x //nolint:makezero // ok that this is not initialized } From b960b725306456d583d821b9e61354d1689841d8 Mon Sep 17 00:00:00 2001 From: "Andrew S. Brown" Date: Sat, 21 Nov 2020 18:30:40 -0800 Subject: [PATCH 3/8] Cannot run makezero on golangci lint itself until it is merged --- .golangci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.golangci.yml b/.golangci.yml index e44018f2fc93..012255c281b4 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -90,7 +90,6 @@ linters: - ineffassign - interfacer - lll - - makezero - misspell - nakedret - noctx From 438b939987469ad2fb20cd9e1e3779a768a74e37 Mon Sep 17 00:00:00 2001 From: "Andrew S. Brown" Date: Sat, 21 Nov 2020 18:43:11 -0800 Subject: [PATCH 4/8] Fix linters --- pkg/config/config.go | 2 +- pkg/golinters/makezero.go | 4 ++-- test/testdata/makezero_always.go | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/config/config.go b/pkg/config/config.go index 6df0df4de83a..30190065fcd6 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -388,7 +388,7 @@ type ErrorLintSettings struct { } type MakezeroSettings struct { - Always bool + Always bool } var defaultLintersSettings = LintersSettings{ diff --git a/pkg/golinters/makezero.go b/pkg/golinters/makezero.go index 54554795f357..7b7ec09b9ec0 100644 --- a/pkg/golinters/makezero.go +++ b/pkg/golinters/makezero.go @@ -1,10 +1,10 @@ package golinters import ( - "github.com/pkg/errors" "sync" "github.com/ashanbrown/makezero/makezero" + "github.com/pkg/errors" "golang.org/x/tools/go/analysis" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" @@ -36,7 +36,7 @@ func NewMakezero() *goanalysis.Linter { for _, file := range pass.Files { hints, err := linter.Run(pass.Fset, pass.TypesInfo, file) if err != nil { - return nil, errors.Wrapf(err, "makezero linter failed on file %q", file) + return nil, errors.Wrapf(err, "makezero linter failed on file %q", file.Name.String()) } for _, hint := range hints { res = append(res, goanalysis.NewIssue(&result.Issue{ diff --git a/test/testdata/makezero_always.go b/test/testdata/makezero_always.go index 8f3e550f7e45..7472cd0426f2 100644 --- a/test/testdata/makezero_always.go +++ b/test/testdata/makezero_always.go @@ -3,12 +3,12 @@ package testdata func MakezeroAlways() []int { - x := make([]int, 5) - return x // ERROR "slice `x` does not have non-zero initial length" + x := make([]int, 5) // ERROR "slice `x` does not have non-zero initial length" + return x } func MakezeroAlwaysNolint() []int { - x := make([]int, 5) - return x //nolint:makezero // ok that this is not initialized + x := make([]int, 5) //nolint:makezero // ok that this is not initialized + return x } From e89d640d145542da1214d4dabb8e32a291a05769 Mon Sep 17 00:00:00 2001 From: "Andrew S. Brown" Date: Sun, 22 Nov 2020 06:13:42 -0800 Subject: [PATCH 5/8] Remove extra whitespace lint --- test/testdata/makezero_always.go | 1 - 1 file changed, 1 deletion(-) diff --git a/test/testdata/makezero_always.go b/test/testdata/makezero_always.go index 7472cd0426f2..e6bdd87d743c 100644 --- a/test/testdata/makezero_always.go +++ b/test/testdata/makezero_always.go @@ -7,7 +7,6 @@ func MakezeroAlways() []int { return x } - func MakezeroAlwaysNolint() []int { x := make([]int, 5) //nolint:makezero // ok that this is not initialized return x From e587f07b64214bc601034041a51638e31aa24066 Mon Sep 17 00:00:00 2001 From: "Andrew S. Brown" Date: Sun, 22 Nov 2020 16:26:27 -0800 Subject: [PATCH 6/8] Bump makezero version to pick up panic fix --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 6cff91d4c5f1..3dcd96ce7814 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( 4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a github.com/Djarvur/go-err113 v0.0.0-20200511133814-5174e21577d5 github.com/OpenPeeDeeP/depguard v1.0.1 - github.com/ashanbrown/makezero v0.0.0-20190918151423-218a01bf77ad + github.com/ashanbrown/makezero v0.0.0-20201122223944-6aa12ecc2e71 github.com/bombsimon/wsl/v3 v3.1.0 github.com/daixiang0/gci v0.2.4 github.com/denis-tingajkin/go-header v0.3.1 diff --git a/go.sum b/go.sum index 9dfab919931f..542b4532439e 100644 --- a/go.sum +++ b/go.sum @@ -33,6 +33,8 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/ashanbrown/makezero v0.0.0-20190918151423-218a01bf77ad h1:wjTV3qrCrFg9Vlqc0hxAmf/UpTKzzcKEhIYHfk7ufBQ= github.com/ashanbrown/makezero v0.0.0-20190918151423-218a01bf77ad/go.mod h1:oG9Dnez7/ESBqc4EdrdNlryeo7d0KcW1ftXHm7nU/UU= +github.com/ashanbrown/makezero v0.0.0-20201122223944-6aa12ecc2e71 h1:I5vCM3EzMpsjllkzez2fjY/FXJNbtulB33LudiHuMNo= +github.com/ashanbrown/makezero v0.0.0-20201122223944-6aa12ecc2e71/go.mod h1:oG9Dnez7/ESBqc4EdrdNlryeo7d0KcW1ftXHm7nU/UU= 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/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= From 2626eea863ff67fc54ef29f4075cafb87597f98b Mon Sep 17 00:00:00 2001 From: "Andrew S. Brown" Date: Sun, 22 Nov 2020 16:41:05 -0800 Subject: [PATCH 7/8] Fix go.mod --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index c50ed844e7b4..50e232b35a5d 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( 4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a github.com/Djarvur/go-err113 v0.0.0-20200511133814-5174e21577d5 github.com/OpenPeeDeeP/depguard v1.0.1 - github.com/ashanbrown/makezero v0.0.0-20201122223944-6aa12ecc2e71 // indirect + github.com/ashanbrown/makezero v0.0.0-20201122223944-6aa12ecc2e71 github.com/bombsimon/wsl/v3 v3.1.0 github.com/daixiang0/gci v0.2.4 github.com/denis-tingajkin/go-header v0.3.1 From 78cc60e4424ba7040c0308d22d29f15d3b6415df Mon Sep 17 00:00:00 2001 From: "Andrew S. Brown" Date: Sat, 5 Dec 2020 07:26:21 -0800 Subject: [PATCH 8/8] Bump makezero --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 50e232b35a5d..f67a8062dc1b 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( 4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a github.com/Djarvur/go-err113 v0.0.0-20200511133814-5174e21577d5 github.com/OpenPeeDeeP/depguard v1.0.1 - github.com/ashanbrown/makezero v0.0.0-20201122223944-6aa12ecc2e71 + github.com/ashanbrown/makezero v0.0.0-20201205152432-7b7cdbb3025a github.com/bombsimon/wsl/v3 v3.1.0 github.com/daixiang0/gci v0.2.4 github.com/denis-tingajkin/go-header v0.3.1 diff --git a/go.sum b/go.sum index 40420fe7878c..d3b9652b33c3 100644 --- a/go.sum +++ b/go.sum @@ -33,6 +33,8 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/ashanbrown/makezero v0.0.0-20201122223944-6aa12ecc2e71 h1:I5vCM3EzMpsjllkzez2fjY/FXJNbtulB33LudiHuMNo= github.com/ashanbrown/makezero v0.0.0-20201122223944-6aa12ecc2e71/go.mod h1:oG9Dnez7/ESBqc4EdrdNlryeo7d0KcW1ftXHm7nU/UU= +github.com/ashanbrown/makezero v0.0.0-20201205152432-7b7cdbb3025a h1:/U9tbJzDRof4fOR51vwzWdIBsIH6R2yU0KG1MBRM2Js= +github.com/ashanbrown/makezero v0.0.0-20201205152432-7b7cdbb3025a/go.mod h1:oG9Dnez7/ESBqc4EdrdNlryeo7d0KcW1ftXHm7nU/UU= 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/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=