.gitlab-ci.yml

@@ -41,7 +41,7 @@ package-jar:
   <<: *clj
   stage: package
   script:
-    - pyb package
+    - pyb package_jar
   artifacts:
     paths:
       - target/org.domaindrivenarchitecture
@@ -51,7 +51,7 @@ release-to-clojars:
   <<: *tag_only
   stage: upload
   script:
-    - pyb upload
+    - pyb upload_clj
 
 dda-backup-image-publish:
   <<: *img

build.py

@@ -35,17 +35,17 @@ def initialize(project):
 
 
 @task
-def test(project):
+def test_clj(project):
     run("make test", shell=True, check=True)
 
 
 @task
-def package(project):
+def package_jar(project):
     run("make build-jar", shell=True, check=True)
 
 
 @task
-def upload(project):
+def upload_clj(project):
     run("make deploy", shell=True, check=True)
 
 

infrastructure/backup/image/Dockerfile

@@ -4,4 +4,3 @@ FROM ubuntu:24.04
 ADD resources /tmp/
 RUN /tmp/install.sh
 ADD local/ /usr/local/lib/dda-backup
-RUN init-bb.bb

infrastructure/backup/image/resources/bb.edn

@@ -1,3 +0,0 @@
-{:deps {org.clojure/spec.alpha {:mvn/version "0.4.233"}
-        orchestra/orchestra {:mvn/version "2021.01.01-1"}
-        org.domaindrivenarchitecture/dda-backup {:local/root "/usr/local/lib/dda-backup"}}}

infrastructure/backup/image/resources/init-bb.bb

@@ -1,3 +0,0 @@
-#!/usr/bin/env bb
-
-(println "initialized")

infrastructure/backup/image/resources/install.sh

@@ -15,15 +15,15 @@ function babashka_install() {
 function main() {
     {
         upgradeSystem
-        apt-get install -qqy ca-certificates curl gnupg postgresql-client-16 restic openjdk-21-jre-headless nano
+        apt-get install -qqy ca-certificates curl gnupg postgresql-client-16 restic
         curl -Ss --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/postgresql-common_pgdg_archive_keyring.gpg
         sh -c 'echo "deb [signed-by=/etc/apt/trusted.gpg.d/postgresql-common_pgdg_archive_keyring.gpg] https://apt.postgresql.org/pub/repos/apt jammy-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
         upgradeSystem
-        babashka_install      
+        babashka_install        
     } > /dev/null
 
     update-ca-certificates
-    install -m 0700 -o root -g root /tmp/init-bb.bb /usr/local/bin/
+
     cleanupDocker
 }
 

infrastructure/backup/test/Dockerfile

@@ -1,6 +1,7 @@
-FROM dda-backup:latest
+FROM c4k-forgejo-backup:latest
 
 # install it
-#ADD local/ /usr/local/lib/dda-backup
+RUN apt update && apt install -qqy openjdk-17-jre-headless
+ADD local/ /usr/local/lib/dda-backup
 ADD resources /tmp/
-RUN ENV_PASSWORD=env-password FILE_PASSWORD_FILE=/tmp/file_password /tmp/test.bb
+RUN ENV_PASSWORD=env-password /tmp/test.bb

infrastructure/backup/test/resources/install-test.bb

@@ -26,4 +26,6 @@
  "https://repo.prod.meissa.de/attachments/0a1da41e-aa5b-4a3e-a3b1-215cf2d5b021"
  "https://repo.prod.meissa.de/attachments/f227cf65-cb0f-46a7-a6cd-28f46917412a")
 (install! "provs-syspec.jar")
+(tasks/shell "apt" "update")
+(tasks/shell "apt" "install" "-qqy" "openjdk-17-jre-headless")
 (tasks/shell "java" "-jar" "/usr/local/bin/provs-syspec.jar" "local" "-c" "/tmp/spec.yml" )

infrastructure/backup/test/resources/test.bb

@@ -24,9 +24,9 @@
 
 (defn prepare!
   []
-  (spit "/tmp/file_password" "file-password")
+  (spit "file_password" "file-password")
-  (println (bc/env-or-file "FILE_PASSWORD"))
+  (println (bc/env-or-file "file_password"))
-  (println (bc/env-or-file "ENV_PASSWORD"))
+  (println (bc/env-or-file "env_password"))
   (spit "restic-pwd" "ThePassword")
   (tasks/shell "mkdir" "-p" "test-backup")
   (spit "test-backup/file" "I was here")
@@ -43,12 +43,6 @@
   (bak/backup-file! file-config)
   (bak/backup-db! (merge db-config dry-run)))
 
-(defn list-snapshots!
-  []
-  (rc/list-snapshots! file-config)
-  (rc/list-snapshots! (merge db-config dry-run)))
-
-
 (defn restic-restore!
   []  
   (rs/restore-file! file-config)
@@ -58,5 +52,4 @@
 (prepare!)
 (restic-repo-init!)
 (restic-backup!)
-(list-snapshots!)
 (restic-restore!)

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,29 +13,11 @@
                    ::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)
