Fix for API version cache (Azure#34974)

* Fix for Api version cache.

* Combine override after fetching from remote

* Get API version from override if exists

* Avoid API request if requsted resource type exists in override

* Revert unnecessary change.

Author: live1206

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

@@ -6,7 +6,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.Core;
@@ -114,12 +113,6 @@ private void CopyApiVersionOverrides(ArmClientOptions options)
             foreach (var keyValuePair in options.ResourceApiVersionOverrides)
             {
                 ApiVersionOverrides.Add(keyValuePair.Key, keyValuePair.Value);
-                if (!ResourceApiVersionCache.TryGetValue(keyValuePair.Key.Namespace, out var apiVersionCache))
-                {
-                    apiVersionCache = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-                    ResourceApiVersionCache.TryAdd(keyValuePair.Key.Namespace, apiVersionCache);
-                }
-                apiVersionCache.Add(keyValuePair.Key.Type, keyValuePair.Value);
             }
         }
 

sdk/resourcemanager/Azure.ResourceManager/src/Resources/Custom/ResourceProviderCollection.cs

@@ -42,14 +42,17 @@ internal virtual string GetApiVersion(ResourceType resourceType, CancellationTok
         {
             string version;
             Dictionary<string, string> resourceVersions;
-            if (!Client.ResourceApiVersionCache.TryGetValue(resourceType.Namespace, out resourceVersions))
+            if (!Client.ApiVersionOverrides.TryGetValue(resourceType, out version))
             {
-                resourceVersions = LoadResourceVersionsFromApi(resourceType.Namespace, cancellationToken);
-                Client.ResourceApiVersionCache.TryAdd(resourceType.Namespace, resourceVersions);
-            }
-            if (!resourceVersions.TryGetValue(resourceType.Type, out version))
-            {
-                throw new InvalidOperationException($"Invalid resource type {resourceType}");
+                if (!Client.ResourceApiVersionCache.TryGetValue(resourceType.Namespace, out resourceVersions))
+                {
+                    resourceVersions = LoadResourceVersionsFromApi(resourceType.Namespace, cancellationToken);
+                    Client.ResourceApiVersionCache.TryAdd(resourceType.Namespace, resourceVersions);
+                }
+                if (!resourceVersions.TryGetValue(resourceType.Type, out version))
+                {
+                    throw new InvalidOperationException($"Invalid resource type {resourceType}");
+                }
             }
             return version;
         }
@@ -59,14 +62,17 @@ internal virtual async ValueTask<string> GetApiVersionAsync(ResourceType resourc
         {
             string version;
             Dictionary<string, string> resourceVersions;
-            if (!Client.ResourceApiVersionCache.TryGetValue(resourceType.Namespace, out resourceVersions))
-            {
-                resourceVersions = await LoadResourceVersionsFromApiAsync(resourceType.Namespace, cancellationToken).ConfigureAwait(false);
-                Client.ResourceApiVersionCache.TryAdd(resourceType.Namespace, resourceVersions);
-            }
-            if (!resourceVersions.TryGetValue(resourceType.Type, out version))
+            if (!Client.ApiVersionOverrides.TryGetValue(resourceType, out version))
             {
-                throw new InvalidOperationException($"Invalid resource type {resourceType}");
+                if (!Client.ResourceApiVersionCache.TryGetValue(resourceType.Namespace, out resourceVersions))
+                {
+                    resourceVersions = await LoadResourceVersionsFromApiAsync(resourceType.Namespace, cancellationToken).ConfigureAwait(false);
+                    Client.ResourceApiVersionCache.TryAdd(resourceType.Namespace, resourceVersions);
+                }
+                if (!resourceVersions.TryGetValue(resourceType.Type, out version))
+                {
+                    throw new InvalidOperationException($"Invalid resource type {resourceType}");
+                }
             }
             return version;
         }

sdk/resourcemanager/Azure.ResourceManager/tests/Scenario/GenericResourceOperationsTests.cs

@@ -4,7 +4,6 @@
 using Azure.Core;
 using Azure.Core.TestFramework;
 using Azure.ResourceManager.Resources;
-using Azure.ResourceManager.Resources.Models;
 using NUnit.Framework;
 
 namespace Azure.ResourceManager.Tests
@@ -230,5 +229,19 @@ public async Task StartUpdate()
                 _ = await updateOp.WaitForCompletionAsync();
             });
         }
+
+        [Test]
+        [RecordedTest]
+        public async Task CreateWithApiVersionSetting()
+        {
+            var options = new ArmClientOptions();
+            options.SetApiVersion(new ResourceType("Microsoft.Compute/test"), "2022-09-01");
+            var client = GetArmClient(options);
+            var rgOp = await (await client.GetDefaultSubscriptionAsync().ConfigureAwait(false)).GetResourceGroups().Construct(AzureLocation.WestUS2).CreateOrUpdateAsync(Recording.GenerateAssetName("testrg"));
+            GenericResourceData data = ConstructGenericAvailabilitySet();
+            var asetId = rgOp.Value.Id.AppendProviderResource("Microsoft.Compute", "availabilitySets", Recording.GenerateAssetName("test-aset"));
+            var op = await client.GetGenericResources().CreateOrUpdateAsync(WaitUntil.Completed, asetId, data);
+            Assert.NotNull(op.Value);
+        }
     }
 }