chore: extract the condition for retry request to the new function

 Improve code maintainability and make it easier to include new logic to retry request, that now in its own scope.

Author: Arthur Granado

src/supervisor/kuberenetes-api-wrappers.ts

@@ -1,5 +1,6 @@
 import * as http from 'http';
 import * as sleep from 'sleep-promise';
+import { IRequestError } from './types';
 
 export const ATTEMPTS_MAX = 3;
 export const DEFAULT_SLEEP_SEC = 1;
@@ -13,20 +14,11 @@ export async function retryKubernetesApiRequest<ResponseType>(
     try {
       return await func();
     } catch (err) {
-      if (!(err.response)) {
+      if (!shouldRetryRequest(err, attempt)) {
         throw err;
       }
 
-      const response = err.response;
-      if (response.statusCode !== 429) {
-        throw err;
-      }
-
-      if (attempt === ATTEMPTS_MAX) {
-        throw err;
-      }
-
-      const sleepSeconds = calculateSleepSeconds(response);
+      const sleepSeconds = calculateSleepSeconds(err.response);
       await sleep(sleepSeconds * 1000);
     }
   }
@@ -48,3 +40,19 @@ export function calculateSleepSeconds(httpResponse: http.IncomingMessage): numbe
   }
   return Math.min(sleepSeconds, MAX_SLEEP_SEC);
 }
+
+function shouldRetryRequest(err: IRequestError, attempt: number): boolean {
+  if (attempt >= ATTEMPTS_MAX) {
+    return false;
+  }
+
+  if (!(err.response)) {
+    return false;
+  }
+
+  if (err.response.statusCode === 429) {
+    return true;
+  }
+
+  return false;
+}

src/supervisor/types.ts

@@ -1,3 +1,4 @@
+import { IncomingMessage }  from 'http';
 import { AppsV1Api, BatchV1Api, BatchV1beta1Api, CoreV1Api, KubeConfig,
   V1ObjectMeta, V1OwnerReference, V1PodSpec } from '@kubernetes/client-node';
 
@@ -12,6 +13,10 @@ export enum WorkloadKind {
   Pod = 'Pod',
 }
 
+export interface IRequestError {
+  response?: IncomingMessage;
+}
+
 export interface IKubeObjectMetadata {
   kind: string;
   objectMeta: V1ObjectMeta;