ensure upload :content works #74

epiccastle · Jun 3, 2020 · 9305a09 · 9305a09
1 parent 0a69d4d
commit 9305a09
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 21 deletions.
diff --git a/src/clj/spire/module/upload.clj b/src/clj/spire/module/upload.clj
@@ -230,20 +230,10 @@
                                   )))))
 
                ;; straight single copy
-               (let [local-md5 (digest/md5 content)
-                     remote-md5 (some-> (facts/on-shell
-                                         :csh (run (format "%s \"%s\"" (facts/md5) dest))
-                                         :else (run (format "%s \"%s\"" (facts/md5) dest)))
-                                        process-md5-out
-                                        first)
-                     ;; _ (println "l:" local-md5 "r:" remote-md5)
-                     ;; _ (do (println "\n\n\n"))
-                     ]
-                 (comment (prn "local-md5:" local-md5)
-                          (prn "remote-md5:" remote-md5))
+               (if content?
+                 ;; content upload
                  (scp-result
-                  (when (not= local-md5 remote-md5)
-                    (scp/scp-to session content dest
+                    (scp/scp-content-to session content dest
                                 :progress-fn progress-fn
                                 :preserve preserve
                                 :dir-mode (or dir-mode 0755)
@@ -252,7 +242,32 @@
                                 :exec-fn exec-fn
                                 :shell-fn shell-fn
                                 :stdin-fn stdin-fn
-                                )))))
+                                ))
+
+                 ;; file upload
+                 (let [local-md5 (digest/md5 content)
+                       remote-md5 (some-> (facts/on-shell
+                                           :csh (run (format "%s \"%s\"" (facts/md5) dest))
+                                           :else (run (format "%s \"%s\"" (facts/md5) dest)))
+                                          process-md5-out
+                                          first)
+                       ;; _ (println "l:" local-md5 "r:" remote-md5)
+                       ;; _ (do (println "\n\n\n"))
+                       ]
+                   (comment (prn "local-md5:" local-md5)
+                            (prn "remote-md5:" remote-md5))
+                   (scp-result
+                    (when (not= local-md5 remote-md5)
+                      (scp/scp-to session content dest
+                                  :progress-fn progress-fn
+                                  :preserve preserve
+                                  :dir-mode (or dir-mode 0755)
+                                  :mode (or mode 0644)
+                                  :exec exec
+                                  :exec-fn exec-fn
+                                  :shell-fn shell-fn
+                                  :stdin-fn stdin-fn
+                                  ))))))
 
              passed-attrs? (or owner group dir-mode mode attrs)
 

diff --git a/test/clojure/spire/module/upload_test.clj b/test/clojure/spire/module/upload_test.clj
@@ -142,10 +142,13 @@
              {:result :changed, :attr-result {:result :changed}, :copy-result {:result :changed}}
              ))
       (is (= (test-utils/run (format "cd '%s'; find ." path-a))
-             (test-utils/run (format "cd '%s'; find ." path-b))))
-      )
-
-
-
-    )
-  )
+             (test-utils/run (format "cd '%s'; find ." path-b)))))))
+
+(deftest upload-content
+  (testing "upload :content works"
+    (let [dest "/tmp/spire-upload-test-content"
+          content "this is a test"]
+      (test-utils/remove-file dest)
+      (is (= (upload/upload {:dest dest :content content})
+             {:result :changed, :attr-result {:result :ok}, :copy-result {:result :changed}}))
+      (is (= content (slurp dest))))))