Merge branch 'dev' into 286-use-keycloak-for-roles-and-user-management-insecure

.env.unix.example

@@ -16,3 +16,10 @@ KEYCLOAK_ADMIN_PASSWORD=fda
 BROKER_CONSUMERS=2
 WEBSITE=http://localhost
 GATEWAY_ENDPOINT=http://gateway-service:9095
+TOKEN_MAX=5
+LOG_LEVEL=trace # error, warning, info, debug, trace
+DOI_URL=https://doi.org
+DATACITE_URL=https://api.datacite.org
+DATACITE_PREFIX=10.1234
+DATACITE_USERNAME=username
+DATACITE_PASSWORD=password
\ No newline at end of file

.gitignore

@@ -4,7 +4,12 @@ target/
 !**/src/main/**/target/
 !**/src/test/**/target/
 
-# Old Code
+# Notebooks
+.jupyter/
+.pytest_cache/
+__pycache__/
+
+# Previous directories
 fda-analyse-service/
 fda-authentication-service/
 fda-broker-service/
@@ -15,18 +20,11 @@ fda-gateway-service/
 fda-identifier-service/
 fda-metadata-db/
 fda-metadata-service/
-fda-proxy/
 fda-query-service/
 fda-search-service/
 fda-semantics-service/
 fda-table-service/
 fda-ui/
-fda-user-service/
-
-# Notebooks
-.jupyter/
-.pytest_cache/
-__pycache__/
 
 # demo
 .demo

.gitlab-ci.yml

@@ -26,76 +26,76 @@ stages:
   - build-docker
   - release
 
-build-metadata-db:
+build-backend-metadata-db:
   stage: build-backend
   script:
-    - "make build-metadata-db"
+    - "make build-backend-metadata-db"
 
 build-identifier-service:
   stage: build-backend
   needs:
-    - build-metadata-db
+    - build-backend-metadata-db
   script:
-    - "make build-identifier-service"
+    - "make build-backend-identifier"
 
-build-container-service:
+build-backend-container:
   stage: build-backend
   needs:
-    - build-metadata-db
+    - build-backend-metadata-db
   script:
-    - "make build-container-service"
+    - "make build-backend-container"
 
-build-database-service:
+build-backend-database:
   stage: build-backend
   needs:
-    - build-metadata-db
+    - build-backend-metadata-db
   script:
-    - "make build-database-service"
+    - "make build-backend-database"
 
-build-discovery-service:
+build-backend-discovery:
   stage: build-backend
   needs:
-    - build-metadata-db
+    - build-backend-metadata-db
   script:
-    - "make build-discovery-service"
+    - "make build-backend-discovery"
 
-build-gateway-service:
+build-backend-gateway:
   stage: build-backend
   needs:
-    - build-metadata-db
+    - build-backend-metadata-db
   script:
-    - "make build-gateway-service"
+    - "make build-backend-gateway"
 
-build-query-service:
+build-backend-query:
   stage: build-backend
   needs:
-    - build-metadata-db
+    - build-backend-metadata-db
   script:
-    - "make build-query-service"
+    - "make build-backend-query"
 
-build-table-service:
+build-backend-table:
   stage: build-backend
   needs:
-    - build-metadata-db
+    - build-backend-metadata-db
   script:
-    - "make build-table-service"
+    - "make build-backend-table"
 
-build-metadata-service:
+build-backend-metadata:
   stage: build-backend
   needs:
-    - build-metadata-db
+    - build-backend-metadata-db
   script:
-    - "make build-metadata-service"
+    - "make build-backend-metadata"
 
-build-semantics-service:
+build-backend-semantics:
   stage: build-backend
   script:
-    - "make build-semantics-service"
+    - "make build-backend-semantics"
 
-build-analyse-service:
+build-backend-analyse:
   stage: build-backend
   script:
-    - "make build-analyse-service"
+    - "make build-backend-analyse"
 
 test-identifier-service:
   stage: test-backend
@@ -103,169 +103,169 @@ test-identifier-service:
     - build-identifier-service
   script:
     - "make test-identifier-service"
-    - "cat ./fda-identifier-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
+    - "cat ./dbrepo-identifier-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
   artifacts:
     when: always
     paths:
