PIA Release 1.36.0

hzi-braunschweig · Jan 4, 2024 · 2ec0625 · 2ec0625
1 parent d9e2766
commit 2ec0625
Show file tree

Hide file tree

Showing 100 changed files with 3,844 additions and 4,682 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -64,3 +64,4 @@ include:
   - /ci/load-test.yml
   - /ci/java-test-unit.yml
   - /ci/renovate.yml
+  - /ci/cleanup-registry.yml
diff --git a/CITATION.cff b/CITATION.cff
@@ -21,6 +21,7 @@ authors:
 
   - family-names: Wangler
     given-names: Thomas
+    orcid: https://orcid.org/0009-0008-1325-2780
     affiliation: 'Freelancer, Germany'
 
 title: 'eResearch System: Prospective Monitoring and Management - App (PIA)'

diff --git a/DISTRIBUTION_NOTES.md b/DISTRIBUTION_NOTES.md
@@ -2,6 +2,14 @@
 
 This file contains notes about changes that are important to the operations team.
 
+## 1.36
+
+- no relevant changes for operations team
+
+## 1.35 (Feedback statistic service)
+
+- FeedbackStatisticService was added
+
 ## 1.32 (Export improvements, GitLab Migration)
 
 - From now on PIA release images are pushed to the [GitLab cloud docker registry](registry.gitlab.com)

diff --git a/README.md b/README.md
@@ -149,7 +149,7 @@ Any contributions you make are **greatly appreciated**.
 
 ## Licence
 
-Distributed under the AGPL-3.0 license. See [LICENSE](./LICENSE.md) for more information.
+Distributed under the AGPL-3.0 license. See [LICENSE](./LICENSES/AGPL-3.0-or-later.txt) for more information.
 
 ## Contact
 

diff --git a/ci/accumulate-coverage.yml b/ci/accumulate-coverage.yml
@@ -5,7 +5,6 @@ include:
 accumulate-coverage:
   extends:
     - .job-exclude-schedules-pipelines
-    - .job-exclude-update-third-party-licenses
     - .no-cpu-request
   stage: accumulate
   image: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/psa.utils.coverage:$IMAGE_ID

diff --git a/ci/check-format.yml b/ci/check-format.yml
@@ -5,7 +5,6 @@ include:
 check-format:
   extends:
     - .job-exclude-schedules-pipelines
-    - .job-exclude-update-third-party-licenses
     - .no-cpu-request
   stage: test
   image: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/psa.utils.codeformatter:$IMAGE_ID

diff --git a/ci/check-merge-allowed.yml b/ci/check-merge-allowed.yml
@@ -6,7 +6,7 @@ check-merge-allowed:
   extends:
     - .job-exclude-schedules-pipelines
     - .no-cpu-request
-  image: bash:5.1.16@sha256:fc742d0c3d9d8f5fb2681062398c04b710cd08c46dac1a8f0a5515687018acb9
+  image: bash:5.2.15@sha256:acbac47fb9ea642a211c35013f50481bec20bd23db852c9c2634a4d153e631f1
   stage: prepare
   variables:
     GIT_STRATEGY: none

diff --git a/ci/cleanup-registry.yml b/ci/cleanup-registry.yml
@@ -0,0 +1,45 @@
+cleanup-registry:
+  extends:
+    - .no-cpu-request
+  image: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/psa.utils.ci-release-image:$IMAGE_ID
+  stage: push
+  variables:
+    GIT_STRATEGY: none
+  dependencies: []
+  script:
+    - sh -c "skopeo login -u '$CI_REGISTRY_USER' -p '$CI_REGISTRY_PASSWORD' '$CI_REGISTRY'"
+    - sh -c "regctl registry login -u '$CI_REGISTRY_USER' -p '$CI_REGISTRY_PASSWORD' '$CI_REGISTRY'"
+    - >
+      REGEX="(^[0-9]+$)|(^[0-9]+-with-faked-secrets$)"
+
+      IMAGES=
+
+      for JOB in $JOBS_INSTALL; do
+          IMAGES+="$JOB-npm-install "
+      done
+
+      for JOB in $JOBS_DOCKER; do
+          IMAGES+="$JOB "
+      done
+
+      for IMAGE in $IMAGES; do
+          echo $IMAGE
+          skopeo list-tags docker://$CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$IMAGE > tags.json
+          for TAG in `jq ".Tags[]" < tags.json | sed 's/"//g'`; do
+
+              if [[ "$TAG" =~ $REGEX ]]; then
+                  echo deleting $IMAGE:$TAG
+
+                  # skopeo uses the tag to identify the hash and delete ALL the images with that hash!
+                  #skopeo delete docker://$CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$IMAGE:$TAG || true
+                  # therefore we are using rectl to just delete a tag
+                  regctl tag delete $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$IMAGE:$TAG || true
+              fi
+          done
+      done
+
+  rules:
+    - if: '$CI_SCHEDULED_TASK == "cleanup-registry"'
+  needs:
+    - job: build-docker
+      artifacts: false
diff --git a/ci/copyright-lint.yml b/ci/copyright-lint.yml
@@ -5,11 +5,10 @@ include:
 copyright-lint:
   extends:
     - .job-exclude-schedules-pipelines
