Linting

Emyrk · Emyrk · commit 75ed8ef15626 · 2022-04-04T23:34:00.000Z
diff --git a/coderd/authz/authz.go b/coderd/authz/authz.go
@@ -7,7 +7,6 @@ func Authorize(subj Subject, obj Resource, action Action) error {
 }
 
 // AuthorizePermissions runs the authorize function with the raw permissions in a single list.
-func AuthorizePermissions(subjID string, permissions []Permission, object Resource, action Action) error {
-
+func AuthorizePermissions(_ string, _ []Permission, _ Resource, _ Action) error {
 	return nil
 }
diff --git a/coderd/authz/authz_test.go b/coderd/authz/authz_test.go
@@ -79,10 +79,11 @@ func Test_ExhaustiveAuthorize(t *testing.T) {
 		//	Result: func(pv string) bool {
 		//		return strings.Contains(pv, "+")
 		//	},
-		//},
+		// },
 	}
 
 	var failedTests int
+	//nolint:paralleltest
 	for _, c := range testCases {
 		t.Run(c.Name, func(t *testing.T) {
 			for _, o := range c.Objs {
@@ -106,7 +107,7 @@ func Test_ExhaustiveAuthorize(t *testing.T) {
 		})
 	}
 	// TODO: @emyrk when we implement the correct authorize, we can enable this check.
-	//require.Equal(t, 0, failedTests, fmt.Sprintf("%d tests failed", failedTests))
+	// require.Equal(t, 0, failedTests, fmt.Sprintf("%d tests failed", failedTests))
 }
 
 func permissionVariants(all authztest.SetGroup) map[string]*authztest.Role {
@@ -248,7 +249,8 @@ func noise(f noiseBits, lvls ...authztest.LevelGroup) *authztest.Role {
 	}
 
 	if len(rs) == 1 {
-		return rs[0].(*authztest.Role)
+		role, _ := rs[0].(*authztest.Role)
+		return role
 	}
 	return authztest.NewRole(rs...)
 }
diff --git a/coderd/authz/authztest/iterator.go b/coderd/authz/authztest/iterator.go
@@ -32,6 +32,7 @@ type unionIterator struct {
 	N int
 }
 
+//nolint:revive
 func Union(sets ...Set) *unionIterator {
 	var n int
 	for _, s := range sets {
@@ -68,7 +69,7 @@ func (si *unionIterator) Reset() {
 	si.offset = 0
 }
 
-func (si *unionIterator) ReturnSize() int {
+func (unionIterator) ReturnSize() int {
 	return 1
 }
 
diff --git a/coderd/authz/authztest/iterator_test.go b/coderd/authz/authztest/iterator_test.go
@@ -3,11 +3,12 @@ package authztest_test
 import (
 	"testing"
 
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/require"
+
 	"github.com/coder/coder/coderd/authz"
 	"github.com/coder/coder/coderd/authz/authztest"
 	crand "github.com/coder/coder/cryptorand"
-	"github.com/google/uuid"
-	"github.com/stretchr/testify/require"
 )
 
 func TestUnion(t *testing.T) {
diff --git a/coderd/authz/authztest/level.go b/coderd/authz/authztest/level.go
@@ -25,7 +25,7 @@ func (lg LevelGroup) All() Set {
 	var i int
 	i += copy(all[i:], pos)
 	i += copy(all[i:], neg)
-	i += copy(all[i:], net)
+	copy(all[i:], net)
 	return all
 }
 
diff --git a/coderd/authz/authztest/level_test.go b/coderd/authz/authztest/level_test.go
@@ -3,9 +3,10 @@ package authztest_test
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/coder/coder/coderd/authz"
 	"github.com/coder/coder/coderd/authz/authztest"
-	"github.com/stretchr/testify/require"
 )
 
 func Test_GroupedPermissions(t *testing.T) {
@@ -81,7 +82,9 @@ func Test_GroupedPermissions(t *testing.T) {
 	}
 
 	for _, c := range cases {
+		c := c
 		t.Run(c.Name, func(t *testing.T) {
+			t.Parallel()
 			require.Equal(t, c.ExpPos+c.ExpNeg+c.ExpAbs, len(c.Lvl.All()), "set size")
 			require.Equal(t, c.ExpPos, len(c.Lvl.Positive()), "correct num pos")
 			require.Equal(t, c.ExpNeg, len(c.Lvl.Negative()), "correct num neg")
diff --git a/coderd/authz/authztest/permissions_test.go b/coderd/authz/authztest/permissions_test.go
@@ -3,8 +3,9 @@ package authztest_test
 import (
 	"testing"
 
-	"github.com/coder/coder/coderd/authz/authztest"
 	"github.com/stretchr/testify/require"
+
+	"github.com/coder/coder/coderd/authz/authztest"
 )
 
 func Test_AllPermissions(t *testing.T) {
diff --git a/coderd/authz/authztest/role.go b/coderd/authz/authztest/role.go
@@ -21,7 +21,7 @@ type Role struct {
 func NewRole(sets ...Iterable) *Role {
 	setInterfaces := make([]Iterator, 0, len(sets))
 	var retSize int
-	var size int = 1
+	size := 1
 	for _, s := range sets {
 		v := s.Iterator()
 		setInterfaces = append(setInterfaces, v)
@@ -71,11 +71,11 @@ func (r *Role) Next() bool {
 	for i := range r.PermissionSets {
 		if r.PermissionSets[i].Next() {
 			break
-		} else {
-			r.PermissionSets[i].Reset()
-			if i == len(r.PermissionSets)-1 {
-				return false
-			}
+		}
+
+		r.PermissionSets[i].Reset()
+		if i == len(r.PermissionSets)-1 {
+			return false
 		}
 	}
 	return true
diff --git a/coderd/authz/authztest/role_test.go b/coderd/authz/authztest/role_test.go
@@ -3,15 +3,18 @@ package authztest_test
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/coder/coder/coderd/authz/authztest"
 	crand "github.com/coder/coder/cryptorand"
-	"github.com/stretchr/testify/require"
 )
 
 func Test_NewRole(t *testing.T) {
+	t.Parallel()
+
 	for i := 0; i < 50; i++ {
 		sets := make([]authztest.Iterable, 1+(i%4))
-		var total int = 1
+		total := 1
 		for j := range sets {
 			size := 1 + must(crand.Intn(3))
 			if i < 5 {
diff --git a/coderd/authz/authztest/set.go b/coderd/authz/authztest/set.go
@@ -33,8 +33,8 @@ func (s Set) String() string {
 		if v == nil {
 			continue
 		}
-		str.WriteString(sep)
-		str.WriteString(v.String())
+		_, _ = str.WriteString(sep)
+		_, _ = str.WriteString(v.String())
 		sep = ", "
 	}
 	return str.String()
diff --git a/coderd/authz/authztest/set_test.go b/coderd/authz/authztest/set_test.go
@@ -3,10 +3,11 @@ package authztest_test
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/coder/coder/coderd/authz"
 	"github.com/coder/coder/coderd/authz/authztest"
 	crand "github.com/coder/coder/cryptorand"
-	"github.com/stretchr/testify/require"
 )
 
 func Test_Set(t *testing.T) {
diff --git a/coderd/authz/example_test.go b/coderd/authz/example_test.go
@@ -3,8 +3,9 @@ package authz_test
 import (
 	"testing"
 
-	"github.com/coder/coder/coderd/authz"
 	"github.com/stretchr/testify/require"
+
+	"github.com/coder/coder/coderd/authz"
 )
 
 // Test_Example gives some examples on how to use the authz library.
@@ -30,19 +31,22 @@ func Test_Example(t *testing.T) {
 
 	// TODO: Uncomment all assertions when implementation is done.
 
+	//nolint:paralleltest
 	t.Run("ReadAllWorkspaces", func(t *testing.T) {
 		// To read all workspaces on the site
 		err := authz.Authorize(user, authz.ResourceWorkspace, authz.ActionRead)
 		var _ = err
-		//require.Error(t, err, "this user cannot read all workspaces")
+		// require.Error(t, err, "this user cannot read all workspaces")
 	})
 
+	//nolint:paralleltest
 	t.Run("ReadOrgWorkspaces", func(t *testing.T) {
 		// To read all workspaces on the org 'default'
 		err := authz.Authorize(user, authz.ResourceWorkspace.Org("default"), authz.ActionRead)
 		require.NoError(t, err, "this user can read all org workspaces in 'default'")
 	})
 
+	//nolint:paralleltest
 	t.Run("ReadMyWorkspace", func(t *testing.T) {
 		// Note 'database.Workspace' could fulfill the object interface and be passed in directly
 		err := authz.Authorize(user, authz.ResourceWorkspace.Org("default").Owner(user.UserID), authz.ActionRead)
@@ -52,10 +56,11 @@ func Test_Example(t *testing.T) {
 		require.NoError(t, err, "this user can read workspace '1234'")
 	})
 
+	//nolint:paralleltest
 	t.Run("CreateNewSiteUser", func(t *testing.T) {
 		err := authz.Authorize(user, authz.ResourceUser, authz.ActionCreate)
 		var _ = err
-		//require.Error(t, err, "this user cannot create new users")
+		// require.Error(t, err, "this user cannot create new users")
 	})
 }
 
diff --git a/coderd/authz/object.go b/coderd/authz/object.go
@@ -51,17 +51,20 @@ func (z zObject) OrgOwnerID() string {
 }
 
 // Org adds an org OwnerID to the resource
+//nolint:revive
 func (z zObject) Org(orgID string) zObject {
 	z.OwnedByOrg = orgID
 	return z
 }
 
 // Owner adds an OwnerID to the resource
+//nolint:revive
 func (z zObject) Owner(id string) zObject {
 	z.OwnedBy = id
 	return z
 }
 
+//nolint:revive
 func (z zObject) AsID(id string) zObject {
 	z.ObjectID = id
 	return z
diff --git a/coderd/authz/permission.go b/coderd/authz/permission.go
@@ -2,8 +2,9 @@ package authz
 
 import (
 	"fmt"
-	"golang.org/x/xerrors"
 	"strings"
+
+	"golang.org/x/xerrors"
 )
 
 type permLevel string
diff --git a/coderd/authz/permission_test.go b/coderd/authz/permission_test.go
@@ -3,8 +3,9 @@ package authz_test
 import (
 	"testing"
 
-	"github.com/coder/coder/coderd/authz"
 	"github.com/stretchr/testify/require"
+
+	"github.com/coder/coder/coderd/authz"
 )
 
 func Test_PermissionString(t *testing.T) {
@@ -54,7 +55,10 @@ func Test_PermissionString(t *testing.T) {
 	}
 
 	for _, c := range testCases {
+		c := c
 		t.Run(c.Name, func(t *testing.T) {
+			t.Parallel()
+
 			require.Equal(t, c.Expected, c.Permission.String())
 			perm, err := authz.ParsePermission(c.Expected)
 			require.NoError(t, err, "parse perm string")
@@ -125,8 +129,11 @@ func Test_ParsePermissions(t *testing.T) {
 			},
 		},
 	}
+
 	for _, c := range testCases {
+		c := c
 		t.Run(c.Name, func(t *testing.T) {
+			t.Parallel()
 			perms, err := authz.ParsePermissions(c.Str)
 			if c.ErrStr != "" {
 				require.Error(t, err)
diff --git a/coderd/authz/resources.go b/coderd/authz/resources.go
@@ -10,7 +10,7 @@ const (
 	ResourceUser      ResourceType = "user"
 )
 
-func (t ResourceType) ID() string {
+func (ResourceType) ID() string {
 	return ""
 }
 
@@ -19,6 +19,7 @@ func (t ResourceType) ResourceType() ResourceType {
 }
 
 // Org adds an org OwnerID to the resource
+//nolint:revive
 func (r ResourceType) Org(orgID string) zObject {
 	return zObject{
 		OwnedByOrg: orgID,
@@ -27,13 +28,15 @@ func (r ResourceType) Org(orgID string) zObject {
 }
 
 // Owner adds an OwnerID to the resource
+//nolint:revive
 func (r ResourceType) Owner(id string) zObject {
 	return zObject{
 		OwnedBy:    id,
 		ObjectType: r,
 	}
 }
 
+//nolint:revive
 func (r ResourceType) AsID(id string) zObject {
 	return zObject{
 		ObjectID:   id,
diff --git a/coderd/authz/subject.go b/coderd/authz/subject.go
@@ -64,6 +64,6 @@ func (s SubjectTODO) UserRoles() ([]Role, error) {
 	return s.User, nil
 }
 
-func (s SubjectTODO) Scopes() ([]Permission, error) {
+func (SubjectTODO) Scopes() ([]Permission, error) {
 	return []Permission{}, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ func Authorize(subj Subject, obj Resource, action Action) error {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`// AuthorizePermissions runs the authorize function with the raw permissions in a single list.`
`10`		`-func AuthorizePermissions(subjID string, permissions []Permission, object Resource, action Action) error {`
`11`		`-`
	`10`	`+func AuthorizePermissions(_ string, _ []Permission, _ Resource, _ Action) error {`
`12`	`11`	`return nil`
`13`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,10 +79,11 @@ func Test_ExhaustiveAuthorize(t *testing.T) {`
`79`	`79`	`// Result: func(pv string) bool {`
`80`	`80`	`// return strings.Contains(pv, "+")`
`81`	`81`	`// },`
`82`		`- //},`
	`82`	`+ // },`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`var failedTests int`
	`86`	`+ //nolint:paralleltest`
`86`	`87`	`for _, c := range testCases {`
`87`	`88`	`t.Run(c.Name, func(t *testing.T) {`
`88`	`89`	`for _, o := range c.Objs {`
`@@ -106,7 +107,7 @@ func Test_ExhaustiveAuthorize(t *testing.T) {`
`106`	`107`	`})`
`107`	`108`	`}`
`108`	`109`	`// TODO: @emyrk when we implement the correct authorize, we can enable this check.`
`109`		`- //require.Equal(t, 0, failedTests, fmt.Sprintf("%d tests failed", failedTests))`
	`110`	`+ // require.Equal(t, 0, failedTests, fmt.Sprintf("%d tests failed", failedTests))`
`110`	`111`	`}`
`111`	`112`
`112`	`113`	`func permissionVariants(all authztest.SetGroup) map[string]*authztest.Role {`
`@@ -248,7 +249,8 @@ func noise(f noiseBits, lvls ...authztest.LevelGroup) *authztest.Role {`
`248`	`249`	`}`
`249`	`250`
`250`	`251`	`if len(rs) == 1 {`
`251`		`- return rs[0].(*authztest.Role)`
	`252`	`+ role, _ := rs[0].(*authztest.Role)`
	`253`	`+ return role`
`252`	`254`	`}`
`253`	`255`	`return authztest.NewRole(rs...)`
`254`	`256`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ type unionIterator struct {`
`32`	`32`	`N int`
`33`	`33`	`}`
`34`	`34`
	`35`	`+//nolint:revive`
`35`	`36`	`func Union(sets ...Set) *unionIterator {`
`36`	`37`	`var n int`
`37`	`38`	`for _, s := range sets {`
`@@ -68,7 +69,7 @@ func (si *unionIterator) Reset() {`
`68`	`69`	`si.offset = 0`
`69`	`70`	`}`
`70`	`71`
`71`		`-func (si *unionIterator) ReturnSize() int {`
	`72`	`+func (unionIterator) ReturnSize() int {`
`72`	`73`	`return 1`
`73`	`74`	`}`
`74`	`75`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ func (lg LevelGroup) All() Set {`
`25`	`25`	`var i int`
`26`	`26`	`i += copy(all[i:], pos)`
`27`	`27`	`i += copy(all[i:], neg)`
`28`		`- i += copy(all[i:], net)`
	`28`	`+ copy(all[i:], net)`
`29`	`29`	`return all`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@ package authztest_test`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`		`- "github.com/coder/coder/coderd/authz/authztest"`
`7`	`6`	`"github.com/stretchr/testify/require"`
	`7`	`+`
	`8`	`+ "github.com/coder/coder/coderd/authz/authztest"`
`8`	`9`	`)`
`9`	`10`
`10`	`11`	`func Test_AllPermissions(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@ func (s Set) String() string {`
`33`	`33`	`if v == nil {`
`34`	`34`	`continue`
`35`	`35`	`}`
`36`		`- str.WriteString(sep)`
`37`		`- str.WriteString(v.String())`
	`36`	`+ _, _ = str.WriteString(sep)`
	`37`	`+ _, _ = str.WriteString(v.String())`
`38`	`38`	`sep = ", "`
`39`	`39`	`}`
`40`	`40`	`return str.String()`