Merge pull request #44 from AsbjornNielsen/feature/addTenantId4AzContext

add TenantId4AzContext parameter to allow service connections to Set-AzContext to several tenants
JulianHayward · Aug 30, 2023 · d4d11c3 · d4d11c3
2 parents bc82d93 + c99d7e6
commit d4d11c3
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 6 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.75'
+    ModuleVersion     = '1.1.76'
 
     # 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.75' }
+function getAzAPICallVersion { return '1.1.76' }
 
 function getJWTDetails {
     <#
@@ -1797,6 +1797,10 @@ function initAzAPICall {
         [string]
         $SubscriptionId4AzContext,
 
+        [Parameter()]
+        [string]
+        $TenantId4AzContext,
+
         [Parameter()]
         [bool]
         $SkipAzContextSubscriptionValidation = $false,
@@ -1874,7 +1878,12 @@ function initAzAPICall {
 
             Logging -preventWriteOutput $true -logMessage "  Setting Az context to SubscriptionId: '$SubscriptionId4AzContext'"
             try {
-                $null = Set-AzContext -SubscriptionId $SubscriptionId4AzContext -ErrorAction Stop
+                if ($null -eq $TenantId4AzContext) {
+                    $null = Set-AzContext -SubscriptionId $SubscriptionId4AzContext -ErrorAction Stop
+                }
+                else {
+                    $null = Set-AzContext -SubscriptionId $SubscriptionId4AzContext -TenantId $TenantId4AzContext -ErrorAction Stop
+                }
             }
             catch {
                 Logging -preventWriteOutput $true -logMessage $_

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.75'
+    ModuleVersion     = '1.1.76'
 
     # 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.75' }
+function getAzAPICallVersion { return '1.1.76' }
diff --git a/pwsh/module/dev/AzAPICall/functions/initAzAPICall.ps1 b/pwsh/module/dev/AzAPICall/functions/initAzAPICall.ps1
@@ -19,6 +19,10 @@
         [string]
         $SubscriptionId4AzContext,
 
+        [Parameter()]
+        [string]
+        $TenantId4AzContext,
+
         [Parameter()]
         [bool]
         $SkipAzContextSubscriptionValidation = $false,
@@ -96,7 +100,12 @@
 
             Logging -preventWriteOutput $true -logMessage "  Setting Az context to SubscriptionId: '$SubscriptionId4AzContext'"
             try {
-                $null = Set-AzContext -SubscriptionId $SubscriptionId4AzContext -ErrorAction Stop
+                if ($null -eq $TenantId4AzContext) {
+                    $null = Set-AzContext -SubscriptionId $SubscriptionId4AzContext -ErrorAction Stop
+                }
+                else {
+                    $null = Set-AzContext -SubscriptionId $SubscriptionId4AzContext -TenantId $TenantId4AzContext -ErrorAction Stop
+                }
             }
             catch {
                 Logging -preventWriteOutput $true -logMessage $_