fix golangci-lint warnings

Author: flier

.golangci.yml

@@ -10,11 +10,12 @@ run:
   issues-exit-code: 1
 
   # include test files or not, default is true
-  tests: true
+  tests: false
 
   # list of build tags, all linters use it. Default is empty list.
   build-tags:
     - !privileged_tests
+    - chimera
 
   # default is true. Enables skipping of directories:
   #   vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
@@ -68,27 +69,24 @@ linters-settings:
 linters:
   enable-all: true
   disable:
-    - deadcode
+    - copyloopvar
+    - depguard
     - dupword
     - exhaustive
-    - exhaustivestruct
     - exhaustruct
+    - exportloopref
     - gci
     - gochecknoglobals
     - gochecknoinits
     - gocritic
     - godox
-    - golint
-    - ifshort
-    - interfacer
+    - gofumpt
+    - gosec
+    - intrange
     - ireturn
-    - maligned
     - nlreturn
     - nonamedreturns
-    - nosnakecase
     - paralleltest
-    - scopelint
-    - structcheck
-    - varcheck
+    - revive
     - varnamelen
     - wsl

chimera/api.go

@@ -33,7 +33,7 @@ func Match(pattern string, data []byte) (bool, error) {
 	h := &ch.MatchRecorder{}
 
 	if err = db.Scan(data, s, h, nil); err != nil {
-		return false, err // nolint: wrapcheck
+		return false, err //nolint: wrapcheck
 	}
 
 	return h.Matched(), h.Err

chimera/block.go

@@ -95,7 +95,7 @@ func (bs *blockScanner) Scan(data []byte, s *Scratch, h Handler, ctx interface{}
 		}()
 	}
 
-	return ch.Scan(bs.db, data, 0, s.s, h.OnMatch, h.OnError, ctx) // nolint: wrapcheck
+	return ch.Scan(bs.db, data, 0, s.s, h.OnMatch, h.OnError, ctx) //nolint: wrapcheck
 }
 
 type blockMatcher struct {

chimera/common.go

@@ -38,8 +38,7 @@ const (
 )
 
 // DbInfo identify the version and platform information for the supplied database.
-// nolint: stylecheck
-type DbInfo string
+type DbInfo string //nolint: stylecheck
 
 // parse `Chimera Version: 5.4.0 Features: AVX2 Mode: BLOCK`.
 var regexDBInfo = regexp.MustCompile(`^Chimera Version: (\d+\.\d+\.\d+) Features: ([\w\s]+)? Mode: (\w+)$`)
@@ -77,7 +76,7 @@ func (i DbInfo) Mode() (hyperscan.ModeFlag, error) {
 		return 0, err
 	}
 
-	return hyperscan.ParseModeFlag(mode) // nolint: wrapcheck
+	return hyperscan.ParseModeFlag(mode) //nolint: wrapcheck
 }
 
 // Database is an immutable database that can be used by the Chimera scanning API.
@@ -104,7 +103,7 @@ func newDatabase(db ch.Database) *baseDatabase { return &baseDatabase{db} }
 
 func (d *baseDatabase) c() ch.Database { return d.db }
 
