Skip to content

Commit 488e2d1

Browse files
brettkolodnybrettkolodny
committed
fix: lint
1 parent f2b7589 commit 488e2d1

File tree

3 files changed

+24
-23
lines changed

3 files changed

+24
-23
lines changed

‎cli/sharing.go

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ import (
44
"fmt"
55
"regexp"
66

7+
"golang.org/x/xerrors"
8+
79
"github.com/coder/coder/v2/cli/cliui"
810
"github.com/coder/coder/v2/codersdk"
911
"github.com/coder/serpent"
10-
"golang.org/x/xerrors"
1112
)
1213

1314
type workspaceShareRow struct {
@@ -91,14 +92,14 @@ func (r *RootCmd) shareWorkspace(orgContext *OrganizationContext) *serpent.Comma
9192
username := userAndRole[1]
9293
role := userAndRole[2]
9394

94-
userId := ""
95+
userID := ""
9596
for _, member := range orgMembers {
9697
if member.Username == username {
97-
userId = member.UserID.String()
98+
userID = member.UserID.String()
9899
break
99100
}
100101
}
101-
if userId == "" {
102+
if userID == "" {
102103
return xerrors.Errorf("Could not find user %s in the organization %s", username, org.Name)
103104
}
104105

@@ -107,7 +108,7 @@ func (r *RootCmd) shareWorkspace(orgContext *OrganizationContext) *serpent.Comma
107108
return err
108109
}
109110

110-
userRoles[userId] = workspaceRole
111+
userRoles[userID] = workspaceRole
111112
}
112113
}
113114

@@ -143,7 +144,6 @@ func (r *RootCmd) shareWorkspace(orgContext *OrganizationContext) *serpent.Comma
143144
}
144145

145146
groupRoles[orgGroup.ID.String()] = workspaceRole
146-
147147
}
148148
}
149149

@@ -155,13 +155,13 @@ func (r *RootCmd) shareWorkspace(orgContext *OrganizationContext) *serpent.Comma
155155
return err
156156
}
157157

158-
workspaceAcl, err := client.WorkspaceACL(inv.Context(), workspace.ID)
158+
workspaceACL, err := client.WorkspaceACL(inv.Context(), workspace.ID)
159159
if err != nil {
160160
return xerrors.Errorf("Could not fetch current workspace ACL after sharing %w", err)
161161
}
162162

