Refactor lint errors exhaustive, noglobals (#554)

gogatekeeper · Feb 8, 2025 · 0936ad6 · 0936ad6
1 parent f762116
commit 0936ad6
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 10 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -25,11 +25,9 @@ linters:
     - nlreturn
     - noctx
     - paralleltest
-    - exhaustive
     - exhaustruct
     - tagliatelle
     - err113
-    - gochecknoglobals
     - dupl
     - wsl
     # TODO: Revisit after the refactor

diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"crypto/rand"
-	"fmt"
 	"math/big"
 	"net"
 	"net/http"
@@ -71,10 +70,9 @@ const (
 	postLoginRedirectPath = "/post/login/path"
 	pkceCookieName        = "TESTPKCECOOKIE"
 	umaCookieName         = "TESTUMACOOKIE"
+	idpRealmURI           = idpURI + "/realms/" + testRealm
 )
 
-var idpRealmURI = fmt.Sprintf("%s/realms/%s", idpURI, testRealm)
-
 func generateRandomPort() (string, error) {
 	var minPort int64 = 1024
 	var maxPort int64 = 65000

diff --git a/pkg/authorization/resource_test.go b/pkg/authorization/resource_test.go
@@ -225,11 +225,10 @@ func TestIsValid(t *testing.T) {
 	}
 }
 
-var expectedRoles = []string{"1", "2", "3"}
-
 const rolesList = "1,2,3"
 
 func TestResourceString(t *testing.T) {
+	expectedRoles := []string{"1", "2", "3"}
 	resource := &authorization.Resource{
 		Roles: expectedRoles,
 	}
@@ -239,6 +238,7 @@ func TestResourceString(t *testing.T) {
 }
 
 func TestGetRoles(t *testing.T) {
+	expectedRoles := []string{"1", "2", "3"}
 	resource := &authorization.Resource{
 		Roles: expectedRoles,
 	}

diff --git a/pkg/constant/constant.go b/pkg/constant/constant.go
@@ -114,4 +114,5 @@ const (
 	TLS12 = "tlsv1.2"
 )
 
+//nolint:gochecknoglobals
 var SignatureAlgs = [3]jose.SignatureAlgorithm{jose.RS256, jose.HS256, jose.HS512}
diff --git a/pkg/encryption/text_encryption_test.go b/pkg/encryption/text_encryption_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+//nolint:gochecknoglobals
 var (
 	fakePlainText = []byte(`nFlhnhwRzC9uJ9mjhR0PQezUpIiDlU9ASLqH1KIKFhBZZrMZfnAAdHdgKs2OJoni8cTSQ
 	JxkaNpboZ6hnrMytlw5kf0biF7dLTU885uHIGkUIRy75hx6BaTEEhbN36qVTxediEHd6xeBPS3qpJ7riO6J

diff --git a/pkg/keycloak/config/config_test.go b/pkg/keycloak/config/config_test.go
@@ -34,7 +34,7 @@ import (
 	"github.com/gogatekeeper/gatekeeper/pkg/constant"
 )
 
-var (
+const (
 	fakeAdminRoleURL      = "/admin*"
 	fakeAdminRole         = "role:admin"
 	fakeTestAdminRolesURL = "/test_admin_roles"

diff --git a/pkg/proxy/cli.go b/pkg/proxy/cli.go
@@ -139,6 +139,7 @@ func getCommandLineOptions(cfg core.Configs) []cli.Flag {
 
 		optName := field.Tag.Get("yaml")
 
+		//nolint:exhaustive
 		switch fType := field.Type; fType.Kind() {
 		case reflect.Bool:
 			dv := reflect.ValueOf(cfg).Elem().FieldByName(field.Name).Bool()
@@ -214,6 +215,7 @@ func parseCLIOptions(cliCtx *cli.Context, config core.Configs) error {
 		}
 
 		if cliCtx.IsSet(name) {
+			//nolint:exhaustive
 			switch field.Type.Kind() {
 			case reflect.Bool:
 				reflect.ValueOf(config).Elem().FieldByName(field.Name).SetBool(cliCtx.Bool(name))

diff --git a/pkg/proxy/core/core.go b/pkg/proxy/core/core.go
@@ -13,6 +13,7 @@ type (
 	GoogleProvider   string
 )
 
+//nolint:gochecknoglobals
 var (
 	release  = ""
 	gitsha   = "no gitsha provided"

diff --git a/pkg/proxy/metrics/metrics.go b/pkg/proxy/metrics/metrics.go
@@ -2,6 +2,7 @@ package metrics
 
 import "github.com/prometheus/client_golang/prometheus"
 
+//nolint:gochecknoglobals
 var (
 	CertificateRotationMetric = prometheus.NewCounter(
 		prometheus.CounterOpts{

diff --git a/pkg/testsuite/fake_authserver.go b/pkg/testsuite/fake_authserver.go
@@ -59,6 +59,7 @@ type DefaultTestTokenClaims struct {
 	Authorization     models.Permissions   `json:"authorization"`
 }
 
+//nolint:gochecknoglobals
 var defTestTokenClaims = DefaultTestTokenClaims{
 	Aud:               "test",
 	Azp:               "clientid",
@@ -281,8 +282,6 @@ type fakeOidcDiscoveryResponse struct {
 	Algorithms  []string `json:"id_token_signing_alg_values_supported"`
 }
 
-var letterRunes = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
-
 type fakeAuthConfig struct {
 	DiscoveryURLPrefix        string
 	Expiration                time.Duration
@@ -734,6 +733,7 @@ func (r *fakeAuthServer) PermissionTicketHandler(wrt http.ResponseWriter, _ *htt
 }
 
 func getRandomString(n int) (string, error) {
+	letterRunes := []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
 	runes := make([]rune, n)
 	for idx := range runes {
 		num, err := rand.Int(rand.Reader, big.NewInt(int64(n)))

diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -41,6 +41,7 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
+//nolint:gochecknoglobals
 var (
 	AllHTTPMethods = []string{
 		http.MethodDelete,