Merge pull request #323 from snyk/fix/retry-pull

Fix/retry pull
snyk · Feb 11, 2020 · bf0ecdf · bf0ecdf
2 parents 2899c9e + b752a6f
commit bf0ecdf
Showing 1 changed file with 20 additions and 3 deletions.
diff --git a/src/scanner/images/skopeo.ts b/src/scanner/images/skopeo.ts
@@ -1,4 +1,4 @@
-import { SpawnPromiseResult } from 'child-process-promise';
+import * as sleep from 'sleep-promise';
 
 import * as processWrapper from '../../common/process';
 import * as config from '../../common/config';
@@ -33,7 +33,7 @@ function prefixRespository(target: string, type: SkopeoRepositoryType): string {
 export async function pull(
   image: string,
   destination: string,
-): Promise<SpawnPromiseResult> {
+): Promise<void> {
   const creds = await credentials.getSourceCredentials(image);
   const credentialsParameters = getCredentialParameters(creds);
 
@@ -43,7 +43,24 @@ export async function pull(
   args.push({body: prefixRespository(image, SkopeoRepositoryType.ImageRegistry), sanitise: false});
   args.push({body: prefixRespository(destination, SkopeoRepositoryType.DockerArchive), sanitise: false});
 
-  return processWrapper.exec('skopeo', ...args);
+  await pullWithRetry(args);
+}
+
+async function pullWithRetry(args: Array<processWrapper.IProcessArgument>): Promise<void> {
+  const MAX_ATTEMPTS = 10;
+  const RETRY_INTERVAL_SEC = 0.2;
+
+  for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
+    try {
+      await processWrapper.exec('skopeo', ...args);
+      return;
+    } catch (err) {
+      if (attempt + 1 > MAX_ATTEMPTS) {
+        throw err;
+      }
+      await sleep(RETRY_INTERVAL_SEC * 1000);
+    }
+  }
 }
 
 export function getCredentialParameters(credentials: string | undefined): Array<processWrapper.IProcessArgument> {