Merge pull request #1734 from vivsriaus/CollectionGet

Support collection query in resource get

Author: Hovsep

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Resource/GetAzureResourceCmdlet.cs

@@ -67,11 +67,16 @@ public sealed class GetAzureResourceCmdlet : ResourceManagerCmdletBase
         /// </summary>
         internal const string GetResourceByNameGroupParameterSet = "Get resource by name and group";
 
-            /// <summary>
-        /// The list resources by name and resource group set.
+        /// <summary>
+        /// The list resources by name, type and resource group set.
         /// </summary>
         internal const string GetResourceByNameGroupTypeParameterSet = "Get resource by name, group and type";
 
+        /// <summary>
+        /// The list resources set.
+        /// </summary>
+        internal const string ListResourceCollection = "Get resource collection";
+
         /// <summary>
         /// Caches the current subscription ids to get all subscription ids in the pipeline.
         /// </summary>
@@ -100,6 +105,7 @@ public sealed class GetAzureResourceCmdlet : ResourceManagerCmdletBase
         /// <summary>
         /// Gets or sets the resource type parameter.
         /// </summary>
+        [Parameter(ParameterSetName = GetAzureResourceCmdlet.ListResourceCollection, Mandatory = true, HelpMessage = "When specified, ensures that the query is run against a collection instead of a resource.")]
         [Parameter(ParameterSetName = GetAzureResourceCmdlet.GetTenantResourceParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource type. e.g. Microsoft.Sql/Servers/Databases.")]
         [Parameter(ParameterSetName = GetAzureResourceCmdlet.ListTenantResourcesParameterSet, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource type. e.g. Microsoft.Sql/Servers/Databases.")]
         [Parameter(ParameterSetName = GetAzureResourceCmdlet.GetResourceByNameTypeParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource type. e.g. Microsoft.Sql/Servers/Databases.")]
@@ -121,6 +127,7 @@ public sealed class GetAzureResourceCmdlet : ResourceManagerCmdletBase
         /// <summary>
         /// Gets or sets the extension resource type.
         /// </summary>
+        [Parameter(ParameterSetName = GetAzureResourceCmdlet.ListResourceCollection, Mandatory = false, HelpMessage = "When specified, ensures that the query is run against a collection instead of a resource.")]
         [Parameter(ParameterSetName = GetAzureResourceCmdlet.GetTenantResourceParameterSet, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The extension resource type. e.g. Microsoft.Sql/Servers/Databases.")]
         [Parameter(ParameterSetName = GetAzureResourceCmdlet.ListTenantResourcesParameterSet, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The extension resource type. e.g. Microsoft.Sql/Servers/Databases.")]
         [Parameter(ParameterSetName = GetAzureResourceCmdlet.GetResourceByNameGroupParameterSet, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The extension resource type. e.g. Microsoft.Sql/Servers/Databases.")]
@@ -138,11 +145,11 @@ public sealed class GetAzureResourceCmdlet : ResourceManagerCmdletBase
         /// <summary>
         /// Gets or sets the is collection.
         /// </summary>
+        [Parameter(ParameterSetName = GetAzureResourceCmdlet.ListResourceCollection, Mandatory = true, HelpMessage = "When specified, ensures that the query is run against a collection instead of a resource.")]
         [Parameter(ParameterSetName = GetAzureResourceCmdlet.GetTenantResourceParameterSet, Mandatory = false, HelpMessage = "When specified, ensures that the query is run against a collection instead of a resource.")]
         [Parameter(ParameterSetName = GetAzureResourceCmdlet.ListTenantResourcesParameterSet, Mandatory = false, HelpMessage = "When specified, ensures that the query is run against a collection instead of a resource.")]
         [Parameter(ParameterSetName = GetAzureResourceCmdlet.GetResourceByNameTypeParameterSet, Mandatory = false, HelpMessage = "When specified, ensures that the query is run against a collection instead of a resource.")]
         [Parameter(ParameterSetName = GetAzureResourceCmdlet.GetResourceByNameGroupParameterSet, Mandatory = false, HelpMessage = "When specified, ensures that the query is run against a collection instead of a resource.")]
-        [Parameter(ParameterSetName = GetAzureResourceCmdlet.GetResourceByNameGroupTypeParameterSet, Mandatory = false, HelpMessage = "When specified, ensures that the query is run against a collection instead of a resource.")]
         public SwitchParameter IsCollection { get; set; }
 
         /// <summary>
@@ -162,6 +169,7 @@ public sealed class GetAzureResourceCmdlet : ResourceManagerCmdletBase
         /// <summary>
         /// Gets or sets the resource group name.
         /// </summary>
+        [Parameter(ParameterSetName = GetAzureResourceCmdlet.ListResourceCollection, Mandatory = true, HelpMessage = "When specified, ensures that the query is run against a collection instead of a resource.")]
         [Parameter(ParameterSetName = GetAzureResourceCmdlet.GetResourceByNameGroupParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource group name.")]
         [Parameter(ParameterSetName = GetAzureResourceCmdlet.GetResourceByNameGroupTypeParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource group name.")]
         [ValidateNotNullOrEmpty]

src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj

@@ -501,6 +501,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ActiveDirectoryTests\TestNewADServicePrincipal.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceTests\TestGetResourceWithCollection.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceTests\TestGetResourceWithExpandProperties.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceTests.cs

@@ -111,5 +111,12 @@ public void TestGetResourceWithExpandProperties()
         {
             ResourcesController.NewInstance.RunPsTest("Test-GetResourceExpandProperties");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestGetResourceWithCollection()
+        {
+            ResourcesController.NewInstance.RunPsTest("Test-GetResourceWithCollection");
+        }
     }
 }

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

@@ -347,4 +347,26 @@ function Test-GetResourceExpandProperties
 
 	# Assert
 	Assert-AreEqual $resourceGet.Properties.key "value"
+}
+
+<#
+.SYNOPSIS
+Tests getting a resource with IsCollection
+#>
+function Test-GetResourceWithCollection
+{
+	# Setup
+	$rgname = Get-ResourceGroupName
+	$rname = Get-ResourceName
+	$rglocation = Get-ProviderLocation ResourceManagement
+	$apiversion = "2015-08-01"
+	$resourceType = "Providers.Test/statefulResources"
+
+	# Test
+	New-AzureRmResourceGroup -Name $rgname -Location $rglocation
+	New-AzureRmResourceGroupDeployment -Name $rname -ResourceGroupName $rgname -TemplateFile sampleTemplate.json -TemplateParameterFile sampleTemplateParams.json
+	$resourceGet = Get-AzureRmResource -ResourceGroupName $rgname -ResourceType Microsoft.Web/serverFarms -IsCollection -ApiVersion 2015-08-01
+
+	# Assert
+	Assert-AreEqual $resourceGet.ResourceType "Microsoft.Web/serverFarms"
 }