-    - .job-exclude-update-third-party-licenses
     - .no-cpu-request
   stage: test
   image:
-    name: fsfe/reuse@sha256:ffca192d7ac78d57fae120e52f374701be5fa001dae1498aac84b4b076b76285
+    name: fsfe/reuse@sha256:888418362aa2a8ebea12d8dbfb41fa8eeabd0c423f42df7e3968af4cbb8d2ef1
     entrypoint: ['/bin/sh', '-c']
   script:
     - rm -rf psa.lib.auth-server-client/dist

diff --git a/ci/create-release-merge-requests.yml b/ci/create-release-merge-requests.yml
@@ -8,7 +8,7 @@ merge-requests:
     - .job-exclude-schedules-pipelines
     - .no-cpu-request
   stage: push
-  image: curlimages/curl@sha256:faaba66e89c87fd3fb51336857142ee6ce78fa8d8f023a5713d2bf4957f1aca8
+  image: curlimages/curl@sha256:4a3396ae573c44932d06ba33f8696db4429c419da87cbdc82965ee96a37dd0af
   needs: []
   rules:
     - if: $CI_COMMIT_TAG =~ /^\d+\.\d+\.\d+/

diff --git a/ci/deploy-stage.yml b/ci/deploy-stage.yml
@@ -10,7 +10,6 @@ include:
 deploy-pia-develop:
   extends:
     - .job-exclude-schedules-pipelines
-    - .job-exclude-update-third-party-licenses
     - .no-cpu-request
   image: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/psa.utils.ci-awx-cli:$IMAGE_ID
   stage: deploy
@@ -28,7 +27,6 @@ deploy-pia-develop:
 deploy-pia-release:
   extends:
     - .job-exclude-schedules-pipelines
-    - .job-exclude-update-third-party-licenses
     - .no-cpu-request
   image: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/psa.utils.ci-awx-cli:$IMAGE_ID
   stage: deploy
@@ -47,7 +45,6 @@ deploy-pia-release:
 deploy-pia-load:
   extends:
     - .job-exclude-schedules-pipelines
-    - .job-exclude-update-third-party-licenses
     - .no-cpu-request
   image: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/psa.utils.ci-awx-cli:$IMAGE_ID
   stage: deploy
@@ -70,7 +67,6 @@ deploy-pia-load:
 deploy-sb-pia-niedersachsen-release:
   extends:
     - .job-exclude-schedules-pipelines
-    - .job-exclude-update-third-party-licenses
     - .no-cpu-request
   image: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/psa.utils.ci-awx-cli:$IMAGE_ID
   stage: deploy
@@ -89,7 +85,6 @@ deploy-sb-pia-niedersachsen-release:
 deploy-stable:
   extends:
     - .job-exclude-schedules-pipelines
-    - .job-exclude-update-third-party-licenses
     - .no-cpu-request
   image: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/psa.utils.ci-awx-cli:$IMAGE_ID
   stage: deploy
@@ -114,7 +109,6 @@ deploy-stable:
 deploy-feature-stage:
   extends:
     - .job-exclude-schedules-pipelines
-    - .job-exclude-update-third-party-licenses
     - .no-cpu-request
   image: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/psa.utils.ci-awx-cli:$IMAGE_ID
   stage: deploy
@@ -153,7 +147,6 @@ deploy-feature-stage:
 deploy-sb-feature-stage:
   extends:
     - .job-exclude-schedules-pipelines
-    - .job-exclude-update-third-party-licenses
     - .no-cpu-request
   image: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/psa.utils.ci-awx-cli:$IMAGE_ID
   stage: deploy