-func (d *baseDatabase) Size() (int, error) { return ch.DatabaseSize(d.db) } // nolint: wrapcheck
+func (d *baseDatabase) Size() (int, error) { return ch.DatabaseSize(d.db) } //nolint: wrapcheck
 
 func (d *baseDatabase) Info() (DbInfo, error) {
 	i, err := ch.DatabaseInfo(d.db)
@@ -115,7 +114,7 @@ func (d *baseDatabase) Info() (DbInfo, error) {
 	return DbInfo(i), nil
 }
 
-func (d *baseDatabase) Close() error { return ch.FreeDatabase(d.db) } // nolint: wrapcheck
+func (d *baseDatabase) Close() error { return ch.FreeDatabase(d.db) } //nolint: wrapcheck
 
 // Version identify this release version.
 //

chimera/compile.go

@@ -144,20 +144,22 @@ func (b *DatabaseBuilder) Build() (Database, error) {
 
 	db, err := ch.CompileExtMulti(b.Patterns, b.Mode, platform, b.MatchLimit, b.MatchLimitRecursion)
 	if err != nil {
-		return nil, err // nolint: wrapcheck
+		return nil, err //nolint: wrapcheck
 	}
 
 	return newBlockDatabase(db), nil
 }
 
 // NewBlockDatabase compile expressions into a pattern database.
-func NewBlockDatabase(patterns ...*Pattern) (BlockDatabase, error) {
-	db, err := Patterns(patterns).Build(Groups)
+func NewBlockDatabase(patterns ...*Pattern) (bdb BlockDatabase, err error) {
+	var db Database
+	db, err = Patterns(patterns).Build(Groups)
 	if err != nil {
 		return nil, err
 	}
 
-	return db.(BlockDatabase), err
+	bdb, _ = db.(*blockDatabase)
+	return
 }
 
 // NewManagedBlockDatabase is a wrapper for NewBlockDatabase that
@@ -181,7 +183,7 @@ func NewManagedBlockDatabase(patterns ...*Pattern) (BlockDatabase, error) {
 func Compile(expr string) (Database, error) {
 	db, err := ch.Compile(expr, 0, ch.Groups, nil)
 	if err != nil {
-		return nil, err // nolint: wrapcheck
+		return nil, err //nolint: wrapcheck
 	}
 
 	return newBlockDatabase(db), nil

chimera/runtime.go

@@ -17,7 +17,7 @@ const (
 type Capture = ch.Capture
 
 // Type used to differentiate the errors raised with the `ErrorEventHandler` callback.
-type ErrorEvent = ch.ErrorEvent
+type ErrorEvent = ch.ErrorEvent //nolint: errname
 
 const (
 	// PCRE hits its match limit and reports PCRE_ERROR_MATCHLIMIT.

chimera/runtime_test.go

@@ -20,7 +20,7 @@ var blockDatabaseConstructors = map[string]BlockDatabaseConstructor{
 func TestBlockScanner(t *testing.T) {
 	for dbType, dbConstructor := range blockDatabaseConstructors {
 		Convey("Given a "+dbType+" block database", t, func() {
-			bdb, err := dbConstructor(chimera.NewPattern(`\d+`, 0)) // nolint: scopelint
+			bdb, err := dbConstructor(chimera.NewPattern(`\d+`, 0)) //nolint: scopelint
 
 			So(err, ShouldBeNil)
 			So(bdb, ShouldNotBeNil)
@@ -48,7 +48,7 @@ func TestBlockScanner(t *testing.T) {
 func TestBlockMatcher(t *testing.T) {
 	for dbType, dbConstructor := range blockDatabaseConstructors {
 		Convey("Given a "+dbType+" block database", t, func() {
-			bdb, err := dbConstructor(chimera.NewPattern(`\d+`, 0)) // nolint: scopelint
+			bdb, err := dbConstructor(chimera.NewPattern(`\d+`, 0)) //nolint: scopelint
 
 			So(err, ShouldBeNil)
 			So(bdb, ShouldNotBeNil)

chimera/scratch.go

@@ -17,7 +17,7 @@ type Scratch struct {
 func NewScratch(db Database) (*Scratch, error) {
 	s, err := ch.AllocScratch(db.(database).c())
 	if err != nil {
-		return nil, err // nolint: wrapcheck
+		return nil, err //nolint: wrapcheck
 	}
 
 	return &Scratch{s}, nil
@@ -39,22 +39,24 @@ func NewManagedScratch(db Database) (*Scratch, error) {
 }
 
 // Size provides the size of the given scratch space.
-func (s *Scratch) Size() (int, error) { return ch.ScratchSize(s.s) } // nolint: wrapcheck
+func (s *Scratch) Size() (int, error) { return ch.ScratchSize(s.s) } //nolint: wrapcheck
 
 // Realloc reallocate the scratch for another database.
 func (s *Scratch) Realloc(db Database) error {
-	return ch.ReallocScratch(db.(database).c(), &s.s) // nolint: wrapcheck
+	r, _ := db.(database)
+
+	return ch.ReallocScratch(r.c(), &s.s) //nolint: wrapcheck
 }
 
 // Clone allocate a scratch space that is a clone of an existing scratch space.
 func (s *Scratch) Clone() (*Scratch, error) {
 	cloned, err := ch.CloneScratch(s.s)
 	if err != nil {
-		return nil, err // nolint: wrapcheck
+		return nil, err //nolint: wrapcheck
 	}
 
 	return &Scratch{cloned}, nil
 }
 
 // Free a scratch block previously allocated.
-func (s *Scratch) Free() error { return ch.FreeScratch(s.s) } // nolint: wrapcheck
+func (s *Scratch) Free() error { return ch.FreeScratch(s.s) } //nolint: wrapcheck

hyperscan/common.go

@@ -57,7 +57,7 @@ type Database interface {
 	Marshal() ([]byte, error)
 
 	// Reconstruct a pattern database from a stream of bytes at a given memory location.
-	Unmarshal([]byte) error
+	Unmarshal(b []byte) error
 }
 
 // DbInfo identify the version and platform information for the supplied database.

hyperscan/pattern.go

@@ -147,7 +147,7 @@ func ParseExprExt(s string) (ext *ExprExt, err error) {
 		var n int
 
 		if n, err = strconv.Atoi(value); err != nil {
-			return
+			return ext, fmt.Errorf("parse value, %w", err)
 		}
 
 		switch key {