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:27:35 +00:00
parent f5581790d8 44bc32149e
commit 754e122564
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/exp_chat_share.go
+5 -6
View File
@@ -47,21 +47,20 @@ func parseChatShareID(raw string) (uuid.UUID, error) {
}
func parseChatShareActorRole(raw string) ([2]string, error) {
if strings.Count(raw, ":") > 1 {
name, role, hasRole := strings.Cut(raw, ":")
if strings.Contains(role, ":") {
return [2]string{}, xerrors.New("must match pattern 'name:role'")
}
parts := strings.SplitN(raw, ":", 2)
name := parts[0]
if name == "" || !codersdk.UsernameValidRegex.MatchString(name) {
return [2]string{}, xerrors.New("invalid name")
}
if len(parts) == 1 {
if !hasRole {
return [2]string{name, ""}, nil
}
if parts[1] == "" {
if role == "" {
return [2]string{}, xerrors.New("role cannot be empty")
}
return [2]string{name, parts[1]}, nil
return [2]string{name, role}, nil
}
func stringToChatRole(role string) (codersdk.ChatRole, error) {
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) //nolint:gocritic // Chat ACL updates require the chat owner to fetch and modify the chat.
clitest.SetupConfig(t, client, root) //nolint:gocritic // Chat ACL operations require the chat owner in this fixture.
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) //nolint:gocritic // Chat ACL updates require the chat owner to fetch and modify the chat.
clitest.SetupConfig(t, client, root) //nolint:gocritic // Chat ACL operations require the chat owner in this fixture.
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) //nolint:gocritic // Chat ACL updates require the chat owner to fetch and modify the chat.
clitest.SetupConfig(t, client, root) //nolint:gocritic // Chat ACL operations require the chat owner in this fixture.
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) //nolint:gocritic // Chat ACL updates require the chat owner to fetch and modify the chat.
clitest.SetupConfig(t, client, root) //nolint:gocritic // Chat ACL operations require the chat owner in this fixture.
err := inv.WithContext(ctx).Run()
require.Error(t, err)