From 91af14e56d8b9f12d66fc5217e2e13670a21d8e1 Mon Sep 17 00:00:00 2001
From: Wei Hu <live1206@gmail.com>
Date: Tue, 7 Jan 2025 11:33:51 +0800
Subject: [PATCH] Mgmt rest client (#47665)

---
 eng/Packages.Data.props                       |  2 +-
 .../Azure.Generator/src/AzureArmVisitor.cs    | 48 ++++++++++
 .../Azure.Generator/src/AzureClientPlugin.cs  |  4 +
 .../Azure.Generator/src/AzureTypeFactory.cs   | 19 +---
 .../InputClientTransformer.cs                 | 45 +++++++++
 .../src/Generated/Foos.RestClient.cs          | 17 ++--
 .../src/Generated/PrivateLinks.RestClient.cs  |  9 +-
 .../FoosRestOperations.cs}                    | 92 ++++++++++---------
 .../MgmtTypeSpecClientRestOperations.cs}      |  8 +-
 .../PrivateLinksRestOperations.cs}            | 52 +++++------
 10 files changed, 194 insertions(+), 102 deletions(-)
 create mode 100644 eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureArmVisitor.cs
 create mode 100644 eng/packages/http-client-csharp/generator/Azure.Generator/src/InputTransformation/InputClientTransformer.cs
 rename eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/{Foos.cs => RestOperations/FoosRestOperations.cs} (73%)
 rename eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/{MgmtTypeSpecClient.cs => RestOperations/MgmtTypeSpecClientRestOperations.cs} (88%)
 rename eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/{PrivateLinks.cs => RestOperations/PrivateLinksRestOperations.cs} (74%)

diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
index 9bc2e2099c1b..d70605beb3fc 100644
--- a/eng/Packages.Data.props
+++ b/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.1" />
+    <PackageReference Update="Microsoft.Generator.CSharp.ClientModel" Version="1.0.0-alpha.20250106.3" />
   </ItemGroup>
 
   <!--
diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureArmVisitor.cs b/eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureArmVisitor.cs
new file mode 100644
index 000000000000..d82aa7399095
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureArmVisitor.cs
@@ -0,0 +1,48 @@
+// 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: TransfromPublicModifiersToInternal(type), relativeFilePath: TransformRelativeFilePathForClient(type));
+            }
+            // TODO: uncomment this once resources are generated
+            //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 TransfromPublicModifiersToInternal(TypeProvider type)
+        {
+            var modifiers = type.DeclarationModifiers;
+            if (modifiers.HasFlag(TypeSignatureModifiers.Public))
+            {
+                modifiers &= ~TypeSignatureModifiers.Public;
+                modifiers |= TypeSignatureModifiers.Internal;
+            }
+
+            return modifiers;
+        }
+    }
+}
diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureClientPlugin.cs b/eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureClientPlugin.cs
index 2cbc1622bfaa..9bb4ab04b4e0 100644
--- a/eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureClientPlugin.cs
+++ b/eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureClientPlugin.cs
@@ -49,6 +49,10 @@ public override void Configure()
         AddMetadataReference(MetadataReference.CreateFromFile(typeof(Response).Assembly.Location));
         var sharedSourceDirectory = Path.Combine(Path.GetDirectoryName(typeof(AzureClientPlugin).Assembly.Location)!, "Shared", "Core");
         AddSharedSourceDirectory(sharedSourceDirectory);
+        if (IsAzureArm.Value)
+        {
+            AddVisitor(new AzureArmVisitor());
+        }
     }
 
     /// <summary>
diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureTypeFactory.cs b/eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureTypeFactory.cs
index 3a62c4cf4233..32148c186261 100644
--- a/eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureTypeFactory.cs
+++ b/eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureTypeFactory.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using Azure.Generator.InputTransformation;
 using Azure.Generator.Primitives;
 using Azure.Generator.Providers;
 using Azure.Generator.Providers.Abstraction;
@@ -13,7 +14,6 @@
 using Microsoft.Generator.CSharp.Statements;
 using System;
 using System.ClientModel.Primitives;
-using System.Collections.Generic;
 using System.Text.Json;
 
 namespace Azure.Generator
@@ -107,20 +107,7 @@ public override MethodBodyStatement SerializeJsonValue(Type valueType, ValueExpr
         }
 
         /// <inheritdoc/>