+  (let [name-upper (st/upper-case name)
-        name-from-file (System/getenv (str name "_FILE"))]
+        name-lower (st/lower-case name)
-    (cond 
+        from-env (System/getenv name-upper)]
-      (some? from-env) from-env
+    (if (some? from-env)
-      (some? name-from-file) (slurp name-from-file)
+      from-env
-      :else (throw ( RuntimeException. 
+      (slurp name-lower))))
-                    (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" "-p" "/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/infrastructure.clj

@@ -4,7 +4,7 @@
             [dda.backup.core.domain :as core]))
 
 (defn-spec execute! nil?
-  [commands ::core/commands
+  [commands ::core/command
    config ::core/execution]
   (let [{:keys [dry-run debug]} config]
     (doseq [c commands]

src/dda/backup/postgresql.clj

@@ -21,12 +21,9 @@
 (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]
   (let [config-w-defaults (merge default config)]
-    (try (i/execute! (domain/db-drop-command config-w-defaults) config-w-defaults)
+    (i/execute! (domain/db-drop-create-command config-w-defaults) config-w-defaults)))
-         (catch Exception e (println (.getMessage e))))
-    (i/execute! (domain/db-create-command config-w-defaults) config-w-defaults)))

src/dda/backup/postgresql/domain.clj

@@ -67,18 +67,12 @@
 
 (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 "\n" 
+    (str pg-host ":" pg-db ":" pg-user ":" pg-password)))
-         pg-host ":" pg-port ":template1:" pg-user ":" pg-password "\n")))
 
-(defn-spec db-drop-command ::cd/commands
+(defn-spec db-drop-create-command ::cd/commands
   [config ::pg-config]
   (let [{:keys [pg-db]} config
         config-w-template (merge config  {:pg-db "template1"})]
-    [(psql-command config-w-template ["-c" (str "DROP DATABASE \"" pg-db "\";")])]))
+    [(psql-command config-w-template ["-c" (str "\"DROP DATABASE \\\"" pg-db "\\\";\"")])
-
+     (psql-command config-w-template ["-c" (str "\"CREATE DATABASE \\\"" pg-db "\\\";\"")])]))
-(defn-spec db-create-command ::cd/commands
-  [config ::pg-config]
-  (let [{:keys [pg-db]} config
-        config-w-template (merge config  {:pg-db "template1"})]
-    [(psql-command config-w-template ["-c" (str "CREATE DATABASE \"" pg-db "\";")])]))

src/dda/backup/restic.clj

@@ -42,9 +42,4 @@
 (defn-spec forget! nil?
   [restic-config ::restic-config]
   (let [config-w-defaults (merge core/default restic-config)]
-    (i/execute! (domain/forget-command config-w-defaults) config-w-defaults)))
+    (i/execute! (domain/forget-command config-w-defaults) config-w-defaults)))
-
-(defn-spec list-snapshots! nil?
-  [restic-config ::restic-config]
-  (let [config-w-defaults (merge core/default restic-config)]
-    (i/execute! (domain/list-snapshot-command config-w-defaults) config-w-defaults)))

test/dda/backup/postgresql/domain_test.clj

@@ -5,11 +5,10 @@
    [dda.backup.postgresql.domain :as cut]))
 
 (st/instrument `cut/pgpass)
-(st/instrument `cut/db-drop-command)
+(st/instrument `cut/db-drop-create-command)
-(st/instrument `cut/db-create-command)
 
 (deftest should-calculate-pgpass
-  (is (= "localhost:5432:mydb:user:password\nlocalhost:5432:template1:user:password\n"
+  (is (= "localhost:mydb:user:password"
          (cut/pgpass {:restic-repository "repo"
                       :backup-path "dir-at-repo"
                       :pg-host "localhost"
@@ -18,21 +17,12 @@
                       :pg-user "user"
                       :pg-password "password"}))))
 
-(deftest should-calculate-db-drop-command
+(deftest should-calculate-db-drop-create-command
   (is (= [["psql" "-d" "template1" "-h" "localhost" "-p" "5432" "-U" "user"
-           "--no-password" "-c" "DROP DATABASE \"mydb\";"]]
+           "--no-password" "-c" "\"DROP DATABASE \\\"mydb\\\";\""]
-         (cut/db-drop-command {:restic-repository "repo"
+          ["psql" "-d" "template1" "-h" "localhost" "-p" "5432" "-U" "user" 
-                                      :backup-path "dir-at-repo"
+           "--no-password" "-c" "\"CREATE DATABASE \\\"mydb\\\";\""]]
-                                      :pg-host "localhost"
+         (cut/db-drop-create-command {:restic-repository "repo"
-                                      :pg-port 5432
-                                      :pg-db "mydb"
-                                      :pg-user "user"
-                                      :pg-password "password"}))))
-
-(deftest should-calculate-db-create-command
-  (is (= [["psql" "-d" "template1" "-h" "localhost" "-p" "5432" "-U" "user"
-           "--no-password" "-c" "CREATE DATABASE \"mydb\";"]]
-         (cut/db-create-command {:restic-repository "repo"
                                       :backup-path "dir-at-repo"
                                       :pg-host "localhost"
                                       :pg-port 5432