From cfa1ba7a37908475887ff6b203280409a312e13f Mon Sep 17 00:00:00 2001
From: bganapa <bganapa@microsoft.com>
Date: Tue, 31 Aug 2021 10:20:45 -0700
Subject: [PATCH 1/2] adding loadEnvJson file for tests

---
 .../test/Get-AzsContainerRegistry.Tests.ps1   |  4 +--
 ...Get-AzsContainerRegistryCapacity.Tests.ps1 |  4 +--
 ...zsContainerRegistryConfiguration.Tests.ps1 |  4 +--
 .../Get-AzsContainerRegistryQuota.Tests.ps1   |  4 +--
 ...-AzsContainerRegistrySetupStatus.Tests.ps1 |  4 +--
 .../New-AzsContainerRegistryQuota.Tests.ps1   |  4 +--
 ...zsContainerRegistryConfiguration.Tests.ps1 |  4 +--
 ...Remove-AzsContainerRegistryQuota.Tests.ps1 |  4 +--
 ...zsContainerRegistryConfiguration.Tests.ps1 |  4 +--
 .../Set-AzsContainerRegistryQuota.Tests.ps1   |  4 +--
 .../Start-AzsContainerRegistrySetup.Tests.ps1 |  4 +--
 .../test/loadEnvJson.ps1                      | 28 +++++++++++++++++++
 12 files changed, 50 insertions(+), 22 deletions(-)
 create mode 100644 src/Azs.ContainerRegistry.Admin/test/loadEnvJson.ps1

diff --git a/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistry.Tests.ps1 b/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistry.Tests.ps1
index 6c3efc7b..12a294ee 100644
--- a/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistry.Tests.ps1
+++ b/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistry.Tests.ps1
@@ -1,6 +1,6 @@
-$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
+$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
 if (-Not (Test-Path -Path $loadEnvPath)) {
-    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
+    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
 }
 . ($loadEnvPath)
 $TestRecordingFile = Join-Path $PSScriptRoot 'Get-AzsContainerRegistry.Recording.json'
diff --git a/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryCapacity.Tests.ps1 b/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryCapacity.Tests.ps1
index a89cc119..b0920802 100644
--- a/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryCapacity.Tests.ps1
+++ b/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryCapacity.Tests.ps1
@@ -1,6 +1,6 @@
-$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
+$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
 if (-Not (Test-Path -Path $loadEnvPath)) {
-    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
+    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
 }
 . ($loadEnvPath)
 $TestRecordingFile = Join-Path $PSScriptRoot 'Get-AzsContainerRegistryCapacity.Recording.json'
diff --git a/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryConfiguration.Tests.ps1 b/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryConfiguration.Tests.ps1
index e02ab919..15014c11 100644
--- a/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryConfiguration.Tests.ps1
+++ b/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryConfiguration.Tests.ps1
@@ -1,6 +1,6 @@
-$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
+$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
 if (-Not (Test-Path -Path $loadEnvPath)) {
-    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
+    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
 }
 . ($loadEnvPath)
 $TestRecordingFile = Join-Path $PSScriptRoot 'Get-AzsContainerRegistryConfiguration.Recording.json'
diff --git a/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryQuota.Tests.ps1 b/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryQuota.Tests.ps1
index c3704b3a..a6db9d72 100644
--- a/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryQuota.Tests.ps1
+++ b/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryQuota.Tests.ps1
@@ -1,6 +1,6 @@
-$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
+$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
 if (-Not (Test-Path -Path $loadEnvPath)) {
-    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
+    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
 }
 . ($loadEnvPath)
 $TestRecordingFile = Join-Path $PSScriptRoot 'Get-AzsContainerRegistryQuota.Recording.json'
diff --git a/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistrySetupStatus.Tests.ps1 b/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistrySetupStatus.Tests.ps1
index 04c50441..0e77dcd3 100644
--- a/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistrySetupStatus.Tests.ps1
+++ b/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistrySetupStatus.Tests.ps1
@@ -1,6 +1,6 @@
-$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
+$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
 if (-Not (Test-Path -Path $loadEnvPath)) {
-    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
+    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
 }
 . ($loadEnvPath)
 $TestRecordingFile = Join-Path $PSScriptRoot 'Get-AzsContainerRegistrySetupStatus.Recording.json'
diff --git a/src/Azs.ContainerRegistry.Admin/test/New-AzsContainerRegistryQuota.Tests.ps1 b/src/Azs.ContainerRegistry.Admin/test/New-AzsContainerRegistryQuota.Tests.ps1
index 93872b84..c533e683 100644
--- a/src/Azs.ContainerRegistry.Admin/test/New-AzsContainerRegistryQuota.Tests.ps1
+++ b/src/Azs.ContainerRegistry.Admin/test/New-AzsContainerRegistryQuota.Tests.ps1
@@ -1,6 +1,6 @@
-$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
+$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
 if (-Not (Test-Path -Path $loadEnvPath)) {
-    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
+    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
 }
 . ($loadEnvPath)
 $TestRecordingFile = Join-Path $PSScriptRoot 'New-AzsContainerRegistryQuota.Recording.json'
