Sync eng/common directory with azure-sdk-tools for PR 7113 (#5032)

azure-sdk · benbp · heaths · web-flow · commit 4f8eca93fd87 · 2023-10-16T17:00:14.000-07:00
* Remove ARM deployment after deploy

* Update eng/common/TestResources/New-TestResources.ps1

Co-authored-by: Heath Stewart &lt;heaths@outlook.com&gt;

* Apply suggestions from code review

---------

Co-authored-by: Ben Broderick Phillips &lt;bebroder@microsoft.com&gt;
Co-authored-by: Heath Stewart &lt;heaths@outlook.com&gt;
diff --git a/eng/common/TestResources/New-TestResources.ps1 b/eng/common/TestResources/New-TestResources.ps1
@@ -771,7 +771,6 @@ try {
                     -TemplateParameterObject $templateFileParameters `
                     -Force:$Force
         }
-
         if ($deployment.ProvisioningState -ne 'Succeeded') {
             Write-Host "Deployment '$($deployment.DeploymentName)' has state '$($deployment.ProvisioningState)' with CorrelationId '$($deployment.CorrelationId)'. Exiting..."
             Write-Host @'
@@ -803,6 +802,9 @@ try {
             Write-Verbose "Removing compiled bicep file $($templateFile.jsonFilePath)"
             Remove-Item $templateFile.jsonFilePath
         }
+
+        Write-Host "Deleting ARM deployment as it may contain secrets. Deployed resources will not be affected."
+        $null = $deployment | Remove-AzResourceGroupDeployment
     }
 
 } finally {

Original file line number	Diff line number	Diff line change
`@@ -771,7 +771,6 @@ try {`
`771`	`771`	-TemplateParameterObject $templateFileParameters `
`772`	`772`	`-Force:$Force`
`773`	`773`	`}`
`774`		`-`
`775`	`774`	`if ($deployment.ProvisioningState -ne 'Succeeded') {`
`776`	`775`	`Write-Host "Deployment '$($deployment.DeploymentName)' has state '$($deployment.ProvisioningState)' with CorrelationId '$($deployment.CorrelationId)'. Exiting..."`
`777`	`776`	`Write-Host @'`
`@@ -803,6 +802,9 @@ try {`
`803`	`802`	`Write-Verbose "Removing compiled bicep file $($templateFile.jsonFilePath)"`
`804`	`803`	`Remove-Item $templateFile.jsonFilePath`
`805`	`804`	`}`
	`805`	`+`
	`806`	`+ Write-Host "Deleting ARM deployment as it may contain secrets. Deployed resources will not be affected."`
	`807`	`+ $null = $deployment \| Remove-AzResourceGroupDeployment`
`806`	`808`	`}`
`807`	`809`
`808`	`810`	`} finally {`