Skip to content

Commit 0eaff5b

Browse files
committed
address comments
1 parent 4239b2b commit 0eaff5b

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

pkg/connector/connector.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ func getOrgs(ctx context.Context, client *github.Client, orgs []string) ([]strin
451451
orgs, resp, err := client.Organizations.List(ctx, "", &github.ListOptions{Page: page, PerPage: maxPageSize})
452452
if err != nil {
453453
if isRatelimited(resp) {
454-
return nil, nil
454+
return nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
455455
}
456456
return nil, fmt.Errorf("github-connector: failed to retrieve org: %w", err)
457457
}

pkg/connector/org.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func (o *orgResourceType) List(
131131
}
132132

133133
if isRatelimited(resp) {
134-
return ret, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
134+
return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
135135
}
136136
return nil, "", nil, err
137137
}

pkg/connector/org_role.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func (o *orgRoleResourceType) List(
9191
return nil, "", nil, nil
9292
}
9393
if isRatelimited(resp) {
94-
uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
94+
return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
9595
}
9696
return nil, "", nil, fmt.Errorf("failed to list organization roles: %w", err)
9797
}

pkg/connector/user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ func (o *userResourceType) List(ctx context.Context, parentID *v2.ResourceId, pt
163163
if res == nil || res.StatusCode != http.StatusNotFound {
164164
return nil, "", nil, err
165165
}
166-
if isRatelimited(resp) {
166+
if isRatelimited(res) {
167167
return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
168168
}
169169
l.Error("error fetching user by id", zap.Error(err), zap.Int64("user_id", user.GetID()))

0 commit comments

Comments
 (0)