add rate limit data to errors for retries

aldevv · aldevv · commit c87b79a120bd · 2025-09-29T14:47:30.000-05:00
diff --git a/pkg/connector/api_token.go b/pkg/connector/api_token.go
@@ -95,7 +95,7 @@ func (o *apiTokenResourceType) List(
 	})
 	if err != nil {
 		if isRatelimited(resp) {
-			return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
+			return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)
 		}
 		return nil, "", nil, err
 	}
diff --git a/pkg/connector/connector.go b/pkg/connector/connector.go
@@ -459,7 +459,7 @@ func getOrgs(ctx context.Context, client *github.Client, orgs []string) ([]strin
 		orgs, resp, err := client.Organizations.List(ctx, "", &github.ListOptions{Page: page, PerPage: maxPageSize})
 		if err != nil {
 			if isRatelimited(resp) {
-				return nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
+				return nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)
 			}
 			if isAuthError(resp) {
 				return nil, uhttp.WrapErrors(codes.Unauthenticated, "github-connector: failed to retrieve org", err)
diff --git a/pkg/connector/enterprise_role.go b/pkg/connector/enterprise_role.go
@@ -143,7 +143,7 @@ func (o *enterpriseRoleResourceType) Grants(
 		user, resp, err := o.userCache.GetUserByLogin(ctx, userLogin)
 		if err != nil {
 			if isRatelimited(resp) {
-				return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
+				return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)
 			}
 			return nil, "", nil, fmt.Errorf("baton-github: error getting user %s: %w", userLogin, err)
 		}
diff --git a/pkg/connector/org.go b/pkg/connector/org.go
@@ -104,7 +104,7 @@ func (o *orgResourceType) List(
 	orgs, resp, err := o.client.Organizations.List(ctx, "", opts)
 	if err != nil {
 		if isRatelimited(resp) {
-			return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
+			return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)
 		}
 		return nil, "", nil, fmt.Errorf("github-connector: failed to fetch org: %w", err)
 	}
@@ -132,7 +132,7 @@ func (o *orgResourceType) List(
 			}
 
 			if isRatelimited(resp) {
-				return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
+				return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)
 			}
 			return nil, "", nil, err
 		}
@@ -230,7 +230,7 @@ func (o *orgResourceType) Grants(
 			}
 			errMsg := "github-connectorv2: failed to list org members"
 			if isRatelimited(resp) {
-				return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
+				return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)
 			}
 			return nil, "", nil, fmt.Errorf("%s: %w", errMsg, err)
 		}
diff --git a/pkg/connector/org_role.go b/pkg/connector/org_role.go
@@ -92,7 +92,7 @@ func (o *orgRoleResourceType) List(
 			return nil, "", nil, nil
 		}
 		if isRatelimited(resp) {
-			return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
+			return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)
 		}
 		return nil, "", nil, fmt.Errorf("failed to list organization roles: %w", err)
 	}
@@ -229,7 +229,7 @@ func (o *orgRoleResourceType) Grants(
 				return nil, pageToken, nil, nil
 			}
 			if isRatelimited(resp) {
-				return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
+				return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)
 			}
 			return nil, "", nil, fmt.Errorf("failed to list role teams: %w", err)
 		}
diff --git a/pkg/connector/repository.go b/pkg/connector/repository.go
@@ -184,7 +184,7 @@ func (o *repositoryResourceType) Grants(
 				return nil, "", nil, uhttp.WrapErrors(codes.NotFound, fmt.Sprintf("repo: %s not found", resource.DisplayName))
 			}
 			if isRatelimited(resp) {
-				return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
+				return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)
 			}
 			return nil, "", nil, fmt.Errorf("github-connector: failed to list repos: %w", err)
 		}
@@ -240,7 +240,7 @@ func (o *repositoryResourceType) Grants(
 			}
 
 			if isRatelimited(resp) {
-				return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
+				return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)
 			}
 			return nil, "", nil, fmt.Errorf("github-connector: failed to list repos: %w", err)
 		}
diff --git a/pkg/connector/team.go b/pkg/connector/team.go
@@ -98,7 +98,7 @@ func (o *teamResourceType) List(ctx context.Context, parentID *v2.ResourceId, pt
 	teams, resp, err := o.client.Teams.ListTeams(ctx, orgName, opts)
 	if err != nil {
 		if isRatelimited(resp) {
-			return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
+			return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)
 		}
 		return nil, "", nil, fmt.Errorf("github-connector: failed to list teams: %w", err)
 	}
@@ -112,7 +112,7 @@ func (o *teamResourceType) List(ctx context.Context, parentID *v2.ResourceId, pt
 		fullTeam, resp, err := o.teamCache.GetTeam(ctx, orgID, team.GetID())
 		if err != nil {
 			if isRatelimited(resp) {
-				return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
+				return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)
 			}
 			return nil, "", nil, err
 		}
