correct gci linter (#946)

mmorel-35 · web-flow · commit d6aeaad93177 · 2023-03-30T09:31:24.000+02:00
Signed-off-by: Matthieu MOREL &lt;matthieu.morel35@gmail.com&gt;
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,33 +1,40 @@
 linters:
   enable:
-  - asciicheck
-  - bodyclose
-  - depguard
-  - dogsled
-  - durationcheck
-  - errcheck
-  - errorlint
-  - exportloopref
-  - gci
-  - gofmt
-  - gofumpt
-  - goimports
-  - gosec
-  - gosimple
-  - govet
-  - importas
-  - ineffassign
-  - megacheck
-  - misspell
-  - nakedret
-  - nolintlint
-  - revive
-  - staticcheck
-  - typecheck
-  - unconvert
-  - unparam
-  - unused
-  - wastedassign
+    - asciicheck
+    - bodyclose
+    - depguard
+    - dogsled
+    - durationcheck
+    - errcheck
+    - errorlint
+    - exportloopref
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+    - gosec
+    - gosimple
+    - govet
+    - importas
+    - ineffassign
+    - megacheck
+    - misspell
+    - nakedret
+    - nolintlint
+    - revive
+    - staticcheck
+    - typecheck
+    - unconvert
+    - unparam
+    - unused
+    - wastedassign
+
+linters-settings:
+  gci:
+    sections:
+      - standard
+      - default
+      - prefix(github.com/securego)
 
 run:
   timeout: 5m
diff --git a/analyzers/ssrf.go b/analyzers/ssrf.go
@@ -15,10 +15,11 @@
 package analyzers
 
 import (
-	"github.com/securego/gosec/v2/issue"
 	"golang.org/x/tools/go/analysis"
 	"golang.org/x/tools/go/analysis/passes/buildssa"
 	"golang.org/x/tools/go/ssa"
+
+	"github.com/securego/gosec/v2/issue"
 )
 
 func newSSRFAnalyzer(id string, description string) *analysis.Analyzer {
diff --git a/analyzers/util.go b/analyzers/util.go
@@ -21,9 +21,10 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/securego/gosec/v2/issue"
 	"golang.org/x/tools/go/analysis"
 	"golang.org/x/tools/go/analysis/passes/buildssa"
+
+	"github.com/securego/gosec/v2/issue"
 )
 
 // SSAAnalyzerResult contains various information returned by the
diff --git a/call_list_test.go b/call_list_test.go
@@ -5,6 +5,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"github.com/securego/gosec/v2"
 	"github.com/securego/gosec/v2/testutils"
 )
diff --git a/cmd/gosec/sort_issues_test.go b/cmd/gosec/sort_issues_test.go
@@ -5,6 +5,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"github.com/securego/gosec/v2/issue"
 )
 
diff --git a/config_test.go b/config_test.go
@@ -6,6 +6,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"github.com/securego/gosec/v2"
 )
 
diff --git a/cwe/data_test.go b/cwe/data_test.go
@@ -3,6 +3,7 @@ package cwe_test
 import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"github.com/securego/gosec/v2/cwe"
 )
 
diff --git a/cwe/types_test.go b/cwe/types_test.go
@@ -3,6 +3,7 @@ package cwe_test
 import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"github.com/securego/gosec/v2/cwe"
 )
 
diff --git a/flag_test.go b/flag_test.go
@@ -6,6 +6,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"github.com/securego/gosec/v2/cmd/vflag"
 )
 
diff --git a/helpers_test.go b/helpers_test.go
@@ -8,6 +8,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"github.com/securego/gosec/v2"
 	"github.com/securego/gosec/v2/testutils"
 )
diff --git a/import_tracker_test.go b/import_tracker_test.go
@@ -3,6 +3,7 @@ package gosec_test
 import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"github.com/securego/gosec/v2"
 	"github.com/securego/gosec/v2/testutils"
 )
diff --git a/issue/issue_test.go b/issue/issue_test.go
@@ -5,6 +5,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"github.com/securego/gosec/v2"
 	"github.com/securego/gosec/v2/issue"
 	"github.com/securego/gosec/v2/rules"
diff --git a/report/formatter_test.go b/report/formatter_test.go
@@ -8,12 +8,13 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"gopkg.in/yaml.v3"
+
 	"github.com/securego/gosec/v2"
 	"github.com/securego/gosec/v2/cwe"
 	"github.com/securego/gosec/v2/issue"
 	"github.com/securego/gosec/v2/report/junit"
 	"github.com/securego/gosec/v2/report/sonar"
