[ArchiveFilesV2] Fixed 'The system cannot find the file specified' error when root folder is parent for archive target path (#15912) (#15926)

* Fixed issue with remove archive/scan files order

* Added L0 tests

* Tests - added dummy file to root directory

* Update Tasks/ArchiveFilesV2/archivefiles.ts - formatting

Co-authored-by: Alexander Smolyakov <[email protected]>

* Update Tasks/ArchiveFilesV2/archivefiles.ts

Co-authored-by: Alexander Smolyakov <[email protected]>

* Update Tasks/ArchiveFilesV2/archivefiles.ts

Co-authored-by: Alexander Smolyakov <[email protected]>

Co-authored-by: Alexander Smolyakov <[email protected]>

Co-authored-by: Alexander Smolyakov <[email protected]>

Author: Anatoly Bolshakov

Tasks/ArchiveFilesV2/Tests/L0.ts

@@ -28,6 +28,11 @@ describe('ArchiveFiles L0 Suite', function () {
         if (!fs.existsSync(testOutput)) {
             fs.mkdirSync(testOutput);
         }
+
+        const replaceTestOutput = path.join(__dirname, 'test_output', 'replace_test');
+        if (!fs.existsSync(replaceTestOutput)) {
+            fs.mkdirSync(replaceTestOutput);
+        }
     })
 
     const files = (n) => {
@@ -139,5 +144,36 @@ if (process.platform.indexOf('darwin') < 0) {
                 assert(fs.existsSync(expectedArchivePath), `Should have successfully created the archive at ${expectedArchivePath}, instead directory contents are ${fs.readdirSync(path.dirname(expectedArchivePath))}`);
         }, tr, done);
     });
+
+    it('Replace archive file in the root folder', function(done: Mocha.Done) {
+        const archiveName = "archive.zip";
+        const replaceTestDir =  path.join(__dirname, 'test_output', 'replace_test');
+        const archivePath = path.join(replaceTestDir, archiveName);
+        this.timeout(5000);
+        process.env['archiveType'] = 'zip';
+        process.env['archiveFile'] = archiveName;
+        process.env['includeRootFolder'] = 'false';
+        process.env['rootFolderOrFile'] = replaceTestDir;
+
+        fs.writeFileSync(path.join(replaceTestDir, 'test_file.txt'), 'test data');
+
+        fs.copyFileSync(
+            path.join(__dirname, 'resources', archiveName),
+            path.join(archivePath)
+        );
+
+        let expectedArchivePath = archivePath;
+
+        let tp: string = path.join(__dirname, 'L0ReplaceArchiveInRootFolder.js');
+        let tr: ttm.MockTestRunner = new ttm.MockTestRunner(tp);
+
+        tr.run();
+        console.info(tr.stdout);
+        runValidations(() => {
+                assert(tr.succeeded, "Task should succeed");
+                assert(tr.stdout.indexOf('Creating archive') > -1, 'Should have tried to create archive');
+                assert(fs.existsSync(expectedArchivePath), `Should have successfully created the archive at ${expectedArchivePath}, instead directory contents are ${fs.readdirSync(path.dirname(expectedArchivePath))}`);
+        }, tr, done);
+    });
 }
 });

Tasks/ArchiveFilesV2/Tests/L0ReplaceArchiveInRootFolder.ts

@@ -0,0 +1,16 @@
+import tmrm = require('azure-pipelines-task-lib/mock-run');
+import path = require('path');
+
+let taskPath = path.join(__dirname, '..', 'archivefiles.js');
+let tmr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
+
+process.env['AGENT_TEMPDIRECTORY'] = path.join(__dirname, 'test_temp');
+
+tmr.setInput('rootFolderOrFile', path.join(__dirname, 'test_output', 'replace_test'));
+tmr.setInput('includeRootFolder', process.env['includeRootFolder']);
+tmr.setInput('archiveType', process.env['archiveType']);
+tmr.setInput('archiveFile', path.join(__dirname, 'test_output', 'replace_test', process.env['archiveFile']));
+tmr.setInput('replaceExistingArchive', 'true');
+tmr.setInput('tarCompression', 'gz');
+
+tmr.run(true);

Tasks/ArchiveFilesV2/Tests/resources/archive.zip

@@ -320,16 +320,6 @@ function createArchive(files: string[]) {
 function doWork() {
     try {
         tl.setResourcePath(path.join( __dirname, 'task.json'));
-        // Find matching archive files
-        var files: string[] = findFiles();
-        utils.reportArchivePlan(files).forEach(function(line) {
-            console.log(line);
-        });
-
-        tl.debug('Listing all ' + files.length + ' files to archive:');
-        for (var i = 0; i < files.length; i++) {
-            tl.debug(files[i]);
-        }
 
         // replaceExistingArchive before creation?
         if (tl.exist(archiveFile)) {
@@ -350,6 +340,13 @@ function doWork() {
             }
         }
 
+        // Find matching archive files
+        var files: string[] = findFiles();
+        utils.reportArchivePlan(files).forEach(line => console.log(line));
+
+        tl.debug(`Listing all ${files.length} files to archive:`);
+        files.forEach(file => tl.debug(file));
+
         //ensure output folder exists
         var destinationFolder = path.dirname(archiveFile);
         tl.debug("Checking for archive destination folder:" + destinationFolder);