Implement getting credentials from environment

PositiveTechnologies · Mar 11, 2018 · 1bf08f0 · 1bf08f0
1 parent a899032
commit 1bf08f0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/flower-common/resources/config.edn b/flower-common/resources/config.edn
@@ -0,0 +1,3 @@
+{:account {}
+ :token {}
+ :url {}}
diff --git a/flower-common/src/flower/credentials.clj b/flower-common/src/flower/credentials.clj
@@ -1,5 +1,7 @@
 (ns flower.credentials
-  (:require [cprop.core :as cprop]))
+  (:require [clojure.java.io :as io]
+            [cprop.core :as cprop]
+            [cprop.source]))
 
 
 ;;
@@ -16,5 +18,11 @@
 ;;
 
 (defn get-credentials [& path]
-  (get-in (cprop/load-config :file *credentials-file*)
+  (get-in (if (.exists (io/as-file *credentials-file*))
+            (cprop/load-config :file *credentials-file*)
+            (cprop/load-config :merge [{:account {}
+                                        :token {}
+                                        :url {}}
+                                       (select-keys (cprop.source/from-env)
+                                                    [:account :token :url])]))
           path))