Skip to content

Commit 31d1664

Browse files
committed
Update RemoveSecurityManagerTeam to use org roles APIs
1 parent d5e450b commit 31d1664

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

github/orgs_security_managers.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,14 @@ func (s *OrganizationsService) AddSecurityManagerTeam(ctx context.Context, org,
6969

7070
// RemoveSecurityManagerTeam removes a team from the list of security managers for an organization.
7171
//
72-
// GitHub API docs: https://docs.github.com/rest/orgs/security-managers#remove-a-security-manager-team
72+
// GitHub API docs: https://docs.github.com/en/rest/orgs/organization-roles#remove-an-organization-role-from-a-team
7373
//
74-
//meta:operation DELETE /orgs/{org}/security-managers/teams/{team_slug}
74+
//meta:operation DELETE /orgs/{org}/organization-roles/teams/{team_slug}/{security_manager_role_id}
7575
func (s *OrganizationsService) RemoveSecurityManagerTeam(ctx context.Context, org, team string) (*Response, error) {
76-
u := fmt.Sprintf("orgs/%v/security-managers/teams/%v", org, team)
77-
req, err := s.client.NewRequest("DELETE", u, nil)
76+
securityManagerRole, resp, err := s.GetSecurityManagerRole(ctx, org)
7877
if err != nil {
79-
return nil, err
78+
return resp, err
8079
}
8180

82-
return s.client.Do(ctx, req, nil)
81+
return s.RemoveOrgRoleFromTeam(ctx, org, team, securityManagerRole.GetID())
8382
}

github/orgs_security_managers_test.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ func TestOrganizationsService_RemoveSecurityManagerTeam(t *testing.T) {
109109
t.Parallel()
110110
client, mux, _ := setup(t)
111111

112-
mux.HandleFunc("/orgs/o/security-managers/teams/t", func(w http.ResponseWriter, r *http.Request) {
112+
handleGetSecurityManagerRole(t, mux, "o")
113+
mux.HandleFunc("/orgs/o/organization-roles/teams/t/138", func(w http.ResponseWriter, r *http.Request) {
113114
testMethod(t, r, "DELETE")
114115
})
115116

@@ -141,10 +142,12 @@ func TestOrganizationsService_RemoveSecurityManagerTeam_invalidOrg(t *testing.T)
141142

142143
func TestOrganizationsService_RemoveSecurityManagerTeam_invalidTeam(t *testing.T) {
143144
t.Parallel()
144-
client, _, _ := setup(t)
145+
client, mux, _ := setup(t)
146+
147+
handleGetSecurityManagerRole(t, mux, "o")
145148

146149
ctx := context.Background()
147-
_, err := client.Organizations.RemoveSecurityManagerTeam(ctx, "%", "t")
150+
_, err := client.Organizations.RemoveSecurityManagerTeam(ctx, "o", "%")
148151
testURLParseError(t, err)
149152
}
150153

0 commit comments

Comments
 (0)