Fix merge conflicts

Author: RubenCerna2079

.pipelines/dwsql-pipelines.yml

@@ -2,7 +2,7 @@
 # Licensed under the MIT License.
 
 # DwSql Integration Testing Pipeline config is split into two jobs:
-# 1) LinuxTests -> Run SQL Server 2019 in Linux Docker Image
+# 1) LinuxTests -> Run SQL Server 2025 in Linux Docker Image
 # 2) WindowsTests -> Run LocalDB preinstalled on machine
 
 trigger:
@@ -159,8 +159,8 @@ jobs:
       # The variable setting on the pipeline UI sets the connection string
       # for the linux job above.
       data-source.connection-string: Server=(localdb)\MSSQLLocalDB;Persist Security Info=False;Integrated Security=True;MultipleActiveResultSets=False;Connection Timeout=30;TrustServerCertificate=True;
-      InstallerUrl: https://download.microsoft.com/download/7/c/1/7c14e92e-bdcb-4f89-b7cf-93543e7112d1/SqlLocalDB.msi
-      SqlVersionCode: '15.0'
+      InstallerUrl: https://download.microsoft.com/download/dea8c210-c44a-4a9d-9d80-0c81578860c5/ENU/SqlLocalDB.msi
+      SqlVersionCode: '17.0'
 
   steps:
   - task: CmdLine@2

.pipelines/mssql-pipelines.yml

@@ -2,7 +2,7 @@
 # Licensed under the MIT License.
 
 # MsSql Integration Testing Pipeline config is split into parallel jobs:
-# 1) linux (disabled) -> Run SQL Server 2019 in Linux Docker Image
+# 1) linux (disabled) -> Run SQL Server 2025 in Linux Docker Image
 # 2) windows_combined -> GraphQL, REST, Unit, HotReload, OpenApi, Auth, Telemetry, Caching on LocalDB
 # 3) windows_configuration -> Configuration tests on LocalDB (with schema init)
 
@@ -176,7 +176,7 @@ jobs:
       # The variable setting on the pipeline UI sets the connection string
       # for the linux job above.
       data-source.connection-string: Server=(localdb)\MSSQLLocalDB;Persist Security Info=False;Integrated Security=True;MultipleActiveResultSets=False;Connection Timeout=30;TrustServerCertificate=True;
-      InstallerUrl: https://download.microsoft.com/download/7/c/1/7c14e92e-bdcb-4f89-b7cf-93543e7112d1/SqlLocalDB.msi
+      InstallerUrl: https://download.microsoft.com/download/dea8c210-c44a-4a9d-9d80-0c81578860c5/ENU/SqlLocalDB.msi
       SqlVersionCode: '17.0'
 
   steps:
@@ -199,7 +199,7 @@ jobs:
       # The variable setting on the pipeline UI sets the connection string
       # for the linux job above.
       data-source.connection-string: Server=(localdb)\MSSQLLocalDB;Persist Security Info=False;Integrated Security=True;MultipleActiveResultSets=False;Connection Timeout=30;TrustServerCertificate=True;
-      InstallerUrl: https://download.microsoft.com/download/7/c/1/7c14e92e-bdcb-4f89-b7cf-93543e7112d1/SqlLocalDB.msi
+      InstallerUrl: https://download.microsoft.com/download/dea8c210-c44a-4a9d-9d80-0c81578860c5/ENU/SqlLocalDB.msi
       SqlVersionCode: '17.0'
 
   steps:

CODEOWNERS

@@ -3,9 +3,9 @@
 # review when someone opens a pull request.
 *       @Aniruddh25 @aaronburtle @anushakolan @jerrynixon @RubenCerna2079 @souvikghosh04 @sourabh1007 @vadeveka @Alekhya-Polavarapu @rusamant @stuartpa
 
-code_of_conduct.md @jerrynixon
-contributing.md @jerrynixon
-license.txt @jerrynixon
-readme.md @jerrynixon
-security.md @jerrynixon
-support.md @jerrynixon
+CODE_OF_CONDUCT.md @jerrynixon @croblesm
+CONTRIBUTING.md @jerrynixon @croblesm
+LICENSE.txt @jerrynixon @croblesm
+README.md @jerrynixon @croblesm
+SECURITY.md @jerrynixon @croblesm
+support.md @jerrynixon @croblesm

README.md

@@ -36,7 +36,7 @@ Data API builder (DAB) is an open-source, no-code tool that creates secure, full
 
 |               | REST | GraphQL |     MCP     |
 | :-----------: | :--: | :-----: | :---------: |
-| **Supported** |  Yes |   Yes   | Coming soon |
+| **Supported** |  Yes |   Yes   | Yes |
 
 ## Getting started
 
