shishantbiswas/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-06-02 20:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/chat-share-add' into feat/chat-share-remove

Browse Source
This commit is contained in:
Danielle Maywood
2026-05-29 10:02:28 +00:00
parent d3c3178021 da039b2efc
commit 484e79308b
2 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/exp_chat_share.go
+3 -13
View File
@@ -64,16 +64,6 @@ func parseChatShareActorRole(raw string) ([2]string, error) {
return [2]string{name, parts[1]}, nil
}
func parseChatShareActor(raw string) ([2]string, error) {
if strings.Contains(raw, ":") {
return [2]string{}, xerrors.New("roles are only accepted by chat share add")
}
if raw == "" || !codersdk.UsernameValidRegex.MatchString(raw) {
return [2]string{}, xerrors.New("invalid name")
}
return [2]string{raw, ""}, nil
}
func stringToChatRole(role string) (codersdk.ChatRole, error) {
switch role {
case string(codersdk.ChatRoleRead):
@@ -85,8 +75,8 @@ func stringToChatRole(role string) (codersdk.ChatRole, error) {
}
}
func fetchChatUsersAndGroups(ctx context.Context, params chatRoleLookupParams) (map[string]codersdk.ChatRole, map[string]codersdk.ChatRole, error) {
userRoles := make(map[string]codersdk.ChatRole, len(params.Users))
func fetchChatUsersAndGroups(ctx context.Context, params chatRoleLookupParams) (userRoles map[string]codersdk.ChatRole, groupRoles map[string]codersdk.ChatRole, err error) {
userRoles = make(map[string]codersdk.ChatRole, len(params.Users))
if len(params.Users) > 0 {
orgMembers, err := params.Client.OrganizationMembers(ctx, params.OrgID)
if err != nil {
@@ -119,7 +109,7 @@ func fetchChatUsersAndGroups(ctx context.Context, params chatRoleLookupParams) (
}
}
groupRoles := make(map[string]codersdk.ChatRole, len(params.Groups))
groupRoles = make(map[string]codersdk.ChatRole, len(params.Groups))
if len(params.Groups) > 0 {
orgGroups, err := params.Client.Groups(ctx, codersdk.GroupArguments{
Organization: params.OrgID.String(),
cli/exp_chat_share_add_test.go
+4 -4
View File
@@ -35,7 +35,7 @@ func TestExpChatShareAdd(t *testing.T) {
ctx := testutil.Context(t, testutil.WaitMedium)
inv, root := clitest.New(t, "exp", "chat", "share", "add", chat.ID.String(), "--user", toShareWithUser.Username+":read")
clitest.SetupConfig(t, client, root)
clitest.SetupConfig(t, client, root) //nolint:gocritic // Chat ACL updates require the chat owner to fetch and modify the chat.
out := new(bytes.Buffer)
inv.Stdout = out
@@ -73,7 +73,7 @@ func TestExpChatShareAdd(t *testing.T) {
ctx := testutil.Context(t, testutil.WaitMedium)
inv, root := clitest.New(t, "exp", "chat", "share", "add", chat.ID.String(), "--user", toShareWithUser.Username)
clitest.SetupConfig(t, client, root)
clitest.SetupConfig(t, client, root) //nolint:gocritic // Chat ACL updates require the chat owner to fetch and modify the chat.
out := new(bytes.Buffer)
inv.Stdout = out
@@ -113,7 +113,7 @@ func TestExpChatShareAdd(t *testing.T) {
"exp", "chat", "share", "add", chat.ID.String(),
fmt.Sprintf("--user=%s:read,%s:read", toShareWithUser1.Username, toShareWithUser2.Username),
)
clitest.SetupConfig(t, client, root)
clitest.SetupConfig(t, client, root) //nolint:gocritic // Chat ACL updates require the chat owner to fetch and modify the chat.
out := new(bytes.Buffer)
inv.Stdout = out
@@ -158,7 +158,7 @@ func TestExpChatShareAdd(t *testing.T) {
ctx := testutil.Context(t, testutil.WaitMedium)
inv, root := clitest.New(t, "exp", "chat", "share", "add", chat.ID.String(), "--user", toShareWithUser.Username+":write")
clitest.SetupConfig(t, client, root)
clitest.SetupConfig(t, client, root) //nolint:gocritic // Chat ACL updates require the chat owner to fetch and modify the chat.
err := inv.WithContext(ctx).Run()
require.Error(t, err)