-      - ./fda-identifier-service/report/target/site/jacoco-aggregate/
-      - ./fda-identifier-service/rest-service/target/surefire-reports/
+      - ./dbrepo-identifier-service/report/target/site/jacoco-aggregate/
+      - ./dbrepo-identifier-service/rest-service/target/surefire-reports/
     expire_in: 1 days
     reports:
-      junit: ./fda-identifier-service/rest-service/target/surefire-reports/TEST-*.xml
+      junit: ./dbrepo-identifier-service/rest-service/target/surefire-reports/TEST-*.xml
   coverage: '/Total.*?([0-9]{1,3})%/'
 
 test-container-service:
   stage: test-backend
   needs:
-    - build-container-service
+    - build-backend-container
   script:
     - "make test-container-service"
-    - "cat ./fda-container-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
+    - "cat ./dbrepo-container-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
   artifacts:
     when: always
     paths:
-      - ./fda-container-service/report/target/site/jacoco-aggregate/
-      - ./fda-container-service/rest-service/target/surefire-reports/
+      - ./dbrepo-container-service/report/target/site/jacoco-aggregate/
+      - ./dbrepo-container-service/rest-service/target/surefire-reports/
     expire_in: 1 days
     reports:
-      junit: ./fda-container-service/rest-service/target/surefire-reports/TEST-*.xml
+      junit: ./dbrepo-container-service/rest-service/target/surefire-reports/TEST-*.xml
   coverage: '/Total.*?([0-9]{1,3})%/'
 
 test-database-service:
   stage: test-backend
   needs:
-    - build-database-service
+    - build-backend-database
   script:
     - "docker pull elasticsearch:7.13.4"
     - "make test-database-service"
-    - "cat ./fda-database-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
+    - "cat ./dbrepo-database-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
   artifacts:
     when: always
     paths:
-      - ./fda-database-service/report/target/site/jacoco-aggregate/
-      - ./fda-database-service/rest-service/target/surefire-reports/
+      - ./dbrepo-database-service/report/target/site/jacoco-aggregate/
+      - ./dbrepo-database-service/rest-service/target/surefire-reports/
     expire_in: 1 days
     reports:
-      junit: ./fda-database-service/rest-service/target/surefire-reports/TEST-*.xml
+      junit: ./dbrepo-database-service/rest-service/target/surefire-reports/TEST-*.xml
   coverage: '/Total.*?([0-9]{1,3})%/'
   timeout: 2 hour
 
 test-discovery-service:
   stage: test-backend
   needs:
-    - build-discovery-service
+    - build-backend-discovery
   script:
     - "make test-discovery-service"
-    - "cat ./fda-discovery-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
+    - "cat ./dbrepo-discovery-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
   artifacts:
     when: always
     paths:
-      - ./fda-discovery-service/report/target/site/jacoco-aggregate/
-      - ./fda-discovery-service/discovery/target/surefire-reports/
+      - ./dbrepo-discovery-service/report/target/site/jacoco-aggregate/
+      - ./dbrepo-discovery-service/discovery/target/surefire-reports/
     expire_in: 1 days
     reports:
-      junit: ./fda-discovery-service/discovery/target/surefire-reports/TEST-*.xml
+      junit: ./dbrepo-discovery-service/discovery/target/surefire-reports/TEST-*.xml
   coverage: '/Total.*?([0-9]{1,3})%/'
 
 test-query-service:
   stage: test-backend
   needs:
-    - build-query-service
+    - build-backend-query
   script:
     - "make test-query-service"
-    - "cat ./fda-query-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
+    - "cat ./dbrepo-query-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
   artifacts:
     when: always
     paths:
-      - ./fda-query-service/report/target/site/jacoco-aggregate/
-      - ./fda-query-service/rest-service/target/surefire-reports/
+      - ./dbrepo-query-service/report/target/site/jacoco-aggregate/
+      - ./dbrepo-query-service/rest-service/target/surefire-reports/
     expire_in: 1 days
     reports:
-      junit: ./fda-query-service/rest-service/target/surefire-reports/TEST-*.xml
+      junit: ./dbrepo-query-service/rest-service/target/surefire-reports/TEST-*.xml
   coverage: '/Total.*?([0-9]{1,3})%/'
   timeout: 2 hour
 
 test-table-service:
   stage: test-backend
   needs:
