From da039b2efc8326dca0ce42ef41ed265a0191cbd2 Mon Sep 17 00:00:00 2001
From: Danielle Maywood <danielle@themaywoods.com>
Date: Fri, 29 May 2026 10:02:25 +0000
Subject: [PATCH] fix(cli): address chat share add lint failures

---
 cli/exp_chat_share.go          | 16 +++-------------
 cli/exp_chat_share_add_test.go |  8 ++++----
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/cli/exp_chat_share.go b/cli/exp_chat_share.go
index 152af9b375..7a0bd432bb 100644
--- a/cli/exp_chat_share.go
+++ b/cli/exp_chat_share.go
@@ -63,16 +63,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):
@@ -84,8 +74,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 {
@@ -118,7 +108,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(),
diff --git a/cli/exp_chat_share_add_test.go b/cli/exp_chat_share_add_test.go
index 051ed25910..4c1a3b08f9 100644
--- a/cli/exp_chat_share_add_test.go
+++ b/cli/exp_chat_share_add_test.go
@@ -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)