diff --git a/src/Azs.ContainerRegistry.Admin/test/Remove-AzsContainerRegistryConfiguration.Tests.ps1 b/src/Azs.ContainerRegistry.Admin/test/Remove-AzsContainerRegistryConfiguration.Tests.ps1
index 2ea2616d..553780be 100644
--- a/src/Azs.ContainerRegistry.Admin/test/Remove-AzsContainerRegistryConfiguration.Tests.ps1
+++ b/src/Azs.ContainerRegistry.Admin/test/Remove-AzsContainerRegistryConfiguration.Tests.ps1
@@ -1,6 +1,6 @@
-$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
+$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
 if (-Not (Test-Path -Path $loadEnvPath)) {
-    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
+    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
 }
 . ($loadEnvPath)
 $TestRecordingFile = Join-Path $PSScriptRoot 'Remove-AzsContainerRegistryConfiguration.Recording.json'
diff --git a/src/Azs.ContainerRegistry.Admin/test/Remove-AzsContainerRegistryQuota.Tests.ps1 b/src/Azs.ContainerRegistry.Admin/test/Remove-AzsContainerRegistryQuota.Tests.ps1
index 2d24276f..ae7b6c9a 100644
--- a/src/Azs.ContainerRegistry.Admin/test/Remove-AzsContainerRegistryQuota.Tests.ps1
+++ b/src/Azs.ContainerRegistry.Admin/test/Remove-AzsContainerRegistryQuota.Tests.ps1
@@ -1,6 +1,6 @@
-$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
+$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
 if (-Not (Test-Path -Path $loadEnvPath)) {
-    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
+    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
 }
 . ($loadEnvPath)
 $TestRecordingFile = Join-Path $PSScriptRoot 'Remove-AzsContainerRegistryQuota.Recording.json'
diff --git a/src/Azs.ContainerRegistry.Admin/test/Set-AzsContainerRegistryConfiguration.Tests.ps1 b/src/Azs.ContainerRegistry.Admin/test/Set-AzsContainerRegistryConfiguration.Tests.ps1
index 1baf125d..42aeb4ff 100644
--- a/src/Azs.ContainerRegistry.Admin/test/Set-AzsContainerRegistryConfiguration.Tests.ps1
+++ b/src/Azs.ContainerRegistry.Admin/test/Set-AzsContainerRegistryConfiguration.Tests.ps1
@@ -1,6 +1,6 @@
-$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
+$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
 if (-Not (Test-Path -Path $loadEnvPath)) {
-    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
+    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
 }
 . ($loadEnvPath)
 $TestRecordingFile = Join-Path $PSScriptRoot 'Set-AzsContainerRegistryConfiguration.Recording.json'
diff --git a/src/Azs.ContainerRegistry.Admin/test/Set-AzsContainerRegistryQuota.Tests.ps1 b/src/Azs.ContainerRegistry.Admin/test/Set-AzsContainerRegistryQuota.Tests.ps1
index b37583e4..71a8d358 100644
--- a/src/Azs.ContainerRegistry.Admin/test/Set-AzsContainerRegistryQuota.Tests.ps1
+++ b/src/Azs.ContainerRegistry.Admin/test/Set-AzsContainerRegistryQuota.Tests.ps1
@@ -1,6 +1,6 @@
-$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
+$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
 if (-Not (Test-Path -Path $loadEnvPath)) {
-    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
+    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
 }
 . ($loadEnvPath)
 $TestRecordingFile = Join-Path $PSScriptRoot 'Set-AzsContainerRegistryQuota.Recording.json'
diff --git a/src/Azs.ContainerRegistry.Admin/test/Start-AzsContainerRegistrySetup.Tests.ps1 b/src/Azs.ContainerRegistry.Admin/test/Start-AzsContainerRegistrySetup.Tests.ps1
index fc85a04b..7b536228 100644
--- a/src/Azs.ContainerRegistry.Admin/test/Start-AzsContainerRegistrySetup.Tests.ps1
+++ b/src/Azs.ContainerRegistry.Admin/test/Start-AzsContainerRegistrySetup.Tests.ps1
@@ -1,6 +1,6 @@
-$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
+$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
 if (-Not (Test-Path -Path $loadEnvPath)) {
-    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
+    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
 }
 . ($loadEnvPath)
 $TestRecordingFile = Join-Path $PSScriptRoot 'Start-AzsContainerRegistrySetup.Recording.json'