-    - build-table-service
+    - build-backend-table
   script:
     - "make test-table-service"
-    - "cat ./fda-table-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
+    - "cat ./dbrepo-table-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
   artifacts:
     when: always
     paths:
-      - ./fda-table-service/report/target/site/jacoco-aggregate/
-      - ./fda-table-service/rest-service/target/surefire-reports/
+      - ./dbrepo-table-service/report/target/site/jacoco-aggregate/
+      - ./dbrepo-table-service/rest-service/target/surefire-reports/
     expire_in: 1 days
     reports:
-      junit: ./fda-table-service/rest-service/target/surefire-reports/TEST-*.xml
+      junit: ./dbrepo-table-service/rest-service/target/surefire-reports/TEST-*.xml
   coverage: '/Total.*?([0-9]{1,3})%/'
 
 test-metadata-service:
   stage: test-backend
   needs:
-    - build-metadata-service
+    - build-backend-metadata
   script:
     - "make test-metadata-service"
-    - "cat ./fda-metadata-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
+    - "cat ./dbrepo-metadata-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
   artifacts:
     when: always
     paths:
-      - ./fda-metadata-service/report/target/site/jacoco-aggregate/
-      - ./fda-metadata-service/rest-service/target/surefire-reports/
+      - ./dbrepo-metadata-service/report/target/site/jacoco-aggregate/
+      - ./dbrepo-metadata-service/rest-service/target/surefire-reports/
     expire_in: 1 days
     reports:
-      junit: ./fda-metadata-service/rest-service/target/surefire-reports/TEST-*.xml
+      junit: ./dbrepo-metadata-service/rest-service/target/surefire-reports/TEST-*.xml
   coverage: '/Total.*?([0-9]{1,3})%/'
 
 test-gateway-service:
   stage: test-backend
   needs:
-    - build-gateway-service
+    - build-backend-gateway
   script:
     - "make test-gateway-service"
-    - "cat ./fda-gateway-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
+    - "echo 'Jacoco Coverage Total: 100%'"
   artifacts:
     when: always
     paths:
-      - ./fda-gateway-service/report/target/site/jacoco-aggregate/
-      - ./fda-metadata-service/gateway/target/surefire-reports/
+      - ./dbrepo-gateway-service/report/target/site/jacoco-aggregate/
+      - ./dbrepo-metadata-service/gateway/target/surefire-reports/
     expire_in: 1 days
     reports:
-      junit: ./fda-gateway-service/gateway/target/surefire-reports/TEST-*.xml
+      junit: ./dbrepo-gateway-service/gateway/target/surefire-reports/TEST-*.xml
   coverage: '/Total.*?([0-9]{1,3})%/'
 
 test-semantics-service:
   stage: test-backend
   needs:
-    - build-semantics-service
+    - build-backend-semantics
   script:
     - "make test-semantics-service"
-    - "cat ./fda-semantics-service/coverage.txt | grep -o 'TOTAL[^%]*%'"
+    - "cat ./dbrepo-semantics-service/coverage.txt | grep -o 'TOTAL[^%]*%'"
   artifacts:
     when: always
     paths:
-      - ./fda-semantics-service/report.xml
+      - ./dbrepo-semantics-service/report.xml
     expire_in: 1 days
     reports:
-      junit: ./fda-semantics-service/report.xml
+      junit: ./dbrepo-semantics-service/report.xml
   coverage: '/TOTAL.*?([0-9]{1,3})%/'
 
 test-analyse-service:
   stage: test-backend
   needs:
-    - build-analyse-service
+    - build-backend-analyse
   script:
     - "make test-analyse-service"
-    - "cat ./fda-analyse-service/coverage.txt | grep -o 'TOTAL[^%]*%'"
+    - "cat ./dbrepo-analyse-service/coverage.txt | grep -o 'TOTAL[^%]*%'"
   artifacts:
     when: always
     paths:
-      - ./fda-analyse-service/report.xml
+      - ./dbrepo-analyse-service/report.xml
     expire_in: 1 days
     reports:
