Added privatelink support to keyvault, storage, and monitor (#11525)

dingmeng-xue · web-flow · commit ab6e76dbefe4 · 2020-04-09T15:03:10.000+08:00
* Add storage endpoint

* add storage

* Add private endpoint connection support to keyvault, storage and monitor

* Add private endpoint connection support to keyvault, storage and monitor

* Revise according to review

* Revise according to review
diff --git a/src/Network/Network.Test/ScenarioTests/PrivateLinkServiceTests.cs b/src/Network/Network.Test/ScenarioTests/PrivateLinkServiceTests.cs
@@ -40,5 +40,13 @@ public void TestPrivateEndpointConnectionCRUD()
         {
             TestRunner.RunTestScript("Test-PrivateEndpointConnectionCRUD");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.Owner, NrpTeamAlias.sdnnrp)]
+        public void TestStoragePrivateEndpoint()
+        {
+            TestRunner.RunTestScript("Test-StoragePrivateEndpoint");
+        }
     }
 }
diff --git a/src/Network/Network.Test/ScenarioTests/PrivateLinkServiceTests.ps1 b/src/Network/Network.Test/ScenarioTests/PrivateLinkServiceTests.ps1
@@ -205,3 +205,58 @@ function Test-PrivateEndpointConnectionCRUD
         Clean-ResourceGroup $rgname;
     }
 }
