Allow sources to be specified as Environment Variables

resolves fsprojects#1796
msarilar · Sep 3, 2024 · da3c2f7 · da3c2f7
1 parent d6fee24
commit da3c2f7
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/src/Paket.Core/Versioning/PackageSources.fs b/src/Paket.Core/Versioning/PackageSources.fs
@@ -132,7 +132,12 @@ type PackageSource =
             else
                 parts.[1].Replace("\"","").TrimEnd([| '/' |])
 
-        let feed = normalizeFeedUrl source
+        let feed =
+            EnvironmentVariable.Create(source)
+            |> Option.map (fun var -> var.Value)
+            |> Option.defaultValue source
+            |> normalizeFeedUrl
+
         PackageSource.Parse(feed, parseAuth(line, feed))
 
     static member Parse(source,auth) =

diff --git a/tests/Paket.Tests/DependenciesFile/ParserSpecs.fs b/tests/Paket.Tests/DependenciesFile/ParserSpecs.fs
@@ -750,7 +750,7 @@ nuget Rx-Main
 let ``should read config with password in env variable``() = 
     Environment.SetEnvironmentVariable("FEED_USERNAME", "user XYZ", EnvironmentVariableTarget.Process)
     Environment.SetEnvironmentVariable("FEED_PASSWORD", "pw Love", EnvironmentVariableTarget.Process)
-    let cfg = DependenciesFile.FromSource( configWithPasswordInEnvVariable)
+    let cfg = DependenciesFile.FromSource(configWithPasswordInEnvVariable)
 
     cfg.Groups.[Constants.MainDependencyGroup].Sources 
     |> shouldEqual [ 
@@ -769,7 +769,7 @@ nuget Rx-Main
 let ``should read config with password in env variable and auth type specified``() = 
     Environment.SetEnvironmentVariable("FEED_USERNAME", "user XYZ", EnvironmentVariableTarget.Process)
     Environment.SetEnvironmentVariable("FEED_PASSWORD", "pw Love", EnvironmentVariableTarget.Process)
-    let cfg = DependenciesFile.FromSource( configWithPasswordInEnvVariableAndAuthType)
+    let cfg = DependenciesFile.FromSource(configWithPasswordInEnvVariableAndAuthType)
 
     cfg.Groups.[Constants.MainDependencyGroup].Sources 
     |> shouldEqual [ 
@@ -779,6 +779,22 @@ let ``should read config with password in env variable and auth type specified``
     cfg.Groups.[Constants.MainDependencyGroup].Sources.Head.Auth.Retrieve true
         |> shouldEqual (Some (Credentials{ Username = "user XYZ"; Password = "pw Love"; Type = NetUtils.AuthType.NTLM}))
 
+let configWithSourceInEnvVariable = """
+source %FEED_URL%
+nuget Rx-Main
+"""
+
+[<Test>]
+let ``should read config with source in env variable``() = 
+    Environment.SetEnvironmentVariable("FEED_URL", "http://www.nuget.org/api/v2", EnvironmentVariableTarget.Process)
+    let cfg = DependenciesFile.FromSource(configWithSourceInEnvVariable)
+
+    cfg.Groups.[Constants.MainDependencyGroup].Sources 
+    |> shouldEqual [ 
+        PackageSource.NuGetV2 { 
+            Url = "http://www.nuget.org/api/v2"
+            Authentication = AuthProvider.empty} ]
+
 let configWithExplicitVersions = """
 source "http://www.nuget.org/api/v2"