[Storage Account] Fix for issue #59323

sdk/storage/Azure.ResourceManager.Storage/CHANGELOG.md

@@ -8,6 +8,8 @@
 
 ### Bugs Fixed
 
+- Fixed `StorageAccountResourceAccessRule.TenantId` deserialization to handle empty or invalid string values returned by the service ([#59323](https://github.com/Azure/azure-sdk-for-net/issues/59323)).
+
 ### Other Changes
 
 ## 1.7.0 (2026-05-22)

sdk/storage/Azure.ResourceManager.Storage/src/Customize/Models/StorageAccountResourceAccessRule.cs

@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#nullable disable
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Text.Json;
+using Microsoft.TypeSpec.Generator.Customizations;
+
+namespace Azure.ResourceManager.Storage.Models
+{
+    // The service may return tenantId as an empty or malformed string even though the SDK exposes Guid?.
+    // Keep deserialization tolerant so storage account GET/list operations do not fail on those values.
+    [CodeGenSerialization(nameof(TenantId), DeserializationValueHook = nameof(DeserializeNullableGuid))]
+    public partial class StorageAccountResourceAccessRule
+    {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static void DeserializeNullableGuid(JsonProperty property, ref Guid? tenantId)
+        {
+            var str = property.Value.GetString();
+            if (string.IsNullOrWhiteSpace(str) || !Guid.TryParse(str, out var parsed))
+            {
+                tenantId = null;
+            }
+            else
+            {
+                tenantId = parsed;
+            }
+        }
+    }
+}

sdk/storage/Azure.ResourceManager.Storage/tests/Tests/StorageAccountResourceAccessRuleSerializationTests.cs

@@ -0,0 +1,75 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+using Azure.ResourceManager.Storage.Models;
+using NUnit.Framework;
+
+namespace Azure.ResourceManager.Storage.Tests
+{
+    public class StorageAccountResourceAccessRuleSerializationTests
+    {
+        [Test]
+        public void DeserializeWithValidTenantId()
+        {
+            var tenantId = Guid.NewGuid();
+            string json = $"{{ \"tenantId\": \"{tenantId}\" }}";
+            using JsonDocument document = JsonDocument.Parse(json);
+
+            StorageAccountResourceAccessRule result =
+                StorageAccountResourceAccessRule.DeserializeStorageAccountResourceAccessRule(document.RootElement, ModelReaderWriterOptions.Json);
+
+            Assert.AreEqual(tenantId, result.TenantId);
+        }
+
+        [Test]
+        public void DeserializeWithEmptyTenantId()
+        {
+            string json = "{ \"tenantId\": \"\" }";
+            using JsonDocument document = JsonDocument.Parse(json);
+
+            StorageAccountResourceAccessRule result =
+                StorageAccountResourceAccessRule.DeserializeStorageAccountResourceAccessRule(document.RootElement, ModelReaderWriterOptions.Json);
+
+            Assert.IsNull(result.TenantId);
+        }
+
+        [Test]
+        public void DeserializeWithWhitespaceTenantId()
+        {
+            string json = "{ \"tenantId\": \"   \" }";
+            using JsonDocument document = JsonDocument.Parse(json);
+
+            StorageAccountResourceAccessRule result =
+                StorageAccountResourceAccessRule.DeserializeStorageAccountResourceAccessRule(document.RootElement, ModelReaderWriterOptions.Json);
+
+            Assert.IsNull(result.TenantId);
+        }
+
+        [Test]
+        public void DeserializeWithNullTenantId()
+        {
+            string json = "{ \"tenantId\": null }";
+            using JsonDocument document = JsonDocument.Parse(json);
+
+            StorageAccountResourceAccessRule result =
+                StorageAccountResourceAccessRule.DeserializeStorageAccountResourceAccessRule(document.RootElement, ModelReaderWriterOptions.Json);
+
+            Assert.IsNull(result.TenantId);
+        }
+
+        [Test]
+        public void DeserializeWithInvalidTenantId()
+        {
+            string json = "{ \"tenantId\": \"not-a-guid\" }";
+            using JsonDocument document = JsonDocument.Parse(json);
+
+            StorageAccountResourceAccessRule result =
+                StorageAccountResourceAccessRule.DeserializeStorageAccountResourceAccessRule(document.RootElement, ModelReaderWriterOptions.Json);
+
+            Assert.IsNull(result.TenantId);
+        }
+    }
+}