From bb3f9a3ff2cdcb2fd312acf740d870d2e996c945 Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Tue, 29 Mar 2022 18:51:39 +0300
Subject: [PATCH] renamed and updated yarpJson builder to add environment
 variables

---
 .../src/EShopOnAbp.WebPublicGateway/Program.cs        |  2 +-
 gateways/web/src/EShopOnAbp.WebGateway/Program.cs     |  2 +-
 .../GatewayHostBuilderExtensions.cs                   | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Program.cs b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Program.cs
index d60f0442..bb1e553f 100644
--- a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Program.cs
+++ b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Program.cs
@@ -23,7 +23,7 @@ public class Program
             var builder = WebApplication.CreateBuilder(args);
             builder.Host
                 .AddAppSettingsSecretsJson()
-                .AddOcelotJson()
+                .AddYarpJson()
                 .UseAutofac()
                 .UseSerilog();
 
diff --git a/gateways/web/src/EShopOnAbp.WebGateway/Program.cs b/gateways/web/src/EShopOnAbp.WebGateway/Program.cs
index 244114fe..a8e13d49 100644
--- a/gateways/web/src/EShopOnAbp.WebGateway/Program.cs
+++ b/gateways/web/src/EShopOnAbp.WebGateway/Program.cs
@@ -22,7 +22,7 @@ public class Program
             var builder = WebApplication.CreateBuilder(args);
             builder.Host
                 .AddAppSettingsSecretsJson()
-                .AddOcelotJson()
+                .AddYarpJson()
                 .UseAutofac()
                 .UseSerilog();
 
diff --git a/shared/EShopOnAbp.Shared.Hosting.Gateways/GatewayHostBuilderExtensions.cs b/shared/EShopOnAbp.Shared.Hosting.Gateways/GatewayHostBuilderExtensions.cs
index a2663f9a..c22d86b7 100644
--- a/shared/EShopOnAbp.Shared.Hosting.Gateways/GatewayHostBuilderExtensions.cs
+++ b/shared/EShopOnAbp.Shared.Hosting.Gateways/GatewayHostBuilderExtensions.cs
@@ -6,7 +6,7 @@ public static class AbpHostingHostBuilderExtensions
 {
     public const string AppYarpJsonPath = "yarp.json";
 
-    public static IHostBuilder AddOcelotJson(
+    public static IHostBuilder AddYarpJson(
         this IHostBuilder hostBuilder,
         bool optional = true,
         bool reloadOnChange = true,
@@ -15,10 +15,11 @@ public static class AbpHostingHostBuilderExtensions
         return hostBuilder.ConfigureAppConfiguration((_, builder) =>
         {
             builder.AddJsonFile(
-                path: AppYarpJsonPath,
-                optional: optional,
-                reloadOnChange: reloadOnChange
-            );
+                    path: AppYarpJsonPath,
+                    optional: optional,
+                    reloadOnChange: reloadOnChange
+                )
+                .AddEnvironmentVariables();
         });
     }
 }
\ No newline at end of file