Skip to content

Commit

Permalink
App Service Deploy - Reliability fixes (#6182)
Browse files Browse the repository at this point in the history 
* raw changes push

* added final changes

* fixed few bugs

* updated task.loc

* removed azurerest-common module

* retry msDeploy

* Fixed few bugs

* Fixed bugs #2

* Fixed bugs #3

* addressed review comments

* added help messages

* fixed few bugs

* linux kudu file path updated

* added basic Tests

* changed rm fn

* Fix L0 Tests

* Test added for common-kudu

* added Tests for common-AzureAppService

* Fix App Service issue

* added debug statements

* Addressed review comments

* addressed review comments

* addressed review comments

* addressed review comments

* Package error message updated

* addressed Ajay & Ayantika comments
  • Loading branch information
@vincent1173
vincent1173 authored Jan 18, 2018
1 parent de36681 commit 3d01307
Show file tree
Hide file tree
Showing 52 changed files with 2,442 additions and 7,109 deletions.
2 changes: 1 addition & 1 deletion Tasks/AzureAppServiceManage/operations/ContinuousMonitoringUtils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export async function enableContinuousMonitoring(endpoint: AzureEndpoint, appSer

try {
tl.debug('Enable alwaysOn property for app service.');
await appService.patchConfiguration({"alwaysOn": true});
await appService.patchConfiguration({ "properties" :{"alwaysOn": true}});
}
catch(error) {
tl.warning(error);
Expand Down
47 changes: 37 additions & 10 deletions Tasks/AzureRmWebAppDeployment/Strings/resources.resjson/en-US/resources.resjson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"loc.group.displayName.FileTransformsAndVariableSubstitution": "File Transforms & Variable Substitution Options",
"loc.group.displayName.AdditionalDeploymentOptions": "Additional Deployment Options",
"loc.group.displayName.PostDeploymentAction": "Post Deployment Action",
"loc.group.displayName.ApplicationAndConfigurationSettings": "Application and Configuration Settings",
"loc.group.displayName.output": "Output",
"loc.group.displayName.ApplicationSettings": "Application Settings",
"loc.input.label.ConnectedServiceName": "Azure subscription",
"loc.input.help.ConnectedServiceName": "Select the Azure Resource Manager subscription for the deployment.",
"loc.input.label.WebAppKind": "App type",
Expand Down Expand Up @@ -48,9 +48,9 @@
"loc.input.label.VirtualApplication": "Virtual application",
"loc.input.help.VirtualApplication": "Specify the name of the Virtual application that has been configured in the Azure portal. The option is not required for deployments to the App Service root.",
"loc.input.label.Package": "Package or folder",
"loc.input.help.Package": "File path to the package or a folder containing app service contents generated by MSBuild or a compressed archive file.<br />Variables ( [Build](https://www.visualstudio.com/docs/build/define/variables) | [Release](https://www.visualstudio.com/docs/release/author-release-definition/understanding-tasks#predefvariables)), wild cards are supported. <br/> For example, $(System.DefaultWorkingDirectory)/\\*\\*/\\*.zip.",
"loc.input.help.Package": "File path to the package or a folder containing app service contents generated by MSBuild or a compressed zip or war file.<br />Variables ( [Build](https://www.visualstudio.com/docs/build/define/variables) | [Release](https://www.visualstudio.com/docs/release/author-release-definition/understanding-tasks#predefvariables)), wild cards are supported. <br/> For example, $(System.DefaultWorkingDirectory)/\\*\\*/\\*.zip or $(System.DefaultWorkingDirectory)/\\*\\*/\\*.war.",
"loc.input.label.BuiltinLinuxPackage": "Package or folder",
"loc.input.help.BuiltinLinuxPackage": "File path to the package or a folder containing app service contents generated by MSBuild or a compressed archive file.<br />Variables ( [Build](https://www.visualstudio.com/docs/build/define/variables) | [Release](https://www.visualstudio.com/docs/release/author-release-definition/understanding-tasks#predefvariables)), wild cards are supported. <br/> For example, $(System.DefaultWorkingDirectory)/\\*\\*/\\*.zip.",
"loc.input.help.BuiltinLinuxPackage": "File path to the package or a folder containing app service contents generated by MSBuild or a compressed zip or war file.<br />Variables ( [Build](https://www.visualstudio.com/docs/build/define/variables) | [Release](https://www.visualstudio.com/docs/release/author-release-definition/understanding-tasks#predefvariables)), wild cards are supported. <br/> For example, $(System.DefaultWorkingDirectory)/\\*\\*/\\*.zip or $(System.DefaultWorkingDirectory)/\\*\\*/\\*.war.",
"loc.input.label.RuntimeStack": "Runtime Stack",
"loc.input.help.RuntimeStack": "Select the framework and version.",
"loc.input.label.StartupCommand": "Startup command ",
Expand All @@ -67,6 +67,8 @@
"loc.input.help.WebConfigParameters": "Edit values like startup file in the generated web.config file. This edit feature is only for the generated web.config. [Learn more](https://go.microsoft.com/fwlink/?linkid=843469).",
"loc.input.label.AppSettings": "App settings",
"loc.input.help.AppSettings": "Edit web app application settings following the syntax -key value .<br /> Example : -Port 5000 -RequestTimeout 5000",
"loc.input.label.ConfigurationSettings": "Configuration settings",
"loc.input.help.ConfigurationSettings": "Edit web app configuration settings following the syntax -key value.<br /> Example : -phpVersion 5.6 -linuxFxVersion: node|6.11",
"loc.input.label.TakeAppOfflineFlag": "Take App Offline",
"loc.input.help.TakeAppOfflineFlag": "Select the option to take the Azure App Service offline by placing an app_offline.htm file in the root directory of the App Service before the sync operation begins. The file will be removed after the sync operation completes successfully.",
"loc.input.label.UseWebDeploy": "Publish using Web Deploy",
Expand Down Expand Up @@ -96,7 +98,7 @@
"loc.messages.UnabletoretrieveResourceID": "Unable to retrieve connection details for Azure Resource:'%s'. Status Code: %s",
"loc.messages.CouldnotfetchaccesstokenforAzureStatusCode": "Could not fetch access token for Azure. Status Code: %s (%s)",
"loc.messages.Successfullyupdateddeploymenthistory": "Successfully updated deployment History at %s",
"loc.messages.Failedtoupdatedeploymenthistory": "Failed to update deployment history.",
"loc.messages.Failedtoupdatedeploymenthistory": "Failed to update deployment history. Error: %s",
"loc.messages.WARNINGCannotupdatedeploymentstatusSCMendpointisnotenabledforthiswebsite": "WARNING : Cannot update deployment status : SCM endpoint is not enabled for this website",
"loc.messages.Unabletoretrievewebconfigdetails": "Unable to retrieve App Service configuration details. Status Code: '%s'",
"loc.messages.Unabletoretrievewebappsettings": "Unable to retrieve App Service application settings. [Status Code: '%s', Error Message: '%s']",
Expand All @@ -112,8 +114,8 @@
"loc.messages.MSDeploygeneratedpackageareonlysupportedforWindowsplatform": "MSDeploy generated packages are only supported for Windows platform.",
"loc.messages.UnsupportedinstalledversionfoundforMSDeployversionshouldbeatleast3orabove": "Unsupported installed version: %s found for MSDeploy. version should be at least 3 or above",
"loc.messages.UnabletofindthelocationofMSDeployfromregistryonmachineError": "Unable to find the location of MS Deploy from registry on machine (Error : %s)",
"loc.messages.Nopackagefoundwithspecifiedpattern": "No package found with specified pattern",
"loc.messages.MorethanonepackagematchedwithspecifiedpatternPleaserestrainthesearchpattern": "More than one package matched with specified pattern. Please restrain the search pattern.",
"loc.messages.Nopackagefoundwithspecifiedpattern": "No package found with specified pattern: %s",
"loc.messages.MorethanonepackagematchedwithspecifiedpatternPleaserestrainthesearchpattern": "More than one package matched with specified pattern: %s. Please restrain the search pattern.",
"loc.messages.Trytodeploywebappagainwithappofflineoptionselected": "Try to deploy app service again with Take application offline option selected.",
"loc.messages.Trytodeploywebappagainwithrenamefileoptionselected": "Try to deploy app service again with Rename locked files option selected.",
"loc.messages.NOJSONfilematchedwithspecificpattern": "NO JSON file matched with specific pattern: %s.",
Expand All @@ -135,16 +137,16 @@
"loc.messages.RequestedURLforkuduphysicalpath": "Requested URL for kudu physical path : %s",
"loc.messages.Physicalpathalreadyexists": "Physical path '%s' already exists",
"loc.messages.KuduPhysicalpathCreatedSuccessfully": "Kudu physical path created successfully : %s",
"loc.messages.FailedtocreateKuduPhysicalPath": "Failed to create kudu physical path. Error Code: %s",
"loc.messages.FailedtocreateKuduPhysicalPath": "Failed to create kudu physical path. Error : %s",
"loc.messages.FailedtocheckphysicalPath": "Failed to check kudu physical path. Error Code: %s",
"loc.messages.VirtualApplicationDoesNotExist": "Virtual application doesn't exists : %s",
"loc.messages.JSONParseError": "Unable to parse JSON file: %s. Error: %s",
"loc.messages.JSONvariablesubstitutionappliedsuccessfully": "JSON variable substitution applied successfully.",
"loc.messages.XMLvariablesubstitutionappliedsuccessfully": "XML variable substitution applied successfully.",
"loc.messages.failedtoUploadFileToKudu": "Unable to upload file: %s to Kudu (%s). Status Code: %s",
"loc.messages.failedtoUploadFileToKuduError": "Unable to upload file: %s to Kudu (%s). Error: %s",
"loc.messages.ExecuteScriptOnKudu": "Executing given script on Kudu: %s",
"loc.messages.FailedToRunScriptOnKuduError": "Unable to run the script on Kudu: %s. Error: %s",
"loc.messages.ExecuteScriptOnKudu": "Executing given script on Kudu service.",
"loc.messages.FailedToRunScriptOnKuduError": "Unable to run the script on Kudu Service. Error: %s",
"loc.messages.FailedToRunScriptOnKudu": "Unable to run the script on Kudu: %s. Status Code: %s",
"loc.messages.ScriptExecutionOnKuduSuccess": "Successfully executed script on Kudu.",
"loc.messages.ScriptExecutionOnKuduFailed": "Executed script returned '%s' as return code. Error: %s",
Expand Down Expand Up @@ -183,5 +185,30 @@
"loc.messages.UnableToUpdateWebAppConfigDetails": "Unable to update WebApp config details. StatusCode: '%s'",
"loc.messages.AddingReleaseAnnotation": "Adding release annotation for the Application Insights resource '%s'",
"loc.messages.SuccessfullyAddedReleaseAnnotation": "Successfully added release annotation to the Application Insight : %s",
"loc.messages.FailedAddingReleaseAnnotation": "Failed to add release annotation. %s"
"loc.messages.FailedAddingReleaseAnnotation": "Failed to add release annotation. %s",
"loc.messages.RenameLockedFilesEnabled": "Rename locked files enabled for App Service.",
"loc.messages.FailedToEnableRenameLockedFiles": "Failed to enable rename locked files. Error: %s",
"loc.messages.WebJobsInProgressIssue": "Few WebJobs in running state prevents the deployment from removing the files. You can disable 'Remove additional files at destinaton' option or Stop continuous Jobs before deployment.",
"loc.messages.FailedToFetchKuduAppSettings": "Failed to fetch Kudu App Settings. Error: %s",
"loc.messages.FailedToCreatePath": "Failed to create path '%s' from Kudu. Error: %s",
"loc.messages.FailedToDeleteFile": "Failed to delete file '%s/%s' from Kudu. Error: %s",
"loc.messages.FailedToUploadFile": "Failed to upload file '%s/%s' from Kudu. Error: %s",
"loc.messages.FailedToGetFileContent": "Failed to get file content '%s/%s' from Kudu. Error: %s",
"loc.messages.FailedToListPath": "Failed to list path '%s' from Kudu. Error: %s",
"loc.messages.RetryToDeploy": "Retrying to deploy the package.",
"loc.messages.FailedToGetAppServiceDetails": "Failed to fetch App Service '%s' details. Error: %s",
"loc.messages.FailedToGetAppServicePublishingProfile": "Failed to fetch App Service '%s' publishing profile. Error: %s",
"loc.messages.FailedToUpdateAppServiceMetadata": "Failed to update App service '%s' Meta data. Error: %s",
"loc.messages.FailedToGetAppServiceMetadata": "Failed to get App service '%s' Meta data. Error: %s",
"loc.messages.FailedToPatchAppServiceConfiguration": "Failed to patch App Service '%s' configuration. Error: %s",
"loc.messages.FailedToUpdateAppServiceConfiguration": "Failed to update App service '%s' configuration. Error: %s",
"loc.messages.FailedToGetAppServiceConfiguration": "Failed to get App service '%s' configuration. Error: %s",
"loc.messages.FailedToGetAppServicePublishingCredentials": "Failed to fetch App Service '%s' publishing credentials. Error: %s",
"loc.messages.FailedToGetAppServiceApplicationSettings": "Failed to get App service '%s' application settings. Error: %s",
"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.UpdatedAppServiceApplicationSettings": "Updated App Service Application settings and Kudu Application settings.",
"loc.messages.MultipleResourceGroupFoundForAppService": "Multiple resource group found for App Service '%s'."
}
Loading

0 comments on commit 3d01307

Please sign in to comment.