From 9c9785e359042b7cf9086dca64e4b74da5a4844a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E6=87=BF=E8=B5=AB?= Date: Tue, 9 Nov 2021 23:22:46 +0800 Subject: [PATCH] fix: wrong position of orgID and userID in `org members remove` (#318) --- clients/org/org_members.go | 2 +- clients/org/org_members_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/clients/org/org_members.go b/clients/org/org_members.go index 94aa4f2..ba3618d 100644 --- a/clients/org/org_members.go +++ b/clients/org/org_members.go @@ -136,7 +136,7 @@ func (c Client) RemoveMember(ctx context.Context, params *RemoveMemberParams) (e } } - if err = c.DeleteOrgsIDMembersID(ctx, orgID, params.MemberId.String()).Execute(); err != nil { + if err = c.DeleteOrgsIDMembersID(ctx, params.MemberId.String(), orgID).Execute(); err != nil { return fmt.Errorf("failed to remove member %q from org %q", params.MemberId, orgID) } diff --git a/clients/org/org_members_test.go b/clients/org/org_members_test.go index 4b215d6..6019040 100644 --- a/clients/org/org_members_test.go +++ b/clients/org/org_members_test.go @@ -352,7 +352,7 @@ func TestClient_RemoveMembers(t *testing.T) { registerExpectations: func(t *testing.T, orgApi *mock.MockOrganizationsApi) { req := api.ApiDeleteOrgsIDMembersIDRequest{ApiService: orgApi}.OrgID(id1.String()).UserID(id2.String()) orgApi.EXPECT(). - DeleteOrgsIDMembersID(gomock.Any(), gomock.Eq(id1.String()), gomock.Eq(id2.String())).Return(req) + DeleteOrgsIDMembersID(gomock.Any(), gomock.Eq(id2.String()), gomock.Eq(id1.String())).Return(req) orgApi.EXPECT().DeleteOrgsIDMembersIDExecute(gomock.Eq(req)).Return(nil) }, expectedOut: "user \"2222222222222222\" has been removed from org \"1111111111111111\"", @@ -374,7 +374,7 @@ func TestClient_RemoveMembers(t *testing.T) { req := api.ApiDeleteOrgsIDMembersIDRequest{ApiService: orgApi}.OrgID(id1.String()).UserID(id2.String()) orgApi.EXPECT(). - DeleteOrgsIDMembersID(gomock.Any(), gomock.Eq(id1.String()), gomock.Eq(id2.String())).Return(req) + DeleteOrgsIDMembersID(gomock.Any(), gomock.Eq(id2.String()), gomock.Eq(id1.String())).Return(req) orgApi.EXPECT().DeleteOrgsIDMembersIDExecute(gomock.Eq(req)).Return(nil) }, expectedOut: "user \"2222222222222222\" has been removed from org \"1111111111111111\"", @@ -395,7 +395,7 @@ func TestClient_RemoveMembers(t *testing.T) { req := api.ApiDeleteOrgsIDMembersIDRequest{ApiService: orgApi}.OrgID(id1.String()).UserID(id2.String()) orgApi.EXPECT(). - DeleteOrgsIDMembersID(gomock.Any(), gomock.Eq(id1.String()), gomock.Eq(id2.String())).Return(req) + DeleteOrgsIDMembersID(gomock.Any(), gomock.Eq(id2.String()), gomock.Eq(id1.String()), ).Return(req) orgApi.EXPECT().DeleteOrgsIDMembersIDExecute(gomock.Eq(req)).Return(nil) }, expectedOut: "user \"2222222222222222\" has been removed from org \"1111111111111111\"",