Merge pull request #569 from Azure/dev

huangpf PR: dev <- Azure:dev

Author: huangpf

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/ResourceGroups/SetAzureResourceGroupCmdlet.cs

@@ -58,7 +58,12 @@ public override void ExecuteCmdlet()
                 ResourceGroupName = Name ?? ResourceIdentifier.FromResourceGroupIdentifier(this.Id).ResourceGroupName,
                 Tag = Tag,
             };
-            WriteObject(ResourceManagerSdkClient.UpdatePSResourceGroup(parameters));
+
+            var resourceGroup = ResourceManagerSdkClient.UpdatePSResourceGroup(parameters);
+            if (resourceGroup != null)
+            {
+                WriteObject(resourceGroup);
+            }
         }
     }
 }

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/SdkClient/ResourceManagerSdkClient.cs

@@ -551,6 +551,12 @@ public virtual PSResourceGroup CreatePSResourceGroup(PSCreateResourceGroupParame
         /// <param name="parameters">The create parameters</param>
         public virtual PSResourceGroup UpdatePSResourceGroup(PSUpdateResourceGroupParameters parameters)
         {
+            if (!ResourceManagementClient.ResourceGroups.CheckExistence(parameters.ResourceGroupName).Value)
+            {
+                WriteError(ProjectResources.ResourceGroupDoesntExists);
+                return null;
+            }
+
             ResourceGroup resourceGroup = ResourceManagementClient.ResourceGroups.Get(parameters.ResourceGroupName);
 
             resourceGroup = CreateOrUpdateResourceGroup(parameters.ResourceGroupName, resourceGroup.Location, parameters.Tag);
@@ -573,12 +579,15 @@ public virtual List<PSResourceGroup> FilterResourceGroups(string name, Hashtable
 
             if (string.IsNullOrEmpty(name))
             {
-                var response = ResourceManagementClient.ResourceGroups.List(null);
-                List<ResourceGroup> resourceGroups = ResourceManagementClient.ResourceGroups.List(null).ToList();
+                List<ResourceGroup> resourceGroups = new List<ResourceGroup>();
+
+                var listResult = ResourceManagementClient.ResourceGroups.List(null);
+                resourceGroups.AddRange(listResult);
 
-                while (!string.IsNullOrEmpty(response.NextPageLink))
+                while (!string.IsNullOrEmpty(listResult.NextPageLink))
                 {
-                    resourceGroups.AddRange(response);
+                    listResult = ResourceManagementClient.ResourceGroups.ListNext(listResult.NextPageLink);
+                    resourceGroups.AddRange(listResult);
                 }
 
                 resourceGroups = !string.IsNullOrEmpty(location)
@@ -621,7 +630,7 @@ public virtual List<PSResourceGroup> FilterResourceGroups(string name, Hashtable
                 }
                 catch (CloudException)
                 {
-                    throw new ArgumentException(ProjectResources.ResourceGroupDoesntExists);
+                    WriteError(ProjectResources.ResourceGroupDoesntExists);
                 }
             }
 
@@ -636,10 +645,12 @@ public virtual void DeleteResourceGroup(string name)
         {
             if (!ResourceManagementClient.ResourceGroups.CheckExistence(name).Value)
             {
-                throw new ArgumentException(ProjectResources.ResourceGroupDoesntExists);
+                WriteError(ProjectResources.ResourceGroupDoesntExists);
+            }
+            else
+            {
+                ResourceManagementClient.ResourceGroups.Delete(name);
             }
-
-            ResourceManagementClient.ResourceGroups.Delete(name);
         }
 
         /// <summary>

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceGroupTests.ps1

@@ -52,7 +52,9 @@ function Test-UpdatesExistingResourceGroup
     try 
     {
         # Test update without tag
-        Assert-Throws { Set-AzureRmResourceGroup -Name $rgname -Tags @{"testtag" = "testval"} } "Resource group '$rgname' could not be found."
+        Set-AzureRmResourceGroup -Name $rgname -Tags @{"testtag" = "testval"} -ErrorAction SilentlyContinue
+        Assert-True { $Error[0] -like "*Provided resource group does not exist." }
+        $Error.Clear()
 
         $new = New-AzureRmResourceGroup -Name $rgname -Location $location
 
@@ -94,8 +96,13 @@ function Test-CreatesAndRemoveResourceGroupViaPiping
     Get-AzureRmResourceGroup | where {$_.ResourceGroupName -eq $rgname1 -or $_.ResourceGroupName -eq $rgname2} | Remove-AzureRmResourceGroup -Force
 
     # Assert
-    Assert-Throws { Get-AzureRmResourceGroup -Name $rgname1 } "Provided resource group does not exist."
-    Assert-Throws { Get-AzureRmResourceGroup -Name $rgname2 } "Provided resource group does not exist."
+    Get-AzureRmResourceGroup -Name $rgname1 -ErrorAction SilentlyContinue
+    Assert-True { $Error[0] -like "*Provided resource group does not exist." }
+    $Error.Clear()
+ 
+    Get-AzureRmResourceGroup -Name $rgname2 -ErrorAction SilentlyContinue
+    Assert-True { $Error[0] -like "*Provided resource group does not exist." }
+    $Error.Clear()
 }
 
 <#
@@ -107,7 +114,9 @@ function Test-GetNonExistingResourceGroup
     # Setup
     $rgname = Get-ResourceGroupName
 
-    Assert-Throws { Get-AzureRmResourceGroup -Name $rgname } "Provided resource group does not exist."
+    Get-AzureRmResourceGroup -Name $rgname -ErrorAction SilentlyContinue
+    Assert-True { $Error[0] -like "*Provided resource group does not exist." }
+    $Error.Clear()
 }
 
 <#
@@ -131,7 +140,9 @@ function Test-RemoveNonExistingResourceGroup
     # Setup
     $rgname = Get-ResourceGroupName
 
-    Assert-Throws { Remove-AzureRmResourceGroup -Name $rgname -Force } "Provided resource group does not exist."
+    Remove-AzureRmResourceGroup -Name $rgname -Force -ErrorAction SilentlyContinue
+    Assert-True { $Error[0] -like "*Provided resource group does not exist." }
+    $Error.Clear()
 }
 
 <#