Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(github): Use new github teams api as old one is deprecated (backport #907) #910

Merged
merged 1 commit into from
Mar 1, 2022
Merged

fix(github): Use new github teams api as old one is deprecated (backport #907) #910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions ...b/src/main/java/com/netflix/spinnaker/fiat/roles/github/GithubTeamsUserRolesProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,9 @@ public Set<String> load(Long key) {
int page = 1;
boolean hasMorePages = true;
do {
List<Member> members = getMembersInTeamPaginated(key, page++);
List<Member> members =
getMembersInTeamPaginated(
gitHubProperties.getOrganization(), key, page++);
members.forEach(m -> memberships.add(m.getLogin().toLowerCase()));
if (members.size() != gitHubProperties.paginationValue) {
hasMorePages = false;
Expand Down Expand Up @@ -295,11 +297,13 @@ private List<Member> getMembersInOrgPaginated(String organization, int page) {
return members;
}

private List<Member> getMembersInTeamPaginated(Long teamId, int page) {
private List<Member> getMembersInTeamPaginated(String organization, Long teamId, int page) {
List<Member> members = new ArrayList<>();
try {
log.debug("Requesting page " + page + " of members team " + teamId + ".");
members = gitHubClient.getMembersOfTeam(teamId, page, gitHubProperties.paginationValue);
members =
gitHubClient.getMembersOfTeam(
organization, teamId, page, gitHubProperties.paginationValue);
} catch (RetrofitError e) {
if (e.getResponse().getStatus() != 404) {
handleNon404s(e);
Expand Down
19 changes: 5 additions & 14 deletions fiat-github/src/main/java/com/netflix/spinnaker/fiat/roles/github/client/GitHubClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,14 @@

import com.netflix.spinnaker.fiat.roles.github.model.Member;
import com.netflix.spinnaker.fiat.roles.github.model.Team;
import com.netflix.spinnaker.fiat.roles.github.model.TeamMembership;
import java.util.List;
import retrofit.client.Response;
import retrofit.http.GET;
import retrofit.http.Path;
import retrofit.http.Query;

/** Retrofit interface for interacting with a GitHub REST API. */
public interface GitHubClient {

@GET("/orgs/{org}/members/{username}")
Response isMemberOfOrganization(@Path("org") String org, @Path("username") String username);

/** This one should use the Current User credentials */
@GET("/user/teams")
List<Team> getUserTeams();

@GET("/orgs/{org}/teams")
List<Team> getOrgTeams(
@Path("org") String org, @Query("page") int page, @Query("per_page") int paginationValue);
Expand All @@ -43,10 +34,10 @@ List<Team> getOrgTeams(
List<Member> getOrgMembers(
@Path("org") String org, @Query("page") int page, @Query("per_page") int paginationValue);

@GET("/teams/{idTeam}/members")
@GET("/orgs/{org}/teams/{idTeam}/members")
List<Member> getMembersOfTeam(
@Path("idTeam") Long idTeam, @Query("page") int page, @Query("per_page") int paginationValue);

@GET("/teams/{idTeam}/memberships/{username}")
TeamMembership isMemberOfTeam(@Path("idTeam") Long idTeam, @Path("username") String username);
@Path("org") String org,
@Path("idTeam") Long idTeam,
@Query("page") int page,
@Query("per_page") int paginationValue);
}
27 changes: 0 additions & 27 deletions fiat-github/src/main/java/com/netflix/spinnaker/fiat/roles/github/model/TeamMembership.java
View file
Open in desktop

This file was deleted.