Second fix to netrc

Author: ericdallo

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Fix `${netrc:...} ` to consider `:netrcFile` config properly.
+
 ## 0.84.1
 
 - Fix `${netrc:...} ` to consider `:netrcFile` config.

src/eca/config.clj

@@ -175,7 +175,7 @@
           (string/replace #"\$\{netrc:([^}]+)\}"
                           (fn [[_match key-rc]]
                             (try
-                              (or (secrets/get-credential key-rc (:netrcFile config)) "")
+                              (or (secrets/get-credential key-rc (get config "netrcFile")) "")
                               (catch Exception e
                                 (logger/warn logger-tag "Error reading netrc credential:" (.getMessage e))
                                 ""))))))

test/eca/config_test.clj

@@ -342,6 +342,12 @@
                                            (when (= key-rc "api.openai.com")
                                              "secret-password-123"))]
       (is (= "secret-password-123" (#'config/parse-dynamic-string "${netrc:api.openai.com}" "/tmp" {})))))
+(testing "replaces netrc pattern with credential password with a custom netrcFile"
+    (with-redefs [secrets/get-credential (fn [key-rc netrc-file]
+                                           (when (and (= key-rc "api.openai.com")
+                                                      (= netrc-file "/tmp/my-file"))
+                                             "secret-password-123"))]
+      (is (= "secret-password-123" (#'config/parse-dynamic-string "${netrc:api.openai.com}" "/tmp" {"netrcFile" "/tmp/my-file"})))))
 
   (testing "replaces netrc pattern with empty string when credential not found"
     (with-redefs [secrets/get-credential (constantly nil)]