azure-pipelines-tasks-azurermdeploycommon 3.221.3 → 3.222.1

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.d.ts

@@ -12,11 +12,12 @@ export declare class AzureAppServiceUtility {
     private getKuduAuthHeader;
     getPhysicalPath(virtualApplication: string): Promise<string>;
     updateConfigurationSettings(properties: any, formatJSON?: boolean): Promise<void>;
-    updateAndMonitorAppSettings(addProperties?: any, deleteProperties?: any, formatJSON?: boolean): Promise<boolean>;
+    updateAndMonitorAppSettings(addProperties?: any, deleteProperties?: any, formatJSON?: boolean, perSlot?: boolean): Promise<boolean>;
     updateConnectionStrings(addProperties: any): Promise<boolean>;
     enableRenameLockedFiles(): Promise<void>;
     updateStartupCommandAndRuntimeStack(runtimeStack: string, startupCommand?: string): Promise<void>;
     isSitePublishingCredentialsEnabled(): Promise<boolean>;
     private _getPhysicalToVirtualPathMap;
     private _getNewMetadata;
+    isFunctionAppOnCentauri(): Promise<boolean>;
 }

package/operations/AzureAppServiceUtility.js

@@ -205,7 +205,7 @@ class AzureAppServiceUtility {
             console.log(tl.loc('UpdatedAppServiceConfigurationSettings'));
         });
     }
-    updateAndMonitorAppSettings(addProperties, deleteProperties, formatJSON) {
+    updateAndMonitorAppSettings(addProperties, deleteProperties, formatJSON, perSlot = true) {
         return __awaiter(this, void 0, void 0, function* () {
             if (formatJSON) {
                 var appSettingsProperties = {};
@@ -240,7 +240,9 @@ class AzureAppServiceUtility {
             else {
                 console.log(tl.loc('AppServiceApplicationSettingsAlreadyPresent'));
             }
-            yield this._appService.patchApplicationSettingsSlot(addProperties);
+            if (perSlot) {
+                yield this._appService.patchApplicationSettingsSlot(addProperties);
+            }
             return isNewValueUpdated;
         });
     }
@@ -390,5 +392,23 @@ class AzureAppServiceUtility {
         }
         return newProperties;
     }
+    isFunctionAppOnCentauri() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let details = yield this._appService.get();
+                if (details.properties["managedEnvironmentId"]) {
+                    tl.debug("Function Container app is on Centauri.");
+                    return true;
+                }
+                else {
+                    return false;
+                }
+            }
+            catch (error) {
+                tl.debug(`Skipping Centauri check: ${error}`);
+                return false;
+            }
+        });
+    }
 }
 exports.AzureAppServiceUtility = AzureAppServiceUtility;

package/operations/AzureAppServiceUtility.ts

@@ -209,7 +209,7 @@ export class AzureAppServiceUtility {
         console.log(tl.loc('UpdatedAppServiceConfigurationSettings'));
     }
 
-    public async updateAndMonitorAppSettings(addProperties?: any, deleteProperties?: any, formatJSON?: boolean): Promise<boolean> {
+    public async updateAndMonitorAppSettings(addProperties?: any, deleteProperties?: any, formatJSON?: boolean, perSlot: boolean = true): Promise<boolean> {
         if(formatJSON) {
             var appSettingsProperties = {};
             for(var property in addProperties) {
@@ -251,7 +251,9 @@ export class AzureAppServiceUtility {
             console.log(tl.loc('AppServiceApplicationSettingsAlreadyPresent'));
         }
 
-        await this._appService.patchApplicationSettingsSlot(addProperties);
+        if (perSlot) {
+            await this._appService.patchApplicationSettingsSlot(addProperties);
+        } 
         return isNewValueUpdated;
     }
 
@@ -413,4 +415,21 @@ export class AzureAppServiceUtility {
         return newProperties;
     }
 
+    public async isFunctionAppOnCentauri(): Promise<boolean>{
+        try{
+            let details: any =  await this._appService.get();
+            if (details.properties["managedEnvironmentId"]){
+                tl.debug("Function Container app is on Centauri.");
+                return true;
+            }
+            else{                
+                return false;    
+            }
+        }
+        catch(error){
+            tl.debug(`Skipping Centauri check: ${error}`);
+            return false;
+        }        
+    }
+
 }

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.3",
+    "version": "3.222.1",
     "description": "Common Lib for Azure ARM REST apis",
     "repository": {
         "type": "git",