Add checkbox for JSONStringify

Tasks/AzureResourceGroupDeploymentV2/README.md

@@ -104,8 +104,35 @@ The following parameters are shown when the selected action is to create or upda
   sed -e 's/]"/]/g'`
   sa_name=`echo $var | jq -r .storageAccountName.value`
   echo $sa_name
+
   ```
+  In case, you're accessing individual output values directly, values are being set after being converted via JSON.Stringify. To change this behavior, `Use individual output values without JSON.Stringify applied` checkbox can be used:
+
+  Example:
+  Let's assume, we've `outputvalue` as output of the deployment.
 
+  `Use individual output values without JSON.Stringify applied` set to `false (default)`
+  ```
+  outputvalue => JSON.stringify(outputvalue) => "outputvalue":
+
+  // setting variable as JSON.stringify's result
+  ##vso[task.setvariable variable=taskdeploymentoutputname.outputkey]"outputvalue"
+
+  // variable will be read as JSON.stringify's result
+  $(outputvalue) => "outputvalue"
+  ```
+
+  `Use individual output values without JSON.Stringify applied` set to `true`
+  ```
+  outputvalue => no operation:
+
+  // setting variable as it is
+  ##vso[task.setvariable variable=taskdeploymentoutputname.outputkey]outputvalue
+
+  // variable will be read as it is
+  $(outputvalue) => outputvalue
+  ```
+
  ### Advanced deployment options for virtual machines:
 
  These options would be applicable only when the Resource group contains virtual machines.

Tasks/AzureResourceGroupDeploymentV2/Strings/resources.resjson/en-US/resources.resjson

@@ -53,6 +53,8 @@
   "loc.input.help.deploymentOutputs": "Provide a name for the variable for the output variable which will contain the outputs section of the current deployment object in string format. You can use the “ConvertFrom-Json” PowerShell cmdlet to parse the JSON object and access the individual output values. For more details refer to [this](https://github.com/microsoft/azure-pipelines-tasks/tree/master/Tasks/AzureResourceGroupDeploymentV2#deployment-outputs)",
   "loc.input.label.addSpnToEnvironment": "Access service principal details in override parameters",
   "loc.input.help.addSpnToEnvironment": "Adds service principal id and key of the Azure endpoint you chose to the script's execution environment. You can use these variables: `$servicePrincipalId` and `$servicePrincipalKey` in your override parameters like `-key $servicePrincipalKey`",
+  "loc.input.label.useWithoutJSON": "Use individual output values without JSON.Stringify applied",
+  "loc.input.help.useWithoutJSON": "Individual output values are being converted via JSON.Stringify by default. If you want to use the output values as it is without converting them via JSON.Stringify, enable this option. For more details refer to [this](https://github.com/microsoft/azure-pipelines-tasks/tree/master/Tasks/AzureResourceGroupDeploymentV2#deployment-outputs)",
   "loc.messages.CheckResourceGroupExistence": "Checking if the following resource group exists: %s.",
   "loc.messages.ResourceGroupStatusFetchFailed": "Failed to check the resource group status. Error: %s.",
   "loc.messages.ResourceGroupStatus": "Resource group exists: %s.",

Tasks/AzureResourceGroupDeploymentV2/models/DeployAzureRG.ts