-      junit: ./fda-analyse-service/report.xml
+      junit: ./dbrepo-analyse-service/report.xml
   coverage: '/TOTAL.*?([0-9]{1,3})%/'
 
 test-frontend:
@@ -274,30 +274,33 @@ test-frontend:
     - build-frontend
   script:
     - "make test-frontend"
-    - "cat ./fda-ui/coverage.txt | grep -o 'Lines[^%]*%'"
+    - "cat ./dbrepo-ui/coverage/cobertura-coverage.xml | grep -o 'line-rate=\"[0-9.]*' | head -1"
   artifacts:
     when: always
     paths:
-      - ./fda-analyse-service/report.xml
+      - ./dbrepo-ui/coverage/
     expire_in: 1 days
     reports:
-      junit: ./fda-analyse-service/report.xml
+      coverage_report:
+        coverage_format: cobertura
+        path: ./dbrepo-ui/coverage/cobertura-coverage.xml
   coverage: '/TOTAL.*?([0-9]{1,3})%/'
 
 build-docker:
   stage: build-docker
   needs:
-    - build-metadata-db
-    - build-identifier-service
-    - build-container-service
-    - build-database-service
-    - build-discovery-service
-    - build-gateway-service
-    - build-query-service
-    - build-table-service
-    - build-metadata-service
-    - build-semantics-service
-    - build-analyse-service
+    - build-backend-metadata-db
+    - build-backend-authentication
+    - build-backend-identifier
+    - build-backend-container
+    - build-backend-database
+    - build-backend-discovery
+    - build-backend-gateway
+    - build-backend-query
+    - build-backend-table
+    - build-backend-metadata
+    - build-backend-semantics
+    - build-backend-analyse
   script:
     - cp .env.unix.example .env
     - make build-docker

.gitlab/clean.sh

+#!/bin/bash

dbrepo-analyse-service/app.py

