delete zip file (AST-40077)

Checkmarx · Nov 18, 2024 · 90c92d4 · 90c92d4
1 parent b86e671
commit 90c92d4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/cxAstScan/services/CleanUpRunner.ts b/cxAstScan/services/CleanUpRunner.ts
@@ -97,8 +97,8 @@ export class CleanUpRunner {
     }
 
     extractZipFilePath(data: string): string | null {
-        const zipFilePattern = /Temporary zip file path:\s*(.+)$/;
+        const zipFilePattern = /Temporary zip file path:\s*(.*)$/m;
         const match = data.match(zipFilePattern);
-        return match ? match[1] : null;
+        return match ? match[1].trim() : null;
     }
 }
diff --git a/cxAstScan/test/_suite.ts b/cxAstScan/test/_suite.ts
@@ -72,6 +72,9 @@ describe('Task runner test', function () {
         assert.strictEqual(tr.stdout.indexOf('Pipeline not cancelled, nothing to do.') >= 0,
             true,
             "should display cleanup message: Pipeline not cancelled, nothing to do.");
+        assert.strictEqual(tr.stdout.indexOf('Deleted zip file') >= 0 || tr.stdout.indexOf('Zip file already deleted.') >= 0,
+            true,
+            "should display cleanup message: Deleted zip file or Zip file already deleted.");
     });
 
     it('should be success cancel scan', async function () {
@@ -92,6 +95,9 @@ describe('Task runner test', function () {
         assert.strictEqual(tr.stdout.indexOf('Canceling scan with ID') >= 0,
             true,
             "should display cleanup message: Canceling scan with ID");
+        assert.strictEqual(tr.stdout.indexOf('Deleted zip file') >= 0 || tr.stdout.indexOf('Zip file already deleted.') >= 0,
+            true,
+            "should display cleanup message: Deleted zip file or Zip file already deleted.");
     });
 
     it('should be success cancel before scan start', async function () {

diff --git a/package-lock.json b/package-lock.json