cursor

Author: Bencheng21

pkg/connector/enterprise_role.go

@@ -142,7 +142,7 @@ func (o *enterpriseRoleResourceType) Grants(
 		user, resp, err := o.client.Users.Get(ctx, userLogin)
 		if err != nil {
 			if isRatelimited(resp) {
-				return ret, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
+				return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
 			}
 			return nil, "", nil, fmt.Errorf("baton-github: error getting user %s: %w", userLogin, err)
 		}

pkg/connector/user.go

@@ -159,13 +159,13 @@ func (o *userResourceType) List(ctx context.Context, parentID *v2.ResourceId, pt
 	for _, user := range users {
 		u, res, err := o.client.Users.GetByID(ctx, user.GetID())
 		if err != nil {
+			if isRatelimited(res) {
+				return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
+			}
 			// This undocumented API can return 404 for some users. If this fails it means we won't get some of their details like email
 			if res == nil || res.StatusCode != http.StatusNotFound {
 				return nil, "", nil, err
 			}
-			if isRatelimited(res) {
-				return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
-			}
 			l.Error("error fetching user by id", zap.Error(err), zap.Int64("user_id", user.GetID()))
 			u = user
 		}