@@ -175,7 +175,7 @@ func (o *teamResourceType) Grants(ctx context.Context, resource *v2.Resource, pT
 	org, resp, err := o.client.Organizations.GetByID(ctx, orgID)
 	if err != nil {
 		if isRatelimited(resp) {
-			return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
+			return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)
 		}
 		return nil, "", nil, err
 	}
@@ -214,7 +214,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", err)
+				return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)
 			}
 			return nil, "", nil, fmt.Errorf("github-connectorv2: failed to fetch team members: %w", err)
 		}
diff --git a/pkg/connector/user.go b/pkg/connector/user.go
@@ -135,7 +135,7 @@ func (o *userResourceType) List(ctx context.Context, parentID *v2.ResourceId, pt
 	users, resp, err := o.client.Organizations.ListMembers(ctx, orgName, &opts)
 	if err != nil {
 		if isRatelimited(resp) {
-			return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
+			return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)
 		}
 		return nil, "", nil, fmt.Errorf("github-connector: ListMembers failed: %w", err)
 	}
@@ -161,7 +161,7 @@ func (o *userResourceType) List(ctx context.Context, parentID *v2.ResourceId, pt
 		u, res, err := o.userCache.GetUser(ctx, user.GetID())
 		if err != nil {
 			if isRatelimited(res) {
-				return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)
+				return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, res.Response, 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 {

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ func (o *apiTokenResourceType) List(`
`95`	`95`	`})`
`96`	`96`	`if err != nil {`
`97`	`97`	`if isRatelimited(resp) {`
`98`		`- return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)`
	`98`	`+ return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)`
`99`	`99`	`}`
`100`	`100`	`return nil, "", nil, err`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -459,7 +459,7 @@ func getOrgs(ctx context.Context, client *github.Client, orgs []string) ([]strin`
`459`	`459`	`orgs, resp, err := client.Organizations.List(ctx, "", &github.ListOptions{Page: page, PerPage: maxPageSize})`
`460`	`460`	`if err != nil {`
`461`	`461`	`if isRatelimited(resp) {`
`462`		`- return nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)`
	`462`	`+ return nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)`
`463`	`463`	`}`
`464`	`464`	`if isAuthError(resp) {`
`465`	`465`	`return nil, uhttp.WrapErrors(codes.Unauthenticated, "github-connector: failed to retrieve org", err)`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ func (o *enterpriseRoleResourceType) Grants(`
`143`	`143`	`user, resp, err := o.userCache.GetUserByLogin(ctx, userLogin)`
`144`	`144`	`if err != nil {`
`145`	`145`	`if isRatelimited(resp) {`
`146`		`- return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)`
	`146`	`+ return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)`
`147`	`147`	`}`
`148`	`148`	`return nil, "", nil, fmt.Errorf("baton-github: error getting user %s: %w", userLogin, err)`
`149`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ func (o *orgResourceType) List(`
`104`	`104`	`orgs, resp, err := o.client.Organizations.List(ctx, "", opts)`
`105`	`105`	`if err != nil {`
`106`	`106`	`if isRatelimited(resp) {`
`107`		`- return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)`
	`107`	`+ return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)`
`108`	`108`	`}`
`109`	`109`	`return nil, "", nil, fmt.Errorf("github-connector: failed to fetch org: %w", err)`
`110`	`110`	`}`
`@@ -132,7 +132,7 @@ func (o *orgResourceType) List(`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`if isRatelimited(resp) {`
`135`		`- return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)`
	`135`	`+ return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)`
`136`	`136`	`}`
`137`	`137`	`return nil, "", nil, err`
`138`	`138`	`}`
`@@ -230,7 +230,7 @@ func (o *orgResourceType) Grants(`
`230`	`230`	`}`
`231`	`231`	`errMsg := "github-connectorv2: failed to list org members"`
`232`	`232`	`if isRatelimited(resp) {`
`233`		`- return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)`
	`233`	`+ return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)`
`234`	`234`	`}`
`235`	`235`	`return nil, "", nil, fmt.Errorf("%s: %w", errMsg, err)`
`236`	`236`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ func (o *orgRoleResourceType) List(`
`92`	`92`	`return nil, "", nil, nil`
`93`	`93`	`}`
`94`	`94`	`if isRatelimited(resp) {`
`95`		`- return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)`
	`95`	`+ return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)`
`96`	`96`	`}`
`97`	`97`	`return nil, "", nil, fmt.Errorf("failed to list organization roles: %w", err)`
`98`	`98`	`}`
`@@ -229,7 +229,7 @@ func (o *orgRoleResourceType) Grants(`
`229`	`229`	`return nil, pageToken, nil, nil`
`230`	`230`	`}`
`231`	`231`	`if isRatelimited(resp) {`
`232`		`- return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)`
	`232`	`+ return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)`
`233`	`233`	`}`
`234`	`234`	`return nil, "", nil, fmt.Errorf("failed to list role teams: %w", err)`
`235`	`235`	`}`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ func (o *repositoryResourceType) Grants(`
`184`	`184`	`return nil, "", nil, uhttp.WrapErrors(codes.NotFound, fmt.Sprintf("repo: %s not found", resource.DisplayName))`
`185`	`185`	`}`
`186`	`186`	`if isRatelimited(resp) {`
`187`		`- return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)`
	`187`	`+ return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)`
