Merge pull request #99 from ConductorOne/jallers/tweak-ratelimit

johnallers · web-flow · commit 1a48b6393388 · 2025-07-29T10:51:50.000-04:00
Distinguish between 403 rate limit vs permission error
diff --git a/pkg/connector/helpers.go b/pkg/connector/helpers.go
@@ -230,5 +230,8 @@ func isRatelimited(resp *github.Response) bool {
 	if resp == nil {
 		return false
 	}
-	return resp.StatusCode == http.StatusForbidden || resp.StatusCode == http.StatusTooManyRequests
+	if resp.Header.Get("X-Ratelimit-Remaining") == "0" {
+		return true
+	}
+	return resp.StatusCode == http.StatusTooManyRequests
 }

Original file line number	Diff line number	Diff line change
`@@ -230,5 +230,8 @@ func isRatelimited(resp *github.Response) bool {`
`230`	`230`	`if resp == nil {`
`231`	`231`	`return false`
`232`	`232`	`}`
`233`		`- return resp.StatusCode == http.StatusForbidden \|\| resp.StatusCode == http.StatusTooManyRequests`
	`233`	`+ if resp.Header.Get("X-Ratelimit-Remaining") == "0" {`
	`234`	`+ return true`
	`235`	`+ }`
	`236`	`+ return resp.StatusCode == http.StatusTooManyRequests`
`234`	`237`	`}`