[Resources] Fix Get-AzResource with -ExpandProperties. (Azure#27368)

Author: NoriZC

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

@@ -624,8 +624,7 @@ private bool IsSubscriptionLevelQuery()
         private bool IsResourceGroupLevelQuery()
         {
             return this.SubscriptionId.HasValue &&
-                this.ResourceGroupName != null &&
-                this.Name != null ||
+                this.ResourceGroupName != null ||
                 this.ResourceType != null;
         }
     }

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

@@ -145,6 +145,13 @@ public void TestGetResourceWithExpandProperties()
             TestRunner.RunTestScript("Test-GetResourceExpandProperties");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestGetResourceWithExpandPropertiesRGLevel()
+        {
+            TestRunner.RunTestScript("Test-GetResourceExpandPropertiesRGLevel");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetResourceByNameAndType()

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

@@ -561,6 +561,37 @@ function Test-GetResourceExpandProperties
     }
 }
 
+<#
+.SYNOPSIS
+Tests getting a resource with properties expanded
+.DESCRIPTION
+SmokeTest
+#>
+function Test-GetResourceExpandPropertiesRGLevel
+{
+    # Setup
+    $rgname = Get-ResourceGroupName
+    $rname = Get-ResourceName
+    $rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
+    $apiversion = "2014-04-01"
+    $resourceType = "Microsoft.Web/sites"
+
+    try
+    {
+        # Test
+        New-AzResourceGroup -Name $rgname -Location $rglocation
+        $resource = New-AzResource -Name $rname -Location $rglocation -Tags @{testtag = "testval"} -ResourceGroupName $rgname -ResourceType $resourceType -PropertyObject @{"key" = "value"} -SkuObject @{ Name = "A0" } -ApiVersion $apiversion -Force
+        $resourceGet = Get-AzResource -ResourceGroupName $rgname -ExpandProperties
+
+        # Assert
+        Assert-NotNull $resourceGet
+    }
+    finally
+    {
+        Clean-ResourceGroup $rgname
+    }
+}
+
 <#
 .SYNOPSIS
 Tests getting a resource by id, name, type, and its properties ensuring default resource api version is *not* used.

src/Resources/Resources.Test/ScenarioTests/ResourcesTestRunner.cs

@@ -55,6 +55,14 @@ protected ResourcesTestRunner(ITestOutputHelper output)
                         { "Microsoft.Azure.Management.ResourceManager.ResourceManagementClient", "2019-10-01" }
                     },
                     resourceProviders: new Dictionary<string, string>()
+                    {
+                        {"Microsoft.Resources", null},
+                        {"Microsoft.Features", null},
+                        {"Microsoft.Authorization", null},
+                        {"Providers.Test", null},
+                        {"microsoft.web", null },
+                        {"Microsoft.Web", null }
+                    }
                 )
                 .WithManagementClients(context =>
                     {

src/Resources/Resources.Test/SessionRecords/Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceTests/TestGetResourceByComponentsAndProperties.json

@@ -19,6 +19,7 @@
 -->
 
 ## Upcoming Release
+* Fixed the issue that Get-AzReource not working with `-ExpandProperties`. [#11248]
 * Updated Resources SDK to 2024-11-01.
 
 ## Version 7.9.0