.gitignore

@@ -34,5 +34,3 @@ ca.crt
 # chaches
 .clj-kondo/.cache
 .lsp/.cache/
-
-.eastwood

.gitlab-ci.yml

@@ -6,18 +6,11 @@ stages:
   - image
   #- integrationtest
 
-.img: &img
+services:
-  image: "domaindrivenarchitecture/ddadevops-dind:4.7.4"
+  - docker:19.03.12-dind
-  services:
-    - docker:dind
-  before_script:
-  - export RELEASE_ARTIFACT_TOKEN=$MEISSA_REPO_BUERO_RW
-  - export IMAGE_DOCKERHUB_USER=$DOCKERHUB_USER
-  - export IMAGE_DOCKERHUB_PASSWORD=$DOCKERHUB_PASSWORD
-  - export IMAGE_TAG=$CI_COMMIT_TAG
 
 .cljs-job: &cljs
-  image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.7.4"
+  image: domaindrivenarchitecture/shadow-cljs
   cache:
     key: ${CI_COMMIT_REF_SLUG}
     paths:
@@ -25,44 +18,38 @@ stages:
       - .shadow-cljs/
       - .m2
   before_script:
-  - export RELEASE_ARTIFACT_TOKEN=$MEISSA_REPO_BUERO_RW
+    - echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
-  - echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
+    - npm install
-  - npm install
 
-.clj-job: &clj
+.clj-uploadjob: &clj
-  image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.7.4"
+  image: domaindrivenarchitecture/lein
   cache:
     key: ${CI_COMMIT_REF_SLUG}
     paths:
       - .m2
   before_script:
-  - export RELEASE_ARTIFACT_TOKEN=$MEISSA_REPO_BUERO_RW
+    - mkdir -p /root/.lein
-  - mkdir -p /root/.lein
+    - echo "{:auth {:repository-auth {#\"clojars\" {:username \"${CLOJARS_USER}\" :password \"${CLOJARS_TOKEN_DOMAINDRIVENARCHITECTURE}\" }}}}" > ~/.lein/profiles.clj
-  - echo "{:auth {:repository-auth {#\"clojars\" {:username \"${CLOJARS_USER}\" :password \"${CLOJARS_TOKEN_DOMAINDRIVENARCHITECTURE}\" }}}}" > ~/.lein/profiles.clj
-
-.tag_only: &tag_only
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      when: never
-    - if: '$CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+$/'
-
-test-clj:
-  <<: *clj
-  stage: build_and_test
-  script:
-    - pyb test_clj
 
 test-cljs:
   <<: *cljs
   stage: build_and_test
   script:
-    - pyb test_cljs
+    - shadow-cljs compile test
+    - node target/node-tests.js
+    
+test-clj:
+  <<: *clj
+  stage: build_and_test
+  script:
+    - lein test
 
 test-schema:
   <<: *clj
   stage: build_and_test
   script:
-    - pyb test_schema
+    - lein uberjar
+    - java -jar target/uberjar/c4k-nextcloud-standalone.jar src/test/resources/nextcloud-test/valid-config.yaml src/test/resources/nextcloud-test/valid-auth.yaml | kubeconform --kubernetes-version 1.19.0 --strict --skip "Certificate,CronJob" -
   artifacts:
     paths:
       - target/uberjar
@@ -71,7 +58,8 @@ report-frontend:
   <<: *cljs
   stage: package
   script:
-    - pyb report_frontend
+    - mkdir -p target/frontend-build
+    - shadow-cljs run shadow.cljs.build-report frontend target/frontend-build/build-report.html
   artifacts:
     paths:
       - target/frontend-build/build-report.html
@@ -80,7 +68,11 @@ package-frontend:
   <<: *cljs
   stage: package
   script:
-    - pyb package_frontend
+    - mkdir -p target/frontend-build
+    - shadow-cljs release frontend
+    - cp public/js/main.js target/frontend-build/c4k-nextcloud.js
+    - sha256sum target/frontend-build/c4k-nextcloud.js > target/frontend-build/c4k-nextcloud.js.sha256
+    - sha512sum target/frontend-build/c4k-nextcloud.js > target/frontend-build/c4k-nextcloud.js.sha512
   artifacts:
     paths:
       - target/frontend-build
@@ -89,55 +81,72 @@ package-uberjar:
   <<: *clj
   stage: package
   script:
