From 72aa843cde3bd3c503b01f75d33bf49e6615629a Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 26 Aug 2021 15:21:21 -0700 Subject: [PATCH 1/2] Bug fix: Storing .env file for bicep file at service dir --- eng/common/TestResources/New-TestResources.ps1 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/eng/common/TestResources/New-TestResources.ps1 b/eng/common/TestResources/New-TestResources.ps1 index 7d5353202f..b2fe602af6 100644 --- a/eng/common/TestResources/New-TestResources.ps1 +++ b/eng/common/TestResources/New-TestResources.ps1 @@ -477,7 +477,12 @@ try { &$preDeploymentScript -ResourceGroupName $ResourceGroupName @PSBoundParameters } - Log "Deploying template '$($templateFile.originalFilePath)' to resource group '$($resourceGroup.ResourceGroupName)'" + $msg = if ($templateFile.jsonFilePath -ne $templateFile.originalFilePath) { + "Deployment template $($templateFile.jsonFilePath) $($templateFile.originalFilePath) to resource group $($resourceGroup.ResourceGroupName)"} else { + "Deployment template $($templateFile.jsonFilePath) to resource group $($resourceGroup.ResourceGroupName)" + } + Log $msg + $deployment = Retry { $lastDebugPreference = $DebugPreference try { @@ -538,7 +543,7 @@ try { Write-Host 'File option is supported only on Windows' } - $outputFile = "$($templateFile.jsonFilePath).env" + $outputFile = "$($templateFile.originalFilePath).env" $environmentText = $deploymentOutputs | ConvertTo-Json; $bytes = ([System.Text.Encoding]::UTF8).GetBytes($environmentText) From 7e2981f0926372cc31bed24ea5815d0b7c0b5869 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Fri, 27 Aug 2021 10:52:12 -0700 Subject: [PATCH 2/2] Styling --- eng/common/TestResources/New-TestResources.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/common/TestResources/New-TestResources.ps1 b/eng/common/TestResources/New-TestResources.ps1 index b2fe602af6..fb517f203d 100644 --- a/eng/common/TestResources/New-TestResources.ps1 +++ b/eng/common/TestResources/New-TestResources.ps1 @@ -478,7 +478,8 @@ try { } $msg = if ($templateFile.jsonFilePath -ne $templateFile.originalFilePath) { - "Deployment template $($templateFile.jsonFilePath) $($templateFile.originalFilePath) to resource group $($resourceGroup.ResourceGroupName)"} else { + "Deployment template $($templateFile.jsonFilePath) from $($templateFile.originalFilePath) to resource group $($resourceGroup.ResourceGroupName)" + } else { "Deployment template $($templateFile.jsonFilePath) to resource group $($resourceGroup.ResourceGroupName)" } Log $msg