cr

Author: Bencheng21

pkg/connector/helpers.go

@@ -225,3 +225,10 @@ func isNotFoundError(resp *github.Response) bool {
 	}
 	return resp.StatusCode == http.StatusNotFound
 }
+
+func isRatelimited(resp *github.Response) bool {
+	if resp == nil {
+		return false
+	}
+	return resp.StatusCode == http.StatusForbidden || resp.StatusCode == http.StatusTooManyRequests
+}

pkg/connector/org.go

@@ -18,6 +18,7 @@ import (
 	"github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap"
 	"go.uber.org/zap"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/proto"
 )
 
@@ -204,7 +205,11 @@ func (o *orgResourceType) Grants(
 		if isNotFoundError(resp) {
 			return nil, "", nil, uhttp.WrapErrors(codes.NotFound, fmt.Sprintf("org: %s not found", orgName))
 		}
-		return nil, "", nil, fmt.Errorf("github-connectorv2: failed to list org members: %w", err)
+		errMsg := "github-connectorv2: failed to list org members"
+		if isRatelimited(resp) {
+			return nil, "", nil, fmt.Errorf("%s: %w", errMsg, status.Error(codes.Unavailable, "too many requests"))
+		}
+		return nil, "", nil, fmt.Errorf("%s: %w", errMsg, err)
 	}
 
 	nextPage, reqAnnos, err := parseResp(resp)

pkg/connector/team.go

@@ -186,6 +186,9 @@ func (o *teamResourceType) Grants(ctx context.Context, resource *v2.Resource, pT
 		if isNotFoundError(resp) {
 			return nil, "", nil, uhttp.WrapErrors(codes.NotFound, fmt.Sprintf("org: %d not found", org.GetID()))
 		}
+		if isRatelimited(resp) {
+			return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests")
+		}
 		return nil, "", nil, fmt.Errorf("github-connectorv2: failed to fetch team members: %w", err)
 	}