Restore deploymentOutputs variable in scope for post deployment script (Azure#25659)

azure-sdk · benbp · web-flow · commit 3b22b8255e01 · 2021-12-02T15:01:52.000-05:00
Co-authored-by: Ben Broderick Phillips &lt;bebroder@microsoft.com&gt;
diff --git a/eng/common/TestResources/New-TestResources.ps1 b/eng/common/TestResources/New-TestResources.ps1
@@ -242,6 +242,8 @@ function SetDeploymentOutputs([string]$serviceName, [object]$azContext, [object]
             $key = $null
         }
     }
+
+    return $deploymentOutputs
 }
 
 # Support actions to invoke on exit.
@@ -669,7 +671,7 @@ try {
             Write-Verbose "Successfully deployed template '$($templateFile.jsonFilePath)' to resource group '$($resourceGroup.ResourceGroupName)'"
         }
 
-        SetDeploymentOutputs $serviceName $context $deployment $templateFile
+        $deploymentOutputs = SetDeploymentOutputs $serviceName $context $deployment $templateFile
 
         $postDeploymentScript = $templateFile.originalFilePath | Split-Path | Join-Path -ChildPath 'test-resources-post.ps1'
         if (Test-Path $postDeploymentScript) {

Original file line number	Diff line number	Diff line change
`@@ -242,6 +242,8 @@ function SetDeploymentOutputs([string]$serviceName, [object]$azContext, [object]`
`242`	`242`	`$key = $null`
`243`	`243`	`}`
`244`	`244`	`}`
	`245`	`+`
	`246`	`+ return $deploymentOutputs`
`245`	`247`	`}`
`246`	`248`
`247`	`249`	`# Support actions to invoke on exit.`
`@@ -669,7 +671,7 @@ try {`
`669`	`671`	`Write-Verbose "Successfully deployed template '$($templateFile.jsonFilePath)' to resource group '$($resourceGroup.ResourceGroupName)'"`
`670`	`672`	`}`
`671`	`673`
`672`		`- SetDeploymentOutputs $serviceName $context $deployment $templateFile`
	`674`	`+ $deploymentOutputs = SetDeploymentOutputs $serviceName $context $deployment $templateFile`
`673`	`675`
`674`	`676`	`$postDeploymentScript = $templateFile.originalFilePath \| Split-Path \| Join-Path -ChildPath 'test-resources-post.ps1'`
`675`	`677`	`if (Test-Path $postDeploymentScript) {`