Fixed DTS:1819676 (#14547) (#14552)

vineetmimrot · web-flow · commit 5101d05ec9ee · 2021-03-09T14:53:20.000+05:30
* Fixed DTS:1819676

* fix unit test

* Fixed unit test

* commit
diff --git a/Tasks/AzureResourceGroupDeploymentV2/Tests/L0.ts b/Tasks/AzureResourceGroupDeploymentV2/Tests/L0.ts
@@ -473,7 +473,7 @@ describe('Azure Resource Group Deployment', function () {
             assert(tr.succeeded, "Should have succeeded");
             assert(tr.stdout.indexOf("properly sanitized") > 0, "Parameters should have been sanitized");
             assert(tr.stdout.indexOf("deployments.createOrUpdate is called") > 0, "deployments.createOrUpdate function should have been called from azure-sdk");
-            assert(tr.stdout.indexOf("set someVar") >= 0, "deploymentsOutput should have been updated");
+            assert(tr.stdout.indexOf("##vso[task.setvariable variable=someVar;]") >= 0, "deploymentsOutput should have been updated");
             done();
         }
         catch (error) {
diff --git a/Tasks/AzureResourceGroupDeploymentV2/operations/ResourceGroup.ts b/Tasks/AzureResourceGroupDeploymentV2/operations/ResourceGroup.ts
@@ -563,15 +563,15 @@ export class ResourceGroup {
                                     setVariablesInObject(`${path}.${key}`, obj[key]);
                                 }
                                 else {
-                                    tl.setVariable(`${path}.${key}`, JSON.stringify(obj[key]));
+                                    console.log(`##vso[task.setvariable variable=${path}.${key};]` + JSON.stringify(obj[key]));
                                     console.log(tl.loc("AddedOutputVariable", `${path}.${key}`));
                                 }
                             }
                         }
                         if (typeof(result["properties"]["outputs"]) === "object") {
                             setVariablesInObject(this.taskParameters.deploymentOutputs, result["properties"]["outputs"]);
                         }
-                        tl.setVariable(this.taskParameters.deploymentOutputs, JSON.stringify(result["properties"]["outputs"]));
+                        console.log(`##vso[task.setvariable variable=${this.taskParameters.deploymentOutputs};]` + JSON.stringify(result["properties"]["outputs"]));
                         console.log(tl.loc("AddedOutputVariable", this.taskParameters.deploymentOutputs));
                     }
 
diff --git a/Tasks/AzureResourceGroupDeploymentV2/task.json b/Tasks/AzureResourceGroupDeploymentV2/task.json
@@ -15,7 +15,7 @@
     "version": {
         "Major": 2,
         "Minor": 184,
-        "Patch": 0
+        "Patch": 1
     },
     "demands": [],
     "minimumAgentVersion": "2.119.1",
diff --git a/Tasks/AzureResourceGroupDeploymentV2/task.loc.json b/Tasks/AzureResourceGroupDeploymentV2/task.loc.json
@@ -15,7 +15,7 @@
   "version": {
     "Major": 2,
     "Minor": 184,
-    "Patch": 0
+    "Patch": 2
   },
   "demands": [],
   "minimumAgentVersion": "2.119.1",
diff --git a/Tasks/AzureResourceManagerTemplateDeploymentV3/Tests/L0.ts b/Tasks/AzureResourceManagerTemplateDeploymentV3/Tests/L0.ts
@@ -54,7 +54,7 @@ describe('Azure Resource Manager Template Deployment', function () {
             assert(tr.succeeded, "Should have succeeded");
             assert(tr.stdout.indexOf("properly sanitized") > 0, "Parameters should have been sanitized");
             assert(tr.stdout.indexOf("deployments.createOrUpdate is called") > 0, "deployments.createOrUpdate function should have been called from azure-sdk");
-            assert(tr.stdout.indexOf("set someVar") >= 0, "deploymentsOutput should have been updated");
+            assert(tr.stdout.indexOf("##vso[task.setvariable variable=someVar;]") >= 0, "deploymentsOutput should have been updated");
             done();
         }
         catch (error) {
@@ -172,5 +172,4 @@ describe('Azure Resource Manager Template Deployment', function () {
             done(error);
         }
     });
-
 });
diff --git a/Tasks/AzureResourceManagerTemplateDeploymentV3/operations/DeploymentScopeBase.ts b/Tasks/AzureResourceManagerTemplateDeploymentV3/operations/DeploymentScopeBase.ts
@@ -77,15 +77,15 @@ export class DeploymentScopeBase {
                                     setVariablesInObject(`${path}.${key}`, obj[key]);
                                 }
                                 else {
-                                    tl.setVariable(`${path}.${key}`, JSON.stringify(obj[key]));
+                                    console.log(`##vso[task.setvariable variable=${path}.${key};]` + JSON.stringify(obj[key]));
                                     console.log(tl.loc("AddedOutputVariable", `${path}.${key}`));
                                 }
                             }
                         }
                         if (typeof(result["properties"]["outputs"]) === "object") {
                             setVariablesInObject(this.taskParameters.deploymentOutputs, result["properties"]["outputs"]);
                         }
-                        tl.setVariable(this.taskParameters.deploymentOutputs, JSON.stringify(result["properties"]["outputs"]));
+                        console.log(`##vso[task.setvariable variable=${this.taskParameters.deploymentOutputs};]` + JSON.stringify(result["properties"]["outputs"]));
                         console.log(tl.loc("AddedOutputVariable", this.taskParameters.deploymentOutputs));
                     }
 
