refactor(limits): Refactor global limits counter (#7931)

renovatebot · Dec 11, 2020 · c98a537 · c98a537
1 parent e41b516
commit c98a537
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 10 deletions.
diff --git a/lib/workers/global/initialize.ts b/lib/workers/global/initialize.ts
@@ -28,14 +28,20 @@ async function setDirectories(input: RenovateConfig): Promise<RenovateConfig> {
   return config;
 }
 
+function limitCommitsPerRun(config: RenovateConfig): void {
+  let limit = config.prCommitsPerRunLimit;
+  limit = typeof limit === 'number' && limit > 0 ? limit : null;
+  setMaxLimit(Limit.Commits, limit);
+}
+
 export async function globalInitialize(
   config_: RenovateConfig
 ): Promise<RenovateConfig> {
   let config = config_;
   config = await initPlatform(config);
   config = await setDirectories(config);
   packageCache.init(config);
-  setMaxLimit(Limit.Commits, config.prCommitsPerRunLimit);
+  limitCommitsPerRun(config);
   setEmojiConfig(config);
   return config;
 }

diff --git a/lib/workers/global/limits.spec.ts b/lib/workers/global/limits.spec.ts
@@ -37,7 +37,28 @@ describe('lib/workers/global/limits', () => {
   it('increments undefined', () => {
     incLimitedValue(Limit.Commits);
     expect(isLimitReached(Limit.Commits)).toBe(false);
+  });
+
+  it('resets counter', () => {
     setMaxLimit(Limit.Commits, 1);
+    incLimitedValue(Limit.Commits);
     expect(isLimitReached(Limit.Commits)).toBe(true);
+    setMaxLimit(Limit.Commits, 1);
+    expect(isLimitReached(Limit.Commits)).toBe(false);
+  });
+
+  it('resets limit', () => {
+    setMaxLimit(Limit.Commits, 1);
+    incLimitedValue(Limit.Commits);
+    expect(isLimitReached(Limit.Commits)).toBe(true);
+    setMaxLimit(Limit.Commits, null);
+    expect(isLimitReached(Limit.Commits)).toBe(false);
+  });
+
+  it('sets non-positive limit as reached', () => {
+    setMaxLimit(Limit.Commits, 0);
+    expect(isLimitReached(Limit.Commits)).toBeTrue();
+    setMaxLimit(Limit.Commits, -1000);
+    expect(isLimitReached(Limit.Commits)).toBeTrue();
   });
 });
diff --git a/lib/workers/global/limits.ts b/lib/workers/global/limits.ts
@@ -15,15 +15,10 @@ export function resetAllLimits(): void {
   limits.clear();
 }
 
-export function setMaxLimit(key: Limit, max: unknown): void {
-  const maxVal = typeof max === 'number' && max > 0 ? max : null;
-  logger.debug(`${key} limit = ${maxVal}`);
-  const limit = limits.get(key);
-  limits.set(key, {
-    current: 0,
-    ...limit,
-    max: maxVal,
-  });
+export function setMaxLimit(key: Limit, val: unknown): void {
+  const max = typeof val === 'number' ? Math.max(0, val) : null;
+  limits.set(key, { current: 0, max });
+  logger.debug(`${key} limit = ${max}`);
 }
 
 export function incLimitedValue(key: Limit, incBy = 1): void {