Merge pull request #4226 from viananth/vishnu_patch

Fix bug for importing modules

Author: markcowl

tools/AzureRM.BootStrapper/AzureRM.BootStrapper.Tests.ps1

@@ -1156,6 +1156,20 @@ Describe "Use-AzureRmProfile" {
                 $useError.exception.message.contains("A different profile version of module") | Should Be $true
             }
         }
+
+        # User has module2 from profile1 imported; tries to execute Use-AzureRmProfile for profile1 with module1. Should import.
+        Context "A different module from same profile was previously imported" {
+            Mock Get-AzureRmModule -Verifiable { "1.0" } 
+            $VersionObj = New-Object -TypeName System.Version -ArgumentList "1.0" 
+            $moduleObj = New-Object -TypeName PSObject 
+            $moduleObj | Add-Member NoteProperty -Name "Name" -Value "Module2"
+            $moduleObj | Add-Member NoteProperty Version($VersionObj)
+            Mock Get-Module -Verifiable { $moduleObj }
+            It "Should import module" {
+                $result = Use-AzureRmProfile -Profile 'Profile1' -Module 'Module1' 
+                Assert-MockCalled Import-Module -Times 1
+            }
+        }
     }
 }
 

tools/AzureRM.BootStrapper/AzureRM.Bootstrapper.psm1

@@ -1043,12 +1043,12 @@ function Use-AzureRmProfile
       $importedModules = Get-Module "Azure*"
       foreach ($importedModule in $importedModules) 
       {
-        $versions = $ProfileMap.$Profile.$($importedModule.Name)
-        if ($null -ne $versions)
+        $importedVersions = $ProfileMap.$Profile.$($importedModule.Name)
+        if ($null -ne $importedVersions)
         {
           # We need the latest version in that profile to be imported. If old version was imported, block user and ask to import in a new session
-          $version = Get-LatestModuleVersion -versions $versions
-          if ([system.version]$version -ne $importedModule.Version)
+          $importedVersion = Get-LatestModuleVersion -versions $importedVersions
+          if ([system.version]$importedVersion -ne $importedModule.Version)
           {
             Write-Error "A different profile version of module $importedModule is imported in this session. Start a new PowerShell session and retry the operation." -Category  InvalidOperation 
             return