Merge pull request #1714 from Microsoft/users/ersciple/m101azpssppref

Update AzureRM preference to rely on auth scheme rather than connecti…
microsoft · May 12, 2016 · d5ff5a5 · d5ff5a5
2 parents f82b12d + ec62101
commit d5ff5a5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/Tasks/Common/VstsAzureHelpers_/VstsAzureHelpers_.psm1 b/Tasks/Common/VstsAzureHelpers_/VstsAzureHelpers_.psm1
@@ -34,7 +34,7 @@ function Initialize-Azure {
 
         # Determine which modules are preferred.
         $preferredModules = @( )
-        if ($serviceNameInput -eq 'ConnectedServiceNameARM') {
+        if ($endpoint.Auth.Scheme -eq 'ServicePrincipal') {
             $preferredModules += 'AzureRM'
         } elseif ($endpoint.Auth.Scheme -eq 'UserNamePassword') {
             $preferredModules += 'Azure'

diff --git a/Tests/L0/Common-VstsAzureHelpers_/Initialize-Azure.PassesInputs.ps1 b/Tests/L0/Common-VstsAzureHelpers_/Initialize-Azure.PassesInputs.ps1
@@ -5,6 +5,14 @@ param()
 . $PSScriptRoot/../../lib/Initialize-Test.ps1
 Microsoft.PowerShell.Core\Import-Module $PSScriptRoot/../../../Tasks/AzurePowerShell/ps_modules/VstsAzureHelpers_
 $variableSets = @(
+    @{
+        ConnectedServiceNameSelector = 'ConnectedServiceName'
+        DeploymentEnvironmentName = $null
+        Endpoint = @{ Auth = @{ Scheme = 'ServicePrincipal' } }
+        StorageAccount = $null
+        ExpectedServiceNameInput = 'ConnectedServiceName'
+        ExpectedPreferredModule = ,'AzureRM'
+    }
     @{
         ConnectedServiceNameSelector = 'ConnectedServiceName'
         DeploymentEnvironmentName = $null
@@ -24,31 +32,31 @@ $variableSets = @(
     @{
         ConnectedServiceNameSelector = 'ConnectedServiceName'
         DeploymentEnvironmentName = $null
-        Endpoint = 'Some endpoint'
+        Endpoint = @{ Auth = @{ Scheme = 'Certificate' } }
         StorageAccount = $null
         ExpectedServiceNameInput = 'ConnectedServiceName'
         ExpectedPreferredModule = ,'Azure'
     }
     @{
         ConnectedServiceNameSelector = 'ConnectedServiceName'
         DeploymentEnvironmentName = $null
-        Endpoint = 'Some endpoint'
+        Endpoint = @{ Auth = @{ Scheme = 'Certificate' } }
         StorageAccount = 'Some storage account'
         ExpectedServiceNameInput = 'ConnectedServiceName'
         ExpectedPreferredModule = ,'Azure'
     }
     @{
         ConnectedServiceNameSelector = 'ConnectedServiceNameARM'
         DeploymentEnvironmentName = $null
-        Endpoint = 'Some endpoint'
+        Endpoint = @{ Auth = @{ Scheme = 'ServicePrincipal' } }
         StorageAccount = $null
         ExpectedServiceNameInput = 'ConnectedServiceNameARM'
         ExpectedPreferredModule = ,'AzureRM'
     }
     @{
         ConnectedServiceNameSelector = 'ConnectedServiceNameARM'
         DeploymentEnvironmentName = $null
-        Endpoint = 'Some endpoint'
+        Endpoint = @{ Auth = @{ Scheme = 'ServicePrincipal' } }
         StorageAccount = 'Some storage account'
         ExpectedServiceNameInput = 'ConnectedServiceNameARM'
         ExpectedPreferredModule = ,'AzureRM'