Merge pull request #121 from yaananth/yaananth-fabric

support fabric eventhouse

Author: sdseaton

KustoSchemaTools.Tests/Parser/KustoExtensionsTests.cs

@@ -0,0 +1,30 @@
+using KustoSchemaTools.Parser;
+using Xunit;
+
+namespace KustoSchemaTools.Tests.Parser
+{
+    public class KustoExtensionsTests
+    {
+        [Theory]
+        [InlineData("https://trd-abc.kusto.fabric.microsoft.com", false, "https://trd-abc.kusto.fabric.microsoft.com")]
+        [InlineData("https://trd-abc.kusto.fabric.microsoft.com", true,  "https://trd-abc.kusto.fabric.microsoft.com")]
+        [InlineData("trd-abc.kusto.fabric.microsoft.com", false, "https://trd-abc.kusto.fabric.microsoft.com")]
+        [InlineData("trd-abc.kusto.fabric.microsoft.com", true,  "https://ingest-trd-abc.kusto.fabric.microsoft.com")]
+        [InlineData("myadx.eastus", false, "https://myadx.eastus.kusto.windows.net")]
+        [InlineData("myadx.eastus", true,  "https://ingest-myadx.eastus.kusto.windows.net")]
+        public void Fqdn_AndShorthand_MapToExpectedHosts(string input, bool ingest, string expected)
+        {
+            var actual = KustoExtensions.ToKustoClusterUrl(input, ingest);
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void NullOrEmpty_ReturnsEmpty_NotThrow()
+        {
+            var a = KustoExtensions.ToKustoClusterUrl(null!, false);
+            var b = KustoExtensions.ToKustoClusterUrl("", true);
+            Assert.Equal(string.Empty, a);
+            Assert.Equal(string.Empty, b);
+        }
+    }
+}

KustoSchemaTools/Parser/KustoExtensions.cs

@@ -14,15 +14,15 @@ public static class KustoExtensions
             NullValueHandling = NullValueHandling.Ignore,
             Formatting = Formatting.Indented,
             ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
-            
+
 
         };
 
         public static string BracketIfIdentifier(this string name)
         {
-            return reservedKustoWords.Contains(name) 
-                ? $"['{name}']" 
-                : name.StartsWith("[") 
+            return reservedKustoWords.Contains(name)
+                ? $"['{name}']"
+                : name.StartsWith("[")
                     ? name
                     : KustoFacts.BracketNameIfNecessary(name);
         }
@@ -65,8 +65,21 @@ public static JObject AsDynamic(this DataTable table)
 
         public static string ToKustoClusterUrl(this string cluster, bool ingest = false)
         {
-            var ingestPrefix = ingest ? "ingest-" : "";
-            return cluster.StartsWith("https") ? cluster : $"https://{ingestPrefix}{cluster}.kusto.windows.net";
+            if (string.IsNullOrWhiteSpace(cluster))
+                return cluster ?? string.Empty;
+
+            // Full URL passed → return as-is
+            if (cluster.StartsWith("https", StringComparison.OrdinalIgnoreCase))
+                return cluster;
+
+            var ingestPrefix = ingest ? "ingest-" : string.Empty;
+
+            // Fabric support
+            if (cluster.EndsWith(".fabric.microsoft.com", StringComparison.OrdinalIgnoreCase))
+                return $"https://{ingestPrefix}{cluster}";
+
+            // Original mapping: shorthand → *.kusto.windows.net
+            return $"https://{ingestPrefix}{cluster}.kusto.windows.net";
         }
 
         public static bool IsFinal(this ScriptExecuteCommandResult command)
@@ -685,4 +698,3 @@ public static string UseHtmlLineBreaks(this string query)
 
     }
 }
-