Fixed load fusion schema settings (#8533)

Author: michaelstaib

src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Configuration/InMemoryFusionConfigurationProvider.cs

@@ -8,15 +8,18 @@ namespace HotChocolate.Fusion.Configuration;
 
 public sealed class InMemoryFusionConfigurationProvider : IFusionConfigurationProvider
 {
-    public InMemoryFusionConfigurationProvider(DocumentNode schemaDocument, JsonDocument? schemaSettings)
+    private readonly JsonDocumentOwner? _schemaSettings;
+
+    public InMemoryFusionConfigurationProvider(DocumentNode schemaDocument, JsonDocumentOwner? schemaSettings)
     {
         ArgumentNullException.ThrowIfNull(schemaDocument);
 
         Configuration = new FusionConfiguration(
             schemaDocument,
             new JsonDocumentOwner(
-                schemaSettings ?? JsonDocument.Parse("{ }"),
+                schemaSettings?.Document ?? JsonDocument.Parse("{ }"),
                 EmptyMemoryOwner.Instance));
+        _schemaSettings = schemaSettings;
     }
 
     public FusionConfiguration Configuration { get; }
@@ -29,7 +32,10 @@ public IDisposable Subscribe(IObserver<FusionConfiguration> observer)
     }
 
     public ValueTask DisposeAsync()
-        => ValueTask.CompletedTask;
+    {
+        _schemaSettings?.Dispose();
+        return ValueTask.CompletedTask;
+    }
 
     private sealed class EmptyMemoryOwner : IMemoryOwner<byte>
     {

src/HotChocolate/Fusion-vnext/src/Fusion.Execution/DependencyInjection/CoreFusionGatewayBuilderExtensions.cs

@@ -1,3 +1,5 @@
+using System.Text.Json;
+using HotChocolate.Buffers;
 using HotChocolate.Fusion.Configuration;
 using HotChocolate.Language;
 
@@ -39,13 +41,14 @@ public static IFusionGatewayBuilder AddFileSystemConfiguration(
 
     public static IFusionGatewayBuilder AddInMemoryConfiguration(
         this IFusionGatewayBuilder builder,
-        DocumentNode schemaDocument)
+        DocumentNode schemaDocument,
+        JsonDocumentOwner? schemaSettings = null)
     {
         ArgumentNullException.ThrowIfNull(builder);
         ArgumentNullException.ThrowIfNull(schemaDocument);
 
         return Configure(
             builder,
-            setup => setup.DocumentProvider = _ => new InMemoryFusionConfigurationProvider(schemaDocument, null));
+            setup => setup.DocumentProvider = _ => new InMemoryFusionConfigurationProvider(schemaDocument, schemaSettings));
     }
 }

src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Execution/FusionRequestExecutorManager.cs

@@ -213,14 +213,19 @@ private SourceSchemaClientConfigurations CreateClientConfigurations(
         {
             foreach (var sourceSchema in sourceSchemas.EnumerateObject())
             {
-                if (sourceSchema.Value.TryGetProperty("http", out var http))
+                if (sourceSchema.Value.TryGetProperty("transports", out var transports))
                 {
-                    var httpClient = new SourceSchemaHttpClientConfiguration(
-                        sourceSchema.Name,
-                        httpClientName: "Fusion",
-                        new Uri(http.GetProperty("url").GetString()!));
+                    if (transports.TryGetProperty("http", out var http))
+                    {
+                        var hasClientName = http.TryGetProperty("clientName", out var clientName);
 
-                    configurations.Add(httpClient);
+                        var httpClient = new SourceSchemaHttpClientConfiguration(
+                            sourceSchema.Name,
+                            httpClientName: hasClientName ? clientName.GetString()! : "fusion",
+                            new Uri(http.GetProperty("url").GetString()!));
+
+                        configurations.Add(httpClient);
+                    }
                 }
             }
         }

src/HotChocolate/Fusion-vnext/test/Fusion.AspNetCore.Tests/BookStoreTests.cs

@@ -45,6 +45,67 @@ public async Task Fetch_Book_From_SourceSchema1()
         response.MatchSnapshot();
     }
 
