Merge pull request #10 from YuKitsune/fix-env-in-parent-dir

Fix reading .env files from parent directories
YuKitsune · Oct 8, 2023 · 64d9f45 · 64d9f45
2 parents 1a7903f + 487860c
commit 64d9f45
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/YuKitsune.Configuration.Env/YuKitsune.Configuration.Env.Tests/EnvConfigurationSourceTests.cs b/YuKitsune.Configuration.Env/YuKitsune.Configuration.Env.Tests/EnvConfigurationSourceTests.cs
@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 using Microsoft.Extensions.Configuration;
 using Xunit;
@@ -26,5 +27,16 @@ public void CanLoadDotPrefixedFiles_FromRelativePath()
             var config = new ConfigurationBuilder().AddEnvFile(envFile).Build();
             Assert.Equal("val", config["var"]);
         }
+
+        [Fact]
+        public void CanLoadDotPrefixedFiles_FromParentDirectory()
+        {
+            var parentDirectory = new DirectoryInfo(Environment.CurrentDirectory).Parent!.FullName;
+            var envFile = Path.Join(parentDirectory, ".env");
+            File.WriteAllText(envFile, "var=val");
+
+            var config = new ConfigurationBuilder().AddEnvFile(envFile).Build();
+            Assert.Equal("val", config["var"]);
+        }
     }
 }
diff --git a/YuKitsune.Configuration.Env/YuKitsune.Configuration.Env/EnvConfigurationSource.cs b/YuKitsune.Configuration.Env/YuKitsune.Configuration.Env/EnvConfigurationSource.cs
@@ -23,7 +23,7 @@ public class EnvConfigurationSource : FileConfigurationSource
         public override IConfigurationProvider Build(IConfigurationBuilder builder)
         {
             // This is necessary as the default PhysicalFileProvider filters out dot-prefixed files (.env)
-            FileProvider = MakeFileProvider(AppContext.BaseDirectory);
+            FileProvider ??= MakeFileProvider(AppContext.BaseDirectory);
 
             EnsureDefaults(builder);
             return new EnvConfigurationProvider(this);