linting

Emyrk · Emyrk · commit 685b21e0a836 · 2024-10-29T13:26:12.000-04:00
diff --git a/coderd/database/dbfake/builder.go b/coderd/database/dbfake/builder.go
@@ -39,25 +39,30 @@ type OrganizationResponse struct {
 }
 
 func (b OrganizationBuilder) EveryoneAllowance(allowance int) OrganizationBuilder {
+	//nolint: revive // returns modified struct
 	b.allUsersAllowance = int32(allowance)
 	return b
 }
 
 func (b OrganizationBuilder) Seed(seed database.Organization) OrganizationBuilder {
+	//nolint: revive // returns modified struct
 	b.seed = seed
 	return b
 }
 
 func (b OrganizationBuilder) Members(users ...database.User) OrganizationBuilder {
 	for _, u := range users {
+		//nolint: revive // returns modified struct
 		b.members = append(b.members, u.ID)
 	}
 	return b
 }
 
 func (b OrganizationBuilder) Group(seed database.Group, members ...database.User) OrganizationBuilder {
+	//nolint: revive // returns modified struct
 	b.groups[seed] = []uuid.UUID{}
 	for _, u := range members {
+		//nolint: revive // returns modified struct
 		b.groups[seed] = append(b.groups[seed], u.ID)
 	}
 	return b
diff --git a/enterprise/coderd/workspacequota_test.go b/enterprise/coderd/workspacequota_test.go
@@ -60,10 +60,6 @@ func verifyQuota(ctx context.Context, t *testing.T, client *codersdk.Client, org
 func TestWorkspaceQuota(t *testing.T) {
 	t.Parallel()
 
-	if !dbtestutil.WillUsePostgres() {
-		t.Fatal("We should only run this test with postgres")
-	}
-
 	// This first test verifies the behavior of creating and deleting workspaces.
 	// It also tests multi-group quota stacking and the everyone group.
 	t.Run("CreateDelete", func(t *testing.T) {
@@ -306,7 +302,7 @@ func TestWorkspaceQuota(t *testing.T) {
 	})
 }
 
-// nolint:paralleltest // Tests must run serially
+// nolint:paralleltest,tparallel // Tests must run serially
 func TestWorkspaceSerialization(t *testing.T) {
 	t.Parallel()
 
@@ -391,7 +387,6 @@ func TestWorkspaceSerialization(t *testing.T) {
 				Isolation: sql.LevelSerializable,
 			})
 			assert.NoError(t, err)
-
 		}
 
 		// Start TX

Original file line number	Diff line number	Diff line change
`@@ -39,25 +39,30 @@ type OrganizationResponse struct {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`func (b OrganizationBuilder) EveryoneAllowance(allowance int) OrganizationBuilder {`
	`42`	`+ //nolint: revive // returns modified struct`
`42`	`43`	`b.allUsersAllowance = int32(allowance)`
`43`	`44`	`return b`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`func (b OrganizationBuilder) Seed(seed database.Organization) OrganizationBuilder {`
	`48`	`+ //nolint: revive // returns modified struct`
`47`	`49`	`b.seed = seed`
`48`	`50`	`return b`
`49`	`51`	`}`
`50`	`52`
`51`	`53`	`func (b OrganizationBuilder) Members(users ...database.User) OrganizationBuilder {`
`52`	`54`	`for _, u := range users {`
	`55`	`+ //nolint: revive // returns modified struct`
`53`	`56`	`b.members = append(b.members, u.ID)`
`54`	`57`	`}`
`55`	`58`	`return b`
`56`	`59`	`}`
`57`	`60`
`58`	`61`	`func (b OrganizationBuilder) Group(seed database.Group, members ...database.User) OrganizationBuilder {`
	`62`	`+ //nolint: revive // returns modified struct`
`59`	`63`	`b.groups[seed] = []uuid.UUID{}`
`60`	`64`	`for _, u := range members {`
	`65`	`+ //nolint: revive // returns modified struct`
`61`	`66`	`b.groups[seed] = append(b.groups[seed], u.ID)`
`62`	`67`	`}`
`63`	`68`	`return b`