@@ -73,6 +73,7 @@ export class AzureRGTaskParameters {
     public agentServiceUserCredentials: AgentServiceUserCredentials;
     public runAgentServiceAsUser: boolean;
     public addSpnToEnvironment: boolean;
+    public useWithoutJSON: boolean;
     public connectedService: string;
     public authScheme: string;
 
@@ -152,6 +153,8 @@ export class AzureRGTaskParameters {
             this.deploymentGroupProjectName = tl.getInput("project");
             this.deploymentOutputs = tl.getInput("deploymentOutputs");
             this.addSpnToEnvironment = tl.getBoolInput("addSpnToEnvironment", false);
+            this.useWithoutJSON = tl.getBoolInput("useWithoutJSON", false);
+
             return this;
         } catch (error) {
             throw new Error(tl.loc("ARGD_ConstructorFailed", error.message));

Tasks/AzureResourceGroupDeploymentV2/operations/ResourceGroup.ts

@@ -563,7 +563,7 @@ export class ResourceGroup {
                                     setVariablesInObject(`${path}.${key}`, obj[key]);
                                 }
                                 else {
-                                    console.log(`##vso[task.setvariable variable=${path}.${key};]` + JSON.stringify(obj[key]));
+                                    console.log(`##vso[task.setvariable variable=${path}.${key};]` + (this.taskParameters.useWithoutJSON ? obj[key] : JSON.stringify(obj[key])));
                                     console.log(tl.loc("AddedOutputVariable", `${path}.${key}`));
                                 }
                             }

Tasks/AzureResourceGroupDeploymentV2/task.json

@@ -15,7 +15,7 @@
     "version": {
         "Major": 2,
         "Minor": 224,
-        "Patch": 0
+        "Patch": 1
     },
     "demands": [],
     "minimumAgentVersion": "2.119.1",
@@ -306,6 +306,15 @@
             "required": false,
             "helpMarkDown": "Adds service principal id and key of the Azure endpoint you chose to the script's execution environment. You can use these variables: `$servicePrincipalId` and `$servicePrincipalKey` in your override parameters like `-key $servicePrincipalKey`",
             "groupName": "Advanced"
+        },
+        {
+            "name": "useWithoutJSON",
+            "type": "boolean",
+            "label": "Use individual output values without JSON.Stringify applied",
+            "defaultValue": "false",
+            "required": false,
+            "helpMarkDown": "Individual output values are being converted via JSON.Stringify by default. If you want to use the output values as it is without converting them via JSON.Stringify, enable this option. For more details refer to [this](https://github.com/microsoft/azure-pipelines-tasks/tree/master/Tasks/AzureResourceGroupDeploymentV2#deployment-outputs)",
+            "groupName": "Advanced"
         }
     ],
     "dataSourceBindings": [

Tasks/AzureResourceGroupDeploymentV2/task.loc.json

@@ -15,7 +15,7 @@
   "version": {
     "Major": 2,
     "Minor": 224,
-    "Patch": 0
+    "Patch": 1
   },
   "demands": [],
   "minimumAgentVersion": "2.119.1",
@@ -306,6 +306,15 @@
       "required": false,
       "helpMarkDown": "ms-resource:loc.input.help.addSpnToEnvironment",
       "groupName": "Advanced"
+    },
+    {
+      "name": "useWithoutJSON",
+      "type": "boolean",
+      "label": "ms-resource:loc.input.label.useWithoutJSON",
+      "defaultValue": "false",
+      "required": false,
+      "helpMarkDown": "ms-resource:loc.input.help.useWithoutJSON",
+      "groupName": "Advanced"
     }
   ],
   "dataSourceBindings": [

Tasks/AzureResourceManagerTemplateDeploymentV3/README.md

@@ -103,6 +103,33 @@ The parameters of the task are described in details, including examples, to show
   echo $sa_name
   ```
 
+  In case, you're accessing individual output values directly, values are being set after being converted via JSON.Stringify. To change this behavior, `Use individual output values without JSON.Stringify applied` checkbox can be used:
+
+  Example:
+  Let's assume, we've `outputvalue` as output of the deployment.
+
+  `Use individual output values without JSON.Stringify applied` set to `false (default)`
+  ```
+  outputvalue => JSON.stringify(outputvalue) => "outputvalue":
+
+  // setting variable as JSON.stringify's result
+  ##vso[task.setvariable variable=taskdeploymentoutputname.outputkey]"outputvalue"
+
+  // variable will be read as JSON.stringify's result
+  $(outputvalue) => "outputvalue"
+  ```
+
+  `Use individual output values without JSON.Stringify applied` set to `true`
+  ```
+  outputvalue => no operation:
+
+  // setting variable as it is
+  ##vso[task.setvariable variable=taskdeploymentoutputname.outputkey]outputvalue
+
+  // variable will be read as it is
+  $(outputvalue) => outputvalue
+  ```
+
 ### Supported Azure and AzureRM module versions:
 |  Azure Pipelines/TFS Release  |  Recommended Azure Version  |  Other Supported Versions |
 |:------------------:|:---------------------------:|:-------------------------:|

Tasks/AzureResourceManagerTemplateDeploymentV3/Strings/resources.resjson/en-US/resources.resjson

@@ -38,6 +38,8 @@
   "loc.input.help.deploymentOutputs": "Provide a name for the variable for the output variable which will contain the outputs section of the current deployment object in string format. You can use the “ConvertFrom-Json” PowerShell cmdlet to parse the JSON object and access the individual output values. For more details refer to [this](https://github.com/microsoft/azure-pipelines-tasks/tree/master/Tasks/AzureResourceManagerTemplateDeploymentV3#deployment-outputs)",
   "loc.input.label.addSpnToEnvironment": "Access service principal details in override parameters",
   "loc.input.help.addSpnToEnvironment": "Adds service principal id and key of the Azure endpoint you chose to the script's execution environment. You can use these variables: `$servicePrincipalId` and `$servicePrincipalKey` in your override parameters like `-key $servicePrincipalKey`",
+  "loc.input.label.useWithoutJSON": "Use individual output values without JSON.Stringify applied",
+  "loc.input.help.useWithoutJSON": "Individual output values are being converted via JSON.Stringify by default. If you want to use the output values as it is without converting them via JSON.Stringify, enable this option. For more details refer to [this](https://github.com/microsoft/azure-pipelines-tasks/tree/master/Tasks/AzureResourceManagerTemplateDeploymentV3#deployment-outputs)",
   "loc.messages.CheckResourceGroupExistence": "Checking if the following resource group exists: %s.",
   "loc.messages.ResourceGroupStatusFetchFailed": "Failed to check the resource group status. Error: %s.",
   "loc.messages.ResourceGroupStatus": "Resource group exists: %s.",

Tasks/AzureResourceManagerTemplateDeploymentV3/models/TaskParameters.ts

@@ -23,6 +23,7 @@ export class TaskParameters {
     public graphCredentials: msRestAzure.ApplicationTokenCredentials;
     public deploymentOutputs: string;
     public addSpnToEnvironment: boolean;
+    public useWithoutJSON: boolean;
     public connectedService: string;
     public deploymentScope: string;
     public managementGroupId: string;
@@ -118,6 +119,7 @@ export class TaskParameters {
             this.graphCredentials = await this.getGraphCredentials(this.connectedService);
             this.deploymentOutputs = tl.getInput("deploymentOutputs");
             this.addSpnToEnvironment = tl.getBoolInput("addSpnToEnvironment", false);
+            this.useWithoutJSON = tl.getBoolInput("useWithoutJSON", false);
 
             return this;
         } catch (error) {

Tasks/AzureResourceManagerTemplateDeploymentV3/operations/DeploymentScopeBase.ts

@@ -78,7 +78,7 @@ export class DeploymentScopeBase {
                                     setVariablesInObject(`${path}.${key}`, obj[key]);
                                 }
                                 else {
-                                    console.log(`##vso[task.setvariable variable=${path}.${key};]` + JSON.stringify(obj[key]));
+                                    console.log(`##vso[task.setvariable variable=${path}.${key};]` + (this.taskParameters.useWithoutJSON ? obj[key] : JSON.stringify(obj[key])));
                                     console.log(tl.loc("AddedOutputVariable", `${path}.${key}`));
                                 }
                             }

