Azure App Service - hotfix JAVA issues (151) (#10383)

vincent1173 · web-flow · commit 3580523a0a2a · 2019-05-16T14:14:48.000+05:30
* resolved merge conflicts * Azure Web App Linux - include image name in runtime stack (#10372) * include image name in runtime stack * added support for parent task * bump up task to correct version * remove package-lock
diff --git a/Tasks/AzureFunctionAppContainerV1/task.loc.json b/Tasks/AzureFunctionAppContainerV1/task.loc.json
@@ -18,7 +18,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 8
+    "Patch": 11
   },
   "minimumAgentVersion": "2.104.1",
   "groups": [
diff --git a/Tasks/AzureFunctionAppV1/task.json b/Tasks/AzureFunctionAppV1/task.json
@@ -18,7 +18,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 11
+        "Patch": 10
     },
     "minimumAgentVersion": "2.104.1",
     "groups": [
diff --git a/Tasks/AzureFunctionAppV1/task.loc.json b/Tasks/AzureFunctionAppV1/task.loc.json
@@ -18,7 +18,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 11
+    "Patch": 10
   },
   "minimumAgentVersion": "2.104.1",
   "groups": [
diff --git a/Tasks/AzureRmWebAppDeploymentV4/deploymentProvider/BuiltInLinuxWebAppDeploymentProvider.ts b/Tasks/AzureRmWebAppDeploymentV4/deploymentProvider/BuiltInLinuxWebAppDeploymentProvider.ts
@@ -57,20 +57,6 @@ export class BuiltInLinuxWebAppDeploymentProvider extends AzureRmWebAppDeploymen
             case PackageType.jar:
                 tl.debug("Initiated deployment via kudu service for webapp jar package : "+ this.taskParams.Package.getPath());
                 var folderPath = await webCommonUtility.generateTemporaryFolderForDeployment(false, this.taskParams.Package.getPath(), PackageType.jar);
-                var jarName = webCommonUtility.getFileNameFromPath(this.taskParams.Package.getPath(), ".jar");
-                var destRootPath = "/home/site/wwwroot/";
-                var script = 'java -jar "' + destRootPath + jarName + '.jar' + '" --server.port=80';
-                var initScriptFileName = "startupscript_" + jarName + ".sh";
-                var initScriptFile = path.join(folderPath, initScriptFileName);
-                var destInitScriptPath = destRootPath + initScriptFileName;
-                if(!this.taskParams.AppSettings) {
-                    this.taskParams.AppSettings = "-INIT_SCRIPT " + destInitScriptPath;
-                }
-                if(this.taskParams.AppSettings.indexOf("-INIT_SCRIPT") < 0) {
-                    this.taskParams.AppSettings += " -INIT_SCRIPT " + destInitScriptPath;
-                }
-                this.taskParams.AppSettings = this.taskParams.AppSettings.trim();
-                tl.writeFile(initScriptFile, script, { encoding: 'utf8' });
                 var output = await webCommonUtility.archiveFolderForDeployment(false, folderPath);
                 var webPackage = output.webDeployPkg;
                 tl.debug("Initiated deployment via kudu service for webapp jar package : "+ webPackage);
diff --git a/Tasks/AzureRmWebAppDeploymentV4/operations/AzureAppServiceUtility.ts b/Tasks/AzureRmWebAppDeploymentV4/operations/AzureAppServiceUtility.ts
@@ -204,9 +204,9 @@ export class AzureAppServiceUtility {
 
     public async updateStartupCommandAndRuntimeStack(runtimeStack: string, startupCommand?: string): Promise<void> {
         var configDetails = await this._appService.getConfiguration();
-        startupCommand = (!!startupCommand) ? startupCommand  : "";
-        var linuxFxVersion: string = configDetails.properties.linuxFxVersion;
         var appCommandLine: string = configDetails.properties.appCommandLine;
+        startupCommand = (!!startupCommand) ? startupCommand  : appCommandLine;
+        var linuxFxVersion: string = configDetails.properties.linuxFxVersion;
         runtimeStack = (!!runtimeStack) ? runtimeStack : linuxFxVersion;
 
         if (appCommandLine != startupCommand || runtimeStack != linuxFxVersion) {
diff --git a/Tasks/AzureRmWebAppDeploymentV4/task.json b/Tasks/AzureRmWebAppDeploymentV4/task.json
@@ -18,7 +18,7 @@
     "version": {
         "Major": 4,
         "Minor": 3,
-        "Patch": 24
+        "Patch": 25
     },
     "releaseNotes": "What's new in version 4.*<br />Supports Zip Deploy, Run From Package, War Deploy [Details here](https://aka.ms/appServiceDeploymentMethods)<br />Supports App Service Environments<br />Improved UI for discovering different App service types supported by the task<br/>Run From Package is the preferred deployment method, which makes files in wwwroot folder read-only<br/>Click [here](https://aka.ms/azurermwebdeployreadme) for more information.",
     "minimumAgentVersion": "2.104.1",
@@ -477,7 +477,7 @@
             "parameters": {
                 "osTypeSelected": "Linux"
             },
-            "resultTemplate": "{\"Value\":\"{{{ runtimeVersion }}}\",\"DisplayValue\":\"{{{ displayVersion }}}\"}"
+            "resultTemplate": "{\"Value\":\"{{{ runtimeVersion }}}\",\"DisplayValue\":\"{{{ displayVersion }}} ({{{ runtimeVersion }}})\"}"
         }
     ],
     "instanceNameFormat": "Azure App Service Deploy: $(WebAppName)",
diff --git a/Tasks/AzureRmWebAppDeploymentV4/task.loc.json b/Tasks/AzureRmWebAppDeploymentV4/task.loc.json
@@ -18,7 +18,7 @@
   "version": {
     "Major": 4,
     "Minor": 3,
-    "Patch": 24
+    "Patch": 25
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "minimumAgentVersion": "2.104.1",
@@ -477,7 +477,7 @@
       "parameters": {
         "osTypeSelected": "Linux"
       },
-      "resultTemplate": "{\"Value\":\"{{{ runtimeVersion }}}\",\"DisplayValue\":\"{{{ displayVersion }}}\"}"
+      "resultTemplate": "{\"Value\":\"{{{ runtimeVersion }}}\",\"DisplayValue\":\"{{{ displayVersion }}} ({{{ runtimeVersion }}})\"}"
     }
   ],
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",
diff --git a/Tasks/AzureWebAppContainerV1/task.json b/Tasks/AzureWebAppContainerV1/task.json
@@ -18,7 +18,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 10
+        "Patch": 11
     },
     "minimumAgentVersion": "2.104.1",
     "groups": [
diff --git a/Tasks/AzureWebAppContainerV1/task.loc.json b/Tasks/AzureWebAppContainerV1/task.loc.json
@@ -18,7 +18,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 10
+    "Patch": 11
   },
   "minimumAgentVersion": "2.104.1",
   "groups": [
diff --git a/Tasks/AzureWebAppV1/Strings/resources.resjson/en-US/resources.resjson b/Tasks/AzureWebAppV1/Strings/resources.resjson/en-US/resources.resjson
@@ -151,7 +151,7 @@
   "loc.messages.FailedToUpdateAppServiceApplicationSettings": "Failed to update App service '%s' application settings. Error: %s",
   "loc.messages.UpdatingAppServiceConfigurationSettings": "Updating App Service Configuration settings. Data: %s",
   "loc.messages.UpdatedAppServiceConfigurationSettings": "Updated App Service Configuration settings.",
-  "loc.messages.UpdatingAppServiceApplicationSettings": "Updating App Service Application settings. Data: %s",
+  "loc.messages.UpdatingAppServiceApplicationSettings": "Updating App Service Application settings. Adding: %s. Deleting : %s",
   "loc.messages.UpdatedAppServiceApplicationSettings": "Updated App Service Application settings and Kudu Application settings.",
   "loc.messages.MultipleResourceGroupFoundForAppService": "Multiple resource group found for App Service '%s'.",
   "loc.messages.PackageDeploymentUsingZipDeployFailed": "Package deployment using ZIP Deploy failed. Refer logs for more details.",
diff --git a/Tasks/AzureWebAppV1/deploymentProvider/BuiltInLinuxWebAppDeploymentProvider.ts b/Tasks/AzureWebAppV1/deploymentProvider/BuiltInLinuxWebAppDeploymentProvider.ts
@@ -1,12 +1,14 @@
 import { AzureRmWebAppDeploymentProvider } from './AzureRmWebAppDeploymentProvider';
 import tl = require('vsts-task-lib/task');
+import * as ParameterParser from 'azurermdeploycommon/operations/ParameterParserUtility'
 import { PackageType } from 'azurermdeploycommon/webdeployment-common/packageUtility';
-import path = require('path');
 
 var webCommonUtility = require('azurermdeploycommon/webdeployment-common/utility.js');
 var deployUtility = require('azurermdeploycommon/webdeployment-common/utility.js');
 var zipUtility = require('azurermdeploycommon/webdeployment-common/ziputility.js');
 
+const initScriptAppSetting: string = "-INIT_SCRIPT";
+
 export class BuiltInLinuxWebAppDeploymentProvider extends AzureRmWebAppDeploymentProvider {
     private zipDeploymentID: string;
 
@@ -32,30 +34,18 @@ export class BuiltInLinuxWebAppDeploymentProvider extends AzureRmWebAppDeploymen
 
             case PackageType.jar:
                 tl.debug("Initiated deployment via kudu service for webapp jar package : "+ this.taskParams.Package.getPath());
-                var folderPath = await webCommonUtility.generateTemporaryFolderForDeployment(false, this.taskParams.Package.getPath(), PackageType.jar);
-                var jarName = webCommonUtility.getFileNameFromPath(this.taskParams.Package.getPath(), ".jar");
-                var destRootPath = "/home/site/wwwroot/";
-                var script = 'java -jar "' + destRootPath + jarName + '.jar' + '" --server.port=80';
-                var initScriptFileName = "startupscript_" + jarName + ".sh";
-                var initScriptFile = path.join(folderPath, initScriptFileName);
-                var destInitScriptPath = destRootPath + initScriptFileName;
-                if(!this.taskParams.AppSettings) {
-                    this.taskParams.AppSettings = "-INIT_SCRIPT " + destInitScriptPath;
-                }
-                if(this.taskParams.AppSettings.indexOf("-INIT_SCRIPT") < 0) {
-                    this.taskParams.AppSettings += " -INIT_SCRIPT " + destInitScriptPath;
-                }
-                this.taskParams.AppSettings = this.taskParams.AppSettings.trim();
-                tl.writeFile(initScriptFile, script, { encoding: 'utf8' });
-                var output = await webCommonUtility.archiveFolderForDeployment(false, folderPath);
-                var webPackage = output.webDeployPkg;
+                let folderPath = await webCommonUtility.generateTemporaryFolderForDeployment(false, this.taskParams.Package.getPath(), PackageType.jar);
+                let output = await webCommonUtility.archiveFolderForDeployment(false, folderPath);
+                let webPackage = output.webDeployPkg;
+                let deleteCustomApplicationSetting = ParameterParser.parse(initScriptAppSetting);
+                await this.appServiceUtility.updateAndMonitorAppSettings(null, deleteCustomApplicationSetting);
                 tl.debug("Initiated deployment via kudu service for webapp jar package : "+ webPackage);
                 this.zipDeploymentID = await this.kuduServiceUtility.deployUsingZipDeploy(webPackage);
             break;
 
             case PackageType.war:
                 tl.debug("Initiated deployment via kudu service for webapp war package : "+ this.taskParams.Package.getPath());
-                var warName = webCommonUtility.getFileNameFromPath(this.taskParams.Package.getPath(), ".war");
+                let warName = webCommonUtility.getFileNameFromPath(this.taskParams.Package.getPath(), ".war");
                 this.zipDeploymentID = await this.kuduServiceUtility.deployUsingWarDeploy(this.taskParams.Package.getPath(), 
                 { slotName: this.appService.getSlot() }, warName);
             break;
diff --git a/Tasks/AzureWebAppV1/task.json b/Tasks/AzureWebAppV1/task.json
@@ -217,7 +217,7 @@
             "parameters": {
                 "osTypeSelected": "Linux"
             },
-            "resultTemplate": "{\"Value\":\"{{{ runtimeVersion }}}\",\"DisplayValue\":\"{{{ displayVersion }}}\"}"
+            "resultTemplate": "{\"Value\":\"{{{ runtimeVersion }}}\",\"DisplayValue\":\"{{{ displayVersion }}} ({{{ runtimeVersion }}})\"}"
         }
     ],
     "instanceNameFormat": "Azure Web App Deploy: $(appName)",
@@ -350,7 +350,7 @@
         "FailedToUpdateAppServiceApplicationSettings": "Failed to update App service '%s' application settings. Error: %s",
         "UpdatingAppServiceConfigurationSettings": "Updating App Service Configuration settings. Data: %s",
         "UpdatedAppServiceConfigurationSettings": "Updated App Service Configuration settings.",
-        "UpdatingAppServiceApplicationSettings": "Updating App Service Application settings. Data: %s",
+        "UpdatingAppServiceApplicationSettings": "Updating App Service Application settings. Adding: %s. Deleting : %s",
         "UpdatedAppServiceApplicationSettings": "Updated App Service Application settings and Kudu Application settings.",
         "MultipleResourceGroupFoundForAppService": "Multiple resource group found for App Service '%s'.",
         "PackageDeploymentUsingZipDeployFailed": "Package deployment using ZIP Deploy failed. Refer logs for more details.",
diff --git a/Tasks/AzureWebAppV1/task.loc.json b/Tasks/AzureWebAppV1/task.loc.json
@@ -217,7 +217,7 @@
       "parameters": {
         "osTypeSelected": "Linux"
       },
-      "resultTemplate": "{\"Value\":\"{{{ runtimeVersion }}}\",\"DisplayValue\":\"{{{ displayVersion }}}\"}"
+      "resultTemplate": "{\"Value\":\"{{{ runtimeVersion }}}\",\"DisplayValue\":\"{{{ displayVersion }}} ({{{ runtimeVersion }}})\"}"
     }
   ],
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",
diff --git a/Tasks/Common/AzureRmDeploy-common/azure-arm-rest/azure-arm-app-service-kudu.ts b/Tasks/Common/AzureRmDeploy-common/azure-arm-rest/azure-arm-app-service-kudu.ts
@@ -455,7 +455,7 @@ export class Kudu {
         httpRequest.body = fs.createReadStream(webPackage);
 
         try {
-            let response = await this._client.beginRequest(httpRequest, null, 'application/octet-stream');
+            let response = await this._client.beginRequest(httpRequest, null, 'multipart/form-data');
             tl.debug(`ZIP Deploy response: ${JSON.stringify(response)}`);
             if(response.statusCode == 200) {
                 tl.debug('Deployment passed');
@@ -488,7 +488,7 @@ export class Kudu {
         httpRequest.body = fs.createReadStream(webPackage);
 
         try {
-            let response = await this._client.beginRequest(httpRequest);
+            let response = await this._client.beginRequest(httpRequest, null, 'multipart/form-data');
             tl.debug(`War Deploy response: ${JSON.stringify(response)}`);
             if(response.statusCode == 200) {
                 tl.debug('Deployment passed');
diff --git a/Tasks/Common/AzureRmDeploy-common/operations/AzureAppServiceUtility.ts b/Tasks/Common/AzureRmDeploy-common/operations/AzureAppServiceUtility.ts
@@ -133,14 +133,14 @@ export class AzureAppServiceUtility {
         console.log(tl.loc('UpdatedAppServiceConfigurationSettings'));
     }
 
-    public async updateAndMonitorAppSettings(addProperties: any, deleteProperties?: any): Promise<boolean> {
+    public async updateAndMonitorAppSettings(addProperties?: any, deleteProperties?: any): Promise<boolean> {
         for(var property in addProperties) {
             if(!!addProperties[property] && addProperties[property].value !== undefined) {
                 addProperties[property] = addProperties[property].value;
             }
         }
         
-        console.log(tl.loc('UpdatingAppServiceApplicationSettings', JSON.stringify(addProperties)));
+        console.log(tl.loc('UpdatingAppServiceApplicationSettings', JSON.stringify(addProperties), JSON.stringify(deleteProperties)));
         var isNewValueUpdated: boolean = await this._appService.patchApplicationSettings(addProperties, deleteProperties);
 
         if(!isNewValueUpdated) {
@@ -202,14 +202,14 @@ export class AzureAppServiceUtility {
         }
     }
 
-    public async updateStartupCommandAndRuntimeStack(runtimeStack: string, startupCommand?: string): Promise<void> {
+    public async updateStartupCommandAndRuntimeStack(runtimeStack: string, startupCommand?: string): Promise<void> { 
         var configDetails = await this._appService.getConfiguration();
-        startupCommand = (!!startupCommand) ? startupCommand  : "";
-        var linuxFxVersion: string = configDetails.properties.linuxFxVersion;
         var appCommandLine: string = configDetails.properties.appCommandLine;
+        startupCommand = (!!startupCommand) ? startupCommand : appCommandLine;
+        var linuxFxVersion: string = configDetails.properties.linuxFxVersion;
         runtimeStack = (!!runtimeStack) ? runtimeStack : linuxFxVersion;
 
-        if (appCommandLine != startupCommand || runtimeStack != linuxFxVersion) {
+        if (startupCommand != appCommandLine || runtimeStack != linuxFxVersion) {
             await this.updateConfigurationSettings({linuxFxVersion: runtimeStack, appCommandLine: startupCommand});
         }
         else {
diff --git a/Tasks/Common/AzureRmDeploy-common/webdeployment-common/utility.ts b/Tasks/Common/AzureRmDeploy-common/webdeployment-common/utility.ts
@@ -3,6 +3,7 @@ import tl = require('vsts-task-lib/task');
 import { PackageType } from './packageUtility';
 import zipUtility = require('./ziputility.js');
 import * as os from "os";
+import * as fs from "fs";
 /**
  * Validates the input package and finds out input type
  * 
@@ -182,6 +183,13 @@ export async function generateTemporaryFolderForDeployment(isFolderBasedDeployme
     if(isFolderBasedDeployment || packageType === PackageType.jar) {
         tl.debug('Copying Web Packge: ' + webDeployPkg + ' to temporary location: ' + folderPath);
         copyDirectory(webDeployPkg, folderPath);
+        if(packageType === PackageType.jar && this.getFileNameFromPath(webDeployPkg, ".jar") != "app") {
+            let src = path.join(folderPath, getFileNameFromPath(webDeployPkg));
+            let dest = path.join(folderPath, "app.jar")
+            tl.debug("Renaming " + src + " to " + dest);
+            fs.renameSync(src, dest);
+        }
+        
         tl.debug('Copied Web Package: ' + webDeployPkg + ' to temporary location: ' + folderPath + ' successfully.');
     }
     else {
