Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ARG Deploy] Updating description and stringifying error logs #7154

Merged
merged 3 commits into from
May 10, 2018
Merged

[ARG Deploy] Updating description and stringifying error logs #7154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a749eea
Updating description and stringifying error logs
thesattiraju May 8, 2018
dc6d866
Updating description
thesattiraju May 9, 2018
079f83b
Minor version bump up.
thesattiraju May 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Tasks/AzureResourceGroupDeploymentV2/Strings/resources.resjson/en-US/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"loc.friendlyName": "Azure Resource Group Deployment",
"loc.helpMarkDown": "[More Information](https://aka.ms/argtaskreadme)",
"loc.description": "Deploy, start, stop, delete Azure Resource Groups",
"loc.description": "Deploy an Azure resource manager (ARM) template to a resource group. You can also start, stop, delete, deallocate all Virtual Machines (VM) in a resource group",
"loc.instanceNameFormat": "Azure Deployment:$(action) action on $(resourceGroupName)",
"loc.releaseNotes": "-Works with cross-platform agents (Linux, macOS, or Windows)\n- Supports Template JSONs located at any publicly accessible http/https URLs.\n- Enhanced UX for Override parameters which can now be viewed/edited in a grid.\n- NAT rule mapping for VMs which are backed by an Load balancer.\n- \"Resource group\" field is now renamed as \"VM details for  WinRM\" and is included in the section \"Advanced deployment options for virtual machines\".\n- Limitations: \n - No support for Classic subscriptions. Only for ARM subscriptions are supported.\n - No support for PowerShell syntax as the task is now node.js based. Ensure the case sensitivity of the parameter names match, when you override the template parameters. Also, remove the PowerShell cmdlets like \"ConvertTo-SecureString\" when you migrate from version 1.0 to version 2.0.",
"loc.group.displayName.AzureDetails": "Azure Details",
Expand Down
7 changes: 4 additions & 3 deletions Tasks/AzureResourceGroupDeploymentV2/operations/Utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ class Utils {
return (!!str && !!str.trim());
}

public static getError(error: any) {
public static getError(error: any): string {
if (error && error.message) {
return error.message;
return JSON.stringify(error.message);
}
return error;

return JSON.stringify(error);
}
}

Expand Down
6 changes: 3 additions & 3 deletions Tasks/AzureResourceGroupDeploymentV2/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "94A74903-F93F-4075-884F-DC11F34058B4",
"name": "AzureResourceGroupDeployment",
"friendlyName": "Azure Resource Group Deployment",
"description": "Deploy, start, stop, delete Azure Resource Groups",
"description": "Deploy an Azure resource manager (ARM) template to a resource group. You can also start, stop, delete, deallocate all Virtual Machines (VM) in a resource group",
"helpMarkDown": "[More Information](https://aka.ms/argtaskreadme)",
"category": "Deploy",
"releaseNotes": "-Works with cross-platform agents (Linux, macOS, or Windows)\n- Supports Template JSONs located at any publicly accessible http/https URLs.\n- Enhanced UX for Override parameters which can now be viewed/edited in a grid.\n- NAT rule mapping for VMs which are backed by an Load balancer.\n- \"Resource group\" field is now renamed as \"VM details for  WinRM\" and is included in the section \"Advanced deployment options for virtual machines\".\n- Limitations: \n - No support for Classic subscriptions. Only for ARM subscriptions are supported.\n - No support for PowerShell syntax as the task is now node.js based. Ensure the case sensitivity of the parameter names match, when you override the template parameters. Also, remove the PowerShell cmdlets like \"ConvertTo-SecureString\" when you migrate from version 1.0 to version 2.0.",
Expand All @@ -13,8 +13,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 2,
"Minor": 131,
"Patch": 3
"Minor": 134,
"Patch": 0
},
"demands": [],
"minimumAgentVersion": "2.119.1",
Expand Down
4 changes: 2 additions & 2 deletions Tasks/AzureResourceGroupDeploymentV2/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 2,
"Minor": 131,
"Patch": 3
"Minor": 134,
"Patch": 0
},
"demands": [],
"minimumAgentVersion": "2.119.1",
Expand Down