Allow passing of git ref on cli

nosana-ci · Mar 1, 2023 · 862d83f · 862d83f
1 parent 27d2ba1
commit 862d83f
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 24 deletions.
diff --git a/deps.edn b/deps.edn
@@ -3,7 +3,7 @@
  :deps
  {org.clojure/clojure  {:mvn/version "1.11.0"}
   nostromo/nostromo    {:git/url "https://github.com/nosana-ci/nostromo"
-                        :sha     "ac24852dbcf5fa2959e524ec465806b0a0f52b1b"}
+                        :sha     "19a427a5b764273fac8e175295239d32e497bfd2"}
   ;; nostromo/nostromo    {:local/root "../nostromo"}
 
   org.clojure/tools.cli {:mvn/version "1.0.214"}

diff --git a/src/nosana_node/main.clj b/src/nosana_node/main.clj
@@ -38,6 +38,9 @@
    [nil "--ipfs-url URL" "IPFS url"]
    [nil "--podman URI" "Podman connection URI"
     :id :podman-conn-uri]
+   [nil "--branch REF"
+    "Git branch to checkout. Defaults to the current directory with any stashed changes."
+    :id :git-branch]
    ["-v" nil "Verbosity level"
     :id :verbosity
     :default 0

diff --git a/src/nosana_node/pipeline.clj b/src/nosana_node/pipeline.clj
@@ -46,9 +46,9 @@
   (->> env
        (map (fn [[k v]]
               (case (:type v)
-                "nosana/secret" [k [:nosana/secret (:endpoint v) (:value v)]]
-                "nos/vault"     [k [:nos/vault (:value v)]]
-                "string"        [k v]
+                "nosana/secret" [(name k) [:nosana/secret (:endpoint v) (:value v)]]
+                "nos/vault"     [(name k) [:nos/vault (:value v)]]
+                "string"        [(name k) v]
                 [k v])))
        (into {"TERM"        "xterm-color"
               "FORCE_COLOR" "1"
@@ -136,14 +136,18 @@
         nos/build
         (assoc :default-args (:nos-default-args conf)))))
 
-(defn make-local-git-artifact! [dir artifact-name flow-id]
+(defn make-local-git-artifact! [dir artifact-name flow-id commit]
   (println "Creating artifact " )
-  (let [artifact               (str dir "/.nos/artifacts/" artifact-name)
-        _                      (io/make-parents artifact)
-        stash                  (-> (sh/sh "git" "-C" dir "stash" "create")
-                                   :out
-                                   (string/replace "\n" ""))
-        _                      (println "Created stash " stash " for working directory")
+  (let [artifact (str dir "/.nos/artifacts/" artifact-name)
+        _        (io/make-parents artifact)
+        stash    (if commit
+                   commit
+                   (-> (sh/sh "git" "-C" dir "stash" "create")
+                       :out
+                       (string/replace "\n" "")))
+        _        (when commit
+                   (println "Created stash " stash " for working directory"))
+
         {:keys [err out exit]} (sh/sh "git"
                                       "-C" dir
                                       "archive"
@@ -160,6 +164,15 @@
       :out
       (string/replace "\n" "")))
 
+(defn add-global-secrets
+  "Add secrets from `vault` to `global.environment` of the yaml."
+  [pipeline vault]
+  (let [global-env (get-in pipeline [:global :environment] {})
+        new-env    (reduce-kv (fn [m k v]
+                                (assoc m k {:type "nos/vault" :value k}))
+                              global-env vault)]
+    (assoc-in pipeline [:global :environment] new-env)))
+
 (defn run-local-pipeline [dir vault]
   (let [yaml-path  (str dir "/.nosana-ci.yml")
         vault-path (str dir "/.nosana-secrets.json")
@@ -168,24 +181,28 @@
             (throw (Exception.
                     "Missing a .nosana-ci.yml file in the current directory")))
 
-        yaml        (slurp yaml-path)
-        local-vault (if (.exists (io/as-file vault-path))
-                      (-> vault-path slurp json/decode)
-                      {})
-        commit      (get-git-sha dir)
-        pipeline    (-> yaml yaml/parse-string)
+        yaml            (slurp yaml-path)
+        local-vault     (if (.exists (io/as-file vault-path))
+                          (-> vault-path slurp json/decode)
+                          {})
+        commit          (get-git-sha dir)
+        pipeline        (-> yaml yaml/parse-string
+                            (add-global-secrets local-vault))
+        pipeline-commit (:git-branch vault)
+
         flow
         (-> {:ops []}
             (update :ops #(into [] (concat % (pipeline->flow-ops pipeline))))
             (assoc-in [:state :input/commit-sha] commit)
             nos/build
-            (assoc :default-args  {:container/run
-                                   {:conn          {:uri [:nos/vault :podman-conn-uri]}
-                                    :inline-logs?  true
-                                    :artifact-path (str dir "/.nos/artifacts")
-                                    :stdout?       true}}))]
-    (println "Flow ID is " (:id flow))
-    (make-local-git-artifact! dir "checkout" (:id flow))
+            (assoc :default-args
+                   {:container/run
+                    {:conn          {:uri [:nos/vault :podman-conn-uri]}
+                     :inline-logs?  true
+                     :artifact-path (str dir "/.nos/artifacts")
+                     :stdout?       true}}))]
+    (println "Flow ID is " (:id flow) " checking out " pipeline-commit)
+    (make-local-git-artifact! dir "checkout" (:id flow) pipeline-commit)
     (let [flow-engine {:store     (<!! (new-mem-store))
                        :chan      (chan)
                        :nos/vault (merge vault local-vault)}]