Update the list methods of resources in extensions to always have a name of Get{ResourceNames} (#52008)

* code update

* regen

* Update eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Utilities/ResourceHelpers.cs

Co-authored-by: Copilot <[email protected]>

* fix after merge

---------

Co-authored-by: Copilot <[email protected]>

Author: ArcturusZhang

eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/ManagementOutputLibrary.cs

@@ -104,7 +104,7 @@ _mockableClients is not null ||
             // build mockable resources
             var resourcesAndMethodsPerScope = BuildResourcesAndNonResourceMethods(
                 resourceDict,
-                resourceMethodCategories.Values.SelectMany(c => c.MethodsInExtension),
+                resourceMethodCategories,
                 ManagementClientGenerator.Instance.InputLibrary.NonResourceMethods);
             var mockableArmClientResource = new MockableArmClientProvider(_resourceClients);
             var mockableResources = new List<MockableResourceProvider>(resourcesAndMethodsPerScope.Count)
@@ -126,7 +126,7 @@ _mockableClients is not null ||
 
             static Dictionary<ResourceScope, ResourcesAndNonResourceMethodsInScope> BuildResourcesAndNonResourceMethods(
                 IReadOnlyDictionary<ResourceMetadata, ResourceClientProvider> resourceDict,
-                IEnumerable<ResourceMethod> resourceMethods,
+                IReadOnlyDictionary<ResourceMetadata, ResourceMethodCategory> resourceMethods,
                 IEnumerable<NonResourceMethod> nonResourceMethods)
             {
                 // walk through all resources to figure out their scopes
@@ -144,9 +144,22 @@ static Dictionary<ResourceScope, ResourcesAndNonResourceMethodsInScope> BuildRes
                         resourcesAndMethodsPerScope[metadata.ResourceScope].ResourceClients.Add(resourceClient);
                     }
                 }
