24 changed files with 34 additions and 157 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -87,3 +87,10 @@ kotlin-image-publish:
  stage: image
  script:
    - cd infrastructure/kotlin && pyb image publish
+
+backup-image-publish:
+  <<: *img
+  <<: *tag_only
+  stage: image
+  script:
+    - cd infrastructure/backup && pyb image publish
--- a/README.md
+++ b/README.md
@ -1,6 +1,6 @@
 # dda-devops-build

-[![Slack](https://img.shields.io/badge/chat-clojurians-green.svg?style=flat)](https://clojurians.slack.com/messages/#dda-pallet/) | [<img src="https://domaindrivenarchitecture.org/img/delta-chat.svg" width=20 alt="DeltaChat"> chat over e-mail](mailto:buero@meissa-gmbh.de?subject=community-chat) | [<img src="https://meissa.de/images/parts/contact/mastodon36_hue9b2464f10b18e134322af482b9c915e_5501_filter_14705073121015236177.png" width=20 alt="M"> meissa@social.meissa-gmbh.de](https://social.meissa-gmbh.de/@meissa) | [Blog](https://domaindrivenarchitecture.org) | [Website](https://meissa.de)
+[![Slack](https://img.shields.io/badge/chat-clojurians-green.svg?style=flat)](https://clojurians.slack.com/messages/#dda-pallet/) | [<img src="https://meissa-gmbh.de/img/community/Mastodon_Logotype.svg" width=20 alt="team@social.meissa-gmbh.de"> team@social.meissa-gmbh.de](https://social.meissa-gmbh.de/@team) | [Website & Blog](https://domaindrivenarchitecture.org)


 dda-devops-build integrates all the tools we use to work with clouds & provide some nice functions around.
--- a/build.py
+++ b/build.py
@ -33,7 +33,7 @@ default_task = "dev"
 name = "ddadevops"
 MODULE = "not-used"
 PROJECT_ROOT_PATH = "."
-version = "4.13.2-dev"
+version = "4.12.1-dev"
 summary = "tools to support builds combining gopass, terraform, dda-pallet, aws & hetzner-cloud"
 description = __doc__
 authors = [Author("meissa GmbH", "buero@meissa-gmbh.de")]
@ -97,6 +97,7 @@ def initialize(project):
        "mixin_types": ["RELEASE"],
        "release_primary_build_file": "build.py",
        "release_secondary_build_files": [
+            "infrastructure/backup/build.py",
            "infrastructure/python/build.py",
            "infrastructure/dind/build.py",
            "infrastructure/ddadevops/build.py",
@ -140,7 +141,13 @@ def lint(project):
        shell=True,
        check=True,
    )
-    
+    run(
+        "pylint -d W0511,R0903,C0301,W0614,C0114,C0115,C0116,similarities,W1203,W0702,W0702,"
+        + "R0913,R0902,R0914,R1732,R1705,W0707,C0123,W0703,C0103 src/main/python/ddadevops/",
+        shell=True,
+        check=True,
+    )
+

@task
 def patch(project):
--- a/doc/ReleaseMixin.md
+++ b/doc/ReleaseMixin.md
@ -35,7 +35,6 @@ classDiagram
 | release_organisation          | Optional: The repository organisation name                                                                            |                 |
 | release_repository_name       | Optional: The repository name name                                                                                    |                 |
 | release_artifacts             | Optional: The list of artifacts to publish to the release generated name                                              | []              |
-| release_tag_prefix            | Optional: Prefix of tag                                                                                               | ""              |

 ## Example Usage just for creating releases

--- a/infrastructure/backup/build.py
+++ b/infrastructure/backup/build.py
@ -7,7 +7,7 @@ import logging
 name = 'dda-backup'
 MODULE = 'NOT_SET'
 PROJECT_ROOT_PATH = '../..'
-version = "4.12.2-dev"
+version = "4.12.1-dev"


@init
@ -38,11 +38,6 @@ def image(project):
    build = get_devops_build(project)
    build.image()

-@task
-def test(project):
-    build = get_devops_build(project)
-    build.test()
-
@task
 def drun(project):
    build = get_devops_build(project)
--- a/infrastructure/backup/image/resources/file-functions.sh
+++ b/infrastructure/backup/image/resources/file-functions.sh
@ -42,7 +42,6 @@ function backup-fs-from-directory() {
  
 }

-# Das tut so nicht!
 function restore-directory() {
  local directory="$1"; shift
  local snapshot_id="${1:-latest}"; shift
--- a/infrastructure/backup/test/Dockerfile
+++ b/infrastructure/backup/test/Dockerfile
@ -1,7 +0,0 @@
-FROM dda-backup:latest
-
-# install it
-RUN apt update && apt install -qqy openjdk-17-jre-headless
-ADD resources /tmp/
-RUN rm -rf /root/.m2
-RUN /tmp/install-test.bb
--- a/infrastructure/backup/test/resources/bb.edn
+++ b/infrastructure/backup/test/resources/bb.edn
@ -1,4 +0,0 @@
-{:deps {org.clojure/spec.alpha {:mvn/version "0.4.233"}
-        orchestra/orchestra {:mvn/version "2021.01.01-1"}
-        org.domaindrivenarchitecture/dda-backup {:mvn/version "0.1.1-SNAPSHOT"}}}
-
--- a/infrastructure/backup/test/resources/install-test.bb
+++ b/infrastructure/backup/test/resources/install-test.bb
@ -1,32 +0,0 @@
-#!/usr/bin/env bb
-
-(require '[babashka.tasks :as tasks])
-
-(defn curl-and-check!
-  [filename artifact-url sha256-url]
-  (let [filepath (str "/tmp/" filename)]
-    (tasks/shell "curl" "-SsLo" filepath artifact-url)
-    (tasks/shell "curl" "-SsLo" "/tmp/checksum" sha256-url)
-    (tasks/shell "bash" "-c" (str "echo \" " filepath "\"|tee -a /tmp/checksum"))
-    ;(tasks/shell "sha256sum" "-c" "--status" "/tmp/checksum")
-    ))
-
-(defn tar-install!
-  [filename binname]
-  (let [filepath (str "/tmp/" filename)]
-    (tasks/shell "tar" "-C" "/tmp" "-xzf" filepath)
-    (tasks/shell "install" "-m" "0700" "-o" "root" "-g" "root" (str "/tmp/" binname) "/usr/local/bin/")))
-
-(defn install!
-  [filename]
-  (tasks/shell "install" "-m" "0700" "-o" "root" "-g" "root" (str "/tmp/" filename) "/usr/local/bin/"))
-
-(tasks/shell "bb" "/tmp/test.bb")
-(curl-and-check!
- "provs-syspec.jar"
- "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" )
--- a/infrastructure/backup/test/resources/spec.yml
+++ b/infrastructure/backup/test/resources/spec.yml
@ -1,7 +0,0 @@
-package:
-  - name: "restic"
-
-command:
-  - command: "bb -h"
-  - command: "/tmp/test.bb"
-  
--- a/infrastructure/backup/test/resources/test.bb
+++ b/infrastructure/backup/test/resources/test.bb
@ -1,27 +0,0 @@
-#!/usr/bin/env bb
-
-(require '[babashka.tasks :as tasks]
-         '[dda.backup.management :as mgm])
-
-(defn restic-repo-init!
-  []
-  (spit "restic-pwd" "ThePassword")
-  (mgm/init! {:password-file "restic-pwd"
-              :restic-repository "restic-repo"}))
-
-(defn restic-backup!
-  []
-  (tasks/shell "mkdir" "test-backup")
-  (spit "test-backup/file" "I was here")
-  (tasks/shell "restic" "backup" "--password-file" "restic-pwd" "--repo" "restic-repo" "test-backup"))
-
-(defn restic-restore!
-  []
-  (tasks/shell "mkdir" "test-restore")
-  (tasks/shell "restic" "restore" "--password-file" "restic-pwd" "--repo" "restic-repo" "--target" "test-restore" "latest")
-  )
-
-
-(restic-repo-init!)
-(restic-backup!)
-(restic-restore!)
--- a/infrastructure/clj-cljs/build.py
+++ b/infrastructure/clj-cljs/build.py
@ -6,7 +6,7 @@ from ddadevops import *
 name = "ddadevops"
 MODULE = "clj-cljs"
 PROJECT_ROOT_PATH = "../.."
-version = "4.13.2-dev"
+version = "4.12.1-dev"

@init
 def initialize(project):
--- a/infrastructure/clj/build.py
+++ b/infrastructure/clj/build.py
@ -6,7 +6,7 @@ from ddadevops import *
 name = "ddadevops"
 MODULE = "clj"
 PROJECT_ROOT_PATH = "../.."
-version = "4.13.2-dev"
+version = "4.12.1-dev"

@init
 def initialize(project):
--- a/infrastructure/ddadevops/build.py
+++ b/infrastructure/ddadevops/build.py
@ -6,7 +6,7 @@ from ddadevops import *
 name = "ddadevops"
 MODULE = "ddadevops"
 PROJECT_ROOT_PATH = "../.."
-version = "4.13.2-dev"
+version = "4.12.1-dev"


@init
--- a/infrastructure/dind/build.py
+++ b/infrastructure/dind/build.py
@ -6,7 +6,7 @@ from ddadevops import *
 name = "ddadevops"
 MODULE = "dind"
 PROJECT_ROOT_PATH = "../.."
-version = "4.13.2-dev"
+version = "4.12.1-dev"


@init
--- a/infrastructure/kotlin/build.py
+++ b/infrastructure/kotlin/build.py
@ -6,7 +6,7 @@ from ddadevops import *
 name = "ddadevops"
 MODULE = "kotlin"
 PROJECT_ROOT_PATH = "../.."
-version = "4.13.2-dev"
+version = "4.12.1-dev"


@init
--- a/infrastructure/python/build.py
+++ b/infrastructure/python/build.py
@ -6,7 +6,7 @@ from ddadevops import *
 name = "ddadevops"
 MODULE = "python"
 PROJECT_ROOT_PATH = "../.."
-version = "4.13.2-dev"
+version = "4.12.1-dev"


@init
--- a/src/main/python/ddadevops/application/release_mixin_services.py
+++ b/src/main/python/ddadevops/application/release_mixin_services.py
@ -53,8 +53,7 @@ class ReleaseService:
        bump_version = release_version.create_bump()
        release_message = f"release: {release_version.to_string()}"
        bump_message = f"bump version to: {bump_version.to_string()}"
-        release_tag = f"{release.release_tag_prefix}{release_version.to_string()}"
-        self.git_api.tag_annotated(release_tag, release_message, 0)
+        self.git_api.tag_annotated(release_version.to_string(), release_message, 0)
        self.__set_version_and_commit__(
            bump_version,
            release.build_files(),
--- a/src/main/python/ddadevops/domain/build_file.py
+++ b/src/main/python/ddadevops/domain/build_file.py
@ -11,7 +11,6 @@ class BuildFileType(Enum):
    JS = ".json"
    JAVA_GRADLE = ".gradle"
    JAVA_CLOJURE = ".clj"
-    JAVA_CLOJURE_EDN = ".edn"
    PYTHON = ".py"


@ -42,8 +41,6 @@ class BuildFile(Validateable):
                result = BuildFileType.JAVA_CLOJURE
            case ".py":
                result = BuildFileType.PYTHON
-            case ".edn":
-                result = BuildFileType.JAVA_CLOJURE_EDN
            case _:
                result = None
        return result
@ -51,13 +48,11 @@ class BuildFile(Validateable):
    def __get_file_type_regex_str(self, file_type: BuildFileType):
        match file_type:
            case BuildFileType.JAVA_GRADLE:
-                return r"(?P<pre_version>\bversion\s?=\s?)\"(?P<version>\d*\.\d*\.\d*(-SNAPSHOT)?)\""
+                return r'(?P<pre_version>\bversion\s?=\s?)\"(?P<version>\d*\.\d*\.\d*(-SNAPSHOT)?)\"'
            case BuildFileType.PYTHON:
-                return r"(?P<pre_version>\bversion\s?=\s?)\"(?P<version>\d*\.\d*\.\d*(-SNAPSHOT|-dev\d*)?)\""
+                return r'(?P<pre_version>\bversion\s?=\s?)\"(?P<version>\d*\.\d*\.\d*(-SNAPSHOT|-dev\d*)?)\"'
            case BuildFileType.JAVA_CLOJURE:
-                return r"(?P<pre_version>\(defproject\s(\S)*\s)\"(?P<version>\d*\.\d*\.\d*(-SNAPSHOT)?)\""
-            case BuildFileType.JAVA_CLOJURE_EDN:
-                return r"(?P<pre_version>\:version\s+)\"(?P<version>\d*\.\d*\.\d*(-SNAPSHOT)?)\""
+                return r'(?P<pre_version>\(defproject\s(\S)*\s)\"(?P<version>\d*\.\d*\.\d*(-SNAPSHOT)?)\"'
            case _:
                return ""

@ -67,15 +62,8 @@ class BuildFile(Validateable):
            match build_file_type:
                case BuildFileType.JS:
                    version_str = json.loads(self.content)["version"]
-                case (
-                    BuildFileType.JAVA_GRADLE
-                    | BuildFileType.PYTHON
-                    | BuildFileType.JAVA_CLOJURE
-                    | BuildFileType.JAVA_CLOJURE_EDN
-                ):
-                    version_str = re.search(
-                        self.__get_file_type_regex_str(build_file_type), self.content
-                    ).group("version")
+                case BuildFileType.JAVA_GRADLE | BuildFileType.PYTHON | BuildFileType.JAVA_CLOJURE:
+                    version_str = re.search(self.__get_file_type_regex_str(build_file_type), self.content).group("version")
        except:
            raise RuntimeError(f"Version not found in file {self.file_path}")

@ -96,15 +84,10 @@ class BuildFile(Validateable):
                    json_data = json.loads(self.content)
                    json_data["version"] = new_version.to_string()
                    self.content = json.dumps(json_data, indent=4)
-                case (
-                    BuildFileType.JAVA_GRADLE
-                    | BuildFileType.PYTHON
-                    | BuildFileType.JAVA_CLOJURE
-                    | BuildFileType.JAVA_CLOJURE_EDN
-                ):
+                case BuildFileType.JAVA_GRADLE | BuildFileType.PYTHON | BuildFileType.JAVA_CLOJURE:
                    substitute = re.sub(
                        self.__get_file_type_regex_str(build_file_type),
-                        rf'\g<pre_version>"{new_version.to_string()}"',
+                        fr'\g<pre_version>"{new_version.to_string()}"',
                        self.content,
                        1,
                    )
--- a/src/main/python/ddadevops/domain/common.py
+++ b/src/main/python/ddadevops/domain/common.py
@ -78,12 +78,6 @@ class DnsRecord(Validateable):
            result.append("ipv4 & ipv6 may not both be empty.")
        return result

-    def ip(self) -> str:
-        if (self.ipv4):
-            return self.ipv4
-        else:
-            return self.ipv6
-

 class Devops(Validateable):
    def __init__(
--- a/src/main/python/ddadevops/domain/provs_k3s.py
+++ b/src/main/python/ddadevops/domain/provs_k3s.py
@ -86,7 +86,7 @@ class K3s(Validateable):
        cmd = [
            "provs-server.jar",
            "k3s",
-            f"{self.k3s_provision_user}@{self.provision_dns.ip()}",
+            f"{self.k3s_provision_user}@{self.provision_dns.fqdn}",
            "-c",
            f"{devops.build_path()}/out_k3sServerConfig.yaml",
            "-a",
--- a/src/main/python/ddadevops/domain/release.py
+++ b/src/main/python/ddadevops/domain/release.py
@ -24,7 +24,6 @@ class Release(Validateable):
            "release_secondary_build_files", []
        )
        self.version = version
-        self.release_tag_prefix = inp.get("release_tag_prefix", "")
        self.release_artifact_server_url = inp.get("release_artifact_server_url")
        self.release_organisation = inp.get("release_organisation")
        self.release_repository_name = inp.get("release_repository_name")
--- a/src/test/python/domain/test_build_file.py
+++ b/src/test/python/domain/test_build_file.py
@ -183,34 +183,6 @@ def test_should_parse_and_set_version_for_clj():
        == sut.content
    )

-def test_should_parse_and_set_version_for_clj_edn():
-    sut = BuildFile(
-        Path("./deps.edn"),
-        """
-{:project {:name org.domaindrivenarchitecture/dda-backup
-           :version "1.1.5-SNAPSHOT"}
-
-}
-""",
-    )
-    assert sut.get_version() == Version.from_str("1.1.5-SNAPSHOT", "SNAPSHOT")
-
-    sut = BuildFile(
-        Path("./deps.edn"),
-        """
-{:project {:name org.domaindrivenarchitecture/dda-backup
-           :version "1.1.5-SNAPSHOT"}
-
-}
-""",
-    )
-    sut.set_version(Version.from_str("1.1.5-SNAPSHOT", "SNAPSHOT").create_major())
-    assert (
-        '\n{:project {:name org.domaindrivenarchitecture/dda-backup\n           :version "2.0.0"}\n\n}\n'
-        == sut.content
-    )
-
-
 def test_should_throw_for_clj_wrong_version():
    sut = BuildFile(
        Path("./project.clj"),
--- a/src/test/python/domain/test_provs_k3s.py
+++ b/src/test/python/domain/test_provs_k3s.py
@ -24,7 +24,7 @@ def test_should_calculate_command():
    assert (
        "provs-server.jar "
        + "k3s "
-        + "k3s_provision_user@::1 "
+        + "k3s_provision_user@example.org "
        + "-c "
        + "root_path/target/name/module/out_k3sServerConfig.yaml "
        + "-a "