Sync eng/common directory with azure-sdk-tools for PR 1876 (Azure#15279)

* rebase * Resolve conflict Co-authored-by: Albert Cheng <albertcheng@microsoft.com>
jay-most · Sep 18, 2021 · fb747c6 · fb747c6
1 parent 8a7a752
commit fb747c6
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/eng/common/TestResources/New-TestResources.ps1 b/eng/common/TestResources/New-TestResources.ps1
@@ -167,9 +167,11 @@ try {
         Get-ChildItem -Path $root -Filter "$_" -Recurse | ForEach-Object {
             Write-Verbose "Found template '$($_.FullName)'"
             if ($_.Extension -eq '.bicep') {
-                $templateFiles += (BuildBicepFile $_)
+                $templateFile = @{originalFilePath = $_.FullName; jsonFilePath = (BuildBicepFile $_)}
+                $templateFiles += $templateFile
             } else {
-                $templateFiles += $_.FullName
+                $templateFile = @{originalFilePath = $_.FullName; jsonFilePath = $_.FullName}
+                $templateFiles += $templateFile
             }
         }
     }
@@ -457,8 +459,8 @@ try {
     # Deploy the templates
     foreach ($templateFile in $templateFiles) {
         # Deployment fails if we pass in more parameters than are defined.
-        Write-Verbose "Removing unnecessary parameters from template '$templateFile'"
-        $templateJson = Get-Content -LiteralPath $templateFile | ConvertFrom-Json
+        Write-Verbose "Removing unnecessary parameters from template '$($templateFile.jsonFilePath)'"
+        $templateJson = Get-Content -LiteralPath $templateFile.jsonFilePath | ConvertFrom-Json
         $templateParameterNames = $templateJson.parameters.PSObject.Properties.Name
 
         $templateFileParameters = $templateParameters.Clone()
@@ -469,20 +471,20 @@ try {
             }
         }
 
-        $preDeploymentScript = $templateFile | Split-Path | Join-Path -ChildPath 'test-resources-pre.ps1'
+        $preDeploymentScript = $templateFile.originalFilePath | Split-Path | Join-Path -ChildPath 'test-resources-pre.ps1'
         if (Test-Path $preDeploymentScript) {
             Log "Invoking pre-deployment script '$preDeploymentScript'"
             &$preDeploymentScript -ResourceGroupName $ResourceGroupName @PSBoundParameters
         }
 
-        Log "Deploying template '$templateFile' to resource group '$($resourceGroup.ResourceGroupName)'"
+        Log "Deploying template '$($templateFile.originalFilePath)' to resource group '$($resourceGroup.ResourceGroupName)'"
         $deployment = Retry {
             $lastDebugPreference = $DebugPreference
             try {
                 if ($CI) {
                     $DebugPreference = 'Continue'
                 }
-                New-AzResourceGroupDeployment -Name $BaseName -ResourceGroupName $resourceGroup.ResourceGroupName -TemplateFile $templateFile -TemplateParameterObject $templateFileParameters -Force:$Force
+                New-AzResourceGroupDeployment -Name $BaseName -ResourceGroupName $resourceGroup.ResourceGroupName -TemplateFile $templateFile.jsonFilePath -TemplateParameterObject $templateFileParameters -Force:$Force
             } catch {
                 Write-Output @'
 #####################################################
@@ -498,7 +500,7 @@ try {
 
         if ($deployment.ProvisioningState -eq 'Succeeded') {
             # New-AzResourceGroupDeployment would've written an error and stopped the pipeline by default anyway.
-            Write-Verbose "Successfully deployed template '$templateFile' to resource group '$($resourceGroup.ResourceGroupName)'"
+            Write-Verbose "Successfully deployed template '$($templateFile.jsonFilePath)' to resource group '$($resourceGroup.ResourceGroupName)'"
         }
 
         $serviceDirectoryPrefix = $serviceName.ToUpperInvariant() + "_"
@@ -536,7 +538,7 @@ try {
                 Write-Host 'File option is supported only on Windows'
             }
 
-            $outputFile = "$templateFile.env"
+            $outputFile = "$($templateFile.jsonFilePath).env"
 
             $environmentText = $deploymentOutputs | ConvertTo-Json;
             $bytes = ([System.Text.Encoding]::UTF8).GetBytes($environmentText)
@@ -574,15 +576,15 @@ try {
             }
         }
 
-        $postDeploymentScript = $templateFile | Split-Path | Join-Path -ChildPath 'test-resources-post.ps1'
+        $postDeploymentScript = $templateFile.originalFilePath | Split-Path | Join-Path -ChildPath 'test-resources-post.ps1'
         if (Test-Path $postDeploymentScript) {
             Log "Invoking post-deployment script '$postDeploymentScript'"
             &$postDeploymentScript -ResourceGroupName $ResourceGroupName -DeploymentOutputs $deploymentOutputs @PSBoundParameters
         }
 
-        if ($templateFile.EndsWith('.compiled.json')) {
-            Write-Verbose "Removing compiled bicep file $templateFile"
-            Remove-Item $templateFile
+        if ($templateFile.jsonFilePath.EndsWith('.compiled.json')) {
+            Write-Verbose "Removing compiled bicep file $($templateFile.jsonFilePath)"
+            Remove-Item $templateFile.jsonFilePath
         }
     }
 
@@ -760,4 +762,4 @@ Run this in an Azure DevOps CI (with approrpiate variables configured) before
 executing live tests. The script will output variables as secrets (to enable
 log redaction).
 
-#>
+#>