-    - pyb package_uberjar
+    - sha256sum target/uberjar/c4k-nextcloud-standalone.jar > target/uberjar/c4k-nextcloud-standalone.jar.sha256
+    - sha512sum target/uberjar/c4k-nextcloud-standalone.jar > target/uberjar/c4k-nextcloud-standalone.jar.sha512
   artifacts:
     paths:
       - target/uberjar
 
-release-to-clojars:
+upload-clj-release:
   <<: *clj
-  <<: *tag_only
   stage: upload
+  rules:
+    - if: '$CI_COMMIT_TAG != null'
   script:
-    - pyb upload_clj
+    - lein deploy
 
-release-to-forgejo:
+release:
-  <<: *clj
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
-  <<: *tag_only
   stage: upload
+  rules:
+    - if: '$CI_COMMIT_TAG != null'
+  artifacts:
+    paths:
+      - target/uberjar
+      - target/frontend-build
   script:
-    - pyb publish_artifacts
+    - apk --no-cache add curl
+    - |
+      release-cli create --name "Release $CI_COMMIT_TAG" --tag-name $CI_COMMIT_TAG \
+        --assets-link "{\"name\":\"c4k-nextcloud-standalone.jar\",\"url\":\"https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud/-/jobs/${CI_JOB_ID}/artifacts/file/target/uberjar/c4k-nextcloud-standalone.jar\"}" \
+        --assets-link "{\"name\":\"c4k-nextcloud-standalone.jar.sha256\",\"url\":\"https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud/-/jobs/${CI_JOB_ID}/artifacts/file/target/uberjar/c4k-nextcloud-standalone.jar.sha256\"}" \
+        --assets-link "{\"name\":\"c4k-nextcloud-standalone.jar.sha512\",\"url\":\"https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud/-/jobs/${CI_JOB_ID}/artifacts/file/target/uberjar/c4k-nextcloud-standalone.jar.sha512\"}" \
+        --assets-link "{\"name\":\"c4k-nextcloud.js\",\"url\":\"https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud/-/jobs/${CI_JOB_ID}/artifacts/file/target/frontend-build/c4k-nextcloud.js\"}" \
+        --assets-link "{\"name\":\"c4k-nextcloud.js.sha256\",\"url\":\"https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud/-/jobs/${CI_JOB_ID}/artifacts/file/target/frontend-build/c4k-nextcloud.js.sha256\"}" \
+        --assets-link "{\"name\":\"c4k-nextcloud.js.sha512\",\"url\":\"https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud/-/jobs/${CI_JOB_ID}/artifacts/file/target/frontend-build/c4k-nextcloud.js.sha512\"}" \
 
-backup-image-publish:
+nextcloud-image-test-publish:
-  <<: *img
+  image: domaindrivenarchitecture/devops-build:latest
-  <<: *tag_only
   stage: image
+  rules:
+    - if: '$CI_COMMIT_TAG != null'
   script:
-    - cd infrastructure/backup && pyb image publish
+    - cd infrastructure/docker-nextcloud && pyb image test publish
 
-nextcloud-image-publish:
+backup-image-test-publish:
-  <<: *img
+  image: domaindrivenarchitecture/devops-build:latest
-  <<: *tag_only
   stage: image
+  rules:
+    - if: '$CI_COMMIT_TAG != null'
   script:
-    - cd infrastructure/nextcloud && pyb image publish
+    - cd infrastructure/docker-backup && pyb image test publish
 
-#.nextcloud-integrationtest:
+.nextcloud-integrationtest:
-#  stage: integrationtest
+  stage: integrationtest
-#  image: registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/releases/3.7.1-kube-1.20.11-alpine-3.14
+  image: registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/releases/3.7.1-kube-1.20.11-alpine-3.14
-#  services:
+  services:
-#    - name: registry.gitlab.com/gitlab-org/cluster-integration/test-utils/k3s-gitlab-ci/releases/v1.22.2-k3s2
+    - name: registry.gitlab.com/gitlab-org/cluster-integration/test-utils/k3s-gitlab-ci/releases/v1.22.2-k3s2
-#      alias: k3s
+      alias: k3s
-#  script:
+  script:
-#    - apk add curl sudo bash
+    - apk add curl sudo bash
-#    - apk add wget curl bash sudo openjdk8
+    - apk add wget curl bash sudo openjdk8
-#    - wget -P /etc/apk/keys/ https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub
+    - wget -P /etc/apk/keys/ https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub
-#    - apk add --no-cache --repository=https://apkproxy.herokuapp.com/sgerrand/alpine-pkg-leiningen leiningen
+    - apk add --no-cache --repository=https://apkproxy.herokuapp.com/sgerrand/alpine-pkg-leiningen leiningen
-#
+
-#    - mkdir -p ${HOME}/.kube/
+    - mkdir -p ${HOME}/.kube/
-#    - curl -f k3s:8081 > ${HOME}/.kube/config
+    - curl -f k3s:8081 > ${HOME}/.kube/config
-#    - kubectl version
+    - kubectl version
-#    - kubectl cluster-info
+    - kubectl cluster-info
-#    - echo "---------- Integration test -------------"
+    - echo "---------- Integration test -------------"
-#    - pwd
+    - pwd
-#    - cd ./src/test/resources/local-integration-test/ && ./setup-local-s3-on-k3d.sh
+    - cd ./src/test/resources/local-integration-test/ && ./setup-local-s3-on-k3d.sh

