Best way to load envs, adjustments in pipeline

.github/workflows/clojure.yml

@@ -2,18 +2,26 @@ name: Clojure CI
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main", "develop"]
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Install dependencies
-      run: lein deps
-    - name: Run tests
-      run: lein test
+      - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: lein deps
+      - name: Run tests
+        run: lein test
+        env:
+          PORT: 3000
+          STRAVA_DOMAIN: https://www.strava.com
+          STRAVA_API_URL: /api/v3
+          STRAVA_CODE: code
+          STRAVA_CLIENT_ID: ${{ secrets.STRAVA_CLIENT_ID }}
+          STRAVA_CLIENT_SECRET: ${{ secrets.STRAVA_CLIENT_SECRET }}
+          STRAVA_REFRESH_TOKEN: ${{ secrets.STRAVA_REFRESH_TOKEN }}
+          STRAVA_USER_ID: ${{ secrets.STRAVA_USER_ID }}

.gitignore

@@ -6,7 +6,9 @@ pom.xml
 pom.xml.asc
 *.jar
 *.class
-/resources/.env
+.env
+.lein-env
+config.edn
 .calva
 .clj-kondo
 .lsp

config.edn.example

@@ -0,0 +1,8 @@
+{:strava-domain "https://www.strava.com"
+:strava-api-url "/api/v3"
+:strava-client-id "number"
+:strava-client-secret "hash"
+:strava-refresh-token "hash"
+:strava-user-id "number"
+:strava-code "hash"
+:port 3000}

project.clj

@@ -5,6 +5,7 @@
             :url "https://www.eclipse.org/legal/epl-2.0/"}
   :dependencies [[org.clojure/clojure "1.11.1"]
                  [compojure "1.7.0"]
+                 [yogthos/config "1.2.1"]
                  [http-kit "2.6.0"]
                  [org.clojure/data.json "2.4.0"]
                  [clj-http "3.12.3"]

src/strava_api/strava.clj

@@ -13,7 +13,7 @@
     (throw (ex-info (str "HTTP error " status) {:status status :body body}))))
 
 (defn fetch-access-token []
-  (let [response (client/post (str (env-var :strava-domain) "/api/v3/oauth/token")
+  (let [response (client/post (str (env-var :domain) "/api/v3/oauth/token")
                               {:body (json/write-str {:client_id (env-var :client-id)
                                                       :client_secret (env-var :client-secret)
                                                       :refresh_token (env-var :refresh-token)
@@ -26,7 +26,7 @@
 
 (defn fetch-activities [access-token]
   (let [response (client/get (str
-                              (env-var :strava-domain)
+                              (env-var :domain)
                               "/api/v3/athletes/"
                               (env-var :user-id)
                               "/stats")

src/strava_api/utils.clj

@@ -1,26 +1,15 @@
 (ns strava-api.utils
-  (:require [clojure.java.io :as io]
-            [clojure.string :as string]))
-
-(defn read-file [filename]
-  (with-open [rdr (clojure.java.io/reader filename)]
-    (->> rdr
-         (line-seq)
-         (map #(clojure.string/split % #"="))
-         (map #(assoc {} (keyword (first %)) (second %)))
-         (reduce merge))))
-
-(def env-vars (read-file "resources/.env"))
+  (:require [config.core :refer [env]]))
 
 (defn get-env-vars []
-  {:strava-domain (get env-vars :STRAVA_DOMAIN)
-   :api-url (get env-vars :STRAVA_API_URL)
-   :client-id (get env-vars :STRAVA_CLIENT_ID)
-   :client-secret (get env-vars :STRAVA_CLIENT_SECRET)
-   :refresh-token (get env-vars :STRAVA_REFRESH_TOKEN)
-   :code (get env-vars :STRAVA_CODE)
-   :user-id (get env-vars :STRAVA_USER_ID)
-   :port (Integer. (get env-vars :PORT))})
+  {:domain    (:strava-domain env)
+   :api-url          (:strava-api-url env)
+   :client-id        (:strava-client-id env)
+   :client-secret    (:strava-client-secret env)
+   :refresh-token    (:strava-refresh-token env)
+   :code             (:strava-code env)
+   :user-id          (:strava-user-id env)
+   :port             (Integer. (:port env))})
 
 (defn round-to [number precision]
   (let [factor (Math/pow 10 precision)]

test/strava_api/utils_test.clj

@@ -2,14 +2,7 @@
   (:require [clojure.test :refer [deftest
                                   is
                                   testing]]
-            [strava-api.utils :refer [read-file
-                                      round-to]]))
-
-(deftest test-read-file
-  (testing "Test read-file function"
-    (let [result (read-file "resources/test.env")]
-      (is (= "11222" (:STRAVA_CLIENT_ID result)))
-      (is (= "https://www.strava.com" (:STRAVA_DOMAIN result))))))
+            [strava-api.utils :refer [round-to]]))
 
 (deftest test-round-to
   (testing "Test round-to function"