Fix #164: update GAS to the latest gosec

golangci · Sep 1, 2018 · b1f5c88 · b1f5c88
1 parent a26f24b
commit b1f5c88
Show file tree

Hide file tree

Showing 60 changed files with 2,492 additions and 454 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -29,11 +29,6 @@
   branch = "fix-crash-on-nil-constant"
   source = "github.com/golangci/unparam"
 
-[[constraint]]
-  name = "github.com/GoASTScanner/gas"
-  branch = "master"
-  source = "github.com/golangci/gas"
-
 [prune]
   go-tests = true
   unused-packages = true

diff --git a/pkg/golinters/gas.go b/pkg/golinters/gas.go
@@ -8,10 +8,10 @@ import (
 	"log"
 	"strconv"
 
-	"github.com/GoASTScanner/gas"
-	"github.com/GoASTScanner/gas/rules"
 	"github.com/golangci/golangci-lint/pkg/lint/linter"
 	"github.com/golangci/golangci-lint/pkg/result"
+	"github.com/golangci/gosec"
+	"github.com/golangci/gosec/rules"
 )
 
 type Gosec struct{}
@@ -25,10 +25,10 @@ func (Gosec) Desc() string {
 }
 
 func (lint Gosec) Run(ctx context.Context, lintCtx *linter.Context) ([]result.Issue, error) {
-	gasConfig := gas.NewConfig()
+	gasConfig := gosec.NewConfig()
 	enabledRules := rules.Generate()
 	logger := log.New(ioutil.Discard, "", 0)
-	analyzer := gas.NewAnalyzer(gasConfig, logger)
+	analyzer := gosec.NewAnalyzer(gasConfig, logger)
 	analyzer.LoadRules(enabledRules.Builders())
 
 	analyzer.ProcessProgram(lintCtx.Program)

diff --git a/vendor/github.com/GoASTScanner/gas/Dockerfile b/vendor/github.com/GoASTScanner/gas/Dockerfile
diff --git a/vendor/github.com/GoASTScanner/gas/Makefile b/vendor/github.com/GoASTScanner/gas/Makefile
diff --git a/vendor/github.com/GoASTScanner/gas/rules/readfile.go b/vendor/github.com/GoASTScanner/gas/rules/readfile.go
diff --git a/vendor/github.com/golang/mock/AUTHORS b/vendor/github.com/golang/mock/AUTHORS
diff --git a/vendor/github.com/golang/mock/CONTRIBUTORS b/vendor/github.com/golang/mock/CONTRIBUTORS