Skip to content

Commit 37a20dd

Browse files
committed
Make sure default first in list
1 parent b1a72c5 commit 37a20dd

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/ResourceManager/Common/Commands.ResourceManager.Common/TabCompleter/ResourceGroupCompleter.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ protected static IList<String> ResourceGroupNames
4848
instance.AuthenticationFactory.GetServiceClientCredentials(context, AzureEnvironment.Endpoint.ResourceManager),
4949
instance.ClientFactory.GetCustomHandlers());
5050
client.SubscriptionId = context.Subscription.Id;
51+
// Retrieve only the first page of ResourceGroups to display to the user
5152
var resourceGroups = client.ResourceGroups.ListAsync();
5253
if (resourceGroups.Wait(TimeSpan.FromSeconds(5)))
5354
{
@@ -112,9 +113,9 @@ public static string[] GetResourceGroups(IList<string> resourceGroupNames, strin
112113
{
113114
if (resourceGroupNames.Contains(defaultResourceGroup))
114115
{
115-
resourceGroupNames.Remove(defaultResourceGroup);
116-
resourceGroupNames.Insert(0, defaultResourceGroup);
116+
resourceGroupNames.Remove(defaultResourceGroup);
117117
}
118+
resourceGroupNames.Insert(0, defaultResourceGroup);
118119
}
119120
return resourceGroupNames.ToArray();
120121
}

src/ResourceManager/Profile/Commands.Profile.Test/ResourcGroupCompleterUnitTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ public void OneResourceGroupWithInvalidDefault()
5353
{
5454
IList<string> resourceGroupsReturned = new List<string>();
5555
resourceGroupsReturned.Add("test1");
56-
Assert.Collection(ResourceGroupCompleterAttribute.GetResourceGroups(resourceGroupsReturned, "invalidDefault"), e1 => Assert.Equal("test1", e1));
56+
Assert.Collection(ResourceGroupCompleterAttribute.GetResourceGroups(resourceGroupsReturned, "defaultOutOfPage"), e1 => Assert.Equal("defaultOutOfPage", e1),
57+
e2 => Assert.Equal("test1", e2));
5758
}
5859

5960
[Fact]

0 commit comments

Comments
 (0)