#296 still hacking this idea around

ThreeMammals · Apr 15, 2018 · c5aa11f · c5aa11f
1 parent 3ae2b28
commit c5aa11f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/src/Ocelot/DependencyInjection/ConfigurationBuilderExtensions.cs b/src/Ocelot/DependencyInjection/ConfigurationBuilderExtensions.cs
@@ -32,19 +32,32 @@ public static IConfigurationBuilder AddOcelot(this IConfigurationBuilder builder
             var reg = new Regex(pattern);
 
             var files = Directory.GetFiles(".")
-                .Where(path => reg.IsMatch(path))
+                .Where(path => reg.IsMatch(path)).Where(x => x.Count(s => s == '.') == 3)
                 .ToList();
 
+            FileConfiguration ocelotConfig = new FileConfiguration();
+
             foreach (var file in files)
             {
+                if(files.Count > 1 && file == "./ocelot.json")
+                {
+                    continue;
+                }
+
                 var lines = File.ReadAllText(file);
                 var config = JsonConvert.DeserializeObject<FileConfiguration>(lines);
 
+                if(file ==  "./ocelot.global.json")
+                {
+                    ocelotConfig.GlobalConfiguration = config.GlobalConfiguration;
+                }
+
+                ocelotConfig.Aggregates.AddRange(config.Aggregates);
+                ocelotConfig.ReRoutes.AddRange(config.ReRoutes);
             }
 
-            //var load all files with ocelot*.json
-            //merge these files into one
-            //save it as ocelot.json
+            var json = JsonConvert.SerializeObject(ocelotConfig);
+            File.WriteAllText("ocelot.json", json);
             builder.AddJsonFile("ocelot.json");
             return builder;
         }

diff --git a/test/Ocelot.UnitTests/DependencyInjection/ConfigurationBuilderExtensionsTests.cs b/test/Ocelot.UnitTests/DependencyInjection/ConfigurationBuilderExtensionsTests.cs
@@ -73,11 +73,11 @@ public void should_merge_files()
             File.WriteAllText("ocelot.global.json", globalJson);
 
             var reRouteJson = JsonConvert.SerializeObject(reRoute);
-            File.WriteAllText("ocelot.reRoute.json", reRouteJson);
+            File.WriteAllText("ocelot.reRoutes.json", reRouteJson);
 
             IConfigurationBuilder builder = new ConfigurationBuilder();
             builder.AddOcelot();
-
+            var configRoot = builder.Build();
         }
 
         private void GivenTheBaseUrl(string baseUrl)