Fix the bug of Get-AzResource with api-version

src/Resources/ResourceManager/Components/ApiVersionHelper.cs

@@ -26,7 +26,8 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components
     using System.Linq;
     using System.Threading;
     using System.Threading.Tasks;
-// TODO: Remove IfDef
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Utilities;
+    // TODO: Remove IfDef
 #if NETSTANDARD
     using Microsoft.Extensions.Caching.Memory;
 #else
@@ -127,13 +128,28 @@ private static string[] GetApiVersionsForResourceType(IAzureContext context, str
                     cancellationToken: cancellationToken),
                 cancellationToken: cancellationToken);
 
-            return providers
+            string[] apiVersions = providers
                 .CoalesceEnumerable()
                 .Where(provider => providerNamespace.EqualsInsensitively(provider.Namespace))
                 .SelectMany(provider => provider.ResourceTypes)
                 .Where(type => resourceType.EqualsInsensitively(type.ResourceType))
                 .Select(type => type.ApiVersions)
                 .FirstOrDefault();
+            if (apiVersions == null)
+            {
+                string topLevelResourceType = ResourceTypeUtility.GetTopLevelResourceType(resourceType);
+                return providers
+                    .CoalesceEnumerable()
+                    .Where(provider => providerNamespace.EqualsInsensitively(provider.Namespace))
+                    .SelectMany(provider => provider.ResourceTypes)
+                    .Where(type => topLevelResourceType.EqualsInsensitively(type.ResourceType))
+                    .Select(type => type.ApiVersions)
+                    .FirstOrDefault();
+            }
+            else
+            {
+                return apiVersions;
+            }
         }
 
         /// <summary>

src/Resources/ResourceManager/SdkClient/ResourceManagerSdkClient.cs

@@ -40,6 +40,7 @@
 using Microsoft.Azure.Commands.ResourceManager.Common.Paging;
 using System.Management.Automation;
 using Microsoft.Rest;
+using System.Runtime.InteropServices.ComTypes;
 
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkClient
 {
@@ -1168,6 +1169,13 @@ public virtual PSResource GetById(string resourceId, string apiVersion)
                 var resourceType = provider.ResourceTypes
                                            .Where(t => string.Equals(string.Format("{0}/{1}", provider.NamespaceProperty, t.ResourceType), resourceIdentifier.ResourceType, StringComparison.OrdinalIgnoreCase))
                                            .FirstOrDefault();
+                if (resourceType == null)
+                {
+                    string topLevelResourceType = ResourceTypeUtility.GetTopLevelResourceTypeWithProvider(resourceIdentifier.ResourceType);
+                    resourceType = provider.ResourceTypes
+                                               .Where(t => string.Equals(t.ResourceType, topLevelResourceType, StringComparison.OrdinalIgnoreCase))
+                                               .FirstOrDefault();
+                }
                 if (resourceType != null)
                 {
                     apiVersion = resourceType.ApiVersions.Contains(apiVersion) ? apiVersion : resourceType.ApiVersions.FirstOrDefault();

src/Resources/ResourceManager/Utilities/ResourceTypeUtility.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Utilities
+{
+    public static class ResourceTypeUtility
+    {
+        public static string GetTopLevelResourceType(string resourceType)
+        {
+            if (string.IsNullOrEmpty(resourceType))
+            {
+                return null;
+            }
+            string[] resourceTypeFieldList = resourceType.Split('/');
+            // resourceType is like {topLevelResource}/[{subLevelResource}]
+            return resourceTypeFieldList[0];
+        }
+
+        public static string GetTopLevelResourceTypeWithProvider(string resourceType)
+        {
+            if (string.IsNullOrEmpty(resourceType))
+            {
+                return null;
+            }
+            string[] resourceTypeFieldList = resourceType.Split('/');
+            // resourceType is like {provider}/{topLevelResource}/[{subLevelResource}]
+            if (resourceTypeFieldList.Length >= 1)
+            {
+                return resourceTypeFieldList[1];
+            }
+            else
+            {
+                return resourceType;
+            }
+        }
+    }
+}

src/Resources/Resources.Test/UnitTests/Utilities/TestResourceTypeUtility.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xunit;
+using Xunit.Abstractions;
+using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Utilities;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
+
+namespace Microsoft.Azure.Commands.Resources.Test.UnitTests.Utilities
+{
+    public class TestResourceTypeUtility
+    {
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestInputIsNull()
+        {
+            string resourceType = ResourceTypeUtility.GetTopLevelResourceType(null);
+
+            Assert.Null(resourceType);
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestInputTopLevelResourceTypeSingle()
+        {
+            string resourceType = ResourceTypeUtility.GetTopLevelResourceType("virtualMachines");
+
+            Assert.Equal("virtualMachines", resourceType);
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestInputTopLevelResourceTypeAndSubResourceType()
+        {
+            string resourceType = ResourceTypeUtility.GetTopLevelResourceType("virtualMachines/networking");
+
+            Assert.Equal("virtualMachines", resourceType);
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestInputProviderNull()
+        {
+            string resourceType = ResourceTypeUtility.GetTopLevelResourceTypeWithProvider(null);
+
+            Assert.Null(resourceType);
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestInputProviderAndTopLevelResourceType()
+        {
+            string resourceType = ResourceTypeUtility.GetTopLevelResourceTypeWithProvider("Microsoft.Compute/virtualMachines");
+
+            Assert.Equal("virtualMachines", resourceType);
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestInputProviderAndTopLevelResourceTypeAndSubLevelResourceType()
+        {
+            string resourceType = ResourceTypeUtility.GetTopLevelResourceTypeWithProvider("Microsoft.Compute/virtualMachines/networking");
+
+            Assert.Equal("virtualMachines", resourceType);
+        }
+    }
+}

src/Resources/Resources/ChangeLog.md

@@ -21,6 +21,7 @@
 * Update references in .psd1 to use relative path
 * Fix an issue where template deployment fails to read a template parameter if its name conflicts with some built-in parameter name.
 * Updated policy cmdlets to use new api version 2019-09-01 that introduces grouping support within policy set definitions.
+* Fix the bug that the output of some sub-resource is empty when using `Get-AzResource`.
 
 ## Version 1.8.0
 - Updated policy cmdlets to use new api version 2019-06-01 that has new EnforcementMode property in policy assignment.