-        protected override ClientProvider CreateClientCore(InputClient inputClient) => base.CreateClientCore(TransformInputClient(inputClient));
-
-        private InputClient TransformInputClient(InputClient client)
-        {
-            var operationsToKeep = new List<InputOperation>();
-            foreach (var operation in client.Operations)
-            {
-                // 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);
-                }
-            }
-            return new InputClient(client.Name, client.Summary, client.Doc, operationsToKeep, client.Parameters, client.Parent);
-        }
+        protected override ClientProvider CreateClientCore(InputClient inputClient)
+            => AzureClientPlugin.Instance.IsAzureArm.Value ? base.CreateClientCore(InputClientTransformer.TransformInputClient(inputClient)) : base.CreateClientCore(inputClient);
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/src/InputTransformation/InputClientTransformer.cs b/eng/packages/http-client-csharp/generator/Azure.Generator/src/InputTransformation/InputClientTransformer.cs
new file mode 100644
index 000000000000..359ea5b118fb
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/Azure.Generator/src/InputTransformation/InputClientTransformer.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Microsoft.Generator.CSharp.Input;
+using System;
+using System.Collections.Generic;
+
+namespace Azure.Generator.InputTransformation
+{
+    internal static class InputClientTransformer
+    {
+        public static InputClient TransformInputClient(InputClient client)
+        {
+            var operationsToKeep = new List<InputOperation>();
+            foreach (var operation in client.Operations)
+            {
+                // 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")
+                {
+                    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 static IReadOnlyList<InputParameter> TransformInputOperationParameters(InputOperation operation)
+        {
+            var parameters = new List<InputParameter>();
+            foreach (var parameter in operation.Parameters)
+            {
+                if (parameter.NameInRequest.Equals("subscriptionId", StringComparison.OrdinalIgnoreCase))
+                {
+                    // Always set subscriptionId to method parameter
+                    parameters.Add(new InputParameter(parameter.Name, parameter.NameInRequest, parameter.Summary, parameter.Doc, parameter.Type, 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;
+        }
+    }
+}
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/Foos.RestClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/Foos.RestClient.cs
index b03e593bc423..49adfd91dd97 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/Foos.RestClient.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/Foos.RestClient.cs
@@ -5,6 +5,7 @@
 
 #nullable disable
 
+using System;
 using Azure;
 using Azure.Core;
 
@@ -23,7 +24,7 @@ public partial class Foos
 
         private static ResponseClassifier PipelineMessageClassifier202204 => _pipelineMessageClassifier202204 = new StatusCodeClassifier(stackalloc ushort[] { 202, 204 });
 
-        internal HttpMessage CreateCreateOrUpdateRequest(string resourceGroupName, string fooName, RequestContent content, RequestContext context)
+        internal HttpMessage CreateCreateOrUpdateRequest(Guid subscriptionId, string resourceGroupName, string fooName, RequestContent content, RequestContext context)
         {
             HttpMessage message = Pipeline.CreateMessage(context, PipelineMessageClassifier200201);
             Request request = message.Request;
@@ -31,7 +32,7 @@ internal HttpMessage CreateCreateOrUpdateRequest(string resourceGroupName, strin
             RawRequestUriBuilder uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
             uri.AppendPath("/subscriptions/", false);
-            uri.AppendPath(_subscriptionId.ToString(), true);
+            uri.AppendPath(subscriptionId.ToString(), true);
             uri.AppendPath("/resourceGroups/", false);
             uri.AppendPath(resourceGroupName, true);
             uri.AppendPath("/providers/MgmtTypeSpec/foos/", false);
@@ -44,7 +45,7 @@ internal HttpMessage CreateCreateOrUpdateRequest(string resourceGroupName, strin
             return message;
         }
 
-        internal HttpMessage CreateGetRequest(string resourceGroupName, string fooName, RequestContext context)
+        internal HttpMessage CreateGetRequest(Guid subscriptionId, string resourceGroupName, string fooName, RequestContext context)
         {
             HttpMessage message = Pipeline.CreateMessage(context, PipelineMessageClassifier200);
             Request request = message.Request;
@@ -52,7 +53,7 @@ internal HttpMessage CreateGetRequest(string resourceGroupName, string fooName,
             RawRequestUriBuilder uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
             uri.AppendPath("/subscriptions/", false);
-            uri.AppendPath(_subscriptionId.ToString(), true);
+            uri.AppendPath(subscriptionId.ToString(), true);
             uri.AppendPath("/resourceGroups/", false);
             uri.AppendPath(resourceGroupName, true);
             uri.AppendPath("/providers/MgmtTypeSpec/foos/", false);
@@ -63,7 +64,7 @@ internal HttpMessage CreateGetRequest(string resourceGroupName, string fooName,
             return message;
         }
 
-        internal HttpMessage CreateDeleteRequest(string resourceGroupName, string fooName, RequestContext context)
+        internal HttpMessage CreateDeleteRequest(Guid subscriptionId, string resourceGroupName, string fooName, RequestContext context)
         {
             HttpMessage message = Pipeline.CreateMessage(context, PipelineMessageClassifier202204);
             Request request = message.Request;
@@ -71,7 +72,7 @@ internal HttpMessage CreateDeleteRequest(string resourceGroupName, string fooNam
             RawRequestUriBuilder uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
             uri.AppendPath("/subscriptions/", false);
-            uri.AppendPath(_subscriptionId.ToString(), true);
+            uri.AppendPath(subscriptionId.ToString(), true);
             uri.AppendPath("/resourceGroups/", false);
             uri.AppendPath(resourceGroupName, true);
             uri.AppendPath("/providers/MgmtTypeSpec/foos/", false);
@@ -82,7 +83,7 @@ internal HttpMessage CreateDeleteRequest(string resourceGroupName, string fooNam
             return message;
         }
 
-        internal HttpMessage CreateListRequest(string resourceGroupName, RequestContext context)
+        internal HttpMessage CreateListRequest(Guid subscriptionId, string resourceGroupName, RequestContext context)
         {
             HttpMessage message = Pipeline.CreateMessage(context, PipelineMessageClassifier200);
             Request request = message.Request;
@@ -90,7 +91,7 @@ internal HttpMessage CreateListRequest(string resourceGroupName, RequestContext
             RawRequestUriBuilder uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
             uri.AppendPath("/subscriptions/", false);
-            uri.AppendPath(_subscriptionId.ToString(), true);
+            uri.AppendPath(subscriptionId.ToString(), true);
             uri.AppendPath("/resourceGroups/", false);
             uri.AppendPath(resourceGroupName, true);
             uri.AppendPath("/providers/MgmtTypeSpec/foos", false);
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/PrivateLinks.RestClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/PrivateLinks.RestClient.cs
index f8ee57c7dcac..bc33d6b87f7d 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/PrivateLinks.RestClient.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/PrivateLinks.RestClient.cs
@@ -5,6 +5,7 @@
 
 #nullable disable
 
+using System;
 using Azure;
 using Azure.Core;
 
@@ -20,7 +21,7 @@ public partial class PrivateLinks
 
         private static ResponseClassifier PipelineMessageClassifier200202 => _pipelineMessageClassifier200202 = new StatusCodeClassifier(stackalloc ushort[] { 200, 202 });
 
-        internal HttpMessage CreateGetAllPrivateLinkResourcesRequest(string resourceGroupName, RequestContext context)
+        internal HttpMessage CreateGetAllPrivateLinkResourcesRequest(Guid subscriptionId, string resourceGroupName, RequestContext context)
         {
             HttpMessage message = Pipeline.CreateMessage(context, PipelineMessageClassifier200);
             Request request = message.Request;
@@ -28,7 +29,7 @@ internal HttpMessage CreateGetAllPrivateLinkResourcesRequest(string resourceGrou
             RawRequestUriBuilder uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
             uri.AppendPath("/subscriptions/", false);
-            uri.AppendPath(_subscriptionId.ToString(), true);
+            uri.AppendPath(subscriptionId.ToString(), true);
             uri.AppendPath("/resourceGroups/", false);
             uri.AppendPath(resourceGroupName, true);
             uri.AppendPath("/providers/MgmtTypeSpec/privateLinkResources", false);
@@ -38,7 +39,7 @@ internal HttpMessage CreateGetAllPrivateLinkResourcesRequest(string resourceGrou
             return message;
         }
 
-        internal HttpMessage CreateStartRequest(string resourceGroupName, string privateLinkResourcenName, RequestContent content, RequestContext context)
+        internal HttpMessage CreateStartRequest(Guid subscriptionId, string resourceGroupName, string privateLinkResourcenName, RequestContent content, RequestContext context)
         {
             HttpMessage message = Pipeline.CreateMessage(context, PipelineMessageClassifier200202);
             Request request = message.Request;
@@ -46,7 +47,7 @@ internal HttpMessage CreateStartRequest(string resourceGroupName, string private
             RawRequestUriBuilder uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
             uri.AppendPath("/subscriptions/", false);
-            uri.AppendPath(_subscriptionId.ToString(), true);
+            uri.AppendPath(subscriptionId.ToString(), true);
             uri.AppendPath("/resourceGroups/", false);
             uri.AppendPath(resourceGroupName, true);
             uri.AppendPath("/providers/MgmtTypeSpec/privateLinkResources/", false);
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/Foos.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/RestOperations/FoosRestOperations.cs
similarity index 73%
rename from eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/Foos.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/RestOperations/FoosRestOperations.cs
index 999db12d1a86..c51cf804c414 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/Foos.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/RestOperations/FoosRestOperations.cs
@@ -15,31 +15,23 @@
 
 namespace MgmtTypeSpec
 {
-    /// <summary></summary>
-    public partial class Foos
+    internal partial class Foos
     {
         private readonly Uri _endpoint;
-        /// <summary> A credential used to authenticate to the service. </summary>
-        private readonly TokenCredential _tokenCredential;
-        private static readonly string[] AuthorizationScopes = new string[] { "user_impersonation" };
         private readonly string _apiVersion;
-        private readonly Guid _subscriptionId;
 
         /// <summary> Initializes a new instance of Foos for mocking. </summary>
         protected Foos()
         {
         }
 
-        internal Foos(HttpPipeline pipeline, TokenCredential tokenCredential, Uri endpoint, string apiVersion, Guid subscriptionId)
+        internal Foos(HttpPipeline pipeline, Uri endpoint, string apiVersion)
         {
             _endpoint = endpoint;
             Pipeline = pipeline;
-            _tokenCredential = tokenCredential;
             _apiVersion = apiVersion;
-            _subscriptionId = subscriptionId;
         }
 
-        /// <summary> The HTTP pipeline for sending and receiving REST requests and responses. </summary>
         public HttpPipeline Pipeline { get; }
 
         /// <summary>
@@ -50,6 +42,7 @@ internal Foos(HttpPipeline pipeline, TokenCredential tokenCredential, Uri endpoi
         /// </item>
         /// </list>
         /// </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="fooName"> The name of the Foo. </param>
         /// <param name="content"> The content to send as the body of the request. </param>
@@ -57,13 +50,13 @@ internal Foos(HttpPipeline pipeline, TokenCredential tokenCredential, Uri endpoi
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/>, <paramref name="fooName"/> or <paramref name="content"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual Response CreateOrUpdate(string resourceGroupName, string fooName, RequestContent content, RequestContext context = null)
+        public virtual Response CreateOrUpdate(Guid subscriptionId, string resourceGroupName, string fooName, RequestContent content, RequestContext context = null)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
             Argument.AssertNotNull(fooName, nameof(fooName));
             Argument.AssertNotNull(content, nameof(content));
 
-            using HttpMessage message = CreateCreateOrUpdateRequest(resourceGroupName, fooName, content, context);
+            using HttpMessage message = CreateCreateOrUpdateRequest(subscriptionId, resourceGroupName, fooName, content, context);
             return Pipeline.ProcessMessage(message, context);
         }
 
@@ -75,6 +68,7 @@ public virtual Response CreateOrUpdate(string resourceGroupName, string fooName,
         /// </item>
         /// </list>
         /// </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="fooName"> The name of the Foo. </param>
         /// <param name="content"> The content to send as the body of the request. </param>
@@ -82,47 +76,49 @@ public virtual Response CreateOrUpdate(string resourceGroupName, string fooName,
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/>, <paramref name="fooName"/> or <paramref name="content"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<Response> CreateOrUpdateAsync(string resourceGroupName, string fooName, RequestContent content, RequestContext context = null)
+        public virtual async Task<Response> CreateOrUpdateAsync(Guid subscriptionId, string resourceGroupName, string fooName, RequestContent content, RequestContext context = null)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
             Argument.AssertNotNull(fooName, nameof(fooName));
             Argument.AssertNotNull(content, nameof(content));
 
-            using HttpMessage message = CreateCreateOrUpdateRequest(resourceGroupName, fooName, content, context);
+            using HttpMessage message = CreateCreateOrUpdateRequest(subscriptionId, resourceGroupName, fooName, content, context);
             return await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
         }
 
         /// <summary> Create a Foo. </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="fooName"> The name of the Foo. </param>
         /// <param name="resource"> Resource create parameters. </param>
         /// <param name="cancellationToken"> The cancellation token that can be used to cancel the operation. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/>, <paramref name="fooName"/> or <paramref name="resource"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
-        public virtual Response<Foo> CreateOrUpdate(string resourceGroupName, string fooName, Foo resource, CancellationToken cancellationToken = default)
+        public virtual Response<Foo> CreateOrUpdate(Guid subscriptionId, string resourceGroupName, string fooName, Foo resource, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
             Argument.AssertNotNull(fooName, nameof(fooName));
             Argument.AssertNotNull(resource, nameof(resource));
 
-            Response result = CreateOrUpdate(resourceGroupName, fooName, resource, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null);
+            Response result = CreateOrUpdate(subscriptionId, resourceGroupName, fooName, resource, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null);
             return Response.FromValue((Foo)result, result);
         }
 
         /// <summary> Create a Foo. </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="fooName"> The name of the Foo. </param>
         /// <param name="resource"> Resource create parameters. </param>
         /// <param name="cancellationToken"> The cancellation token that can be used to cancel the operation. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/>, <paramref name="fooName"/> or <paramref name="resource"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
-        public virtual async Task<Response<Foo>> CreateOrUpdateAsync(string resourceGroupName, string fooName, Foo resource, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<Foo>> CreateOrUpdateAsync(Guid subscriptionId, string resourceGroupName, string fooName, Foo resource, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
             Argument.AssertNotNull(fooName, nameof(fooName));
             Argument.AssertNotNull(resource, nameof(resource));
 
-            Response result = await CreateOrUpdateAsync(resourceGroupName, fooName, resource, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null).ConfigureAwait(false);
+            Response result = await CreateOrUpdateAsync(subscriptionId, resourceGroupName, fooName, resource, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null).ConfigureAwait(false);
             return Response.FromValue((Foo)result, result);
         }
 
@@ -134,18 +130,19 @@ public virtual async Task<Response<Foo>> CreateOrUpdateAsync(string resourceGrou
         /// </item>
         /// </list>
         /// </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="fooName"> The name of the Foo. </param>
         /// <param name="context"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/> or <paramref name="fooName"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual Response Get(string resourceGroupName, string fooName, RequestContext context)
+        public virtual Response Get(Guid subscriptionId, string resourceGroupName, string fooName, RequestContext context)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
             Argument.AssertNotNull(fooName, nameof(fooName));
 
-            using HttpMessage message = CreateGetRequest(resourceGroupName, fooName, context);
+            using HttpMessage message = CreateGetRequest(subscriptionId, resourceGroupName, fooName, context);
             return Pipeline.ProcessMessage(message, context);
         }
 
@@ -157,48 +154,51 @@ public virtual Response Get(string resourceGroupName, string fooName, RequestCon
         /// </item>
         /// </list>
         /// </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="fooName"> The name of the Foo. </param>
         /// <param name="context"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/> or <paramref name="fooName"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<Response> GetAsync(string resourceGroupName, string fooName, RequestContext context)
+        public virtual async Task<Response> GetAsync(Guid subscriptionId, string resourceGroupName, string fooName, RequestContext context)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
             Argument.AssertNotNull(fooName, nameof(fooName));
 
-            using HttpMessage message = CreateGetRequest(resourceGroupName, fooName, context);
+            using HttpMessage message = CreateGetRequest(subscriptionId, resourceGroupName, fooName, context);
             return await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
         }
 
         /// <summary> Get a Foo. </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="fooName"> The name of the Foo. </param>
         /// <param name="cancellationToken"> The cancellation token that can be used to cancel the operation. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/> or <paramref name="fooName"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
-        public virtual Response<Foo> Get(string resourceGroupName, string fooName, CancellationToken cancellationToken = default)
+        public virtual Response<Foo> Get(Guid subscriptionId, string resourceGroupName, string fooName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
             Argument.AssertNotNull(fooName, nameof(fooName));
 
-            Response result = Get(resourceGroupName, fooName, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null);
+            Response result = Get(subscriptionId, resourceGroupName, fooName, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null);
             return Response.FromValue((Foo)result, result);
         }
 
         /// <summary> Get a Foo. </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="fooName"> The name of the Foo. </param>
         /// <param name="cancellationToken"> The cancellation token that can be used to cancel the operation. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/> or <paramref name="fooName"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
-        public virtual async Task<Response<Foo>> GetAsync(string resourceGroupName, string fooName, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<Foo>> GetAsync(Guid subscriptionId, string resourceGroupName, string fooName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
             Argument.AssertNotNull(fooName, nameof(fooName));
 
-            Response result = await GetAsync(resourceGroupName, fooName, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null).ConfigureAwait(false);
+            Response result = await GetAsync(subscriptionId, resourceGroupName, fooName, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null).ConfigureAwait(false);
             return Response.FromValue((Foo)result, result);
         }
 
@@ -210,18 +210,19 @@ public virtual async Task<Response<Foo>> GetAsync(string resourceGroupName, stri
         /// </item>
         /// </list>
         /// </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="fooName"> The name of the Foo. </param>
         /// <param name="context"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/> or <paramref name="fooName"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual Response Delete(string resourceGroupName, string fooName, RequestContext context)
+        public virtual Response Delete(Guid subscriptionId, string resourceGroupName, string fooName, RequestContext context)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
             Argument.AssertNotNull(fooName, nameof(fooName));
 
-            using HttpMessage message = CreateDeleteRequest(resourceGroupName, fooName, context);
+            using HttpMessage message = CreateDeleteRequest(subscriptionId, resourceGroupName, fooName, context);
             return Pipeline.ProcessMessage(message, context);
         }
 
@@ -233,47 +234,50 @@ public virtual Response Delete(string resourceGroupName, string fooName, Request
         /// </item>
         /// </list>
         /// </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="fooName"> The name of the Foo. </param>
         /// <param name="context"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/> or <paramref name="fooName"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<Response> DeleteAsync(string resourceGroupName, string fooName, RequestContext context)
+        public virtual async Task<Response> DeleteAsync(Guid subscriptionId, string resourceGroupName, string fooName, RequestContext context)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
             Argument.AssertNotNull(fooName, nameof(fooName));
 
-            using HttpMessage message = CreateDeleteRequest(resourceGroupName, fooName, context);
+            using HttpMessage message = CreateDeleteRequest(subscriptionId, resourceGroupName, fooName, context);
             return await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
         }
 
         /// <summary> Delete a Foo. </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="fooName"> The name of the Foo. </param>
         /// <param name="cancellationToken"> The cancellation token that can be used to cancel the operation. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/> or <paramref name="fooName"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
-        public virtual Response Delete(string resourceGroupName, string fooName, CancellationToken cancellationToken = default)
+        public virtual Response Delete(Guid subscriptionId, string resourceGroupName, string fooName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
             Argument.AssertNotNull(fooName, nameof(fooName));
 
-            return Delete(resourceGroupName, fooName, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null);
+            return Delete(subscriptionId, resourceGroupName, fooName, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null);
         }
 
         /// <summary> Delete a Foo. </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="fooName"> The name of the Foo. </param>
         /// <param name="cancellationToken"> The cancellation token that can be used to cancel the operation. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/> or <paramref name="fooName"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
-        public virtual async Task<Response> DeleteAsync(string resourceGroupName, string fooName, CancellationToken cancellationToken = default)
+        public virtual async Task<Response> DeleteAsync(Guid subscriptionId, string resourceGroupName, string fooName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
             Argument.AssertNotNull(fooName, nameof(fooName));
 
-            return await DeleteAsync(resourceGroupName, fooName, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null).ConfigureAwait(false);
+            return await DeleteAsync(subscriptionId, resourceGroupName, fooName, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -284,16 +288,17 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// </item>
         /// </list>
         /// </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="context"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual Response List(string resourceGroupName, RequestContext context)
+        public virtual Response List(Guid subscriptionId, string resourceGroupName, RequestContext context)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
 
-            using HttpMessage message = CreateListRequest(resourceGroupName, context);
+            using HttpMessage message = CreateListRequest(subscriptionId, resourceGroupName, context);
             return Pipeline.ProcessMessage(message, context);
         }
 
@@ -305,42 +310,45 @@ public virtual Response List(string resourceGroupName, RequestContext context)
         /// </item>
         /// </list>
         /// </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="context"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<Response> ListAsync(string resourceGroupName, RequestContext context)
+        public virtual async Task<Response> ListAsync(Guid subscriptionId, string resourceGroupName, RequestContext context)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
 
-            using HttpMessage message = CreateListRequest(resourceGroupName, context);
+            using HttpMessage message = CreateListRequest(subscriptionId, resourceGroupName, context);
             return await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
         }
 
         /// <summary> List Foo resources by resource group. </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="cancellationToken"> The cancellation token that can be used to cancel the operation. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
-        public virtual Response<FooListResult> List(string resourceGroupName, CancellationToken cancellationToken = default)
+        public virtual Response<FooListResult> List(Guid subscriptionId, string resourceGroupName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
 
-            Response result = List(resourceGroupName, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null);
+            Response result = List(subscriptionId, resourceGroupName, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null);
             return Response.FromValue((FooListResult)result, result);
         }
 
         /// <summary> List Foo resources by resource group. </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="cancellationToken"> The cancellation token that can be used to cancel the operation. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
-        public virtual async Task<Response<FooListResult>> ListAsync(string resourceGroupName, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<FooListResult>> ListAsync(Guid subscriptionId, string resourceGroupName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
 
-            Response result = await ListAsync(resourceGroupName, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null).ConfigureAwait(false);
+            Response result = await ListAsync(subscriptionId, resourceGroupName, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null).ConfigureAwait(false);
             return Response.FromValue((FooListResult)result, result);
         }
     }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/MgmtTypeSpecClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/RestOperations/MgmtTypeSpecClientRestOperations.cs
similarity index 88%
rename from eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/MgmtTypeSpecClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/RestOperations/MgmtTypeSpecClientRestOperations.cs
index 9bdf120aa7d7..c7c461feff51 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/MgmtTypeSpecClient.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/RestOperations/MgmtTypeSpecClientRestOperations.cs
@@ -12,8 +12,7 @@
 
 namespace MgmtTypeSpec
 {
-    /// <summary></summary>
-    public partial class MgmtTypeSpecClient
+    internal partial class MgmtTypeSpecClient
     {
         private readonly Uri _endpoint;
         /// <summary> A credential used to authenticate to the service. </summary>
@@ -51,19 +50,18 @@ public MgmtTypeSpecClient(Uri endpoint, TokenCredential tokenCredential, MgmtTyp
             Pipeline = HttpPipelineBuilder.Build(options, new HttpPipelinePolicy[] { new BearerTokenAuthenticationPolicy(_tokenCredential, AuthorizationScopes) });
         }
 
-        /// <summary> The HTTP pipeline for sending and receiving REST requests and responses. </summary>
         public HttpPipeline Pipeline { get; }
 
         /// <summary> Initializes a new instance of PrivateLinks. </summary>
         public virtual PrivateLinks GetPrivateLinksClient()
         {
-            return Volatile.Read(ref _cachedPrivateLinks) ?? Interlocked.CompareExchange(ref _cachedPrivateLinks, new PrivateLinks(Pipeline, _tokenCredential, _endpoint), null) ?? _cachedPrivateLinks;
+            return Volatile.Read(ref _cachedPrivateLinks) ?? Interlocked.CompareExchange(ref _cachedPrivateLinks, new PrivateLinks(Pipeline, _endpoint), null) ?? _cachedPrivateLinks;
         }
 
         /// <summary> Initializes a new instance of Foos. </summary>
         public virtual Foos GetFoosClient()
         {
-            return Volatile.Read(ref _cachedFoos) ?? Interlocked.CompareExchange(ref _cachedFoos, new Foos(Pipeline, _tokenCredential, _endpoint), null) ?? _cachedFoos;
+            return Volatile.Read(ref _cachedFoos) ?? Interlocked.CompareExchange(ref _cachedFoos, new Foos(Pipeline, _endpoint), null) ?? _cachedFoos;
         }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/PrivateLinks.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/RestOperations/PrivateLinksRestOperations.cs
similarity index 74%
rename from eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/PrivateLinks.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/RestOperations/PrivateLinksRestOperations.cs
index ce7f580da5b5..53f279822f7f 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/PrivateLinks.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/RestOperations/PrivateLinksRestOperations.cs
@@ -15,31 +15,23 @@
 
 namespace MgmtTypeSpec
 {
-    /// <summary></summary>
-    public partial class PrivateLinks
+    internal partial class PrivateLinks
     {
         private readonly Uri _endpoint;
-        /// <summary> A credential used to authenticate to the service. </summary>
-        private readonly TokenCredential _tokenCredential;
-        private static readonly string[] AuthorizationScopes = new string[] { "user_impersonation" };
         private readonly string _apiVersion;
-        private readonly Guid _subscriptionId;
 
         /// <summary> Initializes a new instance of PrivateLinks for mocking. </summary>
         protected PrivateLinks()
         {
         }
 
-        internal PrivateLinks(HttpPipeline pipeline, TokenCredential tokenCredential, Uri endpoint, string apiVersion, Guid subscriptionId)
+        internal PrivateLinks(HttpPipeline pipeline, Uri endpoint, string apiVersion)
         {
             _endpoint = endpoint;
             Pipeline = pipeline;
-            _tokenCredential = tokenCredential;
             _apiVersion = apiVersion;
-            _subscriptionId = subscriptionId;
         }
 
-        /// <summary> The HTTP pipeline for sending and receiving REST requests and responses. </summary>
         public HttpPipeline Pipeline { get; }
 
         /// <summary>
@@ -50,16 +42,17 @@ internal PrivateLinks(HttpPipeline pipeline, TokenCredential tokenCredential, Ur
         /// </item>
         /// </list>
         /// </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="context"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual Response GetAllPrivateLinkResources(string resourceGroupName, RequestContext context)
+        public virtual Response GetAllPrivateLinkResources(Guid subscriptionId, string resourceGroupName, RequestContext context)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
 
-            using HttpMessage message = CreateGetAllPrivateLinkResourcesRequest(resourceGroupName, context);
+            using HttpMessage message = CreateGetAllPrivateLinkResourcesRequest(subscriptionId, resourceGroupName, context);
             return Pipeline.ProcessMessage(message, context);
         }
 
@@ -71,42 +64,45 @@ public virtual Response GetAllPrivateLinkResources(string resourceGroupName, Req
         /// </item>
         /// </list>
         /// </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="context"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<Response> GetAllPrivateLinkResourcesAsync(string resourceGroupName, RequestContext context)
+        public virtual async Task<Response> GetAllPrivateLinkResourcesAsync(Guid subscriptionId, string resourceGroupName, RequestContext context)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
 
-            using HttpMessage message = CreateGetAllPrivateLinkResourcesRequest(resourceGroupName, context);
+            using HttpMessage message = CreateGetAllPrivateLinkResourcesRequest(subscriptionId, resourceGroupName, context);
             return await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
         }
 
         /// <summary> list private links on the given resource. </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="cancellationToken"> The cancellation token that can be used to cancel the operation. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
-        public virtual Response<PrivateLinkResourceListResult> GetAllPrivateLinkResources(string resourceGroupName, CancellationToken cancellationToken = default)
+        public virtual Response<PrivateLinkResourceListResult> GetAllPrivateLinkResources(Guid subscriptionId, string resourceGroupName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
 
-            Response result = GetAllPrivateLinkResources(resourceGroupName, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null);
+            Response result = GetAllPrivateLinkResources(subscriptionId, resourceGroupName, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null);
             return Response.FromValue((PrivateLinkResourceListResult)result, result);
         }
 
         /// <summary> list private links on the given resource. </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="cancellationToken"> The cancellation token that can be used to cancel the operation. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
-        public virtual async Task<Response<PrivateLinkResourceListResult>> GetAllPrivateLinkResourcesAsync(string resourceGroupName, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<PrivateLinkResourceListResult>> GetAllPrivateLinkResourcesAsync(Guid subscriptionId, string resourceGroupName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
 
-            Response result = await GetAllPrivateLinkResourcesAsync(resourceGroupName, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null).ConfigureAwait(false);
+            Response result = await GetAllPrivateLinkResourcesAsync(subscriptionId, resourceGroupName, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null).ConfigureAwait(false);
             return Response.FromValue((PrivateLinkResourceListResult)result, result);
         }
 
@@ -118,6 +114,7 @@ public virtual async Task<Response<PrivateLinkResourceListResult>> GetAllPrivate
         /// </item>
         /// </list>
         /// </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="privateLinkResourcenName"> The name of the private link associated with the Azure resource. </param>
         /// <param name="content"> The content to send as the body of the request. </param>
@@ -125,12 +122,12 @@ public virtual async Task<Response<PrivateLinkResourceListResult>> GetAllPrivate
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/> or <paramref name="privateLinkResourcenName"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual Response Start(string resourceGroupName, string privateLinkResourcenName, RequestContent content, RequestContext context = null)
+        public virtual Response Start(Guid subscriptionId, string resourceGroupName, string privateLinkResourcenName, RequestContent content, RequestContext context = null)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
             Argument.AssertNotNull(privateLinkResourcenName, nameof(privateLinkResourcenName));
 
-            using HttpMessage message = CreateStartRequest(resourceGroupName, privateLinkResourcenName, content, context);
+            using HttpMessage message = CreateStartRequest(subscriptionId, resourceGroupName, privateLinkResourcenName, content, context);
             return Pipeline.ProcessMessage(message, context);
         }
 
@@ -142,6 +139,7 @@ public virtual Response Start(string resourceGroupName, string privateLinkResour
         /// </item>
         /// </list>
         /// </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="privateLinkResourcenName"> The name of the private link associated with the Azure resource. </param>
         /// <param name="content"> The content to send as the body of the request. </param>
@@ -149,43 +147,45 @@ public virtual Response Start(string resourceGroupName, string privateLinkResour
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/> or <paramref name="privateLinkResourcenName"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<Response> StartAsync(string resourceGroupName, string privateLinkResourcenName, RequestContent content, RequestContext context = null)
+        public virtual async Task<Response> StartAsync(Guid subscriptionId, string resourceGroupName, string privateLinkResourcenName, RequestContent content, RequestContext context = null)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
             Argument.AssertNotNull(privateLinkResourcenName, nameof(privateLinkResourcenName));
 
-            using HttpMessage message = CreateStartRequest(resourceGroupName, privateLinkResourcenName, content, context);
+            using HttpMessage message = CreateStartRequest(subscriptionId, resourceGroupName, privateLinkResourcenName, content, context);
             return await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
         }
 
         /// <summary> Starts the SAP Application Server Instance. </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="privateLinkResourcenName"> The name of the private link associated with the Azure resource. </param>
         /// <param name="body"> SAP Application server instance start request body. </param>
         /// <param name="cancellationToken"> The cancellation token that can be used to cancel the operation. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/> or <paramref name="privateLinkResourcenName"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
-        public virtual Response Start(string resourceGroupName, string privateLinkResourcenName, StartRequest body = null, CancellationToken cancellationToken = default)
+        public virtual Response Start(Guid subscriptionId, string resourceGroupName, string privateLinkResourcenName, StartRequest body = null, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
             Argument.AssertNotNull(privateLinkResourcenName, nameof(privateLinkResourcenName));
 
-            return Start(resourceGroupName, privateLinkResourcenName, body, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null);
+            return Start(subscriptionId, resourceGroupName, privateLinkResourcenName, body, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null);
         }
 
         /// <summary> Starts the SAP Application Server Instance. </summary>
+        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
         /// <param name="resourceGroupName"> The name of the resource group. The name is case insensitive. </param>
         /// <param name="privateLinkResourcenName"> The name of the private link associated with the Azure resource. </param>
         /// <param name="body"> SAP Application server instance start request body. </param>
         /// <param name="cancellationToken"> The cancellation token that can be used to cancel the operation. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupName"/> or <paramref name="privateLinkResourcenName"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
-        public virtual async Task<Response> StartAsync(string resourceGroupName, string privateLinkResourcenName, StartRequest body = null, CancellationToken cancellationToken = default)
+        public virtual async Task<Response> StartAsync(Guid subscriptionId, string resourceGroupName, string privateLinkResourcenName, StartRequest body = null, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(resourceGroupName, nameof(resourceGroupName));
             Argument.AssertNotNull(privateLinkResourcenName, nameof(privateLinkResourcenName));
 
-            return await StartAsync(resourceGroupName, privateLinkResourcenName, body, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null).ConfigureAwait(false);
+            return await StartAsync(subscriptionId, resourceGroupName, privateLinkResourcenName, body, cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null).ConfigureAwait(false);
         }
     }
 }