Skip to content

Commit f89df18

Browse files
committed
Update AzureRM preference to rely on auth scheme rather than connection type.
1 parent ca41ff4 commit f89df18

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

Tasks/Common/VstsAzureHelpers_/VstsAzureHelpers_.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function Initialize-Azure {
3434

3535
# Determine which modules are preferred.
3636
$preferredModules = @( )
37-
if ($serviceNameInput -eq 'ConnectedServiceNameARM') {
37+
if ($endpoint.Auth.Scheme -eq 'ServicePrincipal') {
3838
$preferredModules += 'AzureRM'
3939
} elseif ($endpoint.Auth.Scheme -eq 'UserNamePassword') {
4040
$preferredModules += 'Azure'

Tests/L0/Common-VstsAzureHelpers_/Initialize-Azure.PassesInputs.ps1

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ param()
55
. $PSScriptRoot/../../lib/Initialize-Test.ps1
66
Microsoft.PowerShell.Core\Import-Module $PSScriptRoot/../../../Tasks/AzurePowerShell/ps_modules/VstsAzureHelpers_
77
$variableSets = @(
8+
@{
9+
ConnectedServiceNameSelector = 'ConnectedServiceName'
10+
DeploymentEnvironmentName = $null
11+
Endpoint = @{ Auth = @{ Scheme = 'ServicePrincipal' } }
12+
StorageAccount = $null
13+
ExpectedServiceNameInput = 'ConnectedServiceName'
14+
ExpectedPreferredModule = ,'AzureRM'
15+
}
816
@{
917
ConnectedServiceNameSelector = 'ConnectedServiceName'
1018
DeploymentEnvironmentName = $null
@@ -24,31 +32,31 @@ $variableSets = @(
2432
@{
2533
ConnectedServiceNameSelector = 'ConnectedServiceName'
2634
DeploymentEnvironmentName = $null
27-
Endpoint = 'Some endpoint'
35+
Endpoint = @{ Auth = @{ Scheme = 'Certificate' } }
2836
StorageAccount = $null
2937
ExpectedServiceNameInput = 'ConnectedServiceName'
3038
ExpectedPreferredModule = ,'Azure'
3139
}
3240
@{
3341
ConnectedServiceNameSelector = 'ConnectedServiceName'
3442
DeploymentEnvironmentName = $null
35-
Endpoint = 'Some endpoint'
43+
Endpoint = @{ Auth = @{ Scheme = 'Certificate' } }
3644
StorageAccount = 'Some storage account'
3745
ExpectedServiceNameInput = 'ConnectedServiceName'
3846
ExpectedPreferredModule = ,'Azure'
3947
}
4048
@{
4149
ConnectedServiceNameSelector = 'ConnectedServiceNameARM'
4250
DeploymentEnvironmentName = $null
43-
Endpoint = 'Some endpoint'
51+
Endpoint = @{ Auth = @{ Scheme = 'ServicePrincipal' } }
4452
StorageAccount = $null
4553
ExpectedServiceNameInput = 'ConnectedServiceNameARM'
4654
ExpectedPreferredModule = ,'AzureRM'
4755
}
4856
@{
4957
ConnectedServiceNameSelector = 'ConnectedServiceNameARM'
5058
DeploymentEnvironmentName = $null
51-
Endpoint = 'Some endpoint'
59+
Endpoint = @{ Auth = @{ Scheme = 'ServicePrincipal' } }
5260
StorageAccount = 'Some storage account'
5361
ExpectedServiceNameInput = 'ConnectedServiceNameARM'
5462
ExpectedPreferredModule = ,'AzureRM'

0 commit comments

Comments
 (0)