1.1.79

JulianHayward · Sep 11, 2023 · b28a3e9 · b28a3e9
1 parent 7a19665
commit b28a3e9
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 50 deletions.
diff --git a/pwsh/module/build/AzAPICall.zip b/pwsh/module/build/AzAPICall.zip
diff --git a/pwsh/module/build/AzAPICall/AzAPICall.psd1 b/pwsh/module/build/AzAPICall/AzAPICall.psd1
@@ -12,7 +12,7 @@
     RootModule        = 'AzAPICall.psm1'
 
     # Version number of this module.
-    ModuleVersion     = '1.1.78'
+    ModuleVersion     = '1.1.79'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()

diff --git a/pwsh/module/build/AzAPICall/functions/AzAPICallFunctions.ps1 b/pwsh/module/build/AzAPICall/functions/AzAPICallFunctions.ps1
@@ -1711,7 +1711,7 @@ function getAzAPICallFunctions {
 function getAzAPICallRuleSet {
     return $function:AzAPICallErrorHandler.ToString()
 }
-function getAzAPICallVersion { return '1.1.78' }
+function getAzAPICallVersion { return '1.1.79' }
 
 function getJWTDetails {
     <#
@@ -1879,30 +1879,13 @@ function initAzAPICall {
         if ($AzAPICallConfiguration['checkContext'].Subscription.Id -ne $SubscriptionId4AzContext) {
             try {
                 if ($TenantId4AzContext -and $TenantId4AzContext -match ('^(\{){0,1}[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}(\}){0,1}$')) {
-                    if ($AzAPICallConfiguration['checkContext'].Tenant.Id -ne $TenantId4AzContext) {
-                        Logging -preventWriteOutput $true -logMessage "  Setting Az context to TenantId: '$TenantId4AzContext'"
-                        $null = Set-AzContext -TenantId $TenantId4AzContext -ErrorAction Stop
-                        $newAzContextSet = $true
-                        $AzAPICallConfiguration['checkContext'] = Get-AzContext -ErrorAction Stop
-
-                        if ($SkipAzContextSubscriptionValidation -eq $false) {
-                            testSubscription -SubscriptionId4Test $SubscriptionId4AzContext -AzAPICallConfiguration $AzAPICallConfiguration
-                        }
-                        Logging -preventWriteOutput $true -logMessage "  Setting Az context to SubscriptionId: '$SubscriptionId4AzContext'"
-                        $null = Set-AzContext -SubscriptionId $SubscriptionId4AzContext -ErrorAction Stop
-                        $newAzContextSet = $true
-                        $AzAPICallConfiguration['checkContext'] = Get-AzContext -ErrorAction Stop
-                    }
-                    else {
-                        Logging -preventWriteOutput $true -logMessage "  Az context is already set to TenantId: '$TenantId4AzContext'"
-                        if ($SkipAzContextSubscriptionValidation -eq $false) {
-                            testSubscription -SubscriptionId4Test $SubscriptionId4AzContext -AzAPICallConfiguration $AzAPICallConfiguration
-                        }
-                        Logging -preventWriteOutput $true -logMessage "  Setting Az context to SubscriptionId: '$SubscriptionId4AzContext'"
-                        $null = Set-AzContext -SubscriptionId $SubscriptionId4AzContext -ErrorAction Stop
-                        $newAzContextSet = $true
-                        $AzAPICallConfiguration['checkContext'] = Get-AzContext -ErrorAction Stop
+                    if ($SkipAzContextSubscriptionValidation -eq $false) {
+                        testSubscription -SubscriptionId4Test $SubscriptionId4AzContext -AzAPICallConfiguration $AzAPICallConfiguration
                     }
+                    Logging -preventWriteOutput $true -logMessage "  Setting Az context to SubscriptionId: '$SubscriptionId4AzContext', TenantId: '$TenantId4AzContext'"
+                    $null = Set-AzContext -SubscriptionId $SubscriptionId4AzContext -TenantId $TenantId4AzContext -ErrorAction Stop
+                    $newAzContextSet = $true
+                    $AzAPICallConfiguration['checkContext'] = Get-AzContext -ErrorAction Stop
                 }
                 else {
                     if ($SkipAzContextSubscriptionValidation -eq $false) {

diff --git a/pwsh/module/dev/AzAPICall/AzAPICall.psd1 b/pwsh/module/dev/AzAPICall/AzAPICall.psd1
@@ -12,7 +12,7 @@
     RootModule        = 'AzAPICall.psm1'
 
     # Version number of this module.
-    ModuleVersion     = '1.1.78'
+    ModuleVersion     = '1.1.79'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()

diff --git a/pwsh/module/dev/AzAPICall/functions/getAzAPICallVersion.ps1 b/pwsh/module/dev/AzAPICall/functions/getAzAPICallVersion.ps1
@@ -1 +1 @@
-function getAzAPICallVersion { return '1.1.78' }
+function getAzAPICallVersion { return '1.1.79' }
diff --git a/pwsh/module/dev/AzAPICall/functions/initAzAPICall.ps1 b/pwsh/module/dev/AzAPICall/functions/initAzAPICall.ps1
@@ -101,30 +101,13 @@
         if ($AzAPICallConfiguration['checkContext'].Subscription.Id -ne $SubscriptionId4AzContext) {
             try {
                 if ($TenantId4AzContext -and $TenantId4AzContext -match ('^(\{){0,1}[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}(\}){0,1}$')) {
-                    if ($AzAPICallConfiguration['checkContext'].Tenant.Id -ne $TenantId4AzContext) {
-                        Logging -preventWriteOutput $true -logMessage "  Setting Az context to TenantId: '$TenantId4AzContext'"
-                        $null = Set-AzContext -TenantId $TenantId4AzContext -ErrorAction Stop
-                        $newAzContextSet = $true
-                        $AzAPICallConfiguration['checkContext'] = Get-AzContext -ErrorAction Stop
-
-                        if ($SkipAzContextSubscriptionValidation -eq $false) {
-                            testSubscription -SubscriptionId4Test $SubscriptionId4AzContext -AzAPICallConfiguration $AzAPICallConfiguration
-                        }
-                        Logging -preventWriteOutput $true -logMessage "  Setting Az context to SubscriptionId: '$SubscriptionId4AzContext'"
-                        $null = Set-AzContext -SubscriptionId $SubscriptionId4AzContext -ErrorAction Stop
-                        $newAzContextSet = $true
-                        $AzAPICallConfiguration['checkContext'] = Get-AzContext -ErrorAction Stop
-                    }
-                    else {
-                        Logging -preventWriteOutput $true -logMessage "  Az context is already set to TenantId: '$TenantId4AzContext'"
-                        if ($SkipAzContextSubscriptionValidation -eq $false) {
-                            testSubscription -SubscriptionId4Test $SubscriptionId4AzContext -AzAPICallConfiguration $AzAPICallConfiguration
-                        }
-                        Logging -preventWriteOutput $true -logMessage "  Setting Az context to SubscriptionId: '$SubscriptionId4AzContext'"
-                        $null = Set-AzContext -SubscriptionId $SubscriptionId4AzContext -ErrorAction Stop
-                        $newAzContextSet = $true
-                        $AzAPICallConfiguration['checkContext'] = Get-AzContext -ErrorAction Stop
+                    if ($SkipAzContextSubscriptionValidation -eq $false) {
+                        testSubscription -SubscriptionId4Test $SubscriptionId4AzContext -AzAPICallConfiguration $AzAPICallConfiguration
                     }
+                    Logging -preventWriteOutput $true -logMessage "  Setting Az context to SubscriptionId: '$SubscriptionId4AzContext', TenantId: '$TenantId4AzContext'"
+                    $null = Set-AzContext -SubscriptionId $SubscriptionId4AzContext -TenantId $TenantId4AzContext -ErrorAction Stop
+                    $newAzContextSet = $true
+                    $AzAPICallConfiguration['checkContext'] = Get-AzContext -ErrorAction Stop
                 }
                 else {
                     if ($SkipAzContextSubscriptionValidation -eq $false) {