From 12589026b60949718bdd0b1816f1b329ba16ee4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=B1=E3=82=A4=E3=83=A9?= Date: Mon, 28 Apr 2025 13:51:33 -0700 Subject: [PATCH] chore: update error message for duplicate organization members (#17594) Closes https://github.com/coder/internal/issues/345 --- coderd/members.go | 3 ++- coderd/members_test.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/coderd/members.go b/coderd/members.go index 1e5cc20bb5..5a031fe7ea 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 } diff --git a/coderd/members_test.go b/coderd/members_test.go index 0d133bb27a..bc892bb067 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") }) }