diff --git a/Tasks/AzureResourceManagerTemplateDeploymentV3/task.json b/Tasks/AzureResourceManagerTemplateDeploymentV3/task.json
@@ -15,7 +15,7 @@
     "version": {
         "Major": 3,
         "Minor": 184,
-        "Patch": 0
+        "Patch": 1
     },
     "demands": [],
     "minimumAgentVersion": "2.119.1",
diff --git a/Tasks/AzureResourceManagerTemplateDeploymentV3/task.loc.json b/Tasks/AzureResourceManagerTemplateDeploymentV3/task.loc.json
@@ -15,7 +15,7 @@
   "version": {
     "Major": 3,
     "Minor": 184,
-    "Patch": 0
+    "Patch": 1
   },
   "demands": [],
   "minimumAgentVersion": "2.119.1",

Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,7 @@ describe('Azure Resource Group Deployment', function () {`
`473`	`473`	`assert(tr.succeeded, "Should have succeeded");`
`474`	`474`	`assert(tr.stdout.indexOf("properly sanitized") > 0, "Parameters should have been sanitized");`
`475`	`475`	`assert(tr.stdout.indexOf("deployments.createOrUpdate is called") > 0, "deployments.createOrUpdate function should have been called from azure-sdk");`
`476`		`- assert(tr.stdout.indexOf("set someVar") >= 0, "deploymentsOutput should have been updated");`
	`476`	`+ assert(tr.stdout.indexOf("##vso[task.setvariable variable=someVar;]") >= 0, "deploymentsOutput should have been updated");`
`477`	`477`	`done();`
`478`	`478`	`}`
`479`	`479`	`catch (error) {`
Original file line number	Diff line number	Diff line change
`@@ -563,15 +563,15 @@ export class ResourceGroup {`
`563`	`563`	setVariablesInObject(`${path}.${key}`, obj[key]);
`564`	`564`	`}`
`565`	`565`	`else {`
`566`		- tl.setVariable(`${path}.${key}`, JSON.stringify(obj[key]));
	`566`	+ console.log(`##vso[task.setvariable variable=${path}.${key};]` + JSON.stringify(obj[key]));
`567`	`567`	console.log(tl.loc("AddedOutputVariable", `${path}.${key}`));
`568`	`568`	`}`
`569`	`569`	`}`
`570`	`570`	`}`
`571`	`571`	`if (typeof(result["properties"]["outputs"]) === "object") {`
`572`	`572`	`setVariablesInObject(this.taskParameters.deploymentOutputs, result["properties"]["outputs"]);`
`573`	`573`	`}`
`574`		`- tl.setVariable(this.taskParameters.deploymentOutputs, JSON.stringify(result["properties"]["outputs"]));`
	`574`	+ console.log(`##vso[task.setvariable variable=${this.taskParameters.deploymentOutputs};]` + JSON.stringify(result["properties"]["outputs"]));
`575`	`575`	`console.log(tl.loc("AddedOutputVariable", this.taskParameters.deploymentOutputs));`
`576`	`576`	`}`
`577`	`577`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ describe('Azure Resource Manager Template Deployment', function () {`
`54`	`54`	`assert(tr.succeeded, "Should have succeeded");`
`55`	`55`	`assert(tr.stdout.indexOf("properly sanitized") > 0, "Parameters should have been sanitized");`
`56`	`56`	`assert(tr.stdout.indexOf("deployments.createOrUpdate is called") > 0, "deployments.createOrUpdate function should have been called from azure-sdk");`
`57`		`- assert(tr.stdout.indexOf("set someVar") >= 0, "deploymentsOutput should have been updated");`
	`57`	`+ assert(tr.stdout.indexOf("##vso[task.setvariable variable=someVar;]") >= 0, "deploymentsOutput should have been updated");`
`58`	`58`	`done();`
`59`	`59`	`}`
`60`	`60`	`catch (error) {`
`@@ -172,5 +172,4 @@ describe('Azure Resource Manager Template Deployment', function () {`
`172`	`172`	`done(error);`
`173`	`173`	`}`
`174`	`174`	`});`
`175`		`-`
`176`	`175`	`});`
Original file line number	Diff line number	Diff line change
`@@ -77,15 +77,15 @@ export class DeploymentScopeBase {`
`77`	`77`	setVariablesInObject(`${path}.${key}`, obj[key]);
`78`	`78`	`}`
`79`	`79`	`else {`
`80`		- tl.setVariable(`${path}.${key}`, JSON.stringify(obj[key]));
	`80`	+ console.log(`##vso[task.setvariable variable=${path}.${key};]` + JSON.stringify(obj[key]));
`81`	`81`	console.log(tl.loc("AddedOutputVariable", `${path}.${key}`));
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`	`if (typeof(result["properties"]["outputs"]) === "object") {`
`86`	`86`	`setVariablesInObject(this.taskParameters.deploymentOutputs, result["properties"]["outputs"]);`
`87`	`87`	`}`
`88`		`- tl.setVariable(this.taskParameters.deploymentOutputs, JSON.stringify(result["properties"]["outputs"]));`
	`88`	+ console.log(`##vso[task.setvariable variable=${this.taskParameters.deploymentOutputs};]` + JSON.stringify(result["properties"]["outputs"]));
`89`	`89`	`console.log(tl.loc("AddedOutputVariable", this.taskParameters.deploymentOutputs));`
`90`	`90`	`}`
`91`	`91`