golang-ci lint updates

Author: tolgaozen

.golangci.yml

@@ -1,6 +1,13 @@
 linters-settings:
   gci:
     local-prefixes: github.com/Permify/permify
+  gosec:
+    excludes:
+      - 'G404'
+  goimports:
+    local-prefixes: 'github.com/Permify/permify'
+  maligned:
+      suggest-new: true
   dupl:
     threshold: 100
   errorlint:
@@ -53,85 +60,49 @@ linters-settings:
     require-specific: true
 
 linters:
-  disable-all: true
   enable:
-    - asciicheck
+    - bidichk
     - bodyclose
-    - cyclop
-    - deadcode
-    - depguard
-    - dogsled
-    - dupl
-    - durationcheck
     - errcheck
+    - errname
     - errorlint
-    - exhaustive
-    - exportloopref
-    - forbidigo
-    - funlen
-    - gci
-    - gochecknoglobals
-    - gochecknoinits
-    - gocognit
-    - goconst
-    - gocritic
-    - gocyclo
-    - godot
-    - godox
-    - goerr113
-    - gofmt
     - gofumpt
     - goimports
-    - gomnd
-    - gomodguard
     - goprintffuncname
     - gosec
     - gosimple
     - govet
+    - importas
     - ineffassign
     - makezero
-    - misspell
-    - nakedret
-    - nestif
-    - nlreturn
-    - noctx
-    - nolintlint
-    - paralleltest
+    - prealloc
     - predeclared
+    - promlinter
     - revive
-    - rowserrcheck
-    - sqlclosecheck
     - staticcheck
-    - structcheck
     - stylecheck
-    - tparallel
-    - thelper
+    - tenv
     - typecheck
     - unconvert
-    - unparam
     - unused
-    - varcheck
-    - wsl
     - whitespace
 
-# disable:
-#    - exhaustivestruct
-#    - ifshort
-#    - goheader
-#    - prealloc
-#    - testpackage
-#    - wrapcheck
-
 issues:
   exclude-rules:
     - path: integration-test
       linters:
         - paralleltest
         - godot
-    - path: internal/servers/http
+    - text: 'tx.Rollback()'
       linters:
-        - godot
-
+        - 'errcheck'
+    - path: 'internal/repositories/mocks'
+      linters:
+        - 'errcheck'
 run:
+  tests: false
   skip-dirs:
     - docs
+
+output:
+  sort-results: true

go.mod

