fix: use org members api to get users

brettkolodny · brettkolodny · commit a8565fca847c · 2025-08-26T13:38:27.000Z
diff --git a/cli/sharing.go b/cli/sharing.go
@@ -67,67 +67,85 @@ func (r *RootCmd) shareWorkspace(orgContext *OrganizationContext) *serpent.Comma
 		},
 		Middleware: serpent.Chain(
 			r.InitClient(client),
-			serpent.RequireRangeArgs(1, -1),
+			// serpent.RequireRangeArgs(1, -1),
 		),
 		Handler: func(inv *serpent.Invocation) error {
 			workspace, err := namedWorkspace(inv.Context(), client, inv.Args[0])
 			if err != nil {
 				return xerrors.Errorf("could not fetch the workspace %s: %w", inv.Args[0], err)
 			}
 
-			userRoles := make(map[string]codersdk.WorkspaceRole, len(users))
-			for _, user := range users {
-				userAndRole := userAndGroupRegex.FindStringSubmatch(user)
-				username := userAndRole[1]
-				role := userAndRole[2]
+			org, err := orgContext.Selected(inv, client)
+			if err != nil {
+				return err
+			}
 
-				user, err := client.User(inv.Context(), username)
+			userRoles := make(map[string]codersdk.WorkspaceRole, len(users))
+			if len(users) > 0 {
+				orgMembers, err := client.OrganizationMembers(inv.Context(), org.ID)
 				if err != nil {
 					return err
 				}
 
-				workspaceRole, err := stringToWorkspaceRole(role)
-				if err != nil {
-					return err
-				}
+				for _, user := range users {
+					userAndRole := userAndGroupRegex.FindStringSubmatch(user)
+					username := userAndRole[1]
+					role := userAndRole[2]
+
+					userId := ""
+					for _, member := range orgMembers {
+						if member.Username == username {
+							userId = member.UserID.String()
+							break
+						}
+					}
+					if userId == "" {
+						return xerrors.Errorf("Could not find user %s in the organization %s", username, org.Name)
+					}
+
+					workspaceRole, err := stringToWorkspaceRole(role)
+					if err != nil {
+						return err
+					}
 
-				userRoles[user.ID.String()] = workspaceRole
+					userRoles[userId] = workspaceRole
+				}
 			}
 
 			groupRoles := make(map[string]codersdk.WorkspaceRole)
+			if len(groups) > 0 {
+				orgGroups, err := client.Groups(inv.Context(), codersdk.GroupArguments{
+					Organization: org.ID.String(),
+				})
+				if err != nil {
+					return err
+				}
 
-			org, err := orgContext.Selected(inv, client)
-			if err != nil {
-				return err
-			}
-			orgGroups, err := client.Groups(inv.Context(), codersdk.GroupArguments{
-				Organization: org.ID.String(),
-			})
+				for _, group := range groups {
+					groupAndRole := userAndGroupRegex.FindStringSubmatch(group)
+					groupName := groupAndRole[1]
+					role := groupAndRole[2]
+
+					var orgGroup *codersdk.Group
+					for _, g := range orgGroups {
+						if g.Name == groupName {
+							orgGroup = &g
+							break
+						}
+					}
 
-			for _, group := range groups {
-				groupAndRole := userAndGroupRegex.FindStringSubmatch(group)
-				groupName := groupAndRole[1]
-				role := groupAndRole[2]
+					if orgGroup == nil {
+						return xerrors.Errorf("Could not find group named %s belonging to the organization %s", groupName, org.Name)
+					}
 
-				var orgGroup *codersdk.Group
-				for _, g := range orgGroups {
-					if g.Name == groupName {
-						orgGroup = &g
-						break
+					workspaceRole, err := stringToWorkspaceRole(role)
+					if err != nil {
+						return err
 					}
-				}
 
-				if orgGroup == nil {
-					return xerrors.Errorf("Could not find group named %s belonging to the organization %s", groupName, org.Name)
-				}
+					groupRoles[orgGroup.ID.String()] = workspaceRole
 
-				workspaceRole, err := stringToWorkspaceRole(role)
-				if err != nil {
-					return err
 				}
-
-				groupRoles[orgGroup.ID.String()] = workspaceRole
-
 			}
 
 			err = client.UpdateWorkspaceACL(inv.Context(), workspace.ID, codersdk.UpdateWorkspaceACL{
diff --git a/cli/sharing_test.go b/cli/sharing_test.go
@@ -31,7 +31,7 @@ func TestSharingShare(t *testing.T) {
 		)
 
 		ctx := testutil.Context(t, testutil.WaitMedium)
-		var inv, root = clitest.New(t, "sharing", "share", workspace.Name, "--user", toShareWithUser.Username)
+		var inv, root = clitest.New(t, "sharing", "share", workspace.Name, "--org", orgOwner.OrganizationID.String(), "--user", toShareWithUser.Username)
 		clitest.SetupConfig(t, workspaceOwnerClient, root)
 
 		err := inv.WithContext(ctx).Run()

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ func TestSharingShare(t *testing.T) {`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`ctx := testutil.Context(t, testutil.WaitMedium)`
`34`		`- var inv, root = clitest.New(t, "sharing", "share", workspace.Name, "--user", toShareWithUser.Username)`
	`34`	`+ var inv, root = clitest.New(t, "sharing", "share", workspace.Name, "--org", orgOwner.OrganizationID.String(), "--user", toShareWithUser.Username)`
`35`	`35`	`clitest.SetupConfig(t, workspaceOwnerClient, root)`
`36`	`36`
`37`	`37`	`err := inv.WithContext(ctx).Run()`