-                foreach (var resourceMethod in resourceMethods)
+                foreach (var (metadata, category) in resourceMethods)
                 {
-                    resourcesAndMethodsPerScope[resourceMethod.OperationScope].ResourceMethods.Add(resourceMethod);
+                    // find the resource
+                    var resource = resourceDict[metadata];
+                    // the resource methods
+                    foreach (var resourceMethod in category.MethodsInExtension)
+                    {
+                        var resourcesAndMethodsInThisScope = resourcesAndMethodsPerScope[resourceMethod.OperationScope];
+                        if (!resourcesAndMethodsInThisScope.ResourceMethods.TryGetValue(resource, out var methods))
+                        {
+                            methods = new List<ResourceMethod>();
+                            resourcesAndMethodsInThisScope.ResourceMethods[resource] = methods;
+                        }
+                        // add this method into the list
+                        ((List<ResourceMethod>)methods).Add(resourceMethod);
+                    }
                 }
                 foreach (var nonResourceMethod in nonResourceMethods)
                 {
@@ -251,7 +264,7 @@ internal bool TryGetResourceClientProvider(CSharpType resourceDataType, [MaybeNu
 
         private record ResourcesAndNonResourceMethodsInScope(
             List<ResourceClientProvider> ResourceClients,
-            List<ResourceMethod> ResourceMethods,
+            Dictionary<ResourceClientProvider, IReadOnlyList<ResourceMethod>> ResourceMethods,
             List<NonResourceMethod> NonResourceMethods);
     }
 }

eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Providers/MockableArmClientProvider.cs

@@ -16,7 +16,8 @@ namespace Azure.Generator.Management.Providers
     internal sealed class MockableArmClientProvider : MockableResourceProvider
     {
         // TODO -- we also need to put operations here when we want to support scope resources/operations https://github.com/Azure/azure-sdk-for-net/issues/51821
-        public MockableArmClientProvider(IReadOnlyList<ResourceClientProvider> resources) : base(typeof(ArmClient), RequestPathPattern.Tenant, resources, [], [])
+        public MockableArmClientProvider(IReadOnlyList<ResourceClientProvider> resources)
+            : base(typeof(ArmClient), RequestPathPattern.Tenant, resources, new Dictionary<ResourceClientProvider, IReadOnlyList<ResourceMethod>>(), [])
         {
         }
 

eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Providers/MockableResourceProvider.cs

@@ -25,7 +25,7 @@ namespace Azure.Generator.Management.Providers
     internal class MockableResourceProvider : TypeProvider
     {
         private protected readonly IReadOnlyList<ResourceClientProvider> _resources;
-        private protected readonly IReadOnlyList<ResourceMethod> _resourceMethods;
+        private protected readonly IReadOnlyDictionary<ResourceClientProvider, IReadOnlyList<ResourceMethod>> _resourceMethods;
         private protected readonly IReadOnlyList<NonResourceMethod> _nonResourceMethods;
         private readonly Dictionary<InputClient, RestClientInfo> _clientInfos;
 
@@ -38,28 +38,27 @@ internal class MockableResourceProvider : TypeProvider
         /// <param name="resources">the resources in this scope.</param>
         /// <param name="resourceMethods">the resource methods that belong to this scope.</param>
         /// <param name="nonResourceMethods">the non-resource methods that belong to this scope.</param>
-        public MockableResourceProvider(ResourceScope resourceScope, IReadOnlyList<ResourceClientProvider> resources, IReadOnlyList<ResourceMethod> resourceMethods, IReadOnlyList<NonResourceMethod> nonResourceMethods)
+        public MockableResourceProvider(ResourceScope resourceScope, IReadOnlyList<ResourceClientProvider> resources, IReadOnlyDictionary<ResourceClientProvider, IReadOnlyList<ResourceMethod>> resourceMethods, IReadOnlyList<NonResourceMethod> nonResourceMethods)
             : this(ResourceHelpers.GetArmCoreTypeFromScope(resourceScope), RequestPathPattern.GetFromScope(resourceScope), resources, resourceMethods, nonResourceMethods)
         {
         }
 
-        private protected MockableResourceProvider(CSharpType armCoreType, RequestPathPattern contextualPath, IReadOnlyList<ResourceClientProvider> resources, IReadOnlyList<ResourceMethod> resourceMethods, IReadOnlyList<NonResourceMethod> nonResourceMethods)
+        private protected MockableResourceProvider(CSharpType armCoreType, RequestPathPattern contextualPath, IReadOnlyList<ResourceClientProvider> resources, IReadOnlyDictionary<ResourceClientProvider, IReadOnlyList<ResourceMethod>> resourceMethods, IReadOnlyList<NonResourceMethod> nonResourceMethods)
         {
             _resources = resources;
             _resourceMethods = resourceMethods;
             _nonResourceMethods = nonResourceMethods;
             ArmCoreType = armCoreType;
             _contextualPath = contextualPath;
-            _clientInfos = BuildRestClientInfos(resourceMethods, nonResourceMethods, this);
+            _clientInfos = BuildRestClientInfos(resourceMethods.Values.SelectMany(m => m).Select(m => m.InputClient).Concat(nonResourceMethods.Select(m => m.InputClient)), this);
         }
 
         private static Dictionary<InputClient, RestClientInfo> BuildRestClientInfos(
-            IReadOnlyList<ResourceMethod> resourceMethods,
-            IReadOnlyList<NonResourceMethod> nonResourceMethods,
+            IEnumerable<InputClient> inputClients,
             TypeProvider enclosingType)
         {
             var clientInfos = new Dictionary<InputClient, RestClientInfo>();
-            foreach (var inputClient in resourceMethods.Select(m => m.InputClient).Concat(nonResourceMethods.Select(m => m.InputClient)))
+            foreach (var inputClient in inputClients)
             {
                 if (clientInfos.ContainsKey(inputClient))
                 {
@@ -184,10 +183,13 @@ protected override MethodProvider[] BuildMethods()
                 methods.AddRange(BuildMethodsForResource(resource));
             }
 
-            foreach (var method in _resourceMethods)
+            foreach (var (resource, resourceMethods) in _resourceMethods)
             {
-                methods.Add(BuildServiceMethod(method.InputMethod, method.InputClient, true));
-                methods.Add(BuildServiceMethod(method.InputMethod, method.InputClient, false));
+                foreach (var resourceMethod in resourceMethods)
+                {
+                    methods.Add(BuildResourceServiceMethod(resource, resourceMethod, true));
+                    methods.Add(BuildResourceServiceMethod(resource, resourceMethod, false));
+                }
             }
 
             foreach (var method in _nonResourceMethods)
@@ -276,13 +278,20 @@ static MethodProvider BuildGetMethod(TypeProvider enclosingType, MethodProvider
             }
         }
 
-        private MethodProvider BuildServiceMethod(InputServiceMethod method, InputClient inputClient, bool isAsync)
+        private MethodProvider BuildResourceServiceMethod(ResourceClientProvider resource, ResourceMethod resourceMethod, bool isAsync)
+        {
+            var methodName = ResourceHelpers.GetExtensionOperationMethodName(resourceMethod.Kind, resource.ResourceName, isAsync);
+
+            return BuildServiceMethod(resourceMethod.InputMethod, resourceMethod.InputClient, isAsync, methodName);
+        }
+
+        private MethodProvider BuildServiceMethod(InputServiceMethod method, InputClient inputClient, bool isAsync, string? methodName = null)
         {
             var clientInfo = _clientInfos[inputClient];
             return method switch
             {
-                InputPagingServiceMethod pagingMethod => new PageableOperationMethodProvider(this, _contextualPath, clientInfo, pagingMethod, isAsync),
-                _ => new ResourceOperationMethodProvider(this, _contextualPath, clientInfo, method, isAsync)
+                InputPagingServiceMethod pagingMethod => new PageableOperationMethodProvider(this, _contextualPath, clientInfo, pagingMethod, isAsync, methodName: methodName),
+                _ => new ResourceOperationMethodProvider(this, _contextualPath, clientInfo, method, isAsync, methodName: methodName)
             };
         }
 

eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Utilities/ResourceHelpers.cs

@@ -4,6 +4,7 @@
 using Azure.Generator.Management.Models;
 using Azure.ResourceManager.ManagementGroups;
 using Azure.ResourceManager.Resources;
+using Humanizer;
 using Microsoft.TypeSpec.Generator.Input.Extensions;
 using Microsoft.TypeSpec.Generator.Primitives;
 using Microsoft.TypeSpec.Generator.Providers;
@@ -61,6 +62,22 @@ public static string GetRestClientPropertyName(string clientName)
             };
         }
 
+        /// <summary>
+        /// Gets the appropriate method name for an extension operation based on its kind and corresponding resource name.
+        /// </summary>
+        /// <param name="operationKind">The kind of resource operation to perform (e.g., List, Create).</param>
+        /// <param name="resourceName">The name of the resource for which the operation is being performed.</param>
+        /// <param name="isAsync">Whether the method should be asynchronous.</param>
+        /// <returns>The method name to use for the extension operation, or null if no override is needed.</returns>
+        public static string? GetExtensionOperationMethodName(ResourceOperationKind operationKind, string resourceName, bool isAsync)
+        {
+            return operationKind switch
+            {
+                ResourceOperationKind.List => isAsync ? $"Get{resourceName.Pluralize()}Async" : $"Get{resourceName.Pluralize()}",
+                _ => null
+            };
+        }
+
         public static string GetDiagnosticScope(TypeProvider enclosingType, string methodName, bool isAsync)
         {
             var rawMethodName = isAsync && methodName.EndsWith("Async") ? methodName[..^5] : methodName; // trim "Async" if the method is async method