-	"gopkg.in/yaml.v3"
 )
 
 func createIssueWithFileWhat(file, what string) *issue.Issue {
diff --git a/report/sarif/formatter.go b/report/sarif/formatter.go
@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/google/uuid"
+
 	"github.com/securego/gosec/v2"
 	"github.com/securego/gosec/v2/cwe"
 	"github.com/securego/gosec/v2/issue"
diff --git a/report/sarif/sarif_test.go b/report/sarif/sarif_test.go
@@ -6,6 +6,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"github.com/securego/gosec/v2"
 	"github.com/securego/gosec/v2/issue"
 	"github.com/securego/gosec/v2/report/sarif"
diff --git a/report/sonar/sonar_test.go b/report/sonar/sonar_test.go
@@ -3,6 +3,7 @@ package sonar_test
 import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"github.com/securego/gosec/v2"
 	"github.com/securego/gosec/v2/issue"
 	"github.com/securego/gosec/v2/report/sonar"
diff --git a/report/text/writer.go b/report/text/writer.go
@@ -11,6 +11,7 @@ import (
 	"text/template"
 
 	"github.com/gookit/color"
+
 	"github.com/securego/gosec/v2"
 	"github.com/securego/gosec/v2/issue"
 )
diff --git a/report/yaml/writer.go b/report/yaml/writer.go
@@ -3,8 +3,9 @@ package yaml
 import (
 	"io"
 
-	"github.com/securego/gosec/v2"
 	"gopkg.in/yaml.v3"
+
+	"github.com/securego/gosec/v2"
 )
 
 // WriteReport write a report in yaml format to the output writer
diff --git a/resolve_test.go b/resolve_test.go
@@ -5,6 +5,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"github.com/securego/gosec/v2"
 	"github.com/securego/gosec/v2/testutils"
 )
diff --git a/rule_test.go b/rule_test.go
@@ -6,6 +6,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"github.com/securego/gosec/v2"
 	"github.com/securego/gosec/v2/issue"
 )
diff --git a/rules/hardcoded_credentials.go b/rules/hardcoded_credentials.go
@@ -21,6 +21,7 @@ import (
 	"strconv"
 
 	zxcvbn "github.com/nbutton23/zxcvbn-go"
+
 	"github.com/securego/gosec/v2"
 	"github.com/securego/gosec/v2/issue"
 )
diff --git a/rules/rules_test.go b/rules/rules_test.go
@@ -6,6 +6,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"github.com/securego/gosec/v2"
 	"github.com/securego/gosec/v2/rules"
 	"github.com/securego/gosec/v2/testutils"
diff --git a/testutils/pkg.go b/testutils/pkg.go
@@ -8,8 +8,9 @@ import (
 	"path"
 	"strings"
 
-	"github.com/securego/gosec/v2"
 	"golang.org/x/tools/go/packages"
+
+	"github.com/securego/gosec/v2"
 )
 
 type buildObj struct {

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import (`
`5`	`5`
`6`	`6`	`. "github.com/onsi/ginkgo/v2"`
`7`	`7`	`. "github.com/onsi/gomega"`
	`8`	`+`
`8`	`9`	`"github.com/securego/gosec/v2"`
`9`	`10`	`"github.com/securego/gosec/v2/testutils"`
`10`	`11`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`
`7`	`7`	`. "github.com/onsi/ginkgo/v2"`
`8`	`8`	`. "github.com/onsi/gomega"`
	`9`	`+`
`9`	`10`	`"github.com/securego/gosec/v2"`
`10`	`11`	`)`
`11`	`12`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package cwe_test`
`3`	`3`	`import (`
`4`	`4`	`. "github.com/onsi/ginkgo/v2"`
`5`	`5`	`. "github.com/onsi/gomega"`
	`6`	`+`
`6`	`7`	`"github.com/securego/gosec/v2/cwe"`
`7`	`8`	`)`
`8`	`9`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`. "github.com/onsi/ginkgo/v2"`
`10`	`10`	`. "github.com/onsi/gomega"`
	`11`	`+`
`11`	`12`	`"github.com/securego/gosec/v2"`
`12`	`13`	`"github.com/securego/gosec/v2/testutils"`
`13`	`14`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package gosec_test`
`3`	`3`	`import (`
`4`	`4`	`. "github.com/onsi/ginkgo/v2"`
`5`	`5`	`. "github.com/onsi/gomega"`
	`6`	`+`
`6`	`7`	`"github.com/securego/gosec/v2"`
`7`	`8`	`"github.com/securego/gosec/v2/testutils"`
`8`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import (`
`11`	`11`	`"text/template"`
`12`	`12`
`13`	`13`	`"github.com/gookit/color"`
	`14`	`+`
`14`	`15`	`"github.com/securego/gosec/v2"`
`15`	`16`	`"github.com/securego/gosec/v2/issue"`
`16`	`17`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@ package yaml`
`3`	`3`	`import (`
`4`	`4`	`"io"`
`5`	`5`
`6`		`- "github.com/securego/gosec/v2"`
`7`	`6`	`"gopkg.in/yaml.v3"`
	`7`	`+`
	`8`	`+ "github.com/securego/gosec/v2"`
`8`	`9`	`)`
`9`	`10`
`10`	`11`	`// WriteReport write a report in yaml format to the output writer`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ import (`
`21`	`21`	`"strconv"`
`22`	`22`
`23`	`23`	`zxcvbn "github.com/nbutton23/zxcvbn-go"`
	`24`	`+`
`24`	`25`	`"github.com/securego/gosec/v2"`
`25`	`26`	`"github.com/securego/gosec/v2/issue"`
`26`	`27`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,9 @@ import (`
`8`	`8`	`"path"`
`9`	`9`	`"strings"`
`10`	`10`
`11`		`- "github.com/securego/gosec/v2"`
`12`	`11`	`"golang.org/x/tools/go/packages"`
	`12`	`+`
	`13`	`+ "github.com/securego/gosec/v2"`
`13`	`14`	`)`
`14`	`15`
`15`	`16`	`type buildObj struct {`