Tasks/AzureResourceManagerTemplateDeploymentV3/task.json

@@ -14,8 +14,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 3,
-        "Minor": 223,
-        "Patch": 1
+        "Minor": 224,
+        "Patch": 0
     },
     "demands": [],
     "minimumAgentVersion": "2.119.1",
@@ -225,6 +225,15 @@
             "required": false,
             "helpMarkDown": "Adds service principal id and key of the Azure endpoint you chose to the script's execution environment. You can use these variables: `$servicePrincipalId` and `$servicePrincipalKey` in your override parameters like `-key $servicePrincipalKey`",
             "groupName": "Advanced"
+        },
+        {
+            "name": "useWithoutJSON",
+            "type": "boolean",
+            "label": "Use individual output values without JSON.Stringify applied",
+            "defaultValue": "false",
+            "required": false,
+            "helpMarkDown": "Individual output values are being converted via JSON.Stringify by default. If you want to use the output values as it is without converting them via JSON.Stringify, enable this option. For more details refer to [this](https://github.com/microsoft/azure-pipelines-tasks/tree/master/Tasks/AzureResourceManagerTemplateDeploymentV3#deployment-outputs)",
+            "groupName": "Advanced"
         }
     ],
     "dataSourceBindings": [

Tasks/AzureResourceManagerTemplateDeploymentV3/task.loc.json

@@ -14,8 +14,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 3,
-    "Minor": 223,
-    "Patch": 1
+    "Minor": 224,
+    "Patch": 0
   },
   "demands": [],
   "minimumAgentVersion": "2.119.1",
@@ -225,6 +225,15 @@
       "required": false,
       "helpMarkDown": "ms-resource:loc.input.help.addSpnToEnvironment",
       "groupName": "Advanced"
+    },
+    {
+      "name": "useWithoutJSON",
+      "type": "boolean",
+      "label": "ms-resource:loc.input.label.useWithoutJSON",
+      "defaultValue": "false",
+      "required": false,
+      "helpMarkDown": "ms-resource:loc.input.help.useWithoutJSON",
+      "groupName": "Advanced"
     }
   ],
   "dataSourceBindings": [