@@ -312,4 +312,4 @@ Nitro (formerly Banana Cake Pop by ChilliCream, Inc.) may optionally store work
 
 ### Trademarks
 
-This project may use trademarks or logos. Use of Microsoft trademarks must follow Microsoft’s [Trademark & Brand Guidelines](https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks). Use of third-party marks is subject to their policies.
+This project may use trademarks or logos. Use of Microsoft trademarks must follow Microsoft’s [Trademark & Brand Guidelines](https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks). Use of third-party marks is subject to their policies.

src/Cli.Tests/ConfigureOptionsTests.cs

@@ -418,6 +418,7 @@ public void TestUpdateEnabledForRestSettings(bool updatedEnabledValue)
         [DataRow("/updatedPath", DisplayName = "Update REST path to /updatedPath.")]
         [DataRow("/updated_Path", DisplayName = "Ensure underscore is allowed in REST path.")]
         [DataRow("/updated-Path", DisplayName = "Ensure hyphen is allowed in REST path.")]
+        [DataRow("/api/v2", DisplayName = "Ensure multi-segment paths are allowed in REST path.")]
         public void TestUpdatePathForRestSettings(string updatedPathValue)
         {
             // Arrange -> all the setup which includes creating options.

src/Cli.Tests/EndToEndTests.cs

@@ -343,11 +343,12 @@ public void TestUpdateDepthLimitInGraphQLRuntimeSettings(string depthLimit, bool
     [DataRow("/updatedPath", true, DisplayName = "Success in updated GraphQL Path to /updatedPath.")]
     [DataRow("/updated-Path", true, DisplayName = "Success in updated GraphQL Path to /updated-Path.")]
     [DataRow("/updated_Path", true, DisplayName = "Success in updated GraphQL Path to /updated_Path.")]
+    [DataRow("/api/v2", true, DisplayName = "Success in updated GraphQL Path to multi-segment path /api/v2.")]
     [DataRow("updatedPath", false, DisplayName = "Failure due to '/' missing.")]
     [DataRow("/updated Path", false, DisplayName = "Failure due to white spaces.")]
     [DataRow("/updated.Path", false, DisplayName = "Failure due to reserved char '.'.")]
     [DataRow("/updated@Path", false, DisplayName = "Failure due reserved chars '@'.")]
-    [DataRow("/updated/Path", false, DisplayName = "Failure due reserved chars '/'.")]
+    [DataRow("/api//v2", false, DisplayName = "Failure due to empty path segment.")]
     public void TestUpdateGraphQLPathRuntimeSettings(string path, bool isSuccess)
     {
         // Initialize the config file.
@@ -405,11 +406,12 @@ public void TestUpdateHostCorsOriginsRuntimeSettings(string path, bool isSuccess
     [DataRow("/updatedPath", true, DisplayName = "Successfully updated Rest Path to /updatedPath.")]
     [DataRow("/updated-Path", true, DisplayName = "Successfully updated Rest Path to /updated-Path.")]
     [DataRow("/updated_Path", true, DisplayName = "Successfully updated Rest Path to /updated_Path.")]
+    [DataRow("/api/v2", true, DisplayName = "Successfully updated Rest Path to multi-segment path /api/v2.")]
     [DataRow("updatedPath", false, DisplayName = "Failure due to '/' missing.")]
     [DataRow("/updated Path", false, DisplayName = "Failure due to white spaces.")]
     [DataRow("/updated.Path", false, DisplayName = "Failure due to reserved char '.'.")]
     [DataRow("/updated@Path", false, DisplayName = "Failure due reserved chars '@'.")]
-    [DataRow("/updated/Path", false, DisplayName = "Failure due reserved chars '/'.")]
+    [DataRow("/api//v2", false, DisplayName = "Failure due to empty path segment.")]
     public void TestUpdateRestPathRuntimeSettings(string path, bool isSuccess)
     {
         // Initialize the config file.

src/Cli.Tests/ValidateConfigTests.cs

@@ -40,6 +40,16 @@ public void TestCleanup()
         Environment.SetEnvironmentVariable($"database-type", null);
         Environment.SetEnvironmentVariable($"sp_param1_int", null);
         Environment.SetEnvironmentVariable($"sp_param2_bool", null);
+
+        // Set output back to the default for other tests.
+        Console.SetOut(new StreamWriter(Console.OpenStandardOutput())
+        {
+            AutoFlush = true
+        });
+        Console.SetError(new StreamWriter(Console.OpenStandardError())
+        {
+            AutoFlush = true
+        });
     }
 
     /// <summary>
@@ -294,9 +304,6 @@ public void ValidateConfigSchemaWhereConfigReferencesEnvironmentVariables()
         Assert.IsFalse(
             condition: loggerOutput.Contains("Failed to validate config against schema due to"),
             message: "Unexpected errors encountered when validating config schema in RuntimeConfigValidator::ValidateConfigSchema(...).");
-        Assert.IsTrue(
-            condition: loggerOutput.Contains("The config satisfies the schema requirements."),
-            message: "RuntimeConfigValidator::ValidateConfigSchema(...) didn't communicate successful config schema validation.");
     }
 
     /// <summary>
@@ -405,6 +412,37 @@ public void TestValidateNonRootZeroEntitiesWithInvalidConnectionString()
         Assert.IsFalse(isValid);
     }
 
+    /// <summary>
+    /// Tests that logs related to suppressed messages do not appear.
+    /// </summary>
+    [TestMethod]
+    public async Task TestValidateSuppressedLogsDoNotAppear()
+    {
+        // Arrange
+        StringWriter writer = new();
+        Console.SetOut(writer);
+
+        string config = AddPropertiesToJson(INITIAL_CONFIG, SINGLE_ENTITY);
+
+        ((MockFileSystem)_fileSystem!).AddFile(
+            path: TEST_RUNTIME_CONFIG_FILE,
+            mockFile: config);
+        ValidateOptions validateOptions = new(TEST_RUNTIME_CONFIG_FILE);
+
+        // Act
+        Utils.LoggerFactoryForCli = Utils.GetLoggerFactoryForCli();
+        ConfigGenerator.IsConfigValid(validateOptions, _runtimeConfigLoader!, _fileSystem!);
+
+        // Assert
+        string loggerOutput = writer.ToString();
+        Assert.IsTrue(
+            condition: !loggerOutput.Contains("REST path:"),
+            message: "RuntimeConfigValidator should not contain any messages indicating REST path for individual entities");
+        Assert.IsTrue(
+            condition: !loggerOutput.Contains("REST calls are disabled for the entity:"),
+            message: "RuntimeConfigValidator should not contain any messages related to REST calls for individual entities");
+    }
+
     /// <summary>
     /// Validates that a root config (with data-source-files pointing to children)
     /// that has no data-source and no entities is considered structurally valid

src/Cli/Commands/ValidateOptions.cs

@@ -38,7 +38,7 @@ public int Handler(ILogger logger, FileSystemRuntimeConfigLoader loader, IFileSy
             }
             else
             {
-                logger.LogError("Config is invalid.");
+                logger.LogInformation("Config is invalid.");
             }
 
             return isValidConfig ? CliReturnCode.SUCCESS : CliReturnCode.GENERAL_ERROR;

src/Cli/ConfigGenerator.cs

@@ -3166,8 +3166,6 @@ public static bool IsConfigValid(ValidateOptions options, FileSystemRuntimeConfi
                 return false;
             }
 
-            _logger.LogInformation("Validating config file: {runtimeConfigFile}", runtimeConfigFile);
-
             RuntimeConfigProvider runtimeConfigProvider = new(loader);
 
             if (!runtimeConfigProvider.TryGetConfig(out RuntimeConfig? _))
@@ -3196,14 +3194,21 @@ public static bool IsConfigValid(ValidateOptions options, FileSystemRuntimeConfi
                     bool mcpEnabled = config.IsMcpEnabled;
                     if (mcpEnabled)
                     {
+                        bool missingFields = false;
                         foreach (KeyValuePair<string, Entity> entity in config.Entities)
                         {
                             if (entity.Value.Fields == null || !entity.Value.Fields.Any())
                             {
-                                _logger.LogWarning($"Entity '{entity.Key}' is missing 'fields' definition while MCP is enabled. " +
-                                    "It's recommended to define fields explicitly to ensure optimal performance with MCP.");
+                                missingFields = true;
+                                _logger.LogDebug($"Entity '{entity.Key}' is missing 'fields' definition while MCP is enabled.");
                             }
                         }
+
+                        if (missingFields)
+                        {
+                            _logger.LogWarning("One or more entities are missing `fields` definition while MCP is enabled. " +
+                                "It's recommended to define fields explicitly to ensure optimal performance with MCP.");
+                        }
                     }
 
                     // Warn if Unauthenticated provider is used with authenticated or custom roles

src/Cli/Utils.cs

@@ -205,7 +205,8 @@ public static bool IsURIComponentValid(string? uriComponent)
                 uriComponent = uriComponent.Substring(1);
             }
 
-            return !RuntimeConfigValidatorUtil.DoesUriComponentContainReservedChars(uriComponent);
+            // The path may contain multiple '/'-separated segments (e.g. 'api/v2'); validate each segment.
+            return !RuntimeConfigValidatorUtil.DoesUriPathContainReservedChars(uriComponent);
         }
 
         /// <summary>