From a749eea856e88cd408fef77a855c55cdf7500638 Mon Sep 17 00:00:00 2001 From: Deepak Sattiraju Date: Tue, 8 May 2018 15:37:40 +0530 Subject: [PATCH 1/3] Updating description and stringifying error logs --- .../Strings/resources.resjson/en-US/resources.resjson | 2 +- Tasks/AzureResourceGroupDeploymentV2/operations/Utils.ts | 7 ++++--- Tasks/AzureResourceGroupDeploymentV2/task.json | 4 ++-- Tasks/AzureResourceGroupDeploymentV2/task.loc.json | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Tasks/AzureResourceGroupDeploymentV2/Strings/resources.resjson/en-US/resources.resjson b/Tasks/AzureResourceGroupDeploymentV2/Strings/resources.resjson/en-US/resources.resjson index 949f7da70c22..e3da24c127a9 100644 --- a/Tasks/AzureResourceGroupDeploymentV2/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/AzureResourceGroupDeploymentV2/Strings/resources.resjson/en-US/resources.resjson @@ -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. 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", diff --git a/Tasks/AzureResourceGroupDeploymentV2/operations/Utils.ts b/Tasks/AzureResourceGroupDeploymentV2/operations/Utils.ts index 7c2cf5c8bc17..f15b1671ccb3 100644 --- a/Tasks/AzureResourceGroupDeploymentV2/operations/Utils.ts +++ b/Tasks/AzureResourceGroupDeploymentV2/operations/Utils.ts @@ -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); } } diff --git a/Tasks/AzureResourceGroupDeploymentV2/task.json b/Tasks/AzureResourceGroupDeploymentV2/task.json index 6de8ab02a713..10e3cdaf43b5 100644 --- a/Tasks/AzureResourceGroupDeploymentV2/task.json +++ b/Tasks/AzureResourceGroupDeploymentV2/task.json @@ -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. 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.", @@ -14,7 +14,7 @@ "version": { "Major": 2, "Minor": 131, - "Patch": 3 + "Patch": 4 }, "demands": [], "minimumAgentVersion": "2.119.1", diff --git a/Tasks/AzureResourceGroupDeploymentV2/task.loc.json b/Tasks/AzureResourceGroupDeploymentV2/task.loc.json index d89f622c308c..f8f62b1ffc98 100644 --- a/Tasks/AzureResourceGroupDeploymentV2/task.loc.json +++ b/Tasks/AzureResourceGroupDeploymentV2/task.loc.json @@ -14,7 +14,7 @@ "version": { "Major": 2, "Minor": 131, - "Patch": 3 + "Patch": 4 }, "demands": [], "minimumAgentVersion": "2.119.1", From dc6d866dff956bbb4ca28e12d82e410bb03aeae6 Mon Sep 17 00:00:00 2001 From: Deepak Sattiraju Date: Wed, 9 May 2018 14:05:29 +0530 Subject: [PATCH 2/3] Updating description --- .../Strings/resources.resjson/en-US/resources.resjson | 2 +- Tasks/AzureResourceGroupDeploymentV2/task.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tasks/AzureResourceGroupDeploymentV2/Strings/resources.resjson/en-US/resources.resjson b/Tasks/AzureResourceGroupDeploymentV2/Strings/resources.resjson/en-US/resources.resjson index e3da24c127a9..4a0971fba00d 100644 --- a/Tasks/AzureResourceGroupDeploymentV2/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/AzureResourceGroupDeploymentV2/Strings/resources.resjson/en-US/resources.resjson @@ -1,7 +1,7 @@ { "loc.friendlyName": "Azure Resource Group Deployment", "loc.helpMarkDown": "[More Information](https://aka.ms/argtaskreadme)", - "loc.description": "Deploy an Azure resource manager (ARM) template to a resource group. Start, stop, delete, deallocate all Virtual Machines (VM) in a resource group", + "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", diff --git a/Tasks/AzureResourceGroupDeploymentV2/task.json b/Tasks/AzureResourceGroupDeploymentV2/task.json index 10e3cdaf43b5..2b1e150b9e7f 100644 --- a/Tasks/AzureResourceGroupDeploymentV2/task.json +++ b/Tasks/AzureResourceGroupDeploymentV2/task.json @@ -2,7 +2,7 @@ "id": "94A74903-F93F-4075-884F-DC11F34058B4", "name": "AzureResourceGroupDeployment", "friendlyName": "Azure Resource Group Deployment", - "description": "Deploy an Azure resource manager (ARM) template to a resource group. Start, stop, delete, deallocate all Virtual Machines (VM) in a resource group", + "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.", From 079f83be850006310584196c53b25a4c2f5a9631 Mon Sep 17 00:00:00 2001 From: Deepak Sattiraju Date: Wed, 9 May 2018 14:10:34 +0530 Subject: [PATCH 3/3] Minor version bump up. --- Tasks/AzureResourceGroupDeploymentV2/task.json | 4 ++-- Tasks/AzureResourceGroupDeploymentV2/task.loc.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Tasks/AzureResourceGroupDeploymentV2/task.json b/Tasks/AzureResourceGroupDeploymentV2/task.json index 2b1e150b9e7f..66e37999502e 100644 --- a/Tasks/AzureResourceGroupDeploymentV2/task.json +++ b/Tasks/AzureResourceGroupDeploymentV2/task.json @@ -13,8 +13,8 @@ "author": "Microsoft Corporation", "version": { "Major": 2, - "Minor": 131, - "Patch": 4 + "Minor": 134, + "Patch": 0 }, "demands": [], "minimumAgentVersion": "2.119.1", diff --git a/Tasks/AzureResourceGroupDeploymentV2/task.loc.json b/Tasks/AzureResourceGroupDeploymentV2/task.loc.json index f8f62b1ffc98..16253e7453d2 100644 --- a/Tasks/AzureResourceGroupDeploymentV2/task.loc.json +++ b/Tasks/AzureResourceGroupDeploymentV2/task.loc.json @@ -13,8 +13,8 @@ "author": "Microsoft Corporation", "version": { "Major": 2, - "Minor": 131, - "Patch": 4 + "Minor": 134, + "Patch": 0 }, "demands": [], "minimumAgentVersion": "2.119.1",