src/dda/backup/core.clj

@@ -2,7 +2,7 @@
   (:require
    [orchestra.core :refer [defn-spec]]
    [clojure.spec.alpha :as s]
-   [dda.backup.infrastructure :as i]))
+   [clojure.string :as st]))
 
 (def default {:dry-run false
               :debug false})
@@ -13,12 +13,6 @@
                    ::debug
                    ::execution-directory]))
 
-(s/def ::aws-access-key-id string?)
-(s/def ::aws-secret-access-key string?)
-(s/def ::aws-config
-  (s/keys :req-un [::aws-access-key-id
-                   ::aws-secret-access-key]))
-
 (defn-spec env-or-file string?
   [name string?]
   (let [from-env (System/getenv name)
@@ -28,14 +22,3 @@
       (some? name-from-file) (slurp name-from-file)
       :else (throw ( RuntimeException. 
                     (str "Environment: [" name "," name-from-file "] was missing." ))))))
-
-
-(defn-spec create-aws-credentials! nil?
-  [config ::aws-config]
-  (let [{:keys [aws-access-key-id aws-secret-access-key]} config]
-    (i/execute! [["mkdir" "/root/.aws"]] {})
-    (spit "/root/.aws/credentials"
-          (str "[default]\n"
-               "aws_access_key_id=" aws-access-key-id "\n"
-               "aws_secret_access_key=" aws-secret-access-key "\n"))
-    (i/execute! [["chmod" "0600" "/root/.aws/credentials"]] {})))

src/dda/backup/postgresql.clj

@@ -21,8 +21,7 @@
 (defn-spec create-pg-pass! nil?
   [config ::pg-config]
   (let [config-w-defaults (merge default config)]
-    (spit "/root/.pgpass" (domain/pgpass config-w-defaults))
+    (spit "/root/.pgpass" (domain/pgpass config-w-defaults))))
-    (i/execute! [["chmod" "0600" "/root/.pgpass"]] config)))
 
 (defn-spec drop-create-db! nil?
   [config ::pg-config]

src/dda/backup/postgresql/domain.clj

@@ -67,8 +67,8 @@
 
 (defn-spec pgpass string?
   [config ::pg-config]
-  (let [{:keys [pg-host pg-port pg-db pg-user pg-password]} config]
+  (let [{:keys [pg-host pg-db pg-user pg-password]} config]
-    (str pg-host ":" pg-port ":" pg-db ":" pg-user ":" pg-password)))
+    (str pg-host ":" pg-db ":" pg-user ":" pg-password)))
 
 (defn-spec db-drop-create-command ::cd/commands
   [config ::pg-config]

test/dda/backup/postgresql/domain_test.clj

@@ -8,7 +8,7 @@
 (st/instrument `cut/db-drop-create-command)
 
 (deftest should-calculate-pgpass
-  (is (= "localhost:5432:mydb:user:password"
+  (is (= "localhost:mydb:user:password"
          (cut/pgpass {:restic-repository "repo"
                       :backup-path "dir-at-repo"
                       :pg-host "localhost"