now

Author: Bencheng21

pkg/connector/org.go

@@ -13,11 +13,11 @@ import (
 	"github.com/conductorone/baton-sdk/pkg/types/entitlement"
 	"github.com/conductorone/baton-sdk/pkg/types/grant"
 	"github.com/conductorone/baton-sdk/pkg/types/resource"
+	"github.com/conductorone/baton-sdk/pkg/uhttp"
 	"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"
 	"google.golang.org/protobuf/proto"
 )
 
@@ -203,7 +203,7 @@ func (o *orgResourceType) Grants(
 	if err != nil {
 		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, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
 		}
 		return nil, "", nil, fmt.Errorf("%s: %w", errMsg, err)
 	}

pkg/connector/team.go

@@ -187,7 +187,7 @@ func (o *teamResourceType) Grants(ctx context.Context, resource *v2.Resource, pT
 			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, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
 		}
 		return nil, "", nil, fmt.Errorf("github-connectorv2: failed to fetch team members: %w", err)
 	}