+    [Fact]
+    public async Task Fetch_Book_From_SourceSchema1_With_Settings()
+    {
+        // arrange
+        using var server1 = CreateSourceSchema(
+            "a",
+            b => b.AddQueryType<SourceSchema1.Query>());
+
+        using var server2 = CreateSourceSchema(
+            "b",
+            b => b.AddQueryType<SourceSchema2.Query>());
+
+        // act
+        using var gateway = await CreateCompositeSchemaAsync(
+            [
+                ("a", server1),
+                ("b", server2),
+            ],
+            schemaSettings:
+            """
+            {
+              "sourceSchemas": {
+                "a": {
+                  "transports": {
+                    "http": {
+                      "clientName": "a",
+                      "url": "http://localhost:5000/graphql"
+                    }
+                  }
+                },
+                "b": {
+                  "transports": {
+                    "http": {
+                      "clientName": "b",
+                      "url": "http://localhost:5000/graphql"
+                    }
+                  }
+                }
+              }
+            }
+            """);
+
+        // assert
+        using var client = GraphQLHttpClient.Create(gateway.CreateClient());
+
+        using var result = await client.PostAsync(
+            """
+            {
+              bookById(id: 1) {
+                id
+                title
+              }
+            }
+            """,
+            new Uri("http://localhost:5000/graphql"));
+
+        // act
+        using var response = await result.ReadAsResultAsync();
+        response.MatchSnapshot();
+    }
+
     [Fact]
     public async Task Fetch_Book_From_SourceSchema1_Two_Requests()
     {

src/HotChocolate/Fusion-vnext/test/Fusion.AspNetCore.Tests/FusionTestBase.cs

@@ -1,4 +1,8 @@
+using System.Buffers;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
 using HotChocolate.AspNetCore;
+using HotChocolate.Buffers;
 using HotChocolate.Execution;
 using HotChocolate.Execution.Configuration;
 using HotChocolate.Fusion.Logging;
@@ -43,7 +47,8 @@ public TestServer CreateSourceSchema(
     public async Task<TestServer> CreateCompositeSchemaAsync(
         (string SchemaName, TestServer Server)[] sourceSchemaServers,
         Action<IServiceCollection>? configureServices = null,
-        Action<IApplicationBuilder>? configureApplication = null)
+        Action<IApplicationBuilder>? configureApplication = null,
+        [StringSyntax("json")] string? schemaSettings = null)
     {
         var sourceSchemas = new List<SourceSchemaText>();
         var gatewayServices = new ServiceCollection();
@@ -54,7 +59,11 @@ public async Task<TestServer> CreateCompositeSchemaAsync(
             var schemaDocument = await server.Services.GetSchemaAsync(name);
             sourceSchemas.Add(new SourceSchemaText(name, schemaDocument.ToString()));
             gatewayServices.AddHttpClient(name, server);
-            gatewayBuilder.AddHttpClientConfiguration(name, new Uri("http://localhost:5000/graphql"));
+
+            if (schemaSettings is null)
+            {
+                gatewayBuilder.AddHttpClientConfiguration(name, new Uri("http://localhost:5000/graphql"));
+            }
         }
 
         var compositionLog = new CompositionLog();
@@ -66,7 +75,14 @@ public async Task<TestServer> CreateCompositeSchemaAsync(
             throw new InvalidOperationException(result.Errors[0].Message);
         }
 
-        gatewayBuilder.AddInMemoryConfiguration(result.Value.ToSyntaxNode());
+        JsonDocumentOwner? settings = null;
+        if (schemaSettings is not null)
+        {
+            var body = JsonDocument.Parse(schemaSettings);
+            settings = new JsonDocumentOwner(body, new EmptyMemoryOwner());
+        }
+
+        gatewayBuilder.AddInMemoryConfiguration(result.Value.ToSyntaxNode(), settings);
         gatewayBuilder.AddHttpRequestInterceptor<OperationPlanHttpRequestInterceptor>();
         gatewayBuilder.ModifyRequestOptions(o => o.CollectOperationPlanTelemetry = false);
 
@@ -125,4 +141,11 @@ public override ValueTask OnCreateAsync(
             return base.OnCreateAsync(context, requestExecutor, requestBuilder, cancellationToken);
         }
     }
+
+    private class EmptyMemoryOwner : IMemoryOwner<byte>
+    {
+        public Memory<byte> Memory => default;
+
+        public void Dispose() { }
+    }
 }

src/HotChocolate/Fusion-vnext/test/Fusion.AspNetCore.Tests/__snapshots__/BookStoreTests.Fetch_Book_From_SourceSchema1_With_Settings.snap

@@ -0,0 +1,26 @@
+{
+  "data": {
+    "bookById": {
+      "id": 1,
+      "title": "C# in Depth"
+    }
+  },
+  "extensions": {
+    "fusion": {
+      "operationPlan": {
+        "operation": {
+          "document": "{\n  bookById(id: 1) {\n    id\n    title\n  }\n}",
+          "hash": "da31ef9bfb0a7c42de9b1578b454d0af"
+        },
+        "nodes": [
+          {
+            "id": 1,
+            "type": "Operation",
+            "schema": "a",
+            "operation": "query Op_da31ef9b_1 {\n  bookById(id: 1) {\n    id\n    title\n  }\n}"
+          }
+        ]
+      }
+    }
+  }
+}