refactor for repo-command

infrastructure/backup/test/resources/test.bb

@@ -2,38 +2,47 @@
 
 (require '[babashka.tasks :as tasks]
          '[dda.backup.management :as mgm]
-         '[dda.backup.postgresql :as ps]
+         '[dda.backup.postgresql :as pg]
          '[dda.backup.backup :as bak]
          '[dda.backup.restore :as rs])
 
 (def restic-repo {:password-file "restic-pwd"
                   :restic-repository "restic-repo"})
 
-(defn prepare!
+(def file-config (merge restic-repo {:backup-path "files"
-  []
+                                     :files ["test-backup"]
-  (ps/create-pg-pass! (merge restic-repo {:backup-path "db"
+                                     :target-directory "test-restore"}))
+
+
+(def db-config (merge restic-repo {:backup-path "db"
                                    :pg-db "mydb"
                                    :pg-user "user"
-                                          :pg-password "password"})))
+                                   :pg-password "password"}))
+
+(def dry-run {:dry-run true :debug true})
+
+(defn prepare!
+  []
+  (pg/create-pg-pass! db-config))
 
 (defn restic-repo-init!
   []
   (spit "restic-pwd" "ThePassword")
-  (mgm/init! (merge restic-repo {:backup-path "files"}))
+  (mgm/init! file-config)
-  (mgm/init! (merge restic-repo {:backup-path "db" :dry-run true :debug true})))
+  (mgm/init! (merge db-config dry-run)))
 
 (defn restic-backup!
   []
   (tasks/shell "mkdir" "-p" "test-backup")
   (spit "test-backup/file" "I was here")
-  (bak/backup! (merge restic-repo {:backup-path "files"
+  (bak/backup! file-config))
-                                   :files ["test-backup"]})))
 
 (defn restic-restore!
   []
   (tasks/shell "mkdir" "-p" "test-restore")
-  (rs/restore! (merge restic-repo {:backup-path "files"
+  (rs/restore! file-config)
-                                   :target-directory "test-restore"})))
+  (pg/drop-create-db! (merge db-config dry-run))
+  )
 
 (prepare!)
 (restic-repo-init!)

src/dda/backup/backup/domain.clj

@@ -14,4 +14,4 @@
 (defn-spec backup-files-command ::cd/commands
   [config ::config]
   (let [{:keys [files]} config]
-    (cd/repo-command config (into ["backup"] files))))
+    [(cd/repo-command config (into ["backup"] files))]))

src/dda/backup/core/domain.clj

@@ -20,11 +20,11 @@
   (s/keys :req-un [::restic-repository ::backup-path ::days-to-keep ::months-to-keep]
           :opt-un [::certificate-file ::password-file ::directory]))
 
-(defn-spec repo-command ::commands
+(defn-spec repo-command ::command
   [config ::config
    command ::command]
   (let [{:keys [certificate-file password-file directory restic-repository backup-path]} config]
-    [(into
+    (into
      []
      (concat
       (if (some? directory)
@@ -38,4 +38,4 @@
         ["--password-file" password-file]
         :else
         [])
-       command))]))
+      command))))

src/dda/backup/management/domain.clj

@@ -10,24 +10,24 @@
 
 (defn-spec check-repo-command ::cd/commands
   [config ::config]
-  (cd/repo-command config ["check"]))
+  [(cd/repo-command config ["check"])])
 
 (defn-spec init-repo-command ::cd/commands
   [config ::config]
-  (cd/repo-command config ["init"]))
+  [(cd/repo-command config ["init"])])
 
 (defn-spec unlock-repo-command ::cd/commands
   [config ::config]
-  (cd/repo-command config ["--cleanup-cache" "unlock"]))
+  [(cd/repo-command config ["--cleanup-cache" "unlock"])])
 
 (defn-spec list-snapshot-command ::cd/commands
   [config ::config]
-  (cd/repo-command config ["snapshots"]))
+  [(cd/repo-command config ["snapshots"])])
 
 (defn-spec forget-command ::cd/commands
   [config ::config]
   (let [{:keys [days-to-keep months-to-keep]} config]
-    (cd/repo-command config ["forget" "--group-by" ""
+    [(cd/repo-command config ["forget" "--group-by" ""
                               "--keep-last" "1"
                               "--keep-daily" (str days-to-keep)
-                             "--keep-monthly" (str months-to-keep) "--prune"])))
+                              "--keep-monthly" (str months-to-keep) "--prune"])]))

src/dda/backup/postgresql.clj

@@ -28,6 +28,7 @@
                    ::cd/dry-run
                    ::cd/debug]))
 
+
 (defn-spec create-pg-pass! nil?
   [config ::config]
   (let [config-w-defaults (merge default config)]
@@ -37,7 +38,7 @@
 (defn-spec drop-create-db! nil?
   [config ::config]
   (let [config-w-defaults (merge default config)]
-    ((i/execute!  (domain/db-drop-create-command config-w-defaults)))))
+    (i/execute! (domain/db-drop-create-command config-w-defaults) config-w-defaults)))
 
 ;; function backup-roles() {
 ;;   local role_prefix="$1"; shift

src/dda/backup/restore/domain.clj

@@ -15,5 +15,5 @@
 (defn-spec restore-dir-command ::cd/commands
   [config ::config]
   (let [{:keys [target-directory snapshot-id]} config]
-    (into [["rm" "-rf" target-directory]]
+    [["rm" "-rf" target-directory]
-          (cd/repo-command config ["restore" snapshot-id "--target" target-directory]))))
+     (cd/repo-command config ["restore" snapshot-id "--target" target-directory])]))

test/dda/backup/core/domain_test.clj

@@ -18,7 +18,7 @@
                                     ["restic" "-r" "repo/dir" "-v" "init" "--cacert" "ca"]]))))
 
 (deftest should-calculate-repo-command
-  (is (= [[{:dir "dir"}
+  (is (=  [{:dir "dir"}
            "restic"
            "-r"
            "repo/dir"
@@ -27,7 +27,7 @@
            "ca"
            "backup"
            "file1"
-           "file2"]]
+           "file2"]
           (cut/repo-command {:certificate-file "ca"
                              :directory "dir"
                              :restic-repository "repo"
@@ -35,21 +35,21 @@
                              :days-to-keep 39
                              :months-to-keep 3}
                             ["backup" "file1" "file2"])))
-  (is (= [["restic" "-r" "repo/dir" "-v" "--cacert" "ca" "snapshots"]]
+  (is (= ["restic" "-r" "repo/dir" "-v" "--cacert" "ca" "snapshots"]
          (cut/repo-command {:certificate-file "ca"
                             :restic-repository "repo"
                             :backup-path "dir"
                             :days-to-keep 39
                             :months-to-keep 3}
                            ["snapshots"])))
-  (is (= [["restic" "-r" "repo/dir" "-v" "--password-file" "password" "snapshots"]]
+  (is (= ["restic" "-r" "repo/dir" "-v" "--password-file" "password" "snapshots"]
          (cut/repo-command {:password-file "password"
                             :restic-repository "repo"
                             :backup-path "dir"
                             :days-to-keep 39
                             :months-to-keep 3}
                            ["snapshots"])))
-  (is (= [["restic" "-r" "repo/dir" "-v" "snapshots"]]
+  (is (= ["restic" "-r" "repo/dir" "-v" "snapshots"]
          (cut/repo-command {:restic-repository "repo"
                             :backup-path "dir"
                             :days-to-keep 39