diff --git a/src/Azs.ContainerRegistry.Admin/test/loadEnvJson.ps1 b/src/Azs.ContainerRegistry.Admin/test/loadEnvJson.ps1
new file mode 100644
index 00000000..073159ad
--- /dev/null
+++ b/src/Azs.ContainerRegistry.Admin/test/loadEnvJson.ps1
@@ -0,0 +1,28 @@
+# ----------------------------------------------------------------------------------
+#
+# Copyright Microsoft Corporation
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ----------------------------------------------------------------------------------
+$envFile = 'env.json'
+if ($TestMode -eq 'live') {
+    $envFile = 'localEnv.json'
+}
+
+if (Test-Path -Path (Join-Path $PSScriptRoot $envFile)) {
+    $envFilePath = Join-Path $PSScriptRoot $envFile
+} else {
+    $envFilePath = Join-Path $PSScriptRoot '..\$envFile'
+}
+$env = @{}
+if (Test-Path -Path $envFilePath) {
+    $env = Get-Content (Join-Path $PSScriptRoot $envFile) | ConvertFrom-Json
+    $PSDefaultParameterValues = @{"*:SubscriptionId" = $env.SubscriptionId; "*:Tenant" = $env.Tenant; "*:Location" = $env.Location; "*:ResourceGroupName" = $env.ResourceGroup }
+}
\ No newline at end of file

From c30c4d82bbbadce08384a5e7e0e9e74a551c9d06 Mon Sep 17 00:00:00 2001
From: larisaborodina <larisab@microsoft.com>
Date: Tue, 31 Aug 2021 13:33:34 -0700
Subject: [PATCH 2/2] Pester Test fixes.

---
 ...t-AzsContainerRegistrySetup.Recording.json |  4 +--
 .../test/loadEnv.ps1                          | 29 -------------------
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 src/Azs.ContainerRegistry.Admin/test/loadEnv.ps1

diff --git a/src/Azs.ContainerRegistry.Admin/test/Start-AzsContainerRegistrySetup.Recording.json b/src/Azs.ContainerRegistry.Admin/test/Start-AzsContainerRegistrySetup.Recording.json
index 32798c7d..98acfc11 100644
--- a/src/Azs.ContainerRegistry.Admin/test/Start-AzsContainerRegistrySetup.Recording.json
+++ b/src/Azs.ContainerRegistry.Admin/test/Start-AzsContainerRegistrySetup.Recording.json
@@ -13,7 +13,7 @@
       }
     },
     "Response": {
-      "StatusCode": 409,
+      "StatusCode": 201,
       "Headers": {
         "Cache-Control": [ "no-cache" ],
         "Pragma": [ "no-cache" ],
@@ -31,7 +31,7 @@
         "Content-Type": [ "application/json; charset=utf-8" ],
         "Expires": [ "-1" ]
       },
-      "Content": "{\"error\":{\"code\":\"AcrAlreadyDeployed\",\"message\":\"Container registry deployment has already been successfully completed. It is not allowed to repeat deployment\"}}",
+      "Content": "{\"id\":\"/subscriptions/7e41090c-4aa7-40bc-856a-a993f8fbd215/providers/Microsoft.ContainerRegistry.Setup/locations/redmond/setup/value\",\"name\":\"redmond/value\",\"type\":\"Microsoft.ContainerRegistry.Setup/locations/setup\",\"properties\":{\"statusUri\":\"https://adminmanagement.redmond.ext-v.masd.stbtest.microsoft.com/subscriptions/731e84f5-d31e-4c6a-aa1d-546d6bfb2789/providers/Microsoft.ContainerRegistry.Setup/locations/local/setup?api-version=2019-11-01-preview\"}}",
       "isContentBase64": false
     }
   }
diff --git a/src/Azs.ContainerRegistry.Admin/test/loadEnv.ps1 b/src/Azs.ContainerRegistry.Admin/test/loadEnv.ps1
deleted file mode 100644
index b64982f9..00000000
--- a/src/Azs.ContainerRegistry.Admin/test/loadEnv.ps1
+++ /dev/null
@@ -1,29 +0,0 @@
-# ----------------------------------------------------------------------------------
-#
-# Copyright Microsoft Corporation
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ----------------------------------------------------------------------------------
-$envFile = 'env.json'
-Write-Host "Loading env.json"
-if ($TestMode -eq 'live') {
-    $envFile = 'localEnv.json'
-}
-
-if (Test-Path -Path (Join-Path $PSScriptRoot $envFile)) {
-    $envFilePath = Join-Path $PSScriptRoot $envFile
-} else {
-    $envFilePath = Join-Path $PSScriptRoot '..\$envFile'
-}
-$env = @{}
-if (Test-Path -Path $envFilePath) {
-    $env = Get-Content (Join-Path $PSScriptRoot $envFile) | ConvertFrom-Json
-    $PSDefaultParameterValues = @{"*:SubscriptionId" = $env.SubscriptionId; "*:Tenant" = $env.Tenant; "*:Location" = $env.Location; "*:ResourceGroupName" = $env.ResourceGroup }
-}
\ No newline at end of file