@@ -192,7 +185,6 @@ deploy-sb-feature-stage:
 stop-feature-stage:
   extends:
     - .job-exclude-schedules-pipelines
-    - .job-exclude-update-third-party-licenses
     - .no-cpu-request
   image: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/psa.utils.ci-awx-cli:$IMAGE_ID
   stage: undeploy
@@ -213,7 +205,6 @@ stop-feature-stage:
 stop-sb-feature-stage:
   extends:
     - .job-exclude-schedules-pipelines
-    - .job-exclude-update-third-party-licenses
     - .no-cpu-request
   image: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/psa.utils.ci-awx-cli:$IMAGE_ID
   stage: undeploy

diff --git a/ci/detect-secrets.yml b/ci/detect-secrets.yml
@@ -5,10 +5,9 @@ include:
 detect-secrets:
   extends:
     - .job-exclude-schedules-pipelines
-    - .job-exclude-update-third-party-licenses
     - .no-cpu-request
   stage: prepare
-  image: 'registry.gitlab.com/gitlab-org/security-products/analyzers/secrets:5@sha256:f272e7334fbb1a71bd84a33e25dbac878524e708aa9718588413e46792b9a38b'
+  image: 'registry.gitlab.com/gitlab-org/security-products/analyzers/secrets:5@sha256:0252d11cd0831a08667985bcd13c1b7236d9180b24cf880e3f5a0ab687840b04'
   variables:
     GIT_DEPTH: '1000'
   artifacts:

diff --git a/ci/docker.yml b/ci/docker.yml
@@ -7,7 +7,7 @@ build-docker:
     - .job-exclude-schedules-pipelines
     - .no-cpu-request
   stage: prepare
-  image: snickch/buildx@sha256:71060c230c8c23e1525c89389ba18a4342a1923c29d7b76663ae41a6062c17b6
+  image: snickch/buildx@sha256:63db62815b7ec00b80fd28c5f85c88c50df48d65fbbdd454e18b0efcc96a3235
   # downloads may fail
   retry: 2
   variables:
@@ -28,6 +28,7 @@ build-docker:
     - docker buildx bake --push -f bake.hcl
     - docker buildx bake --push -f bake-with-faked-secrets.hcl
   rules:
+    - if: $CI_SCHEDULED_TASK == "cleanup-registry"
     - if: $CI_SCHEDULED_TASK == "update_third_party_licenses"
     - if: $CI_MERGE_REQUEST_IID
     - if: $CI_COMMIT_TAG
@@ -41,7 +42,6 @@ build-docker:
 push-branch-images:
   extends:
     - .job-exclude-schedules-pipelines
-    - .job-exclude-update-third-party-licenses
     - .no-cpu-request
   stage: push
   image:

diff --git a/ci/e2e.yml b/ci/e2e.yml
@@ -3,7 +3,6 @@ include: ci/rules.yml
 e2e:
   extends:
     - .job-exclude-schedules-pipelines
-    - .job-exclude-update-third-party-licenses
   stage: test
   image:
     name: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/psa.utils.e2e-runner:$IMAGE_ID

diff --git a/ci/generated.yml b/ci/generated.yml
@@ -1,23 +1,24 @@
 .modules:
   list:
     docker: psa.app.mobile psa.app.web psa.database psa.database.ewpia
-      psa.database.ipia psa.lib.auth-server-client psa.lib.charts psa.lib.hapi-i18n-plugin
-      psa.lib.http-clients-internal psa.lib.licensecollector
-      psa.lib.messagequeue psa.lib.service-core psa.lib.templatepipeline
-      psa.server.apigateway psa.server.auth psa.server.autheventproxy
-      psa.server.mailserver psa.server.messagequeue psa.server.sftpserver
-      psa.service.analyzerservice psa.service.complianceservice
-      psa.service.feedbackstatisticservice psa.service.loggingservice
-      psa.service.modysservice psa.service.notificationservice
-      psa.service.personaldataservice psa.service.questionnaireservice
-      psa.service.sampletrackingservice psa.service.sormasservice
-      psa.service.userservice psa.test.data psa.utils.ci-analyze-secret-report
-      psa.utils.ci-awx-cli psa.utils.ci-git-mirror psa.utils.ci-release-image
+      psa.database.ipia psa.lib.auth-server-client psa.lib.charts
+      psa.lib.hapi-i18n-plugin psa.lib.http-clients-internal
+      psa.lib.licensecollector psa.lib.messagequeue psa.lib.service-core
+      psa.lib.templatepipeline psa.server.apigateway psa.server.auth
+      psa.server.autheventproxy psa.server.mailserver psa.server.messagequeue
+      psa.server.sftpserver psa.service.analyzerservice
+      psa.service.complianceservice psa.service.feedbackstatisticservice
+      psa.service.loggingservice psa.service.modysservice
+      psa.service.notificationservice psa.service.personaldataservice
+      psa.service.questionnaireservice psa.service.sampletrackingservice
+      psa.service.sormasservice psa.service.userservice psa.test.data
+      psa.utils.ci-analyze-secret-report psa.utils.ci-awx-cli
+      psa.utils.ci-git-mirror psa.utils.ci-release-image
       psa.utils.ci-thirdparty-license-collector psa.utils.codeformatter
       psa.utils.coverage psa.utils.deploymentservice psa.utils.e2e-runner
       psa.utils.log-sink psa.utils.metrics psa.utils.repo-tool