build.py

@@ -1,179 +0,0 @@
-from os import environ
-from subprocess import run
-from pybuilder.core import init, task
-from ddadevops import *
-
-default_task = "dev"
-name = 'c4k-nextcloud'
-MODULE = 'not-used'
-PROJECT_ROOT_PATH = '.'
-
-@init
-def initialize(project):
-    project.build_depends_on("ddadevops>=4.7.0")
-
-    input = {
-        "name": name,
-        "module": MODULE,
-        "stage": "notused",
-        "project_root_path": PROJECT_ROOT_PATH,
-        "build_types": [],
-        "mixin_types": ["RELEASE"],
-        "release_primary_build_file": "project.clj",
-        "release_secondary_build_files": [
-            "package.json",
-            "infrastructure/backup/build.py",
-            "infrastructure/nextcloud/build.py",
-            ],
-        "release_artifact_server_url": "https://repo.prod.meissa.de",
-        "release_organisation": "meissa",
-        "release_repository_name": name,
-        "release_artifacts": [
-            "target/uberjar/c4k-nextcloud-standalone.jar",
-            "target/frontend-build/c4k-nextcloud.js",
-        ],
-    }
-    
-    build = ReleaseMixin(project, input)
-    build.initialize_build_dir()
-
-
-@task
-def test_clj(project):
-    run("lein test", shell=True, check=True)
-
-
-@task
-def test_cljs(project):
-    run("shadow-cljs compile test", shell=True, check=True)
-    run("node target/node-tests.js", shell=True, check=True)
-
-
-@task
-def test_schema(project):
-    run("lein uberjar", shell=True, check=True)
-    run(
-        "java -jar target/uberjar/c4k-nextcloud-standalone.jar "
-        + "src/test/resources/nextcloud-test/valid-config.yaml "
-        + "src/test/resources/nextcloud-test/valid-auth.yaml | "
-        + "kubeconform --kubernetes-version 1.23.0 --strict --skip Certificate -",
-        shell=True,
-        check=True,
-    )
-
-
-@task
-def report_frontend(project):
-    run("mkdir -p target/frontend-build", shell=True, check=True)
-    run(
-        "shadow-cljs run shadow.cljs.build-report frontend target/frontend-build/build-report.html",
-        shell=True,
-        check=True,
-    )
-
-
-@task
-def package_frontend(project):
-    run("mkdir -p target/frontend-build", shell=True, check=True)
-    run("shadow-cljs release frontend", shell=True, check=True)
-    run(
-        "cp public/js/main.js target/frontend-build/c4k-nextcloud.js",
-        shell=True,
-        check=True,
-    )
-    run(
-        "sha256sum target/frontend-build/c4k-nextcloud.js > target/frontend-build/c4k-nextcloud.js.sha256",
-        shell=True,
-        check=True,
-    )
-    run(
-        "sha512sum target/frontend-build/c4k-nextcloud.js > target/frontend-build/c4k-nextcloud.js.sha512",
-        shell=True,
-        check=True,
-    )
-
-
-@task
-def package_uberjar(project):
-    run(
-        "sha256sum target/uberjar/c4k-nextcloud-standalone.jar > target/uberjar/c4k-nextcloud-standalone.jar.sha256",
-        shell=True,
-        check=True,
-    )
-    run(
-        "sha512sum target/uberjar/c4k-nextcloud-standalone.jar > target/uberjar/c4k-nextcloud-standalone.jar.sha512",
-        shell=True,
-        check=True,
-    )
-
-
-@task
-def upload_clj(project):
-    run("lein deploy", shell=True, check=True)
-
-
-@task
-def lint(project):
-    #run(
-    #    "lein eastwood",
-    #    shell=True,
-    #    check=True,
-    #)
-    run(
-        "lein ancient check",
-        shell=True,
-        check=True,
-    )
-
-
-@task
-def patch(project):
-    linttest(project, "PATCH")
-    release(project)
-
-
-@task
-def minor(project):
-    linttest(project, "MINOR")
-    release(project)
-
-
-@task
-def major(project):
-    linttest(project, "MAJOR")
-    release(project)
-
-
-@task
-def dev(project):
-    linttest(project, "NONE")
-
-
-@task
-def prepare(project):
-    build = get_devops_build(project)
-    build.prepare_release()
-
-
-@task
-def tag(project):
-    build = get_devops_build(project)
-    build.tag_bump_and_push_release()
-
-@task
-def publish_artifacts(project):
-    build = get_devops_build(project)
-    build.publish_artifacts()
-
-def release(project):
-    prepare(project)
-    tag(project)
-
-
-def linttest(project, release_type):
-    build = get_devops_build(project)
-    build.update_release_type(release_type)
-    test_clj(project)
-    test_cljs(project)
-    test_schema(project)
-    lint(project)