163163
outputRows := make([]workspaceShareRow, 0)
164-
for _, user := range workspaceAcl.Users {
164+
for _, user := range workspaceACL.Users {
165165
if user.Role == codersdk.WorkspaceRoleDeleted {
166166
continue
167167
}
@@ -172,7 +172,7 @@ func (r *RootCmd) shareWorkspace(orgContext *OrganizationContext) *serpent.Comma
172172
Role: user.Role,
173173
})
174174
}
175-
for _, group := range workspaceAcl.Groups {
175+
for _, group := range workspaceACL.Groups {
176176
if group.Role == codersdk.WorkspaceRoleDeleted {
177177
continue
178178
}
@@ -199,7 +199,6 @@ func (r *RootCmd) shareWorkspace(orgContext *OrganizationContext) *serpent.Comma
199199
}
200200

201201
func stringToWorkspaceRole(role string) (codersdk.WorkspaceRole, error) {
202-
203202
if role != "" && role != string(codersdk.WorkspaceRoleAdmin) && role != string(codersdk.WorkspaceRoleUse) {
204203
return "", xerrors.Errorf("invalid role %s. Expected %s, or %s", role, codersdk.WorkspaceRoleAdmin, codersdk.WorkspaceRoleUse)
205204
}

‎cli/sharing_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@ import (
77
"strings"
88
"testing"
99

10+
"github.com/stretchr/testify/assert"
11+
"github.com/stretchr/testify/require"
12+
1013
"github.com/coder/coder/v2/cli/clitest"
1114
"github.com/coder/coder/v2/coderd/coderdtest"
1215
"github.com/coder/coder/v2/coderd/database"
1316
"github.com/coder/coder/v2/coderd/database/dbfake"
1417
"github.com/coder/coder/v2/coderd/rbac"
1518
"github.com/coder/coder/v2/codersdk"
1619
"github.com/coder/coder/v2/testutil"
17-
"github.com/stretchr/testify/assert"
18-
"github.com/stretchr/testify/require"
1920
)
2021

2122
func TestSharingShare(t *testing.T) {

‎enterprise/cli/sharing_test.go

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ import (
88
"strings"
99
"testing"
1010

11+
"github.com/google/uuid"
12+
"github.com/stretchr/testify/assert"
13+
"github.com/stretchr/testify/require"
14+
1115
"github.com/coder/coder/v2/cli/clitest"
1216
"github.com/coder/coder/v2/coderd/coderdtest"
1317
"github.com/coder/coder/v2/coderd/database"
@@ -17,9 +21,6 @@ import (
1721
"github.com/coder/coder/v2/enterprise/coderd/coderdenttest"
1822
"github.com/coder/coder/v2/enterprise/coderd/license"
1923
"github.com/coder/coder/v2/testutil"
20-
"github.com/google/uuid"
21-
"github.com/stretchr/testify/assert"
22-
"github.com/stretchr/testify/require"
2324
)
2425

2526
func TestSharingShareEnterprise(t *testing.T) {
@@ -52,7 +53,7 @@ func TestSharingShareEnterprise(t *testing.T) {
5253

5354
ctx := testutil.Context(t, testutil.WaitMedium)
5455

55-
group, err := createGroupWithMembers(client, ctx, orgOwner.OrganizationID, "new-group", []uuid.UUID{orgMember.ID})
56+
group, err := createGroupWithMembers(ctx, client, orgOwner.OrganizationID, "new-group", []uuid.UUID{orgMember.ID})
5657
require.NoError(t, err)
5758

5859
inv, root := clitest.New(t, "sharing", "share", workspace.Name, "--org", orgOwner.OrganizationID.String(), "--group", group.Name)
@@ -106,10 +107,10 @@ func TestSharingShareEnterprise(t *testing.T) {
106107

107108
ctx := testutil.Context(t, testutil.WaitMedium)
108109

109-
wibbleGroup, err := createGroupWithMembers(client, ctx, orgOwner.OrganizationID, "wibble", []uuid.UUID{wibbleMember.ID})
110+
wibbleGroup, err := createGroupWithMembers(ctx, client, orgOwner.OrganizationID, "wibble", []uuid.UUID{wibbleMember.ID})
110111
require.NoError(t, err)
111112

112-
wobbleGroup, err := createGroupWithMembers(client, ctx, orgOwner.OrganizationID, "wobble", []uuid.UUID{wobbleMember.ID})
113+
wobbleGroup, err := createGroupWithMembers(ctx, client, orgOwner.OrganizationID, "wobble", []uuid.UUID{wobbleMember.ID})
113114
require.NoError(t, err)
114115

115116
inv, root := clitest.New(t, "sharing", "share", workspace.Name, "--org", orgOwner.OrganizationID.String(),
@@ -157,7 +158,7 @@ func TestSharingShareEnterprise(t *testing.T) {
157158

158159
ctx := testutil.Context(t, testutil.WaitMedium)
159160

160-
group, err := createGroupWithMembers(client, ctx, orgOwner.OrganizationID, "new-group", []uuid.UUID{orgMember.ID})
161+
group, err := createGroupWithMembers(ctx, client, orgOwner.OrganizationID, "new-group", []uuid.UUID{orgMember.ID})
161162
require.NoError(t, err)
162163

163164
inv, root := clitest.New(t, "sharing", "share", workspace.Name, "--org", orgOwner.OrganizationID.String(), "--group", fmt.Sprintf("%s:admin", group.Name))
@@ -186,17 +187,17 @@ func TestSharingShareEnterprise(t *testing.T) {
186187
})
187188
}
188189

189-
func createGroupWithMembers(client *codersdk.Client, ctx context.Context, orgId uuid.UUID, name string, memberIds []uuid.UUID) (codersdk.Group, error) {
190-
group, err := client.CreateGroup(ctx, orgId, codersdk.CreateGroupRequest{
190+
func createGroupWithMembers(ctx context.Context, client *codersdk.Client, orgID uuid.UUID, name string, memberIDs []uuid.UUID) (codersdk.Group, error) {
191+
group, err := client.CreateGroup(ctx, orgID, codersdk.CreateGroupRequest{
191192
Name: name,
192193
DisplayName: name,
193194
})
194195
if err != nil {
195196
return codersdk.Group{}, err
196197
}
197198

198-
ids := make([]string, len(memberIds))
199-
for i, id := range memberIds {
199+
ids := make([]string, len(memberIDs))
200+
for i, id := range memberIDs {
200201
ids[i] = id.String()
201202
}
202203

0 commit comments

Comments
 (0)