Added Service Discovery to Gateway (#6976)

michaelstaib · web-flow · commit 2a1f1bc8eb8d · 2024-03-07T19:43:49.000-08:00
diff --git a/src/HotChocolate/Fusion/src/Abstractions/Composition/HttpClientConfiguration.cs b/src/HotChocolate/Fusion/src/Abstractions/Composition/HttpClientConfiguration.cs
diff --git a/src/HotChocolate/Fusion/src/Abstractions/Composition/JsonElementExtensions.cs b/src/HotChocolate/Fusion/src/Abstractions/Composition/JsonElementExtensions.cs
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using HotChocolate.Utilities;
 
-namespace HotChocolate.Fusion;
+namespace HotChocolate.Fusion.Composition;
 
 internal static class JsonElementExtensions
 {
diff --git a/src/HotChocolate/Fusion/src/Abstractions/Composition/SubgraphConfigJson.cs b/src/HotChocolate/Fusion/src/Abstractions/Composition/SubgraphConfigJson.cs
@@ -1,7 +1,6 @@
 using System.Text.Json;
-using HotChocolate.Fusion.Composition;
 
-namespace HotChocolate.Fusion;
+namespace HotChocolate.Fusion.Composition;
 
 /// <summary>
 /// The runtime representation of subgraph-config.json.
diff --git a/src/HotChocolate/Fusion/src/Abstractions/Composition/SubgraphConfigJsonSerializer.cs b/src/HotChocolate/Fusion/src/Abstractions/Composition/SubgraphConfigJsonSerializer.cs
@@ -1,9 +1,8 @@
 using System.Buffers;
 using System.Text;
 using System.Text.Json;
-using HotChocolate.Fusion.Composition;
 
-namespace HotChocolate.Fusion;
+namespace HotChocolate.Fusion.Composition;
 
 /// <summary>
 /// Represents the formatter for the core subgraph configuration.
diff --git a/src/HotChocolate/Fusion/src/Abstractions/Composition/SubgraphConfiguration.cs b/src/HotChocolate/Fusion/src/Abstractions/Composition/SubgraphConfiguration.cs
@@ -115,4 +115,4 @@ public SubgraphConfiguration(
     /// Gets the configuration extension.
     /// </summary>
     public JsonElement? ConfigurationExtensions { get; }
-}
+}
diff --git a/src/HotChocolate/Fusion/src/Abstractions/Composition/WebSocketClientConfiguration.cs b/src/HotChocolate/Fusion/src/Abstractions/Composition/WebSocketClientConfiguration.cs
diff --git a/src/HotChocolate/Fusion/src/Abstractions/IClientConfiguration.cs b/src/HotChocolate/Fusion/src/Abstractions/IClientConfiguration.cs
@@ -3,6 +3,4 @@ namespace HotChocolate.Fusion.Composition;
 /// <summary>
 /// Represents a configuration for an HTTP client that can be used to fetch data from a subgraph.
 /// </summary>
-public interface IClientConfiguration
-{
-}
+public interface IClientConfiguration;
diff --git a/src/HotChocolate/Fusion/src/Composition/CompositionContext.cs b/src/HotChocolate/Fusion/src/Composition/CompositionContext.cs
@@ -50,7 +50,7 @@ public CompositionContext(
     /// Gets the subgraph configurations.
     /// </summary>
     public IReadOnlyList<SubgraphConfiguration> Configurations { get; }
-    
+
     /// <summary>
     /// Gets the composition features.
     /// </summary>
@@ -90,7 +90,7 @@ public CompositionContext(
     /// Gets a set that can be used to calculate subgraph support of a component.
     /// </summary>
     public HashSet<string> SupportedBy { get; } = new(StringComparer.OrdinalIgnoreCase);
-    
+
     /// <summary>
     /// Gets a map that can be used to store custom context data.
     /// </summary>
@@ -132,7 +132,7 @@ public bool TryGetSubgraphMember<T>(
         [NotNullWhen(true)] out T? member)
         where T : ITypeSystemMember
         => GetSubgraphSchema(subgraphName).TryGetMember(coordinate, out member);
-    
+
     public IEnumerable<T> GetSubgraphMembers<T>(SchemaCoordinate coordinate)
         where T : ITypeSystemMember
     {
@@ -144,4 +144,4 @@ public IEnumerable<T> GetSubgraphMembers<T>(SchemaCoordinate coordinate)
             }
         }
     }
-}
+}
diff --git a/src/HotChocolate/Fusion/src/Composition/FusionGraphComposer.cs b/src/HotChocolate/Fusion/src/Composition/FusionGraphComposer.cs
@@ -32,19 +32,17 @@ public FusionGraphComposer(
         bool fusionTypeSelf = false,
         Func<ICompositionLog>? logFactory = null)
         : this(
-            new IEntityEnricher[]
-            {
+            [
                 new RefResolverEntityEnricher(),
                 new PatternEntityEnricher(),
                 new RequireEnricher(),
                 new NodeEntityEnricher(),
-            },
-            new ITypeMergeHandler[]
-            {
+            ],
+            [
                 new InterfaceTypeMergeHandler(), new UnionTypeMergeHandler(),
                 new InputObjectTypeMergeHandler(), new EnumTypeMergeHandler(),
                 new ScalarTypeMergeHandler(),
-            },
+            ],
             fusionTypePrefix,
             fusionTypeSelf,
             logFactory)
