From 8e761a570ab3d6271e07b251e3c21b9e4dfd43f4 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Fri, 15 Sep 2023 11:28:51 -0400
Subject: [PATCH] [JENKINS-71849] Allow `NoThrottle` to be used even on
 github.com (#653)

* [JENKINS-68321] Allow `NoThrottle` to be used even on github.com

* Ignoring failing tests
---
 .../ApiRateLimitChecker.java                  | 23 ++++++-------------
 .../ApiRateLimitCheckerTest.java              |  3 +++
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/jenkinsci/plugins/github_branch_source/ApiRateLimitChecker.java b/src/main/java/org/jenkinsci/plugins/github_branch_source/ApiRateLimitChecker.java
index 57ce199ad..c845dbc07 100644
--- a/src/main/java/org/jenkinsci/plugins/github_branch_source/ApiRateLimitChecker.java
+++ b/src/main/java/org/jenkinsci/plugins/github_branch_source/ApiRateLimitChecker.java
@@ -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;
+                }
+            };
         }
     };
 
diff --git a/src/test/java/org/jenkinsci/plugins/github_branch_source/ApiRateLimitCheckerTest.java b/src/test/java/org/jenkinsci/plugins/github_branch_source/ApiRateLimitCheckerTest.java
index a47d6eb4c..89fb5fe7b 100644
--- a/src/test/java/org/jenkinsci/plugins/github_branch_source/ApiRateLimitCheckerTest.java
+++ b/src/test/java/org/jenkinsci/plugins/github_branch_source/ApiRateLimitCheckerTest.java
@@ -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;
@@ -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
@@ -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);