From 519c1edb4c4b565d528c440ad84adad1dd7f784c Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Mon, 28 Apr 2025 18:29:33 +0000 Subject: [PATCH 1/2] chore: update error message for duplicate organization members --- coderd/members.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coderd/members.go b/coderd/members.go index 1e5cc20bb5419..5a031fe7eab90 100644 --- a/coderd/members.go +++ b/coderd/members.go @@ -62,7 +62,8 @@ func (api *API) postOrganizationMember(rw http.ResponseWriter, r *http.Request) } if database.IsUniqueViolation(err, database.UniqueOrganizationMembersPkey) { httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{ - Message: "Organization member already exists in this organization", + Message: "User is already an organization member", + Detail: fmt.Sprintf("%s is already a member of %s", user.Username, organization.DisplayName), }) return } From 445a35b2cb9ef43e4c65af866cc09053d41b88f4 Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Mon, 28 Apr 2025 20:35:05 +0000 Subject: [PATCH 2/2] fix test --- coderd/members_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coderd/members_test.go b/coderd/members_test.go index 0d133bb27aef8..bc892bb0679d4 100644 --- a/coderd/members_test.go +++ b/coderd/members_test.go @@ -26,7 +26,7 @@ func TestAddMember(t *testing.T) { // Add user to org, even though they already exist // nolint:gocritic // must be an owner to see the user _, err := owner.PostOrganizationMember(ctx, first.OrganizationID, user.Username) - require.ErrorContains(t, err, "already exists") + require.ErrorContains(t, err, "already an organization member") }) }