@@ -22,7 +22,7 @@ require (
 	github.com/jackc/pgproto3/v2 v2.3.1
 	github.com/jackc/pgtype v1.13.0
 	github.com/jackc/pgx/v4 v4.17.2
-	github.com/onsi/ginkgo/v2 v2.5.0
+	github.com/onsi/ginkgo/v2 v2.6.0
 	github.com/onsi/gomega v1.24.1
 	github.com/pkg/errors v0.9.1
 	github.com/rs/cors v1.8.2

go.sum

@@ -366,9 +366,12 @@ github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/ginkgo/v2 v2.5.0 h1:TRtrvv2vdQqzkwrQ1ke6vtXf7IK34RBUJafIy1wMwls=
 github.com/onsi/ginkgo/v2 v2.5.0/go.mod h1:Luc4sArBICYCS8THh8v3i3i5CuSZO+RaQRaJoeNwomw=
+github.com/onsi/ginkgo/v2 v2.6.0 h1:9t9b9vRUbFq3C4qKFCGkVuq/fIHji802N1nrtkh1mNc=
+github.com/onsi/ginkgo/v2 v2.6.0/go.mod h1:63DOGlLAH8+REH8jUGdL3YpCpu7JODesutUjdENfUAc=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=

integration-test/integration_test.go

@@ -17,7 +17,7 @@ const (
 	attempts   = 20
 
 	// HTTP REST
-	basePath = "http://" + host + "/v1"
+	// basePath = "http://" + host + "/v1"
 )
 
 func TestMain(m *testing.M) {

internal/commands/check.go

@@ -3,16 +3,16 @@ package commands
 import (
 	"context"
 	"errors"
-	`sync`
-	`sync/atomic`
+	"sync"
+	"sync/atomic"
 
 	"github.com/Permify/permify/internal/keys"
 	"github.com/Permify/permify/internal/repositories"
 	"github.com/Permify/permify/pkg/database"
-	`github.com/Permify/permify/pkg/dsl/schema`
+	"github.com/Permify/permify/pkg/dsl/schema"
 	"github.com/Permify/permify/pkg/logger"
 	base "github.com/Permify/permify/pkg/pb/base/v1"
-	`github.com/Permify/permify/pkg/token`
+	"github.com/Permify/permify/pkg/token"
 	"github.com/Permify/permify/pkg/tuple"
 )
 
@@ -39,7 +39,6 @@ func NewCheckCommand(km keys.CommandKeyManager, sr repositories.SchemaReader, rr
 
 // Execute -
 func (command *CheckCommand) Execute(ctx context.Context, request *base.PermissionCheckRequest) (response *base.PermissionCheckResponse, err error) {
-
 	if request.Depth == 0 {
 		request.Depth = 20
 	}
@@ -83,7 +82,6 @@ func (command *CheckCommand) Execute(ctx context.Context, request *base.Permissi
 			return response, err
 		}
 		child = action.Child
-		break
 	case base.EntityDefinition_RELATIONAL_REFERENCE_RELATION:
 		var leaf *base.Leaf
 		computedUserSet := &base.ComputedUserSet{Relation: request.GetPermission()}
@@ -92,7 +90,6 @@ func (command *CheckCommand) Execute(ctx context.Context, request *base.Permissi
 			Exclusion: false,
 		}
 		child = &base.Child{Type: &base.Child_Leaf{Leaf: leaf}}
-		break
 	default:
 		return response, errors.New(base.ErrorCode_ERROR_CODE_ACTION_DEFINITION_NOT_FOUND.String())
 	}
@@ -199,15 +196,13 @@ func (command *CheckCommand) checkDirect(ctx context.Context, request *base.Perm
 			if exclusion {
 				if resp.GetCan() == base.PermissionCheckResponse_RESULT_ALLOWED {
 					return denied(loadDepth(request))
-				} else {
-					return allowed(loadDepth(request))
 				}
-			} else {
-				return &base.PermissionCheckResponse{
-					Can:            resp.GetCan(),
-					RemainingDepth: loadDepth(request),
-				}, nil
+				return allowed(loadDepth(request))
 			}
+			return &base.PermissionCheckResponse{
+				Can:            resp.GetCan(),
+				RemainingDepth: loadDepth(request),
+			}, nil
 		}
 
 		if isDepthFinish(request) {
@@ -252,22 +247,21 @@ func (command *CheckCommand) checkDirect(ctx context.Context, request *base.Perm
 				}
 				command.commandKeyManager.SetCheckKey(request, result)
 				return result, nil
-			} else {
-				if !tuple.IsSubjectUser(t.GetSubject()) && t.GetSubject().GetRelation() != tuple.ELLIPSIS {
-					i++
-					decrease(request, int32(i))
-					checkFunctions = append(checkFunctions, command.checkDirect(ctx, &base.PermissionCheckRequest{
-						Entity: &base.Entity{
-							Type: t.GetSubject().GetType(),
-							Id:   t.GetSubject().GetId(),
-						},
-						Permission:    t.GetSubject().GetRelation(),
-						Subject:       request.GetSubject(),
-						SnapToken:     request.GetSnapToken(),
-						SchemaVersion: request.GetSchemaVersion(),
-						Depth:         loadDepth(request),
-					}, exclusion))
-				}
+			}
+			if !tuple.IsSubjectUser(t.GetSubject()) && t.GetSubject().GetRelation() != tuple.ELLIPSIS {
+				i++
+				decrease(request, int32(i))
+				checkFunctions = append(checkFunctions, command.checkDirect(ctx, &base.PermissionCheckRequest{
+					Entity: &base.Entity{
+						Type: t.GetSubject().GetType(),
+						Id:   t.GetSubject().GetId(),
+					},
+					Permission:    t.GetSubject().GetRelation(),
+					Subject:       request.GetSubject(),
+					SnapToken:     request.GetSnapToken(),
+					SchemaVersion: request.GetSchemaVersion(),
+					Depth:         loadDepth(request),
+				}, exclusion))
 			}
 		}
 
@@ -294,7 +288,6 @@ func (command *CheckCommand) checkDirect(ctx context.Context, request *base.Perm
 // checkTupleToUserSet -
 func (command *CheckCommand) checkTupleToUserSet(ctx context.Context, request *base.PermissionCheckRequest, ttu *base.TupleToUserSet, exclusion bool) CheckFunction {
 	return func(ctx context.Context) (*base.PermissionCheckResponse, error) {
-
 		if isDepthFinish(request) {
 			return &base.PermissionCheckResponse{
 				Can:            base.PermissionCheckResponse_RESULT_DENIED,

internal/commands/check_test.go

@@ -2,17 +2,18 @@ package commands
 
 import (
 	"context"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	`github.com/Permify/permify/internal/keys`
+	"github.com/Permify/permify/internal/keys"
 	"github.com/Permify/permify/internal/repositories/mocks"
 	"github.com/Permify/permify/pkg/database"
 	"github.com/Permify/permify/pkg/dsl/compiler"
 	"github.com/Permify/permify/pkg/dsl/schema"
 	"github.com/Permify/permify/pkg/logger"
 	base "github.com/Permify/permify/pkg/pb/base/v1"
-	`github.com/Permify/permify/pkg/token`
+	"github.com/Permify/permify/pkg/token"
 	"github.com/Permify/permify/pkg/tuple"
 )
 
@@ -485,7 +486,6 @@ entity doc {
 
 	Context("Github Sample: Check", func() {
 		It("Github Sample: Case 1", func() {
-
 			var err error
 
 			// SCHEMA
@@ -544,7 +544,6 @@ entity doc {
 		})
 
 		It("Github Sample: Case 2", func() {
-
 			var err error
 
 			// SCHEMA
@@ -669,7 +668,6 @@ entity doc {
 		})
 
 		It("Github Sample: Case 3", func() {
-
 			var err error
 
 			// SCHEMA

internal/commands/expand.go

@@ -6,11 +6,11 @@ import (
 
 	"github.com/Permify/permify/internal/repositories"
 	"github.com/Permify/permify/pkg/database"
-	`github.com/Permify/permify/pkg/dsl/schema`
+	"github.com/Permify/permify/pkg/dsl/schema"
 	"github.com/Permify/permify/pkg/logger"
 	base "github.com/Permify/permify/pkg/pb/base/v1"
-	`github.com/Permify/permify/pkg/token`
-	`github.com/Permify/permify/pkg/tuple`
+	"github.com/Permify/permify/pkg/token"
+	"github.com/Permify/permify/pkg/tuple"
 )
 
 // ExpandCommand -
@@ -33,7 +33,6 @@ func NewExpandCommand(sr repositories.SchemaReader, rr repositories.Relationship
 
 // Execute -
 func (command *ExpandCommand) Execute(ctx context.Context, request *base.PermissionExpandRequest) (response *base.PermissionExpandResponse, err error) {
-
 	if request.GetSnapToken() == "" {
 		var st token.SnapToken
 		st, err = command.relationshipReader.HeadSnapshot(ctx)
@@ -73,7 +72,6 @@ func (command *ExpandCommand) Execute(ctx context.Context, request *base.Permiss
 			return response, err
 		}
 		child = action.Child
-		break
 	case base.EntityDefinition_RELATIONAL_REFERENCE_RELATION:
 		var leaf *base.Leaf
 		computedUserSet := &base.ComputedUserSet{Relation: request.GetPermission()}
@@ -82,7 +80,6 @@ func (command *ExpandCommand) Execute(ctx context.Context, request *base.Permiss
 			Exclusion: false,
 		}
 		child = &base.Child{Type: &base.Child_Leaf{Leaf: leaf}}
-		break
 	default:
 		return response, errors.New(base.ErrorCode_ERROR_CODE_ACTION_DEFINITION_NOT_FOUND.String())
 	}
@@ -143,7 +140,6 @@ func (command *ExpandCommand) expandLeaf(ctx context.Context, request *base.Perm
 
 // set -
 func (command *ExpandCommand) setChild(ctx context.Context, request *base.PermissionExpandRequest, children []*base.Child, combiner ExpandCombiner) ExpandFunction {
-
 	var functions []ExpandFunction
 	for _, child := range children {
 		switch child.GetType().(type) {
@@ -164,7 +160,6 @@ func (command *ExpandCommand) setChild(ctx context.Context, request *base.Permis
 // expandDirect -
 func (command *ExpandCommand) expandDirect(ctx context.Context, request *base.PermissionExpandRequest, exclusion bool) ExpandFunction {
 	return func(ctx context.Context, expandChan chan<- ExpandResponse) {
-
 		target := &base.EntityAndRelation{
 			Entity:   request.GetEntity(),
 			Relation: request.GetPermission(),