Merge branch 'release-1.4.4' into dev

.docs/api/metadata-db.md

@@ -28,6 +28,13 @@ services:
     ...
 ```
 
+## Image
+
+:octicons-tag-16:{ title="Minimum version" } 1.4.4
+
+We recommend to use the MariaDB image directly instead of our own maintained image which just copied
+the `setup-schema.sql` into the container. This can be done more transparently through volume mounts.
+
 !!! warning "Alphabetic Filename Sorting"
 
     Beware that the init script provided by Bitnami executes files in alphabetic order! For example: the file 

.gitlab-ci.yml

@@ -459,26 +459,6 @@ scan-data-db:
     reports:
       container_scanning: ./.trivy/trivy-data-db-report.json
 
-scan-metadata-db:
-  image: bitnami/trivy:latest
-  stage: scan
-  only:
-    refs:
-      - master
-  allow_failure: true
-  script:
-    - trivy image --insecure --exit-code 0 --format template --template "@.gitlab/gitlab.tpl" -o ./.trivy/trivy-metadata-db-report.json dbrepo-metadata-db:latest
-    - trivy image --insecure --exit-code 0 dbrepo-metadata-db:latest
-    - trivy image --insecure --exit-code 1 --severity CRITICAL dbrepo-metadata-db:latest
-  cache:
-    paths:
-      - .trivycache/
-  artifacts:
-    when: always
-    expire_in: 1 days
-    reports:
-      container_scanning: ./.trivy/trivy-metadata-db-report.json
-
 scan-ui:
   image: bitnami/trivy:latest
   stage: scan
@@ -606,11 +586,13 @@ release-helm:
     - "docker logout ${CI_REGISTRY2_URL}"
     - "echo ${CI_REGISTRY2_PASSWORD} | docker login --username ${CI_REGISTRY2_USER} --password-stdin ${CI_REGISTRY2_URL}"
     - "apk add sed helm curl"
-    - echo "$CI_GPG_KEYRING" | base64 -d > ./secring.gpg
-    - helm package ./helm/dbrepo --sign --key 'Martin Weise' --keyring ./secring.gpg --destination ./build
+    - "mkdir -p ~/.gnupg"
+    - echo "$CI_GPG_KEYRING" | base64 -d > ~/.gnupg/secring.gpg
+    - echo "$CI_GPG_KEYRING2" | base64 -d > ~/.gnupg/pubring.gpg
+    - "helm package ./helm/dbrepo --sign --key 'Martin Weise' --keyring ~/.gnupg/secring.gpg --destination ./build"
     - "helm plugin install https://github.com/sigstore/helm-sigstore"
   script:
-    - "helm sigstore upload ./build/dbrepo-${CHART_VERSION}.tgz oci://${CI_REGISTRY2_URL}/helm"
+    - "helm sigstore upload ./build/dbrepo-${CHART_VERSION}.tgz"
 
 release-docs:
   stage: release

dbrepo-ui/composables/table-service.ts

@@ -69,7 +69,6 @@ export const useTableService = (): any => {
 
   async function getData(databaseId: number, tableId: number, page: number, size: number, timestamp: Date): Promise<QueryResultDto> {
     const axios = useAxiosInstance()
-    console.debug('====>', mapFilter(timestamp, page, size))
     console.debug('get data for table with id', tableId, 'in database with id', databaseId);
     return new Promise<QueryResultDto>((resolve, reject) => {
       axios.get<QueryResultDto>(`/api/database/${databaseId}/table/${tableId}/data`, { params: mapFilter(timestamp, page, size), timeout: 30_000 })

dbrepo-ui/utils/index.ts

@@ -1056,10 +1056,12 @@ export function axiosErrorToApiError(error: AxiosError): ApiErrorDto {
       code: 'error.axios.timeout',
       message: error.message
     }
+    console.info('==> mapped axios error to', errorObj)
     return errorObj
   }
   if (error.response?.data) {
     const errorObj: ApiErrorDto = (error.response?.data as ApiErrorDto)
+    console.info('==> mapped axios error to', errorObj)
     return errorObj
   }
   const errorObj: ApiErrorDto = {
@@ -1067,6 +1069,7 @@ export function axiosErrorToApiError(error: AxiosError): ApiErrorDto {
     code: 'error.axios.connection',
     message: error.message
   }
+  console.info('==> mapped axios error to', errorObj)
   return errorObj
 }
 

helm/dbrepo/values.yaml

@@ -208,7 +208,7 @@ datadb:
 
 searchdb:
   ## @param searchdb.enabled Enable the Data Database.
-  enabled: true.
+  enabled: true
   ## @skip searchdb.fullnameOverride
   fullnameOverride: search-db
   ## @skip searchdb.servicenameOverride

make/rel.mk

@@ -4,7 +4,6 @@
 tag-images: build-images ## Tag the docker images.
 	docker tag dbrepo-analyse-service:latest "${REPOSITORY_URL}/analyse-service:${APP_VERSION}"
 	docker tag dbrepo-auth-service:latest "${REPOSITORY_URL}/auth-service:${APP_VERSION}"
-	docker tag dbrepo-metadata-db:latest "${REPOSITORY_URL}/metadata-db:${APP_VERSION}"
 	docker tag dbrepo-ui:latest "${REPOSITORY_URL}/ui:${APP_VERSION}"
 	docker tag dbrepo-data-service:latest "${REPOSITORY_URL}/data-service:${APP_VERSION}"
 	docker tag dbrepo-metadata-service:latest "${REPOSITORY_URL}/metadata-service:${APP_VERSION}"
@@ -18,7 +17,6 @@ tag-images: build-images ## Tag the docker images.
 release-images: tag-images ## Release the docker images.
 	docker push "${REPOSITORY_URL}/analyse-service:${APP_VERSION}"
 	docker push "${REPOSITORY_URL}/auth-service:${APP_VERSION}"
-	docker push "${REPOSITORY_URL}/metadata-db:${APP_VERSION}"
 	docker push "${REPOSITORY_URL}/ui:${APP_VERSION}"
 	docker push "${REPOSITORY_URL}/data-service:${APP_VERSION}"
 	docker push "${REPOSITORY_URL}/search-db:${APP_VERSION}"