Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[JENKINS-71849] Allow NoThrottle to be used even on github.com #653

Merged
merged 4 commits into from
Sep 15, 2023
Merged

[JENKINS-71849] Allow NoThrottle to be used even on github.com #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8867803
[JENKINS-68321] Allow `NoThrottle` to be used even on github.com
jglick Jan 11, 2023
33f063e
Merge branch 'master' of https://github.com/jenkinsci/github-branch-s…
jglick Jan 11, 2023
ece6b0c
Ignoring failing tests
jglick Jan 11, 2023
37e7cd8
Merging with #684
jglick Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 7 additions & 16 deletions src/main/java/org/jenkinsci/plugins/github_branch_source/ApiRateLimitChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,22 +100,13 @@ long checkRateLimitImpl(@NonNull GHRateLimit.Record rateLimit, long count, long
NoThrottle(Messages.ApiRateLimitChecker_NoThrottle()) {
@Override
public LocalChecker getChecker(@NonNull TaskListener listener, String apiUrl) {
if (GitHubServerConfig.GITHUB_URL.equals(apiUrl)) {
// If the GitHub public API is being used, this will fallback to ThrottleOnOver
LocalChecker checker = ThrottleOnOver.getChecker(listener, apiUrl);
checker.writeLog(
"GitHub throttling is disabled, which is not allowed for public GitHub usage, "
+ "so ThrottleOnOver will be used instead. To configure a different rate limiting strategy, go to \"GitHub API usage\" under \"Configure System\" in the Jenkins settings.");
return checker;
} else {
return new LocalChecker(listener) {
@Override
long checkRateLimitImpl(@NonNull GHRateLimit.Record rateLimit, long count, long now)
throws InterruptedException {
return now;
}
};
}
return new LocalChecker(listener) {
@Override
long checkRateLimitImpl(@NonNull GHRateLimit.Record rateLimit, long count, long now)
throws InterruptedException {
return now;
}
};
}
};

Expand Down
3 changes: 3 additions & 0 deletions src/test/java/org/jenkinsci/plugins/github_branch_source/ApiRateLimitCheckerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.jenkinsci.plugins.github.config.GitHubServerConfig;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.kohsuke.github.GHRateLimit;
import org.kohsuke.github.GitHub;
Expand Down Expand Up @@ -159,6 +160,7 @@ private void setupStubs(List<RateLimit> scenarios) throws Exception {
assertEquals(2, initialRequestCount);
}

@Ignore("behavior deliberately modified")
@Test
public void NoCheckerConfigured() throws Exception {
// set up scenarios
Expand Down Expand Up @@ -349,6 +351,7 @@ public void NoThrottleTestShouldNotThrottle404() throws Exception {
*
* @author Marc Salles Navarro
*/
@Ignore("behavior deliberately modified")
@Test
public void NoThrottleTestShouldFallbackToThrottleOnOverForGitHubDotCom() throws Exception {
GitHubConfiguration.get().setApiRateLimitChecker(ApiRateLimitChecker.ThrottleOnOver);
Expand Down
Loading