Update

Azure · Jan 4, 2024 · 1d056a9 · 1d056a9
1 parent cc28e0b
commit 1d056a9
Show file tree

Hide file tree

Showing 26 changed files with 29 additions and 26 deletions.
diff --git a/src/functions/Invoke-AzOpsPush.ps1 b/src/functions/Invoke-AzOpsPush.ps1
@@ -486,6 +486,8 @@
         }
 
         if ($deploymentResult) {
+            # Output deploymentResult outside module
+            $deploymentResult
             #Process deploymentResult and output result
             foreach ($result in $deploymentResult) {
                 Set-AzOpsWhatIfOutput -FilePath $result.filePath -ParameterFilePath $result.parameterFilePath -Results $result.results

diff --git a/src/internal/functions/New-AzOpsDeployment.ps1 b/src/internal/functions/New-AzOpsDeployment.ps1
@@ -166,6 +166,7 @@
                 filePath    = ''
                 parameterFilePath = ''
                 results = ''
+                deployment = ''
             }
             if ($TemplateParameterFilePath) {
                 $parameters.TemplateParameterFile = $TemplateParameterFilePath
@@ -224,7 +225,7 @@
             $parameters.Name = $DeploymentName
             if ($PSCmdlet.ShouldProcess("Start $($scopeObject.type) Deployment with $deploymentCommand?")) {
                 if (-not $invalidTemplate) {
-                    & $deploymentCommand @parameters | Out-Null
+                    $deploymentResult.deployment = & $deploymentCommand @parameters
                 }
             }
             else {

diff --git a/src/internal/functions/Set-AzOpsWhatIfOutput.ps1 b/src/internal/functions/Set-AzOpsWhatIfOutput.ps1
@@ -48,8 +48,8 @@
         $tempPath = [System.IO.Path]::GetTempPath()
         if ((-not (Test-Path -Path ($tempPath + 'OUTPUT.md'))) -or (-not (Test-Path -Path ($tempPath + 'OUTPUT.json')))) {
             Write-PSFMessage -Level Verbose -String 'Set-AzOpsWhatIfOutput.WhatIfFile'
-            New-Item -Path ($tempPath + 'OUTPUT.md') -WhatIf:$false
-            New-Item -Path ($tempPath + 'OUTPUT.json') -WhatIf:$false
+            New-Item -Path ($tempPath + 'OUTPUT.md') -WhatIf:$false | Out-Null
+            New-Item -Path ($tempPath + 'OUTPUT.json') -WhatIf:$false | Out-Null
         }
 
         if ($ParameterFilePath) {

diff --git a/src/tests/functional/Microsoft.Authorization/policyAssignments/scenario.ps1 b/src/tests/functional/Microsoft.Authorization/policyAssignments/scenario.ps1
@@ -85,7 +85,7 @@ Describe "Scenario - policyAssignments" {
 
         #region Push Test
         It "Push should be successful" {
-            $script:push.ProvisioningState | Should -Be "Succeeded"
+            $script:push.deployment.ProvisioningState | Should -Be "Succeeded"
         }
         #endregion Push Test
     }

diff --git a/src/tests/functional/Microsoft.Authorization/roleAssignments/scenario.ps1 b/src/tests/functional/Microsoft.Authorization/roleAssignments/scenario.ps1
@@ -85,7 +85,7 @@ Describe "Scenario - roleAssignments" {
 
         #region Push Test
         It "Push should be successful" {
-            $script:push.ProvisioningState | Should -Be "Succeeded"
+            $script:push.deployment.ProvisioningState | Should -Be "Succeeded"
         }
         #endregion Push Test
     }

diff --git a/src/tests/functional/Microsoft.Compute/virtualMachines/scenario.ps1 b/src/tests/functional/Microsoft.Compute/virtualMachines/scenario.ps1
@@ -88,7 +88,7 @@ Describe "Scenario - virtualMachines" {
 
         #region Push Test
         It "Push should be successful" {
-            $script:push.ProvisioningState | Should -Be "Succeeded"
+            $script:push.deployment.ProvisioningState | Should -Be "Succeeded"
         }
         #endregion Push Test
     }

diff --git a/src/tests/functional/Microsoft.Insights/activityLogAlerts/scenario.ps1 b/src/tests/functional/Microsoft.Insights/activityLogAlerts/scenario.ps1
@@ -76,7 +76,7 @@ Describe "Scenario - activityLogAlerts" {
 
         #region Push Test
         It "Push should be successful" {
-            $script:push.ProvisioningState | Should -Be "Succeeded"
+            $script:push.deployment.ProvisioningState | Should -Be "Succeeded"
         }
         #endregion Push Test
     }

diff --git a/src/tests/functional/Microsoft.KeyVault/vaults/scenario.ps1 b/src/tests/functional/Microsoft.KeyVault/vaults/scenario.ps1
@@ -73,7 +73,7 @@ Describe "Scenario - vaults" {
 
         #region Push Test
         It "Push should be successful" {
-            $script:push.ProvisioningState | Should -Be "Succeeded"
+            $script:push.deployment.ProvisioningState | Should -Be "Succeeded"
         }
         #endregion Push Test
     }

diff --git a/src/tests/functional/Microsoft.Logic/workflows/scenario.ps1 b/src/tests/functional/Microsoft.Logic/workflows/scenario.ps1
@@ -73,7 +73,7 @@ Describe "Scenario - workflows" {
 
         #region Push Test
         It "Push should be successful" {
-            $script:push.ProvisioningState | Should -Be "Succeeded"
+            $script:push.deployment.ProvisioningState | Should -Be "Succeeded"
         }
         #endregion Push Test
     }

diff --git a/src/tests/functional/Microsoft.ManagedIdentity/userAssignedIdentities/scenario.ps1 b/src/tests/functional/Microsoft.ManagedIdentity/userAssignedIdentities/scenario.ps1
@@ -70,7 +70,7 @@ Describe "Scenario - userAssignedIdentities" {
 
         #region Push Test
         It "Push should be successful" {
-            $script:push.ProvisioningState | Should -Be "Succeeded"
+            $script:push.deployment.ProvisioningState | Should -Be "Succeeded"
         }
         #endregion Push Test
     }

diff --git a/src/tests/functional/Microsoft.Management/managementGroups/scenario.ps1 b/src/tests/functional/Microsoft.Management/managementGroups/scenario.ps1
@@ -67,7 +67,7 @@ Describe "Scenario - managementGroups" {
 
         #region Push Test
         It "Push should be successful" {
-            $script:push.ProvisioningState | Should -Be "Succeeded"
+            $script:push.deployment.ProvisioningState | Should -Be "Succeeded"
         }
         #endregion Push Test
     }

diff --git a/src/tests/functional/Microsoft.Network/azureFirewalls/scenario.ps1 b/src/tests/functional/Microsoft.Network/azureFirewalls/scenario.ps1
@@ -76,7 +76,7 @@ Describe "Scenario - azureFirewalls" {
 
         #region Push Test
         It "Push should be successful" {
-            $script:push.ProvisioningState | Should -Be "Succeeded"
+            $script:push.deployment.ProvisioningState | Should -Be "Succeeded"
         }
         #endregion Push Test
     }

diff --git a/src/tests/functional/Microsoft.Network/bastionHosts/scenario.ps1 b/src/tests/functional/Microsoft.Network/bastionHosts/scenario.ps1
@@ -76,7 +76,7 @@ Describe "Scenario - bastionHosts" {
 
         #region Push Test
         It "Push should be successful" {
-            $script:push.ProvisioningState | Should -Be "Succeeded"
+            $script:push.deployment.ProvisioningState | Should -Be "Succeeded"
         }
         #endregion Push Test
     }

diff --git a/src/tests/functional/Microsoft.Network/connections/scenario.ps1 b/src/tests/functional/Microsoft.Network/connections/scenario.ps1
@@ -70,7 +70,7 @@ Describe "Scenario - connections" {
 
         #region Push Test
         It "Push should be successful" {
-            $script:push.ProvisioningState | Should -Be "Succeeded"
+            $script:push.deployment.ProvisioningState | Should -Be "Succeeded"
         }
         #endregion Push Test
     }

diff --git a/src/tests/functional/Microsoft.Network/localNetworkGateways/scenario.ps1 b/src/tests/functional/Microsoft.Network/localNetworkGateways/scenario.ps1
@@ -73,7 +73,7 @@ Describe "Scenario - localNetworkGateways" {
 
         #region Push Test
         It "Push should be successful" {
-            $script:push.ProvisioningState | Should -Be "Succeeded"
+            $script:push.deployment.ProvisioningState | Should -Be "Succeeded"
         }
         #endregion Push Test
     }

diff --git a/src/tests/functional/Microsoft.Network/networkInterfaces/scenario.ps1 b/src/tests/functional/Microsoft.Network/networkInterfaces/scenario.ps1
@@ -73,7 +73,7 @@ Describe "Scenario - networkInterfaces" {
 
         #region Push Test
         It "Push should be successful" {
-            $script:push.ProvisioningState | Should -Be "Succeeded"
+            $script:push.deployment.ProvisioningState | Should -Be "Succeeded"
         }
         #endregion Push Test
     }

diff --git a/src/tests/functional/Microsoft.Network/networkSecurityGroups/scenario.ps1 b/src/tests/functional/Microsoft.Network/networkSecurityGroups/scenario.ps1
@@ -70,7 +70,7 @@ Describe "Scenario - networkSecurityGroups" {
 
         #region Push Test
         It "Push should be successful" {
-            $script:push.ProvisioningState | Should -Be "Succeeded"
+            $script:push.deployment.ProvisioningState | Should -Be "Succeeded"
         }
         #endregion Push Test
     }

diff --git a/src/tests/functional/Microsoft.Network/privateDnsZones/scenario.ps1 b/src/tests/functional/Microsoft.Network/privateDnsZones/scenario.ps1
@@ -67,7 +67,7 @@ Describe "Scenario - privateDnsZones" {
 
         #region Push Test
         It "Push should be successful" {
-            $script:push.ProvisioningState | Should -Be "Succeeded"
+            $script:push.deployment.ProvisioningState | Should -Be "Succeeded"
         }
         #endregion Push Test
     }

diff --git a/src/tests/functional/Microsoft.Network/privateEndpoints/scenario.ps1 b/src/tests/functional/Microsoft.Network/privateEndpoints/scenario.ps1
@@ -70,7 +70,7 @@ Describe "Scenario - privateEndpoints" {
 
         #region Push Test
         It "Push should be successful" {
-            $script:push.ProvisioningState | Should -Be "Succeeded"
+            $script:push.deployment.ProvisioningState | Should -Be "Succeeded"
         }
         #endregion Push Test
     }

diff --git a/src/tests/functional/Microsoft.Network/publicIPAddresses/scenario.ps1 b/src/tests/functional/Microsoft.Network/publicIPAddresses/scenario.ps1
@@ -70,7 +70,7 @@ Describe "Scenario - publicIPAddresses" {
 
         #region Push Test
         It "Push should be successful" {
-            $script:push.ProvisioningState | Should -Be "Succeeded"
+            $script:push.deployment.ProvisioningState | Should -Be "Succeeded"
         }
         #endregion Push Test
     }

diff --git a/src/tests/functional/Microsoft.Network/routeTables/scenario.ps1 b/src/tests/functional/Microsoft.Network/routeTables/scenario.ps1
@@ -70,7 +70,7 @@ Describe "Scenario - routeTables" {
 
         #region Push Test
         It "Push should be successful" {
-            $script:push.ProvisioningState | Should -Be "Succeeded"
+            $script:push.deployment.ProvisioningState | Should -Be "Succeeded"
         }
         #endregion Push Test
     }

diff --git a/src/tests/functional/Microsoft.Network/virtualNetworks/scenario.ps1 b/src/tests/functional/Microsoft.Network/virtualNetworks/scenario.ps1
@@ -73,7 +73,7 @@ Describe "Scenario - virtualNetworks" {
 
         #region Push Test
         It "Push should be successful" {
-            $script:push.ProvisioningState | Should -Be "Succeeded"
+            $script:push.deployment.ProvisioningState | Should -Be "Succeeded"
         }
         #endregion Push Test
     }

diff --git a/src/tests/functional/Microsoft.Resources/resourceGroups/scenario.ps1 b/src/tests/functional/Microsoft.Resources/resourceGroups/scenario.ps1
@@ -67,7 +67,7 @@ Describe "Scenario - resourceGroups" {
 
         #region Push Test
         It "Push should be successful" {
-            $script:push.ProvisioningState | Should -Be "Succeeded"
+            $script:push.deployment.ProvisioningState | Should -Be "Succeeded"
         }
         #endregion Push Test
     }

diff --git a/src/tests/functional/Microsoft.Storage/storageAccounts/scenario.ps1 b/src/tests/functional/Microsoft.Storage/storageAccounts/scenario.ps1
@@ -73,7 +73,7 @@ Describe "Scenario - storageAccounts" {
 
         #region Push Test
         It "Push should be successful" {
-            $script:push.ProvisioningState | Should -Be "Succeeded"
+            $script:push.deployment.ProvisioningState | Should -Be "Succeeded"
         }
         #endregion Push Test
     }

diff --git a/src/tests/functional/Microsoft.Web/serverfarms/scenario.ps1 b/src/tests/functional/Microsoft.Web/serverfarms/scenario.ps1
@@ -73,7 +73,7 @@ Describe "Scenario - serverfarms" {
 
         #region Push Test
         It "Push should be successful" {
-            $script:push.ProvisioningState | Should -Be "Succeeded"
+            $script:push.deployment.ProvisioningState | Should -Be "Succeeded"
         }
         #endregion Push Test
     }

diff --git a/src/tests/functional/Microsoft.Web/sites/scenario.ps1 b/src/tests/functional/Microsoft.Web/sites/scenario.ps1
@@ -73,7 +73,7 @@ Describe "Scenario - sites" {
 
         #region Push Test
         It "Push should be successful" {
-            $script:push.ProvisioningState | Should -Be "Succeeded"
+            $script:push.deployment.ProvisioningState | Should -Be "Succeeded"
         }
         #endregion Push Test
     }