Merge pull request Azure#5047 from matthchr/feature/fix-resourcegroup-bug

Fix Batch account operations bug

Author: maddieclayton

src/ResourceManager/AzureBatch/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fixed a bug where account operations without a resource group failed to auto-detect the resource group.
 
 ## Version 4.0.1
 * Fixed assembly loading issue that caused some cmdlets to fail when executing

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchAccountTests.ps1

@@ -63,7 +63,12 @@ function Test-BatchAccountEndToEnd
         Assert-AreEqual 1 $updatedAccount.Tags.Count
         Assert-AreEqual $newTagValue $updatedAccount.Tags[$newTagName]
 
-        # Get the account keys
+        # Get the account keys (without resource group)
+        $accountWithKeys = Get-AzureRmBatchAccountKeys -Name $accountName
+        Assert-NotNull $accountWithKeys.PrimaryAccountKey
+        Assert-NotNull $accountWithKeys.SecondaryAccountKey
+
+        # Get the account keys (with resource group)
         $accountWithKeys = Get-AzureRmBatchAccountKeys -Name $accountName -ResourceGroupName $resourceGroup
         Assert-NotNull $accountWithKeys.PrimaryAccountKey
         Assert-NotNull $accountWithKeys.SecondaryAccountKey
@@ -80,8 +85,8 @@ function Test-BatchAccountEndToEnd
         {
             # Delete the account
             Remove-AzureRmBatchAccount -Name $accountName -ResourceGroupName $resourceGroup -Force
-            $errorMessage = "The Resource 'Microsoft.Batch/batchAccounts/$accountName' under resource group '$resourceGroup' was not found."
-            Assert-Throws { Get-AzureRmBatchAccount -Name $accountName -ResourceGroupName $resourceGroup } $errorMessage
+            $errorMessage = "The specified account does not exist."
+            Assert-ThrowsContains { Get-AzureRmBatchAccount -Name $accountName -ResourceGroupName $resourceGroup } $errorMessage
         }
         finally
         {

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/Common.ps1

@@ -52,12 +52,12 @@ function Get-BatchAccountProviderLocation($index)
     {
         $namespace = "Microsoft.Batch"
         $type = "batchAccounts"
-        $r = Get-AzureRmResourceProvider -ProviderNamespace $namespace | where {$_.ResourceTypes[0].ResourceTypeName -eq $type}  
+        $r = Get-AzureRmResourceProvider -ProviderNamespace $namespace | where {$_.ResourceTypes[0].ResourceTypeName -eq $type}
         $location = $r.Locations
 
-        if ($location -eq $null) 
+        if ($location -eq $null)
         {  
-            return "westus"  
+            return "westus"
         } 
         else 
         {  
@@ -67,7 +67,7 @@ function Get-BatchAccountProviderLocation($index)
             }
             else
             {
-                return $location[$index]  
+                return $location[$index]
             }
         }  
     }