`188`	`188`	`}`
`189`	`189`	`return nil, "", nil, fmt.Errorf("github-connector: failed to list repos: %w", err)`
`190`	`190`	`}`
`@@ -240,7 +240,7 @@ func (o *repositoryResourceType) Grants(`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`if isRatelimited(resp) {`
`243`		`- return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)`
	`243`	`+ return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)`
`244`	`244`	`}`
`245`	`245`	`return nil, "", nil, fmt.Errorf("github-connector: failed to list repos: %w", err)`
`246`	`246`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ func (o teamResourceType) List(ctx context.Context, parentID v2.ResourceId, pt`
`98`	`98`	`teams, resp, err := o.client.Teams.ListTeams(ctx, orgName, opts)`
`99`	`99`	`if err != nil {`
`100`	`100`	`if isRatelimited(resp) {`
`101`		`- return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)`
	`101`	`+ return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)`
`102`	`102`	`}`
`103`	`103`	`return nil, "", nil, fmt.Errorf("github-connector: failed to list teams: %w", err)`
`104`	`104`	`}`
`@@ -112,7 +112,7 @@ func (o teamResourceType) List(ctx context.Context, parentID v2.ResourceId, pt`
`112`	`112`	`fullTeam, resp, err := o.teamCache.GetTeam(ctx, orgID, team.GetID())`
`113`	`113`	`if err != nil {`
`114`	`114`	`if isRatelimited(resp) {`
`115`		`- return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)`
	`115`	`+ return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)`
`116`	`116`	`}`
`117`	`117`	`return nil, "", nil, err`
`118`	`118`	`}`
`@@ -175,7 +175,7 @@ func (o teamResourceType) Grants(ctx context.Context, resource v2.Resource, pT`
`175`	`175`	`org, resp, err := o.client.Organizations.GetByID(ctx, orgID)`
`176`	`176`	`if err != nil {`
`177`	`177`	`if isRatelimited(resp) {`
`178`		`- return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)`
	`178`	`+ return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)`
`179`	`179`	`}`
`180`	`180`	`return nil, "", nil, err`
`181`	`181`	`}`
`@@ -214,7 +214,7 @@ func (o teamResourceType) Grants(ctx context.Context, resource v2.Resource, pT`
`214`	`214`	`return nil, "", nil, uhttp.WrapErrors(codes.NotFound, fmt.Sprintf("org: %d not found", org.GetID()))`
`215`	`215`	`}`
`216`	`216`	`if isRatelimited(resp) {`
`217`		`- return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)`
	`217`	`+ return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)`
`218`	`218`	`}`
`219`	`219`	`return nil, "", nil, fmt.Errorf("github-connectorv2: failed to fetch team members: %w", err)`
`220`	`220`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ func (o userResourceType) List(ctx context.Context, parentID v2.ResourceId, pt`
`135`	`135`	`users, resp, err := o.client.Organizations.ListMembers(ctx, orgName, &opts)`
`136`	`136`	`if err != nil {`
`137`	`137`	`if isRatelimited(resp) {`
`138`		`- return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)`
	`138`	`+ return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp.Response, err)`
`139`	`139`	`}`
`140`	`140`	`return nil, "", nil, fmt.Errorf("github-connector: ListMembers failed: %w", err)`
`141`	`141`	`}`
`@@ -161,7 +161,7 @@ func (o userResourceType) List(ctx context.Context, parentID v2.ResourceId, pt`
`161`	`161`	`u, res, err := o.userCache.GetUser(ctx, user.GetID())`
`162`	`162`	`if err != nil {`
`163`	`163`	`if isRatelimited(res) {`
`164`		`- return nil, "", nil, uhttp.WrapErrors(codes.Unavailable, "too many requests", err)`
	`164`	`+ return nil, "", nil, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, res.Response, err)`
`165`	`165`	`}`
`166`	`166`	`// This undocumented API can return 404 for some users. If this fails it means we won't get some of their details like email`
`167`	`167`	`if res == nil \|\| res.StatusCode != http.StatusNotFound {`