[Elastic] Fix for issue Azure#50974 (Azure#51122)

Author: HarveyLink

sdk/elastic/Azure.ResourceManager.Elastic/CHANGELOG.md

@@ -8,6 +8,8 @@
 
 ### Bugs Fixed
 
+- Fixed serialization issue in `ElasticCloudDeployment` where `ElasticsearchServiceUri`, `KibanaServiceUri`, and `KibanaSsoUri` properties would throw `InvalidOperationException` when containing relative URIs. Added custom serialization hooks to handle both absolute and relative URIs by using `OriginalString` for relative URIs instead of `AbsoluteUri`. This resolves issue #50974.
+
 ### Other Changes
 
 ## 1.0.0 (2024-12-26)

sdk/elastic/Azure.ResourceManager.Elastic/src/Custom/ElasticCloudDeployment.cs

@@ -0,0 +1,74 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Runtime.CompilerServices;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.ResourceManager.Elastic.Models
+{
+    // This is the fix for issue #50974
+    [CodeGenSerialization(nameof(ElasticsearchServiceUri), SerializationValueHook = nameof(WriteElasticsearchServiceUri), DeserializationValueHook = nameof(DeserializeElasticsearchServiceUri))]
+    [CodeGenSerialization(nameof(KibanaServiceUri), SerializationValueHook = nameof(WriteKibanaServiceUri), DeserializationValueHook = nameof(DeserializeKibanaServiceUri))]
+    [CodeGenSerialization(nameof(KibanaSsoUri), SerializationValueHook = nameof(WriteKibanaSsoUri), DeserializationValueHook = nameof(DeserializeKibanaSsoUri))]
+    public partial class ElasticCloudDeployment
+    {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal void WriteElasticsearchServiceUri(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            WriteUri(writer, ElasticsearchServiceUri);
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static void DeserializeElasticsearchServiceUri(JsonProperty property, ref Uri elasticsearchServiceUrl)
+        {
+            DeserializeUri(property, ref elasticsearchServiceUrl);
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal void WriteKibanaServiceUri(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            WriteUri(writer, KibanaServiceUri);
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static void DeserializeKibanaServiceUri(JsonProperty property, ref Uri kibanaServiceUrl)
+        {
+            DeserializeUri(property, ref kibanaServiceUrl);
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal void WriteKibanaSsoUri(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            WriteUri(writer, KibanaSsoUri);
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static void DeserializeKibanaSsoUri(JsonProperty property, ref Uri kibanaSsoUrl)
+        {
+            DeserializeUri(property, ref kibanaSsoUrl);
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static void WriteUri(Utf8JsonWriter writer, Uri uri)
+        {
+            writer.WriteStringValue(uri.IsAbsoluteUri ? uri.AbsoluteUri : uri.OriginalString);
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static void DeserializeUri(JsonProperty property, ref Uri uri)
+        {
+            if (property.Value.ValueKind != JsonValueKind.Null)
+            {
+                var uriString = property.Value.GetString();
+                uri = Uri.TryCreate(uriString, UriKind.Absolute, out var absoluteUri)
+                    ? absoluteUri
+                    : new Uri(uriString, UriKind.Relative);
+            }
+        }
+    }
+}

sdk/elastic/Azure.ResourceManager.Elastic/src/Generated/Models/ElasticCloudDeployment.Serialization.cs

@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.ResourceManager.Elastic.Models;
+using NUnit.Framework;
+
+namespace Azure.ResourceManager.Elastic.Tests
+{
+    /// <summary>
+    /// Regression tests for ElasticCloudDeployment custom serialization fixes for issue #50974
+    /// </summary>
+    public class ElasticCloudDeploymentRegressionTests
+    {
+        [Test]
+        public void SerializeAndDeserialize_AllUriProperties_WithAbsoluteUris()
+        {
+            // Arrange
+            var elasticsearchServiceUri = new Uri("https://elasticsearch.example.com:9200");
+            var kibanaServiceUri = new Uri("https://kibana.example.com:5601");
+            var kibanaSsoUri = new Uri("https://kibana.example.com:5601/sso");
+
+            var deployment = new ElasticCloudDeployment(
+                name: "test-deployment",
+                deploymentId: "dep-123",
+                azureSubscriptionId: "sub-456",
+                elasticsearchRegion: "eastus",
+                elasticsearchServiceUri: elasticsearchServiceUri,
+                kibanaServiceUri: kibanaServiceUri,
+                kibanaSsoUri: kibanaSsoUri,
+                serializedAdditionalRawData: new Dictionary<string, BinaryData>()
+            );
+
+            // Act - Serialize
+            var model = deployment as IPersistableModel<ElasticCloudDeployment>;
+            var wire = ModelReaderWriter.Write(model);
+            var jsonString = wire.ToString();
+
+            // Verify serialized JSON contains absolute URIs
+            var jsonDoc = JsonDocument.Parse(jsonString);
+            var root = jsonDoc.RootElement;
+
+            if (root.TryGetProperty("elasticsearchServiceUrl", out var esElement))
+            {
+                Assert.AreEqual("https://elasticsearch.example.com:9200/", esElement.GetString());
+            }
+            if (root.TryGetProperty("kibanaServiceUrl", out var kibanaElement))
+            {
+                Assert.AreEqual("https://kibana.example.com:5601/", kibanaElement.GetString());
+            }
+            if (root.TryGetProperty("kibanaSsoUrl", out var kibanaSsoElement))
+            {
+                Assert.AreEqual("https://kibana.example.com:5601/sso", kibanaSsoElement.GetString());
+            }
+
+            // Act - Deserialize
+            var deserialized = ModelReaderWriter.Read<ElasticCloudDeployment>(wire);
+
+            // Assert
+            Assert.NotNull(deserialized);
+            Assert.AreEqual(elasticsearchServiceUri, deserialized.ElasticsearchServiceUri);
+            Assert.AreEqual(kibanaServiceUri, deserialized.KibanaServiceUri);
+            Assert.AreEqual(kibanaSsoUri, deserialized.KibanaSsoUri);
+
+            // Verify all URIs are absolute
+            Assert.IsTrue(deserialized.ElasticsearchServiceUri.IsAbsoluteUri);
+            Assert.IsTrue(deserialized.KibanaServiceUri.IsAbsoluteUri);
+            Assert.IsTrue(deserialized.KibanaSsoUri.IsAbsoluteUri);
+        }
+
+        [Test]
+        public void SerializeAndDeserialize_AllUriProperties_WithRelativeUris()
+        {
+            // Arrange - Use relative paths that don't start with "/" to avoid platform-specific interpretation
+            var elasticsearchServiceUri = new Uri("elasticsearch", UriKind.Relative);
+            var kibanaServiceUri = new Uri("kibana", UriKind.Relative);
+            var kibanaSsoUri = new Uri("kibana/sso", UriKind.Relative);
+
+            var deployment = new ElasticCloudDeployment(
+                name: "test-deployment",
+                deploymentId: "dep-123",
+                azureSubscriptionId: "sub-456",
+                elasticsearchRegion: "eastus",
+                elasticsearchServiceUri: elasticsearchServiceUri,
+                kibanaServiceUri: kibanaServiceUri,
+                kibanaSsoUri: kibanaSsoUri,
+                serializedAdditionalRawData: new Dictionary<string, BinaryData>()
+            );
+
+            // Act - Serialize
+            var model = deployment as IPersistableModel<ElasticCloudDeployment>;
+            var wire = ModelReaderWriter.Write(model);
+            var jsonString = wire.ToString();
+
+            // Verify serialized JSON contains relative URIs as original strings
+            var jsonDoc = JsonDocument.Parse(jsonString);
+            var root = jsonDoc.RootElement;
+
+            if (root.TryGetProperty("elasticsearchServiceUrl", out var esElement))
+            {
+                Assert.AreEqual("elasticsearch", esElement.GetString());
+            }
+            if (root.TryGetProperty("kibanaServiceUrl", out var kibanaElement))
+            {
+                Assert.AreEqual("kibana", kibanaElement.GetString());
+            }
+            if (root.TryGetProperty("kibanaSsoUrl", out var kibanaSsoElement))
+            {
+                Assert.AreEqual("kibana/sso", kibanaSsoElement.GetString());
+            }
+
+            // Act - Deserialize
+            var deserialized = ModelReaderWriter.Read<ElasticCloudDeployment>(wire);
+
+            // Assert
+            Assert.NotNull(deserialized);
+            Assert.AreEqual(elasticsearchServiceUri, deserialized.ElasticsearchServiceUri);
+            Assert.AreEqual(kibanaServiceUri, deserialized.KibanaServiceUri);
+            Assert.AreEqual(kibanaSsoUri, deserialized.KibanaSsoUri);
+
+            // Verify all URIs are relative
+            Assert.IsFalse(deserialized.ElasticsearchServiceUri.IsAbsoluteUri);
+            Assert.IsFalse(deserialized.KibanaServiceUri.IsAbsoluteUri);
+            Assert.IsFalse(deserialized.KibanaSsoUri.IsAbsoluteUri);
+
+            // Verify original strings are preserved
+            Assert.AreEqual("elasticsearch", deserialized.ElasticsearchServiceUri.OriginalString);
+            Assert.AreEqual("kibana", deserialized.KibanaServiceUri.OriginalString);
+            Assert.AreEqual("kibana/sso", deserialized.KibanaSsoUri.OriginalString);
+        }
+    }
+}