linting

coder · Emyrk · Jul 25, 2024 · Jul 24, 2024 · Jul 24, 2024 · Jul 24, 2024
commit 66cd785aea8dc24fba8fcc2f010cd3c56676e92e
diff --git a/enterprise/cli/organization_test.go b/enterprise/cli/organization_test.go
@@ -114,6 +114,8 @@ func TestEditOrganizationRoles(t *testing.T) {
 }
 
 func TestShowOrganizations(t *testing.T) {
+	t.Parallel()
+
 	t.Run("OnlyID", func(t *testing.T) {
 		t.Parallel()
 

diff --git a/enterprise/coderd/organizations_test.go b/enterprise/coderd/organizations_test.go
@@ -71,6 +71,7 @@ func TestOrganizationsByUser(t *testing.T) {
 
 	ctx := testutil.Context(t, testutil.WaitLong)
 
+	//nolint:gocritic // owner is required to make orgs
 	orgs, err := client.OrganizationsByUser(ctx, codersdk.Me)
 	require.NoError(t, err)
 	require.NotNil(t, orgs)

diff --git a/enterprise/coderd/roles_test.go b/enterprise/coderd/roles_test.go
@@ -354,13 +354,7 @@ func TestListRoles(t *testing.T) {
 	member, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
 	orgAdmin, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID, rbac.ScopedRoleOrgAdmin(owner.OrganizationID))
 
-	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
-	t.Cleanup(cancel)
-
-	otherOrg, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
-		Name: "other",
-	})
-	require.NoError(t, err, "create org")
+	otherOrg := coderdenttest.CreateOrganization(t, client, coderdenttest.CreateOrganizationOptions{})
 
 	const notFound = "Resource not found"
 	testCases := []struct {

diff --git a/enterprise/coderd/templates_test.go b/enterprise/coderd/templates_test.go
@@ -779,7 +779,7 @@ func TestTemplates(t *testing.T) {
 		t.Parallel()
 		dv := coderdtest.DeploymentValues(t)
 		dv.Experiments = []string{string(codersdk.ExperimentMultiOrganization)}
-		client, owner := coderdenttest.New(t, &coderdenttest.Options{
+		ownerClient, owner := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				DeploymentValues: dv,
 			},
@@ -790,8 +790,9 @@ func TestTemplates(t *testing.T) {
 			},
 		})
 
-		org2 := coderdenttest.CreateOrganization(t, client, coderdenttest.CreateOrganizationOptions{})
-		user, _ := coderdtest.CreateAnotherUser(t, client, org2.ID)
+		client, _ := coderdtest.CreateAnotherUser(t, ownerClient, owner.OrganizationID, rbac.RoleTemplateAdmin())
+		org2 := coderdenttest.CreateOrganization(t, ownerClient, coderdenttest.CreateOrganizationOptions{})
+		user, _ := coderdtest.CreateAnotherUser(t, ownerClient, org2.ID)
 
 		// 2 templates in first organization
 		version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, nil)

diff --git a/enterprise/coderd/users_test.go b/enterprise/coderd/users_test.go
@@ -311,10 +311,6 @@ func TestGrantSiteRoles(t *testing.T) {
 		require.Equal(t, statusCode, e.StatusCode(), "correct status code")
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
-	t.Cleanup(cancel)
-	var err error
-
 	dv := coderdtest.DeploymentValues(t)
 	dv.Experiments = []string{string(codersdk.ExperimentMultiOrganization)}
 	admin, first := coderdenttest.New(t, &coderdenttest.Options{
@@ -331,10 +327,8 @@ func TestGrantSiteRoles(t *testing.T) {
 
 	member, _ := coderdtest.CreateAnotherUser(t, admin, first.OrganizationID)
 	orgAdmin, _ := coderdtest.CreateAnotherUser(t, admin, first.OrganizationID, rbac.ScopedRoleOrgAdmin(first.OrganizationID))
-	randOrg, err := admin.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
-		Name: "random",
-	})
-	require.NoError(t, err)
+	randOrg := coderdenttest.CreateOrganization(t, admin, coderdenttest.CreateOrganizationOptions{})
+
 	_, randOrgUser := coderdtest.CreateAnotherUser(t, admin, randOrg.ID, rbac.ScopedRoleOrgAdmin(randOrg.ID))
 	userAdmin, _ := coderdtest.CreateAnotherUser(t, admin, first.OrganizationID, rbac.RoleUserAdmin())
 

diff --git a/enterprise/coderd/workspaces_test.go b/enterprise/coderd/workspaces_test.go
@@ -1363,6 +1363,7 @@ func TestAdminViewAllWorkspaces(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 	defer cancel()
 
+	//nolint:gocritic // intentionally using owner
 	_, err := client.Workspace(ctx, workspace.ID)
 	require.NoError(t, err)
 

diff --git a/enterprise/members_test.go b/enterprise/members_test.go
@@ -16,6 +16,8 @@ import (
 )
 
 func TestEnterpriseMembers(t *testing.T) {
+	t.Parallel()
+
 	t.Run("PostUser", func(t *testing.T) {
 		t.Parallel()
 
@@ -77,6 +79,7 @@ func TestEnterpriseMembers(t *testing.T) {
 
 		ctx := testutil.Context(t, testutil.WaitMedium)
 		// Add user to org
+		//nolint:gocritic // Using owner to ensure it's not a 404 error
 		_, err := owner.PostOrganizationMember(ctx, org.ID, uuid.NewString())
 		require.Error(t, err)
 		var apiErr *codersdk.Error
@@ -87,6 +90,7 @@ func TestEnterpriseMembers(t *testing.T) {
 	// Calling it from a user without the org access.
 	t.Run("ListNotInOrg", func(t *testing.T) {
 		t.Parallel()
+
 		dv := coderdtest.DeploymentValues(t)
 		dv.Experiments = []string{string(codersdk.ExperimentMultiOrganization)}
 		owner, first := coderdenttest.New(t, &coderdenttest.Options{

diff --git a/enterprise/wsproxy/wsproxy_test.go b/enterprise/wsproxy/wsproxy_test.go
@@ -998,6 +998,7 @@ func TestWorkspaceProxyWorkspaceApps_BlockDirect(t *testing.T) {
 		deploymentValues.Dangerous.AllowPathAppSiteOwnerAccess = serpent.Bool(opts.DangerousAllowPathAppSiteOwnerAccess)
 		deploymentValues.Experiments = []string{
 			"*",
+			string(codersdk.ExperimentMultiOrganization),
 		}
 
 		proxyStatsCollectorFlushCh := make(chan chan<- struct{}, 1)
@@ -1028,7 +1029,8 @@ func TestWorkspaceProxyWorkspaceApps_BlockDirect(t *testing.T) {
 			},
 			LicenseOptions: &coderdenttest.LicenseOptions{
 				Features: license.Features{
-					codersdk.FeatureWorkspaceProxy: 1,
+					codersdk.FeatureWorkspaceProxy:        1,
+					codersdk.FeatureMultipleOrganizations: 1,
 				},
 			},
 		})