azure-pipelines-tasks-azurermdeploycommon 3.221.2 → 3.222.0

package/azure-arm-rest/azure-arm-app-service.js

@@ -349,7 +349,7 @@ class AzureAppService {
                     '{name}': this._name,
                 }, null, '2018-02-01');
                 var response = yield this._client.beginRequest(httpRequest);
-                if (response.statusCode != 200) {
+                if (response.statusCode != 200 && response.statusCode != 202) {
                     throw AzureServiceClient_1.ToError(response);
                 }
                 return response.body;

package/azure-arm-rest/azure-arm-app-service.ts

@@ -378,7 +378,7 @@ export class AzureAppService {
             }, null, '2018-02-01');
             
             var response = await this._client.beginRequest(httpRequest);
-            if(response.statusCode != 200) {
+            if(response.statusCode != 200 && response.statusCode != 202) {
                 throw ToError(response);
             }
 

package/operations/AzureAppServiceUtility.js

@@ -143,13 +143,24 @@ class AzureAppServiceUtility {
             const scmPolicyCheck = yield this.isSitePublishingCredentialsEnabled();
             let token = "";
             let method = "";
+            const password = publishingCredentials.properties["publishingPassword"];
+            const userName = publishingCredentials.properties["publishingUserName"];
             if (scmPolicyCheck === false) {
                 token = yield this._appService._client.getCredentials().getToken();
                 method = "Bearer";
+                // Though bearer AuthN is used, lets try to set publish profile password for mask hints to maintain compat with old behavior for MSDEPLOY. 
+                // This needs to be cleaned up once MSDEPLOY suppport is reomve. Safe handle the exception setting up mask hint as we dont want to fail here.
+                try {
+                    tl.setVariable(`AZURE_APP_MSDEPLOY_${this._appService.getSlot()}_PASSWORD`, password, true);
+                }
+                catch (error) {
+                    // safe handle the exception setting up mask hint
+                    tl.debug(`Setting mask hint for publish profile password failed with error: ${error}`);
+                }
             }
             else {
-                tl.setVariable(`AZURE_APP_SERVICE_KUDU_${this._appService.getSlot()}_PASSWORD`, publishingCredentials.properties["publishingPassword"], true);
-                const buffer = new Buffer(publishingCredentials.properties["publishingUserName"] + ':' + publishingCredentials.properties["publishingPassword"]);
+                tl.setVariable(`AZURE_APP_SERVICE_KUDU_${this._appService.getSlot()}_PASSWORD`, password, true);
+                const buffer = new Buffer(userName + ':' + password);
                 token = buffer.toString('base64');
                 method = "Basic";
             }

package/operations/AzureAppServiceUtility.ts

@@ -137,12 +137,27 @@ export class AzureAppServiceUtility {
         let token = "";
         let method = "";
 
+        const password = publishingCredentials.properties["publishingPassword"];
+        const userName = publishingCredentials.properties["publishingUserName"];
+
         if(scmPolicyCheck === false) {
             token = await this._appService._client.getCredentials().getToken();
             method = "Bearer";
+
+            
+            // Though bearer AuthN is used, lets try to set publish profile password for mask hints to maintain compat with old behavior for MSDEPLOY. 
+            // This needs to be cleaned up once MSDEPLOY suppport is reomve. Safe handle the exception setting up mask hint as we dont want to fail here.
+            try {      
+                tl.setVariable(`AZURE_APP_MSDEPLOY_${this._appService.getSlot()}_PASSWORD`, password, true);
+            }
+            catch (error) {
+                // safe handle the exception setting up mask hint
+                tl.debug(`Setting mask hint for publish profile password failed with error: ${error}`);
+            }
+
         } else {
-            tl.setVariable(`AZURE_APP_SERVICE_KUDU_${this._appService.getSlot()}_PASSWORD`, publishingCredentials.properties["publishingPassword"], true);
-            const buffer = new Buffer(publishingCredentials.properties["publishingUserName"] + ':' + publishingCredentials.properties["publishingPassword"]);
+            tl.setVariable(`AZURE_APP_SERVICE_KUDU_${this._appService.getSlot()}_PASSWORD`, password, true);
+            const buffer = new Buffer(userName + ':' + password);
             token = buffer.toString('base64');
             method = "Basic";
         }

package/operations/ContainerBasedDeploymentUtility.d.ts

@@ -3,7 +3,7 @@ export declare class ContainerBasedDeploymentUtility {
     private _appService;
     private _appServiceUtility;
     constructor(appService: AzureAppService);
-    deployWebAppImage(properties: any): Promise<void>;
+    deployWebAppImage(properties: any, restart?: boolean): Promise<void>;
     private _updateConfigurationDetails;
     private _getAzureContainerImageName;
     private _getDockerHubImageName;

package/operations/ContainerBasedDeploymentUtility.js

@@ -29,7 +29,7 @@ class ContainerBasedDeploymentUtility {
         this._appService = appService;
         this._appServiceUtility = new AzureAppServiceUtility_1.AzureAppServiceUtility(appService);
     }
-    deployWebAppImage(properties) {
+    deployWebAppImage(properties, restart = true) {
         return __awaiter(this, void 0, void 0, function* () {
             let imageName = properties["ImageName"];
             let multicontainerConfigFile = properties["MulticontainerConfigFile"];
@@ -49,8 +49,10 @@ class ContainerBasedDeploymentUtility {
             }
             tl.debug("Updating the webapp configuration.");
             yield this._updateConfigurationDetails(properties["ConfigurationSettings"], properties["StartupCommand"], isLinuxApp, imageName, isMultiContainer, updatedMulticontainerConfigFile);
-            tl.debug('making a restart request to app service');
-            yield this._appService.restart();
+            if (restart) {
+                tl.debug('making a restart request to app service');
+                yield this._appService.restart();
+            }
         });
     }
     _updateConfigurationDetails(configSettings, startupCommand, isLinuxApp, imageName, isMultiContainer, multicontainerConfigFile) {

package/operations/ContainerBasedDeploymentUtility.ts

@@ -23,7 +23,7 @@ export class ContainerBasedDeploymentUtility {
         this._appServiceUtility = new AzureAppServiceUtility(appService);
     }
 
-    public async deployWebAppImage(properties: any): Promise<void> {
+    public async deployWebAppImage(properties: any, restart: boolean = true): Promise<void> {
         let imageName: string = properties["ImageName"];
         let multicontainerConfigFile: string = properties["MulticontainerConfigFile"];
         let isMultiContainer: boolean = properties["isMultiContainer"];
@@ -46,8 +46,10 @@ export class ContainerBasedDeploymentUtility {
         tl.debug("Updating the webapp configuration.");
         await this._updateConfigurationDetails(properties["ConfigurationSettings"], properties["StartupCommand"], isLinuxApp, imageName, isMultiContainer, updatedMulticontainerConfigFile);
 
-        tl.debug('making a restart request to app service');
-        await this._appService.restart();
+        if (restart) {
+            tl.debug('making a restart request to app service');
+            await this._appService.restart();
+        }
     }
 
     private async _updateConfigurationDetails(configSettings: any, startupCommand: string, isLinuxApp: boolean, imageName?: string, isMultiContainer?: boolean, multicontainerConfigFile?: string): Promise<void> {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "azure-pipelines-tasks-azurermdeploycommon",
-    "version": "3.221.2",
+    "version": "3.222.0",
     "description": "Common Lib for Azure ARM REST apis",
     "repository": {
         "type": "git",