Transform subscriptionId and client

eng/Packages.Data.props

@@ -259,7 +259,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(IsGeneratorLibrary)' == 'true'">
-    <PackageReference Update="Microsoft.Generator.CSharp.ClientModel" Version="1.0.0-alpha.20241223.2" />
+    <PackageReference Update="Microsoft.Generator.CSharp.ClientModel" Version="1.0.0-alpha.20241225.2" />
   </ItemGroup>
 
   <!--

eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureArmVisitor.cs

@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Microsoft.Generator.CSharp.ClientModel;
+using Microsoft.Generator.CSharp.ClientModel.Providers;
+using Microsoft.Generator.CSharp.Primitives;
+using Microsoft.Generator.CSharp.Providers;
+using System.IO;
+
+namespace Azure.Generator
+{
+    // only apply for MPG
+    internal class AzureArmVisitor : ScmLibraryVisitor
+    {
+        /// <inheritdoc/>
+        protected override TypeProvider? Visit(TypeProvider type)
+        {
+            if (type is ClientProvider)
+            {
+                type.Update(modifiers: TransfromModifiers(type), relativeFilePath: TransformRelativeFilePathForClient(type));
+            }
+            //if (type is RestClientProvider)
+            //{
+            //    type.Update(modifiers: TransfromModifiers(type), relativeFilePath: TransformRelativeFilePathForRestClient(type));
+            //}
+            return type;
+        }
+
+        private static string TransformRelativeFilePathForClient(TypeProvider type)
+            => Path.Combine("src", "Generated", "RestOperations", $"{type.Name}RestOperations.cs");
+
+        private static string TransformRelativeFilePathForRestClient(TypeProvider type)
+            => Path.Combine("src", "Generated", "RestOperations", $"{type.Name}.RestClient.cs");
+
+        private static TypeSignatureModifiers TransfromModifiers(TypeProvider type)
+        {
+            var modifiers = type.DeclarationModifiers;
+            if (modifiers.HasFlag(TypeSignatureModifiers.Public))
+            {
+                modifiers &= ~TypeSignatureModifiers.Public;
+                modifiers |= TypeSignatureModifiers.Internal;
+            }
+
+            return modifiers;
+        }
+    }
+}

eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureClientPlugin.cs

@@ -51,7 +51,7 @@ public override void Configure()
         AddSharedSourceDirectory(sharedSourceDirectory);
         if (IsAzureArm.Value)
         {
-            AddVisitor(new AzureVisitor());
+            AddVisitor(new AzureArmVisitor());
         }
     }
 

eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureTypeFactory.cs

@@ -107,7 +107,8 @@ public override MethodBodyStatement SerializeJsonValue(Type valueType, ValueExpr
         }
 
         /// <inheritdoc/>
-        protected override ClientProvider CreateClientCore(InputClient inputClient) => base.CreateClientCore(TransformInputClient(inputClient));
+        protected override ClientProvider CreateClientCore(InputClient inputClient)
+            => AzureClientPlugin.Instance.IsAzureArm.Value ? base.CreateClientCore(TransformInputClient(inputClient)) : base.CreateClientCore(inputClient);
 
         private InputClient TransformInputClient(InputClient client)
         {
@@ -117,10 +118,29 @@ private InputClient TransformInputClient(InputClient client)
                 // operations_list has been covered in Azure.ResourceManager already, we don't need to generate it in the client
                 if (operation.CrossLanguageDefinitionId != "Azure.ResourceManager.Operations.list")
                 {
-                    operationsToKeep.Add(operation);
+                    // TODO: have a helper method in InputOperation to update the parameters
+                    var transformedOperation = new InputOperation(operation.Name, operation.ResourceName, operation.Summary, operation.Doc, operation.Deprecated, operation.Accessibility, TransformInputOperationParameters(operation), operation.Responses, operation.HttpMethod, operation.RequestBodyMediaType, operation.Uri, operation.Path, operation.ExternalDocsUrl, operation.RequestMediaTypes, operation.BufferResponse, operation.LongRunning, operation.Paging, operation.GenerateProtocolMethod, operation.GenerateConvenienceMethod, operation.CrossLanguageDefinitionId);
+                    operationsToKeep.Add(transformedOperation);
                 }
             }
             return new InputClient(client.Name, client.Summary, client.Doc, operationsToKeep, client.Parameters, client.Parent);
         }
+
+        private IReadOnlyList<InputParameter> TransformInputOperationParameters(InputOperation operation)
+        {
+            var parameters = new List<InputParameter>();
+            foreach (var parameter in operation.Parameters)
+            {
+                if (parameter.NameInRequest.Equals("subscriptionId", StringComparison.OrdinalIgnoreCase))
+                {
+                    parameters.Add(new InputParameter(parameter.Name, parameter.NameInRequest, parameter.Summary, parameter.Doc, InputPrimitiveType.String, parameter.Location, parameter.DefaultValue, InputOperationParameterKind.Method, parameter.IsRequired, parameter.IsApiVersion, parameter.IsResourceParameter, parameter.IsContentType, parameter.IsEndpoint, parameter.SkipUrlEncoding, parameter.Explode, parameter.ArraySerializationDelimiter, parameter.HeaderCollectionPrefix));
+                }
+                else
+                {
+                    parameters.Add(parameter);
+                }
+            }
+            return parameters;
+        }
     }
 }