more

Author: Bencheng21

pkg/connector/invitation.go

@@ -11,6 +11,8 @@ import (
 	"github.com/conductorone/baton-sdk/pkg/pagination"
 	"github.com/conductorone/baton-sdk/pkg/types/resource"
 	"github.com/google/go-github/v69/github"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 )
 
 func invitationToUserResource(invitation *github.Invitation) (*v2.Resource, error) {
@@ -69,10 +71,14 @@ func (i *invitationResourceType) List(ctx context.Context, parentID *v2.Resource
 		PerPage: pt.Size,
 	})
 	if err != nil {
+		errMsg := "github-connector: ListPendingOrgInvitatioins failed"
 		if isNotFoundError(resp) {
 			return nil, "", nil, nil
 		}
-		return nil, "", nil, fmt.Errorf("github-connector: ListPendingOrgInvitatioins failed: %w", err)
+		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)
 	}
 
 	restApiRateLimit, err := extractRateLimitData(resp)

pkg/connector/org.go

@@ -102,7 +102,11 @@ func (o *orgResourceType) List(
 
 	orgs, resp, err := o.client.Organizations.List(ctx, "", opts)
 	if err != nil {
-		return nil, "", nil, fmt.Errorf("github-connector: failed to fetch org: %w", err)
+		errMsg := "github-connector: failed to fetch org"
+		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/repository.go

@@ -16,6 +16,8 @@ import (
 	"github.com/google/go-github/v69/github"
 	"github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap"
 	"go.uber.org/zap"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 )
 
 // outside collaborators are given one of these roles too.
@@ -88,7 +90,11 @@ func (o *repositoryResourceType) List(ctx context.Context, parentID *v2.Resource
 
 	repos, resp, err := o.client.Repositories.ListByOrg(ctx, orgName, opts)
 	if err != nil {
-		return nil, "", nil, fmt.Errorf("github-connector: failed to list repositories: %w", err)
+		errMsg := "github-connector: failed to list repositories"
+		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

@@ -17,6 +17,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"
 )
 
 const (
@@ -95,7 +96,11 @@ func (o *teamResourceType) List(ctx context.Context, parentID *v2.ResourceId, pt
 
 	teams, resp, err := o.client.Teams.ListTeams(ctx, orgName, opts)
 	if err != nil {
-		return nil, "", nil, fmt.Errorf("github-connector: failed to list teams: %w", err)
+		errMsg := "github-connector: failed to list teams"
+		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/user.go

@@ -16,6 +16,8 @@ import (
 	"github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap"
 	"github.com/shurcooL/githubv4"
 	"go.uber.org/zap"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
@@ -131,7 +133,11 @@ func (o *userResourceType) List(ctx context.Context, parentID *v2.ResourceId, pt
 
 	users, resp, err := o.client.Organizations.ListMembers(ctx, orgName, &opts)
 	if err != nil {
-		return nil, "", nil, fmt.Errorf("github-connector: ListMembers failed: %w", err)
+		errMsg := "github-connector: ListMembers failed"
+		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)
 	}
 
 	restApiRateLimit, err = extractRateLimitData(resp)