Enable a bunch more linters

peterstace · Oct 10, 2023 · 73888f7 · 73888f7
1 parent 49ea768
commit 73888f7
Show file tree

Hide file tree

Showing 11 changed files with 117 additions and 112 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -11,10 +11,16 @@ issues:
         - thelper
 
 linters-settings:
-  thelper:
-    # TODO: consider turning this check back on.
-    tb:
-      name: false
+  depguard:
+    rules:
+      main:
+        allow:
+          - $gostd
+          - github.com/peterstace/simplefeatures
+          - github.com/lib/pq
+  gosec:
+    excludes:
+      - G404 # Insecure random number source (rand)
 
 linters:
 
@@ -35,39 +41,37 @@ linters:
     - structcheck
     - varcheck
 
+    - cyclop # Due to the nature of simplefeatures, cyclomatic complexity is going to be high.
+    - exhaustive # Switches on geometry type are often purposefully non-exhaustive.
+    - forbidigo # Overly prescriptive.
+    - funlen # Overly opinionated.
+    - gocyclo # Due to the nature of simplefeatures, cyclomatic complexity is going to be high.
+    - paralleltest # Most tests are CPU bound, so parallel tests don't make sense.
+
     # Disabled because they're currently not passing cleanly.
-    - cyclop
-    - depguard
     - dupl
-    - dupword
     - errcheck
     - errname
     - errorlint
-    - exhaustive
     - exhaustruct
-    - forbidigo
     - forcetypeassert
-    - funlen
     - gci
     - gochecknoglobals
     - gochecknoinits
     - gocognit
     - goconst
     - gocritic
-    - gocyclo
     - godot
     - godox
     - goerr113
     - gomnd
-    - gosec
     - lll
     - maintidx
     - nestif
     - nilerr
     - nlreturn
     - nolintlint
     - nonamedreturns
-    - paralleltest
     - prealloc
     - predeclared
     - revive
@@ -76,20 +80,22 @@ linters:
     - unconvert
     - unparam
     - varnamelen
-    - whitespace
     - wrapcheck
     - wsl
 
   enable:
 
+    - gosec
     - asasalint
     - asciicheck
     - bidichk
     - bodyclose
     - containedctx
     - contextcheck
     - decorder
+    - depguard
     - dogsled
+    - dupword
     - durationcheck
     - errchkjson
     - execinquery
@@ -134,4 +140,5 @@ linters:
     - unused
     - usestdlibvars
     - wastedassign
+    - whitespace
     - zerologlint
diff --git a/geom/alg_convex_hull.go b/geom/alg_convex_hull.go
@@ -7,9 +7,9 @@ import (
 
 func convexHull(g Geometry) Geometry {
 	if g.IsEmpty() {
-		// Any empty geometry could be returned here to to give correct
-		// behaviour. However, to replicate PostGIS behaviour, we always return
-		// the original geometry.
+		// Any empty geometry could be returned here to give correct behaviour.
+		// However, to replicate PostGIS behaviour, we always return the
+		// original geometry.
 		return g.Force2D()
 	}
 

diff --git a/geom/alg_exact_equals.go b/geom/alg_exact_equals.go
@@ -18,7 +18,7 @@ func newExactEqualsComparator(opts []ExactEqualsOption) exactEqualsComparator {
 }
 
 // ToleranceXY modifies the behaviour of the ExactEquals method by allowing two
-// geometry control points be be considered equal if their XY coordinates are
+// geometry control points be considered equal if their XY coordinates are
 // within the given euclidean distance of each other.
 func ToleranceXY(within float64) ExactEqualsOption {
 	return func(c exactEqualsComparator) exactEqualsComparator {

diff --git a/geom/alg_set_op_test.go b/geom/alg_set_op_test.go
@@ -484,6 +484,7 @@ func TestBinaryOp(t *testing.T) {
 			relate:  "FF1F0F1F2",
 		},
 		{
+			//nolint:dupword
 			/*
 			   +--A&B--+---A---+
 			   |       |       |

diff --git a/geom/twkb_parser.go b/geom/twkb_parser.go
@@ -354,7 +354,6 @@ func (p *twkbParser) parseBBoxHeader(twkb []byte) (bbox []Point, err error) {
 		minPt := NewPoint(Coordinates{XY: XY{minX, minY}, Z: minZ, M: minM, Type: p.ctype})
 		maxPt := NewPoint(Coordinates{XY: XY{maxX, maxY}, Z: maxZ, M: maxM, Type: p.ctype})
 		bbox = []Point{minPt, maxPt}
-
 	} else if p.hasZ {
 		minX := p.scalings[0] * float64(p.bbox[0])
 		minY := p.scalings[1] * float64(p.bbox[2])
@@ -367,7 +366,6 @@ func (p *twkbParser) parseBBoxHeader(twkb []byte) (bbox []Point, err error) {
 		minPt := NewPoint(Coordinates{XY: XY{minX, minY}, Z: minZ, Type: p.ctype})
 		maxPt := NewPoint(Coordinates{XY: XY{maxX, maxY}, Z: maxZ, Type: p.ctype})
 		bbox = []Point{minPt, maxPt}
-
 	} else if p.hasM {
 		minX := p.scalings[0] * float64(p.bbox[0])
 		minY := p.scalings[1] * float64(p.bbox[2])
@@ -380,7 +378,6 @@ func (p *twkbParser) parseBBoxHeader(twkb []byte) (bbox []Point, err error) {
 		minPt := NewPoint(Coordinates{XY: XY{minX, minY}, M: minM, Type: p.ctype})
 		maxPt := NewPoint(Coordinates{XY: XY{maxX, maxY}, M: maxM, Type: p.ctype})
 		bbox = []Point{minPt, maxPt}
-
 	} else {
 		minX := p.scalings[0] * float64(p.bbox[0])
 		minY := p.scalings[1] * float64(p.bbox[2])

diff --git a/geom/twkb_test.go b/geom/twkb_test.go
@@ -501,7 +501,7 @@ func TestWriteTWKBSQLFile(t *testing.T) {
 		sql += "\n\n"
 	}
 
-	err := os.WriteFile("../twkb_sql.txt", []byte(sql), 0o644)
+	err := os.WriteFile("../twkb_sql.txt", []byte(sql), 0o600)
 	expectNoErr(t, err)
 }
 

diff --git a/geom/type_envelope.go b/geom/type_envelope.go
@@ -14,7 +14,7 @@ import (
 // cases where the width or height (or both) are zero, or the envelope is
 // empty. Its bounds are validated so as to not be NaN or +/- Infinity.
 //
-// An envelope can be thought of as as being similar to a regular geometry, but
+// An envelope can be thought of as being similar to a regular geometry, but
 // can only represent an empty geometry, a single point, a horizontal or
 // vertical line, or an axis aligned rectangle with some area.
 //