Move Providers and ProviderOperations from Azure.ResourceManager.Resources into Azure.ResourceManager.Core-nibhati-5862

sdk/core/Azure.Core.TestFramework/src/Instrumentation/ManagementInterceptor.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
+using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using Castle.DynamicProxy;
@@ -39,11 +40,25 @@ public void Intercept(IInvocation invocation)
                 var taskResultType = type.GetGenericArguments()[0];
                 if (taskResultType.Name.StartsWith("Response"))
                 {
-                    var taskResult = result.GetType().GetProperty("Result").GetValue(result);
-                    var instrumentedResult = _testBase.InstrumentClient(taskResultType, taskResult, new IInterceptor[] { new ManagementInterceptor(_testBase) });
-                    invocation.ReturnValue = type.Name.StartsWith("ValueTask")
-                        ? GetValueFromValueTask(taskResultType, instrumentedResult)
-                        : GetValueFromOther(taskResultType, instrumentedResult);
+                    try
+                    {
+                        var taskResult = result.GetType().GetProperty("Result").GetValue(result);
+                        var instrumentedResult = _testBase.InstrumentClient(taskResultType, taskResult, new IInterceptor[] { new ManagementInterceptor(_testBase) });
+                        invocation.ReturnValue = type.Name.StartsWith("ValueTask")
+                            ? GetValueFromValueTask(taskResultType, instrumentedResult)
+                            : GetValueFromOther(taskResultType, instrumentedResult);
+                    }
+                    catch (TargetInvocationException e)
+                    {
+                        if (e.InnerException is AggregateException aggException)
+                        {
+                            throw aggException.InnerExceptions.First();
+                        }
+                        else
+                        {
+                            throw e.InnerException;
+                        }
+                    }
                 }
             }
             else if (invocation.Method.Name.EndsWith("Value") && type.BaseType.Name.EndsWith("Operations"))

sdk/resourcemanager/Azure.ResourceManager.Core/src/ApiVersions.cs

@@ -10,8 +10,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.Core;
-using Azure.ResourceManager.Resources;
-using Azure.ResourceManager.Resources.Models;
 
 namespace Azure.ResourceManager.Core
 {
@@ -20,7 +18,7 @@ namespace Azure.ResourceManager.Core
     /// </summary>
     public class ApiVersions
     {
-        private ProvidersOperations ProviderOperations;
+        private ArmClient _armClient;
         private ArmClientOptions _clientOptions;
 
         /// <summary>
@@ -30,19 +28,15 @@ internal ApiVersions(ArmClientOptions clientOptions)
         {
             BuildApiTable(clientOptions);
             _clientOptions = clientOptions;
-            ProviderOperations = null;
+            _armClient = null;
         }
 
         /// <summary>
         /// Make a provider resource client class.
         /// </summary>
-        internal void SetProviderClient(TokenCredential credential, Uri baseUri, string subscription)
+        internal void SetProviderClient(ArmClient armClient)
         {
-            ProviderOperations = new ResourcesManagementClient(
-            baseUri,
-            subscription,
-            credential,
-            _clientOptions.Convert<ResourcesManagementClientOptions>()).Providers;
+            _armClient = armClient;            ;
         }
 
         private ConcurrentDictionary<string, PropertyWrapper> _loadedResourceToApiVersions = new ConcurrentDictionary<string, PropertyWrapper>();
@@ -84,18 +78,18 @@ where method.GetParameters()[0].ParameterType == typeof(ArmClientOptions)
             return results;
         }
 
-        private string LoadApiVersion(ResourceType resourceType, CancellationToken cancellationToken)
+        private string LoadApiVersion(ResourceType resourceType, CancellationToken cancellationToken, string expand = null)
         {
             Response<Provider> results;
             try
             {
-                results = ProviderOperations.Get(resourceType.Namespace, null, cancellationToken);
+                results = _armClient.DefaultSubscription.GetProviders().Get(resourceType.Namespace, expand, cancellationToken);
             }
             catch (RequestFailedException ex) when (ex.Status == 404)
             {
                 return null;
             }
-            foreach (var type in results.Value.ResourceTypes)
+            foreach (var type in results.Value.Data.ResourceTypes)
             {
                 if (type.ResourceType.Equals(resourceType.Type))
                 {
@@ -106,18 +100,18 @@ private string LoadApiVersion(ResourceType resourceType, CancellationToken cance
             return null;
         }
 
-        private async Task<string> LoadApiVersionAsync(ResourceType resourceType, CancellationToken cancellationToken)
+        private async Task<string> LoadApiVersionAsync(ResourceType resourceType, CancellationToken cancellationToken, string expand = null)
         {
             Response<Provider> results;
             try
             {
-                results = await ProviderOperations.GetAsync(resourceType.Namespace, null, cancellationToken).ConfigureAwait(false);
+                results = await _armClient.DefaultSubscription.GetProviders().GetAsync(resourceType.Namespace, expand, cancellationToken).ConfigureAwait(false);
             }
             catch (RequestFailedException ex) when (ex.Status == 404)
             {
                 return null;
             }
-            foreach (var type in results.Value.ResourceTypes)
+            foreach (var type in results.Value.Data.ResourceTypes)
             {
                 if (type.ResourceType.Equals(resourceType.Type))
                 {
@@ -138,7 +132,7 @@ public string TryGetApiVersion(ResourceType resourceType, CancellationToken canc
             {
                 return val;
             }
-            return ProviderOperations == null ? null : LoadApiVersion(resourceType.ToString(), cancellationToken);
+            return _armClient == null ? null : LoadApiVersion(resourceType.ToString(), cancellationToken);
         }
 
         /// <summary>
@@ -151,7 +145,7 @@ public async Task<string> TryGetApiVersionAsync(ResourceType resourceType, Cance
             {
                 return val;
             }
-            return ProviderOperations == null ? null : await LoadApiVersionAsync(resourceType.ToString(), cancellationToken).ConfigureAwait(false);
+            return _armClient == null ? null : await LoadApiVersionAsync(resourceType.ToString(), cancellationToken).ConfigureAwait(false);
         }
 
         private bool TryGetApiVersion(string resourceType, out string val)
@@ -190,7 +184,7 @@ public void SetApiVersion(ResourceType resourceType, string apiVersion)
         internal ApiVersions Clone()
         {
             ApiVersions copy = new ApiVersions(_clientOptions);
-            copy.ProviderOperations = ProviderOperations;
+            copy._armClient = _armClient;
             copy._loadedResourceToApiVersions = new ConcurrentDictionary<string, PropertyWrapper>(_loadedResourceToApiVersions);
             copy._nonLoadedResourceToApiVersion = new ConcurrentDictionary<string, string>(_nonLoadedResourceToApiVersion);
             return copy;

sdk/resourcemanager/Azure.ResourceManager.Core/src/ArmClient.cs

@@ -99,7 +99,7 @@ private ArmClient(
             DefaultSubscription = string.IsNullOrWhiteSpace(defaultSubscriptionId)
                 ? GetDefaultSubscription()
                 : GetSubscriptions().TryGet(defaultSubscriptionId);
-            ClientOptions.ApiVersions.SetProviderClient(credential, baseUri, defaultSubscriptionId ?? DefaultSubscription.Id.SubscriptionId);
+            ClientOptions.ApiVersions.SetProviderClient(this);
         }
 
         /// <summary>