update .golangci.yml (#49)

* update .golangci.yml Signed-off-by: adisos <[email protected]> * lint fixes Signed-off-by: adisos <[email protected]> * update Signed-off-by: adisos <[email protected]> --------- Signed-off-by: adisos <[email protected]>
np-guard · Jun 6, 2024 · 9e2ccff · 9e2ccff
1 parent c4048f7
commit 9e2ccff
Show file tree

Hide file tree

Showing 15 changed files with 88 additions and 43 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -5,7 +5,7 @@ linters-settings:
     lines: 100
     statements: 50
   gci:
-    local-prefixes: github.com/np-guard
+    prefix: github.com/np-guard
   goconst:
     min-len: 2
     min-occurrences: 2
@@ -23,27 +23,26 @@ linters-settings:
       const:
         COMPANY: IBM Inc.
     template: |-
-      Copyright 2020- {{ COMPANY }} All Rights Reserved.
+      Copyright 2023- {{ COMPANY }} All Rights Reserved.
+
       SPDX-License-Identifier: Apache-2.0
   goimports:
     local-prefixes: github.com/np-guard
-  gomnd:
-    settings:
-      mnd:
-        # don't include the "operation" and "assign"
-        checks: argument,case,condition,return
-        ignored-numbers: 0,1,2,3
-        ignored-functions: strings.SplitN
+  mnd:
+      # don't include the "operation" and "assign"
+      checks: argument,case,condition,return
+      ignored-numbers: 0,1,2,3
+      ignored-functions: strings.SplitN
 
   govet:
-    check-shadowing: true
+    shadow: true
   lll:
     line-length: 140
   misspell:
     locale: US
   nolintlint:
     allow-leading-space: true # don't require machine-readable nolint directives (i.e. with no leading space)
-    allow-unused: true # report any unused nolint directives
+    allow-unused: false # report any unused nolint directives
     require-explanation: false # don't require an explanation for nolint directives
     require-specific: false # don't require nolint directives to be specific about which linter is being skipped
   revive:
@@ -89,7 +88,7 @@ linters:
     - gofmt
     - goheader
     - goimports
-    - gomnd
+    - mnd
     - gomoddirectives
     - goprintffuncname
     - gosec
@@ -118,8 +117,6 @@ linters:
     - tagliatelle
     - tenv
     - testableexamples
-    - thelper
-    - tparallel
     - typecheck
     - unconvert
     - unparam
@@ -138,3 +135,6 @@ issues:
 
 run:
   timeout: 5m
+
+output:
+  print-issued-lines: false
diff --git a/pkg/connection/connectionset.go b/pkg/connection/connectionset.go
@@ -1,5 +1,8 @@
-// Copyright 2020- IBM Inc. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
+/*
+Copyright 2023- IBM Inc. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
 package connection
 
 import (

diff --git a/pkg/connection/connectionset_test.go b/pkg/connection/connectionset_test.go
@@ -1,5 +1,8 @@
-// Copyright 2020- IBM Inc. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
+/*
+Copyright 2023- IBM Inc. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
 package connection_test
 
 import (

diff --git a/pkg/connection/statefulness.go b/pkg/connection/statefulness.go
@@ -1,5 +1,8 @@
-// Copyright 2020- IBM Inc. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
+/*
+Copyright 2023- IBM Inc. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
 package connection
 
 import (

diff --git a/pkg/connection/statefulness_test.go b/pkg/connection/statefulness_test.go
@@ -1,5 +1,8 @@
-// Copyright 2020- IBM Inc. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
+/*
+Copyright 2023- IBM Inc. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
 package connection_test
 
 import (

diff --git a/pkg/hypercube/hypercubeset.go b/pkg/hypercube/hypercubeset.go
@@ -1,5 +1,8 @@
-// Copyright 2020- IBM Inc. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
+/*
+Copyright 2023- IBM Inc. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
 package hypercube
 
 import (

diff --git a/pkg/hypercube/hypercubeset_test.go b/pkg/hypercube/hypercubeset_test.go
@@ -1,5 +1,8 @@
-// Copyright 2020- IBM Inc. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
+/*
+Copyright 2023- IBM Inc. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
 package hypercube_test
 
 import (

diff --git a/pkg/interval/interval.go b/pkg/interval/interval.go
@@ -1,5 +1,9 @@
-// Copyright 2020- IBM Inc. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
+/*
+Copyright 2023- IBM Inc. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
 package interval
 
 import "fmt"

diff --git a/pkg/interval/intervalset.go b/pkg/interval/intervalset.go
@@ -1,5 +1,9 @@
-// Copyright 2020- IBM Inc. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
+/*
+Copyright 2023- IBM Inc. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
 package interval
 
 import (

diff --git a/pkg/interval/intervalset_test.go b/pkg/interval/intervalset_test.go
@@ -1,5 +1,9 @@
-// Copyright 2020- IBM Inc. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
+/*
+Copyright 2023- IBM Inc. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
 package interval_test
 
 import (

diff --git a/pkg/ipblock/ipblock.go b/pkg/ipblock/ipblock.go
@@ -1,5 +1,8 @@
-// Copyright 2020- IBM Inc. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
+/*
+Copyright 2023- IBM Inc. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
 package ipblock
 
 import (

diff --git a/pkg/ipblock/ipblock_test.go b/pkg/ipblock/ipblock_test.go
@@ -1,5 +1,8 @@
-// Copyright 2020- IBM Inc. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
+/*
+Copyright 2023- IBM Inc. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
 package ipblock_test
 
 import (

diff --git a/pkg/netp/common.go b/pkg/netp/common.go
@@ -1,5 +1,8 @@
-// Copyright 2020- IBM Inc. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
+/*
+Copyright 2023- IBM Inc. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
 package netp
 
 type Protocol interface {

diff --git a/pkg/netp/icmp.go b/pkg/netp/icmp.go
@@ -1,5 +1,9 @@
-// Copyright 2020- IBM Inc. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
+/*
+Copyright 2023- IBM Inc. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
 package netp
 
 import (
@@ -95,7 +99,6 @@ func inverseICMPType(t int) int {
 	return undefinedICMP
 }
 
-//nolint:revive // magic numbers are fine here
 var maxCodes = map[int]int{
 	EchoReply:              0,
 	DestinationUnreachable: 5,

diff --git a/pkg/netp/tcpudp.go b/pkg/netp/tcpudp.go
@@ -1,5 +1,8 @@
-// Copyright 2020- IBM Inc. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
+/*
+Copyright 2023- IBM Inc. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
 package netp
 
 import "github.com/np-guard/models/pkg/interval"