Merge pull request #441 from snyk-tech-services/feat/force-delete

feat: retry deletion 3 times

Author: lili2311

package.json

@@ -68,7 +68,7 @@
     "@types/lodash": "^4.14.149",
     "@types/micromatch": "4.0.2",
     "@types/needle": "2.0.4",
-    "@types/node": "^12.12.26",
+    "@types/node": "14.14.45",
     "@types/parse-link-header": "1.0.0",
     "@types/split": "1.0.0",
     "@typescript-eslint/eslint-plugin": "4.28.1",

src/lib/git-clone.ts

@@ -53,7 +53,7 @@ export async function gitClone(
   } catch (err: any) {
     debug(`Could not shallow clone the repo:\n ${err}`);
     if (fs.existsSync(repoClonePath)) {
-      fs.rmdirSync(repoClonePath);
+      fs.rmdirSync(repoClonePath, { recursive: true, maxRetries: 3 });
     }
     return {
       success: false,

src/scripts/sync/clone-and-analyze.ts

@@ -63,7 +63,7 @@ export async function cloneAndAnalyze(
   );
 
   try {
-    fs.rmdirSync(repoPath, { recursive: true });
+    fs.rmdirSync(repoPath, { recursive: true, maxRetries: 3 });
   } catch (error) {
     debug(`Failed to delete ${repoPath}. Error was ${error}.`);
   }

test/lib/git-clone.spec.ts

@@ -13,7 +13,7 @@ describe('gitClone', () => {
     afterEach(() => {
       for (const f of removeFolders) {
         try {
-          fs.rmdirSync(f, { recursive: true });
+          fs.rmdirSync(f, { recursive: true, maxRetries: 3 });
         } catch (e) {
           console.log('Failed to clean up test', e);
         }
@@ -76,7 +76,7 @@ describe('gitClone', () => {
     afterEach(() => {
       for (const f of removeFolders) {
         try {
-          fs.rmdirSync(f, { recursive: true });
+          fs.rmdirSync(f, { recursive: true, maxRetries: 3 });
         } catch (e) {
           console.log('Failed to clean up test', e);
         }

test/scripts/generate-targets-data.test.ts

@@ -1,4 +1,3 @@
-import * as _ from 'lodash';
 import * as path from 'path';
 import type { CreatedOrg } from '../../src/lib/types';
 import { SupportedIntegrationTypesImportData } from '../../src/lib/types';

test/scripts/sync/clone-and-analyze.spec.ts

@@ -15,7 +15,7 @@ describe('cloneAndAnalyze', () => {
   afterEach(() => {
     for (const f of removeFolders) {
       try {
-        fs.rmdirSync(f, { recursive: true });
+        fs.rmdirSync(f, { recursive: true, maxRetries: 3 });
       } catch (e) {
         console.log('Failed to clean up test', e);
       }