infrastructure/backup/build.py

@@ -1,54 +0,0 @@
-from os import environ
-from datetime import datetime
-from pybuilder.core import task, init
-from ddadevops import *
-
-name = "c4k-nextcloud"
-MODULE = "backup"
-PROJECT_ROOT_PATH = "../.."
-version = "7.0.1-SNAPSHOT"
-
-
-@init
-def initialize(project):
-    image_tag = version
-    if "dev" in image_tag:
-        image_tag += datetime.now().strftime("%Y-%m-%d-%H-%M-%S")
-
-    input = {
-        "name": name,
-        "module": MODULE,
-        "stage": "notused",
-        "project_root_path": PROJECT_ROOT_PATH,
-        "build_types": ["IMAGE"],
-        "mixin_types": [],
-        "image_naming": "NAME_AND_MODULE",
-        "image_tag": f"{image_tag}",
-    }
-
-    project.build_depends_on("ddadevops>=4.7.0")
-
-    build = DevopsImageBuild(project, input)
-    build.initialize_build_dir()
-
-
-@task
-def image(project):
-    build = get_devops_build(project)
-    build.image()
-
-@task
-def drun(project):
-    build = get_devops_build(project)
-    build.drun()
-
-@task
-def test(project):
-    build = get_devops_build(project)
-    build.test()
-
-@task
-def publish(project):
-    build = get_devops_build(project)
-    build.dockerhub_login()
-    build.dockerhub_publish()

infrastructure/docker-backup/build.py

@@ -0,0 +1,52 @@
+from os import environ
+from pybuilder.core import task, init
+from ddadevops import *
+import logging
+
+name = 'c4k-cloud-backup'
+MODULE = 'docker'
+PROJECT_ROOT_PATH = '../..'
+
+
+class MyBuild(DevopsDockerBuild):
+    pass
+
+@init
+def initialize(project):
+    project.build_depends_on('ddadevops>=0.12.4')
+    stage = 'notused'
+    dockerhub_user = environ.get('DOCKERHUB_USER')
+    if not dockerhub_user:
+        dockerhub_user = gopass_field_from_path('meissa/web/docker.com', 'login')
+    dockerhub_password = environ.get('DOCKERHUB_PASSWORD')
+    if not dockerhub_password:
+        dockerhub_password = gopass_password_from_path('meissa/web/docker.com')
+    tag = environ.get('CI_COMMIT_TAG')
+    if not tag:
+        tag = get_tag_from_latest_commit()
+    config = create_devops_docker_build_config(
+        stage, PROJECT_ROOT_PATH, MODULE, dockerhub_user, dockerhub_password, docker_publish_tag=tag)
+    build = MyBuild(project, config)
+    build.initialize_build_dir()
+
+
+@task
+def image(project):
+    build = get_devops_build(project)
+    build.image()
+
+@task
+def drun(project):
+    build = get_devops_build(project)
+    build.drun()
+
+@task
+def test(project):
+    build = get_devops_build(project)
+    build.test()
+
+@task
+def publish(project):
+    build = get_devops_build(project)
+    build.dockerhub_login()
+    build.dockerhub_publish()

infrastructure/docker-nextcloud/build.py

