update node_modules

.gitignore

@@ -261,7 +261,7 @@ FakesAssemblies/
 
 # Node.js Tools for Visual Studio
 .ntvs_analysis.dat
-node_modules/
+# node_modules/
 
 # Visual Studio 6 build log
 *.plg

lib/DeploymentProvider/Providers/WebAppDeploymentProvider.js

@@ -27,36 +27,41 @@ class WebAppDeploymentProvider extends BaseWebAppDeploymentProvider_1.BaseWebApp
         return __awaiter(this, void 0, void 0, function* () {
             let appPackage = this.actionParams.package;
             let webPackage = appPackage.getPath();
+            const validTypes = ["war", "jar", "ear", "zip", "static"];
             // kudu warm up
             yield this.kuduServiceUtility.warmpUp();
-            let packageType = appPackage.getPackageType();
-            switch (packageType) {
-                case packageUtility_1.PackageType.war:
-                    core.debug("Initiated deployment via kudu service for webapp war package : " + webPackage);
-                    var warName = utility.getFileNameFromPath(webPackage, ".war");
-                    this.deploymentID = yield this.kuduServiceUtility.deployUsingWarDeploy(webPackage, { slotName: this.actionParams.slotName, commitMessage: this.actionParams.commitMessage }, warName);
-                    break;
-                case packageUtility_1.PackageType.jar:
-                    core.debug("Initiated deployment via kudu service for webapp jar package : " + webPackage);
-                    let folderPath = yield utility.generateTemporaryFolderForDeployment(false, webPackage, packageUtility_1.PackageType.jar);
-                    let output = yield utility.archiveFolderForDeployment(false, folderPath);
-                    webPackage = output.webDeployPkg;
-                    this.deploymentID = yield this.kuduServiceUtility.deployUsingZipDeploy(webPackage, { slotName: this.actionParams.slotName, commitMessage: this.actionParams.commitMessage });
-                    break;
-                case packageUtility_1.PackageType.folder:
-                    let tempPackagePath = utility.generateTemporaryFolderOrZipPath(`${process.env.RUNNER_TEMP}`, false);
-                    webPackage = (yield zipUtility.archiveFolder(webPackage, "", tempPackagePath));
-                    core.debug("Compressed folder into zip " + webPackage);
-                    core.debug("Initiated deployment via kudu service for webapp package : " + webPackage);
-                    this.deploymentID = yield this.kuduServiceUtility.deployUsingZipDeploy(webPackage, { slotName: this.actionParams.slotName, commitMessage: this.actionParams.commitMessage });
-                    break;
-                case packageUtility_1.PackageType.zip:
-                    core.debug("Initiated deployment via kudu service for webapp package : " + webPackage);
-                    this.deploymentID = yield this.kuduServiceUtility.deployUsingZipDeploy(webPackage, { slotName: this.actionParams.slotName, commitMessage: this.actionParams.commitMessage });
-                    break;
-                default:
-                    throw new Error('Invalid App Service package or folder path provided: ' + webPackage);
+            // If provided, type paramater takes precidence over file package type
+            if (this.actionParams.type != null && validTypes.includes(this.actionParams.type.toLowerCase())) {
+                core.debug("Initiated deployment via kudu service for webapp" + this.actionParams.type + "package : " + webPackage);
             }
+            else {
+                // Retains the old behavior of determining the package type from the file extension if valid type is not defined
+                let packageType = appPackage.getPackageType();
+                switch (packageType) {
+                    case packageUtility_1.PackageType.war:
+                        core.debug("Initiated deployment via kudu service for webapp war package : " + webPackage);
+                        this.actionParams.type = "war";
+                        break;
+                    case packageUtility_1.PackageType.jar:
+                        core.debug("Initiated deployment via kudu service for webapp jar package : " + webPackage);
+                        this.actionParams.type = "jar";
+                        break;
+                    case packageUtility_1.PackageType.folder:
+                        let tempPackagePath = utility.generateTemporaryFolderOrZipPath(`${process.env.RUNNER_TEMP}`, false);
+                        webPackage = (yield zipUtility.archiveFolder(webPackage, "", tempPackagePath));
+                        core.debug("Compressed folder into zip " + webPackage);
+                        core.debug("Initiated deployment via kudu service for webapp package : " + webPackage);
+                        this.actionParams.type = "zip";
+                        break;
+                    case packageUtility_1.PackageType.zip:
+                        core.debug("Initiated deployment via kudu service for webapp zip package : " + webPackage);
+                        this.actionParams.type = "zip";
+                        break;
+                    default:
+                        throw new Error('Invalid App Service package: ' + webPackage + ' or type provided: ' + this.actionParams.type);
+                }
+            }
+            this.deploymentID = yield this.kuduServiceUtility.deployUsingOneDeploy(webPackage, { slotName: this.actionParams.slotName, commitMessage: this.actionParams.commitMessage }, this.actionParams.targetPath, this.actionParams.type, this.actionParams.clean, this.actionParams.restart);
             // updating startup command
             if (!!this.actionParams.startupCommand) {
                 yield this.updateStartupCommand();

lib/actionparameters.js

@@ -39,6 +39,11 @@ class ActionParameters {
          */
         this._commitMessage = github.context.eventName === 'push' ? github.context.payload.head_commit.message.slice(0, 1000) : "";
         this._endpoint = endpoint;
+        // Used only for OneDeploy
+        this._type = core.getInput('type');
+        this._targetPath = core.getInput('target-path');
+        this._clean = core.getInput('clean');
+        this._restart = core.getInput('restart');
     }
     static getActionParams(endpoint) {
         if (!this.actionparams) {
@@ -112,5 +117,20 @@ class ActionParameters {
     get multiContainerConfigFile() {
         return this._multiContainerConfigFile;
     }
+    get type() {
+        return this._type;
+    }
+    set type(type) {
+        this._type = type;
+    }
+    get targetPath() {
+        return this._targetPath;
+    }
+    get clean() {
+        return this._clean;
+    }
+    get restart() {
+        return this._restart;
+    }
 }
 exports.ActionParameters = ActionParameters;