From 28d377d1d7e9942501c43a6aaada398f2aef01b2 Mon Sep 17 00:00:00 2001
From: Albert Cheng <albertcheng@microsoft.com>
Date: Thu, 12 Aug 2021 15:02:17 -0700
Subject: [PATCH 1/2] rebase

---
 eng/common/TestResources/New-TestResources.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/common/TestResources/New-TestResources.ps1 b/eng/common/TestResources/New-TestResources.ps1
index a38155cba855..c309945b4df2 100644
--- a/eng/common/TestResources/New-TestResources.ps1
+++ b/eng/common/TestResources/New-TestResources.ps1
@@ -475,7 +475,7 @@ try {
             &$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 {

From 0c46c4bf3fa2385c45d0e8e6121acd445c0fcca8 Mon Sep 17 00:00:00 2001
From: Albert Cheng <albertcheng@microsoft.com>
Date: Thu, 12 Aug 2021 15:23:41 -0700
Subject: [PATCH 2/2] Resolve conflict

---
 .../TestResources/New-TestResources.ps1       | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/eng/common/TestResources/New-TestResources.ps1 b/eng/common/TestResources/New-TestResources.ps1
index c309945b4df2..60f9f2bf2c06 100644
--- 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,7 +471,7 @@ 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
@@ -482,7 +484,7 @@ 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).
 
-#>
+#>
\ No newline at end of file