@@ -0,0 +1,52 @@
+from os import environ
+from pybuilder.core import task, init
+from ddadevops import *
+import logging
+
+name = 'c4k-cloud'
+MODULE = 'docker'
+PROJECT_ROOT_PATH = '../..'
+
+
+class MyBuild(DevopsDockerBuild):
+    pass
+
+@init
+def initialize(project):
+    project.build_depends_on('ddadevops>=0.12.7')
+    stage = 'notused'
+    dockerhub_user = environ.get('DOCKERHUB_USER')
+    if not dockerhub_user:
+        dockerhub_user = gopass_field_from_path('meissa/web/docker.com', 'login')
+    dockerhub_password = environ.get('DOCKERHUB_PASSWORD')
+    if not dockerhub_password:
+        dockerhub_password = gopass_password_from_path('meissa/web/docker.com')
+    tag = environ.get('CI_COMMIT_TAG')
+    if not tag:
+        tag = get_tag_from_latest_commit()
+    config = create_devops_docker_build_config(
+        stage, PROJECT_ROOT_PATH, MODULE, dockerhub_user, dockerhub_password, docker_publish_tag=tag)
+    build = MyBuild(project, config)
+    build.initialize_build_dir()
+
+
+@task
+def image(project):
+    build = get_devops_build(project)
+    build.image()
+
+@task
+def drun(project):
+    build = get_devops_build(project)
+    build.drun()
+
+@task
+def test(project):
+    build = get_devops_build(project)
+    build.test()
+
+@task
+def publish(project):
+    build = get_devops_build(project)
+    build.dockerhub_login()
+    build.dockerhub_publish()

infrastructure/nextcloud/build.py

@@ -1,53 +0,0 @@
-from os import environ
-from datetime import datetime
-from pybuilder.core import task, init
-from ddadevops import *
-
-name = 'c4k-cloud'
-MODULE = 'nextcloud'
-PROJECT_ROOT_PATH = '../..'
-version = "7.0.1-SNAPSHOT"
-
-@init
-def initialize(project):
-    image_tag = version
-    if "dev" in image_tag:
-        image_tag += datetime.now().strftime("%Y-%m-%d-%H-%M-%S")
-
-    input = {
-        "name": name,
-        "module": MODULE,
-        "stage": "notused",
-        "project_root_path": PROJECT_ROOT_PATH,
-        "build_types": ["IMAGE"],
-        "mixin_types": [],
-        "image_naming": "NAME_AND_MODULE",
-        "image_tag": f"{image_tag}",
-    }
-
-    project.build_depends_on("ddadevops>=4.7.0")
-
-    build = DevopsImageBuild(project, input)
-    build.initialize_build_dir()
-
-
-@task
-def image(project):
-    build = get_devops_build(project)
-    build.image()
-
-@task
-def drun(project):
-    build = get_devops_build(project)
-    build.drun()
-
-@task
-def test(project):
-    build = get_devops_build(project)
-    build.test()
-
-@task
-def publish(project):
-    build = get_devops_build(project)
-    build.dockerhub_login()
-    build.dockerhub_publish()

project.clj

@@ -5,8 +5,7 @@
             :url "https://www.apache.org/licenses/LICENSE-2.0.html"}
   :dependencies [[org.clojure/clojure "1.11.1"]
                  [org.clojure/tools.reader "1.3.6"]
-                 [org.domaindrivenarchitecture/c4k-common-clj "6.0.3"]
+                 [org.domaindrivenarchitecture/c4k-common-clj "6.0.1"]]
-                 [hickory "0.7.1" :exclusions [viebel/codox-klipse-theme]]]
   :target-path "target/%s/"
   :source-paths ["src/main/cljc"
                  "src/main/clj"]
@@ -22,15 +21,15 @@
              :uberjar {:aot :all
                        :main dda.c4k-nextcloud.uberjar
                        :uberjar-name "c4k-nextcloud-standalone.jar"
-                       :dependencies [[org.clojure/tools.cli "1.0.219"]
+                       :dependencies [[org.clojure/tools.cli "1.0.214"]
-                                      [ch.qos.logback/logback-classic "1.4.11"
+                                      [ch.qos.logback/logback-classic "1.4.5"
                                        :exclusions [com.sun.mail/javax.mail]]
-                                      [org.slf4j/jcl-over-slf4j "2.0.9"]]}}
+                                      [org.slf4j/jcl-over-slf4j "2.0.6"]]}}
   :release-tasks [["test"]
                   ["vcs" "assert-committed"]
                   ["change" "version" "leiningen.release/bump-version" "release"]
                   ["vcs" "commit"]
-                  ["vcs" "tag" "v" "--no-sign"]
+                  ["vcs" "tag" "--no-sign"]
                   ["change" "version" "leiningen.release/bump-version"]]
   :aliases {"native" ["shell"
                       "native-image"