+
+<#
+.SYNOPSIS
+Test operation for StoragePrivateEndpoint.
+#>
+function Test-StoragePrivateEndpoint
+{
+    # Setup
+    $rgname = Get-ResourceGroupName;
+    $location = Get-ProviderLocation "Microsoft.Network/privateLinkServices" "eastus";
+    $peName = "mype";
+    $storageAccount = "xdmsa2";
+    $subId = getSubscription
+
+    try
+    {
+        $resourceGroup = New-AzResourceGroup -Name $rgname -Location $location;
+        New-AzStorageAccount -ResourceGroupName $rgname -AccountName $storageAccount -Location $location -SkuName Standard_GRS
+
+        $resourceId = "/subscriptions/$subId/resourceGroups/$rgname/providers/Microsoft.Storage/storageAccounts/$storageAccount";
+
+        $peSubnet = New-AzVirtualNetworkSubnetConfig -Name peSubnet -AddressPrefix "11.0.1.0/24" -PrivateEndpointNetworkPolicies "Disabled"
+        $vnetPE = New-AzVirtualNetwork -Name "vnetPE" -ResourceGroupName $rgname -Location $location -AddressPrefix "11.0.0.0/16" -Subnet $peSubnet
+        
+        $plsConnection= New-AzPrivateLinkServiceConnection -Name plsConnection -PrivateLinkServiceId  $resourceId -GroupId 'blob'
+        $privateEndpoint = New-AzPrivateEndpoint -ResourceGroupName $rgname -Name $peName -Location $location -Subnet $vnetPE.subnets[0] -PrivateLinkServiceConnection $plsConnection -ByManualRequest
+
+        $pecGet = Get-AzPrivateEndpointConnection -PrivateLinkResourceId $resourceId
+        Assert-NotNull $pecGet;
+        Assert-AreEqual "Pending" $pecGet.PrivateLinkServiceConnectionState.Status
+
+        # Approve Private Endpoint Connection
+        $pecApprove = Approve-AzPrivateEndpointConnection -ResourceId $pecGet.Id
+        Assert-NotNull $pecApprove;
+        Assert-AreEqual "Approved" $pecApprove.PrivateLinkServiceConnectionState.Status
+
+        Start-TestSleep 20000
+
+        # Remove Private Endpoint Connection
+        $pecRemove = Remove-AzPrivateEndpointConnection -ResourceId $pecGet.Id -PassThru -Force
+        Assert-AreEqual true $pecRemove
+
+        Start-TestSleep 15000
+
+        # Get Private Endpoint Connection again
+        $pecGet2 = Get-AzPrivateEndpointConnection -PrivateLinkResourceId $resourceId
+        Assert-Null($pecGet2)
+
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname;
+    }
+}
diff --git a/src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.PrivateLinkServiceTests/TestStoragePrivateEndpoint.json b/src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.PrivateLinkServiceTests/TestStoragePrivateEndpoint.json
diff --git a/src/Network/Network/PrivateLinkService/Models/TrackedResource.cs b/src/Network/Network/PrivateLinkService/Models/TrackedResource.cs
@@ -0,0 +1,28 @@
+﻿using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Microsoft.Azure.Commands.Network.PrivateLinkService.Models
+{
+    [Rest.Serialization.JsonTransformation]
+    public partial class TrackedResource : ProxyResource
+    {
+
+        public TrackedResource()
+        {
+            CustomInit();
+        }
+
+        public TrackedResource(string id = default(string), string name = default(string), string type = default(string), IList<PrivateEndpointConnection> privateEndpointConnections = default(IList<PrivateEndpointConnection>))
+            : base(id, name, type)
+        {
+            PrivateEndpointConnections = privateEndpointConnections;
+            CustomInit();
+        }
+
+        partial void CustomInit();
+
+        [JsonProperty(PropertyName = "properties.privateEndpointConnections")]
+        public IList<PrivateEndpointConnection> PrivateEndpointConnections { get; private set; }
+
+    }
+}
diff --git a/src/Network/Network/PrivateLinkService/PrivateLinkServiceProvider/GenericProvider.cs b/src/Network/Network/PrivateLinkService/PrivateLinkServiceProvider/GenericProvider.cs
@@ -24,32 +24,26 @@ namespace Microsoft.Azure.Commands.Network.PrivateLinkService.PrivateLinkService
 {
     internal class GenericProvider : IPrivateLinkProvider
     {
-
-        private static IDictionary<string, string> _apiVersions = new Dictionary<string, string>{
-            {"microsoft.sql/servers", "2018-06-01-preview"}
-        };
-
         #region Constructor
         public GenericProvider(NetworkBaseCmdlet baseCmdlet, string subscription, string privateLinkResourceType)
         {
             this.BaseCmdlet = baseCmdlet;
             this._subscription = subscription;
-            this._privateLinkResourceType = privateLinkResourceType;
-            this._apiVersion = _apiVersions[privateLinkResourceType?.ToLower()];
+            this._configuration = ProviderConfiguration.GetProviderConfiguration(privateLinkResourceType);
         }
         #endregion
 
         #region Interface Implementation
 
         public static bool SupportsPrivateLinkResourceType(string privateLinkResourceType)
         {
-            return _apiVersions.ContainsKey(privateLinkResourceType?.ToLower());
+            ProviderConfiguration configuration = ProviderConfiguration.GetProviderConfiguration(privateLinkResourceType);
+            return (configuration != null);
         }
 
         public NetworkBaseCmdlet BaseCmdlet { get; set; }
         private string _subscription;
-        private string _privateLinkResourceType;
-        private string _apiVersion;
+        private ProviderConfiguration _configuration;
 
         private IAzureRestClient _client;
         private IAzureRestClient ServiceClient
@@ -70,36 +64,53 @@ private IAzureRestClient ServiceClient
         public PSPrivateEndpointConnection GetPrivateEndpointConnection(string resourceGroupName, string serviceName, string name)
         {
             string url = BuildPrivateEndpointConnectionURL(resourceGroupName, serviceName, name);
-            PrivateEndpointConnection connnection = ServiceClient.Operations.GetResouce<PrivateEndpointConnection>(url, _apiVersion);
+            PrivateEndpointConnection connnection = ServiceClient.Operations.GetResouce<PrivateEndpointConnection>(url, _configuration.ApiVersion);
             return ToPsPrivateEndpointConnection(connnection);
         }
 
         public List<PSPrivateEndpointConnection> ListPrivateEndpointConnections(string resourceGroupName, string serviceName)
         {
             var psPECs = new List<PSPrivateEndpointConnection>();
-            string url = BuildPrivateEndpointConnectionsURL(resourceGroupName, serviceName);
-            IPage<PrivateEndpointConnection> list = ServiceClient.Operations.GetResoucePage<Page<PrivateEndpointConnection>, PrivateEndpointConnection>(url, _apiVersion);
-            foreach (var pec in list)
-            {
-                var psPec = ToPsPrivateEndpointConnection(pec);
-                psPECs.Add(psPec);
-            }
-            while (list.NextPageLink != null)
+            if(_configuration.HasConnectionsURI)
             {
-                list = ServiceClient.Operations.GetResoucePage<Page<PrivateEndpointConnection>, PrivateEndpointConnection>(list.NextPageLink, null);
+                string url = BuildPrivateEndpointConnectionsURL(resourceGroupName, serviceName);
+                IPage<PrivateEndpointConnection> list = ServiceClient.Operations.GetResoucePage<Page<PrivateEndpointConnection>, PrivateEndpointConnection>(url, _configuration.ApiVersion);
                 foreach (var pec in list)
                 {
                     var psPec = ToPsPrivateEndpointConnection(pec);
                     psPECs.Add(psPec);
                 }
+                while (list.NextPageLink != null)
+                {
+                    list = ServiceClient.Operations.GetResoucePage<Page<PrivateEndpointConnection>, PrivateEndpointConnection>(list.NextPageLink, null);
+                    foreach (var pec in list)
+                    {
+                        var psPec = ToPsPrivateEndpointConnection(pec);
+                        psPECs.Add(psPec);
+                    }
+                }
+            } 
+            else
+            {
+                string url = BuildPrivateEndpointConnectionsOwnerURL(resourceGroupName, serviceName);
+                TrackedResource resource = ServiceClient.Operations.GetResouce<TrackedResource>(url, _configuration.ApiVersion);
+                if(resource?.PrivateEndpointConnections != null)
+                {
+                    foreach (var pec in resource.PrivateEndpointConnections)
+                    {
+                        var psPec = ToPsPrivateEndpointConnection(pec);
+                        psPECs.Add(psPec);
+                    }
+                }
             }
+
             return psPECs;
         }
 
         public PSPrivateEndpointConnection UpdatePrivateEndpointConnectionStatus(string resourceGroupName, string serviceName, string name, string status, string description = null)
         {
             string url = BuildPrivateEndpointConnectionURL(resourceGroupName, serviceName, name);
-            PrivateEndpointConnection privateEndpointConnection = ServiceClient.Operations.GetResouce<PrivateEndpointConnection>(url, _apiVersion);
+            PrivateEndpointConnection privateEndpointConnection = ServiceClient.Operations.GetResouce<PrivateEndpointConnection>(url, _configuration.ApiVersion);
 
             privateEndpointConnection.PrivateLinkServiceConnectionState.Status = status;
 
@@ -108,29 +119,29 @@ public PSPrivateEndpointConnection UpdatePrivateEndpointConnectionStatus(string
                 privateEndpointConnection.PrivateLinkServiceConnectionState.Description = description;
             }
 
-            ServiceClient.Operations.PutResouce<PrivateEndpointConnection>(url, _apiVersion, privateEndpointConnection);
+            ServiceClient.Operations.PutResouce<PrivateEndpointConnection>(url, _configuration.ApiVersion, privateEndpointConnection);
 
             return GetPrivateEndpointConnection(resourceGroupName, serviceName, name);
         }
 
         public void DeletePrivateEndpointConnection(string resourceGroupName, string serviceName, string name)
         {
             string url = BuildPrivateEndpointConnectionURL(resourceGroupName, serviceName, name);
-            ServiceClient.Operations.DeleteResouce(url, _apiVersion);
+            ServiceClient.Operations.DeleteResouce(url, _configuration.ApiVersion);
         }
 
         public PSPrivateLinkResource GetPrivateLinkResource(string resourceGroupName, string serviceName, string name)
         {
             string url = BuildPrivateLinkResourceURL(resourceGroupName, serviceName, name);
-            PrivateLinkResource resource = ServiceClient.Operations.GetResouce<PrivateLinkResource>(url, _apiVersion);
+            PrivateLinkResource resource = ServiceClient.Operations.GetResouce<PrivateLinkResource>(url, _configuration.ApiVersion);
             return ToPsPrivateLinkResource(resource);
         }
 
         public List<PSPrivateLinkResource> ListPrivateLinkResource(string resourceGroupName, string serviceName)
         {
             var psPLRs = new List<PSPrivateLinkResource>();
             string url = BuildPrivateLinkResourcesURL(resourceGroupName, serviceName);
-            IPage<PrivateLinkResource> list = ServiceClient.Operations.GetResoucePage<Page<PrivateLinkResource>, PrivateLinkResource>(url, _apiVersion);
+            IPage<PrivateLinkResource> list = ServiceClient.Operations.GetResoucePage<Page<PrivateLinkResource>, PrivateLinkResource>(url, _configuration.ApiVersion);
             foreach (var plr in list)
             {
                 var psPlr = ToPsPrivateLinkResource(plr);
@@ -156,31 +167,37 @@ public List<PSPrivateLinkResource> ListPrivateLinkResource(string resourceGroupN
         /// </summary>
         private string BuildPrivateLinkResourcesURL(string resourceGroupName, string serviceName)
         {
-            return $"/subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_privateLinkResourceType}/{serviceName}/privateLinkResources";
+            return $"/subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_configuration.Type}/{serviceName}/privateLinkResources";
         }
 
         /// <summary>
         /// /subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_privateLinkResourceType}/{serviceName}/privateLinkResources/{name}
         /// </summary>
         private string BuildPrivateLinkResourceURL(string resourceGroupName, string serviceName, string name)
         {
-            return $"/subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_privateLinkResourceType}/{serviceName}/privateLinkResources/{name}";
+            return $"/subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_configuration.Type}/{serviceName}/privateLinkResources/{name}";
         }
 
         /// <summary>
         /// /subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_privateLinkResourceType}/{serviceName}/privateEndpointConnections
         /// </summary>
         private string BuildPrivateEndpointConnectionsURL(string resourceGroupName, string serviceName)
         {
-            return $"/subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_privateLinkResourceType}/{serviceName}/privateEndpointConnections";
+            return $"/subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_configuration.Type}/{serviceName}/privateEndpointConnections";
         }
 
+        private string BuildPrivateEndpointConnectionsOwnerURL(string resourceGroupName, string serviceName)
+        {
+            return $"/subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_configuration.Type}/{serviceName}";
+        }
+
+
         /// <summary>
         /// /subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_privateLinkResourceType}/{serviceName}/privateEndpointConnections/{name}
         /// </summary>
         private string BuildPrivateEndpointConnectionURL(string resourceGroupName, string serviceName, string name)
         {
-            return $"/subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_privateLinkResourceType}/{serviceName}/privateEndpointConnections/{name}";
+            return $"/subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_configuration.Type}/{serviceName}/privateEndpointConnections/{name}";
         }
 
         private PSPrivateEndpointConnection ToPsPrivateEndpointConnection(PrivateEndpointConnection privateEndpointConnection)
diff --git a/src/Network/Network/PrivateLinkService/PrivateLinkServiceProvider/ProviderConfiguration.cs b/src/Network/Network/PrivateLinkService/PrivateLinkServiceProvider/ProviderConfiguration.cs
@@ -0,0 +1,38 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.Azure.Commands.Network.PrivateLinkService.PrivateLinkServiceProvider
+{
+    internal class ProviderConfiguration
+    {
+
+        private static IDictionary<string, ProviderConfiguration> _configurations = new Dictionary<string, ProviderConfiguration>();
+
+        static ProviderConfiguration()
+        {
+            RegisterConfiguration("Microsoft.Sql/servers", "2018-06-01-preview");
+            RegisterConfiguration("Microsoft.Insights/privateLinkScopes", "2019-10-17-preview");
+            RegisterConfiguration("Microsoft.Storage/storageAccounts", "2019-06-01", false);
+            RegisterConfiguration("Microsoft.KeyVault/vaults", "2019-09-01", false);
+        }
+
+        private static void RegisterConfiguration(string type, string apiVersion, bool hasConnectionsURI = true)
+        {
+            ProviderConfiguration configuration = new ProviderConfiguration();
+            configuration.Type = type;
+            configuration.ApiVersion = apiVersion;
+            configuration.HasConnectionsURI = hasConnectionsURI;
+            _configurations.Add(type.ToLower(), configuration);
+        }
+
+        public string Type { get; set; }
+        public string ApiVersion { get; set; }
+        public bool HasConnectionsURI { get; set; }
+
+        public static ProviderConfiguration GetProviderConfiguration(string type)
+        {
+            return _configurations[type?.ToLower()];
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -40,5 +40,13 @@ public void TestPrivateEndpointConnectionCRUD()`
`40`	`40`	`{`
`41`	`41`	`TestRunner.RunTestScript("Test-PrivateEndpointConnectionCRUD");`
`42`	`42`	`}`
	`43`	`+`
	`44`	`+ [Fact]`
	`45`	`+ [Trait(Category.AcceptanceType, Category.CheckIn)]`
	`46`	`+ [Trait(Category.Owner, NrpTeamAlias.sdnnrp)]`
	`47`	`+ public void TestStoragePrivateEndpoint()`
	`48`	`+ {`
	`49`	`+ TestRunner.RunTestScript("Test-StoragePrivateEndpoint");`
	`50`	`+ }`
`43`	`51`	`}`
`44`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,32 +24,26 @@ namespace Microsoft.Azure.Commands.Network.PrivateLinkService.PrivateLinkService`
`24`	`24`	`{`
`25`	`25`	`internal class GenericProvider : IPrivateLinkProvider`
`26`	`26`	`{`
`27`		`-`
`28`		`- private static IDictionary<string, string> _apiVersions = new Dictionary<string, string>{`
`29`		`- {"microsoft.sql/servers", "2018-06-01-preview"}`
`30`		`- };`
`31`		`-`
`32`	`27`	`#region Constructor`
`33`	`28`	`public GenericProvider(NetworkBaseCmdlet baseCmdlet, string subscription, string privateLinkResourceType)`
`34`	`29`	`{`
`35`	`30`	`this.BaseCmdlet = baseCmdlet;`
`36`	`31`	`this._subscription = subscription;`
`37`		`- this._privateLinkResourceType = privateLinkResourceType;`
`38`		`- this._apiVersion = _apiVersions[privateLinkResourceType?.ToLower()];`
	`32`	`+ this._configuration = ProviderConfiguration.GetProviderConfiguration(privateLinkResourceType);`
`39`	`33`	`}`
`40`	`34`	`#endregion`
`41`	`35`
`42`	`36`	`#region Interface Implementation`
`43`	`37`
`44`	`38`	`public static bool SupportsPrivateLinkResourceType(string privateLinkResourceType)`
`45`	`39`	`{`
`46`		`- return _apiVersions.ContainsKey(privateLinkResourceType?.ToLower());`
	`40`	`+ ProviderConfiguration configuration = ProviderConfiguration.GetProviderConfiguration(privateLinkResourceType);`
	`41`	`+ return (configuration != null);`
`47`	`42`	`}`
`48`	`43`
`49`	`44`	`public NetworkBaseCmdlet BaseCmdlet { get; set; }`
`50`	`45`	`private string _subscription;`
`51`		`- private string _privateLinkResourceType;`
`52`		`- private string _apiVersion;`
	`46`	`+ private ProviderConfiguration _configuration;`
`53`	`47`
`54`	`48`	`private IAzureRestClient _client;`
`55`	`49`	`private IAzureRestClient ServiceClient`
`@@ -70,36 +64,53 @@ private IAzureRestClient ServiceClient`
`70`	`64`	`public PSPrivateEndpointConnection GetPrivateEndpointConnection(string resourceGroupName, string serviceName, string name)`
`71`	`65`	`{`
`72`	`66`	`string url = BuildPrivateEndpointConnectionURL(resourceGroupName, serviceName, name);`
`73`		`- PrivateEndpointConnection connnection = ServiceClient.Operations.GetResouce<PrivateEndpointConnection>(url, _apiVersion);`
	`67`	`+ PrivateEndpointConnection connnection = ServiceClient.Operations.GetResouce<PrivateEndpointConnection>(url, _configuration.ApiVersion);`
`74`	`68`	`return ToPsPrivateEndpointConnection(connnection);`
`75`	`69`	`}`
`76`	`70`
`77`	`71`	`public List<PSPrivateEndpointConnection> ListPrivateEndpointConnections(string resourceGroupName, string serviceName)`
`78`	`72`	`{`
`79`	`73`	`var psPECs = new List<PSPrivateEndpointConnection>();`
`80`		`- string url = BuildPrivateEndpointConnectionsURL(resourceGroupName, serviceName);`
`81`		`- IPage<PrivateEndpointConnection> list = ServiceClient.Operations.GetResoucePage<Page<PrivateEndpointConnection>, PrivateEndpointConnection>(url, _apiVersion);`
`82`		`- foreach (var pec in list)`
`83`		`- {`
`84`		`- var psPec = ToPsPrivateEndpointConnection(pec);`
`85`		`- psPECs.Add(psPec);`
`86`		`- }`
`87`		`- while (list.NextPageLink != null)`
	`74`	`+ if(_configuration.HasConnectionsURI)`
`88`	`75`	`{`
`89`		`- list = ServiceClient.Operations.GetResoucePage<Page<PrivateEndpointConnection>, PrivateEndpointConnection>(list.NextPageLink, null);`
	`76`	`+ string url = BuildPrivateEndpointConnectionsURL(resourceGroupName, serviceName);`
	`77`	`+ IPage<PrivateEndpointConnection> list = ServiceClient.Operations.GetResoucePage<Page<PrivateEndpointConnection>, PrivateEndpointConnection>(url, _configuration.ApiVersion);`
`90`	`78`	`foreach (var pec in list)`
`91`	`79`	`{`
`92`	`80`	`var psPec = ToPsPrivateEndpointConnection(pec);`
`93`	`81`	`psPECs.Add(psPec);`
`94`	`82`	`}`
	`83`	`+ while (list.NextPageLink != null)`
	`84`	`+ {`
	`85`	`+ list = ServiceClient.Operations.GetResoucePage<Page<PrivateEndpointConnection>, PrivateEndpointConnection>(list.NextPageLink, null);`
	`86`	`+ foreach (var pec in list)`
	`87`	`+ {`
	`88`	`+ var psPec = ToPsPrivateEndpointConnection(pec);`
	`89`	`+ psPECs.Add(psPec);`
	`90`	`+ }`
	`91`	`+ }`
	`92`	`+ }`
	`93`	`+ else`
	`94`	`+ {`
	`95`	`+ string url = BuildPrivateEndpointConnectionsOwnerURL(resourceGroupName, serviceName);`
	`96`	`+ TrackedResource resource = ServiceClient.Operations.GetResouce<TrackedResource>(url, _configuration.ApiVersion);`
	`97`	`+ if(resource?.PrivateEndpointConnections != null)`
	`98`	`+ {`
	`99`	`+ foreach (var pec in resource.PrivateEndpointConnections)`
	`100`	`+ {`
	`101`	`+ var psPec = ToPsPrivateEndpointConnection(pec);`
	`102`	`+ psPECs.Add(psPec);`
	`103`	`+ }`
	`104`	`+ }`
`95`	`105`	`}`
	`106`	`+`
`96`	`107`	`return psPECs;`
`97`	`108`	`}`
`98`	`109`
`99`	`110`	`public PSPrivateEndpointConnection UpdatePrivateEndpointConnectionStatus(string resourceGroupName, string serviceName, string name, string status, string description = null)`
`100`	`111`	`{`
`101`	`112`	`string url = BuildPrivateEndpointConnectionURL(resourceGroupName, serviceName, name);`
`102`		`- PrivateEndpointConnection privateEndpointConnection = ServiceClient.Operations.GetResouce<PrivateEndpointConnection>(url, _apiVersion);`
	`113`	`+ PrivateEndpointConnection privateEndpointConnection = ServiceClient.Operations.GetResouce<PrivateEndpointConnection>(url, _configuration.ApiVersion);`
`103`	`114`
`104`	`115`	`privateEndpointConnection.PrivateLinkServiceConnectionState.Status = status;`
`105`	`116`
`@@ -108,29 +119,29 @@ public PSPrivateEndpointConnection UpdatePrivateEndpointConnectionStatus(string`
`108`	`119`	`privateEndpointConnection.PrivateLinkServiceConnectionState.Description = description;`
`109`	`120`	`}`
`110`	`121`
`111`		`- ServiceClient.Operations.PutResouce<PrivateEndpointConnection>(url, _apiVersion, privateEndpointConnection);`
	`122`	`+ ServiceClient.Operations.PutResouce<PrivateEndpointConnection>(url, _configuration.ApiVersion, privateEndpointConnection);`
`112`	`123`
`113`	`124`	`return GetPrivateEndpointConnection(resourceGroupName, serviceName, name);`
`114`	`125`	`}`
`115`	`126`
`116`	`127`	`public void DeletePrivateEndpointConnection(string resourceGroupName, string serviceName, string name)`
`117`	`128`	`{`
`118`	`129`	`string url = BuildPrivateEndpointConnectionURL(resourceGroupName, serviceName, name);`
`119`		`- ServiceClient.Operations.DeleteResouce(url, _apiVersion);`
	`130`	`+ ServiceClient.Operations.DeleteResouce(url, _configuration.ApiVersion);`
`120`	`131`	`}`
`121`	`132`
`122`	`133`	`public PSPrivateLinkResource GetPrivateLinkResource(string resourceGroupName, string serviceName, string name)`
`123`	`134`	`{`
`124`	`135`	`string url = BuildPrivateLinkResourceURL(resourceGroupName, serviceName, name);`
`125`		`- PrivateLinkResource resource = ServiceClient.Operations.GetResouce<PrivateLinkResource>(url, _apiVersion);`
	`136`	`+ PrivateLinkResource resource = ServiceClient.Operations.GetResouce<PrivateLinkResource>(url, _configuration.ApiVersion);`
`126`	`137`	`return ToPsPrivateLinkResource(resource);`
`127`	`138`	`}`
`128`	`139`
`129`	`140`	`public List<PSPrivateLinkResource> ListPrivateLinkResource(string resourceGroupName, string serviceName)`
`130`	`141`	`{`
`131`	`142`	`var psPLRs = new List<PSPrivateLinkResource>();`
`132`	`143`	`string url = BuildPrivateLinkResourcesURL(resourceGroupName, serviceName);`
`133`		`- IPage<PrivateLinkResource> list = ServiceClient.Operations.GetResoucePage<Page<PrivateLinkResource>, PrivateLinkResource>(url, _apiVersion);`
	`144`	`+ IPage<PrivateLinkResource> list = ServiceClient.Operations.GetResoucePage<Page<PrivateLinkResource>, PrivateLinkResource>(url, _configuration.ApiVersion);`
`134`	`145`	`foreach (var plr in list)`
`135`	`146`	`{`
`136`	`147`	`var psPlr = ToPsPrivateLinkResource(plr);`
`@@ -156,31 +167,37 @@ public List<PSPrivateLinkResource> ListPrivateLinkResource(string resourceGroupN`
`156`	`167`	`/// </summary>`
`157`	`168`	`private string BuildPrivateLinkResourcesURL(string resourceGroupName, string serviceName)`
`158`	`169`	`{`
`159`		`- return $"/subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_privateLinkResourceType}/{serviceName}/privateLinkResources";`
	`170`	`+ return $"/subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_configuration.Type}/{serviceName}/privateLinkResources";`
`160`	`171`	`}`
`161`	`172`
`162`	`173`	`/// <summary>`
`163`	`174`	`/// /subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_privateLinkResourceType}/{serviceName}/privateLinkResources/{name}`
`164`	`175`	`/// </summary>`
`165`	`176`	`private string BuildPrivateLinkResourceURL(string resourceGroupName, string serviceName, string name)`
`166`	`177`	`{`
`167`		`- return $"/subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_privateLinkResourceType}/{serviceName}/privateLinkResources/{name}";`
	`178`	`+ return $"/subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_configuration.Type}/{serviceName}/privateLinkResources/{name}";`
`168`	`179`	`}`
`169`	`180`
`170`	`181`	`/// <summary>`
`171`	`182`	`/// /subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_privateLinkResourceType}/{serviceName}/privateEndpointConnections`
`172`	`183`	`/// </summary>`
`173`	`184`	`private string BuildPrivateEndpointConnectionsURL(string resourceGroupName, string serviceName)`
`174`	`185`	`{`
`175`		`- return $"/subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_privateLinkResourceType}/{serviceName}/privateEndpointConnections";`
	`186`	`+ return $"/subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_configuration.Type}/{serviceName}/privateEndpointConnections";`
`176`	`187`	`}`
`177`	`188`
	`189`	`+ private string BuildPrivateEndpointConnectionsOwnerURL(string resourceGroupName, string serviceName)`
	`190`	`+ {`
	`191`	`+ return $"/subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_configuration.Type}/{serviceName}";`
	`192`	`+ }`
	`193`	`+`
	`194`	`+`
`178`	`195`	`/// <summary>`
`179`	`196`	`/// /subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_privateLinkResourceType}/{serviceName}/privateEndpointConnections/{name}`
`180`	`197`	`/// </summary>`
`181`	`198`	`private string BuildPrivateEndpointConnectionURL(string resourceGroupName, string serviceName, string name)`
`182`	`199`	`{`
`183`		`- return $"/subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_privateLinkResourceType}/{serviceName}/privateEndpointConnections/{name}";`
	`200`	`+ return $"/subscriptions/{_subscription}/resourceGroups/{resourceGroupName}/providers/{_configuration.Type}/{serviceName}/privateEndpointConnections/{name}";`
`184`	`201`	`}`
`185`	`202`
`186`	`203`	`private PSPrivateEndpointConnection ToPsPrivateEndpointConnection(PrivateEndpointConnection privateEndpointConnection)`