diff --git a/src/HotChocolate/Fusion/src/Composition/Pipeline/IMergeMiddleware.cs b/src/HotChocolate/Fusion/src/Composition/Pipeline/IMergeMiddleware.cs
@@ -1,6 +1,6 @@
 namespace HotChocolate.Fusion.Composition.Pipeline;
 
-internal  interface IMergeMiddleware
+internal interface IMergeMiddleware
 {
     ValueTask InvokeAsync(CompositionContext context, MergeDelegate next);
 }
diff --git a/src/HotChocolate/Fusion/src/Composition/Pipeline/ParseSubGraphSchemaMiddleware.cs b/src/HotChocolate/Fusion/src/Composition/Pipeline/ParseSubGraphSchemaMiddleware.cs
@@ -110,11 +110,6 @@ private static void CreateMissingTypes(
         }
     }
 
-    private void AlignTypes(Schema schema)
-    {
-
-    }
-
     private static void TryCreateMissingType<T>(
         CompositionContext context,
         T sourceType,
diff --git a/src/HotChocolate/Fusion/src/Core/DependencyInjection/FusionRequestExecutorBuilderExtensions.cs b/src/HotChocolate/Fusion/src/Core/DependencyInjection/FusionRequestExecutorBuilderExtensions.cs
@@ -217,6 +217,22 @@ public static FusionGatewayBuilder RegisterGatewayConfiguration(
         builder.CoreBuilder.AddTypeModule<GatewayConfigurationTypeModule>();
         return builder;
     }
+    
+    /// <summary>
+    /// Rewrites the gateway configuration to use the service discovery for HTTP clients.
+    /// </summary>
+    /// <param name="builder">
+    /// The gateway builder.
+    /// </param>
+    /// <returns>
+    /// Returns the gateway builder for configuration chaining.
+    /// </returns>
+    public static FusionGatewayBuilder AddServiceDiscoveryRewriter(
+        this FusionGatewayBuilder builder)
+    {
+        builder.Services.AddSingleton<IConfigurationRewriter, ServiceDiscoveryConfigurationRewriter>();
+        return builder;
+    }
 
     /// <summary>
     /// Uses the default fusion gateway pipeline.
diff --git a/src/HotChocolate/Fusion/src/Core/Metadata/ConfigurationRewriter.cs b/src/HotChocolate/Fusion/src/Core/Metadata/ConfigurationRewriter.cs
@@ -117,4 +117,4 @@ protected virtual ValueTask<WebSocketClientConfiguration> RewriteAsync(
         WebSocketClientConfiguration configuration,
         CancellationToken cancellationToken)
         => new(configuration);
-}
+}
diff --git a/src/HotChocolate/Fusion/src/Core/Metadata/ServiceDiscoveryConfigurationRewriter.cs b/src/HotChocolate/Fusion/src/Core/Metadata/ServiceDiscoveryConfigurationRewriter.cs
@@ -0,0 +1,16 @@
+namespace HotChocolate.Fusion.Metadata;
+
+internal sealed class ServiceDiscoveryConfigurationRewriter : ConfigurationRewriter
+{
+    protected override ValueTask<HttpClientConfiguration> RewriteAsync(
+        HttpClientConfiguration configuration,
+        CancellationToken cancellationToken)
+    {
+        var x = configuration with
+        {
+            EndpointUri = new Uri($"http://{configuration.SubgraphName}/graphql")
+        };
+        
+        return new ValueTask<HttpClientConfiguration>(x);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System.Text.Json;`
`2`	`2`	`using HotChocolate.Utilities;`
`3`	`3`
`4`		`-namespace HotChocolate.Fusion;`
	`4`	`+namespace HotChocolate.Fusion.Composition;`
`5`	`5`
`6`	`6`	`internal static class JsonElementExtensions`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace HotChocolate.Fusion.Composition.Pipeline;`
`2`	`2`
`3`		`-internal interface IMergeMiddleware`
	`3`	`+internal interface IMergeMiddleware`
`4`	`4`	`{`
`5`	`5`	`ValueTask InvokeAsync(CompositionContext context, MergeDelegate next);`
`6`	`6`	`}`