Users/vinca/pdfix m140 (#8287)

* resolved merge conflicts

* addressed review comments

* resolved merge conflicts 2

* remove log files

* L0 test fix

* Update task.json

* Update task.loc.json

* Post Deployment script - addressed review comments

* addressed review comment

* removed v3

Author: vincent1173

Tasks/AzureRmWebAppDeploymentV4/operations/KuduServiceUtility.ts

@@ -55,12 +55,11 @@ export class KuduServiceUtility {
             await this._appServiceKuduService.uploadFile(vstsPostDeploymentFolderPath, 'kuduPostDeploymentScript' + fileExtension, scriptFile.filePath);
             console.log(tl.loc('ExecuteScriptOnKudu'));
             var cmdFilePath = '%Home%\\site\\VSTS_PostDeployment_' + uniqueID + '\\mainCmdFile' + fileExtension;
-            var scriprResultPath = '%Home%\\site\\VSTS_PostDeployment_' + uniqueID + '\\script_result.txt';
+            var scriprResultPath = '/site/VSTS_PostDeployment_' + uniqueID;
             if (taskParams.isLinuxApp){
-                cmdFilePath = '/home/site/VSTS_PostDeployment_' + uniqueID + '/mainCmdFile' + fileExtension
-                scriprResultPath = '/home/site/VSTS_PostDeployment_' + uniqueID + '/script_result.txt';
+                cmdFilePath = '/home/site/VSTS_PostDeployment_' + uniqueID + '/mainCmdFile' + fileExtension;
             }
-            await this.runCommand(rootDirectoryPath, cmdFilePath + ' ' + uniqueID, 30, scriprResultPath);
+            await this.runCommand(rootDirectoryPath, cmdFilePath + ' ' + uniqueID, 30, scriprResultPath, 'script_result.txt');
             await this._printPostDeploymentLogs(vstsPostDeploymentFolderPath);
 
         }
@@ -78,8 +77,13 @@ export class KuduServiceUtility {
         }
         finally {
             try {
+                let deleteFilePath = '%Home%\\site\\VSTS_PostDeployment_' + uniqueID + '\\delete_log_file' + fileExtension;
+                if(taskParams.isLinuxApp) {
+                    deleteFilePath = '/home/site/VSTS_PostDeployment_' + uniqueID + '/delete_log_file' + fileExtension;
+                }
+                
                 await this._appServiceKuduService.uploadFile(vstsPostDeploymentFolderPath, 'delete_log_file' + fileExtension, path.join(__dirname, '..', 'postDeploymentScript', 'deleteLogFile' + fileExtension));
-                await this.runCommand(vstsPostDeploymentFolderPath, 'delete_log_file' + fileExtension, 0, null);
+                await this.runCommand(vstsPostDeploymentFolderPath, deleteFilePath);
                 await this._appServiceKuduService.deleteFolder(vstsPostDeploymentFolderPath);
             }
             catch(error) {
@@ -313,14 +317,14 @@ export class KuduServiceUtility {
         }
     }
 
-    private async runCommand(physicalPath: string, command: string, timeOutInMinutes: number, pollFile: string): Promise<void> {
+    private async runCommand(physicalPath: string, command: string, timeOutInMinutes?: number, pollFolderPath?: string, pollFile?: string): Promise<void> {
         try {
             await this._appServiceKuduService.runCommand(physicalPath, command);
         }
         catch(error) {
-            if(timeOutInMinutes > 0 && error.toString().indexOf('Request timeout: /api/command') != -1) {
+            if(!!pollFolderPath && !!pollFile && timeOutInMinutes > 0 && error.toString().indexOf('Request timeout: /api/command') != -1) {
                 tl.debug('Request timeout occurs. Trying to poll for file: ' + pollFile);
-                await this._pollForFile(physicalPath, pollFile, timeOutInMinutes);
+                await this._pollForFile(pollFolderPath, pollFile, timeOutInMinutes);
             }
             else {
                 if(typeof error.valueOf() == 'string') {

Tasks/AzureRmWebAppDeploymentV4/operations/TaskParameters.ts

@@ -98,6 +98,10 @@ export class TaskParametersUtility {
             taskParameters.AdditionalArguments = '-retryAttempts:6 -retryInterval:10000';
         }
 
+        if(taskParameters.isLinuxApp && taskParameters.ScriptType) {
+            this.UpdateLinuxAppTypeScriptParameters(taskParameters);
+        }
+
         return taskParameters;
     }
 
@@ -107,6 +111,19 @@ export class TaskParametersUtility {
         taskParameters.Package = new Package(tl.getPathInput('Package', true));
         taskParameters.AdditionalArguments = "-retryAttempts:6 -retryInterval:10000";
     }
+
+    private static UpdateLinuxAppTypeScriptParameters(taskParameters: TaskParameters) {
+        let retryTimeoutValue = tl.getVariable('appservicedeploy.retrytimeout');
+        let timeoutAppSettings = retryTimeoutValue ? Number(retryTimeoutValue) * 60 : 1800;
+
+        tl.debug(`setting app setting SCM_COMMAND_IDLE_TIMEOUT to ${timeoutAppSettings}`);
+        if(taskParameters.AppSettings) {
+            taskParameters.AppSettings = `-SCM_COMMAND_IDLE_TIMEOUT ${timeoutAppSettings} ` + taskParameters.AppSettings;
+        }
+        else {
+            taskParameters.AppSettings = `-SCM_COMMAND_IDLE_TIMEOUT ${timeoutAppSettings}`;
+        }
+    }
 
     private static getDeploymentType(type): DeploymentType {
         switch(type) {

Tasks/AzureRmWebAppDeploymentV4/task.json

@@ -18,7 +18,7 @@
     "version": {
         "Major": 4,
         "Minor": 3,
-        "Patch": 5
+        "Patch": 6
     },
     "releaseNotes": "What's new in version 4.* (preview)<br />Supports Kudu Zip Deploy<br />Supports App Service Environments<br />Improved UI for discovering different App service types supported by the task<br/>Click [here](https://aka.ms/azurermwebdeployreadme) for more information.",
     "minimumAgentVersion": "2.104.1",

Tasks/AzureRmWebAppDeploymentV4/task.loc.json

@@ -18,7 +18,7 @@
   "version": {
     "Major": 4,
     "Minor": 3,
-    "Patch": 5
+    "Patch": 6
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "minimumAgentVersion": "2.104.1",
@@ -620,4 +620,4 @@
     "JarPathNotPresent": "ms-resource:loc.messages.JarPathNotPresent",
     "FailedToUpdateApplicationInsightsResource": "ms-resource:loc.messages.FailedToUpdateApplicationInsightsResource"
   }
-}
+}

Tasks/Common/azure-arm-rest/azure-arm-app-service-kudu.ts

@@ -22,7 +22,8 @@ export class KuduServiceManagementClient {
         request.headers["Authorization"] = "Basic " + this._accesssToken;
         request.headers['Content-Type'] = 'application/json; charset=utf-8';
 
-        let retryCount = reqOptions && reqOptions.retryCount ? reqOptions.retryCount : 5;
+        let retryCount = reqOptions && util.isNumber(reqOptions.retryCount) ? reqOptions.retryCount : 5;
+
         while(retryCount >= 0) {
             try {
                 let httpResponse = await webClient.sendRequest(request, reqOptions);
@@ -36,7 +37,7 @@ export class KuduServiceManagementClient {
                         tl.warning(tl.loc('ASE_SSLIssueRecommendation'));
                 }
 
-                if(retryCount > 0 && exceptionString.indexOf('Request timeout') != -1) {
+                if(retryCount > 0 && exceptionString.indexOf('Request timeout') != -1 && reqOptions.retryRequestTimedout) {
                     tl.debug('encountered request timedou issue in Kudu. Retrying again');
                     retryCount -= 1;
                     continue;
@@ -395,7 +396,8 @@ export class Kudu {
 
         try {
             tl.debug('Executing Script on Kudu. Command: ' + command);
-            var response = await this._client.beginRequest(httpRequest);
+            let webRequestOptions: webClient.WebRequestOptions = {retriableErrorCodes: null, retriableStatusCodes: null, retryCount: 5, retryIntervalInSeconds: 5, retryRequestTimedout: false};
+            var response = await this._client.beginRequest(httpRequest, webRequestOptions);
             tl.debug(`runCommand. Data: ${JSON.stringify(response)}`);
             if(response.statusCode == 200) {
                 return ;

Tasks/Common/azure-arm-rest/webClient.ts

@@ -38,6 +38,7 @@ export class WebRequestOptions {
     public retryCount: number;
     public retryIntervalInSeconds: number;
     public retriableStatusCodes: number[];
+    public retryRequestTimedout?: boolean = true;
 }
 
 export async function sendRequest(request: WebRequest, options?: WebRequestOptions): Promise<WebResponse> {