From c2f847299caaa9d907da30207e44e64026a0c7a8 Mon Sep 17 00:00:00 2001 From: Mark Rushakoff Date: Wed, 4 Sep 2019 15:41:48 -0700 Subject: [PATCH] ci: use latest staticcheck We were still referring to megacheck in tools.go; this confused dependent projects also using staticcheck. --- chronograf/server/server.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- tools.go | 2 +- tsdb/series_id.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/chronograf/server/server.go b/chronograf/server/server.go index 8395c849d3..f647f30e7b 100644 --- a/chronograf/server/server.go +++ b/chronograf/server/server.go @@ -98,7 +98,7 @@ type Server struct { TelegrafSystemInterval time.Duration `long:"telegraf-system-interval" default:"1m" description:"Duration used in the GROUP BY time interval for the hosts list" env:"TELEGRAF_SYSTEM_INTERVAL"` ReportingDisabled bool `short:"r" long:"reporting-disabled" description:"Disable reporting of usage stats (os,arch,version,cluster_id,uptime) once every 24hr" env:"REPORTING_DISABLED"` - LogLevel string `short:"l" long:"log-level" value-name:"choice" choice:"debug" choice:"info" choice:"error" default:"info" description:"Set the logging level" env:"LOG_LEVEL"` + LogLevel string `short:"l" long:"log-level" value-name:"choice" choice:"debug" choice:"info" choice:"error" default:"info" description:"Set the logging level" env:"LOG_LEVEL"` //lint:ignore SA5008 duplicate tag choice is expected with go-flags. Basepath string `short:"p" long:"basepath" description:"A URL path prefix under which all chronograf routes will be mounted. (Note: PREFIX_ROUTES has been deprecated. Now, if basepath is set, all routes will be prefixed with it.)" env:"BASE_PATH"` ShowVersion bool `short:"v" long:"version" description:"Show Chronograf version info"` BuildInfo chronograf.BuildInfo diff --git a/go.mod b/go.mod index 4520768b40..eb208434d6 100644 --- a/go.mod +++ b/go.mod @@ -101,7 +101,7 @@ require ( gopkg.in/ini.v1 v1.42.0 // indirect gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5 gopkg.in/vmihailenco/msgpack.v2 v2.9.1 // indirect - honnef.co/go/tools v0.0.0-20190812140558-8bd8df698242 // indirect + honnef.co/go/tools v0.0.1-2019.2.3.0.20190904154718-afd67930eec2 labix.org/v2/mgo v0.0.0-20140701140051-000000000287 // indirect launchpad.net/gocheck v0.0.0-20140225173054-000000000087 // indirect ) diff --git a/go.sum b/go.sum index ad116d5052..fd8c1df0f8 100644 --- a/go.sum +++ b/go.sum @@ -544,8 +544,8 @@ honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20181108184350-ae8f1f9103cc h1:VdiEcF0DrrUbDdrLBceS0h7LE60ebD5yRYLLXi0ezIs= honnef.co/go/tools v0.0.0-20181108184350-ae8f1f9103cc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190812140558-8bd8df698242 h1:o4vydRJR8cV2rSlUkfP0aRbr0sOMX+iAdUTFbQV4goo= -honnef.co/go/tools v0.0.0-20190812140558-8bd8df698242/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2019.2.3.0.20190904154718-afd67930eec2 h1:TeRFic5UJx5LXC3n8mOt92bqyM5J+so5EuErnxK4PAk= +honnef.co/go/tools v0.0.1-2019.2.3.0.20190904154718-afd67930eec2/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= labix.org/v2/mgo v0.0.0-20140701140051-000000000287 h1:L0cnkNl4TfAXzvdrqsYEmxOHOCv2p5I3taaReO8BWFs= labix.org/v2/mgo v0.0.0-20140701140051-000000000287/go.mod h1:Lg7AYkt1uXJoR9oeSZ3W/8IXLdvOfIITgZnommstyz4= launchpad.net/gocheck v0.0.0-20140225173054-000000000087 h1:Izowp2XBH6Ya6rv+hqbceQyw/gSGoXfH/UPoTGduL54= diff --git a/tools.go b/tools.go index 828b0b978b..de066470b5 100644 --- a/tools.go +++ b/tools.go @@ -11,7 +11,7 @@ import ( _ "github.com/kevinburke/go-bindata/go-bindata" _ "github.com/mna/pigeon" _ "golang.org/x/tools/cmd/stringer" - _ "honnef.co/go/tools/cmd/megacheck" + _ "honnef.co/go/tools/cmd/staticcheck" ) // This package is a workaround for adding additional paths to the go.mod file diff --git a/tsdb/series_id.go b/tsdb/series_id.go index 70b1333213..90632e9752 100644 --- a/tsdb/series_id.go +++ b/tsdb/series_id.go @@ -12,7 +12,7 @@ const ( seriesIDValueMask = 0xFFFFFFFF // series ids numerically are 32 bits seriesIDTypeShift = 32 // we put the type right after the value info seriesIDTypeMask = 0xFF << seriesIDTypeShift // a mask for the type byte - seriesIDSize = 8 //lint:ignore U1000 This const is used in a discarded compile-time type assertion. + seriesIDSize = 8 ) // SeriesID is the type of a series id. It is logically a uint64, but encoded as a struct so