Merge pull request #8 from amarzavery/rp

Fix using in memory subscription with provider registration

Author: amarzavery

src/Common/Commands.Common/Common/AzurePowerShellClientFactory.cs

@@ -119,16 +119,24 @@ private void RegisterServiceManagementProviders<T>(AzureContext context) where T
             }
         }
 
-        private void UpdateSubscriptionRegisteredProviders(AzureSubscription subscription, List<string> providers)
+        private void UpdateSubscriptionRegisteredProviders(AzureSubscription subscription, List<string> providers)
         {
-            if (providers != null && providers.Count > 0)
-            {
-                subscription.SetOrAppendProperty(AzureSubscription.Property.RegisteredResourceProviders,
-                    providers.ToArray());
-                ProfileClient profileClient = new ProfileClient();
-                profileClient.AddOrSetSubscription(subscription);
-                profileClient.Profile.Save();
-            }
+            if (providers != null && providers.Count > 0)
+            {
+                subscription.SetOrAppendProperty(AzureSubscription.Property.RegisteredResourceProviders,
+                    providers.ToArray());
+                try
+                {
+                    ProfileClient profileClient = new ProfileClient();
+                    profileClient.AddOrSetSubscription(subscription);
+                    profileClient.Profile.Save();
+                }
+                catch (KeyNotFoundException)
+                {
+                    // if using a subscription data file, do not write registration to disk
+                    // long term solution is using -Profile parameter
+                }
+            }
         }
     }
 }

tools/InstallationTests/InstallationTest.ps1

@@ -41,4 +41,14 @@ function Test-UpdateStorageAccount
   Set-AzureSubscription -SubscriptionName $subscription -CurrentStorageAccountName $accounts[1].StorageAccountName
   $storageAccountName = $(Get-AzureStorageContainer)[0].Context.StorageAccountName
   Assert-AreEqual $storageAccountName $accounts[1].StorageAccountName
+}
+
+function Test-GetBatchAccountWithSubscriptionDataFile
+{
+  param([PSCredential] $credential)
+  Get-AzureSubscription | Remove-AzureSubscription -Force
+  $account = Add-AzureAccount -Credential $credential -SubscriptionDataFile "File.txt"
+  Select-AzureSubscription -SubscriptionId $account.Subscriptions.Split("`r`n")[0] -SubscriptionDataFile "File.txt"
+  Get-AzureBatchAccount
+  Add-AzureAccount -Credential $credential
 }

tools/InstallationTests/RunInstallationTests.ps1

@@ -107,6 +107,7 @@ Run-TestProtected { Test-UpdateStorageAccount } "Test-UpdateStorageAccount"
 $serviceCommands | % { Run-TestProtected $_  $_.ToString() }
 Write-Host -ForegroundColor Green "STARTING RESOURCE MANAGER TESTS"
 Switch-AzureMode AzureResourceManager > $null
+Run-TestProtected { Test-GetBatchAccountWithSubscriptionDataFile $credential} "Test-GetBatchAccountWithSubscriptionDataFile"
 $resourceCommands | % { Run-TestProtected $_  $_.ToString() }
 Write-Host
 Write-Host -ForegroundColor Green "$global:passedCount / $global:totalCount Installation Tests Pass"