linting

Emyrk · Emyrk · commit b377e69f4417 · 2024-08-28T11:40:52.000-05:00
diff --git a/coderd/idpsync/idpsync_test.go b/coderd/idpsync/idpsync_test.go
@@ -137,6 +137,8 @@ func TestParseStringSliceClaim(t *testing.T) {
 }
 
 func TestIsHTTPError(t *testing.T) {
+	t.Parallel()
+
 	herr := idpsync.HTTPError{}
 	require.NotNil(t, idpsync.IsHTTPError(herr))
 	require.NotNil(t, idpsync.IsHTTPError(&herr))
diff --git a/coderd/idpsync/organization.go b/coderd/idpsync/organization.go
@@ -16,7 +16,7 @@ import (
 	"github.com/coder/coder/v2/coderd/util/slice"
 )
 
-func (s AGPLIDPSync) OrganizationSyncEnabled() bool {
+func (AGPLIDPSync) OrganizationSyncEnabled() bool {
 	// AGPL does not support syncing organizations.
 	return false
 }
diff --git a/enterprise/coderd/enidpsync/organizations_test.go b/enterprise/coderd/enidpsync/organizations_test.go
@@ -20,6 +20,7 @@ import (
 	"github.com/coder/coder/v2/coderd/idpsync"
 	"github.com/coder/coder/v2/coderd/rbac"
 	"github.com/coder/coder/v2/codersdk"
+	"github.com/coder/coder/v2/enterprise/coderd/enidpsync"
 	"github.com/coder/coder/v2/testutil"
 )
 
@@ -235,7 +236,7 @@ func TestOrganizationSync(t *testing.T) {
 			}
 
 			// Create a new sync object
-			sync := idpsync.NewSync(logger, caseData.Entitlements, caseData.Settings)
+			sync := enidpsync.NewSync(logger, caseData.Entitlements, caseData.Settings)
 			for _, exp := range caseData.Exps {
 				t.Run(exp.Name, func(t *testing.T) {
 					params, httpErr := sync.ParseOrganizationClaims(ctx, exp.Claims)
diff --git a/enterprise/coderd/userauth_test.go b/enterprise/coderd/userauth_test.go
@@ -1016,8 +1016,8 @@ func (r *oidcTestRunner) AssertOrganizations(t *testing.T, userIdent string, inc
 	userOrgs, err := r.AdminClient.OrganizationsByUser(ctx, userIdent)
 	require.NoError(t, err)
 
-	cpy := make([]uuid.UUID, len(expected))
-	copy(cpy, expected)
+	cpy := make([]uuid.UUID, 0, len(expected))
+	cpy = append(cpy, expected...)
 	hasDefault := false
 	userOrgIDs := db2sdk.List(userOrgs, func(o codersdk.Organization) uuid.UUID {
 		if o.IsDefault {

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,8 @@ func TestParseStringSliceClaim(t *testing.T) {`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`func TestIsHTTPError(t *testing.T) {`
	`140`	`+ t.Parallel()`
	`141`	`+`
`140`	`142`	`herr := idpsync.HTTPError{}`
`141`	`143`	`require.NotNil(t, idpsync.IsHTTPError(herr))`
`142`	`144`	`require.NotNil(t, idpsync.IsHTTPError(&herr))`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`"github.com/coder/coder/v2/coderd/util/slice"`
`17`	`17`	`)`
`18`	`18`
`19`		`-func (s AGPLIDPSync) OrganizationSyncEnabled() bool {`
	`19`	`+func (AGPLIDPSync) OrganizationSyncEnabled() bool {`
`20`	`20`	`// AGPL does not support syncing organizations.`
`21`	`21`	`return false`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ import (`
`20`	`20`	`"github.com/coder/coder/v2/coderd/idpsync"`
`21`	`21`	`"github.com/coder/coder/v2/coderd/rbac"`
`22`	`22`	`"github.com/coder/coder/v2/codersdk"`
	`23`	`+ "github.com/coder/coder/v2/enterprise/coderd/enidpsync"`
`23`	`24`	`"github.com/coder/coder/v2/testutil"`
`24`	`25`	`)`
`25`	`26`
`@@ -235,7 +236,7 @@ func TestOrganizationSync(t *testing.T) {`
`235`	`236`	`}`
`236`	`237`
`237`	`238`	`// Create a new sync object`
`238`		`- sync := idpsync.NewSync(logger, caseData.Entitlements, caseData.Settings)`
	`239`	`+ sync := enidpsync.NewSync(logger, caseData.Entitlements, caseData.Settings)`
`239`	`240`	`for _, exp := range caseData.Exps {`
`240`	`241`	`t.Run(exp.Name, func(t *testing.T) {`
`241`	`242`	`params, httpErr := sync.ParseOrganizationClaims(ctx, exp.Claims)`