azure-pipelines-tasks-azurermdeploycommon 3.235.0 → 3.236.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "azure-pipelines-tasks-azurermdeploycommon",
-    "version": "3.235.0",
+    "version": "3.236.0",
     "description": "Common Lib for Azure ARM REST apis",
     "repository": {
         "type": "git",
@@ -21,7 +21,6 @@
         "@types/q": "1.0.7",
         "archiver": "2.1.1",
         "azure-pipelines-task-lib": "^3.1.0",
-        "decompress-zip": "^0.3.3",
         "jsonwebtoken": "^8.5.1",
         "ltx": "2.6.2",
         "node-stream-zip": "1.7.0",

package/webdeployment-common/ziputility.d.ts

@@ -1,5 +1,5 @@
 import Q = require('q');
-export declare function unzip(zipLocation: any, unzipLocation: any): Promise<unknown>;
+export declare function unzip(zipLocation: any, unzipLocation: any): Promise<void>;
 export declare function archiveFolder(folderPath: any, targetPath: any, zipName: any): Promise<unknown>;
 /**
  *  Returns array of files present in archived package

package/webdeployment-common/ziputility.js

@@ -14,8 +14,7 @@ const tl = require("azure-pipelines-task-lib/task");
 const path = require("path");
 const Q = require("q");
 const fs = require("fs");
-const StreamZip = require("node-stream-zip");
-var DecompressZip = require('decompress-zip');
+const node_stream_zip_1 = require("node-stream-zip");
 var archiver = require('archiver');
 function unzip(zipLocation, unzipLocation) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -23,19 +22,15 @@ function unzip(zipLocation, unzipLocation) {
         if (tl.exist(unzipLocation)) {
             tl.rmRF(unzipLocation);
         }
-        var unzipper = new DecompressZip(zipLocation);
-        tl.debug('extracting ' + zipLocation + ' to ' + unzipLocation);
-        unzipper.on('error', function (error) {
+        tl.mkdirP(unzipLocation);
+        const zip = new node_stream_zip_1.default.async({ file: zipLocation });
+        zip.extract(null, unzipLocation).then(() => {
+            zip.close();
+            defer.resolve();
+        }).catch((error) => {
+            console.log(`error extracting ${zipLocation}: ${error}`);
             defer.reject(error);
         });
-        unzipper.on('extract', function (log) {
-            tl.debug('extracted ' + zipLocation + ' to ' + unzipLocation + ' Successfully');
-            defer.resolve(unzipLocation);
-        });
-        unzipper.extract({
-            path: unzipLocation
-        });
-        return defer.promise;
     });
 }
 exports.unzip = unzip;
@@ -66,17 +61,16 @@ exports.archiveFolder = archiveFolder;
 function getArchivedEntries(archivedPackage) {
     return __awaiter(this, void 0, void 0, function* () {
         var deferred = Q.defer();
-        var unzipper = new DecompressZip(archivedPackage);
-        unzipper.on('error', function (error) {
-            deferred.reject(error);
-        });
-        unzipper.on('list', function (files) {
-            var packageComponent = {
-                "entries": files
+        const zip = new node_stream_zip_1.default.async({ file: archivedPackage });
+        zip.entries().then(entries => {
+            var packageConmponent = {
+                'entries': Object.keys(entries)
             };
-            deferred.resolve(packageComponent);
+            zip.close();
+            deferred.resolve(packageConmponent);
+        }).catch(error => {
+            deferred.reject(error);
         });
-        unzipper.list();
         return deferred.promise;
     });
 }
@@ -86,7 +80,7 @@ function checkIfFilesExistsInZip(archivedPackage, files) {
     for (let i = 0; i < files.length; i++) {
         files[i] = files[i].toLowerCase();
     }
-    const zip = new StreamZip({
+    const zip = new node_stream_zip_1.default({
         file: archivedPackage,
         storeEntries: true,
         skipEntryNameValidation: true

package/webdeployment-common/ziputility.ts

@@ -2,8 +2,7 @@ import tl = require('azure-pipelines-task-lib/task');
 import path = require('path');
 import Q = require('q');
 import fs = require('fs');
-import StreamZip = require('node-stream-zip');
-var DecompressZip = require('decompress-zip');
+import StreamZip from 'node-stream-zip';
 var archiver = require('archiver');
 
 export async function unzip(zipLocation, unzipLocation) {
@@ -11,19 +10,15 @@ export async function unzip(zipLocation, unzipLocation) {
     if(tl.exist(unzipLocation)) {
       tl.rmRF(unzipLocation);
     }
-    var unzipper = new DecompressZip(zipLocation);
-    tl.debug('extracting ' + zipLocation + ' to ' + unzipLocation);
-    unzipper.on('error', function (error) {
-        defer.reject(error);
-    });
-    unzipper.on('extract', function (log) {
-        tl.debug('extracted ' + zipLocation + ' to ' + unzipLocation + ' Successfully');
-        defer.resolve(unzipLocation);
-    });
-    unzipper.extract({
-      path: unzipLocation
-    });
-    return defer.promise;
+    tl.mkdirP(unzipLocation);
+    const zip = new StreamZip.async({ file: zipLocation});
+        zip.extract(null, unzipLocation).then(() => {
+            zip.close();
+            defer.resolve();
+        }).catch((error) => {
+            console.log(`error extracting ${zipLocation}: ${error}`);
+            defer.reject(error);
+        })
 }
 
 export async function archiveFolder(folderPath, targetPath, zipName) {
@@ -53,17 +48,16 @@ export async function archiveFolder(folderPath, targetPath, zipName) {
  */
 export async function getArchivedEntries(archivedPackage: string)  {
     var deferred = Q.defer();
-    var unzipper = new DecompressZip(archivedPackage);
-    unzipper.on('error', function (error) {
+    const zip = new StreamZip.async({file: archivedPackage});
+    zip.entries().then(entries => {
+        var packageConmponent = {
+            'entries': Object.keys(entries)
+        }
+        zip.close();
+        deferred.resolve(packageConmponent);
+    }).catch(error => {
         deferred.reject(error);
-    });
-    unzipper.on('list', function (files) {
-        var packageComponent = {
-            "entries":files
-        };
-        deferred.resolve(packageComponent); 
-    });
-    unzipper.list();
+    })
     return deferred.promise;
 }