-    lint: psa.app.mobile psa.app.web psa.lib.auth-server-client
-      psa.lib.hapi-i18n-plugin psa.lib.charts psa.lib.http-clients-internal
+    lint: psa.app.mobile psa.app.web psa.lib.auth-server-client psa.lib.charts
+      psa.lib.hapi-i18n-plugin psa.lib.http-clients-internal
       psa.lib.licensecollector psa.lib.messagequeue psa.lib.service-core
       psa.lib.templatepipeline psa.server.apigateway psa.server.autheventproxy
       psa.service.analyzerservice psa.service.complianceservice
@@ -27,8 +28,8 @@
       psa.service.sampletrackingservice psa.service.sormasservice
       psa.service.userservice psa.test.data psa.utils.deploymentservice
       psa.utils.repo-tool
-    install: psa.app.mobile psa.app.web psa.lib.auth-server-client
-      psa.lib.charts psa.lib.hapi-i18n-plugin psa.lib.http-clients-internal
+    install: psa.app.mobile psa.app.web psa.lib.auth-server-client psa.lib.charts
+      psa.lib.hapi-i18n-plugin psa.lib.http-clients-internal
       psa.lib.licensecollector psa.lib.messagequeue psa.lib.service-core
       psa.lib.templatepipeline psa.server.apigateway psa.server.autheventproxy
       psa.service.analyzerservice psa.service.complianceservice
@@ -38,14 +39,14 @@
       psa.service.sampletrackingservice psa.service.sormasservice
       psa.service.userservice psa.test.data psa.utils.deploymentservice
       psa.utils.repo-tool
-    unit: psa.app.mobile psa.app.web psa.lib.auth-server-client
-      psa.lib.charts psa.lib.hapi-i18n-plugin psa.lib.http-clients-internal
+    unit: psa.app.mobile psa.app.web psa.lib.auth-server-client psa.lib.charts
+      psa.lib.hapi-i18n-plugin psa.lib.http-clients-internal
       psa.lib.licensecollector psa.lib.service-core psa.lib.templatepipeline
       psa.server.apigateway psa.service.analyzerservice
-      psa.service.complianceservice psa.service.modysservice
-      psa.service.questionnaireservice psa.service.sampletrackingservice
-      psa.service.sormasservice psa.service.userservice
-      psa.utils.deploymentservice
+      psa.service.complianceservice psa.service.feedbackstatisticservice
+      psa.service.modysservice psa.service.questionnaireservice
+      psa.service.sampletrackingservice psa.service.sormasservice
+      psa.service.userservice psa.utils.deploymentservice
     int: psa.lib.messagequeue psa.lib.service-core psa.server.autheventproxy
       psa.service.analyzerservice psa.service.complianceservice
       psa.service.feedbackstatisticservice psa.service.loggingservice
@@ -91,6 +92,7 @@
       - psa.server.apigateway
       - psa.service.analyzerservice
       - psa.service.complianceservice
+      - psa.service.feedbackstatisticservice
       - psa.service.modysservice
       - psa.service.questionnaireservice
       - psa.service.sampletrackingservice

diff --git a/ci/github.yml b/ci/github.yml
@@ -5,7 +5,6 @@ include:
 mirror-github:
   extends:
     - .job-exclude-schedules-pipelines
-    - .job-exclude-update-third-party-licenses
     - .no-cpu-request
   image:
     name: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/psa.utils.ci-git-mirror:$IMAGE_ID