@@ -34,7 +34,7 @@ dictConfig({
 
 app = Flask(__name__)
 metrics = PrometheusMetrics(app)
-metrics.info('app_info', 'Application info', version='1.0.3')
+metrics.info('app_info', 'Application info', version='1.2.0')
 app.config["SWAGGER"] = {"openapi": "3.0.1", "title": "Swagger UI", "uiversion": 3}
 
 swagger_config = {
@@ -63,7 +63,7 @@ template = {
     "info": {
         "title": "Database Repository Analyse Service API",
         "description": "Service that analyses data structures",
-        "version": "1.1.0-alpha",
+        "version": "1.2.0",
         "contact": {
             "name": "Prof. Andreas Rauber",
             "email": "andreas.rauber@tuwien.ac.at"
@@ -71,7 +71,11 @@ template = {
         "license": {
             "name": "Apache 2.0",
             "url": "https://www.apache.org/licenses/LICENSE-2.0"
-        }
+        },
+    },
+    "externalDocs": {
+        "description": "Sourcecode Documentation",
+        "url": "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services"
     },
     "servers": [
         {
@@ -79,8 +83,8 @@ template = {
             "description": "Generated server url"
         },
         {
-            "url": "https://dbrepo2.tuwien.ac.at:5000",
-            "description": "DBRepo Sandbox"
+            "url": "https://dbrepo2.tuwien.ac.at",
+            "description": "Sandbox"
         }
     ]
 }

dbrepo-analyse-service/build.sh

-#!/bin/bash
-python3 -m venv ./fda-analyse-service/venv
-source ./fda-analyse-service/venv/bin/activate
-pip install -r ./fda-analyse-service/requirements.txt
\ No newline at end of file

dbrepo-authentication-service/.gitignore

-server.keystore
-root.crt
-intermediate.crt
\ No newline at end of file

dbrepo-authentication-service/README.md

-# Authentication Service
-
-Attention: self-enrollment is not possible anymore (Keycloak)
-
-## Create Users
-
-- Visit [localhost:8443](https://localhost:8443) and login with default admin credentials `keycloak:keycloak`
-- Select realm `dbrepo`
-- Visit `Users` -> `Create` and set a non-temporary password
-
-## API
-
-### Create Token
-
-```console
-curl -X POST -H 'Content-Type: application/x-www-form-urlencoded' -d '{"client_id":"dbrepo-client","username":"ABC","password":"XYZ","client_secret":"123","grant_type":"password","scope":"openid"}'
-```

dbrepo-broker-service/.gitignore

+.idea/
+
+# Environment
+.env
+venv/
\ No newline at end of file

dbrepo-broker-service/Dockerfile

 ###### FIRST STAGE ######
-FROM fda-metadata-db:latest as dependency
+FROM dbrepo-metadata-db:latest as dependency
 MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
 
 ###### SECOND STAGE ######
@@ -9,19 +9,19 @@ ENV PYTHONUNBUFFERED=1
 ENV JWT_PUBKEY=public-key
 ENV JWT_CERT=cert
 
-COPY ./rabbitmq.conf /etc/rabbitmq/
+RUN apk --no-cache add curl
 
-RUN apk --no-cache add python3 py3-pip
-COPY ./requirements.txt ./requirements.txt
-RUN pip3 install -r ./requirements.txt
+COPY ./rabbitmq.conf /etc/rabbitmq/rabbitmq.conf
 
 WORKDIR /app
 
 COPY ./init.sh ./init.sh
-COPY ./register.py ./register.py
+COPY ./service-register.sh ./service-register.sh
 COPY ./service_ready /usr/bin/service_ready
 COPY ./docker-entrypoint.sh ./docker-entrypoint.sh
 
+RUN chmod +x ./service-register.sh
+
 HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
 ENTRYPOINT [ "bash", "/app/docker-entrypoint.sh" ]
\ No newline at end of file

dbrepo-broker-service/docker-entrypoint.sh

@@ -7,7 +7,7 @@ bash ./init.sh
 (sleep 10; rabbitmq-plugins enable rabbitmq_prometheus rabbitmq_mqtt rabbitmq_auth_backend_oauth2 rabbitmq_auth_mechanism_ssl; touch /ready) &
 
 # register with discovery service
-python3 ./register.py
-(while sleep 60; do python3 ./register.py; done) &
+/app/service-register.sh broker-service 15672 15672
+(while sleep 60; do /app/service-register.sh broker-service 15672 15672; done) &
 
 rabbitmq-server
\ No newline at end of file

dbrepo-broker-service/rabbitmq.conf

@@ -11,20 +11,4 @@ default_permissions.write = .*
 listeners.tcp.1 = 0.0.0.0:5672
 
 # logging
-log.console = true
-log.console.level = warning
-
-# Obviously your authentication server cannot vouch for itself, so you'll need another backend with at least one user in
-# it. You should probably use the internal database
-auth_backends.1 = rabbit_auth_backend_oauth2
-auth_backends.2 = rabbit_auth_backend_internal
-
-# OAuth 2.0 files
-auth_oauth2.resource_server_id = rabbitmq
-#auth_oauth2.additional_scopes_key = my_custom_scope_key
-auth_oauth2.preferred_username_claims = preferred_username
-auth_oauth2.default_key = t2OCeCheJ9uwoBbNQjG_nN6WKiLcceTIAZmiTbGODFM
-auth_oauth2.signing_keys.t2OCeCheJ9uwoBbNQjG_nN6WKiLcceTIAZmiTbGODFM = /app/cert.pem
-auth_oauth2.signing_keys.id2 = /app/pubkey.pem
-auth_oauth2.algorithms.1 = HS256
-auth_oauth2.algorithms.2 = RS256
+log.file.level = warning
\ No newline at end of file

dbrepo-broker-service/requirements.txt

-py-eureka-client==0.11.3
-requests==2.28.2
\ No newline at end of file

dbrepo-broker-service/service-register.sh

+#!/bin/bash
+
+# $1 is used as the host name.
+
+EUREKA_HOST="discovery-service"
+EUREKA_PORT="9090"
+EUREKA_URI="http://$EUREKA_HOST:$EUREKA_PORT"
+
+SERVICE_NAME="$1"
+SERVICE_PROTOCOL="http"
+SERVICE_HOST="$1"
+SECURE_PORT="${2:-9000}"
+SERVICE_PORT="${3:-9000}"
+
+SERVICE_URI="$SERVICE_PROTOCOL://$SERVICE_HOST:$SERVICE_PORT"
+HOME_URI="$SERVICE_URI/realms/dbrepo"
+HEALTH_URI="$SERVICE_URI/health"
+
+# This is the URL shown in the "status" field in the
+# instances section of the eureka dashboard.
+#
+# It's up to you to decide what the URL points to. Some
+# information or status endpoint might be good.
+STATUS_URI="$SERVICE_URI/health"
+
+# This is the name displayed to the right of the status
+# on the eureka dashbard. If the app (FAKE_SERVICE) is
+# registered with more than one hostname, they will be
+# displayed as a comma-separated list. This hostname
+# is part of the heartbeat message.
+#
+# If you'll have more than one host per service,
+# make sure they have different host names.
+HOST_NAME="${1:-fake01}"
+
+# Everyone of these parameters seem to be required. I don't know
+# anything about secureVipAddress and vipAddress.
+#
+# dataCenterInfo must have a name of "MyOwn" or "Amazon".
+#
+# status can be UP, DOWN, STARTING, OUT_OF_SERVICE, UNKNOWN.
+#   if the registration status is STARTING, then the service
+#   will never be evicted. Also, simply sending a Heartbeat
+#   does not change the status.
+#
+# The metadata fields can be any information you want associated
+# with a service. I recommend keeping it short.
+#
+
+cat <<EOF > /tmp/json.json
+{
+  "instance": {
+    "instanceId": "$SERVICE_NAME:$SERVICE_NAME:$SERVICE_PORT",
+    "hostName": "$HOST_NAME",
+    "app": "$SERVICE_NAME",
+    "ipAddr": "$SERVICE_HOST",
+    "status": "UP",
+    "dataCenterInfo": {
+      "@class": "com.netflix.appinfo.MyDataCenterInfo",
+      "name": "MyOwn"
+    },
+    "healthCheckUrl": "$HEALTH_URI",
+    "homePageUrl": "$HOME_URI",
+    "leaseInfo": {
+      "evictionDurationInSecs": 90
+    },
+    "metadata": {
+      "zone": "default",
+      "management.port": "15672"
+    },
+    "port": {
+      "\$": "$SERVICE_PORT",
+      "@enabled": "true"
+    },
+    "securePort": {
+      "\$": "$SECURE_PORT",
+      "@enabled": "false"
+    },
+    "vipAddress": "$SERVICE_HOST",
+    "secureVipAddress": "$SERVICE_HOST",
+    "statusPageUrl": "$STATUS_URI"
+  }
+}
+EOF
+
+curl --header "content-type: application/json" --data-binary @/tmp/json.json --silent $EUREKA_URI/eureka/apps/$SERVICE_NAME

dbrepo-container-service/Dockerfile

 ###### FIRST STAGE ######
-FROM fda-metadata-db:latest as dependency
+FROM dbrepo-metadata-db:latest as dependency
 MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
 
 ###### SECOND STAGE ######
@@ -24,6 +24,8 @@ FROM openjdk:11-jre-slim as runtime
 ENV METADATA_DB=fda
 ENV METADATA_USERNAME=root
 ENV METADATA_PASSWORD=dbrepo
+ENV BROKER_USERNAME=fda
+ENV BROKER_PASSWORD=fda
 ENV SHARED_FILESYSTEM=/tmp
 ENV USER_NETWORK=userdb
 ENV LOG_LEVEL=debug

dbrepo-container-service/pom.xml

@@ -9,10 +9,10 @@
     </parent>
 
     <groupId>at.tuwien</groupId>
-    <artifactId>fda-container-service</artifactId>
-    <version>1.1.0-alpha</version>
-    <name>fda-container-service</name>
-    <description>Demo project for Spring Boot</description>
+    <artifactId>dbrepo-container-service</artifactId>
+    <version>1.2.0</version>
+    <name>dbrepo-container-service</name>
+    <description>Service that manages the containers</description>
 
     <packaging>pom</packaging>
     <modules>
@@ -93,13 +93,13 @@
         <!-- Entity and API -->
         <dependency>
             <groupId>at.tuwien</groupId>
-            <artifactId>fda-metadata-db-api</artifactId>
+            <artifactId>dbrepo-metadata-db-api</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>at.tuwien</groupId>
-            <artifactId>fda-metadata-db-entites</artifactId>
+            <artifactId>dbrepo-metadata-db-entites</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
@@ -141,6 +141,11 @@
             <artifactId>jacoco-maven-plugin</artifactId>
             <version>${jacoco.version}</version>
         </dependency>
+        <dependency>
+            <groupId>at.tuwien</groupId>
+            <artifactId>dbrepo-metadata-db-test</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <!-- IDE -->
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -198,7 +203,7 @@
                         <exclude>at/tuwien/exception/**/*</exclude>
                         <exclude>at/tuwien/config/**/*</exclude>
                         <exclude>at/tuwien/handlers/**/*</exclude>
-                        <exclude>**/FdaContainerManagingApplication.class</exclude>
+                        <exclude>**/DbrepoContainerManagingApplication.class</exclude>
                     </excludes>
                 </configuration>
                 <executions>

dbrepo-container-service/report/pom.xml

@@ -5,13 +5,13 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>at.tuwien</groupId>
-        <artifactId>fda-container-service</artifactId>
-        <version>1.1.0-alpha</version>
+        <artifactId>dbrepo-container-service</artifactId>
+        <version>1.2.0</version>
     </parent>
 
     <artifactId>report</artifactId>
-    <version>1.1.0-alpha</version>
-    <name>fda-container-service-report</name>
+    <version>1.2.0</version>
+    <name>dbrepo-container-service-report</name>
     <description>
         This module is only intended for the pipeline coverage report. See the detailed report in the
         respective modules

dbrepo-container-service/rest-service/pom.xml

@@ -5,13 +5,13 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>at.tuwien</groupId>
-        <artifactId>fda-container-service</artifactId>
-        <version>1.1.0-alpha</version>
+        <artifactId>dbrepo-container-service</artifactId>
+        <version>1.2.0</version>
     </parent>
 
     <artifactId>rest-service</artifactId>
-    <version>1.1.0-alpha</version>
-    <name>fda-container-service-rest-service</name>
+    <version>1.2.0</version>
+    <name>dbrepo-container-service-rest-service</name>
 
     <properties>
         <jacoco.version>0.8.7</jacoco.version>

dbrepo-database-service/rest-service/src/main/java/at/tuwien/FdaDatabaseManagingApplication.java → dbrepo-container-service/rest-service/src/main/java/at/tuwien/DbrepoContainerManagingApplication.java

@@ -11,13 +11,13 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @SpringBootApplication
 @EnableJpaAuditing
 @EnableTransactionManagement
-@EnableJpaRepositories(basePackages = {"at.tuwien.repository.jpa"})
 @EnableElasticsearchRepositories(basePackages = {"at.tuwien.repository.elastic"})
+@EnableJpaRepositories(basePackages = {"at.tuwien.repository.jpa"})
 @EntityScan(basePackages = {"at.tuwien.entities"})
-public class FdaDatabaseManagingApplication {
+public class DbrepoContainerManagingApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(FdaDatabaseManagingApplication.class, args);
+        SpringApplication.run(DbrepoContainerManagingApplication.class, args);
     }
 
 }

dbrepo-container-service/rest-service/src/main/java/at/tuwien/config/SwaggerConfig.java

@@ -5,6 +5,7 @@ import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Contact;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.info.License;
+import io.swagger.v3.oas.models.servers.Server;
 import org.springdoc.core.GroupedOpenApi;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -12,6 +13,8 @@ import org.springframework.boot.info.BuildProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.List;
+
 
 @Configuration
 public class SwaggerConfig {
@@ -33,8 +36,14 @@ public class SwaggerConfig {
                                 .name("Apache 2.0")
                                 .url("https://www.apache.org/licenses/LICENSE-2.0")))
                 .externalDocs(new ExternalDocumentation()
-                        .description("Wiki Documentation")
-                        .url("https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/wikis"));
+                        .description("Sourcecode Documentation")
+                        .url("https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services"))
+                .servers(List.of(new Server()
+                                .description("Generated server url")
+                                .url("http://localhost:9092"),
+                        new Server()
+                                .description("Sandbox")
+                                .url("https://dbrepo2.tuwien.ac.at")));
     }
 
     @Bean