From b39029f47892e358e22d39eb616897236486a10d Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Tue, 17 Sep 2024 09:35:36 -0500 Subject: [PATCH 1/2] chore: allow removing users from the default org Removed as no longer in experimental --- coderd/members.go | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/coderd/members.go b/coderd/members.go index 48006221efc59..45bf9aa36dc2b 100644 --- a/coderd/members.go +++ b/coderd/members.go @@ -116,19 +116,6 @@ func (api *API) deleteOrganizationMember(rw http.ResponseWriter, r *http.Request aReq.Old = member.OrganizationMember.Auditable(member.Username) defer commitAudit() - if organization.IsDefault { - // Multi-organizations is currently an experiment, which means it is feasible - // for a deployment to enable, then disable this. To maintain backwards - // compatibility, this safety is necessary. - // TODO: Remove this check when multi-organizations is fully supported. - httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{ - Message: "Removing members from the default organization is not supported.", - Detail: "Multi-organizations is currently an experiment, and until it is fully supported, the default org should be protected.", - Validations: nil, - }) - return - } - if member.UserID == apiKey.UserID { httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{Message: "cannot remove self from an organization"}) return From c1c217aa040aef84cfe14f56c2c3a280a7486c45 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Tue, 17 Sep 2024 09:36:34 -0500 Subject: [PATCH 2/2] fix unit test --- coderd/members_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coderd/members_test.go b/coderd/members_test.go index 13b6779c30663..0d133bb27aef8 100644 --- a/coderd/members_test.go +++ b/coderd/members_test.go @@ -33,7 +33,7 @@ func TestAddMember(t *testing.T) { func TestDeleteMember(t *testing.T) { t.Parallel() - t.Run("NotAllowed", func(t *testing.T) { + t.Run("Allowed", func(t *testing.T) { t.Parallel() owner := coderdtest.New(t, nil) first := coderdtest.CreateFirstUser(t, owner) @@ -45,7 +45,7 @@ func TestDeleteMember(t *testing.T) { // this test should be updated to check there is no error. // nolint:gocritic // must be an owner to see the user err := owner.DeleteOrganizationMember(ctx, first.OrganizationID, user.Username) - require.ErrorContains(t, err, "Multi-organizations is currently an experiment") + require.NoError(t, err) }) }