diff --git a/.docker/.env b/.docker/.env
new file mode 100644
index 0000000000000000000000000000000000000000..16b95b4b46bcd24afcae019c023cf19fb2354ffa
--- /dev/null
+++ b/.docker/.env
@@ -0,0 +1,16 @@
+# general
+BASE_URL=http://localhost
+ADMIN_EMAIL=support@localhost
+# password for the identity service admin user
+IDENTITY_SERVICE_ADMIN_PASSWORD=admin
+# password for the auth service admin user
+AUTH_SERVICE_ADMIN_PASSWORD=admin
+# passwords for root user of the databases
+METADATA_DB_PASSWORD=dbrepo
+DATA_DB_PASSWORD=dbrepo
+AUTH_DB_PASSWORD=dbrepo
+SEARCH_DB_PASSWORD=admin
+# storage service
+S3_SECRET_ACCESS_KEY=seaweedfsadmin
+# internal admin user, requires a change of the value of auth_ldap.dn_lookup_bind.password in dist/rabbitmq.conf
+SYSTEM_PASSWORD=admin
diff --git a/.docker/config/.gitkeep b/.docker/config/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/.docker/dist.tar.gz b/.docker/dist.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..13e91ed189c2425dbb2d2493cc6fd4fa9d949b3e
Binary files /dev/null and b/.docker/dist.tar.gz differ
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index d51b00551a3a6af30bbb7d454f6fea00c17e7d65..d13e63c803d544ef129a6f03dbf6267ab6c2f0ec 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.6"
-
volumes:
metadata-db-data:
data-db-data:
@@ -8,23 +6,25 @@ volumes:
upload-service-data:
search-db-data:
storage-service-data:
+ identity-service-data:
services:
dbrepo-metadata-db:
restart: "no"
container_name: dbrepo-metadata-db
hostname: metadata-db
- image: docker.io/dbrepo/metadata-db:1.4.4
+ image: docker.io/bitnami/mariadb:11.1.3-debian-11-r6
volumes:
- metadata-db-data:/bitnami/mariadb
- - ./dist/2_setup-data.sql:/docker-entrypoint-initdb.d/2_setup-data.sql
+ - ./config/1_setup-schema.sql:/docker-entrypoint-initdb.d/1_setup-schema.sql
+ - ./config/2_setup-data.sql:/docker-entrypoint-initdb.d/2_setup-data.sql
ports:
- "3306:3306"
environment:
MARIADB_DATABASE: "${METADATA_DB:-dbrepo}"
- MARIADB_ROOT_PASSWORD: "${METADATA_PASSWORD:-dbrepo}"
+ MARIADB_ROOT_PASSWORD: "${METADATA_DB_PASSWORD:-dbrepo}"
healthcheck:
- test: mysqladmin ping --user="${METADATA_USERNAME:-root}" --password="${METADATA_PASSWORD:-dbrepo}" --silent
+ test: mysqladmin ping --user=root --password="${METADATA_DB_PASSWORD:-dbrepo}" --silent
interval: 10s
timeout: 5s
retries: 12
@@ -35,17 +35,16 @@ services:
restart: "no"
container_name: dbrepo-data-db
hostname: data-db
- image: docker.io/bitnami/mariadb-galera:11.2.2-debian-11-r0
+ image: docker.io/bitnami/mariadb:11.1.3-debian-11-r6
volumes:
- data-db-data:/bitnami/mariadb
- "${SHARED_VOLUME:-/tmp}:/tmp"
ports:
- "3307:3306"
environment:
- MARIADB_ROOT_PASSWORD: "${USER_DB_PASSWORD:-dbrepo}"
- MARIADB_GALERA_MARIABACKUP_PASSWORD: "${USER_DB_BACKUP_PASSWORD:-dbrepo}"
+ MARIADB_ROOT_PASSWORD: "${DATA_DB_PASSWORD:-dbrepo}"
healthcheck:
- test: mysqladmin ping --user="${USER_DB_USERNAME:-root}" --password="${USER_DB_PASSWORD:-dbrepo}" --silent
+ test: mysqladmin ping --user=root --password="${DATA_DB_PASSWORD:-dbrepo}" --silent
interval: 10s
timeout: 5s
retries: 12
@@ -56,17 +55,17 @@ services:
restart: "no"
container_name: dbrepo-auth-db
hostname: auth-db
- image: docker.io/bitnami/mariadb:11.2.2-debian-11-r0
+ image: docker.io/bitnami/mariadb:11.1.3-debian-11-r6
volumes:
- auth-db-data:/bitnami/mariadb
ports:
- "3308:3306"
environment:
- MARIADB_DATABASE: "${AUTH_DB:-keycloak}"
- MARIADB_ROOT_PASSWORD: "${AUTH_PASSWORD:-dbrepo}"
+ MARIADB_DATABASE: "${AUTH_DB_NAME:-keycloak}"
+ MARIADB_ROOT_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
healthcheck:
- test: mysqladmin ping --user="${AUTH_USERNAME:-root}" --password="${AUTH_PASSWORD:-dbrepo}" --silent
- interval: 10s
+ test: mysqladmin ping --user=root --password="${AUTH_DB_PASSWORD:-dbrepo}" --silent
+ interval: 15s
timeout: 5s
retries: 12
logging:
@@ -76,19 +75,21 @@ services:
restart: "no"
container_name: dbrepo-auth-service
hostname: auth-service
- image: docker.io/dbrepo/auth-service:1.4.4
+ image: registry.datalab.tuwien.ac.at/dbrepo/auth-service:1.4.5
healthcheck:
test: curl -sSL 'http://0.0.0.0:8080/realms/dbrepo' | grep "dbrepo" || exit 1
- interval: 10s
+ interval: 15s
timeout: 5s
retries: 12
environment:
AUTH_DB: "${AUTH_DB:-keycloak}"
- KC_DB_USERNAME: "${AUTH_USERNAME:-root}"
- KC_DB_PASSWORD: "${AUTH_PASSWORD:-dbrepo}"
- KEYCLOAK_ADMIN: "${KEYCLOAK_ADMIN:-fda}"
- KEYCLOAK_ADMIN_PASSWORD: "${KEYCLOAK_ADMIN_PASSWORD:-fda}"
+ KC_DB_USERNAME: root
+ KC_DB_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
+ KEYCLOAK_ADMIN: "${AUTH_SERVICE_ADMIN_USERNAME:-admin}"
+ KEYCLOAK_ADMIN_PASSWORD: "${AUTH_SERVICE_ADMIN_PASSWORD:-admin}"
depends_on:
+ dbrepo-identity-service:
+ condition: service_healthy
dbrepo-auth-db:
condition: service_healthy
logging:
@@ -98,49 +99,50 @@ services:
restart: "no"
container_name: dbrepo-metadata-service
hostname: metadata-service
- image: docker.io/dbrepo/metadata-service:1.4.4
+ image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.4.5
volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp"
environment:
ADMIN_EMAIL: "${ADMIN_EMAIL:-noreply@localhost}"
- ADMIN_PASSWORD: "${ADMIN_PASSWORD:-admin}"
- ADMIN_USERNAME: "${ADMIN_USERNAME:-admin}"
- ANALYSE_SERVICE_ENDPOINT: "${ANALYSE_SERVICE_ENDPOINT:-http://gateway-service}"
- AUTH_SERVICE_ADMIN: ${AUTH_SERVICE_ADMIN:-fda}
- AUTH_SERVICE_ADMIN_PASSWORD: ${AUTH_SERVICE_ADMIN_PASSWORD:-fda}
+ ANALYSE_SERVICE_ENDPOINT: "${ANALYSE_SERVICE_ENDPOINT:-http://analyse-service:8080}"
+ AUTH_SERVICE_ADMIN: ${AUTH_SERVICE_ADMIN:-admin}
+ AUTH_SERVICE_ADMIN_PASSWORD: ${AUTH_SERVICE_ADMIN_PASSWORD:-admin}
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
- AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
- AUTH_SERVICE_ENDPOINT: ${AUTH_SERVICE_ENDPOINT:-http://gateway-service/api/auth}
+ AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT_SECRET:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
+ AUTH_SERVICE_ENDPOINT: ${AUTH_SERVICE_ENDPOINT:-http://auth-service:8080}
BASE_URL: "${BASE_URL:-http://localhost}"
BROKER_EXCHANGE_NAME: ${BROKER_EXCHANGE_NAME:-dbrepo}
BROKER_QUEUE_NAME: ${BROKER_QUEUE_NAME:-dbrepo}
BROKER_HOST: "${BROKER_ENDPOINT:-broker-service}"
- BROKER_PASSWORD: ${BROKER_PASSWORD:-fda}
+ BROKER_PASSWORD: ${BROKER_PASSWORD:-admin}
BROKER_PORT: ${BROKER_PORT:-5672}
- BROKER_SERVICE_ENDPOINT: ${BROKER_SERVICE_ENDPOINT:-http://gateway-service/admin/broker}
- BROKER_USERNAME: ${BROKER_USERNAME:-fda}
+ BROKER_SERVICE_ENDPOINT: ${BROKER_SERVICE_ENDPOINT:-http://broker-service:15672}
+ BROKER_USERNAME: ${BROKER_USERNAME:-admin}
BROKER_VIRTUALHOST: "${BROKER_VIRTUALHOST:-dbrepo}"
+ CROSSREF_ENDPOINT: "${CROSSREF_ENDPOINT:-http://data.crossref.org}"
DATA_SERVICE_ENDPOINT: ${DATA_SERVICE_ENDPOINT:-http://data-service:8080}
DELETED_RECORD: "${DELETED_RECORD:-persistent}"
GRANULARITY: "${GRANULARITY:-YYYY-MM-DDThh:mm:ssZ}"
JWT_PUBKEY: "${JWT_PUBKEY:-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB}"
- LOG_LEVEL: "${LOG_LEVEL:-info}"
+ LOG_LEVEL: ${LOG_LEVEL:-info}
METADATA_DB: "${METADATA_DB:-dbrepo}"
+ METADATA_DB_PASSWORD: "${METADATA_DB_PASSWORD:-dbrepo}"
METADATA_HOST: "${METADATA_HOST:-metadata-db}"
METADATA_JDBC_EXTRA_ARGS: "${METADATA_JDBC_EXTRA_ARGS:-}"
- METADATA_USERNAME: "${METADATA_USERNAME:-root}"
- METADATA_PASSWORD: "${METADATA_PASSWORD:-dbrepo}"
- PID_BASE: ${PID_BASE:-http://localhost/pid/}
+ METADATA_PORT: "${METADATA_PORT:-3306}"
+ METADATA_USERNAME: root
REPOSITORY_NAME: "${REPOSITORY_NAME:-Database Repository}"
- SEARCH_SERVICE_ENDPOINT: "${SEARCH_SERVICE_ENDPOINT:-http://gateway-service}"
+ ROR_ENDPOINT: "${ROR_ENDPOINT:-https://api.ror.org}"
+ SEARCH_SERVICE_ENDPOINT: "${SEARCH_SERVICE_ENDPOINT:-http://search-service:8080}"
S3_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-seaweedfsadmin}"
- S3_ENDPOINT: "${S3_ENDPOINT:-http://gateway-service/api/storage}"
- S3_EXPORT_BUCKET: "${S3_EXPORT_BUCKET:-dbrepo-download}"
- S3_IMPORT_BUCKET: "${S3_IMPORT_BUCKET:-dbrepo-upload}"
+ S3_BUCKET: "${S3_BUCKET:-dbrepo}"
+ S3_ENDPOINT: "${S3_ENDPOINT:-http://storage-service:9000}"
S3_SECRET_ACCESS_KEY: "${S3_SECRET_ACCESS_KEY:-seaweedfsadmin}"
SPARQL_CONNECTION_TIMEOUT: "${SPARQL_CONNECTION_TIMEOUT:-10000}"
+ SYSTEM_USERNAME: "${SYSTEM_USERNAME:-admin}"
+ SYSTEM_PASSWORD: "${SYSTEM_PASSWORD:-admin}"
healthcheck:
- test: wget -qO- localhost:8080/actuator/health/readiness | grep -q "UP" || exit 1
+ test: curl -sSL localhost:8080/actuator/health/liveness | grep 'UP' || exit 1
interval: 10s
timeout: 5s
retries: 12
@@ -160,20 +162,18 @@ services:
restart: "no"
container_name: dbrepo-analyse-service
hostname: analyse-service
- image: docker.io/dbrepo/analyse-service:1.4.4
+ image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.4.5
environment:
- ADMIN_PASSWORD: "${ADMIN_PASSWORD:-admin}"
- ADMIN_USERNAME: "${ADMIN_USERNAME:-admin}"
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
AUTH_SERVICE_ENDPOINT: ${AUTH_SERVICE_ENDPOINT:-http://auth-service:8080}
- GATEWAY_SERVICE_ENDPOINT: ${GATEWAY_SERVICE_ENDPOINT:-http://gateway-service}
JWT_PUBKEY: "${JWT_PUBKEY:-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB}"
S3_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-seaweedfsadmin}"
+ S3_BUCKET: "${S3_BUCKET:-dbrepo}"
S3_ENDPOINT: "${S3_ENDPOINT:-http://storage-service:9000}"
- S3_EXPORT_BUCKET: "${S3_EXPORT_BUCKET:-dbrepo-download}"
- S3_IMPORT_BUCKET: "${S3_IMPORT_BUCKET:-dbrepo-upload}"
S3_SECRET_ACCESS_KEY: "${S3_SECRET_ACCESS_KEY:-seaweedfsadmin}"
+ SYSTEM_USERNAME: "${SYSTEM_USERNAME:-admin}"
+ SYSTEM_PASSWORD: "${SYSTEM_PASSWORD:-admin}"
volumes:
- "${SHARED_FILESYSTEM:-/tmp}:/tmp"
healthcheck:
@@ -189,15 +189,16 @@ services:
container_name: dbrepo-broker-service
hostname: broker-service
image: docker.io/bitnami/rabbitmq:3.12-debian-12
+ ports:
+ - 5672:5672
volumes:
- - ./dist/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf
- - ./dist/enabled_plugins:/etc/rabbitmq/enabled_plugins
- - ./dist/cert.pem:/app/cert.pem
- - ./dist/pubkey.pem:/app/pubkey.pem
- - ./dist/definitions.json:/app/definitions.json
+ - ./config/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf
+ - ./config/advanced.config:/etc/rabbitmq/advanced.config
+ - ./config/enabled_plugins:/etc/rabbitmq/enabled_plugins
+ - ./config/definitions.json:/app/definitions.json
- broker-service-data:/bitnami/rabbitmq/mnesia
depends_on:
- dbrepo-auth-service:
+ dbrepo-identity-service:
condition: service_healthy
healthcheck:
test: rabbitmq-diagnostics -q is_running | grep 'is fully booted and running'
@@ -211,7 +212,7 @@ services:
restart: "no"
container_name: dbrepo-search-db
hostname: search-db
- image: docker.io/dbrepo/search-db:1.4.4
+ image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.4.5
healthcheck:
test: curl -sSL localhost:9200/_plugins/_security/health | jq .status | grep UP
interval: 10s
@@ -235,31 +236,29 @@ services:
restart: "no"
container_name: dbrepo-search-service
hostname: search-service
- image: docker.io/dbrepo/search-service:1.4.4
+ image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.4.5
environment:
- ADMIN_PASSWORD: "${ADMIN_PASSWORD:-admin}"
- ADMIN_USERNAME: "${ADMIN_USERNAME:-admin}"
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
- AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
+ AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT_SECRET:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
AUTH_SERVICE_ENDPOINT: ${AUTH_SERVICE_ENDPOINT:-http://auth-service:8080}
COLLECTION: ${COLLECTION:-['database','table','column','identifier','unit','concept','user','view']}
+ METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}
OPENSEARCH_HOST: ${OPENSEARCH_HOST:-search-db}
OPENSEARCH_PORT: ${OPENSEARCH_PORT:-9200}
- OPENSEARCH_USERNAME: ${OPENSEARCH_USERNAME:-admin}
- OPENSEARCH_PASSWORD: ${OPENSEARCH_PASSWORD:-admin}
+ OPENSEARCH_USERNAME: ${SEARCH_DB_USERNAME:-admin}
+ OPENSEARCH_PASSWORD: ${SEARCH_DB_PASSWORD:-admin}
LOG_LEVEL: ${LOG_LEVEL:-info}
dbrepo-data-db-sidecar:
restart: "no"
container_name: dbrepo-data-db-sidecar
hostname: data-db-sidecar
- image: docker.io/dbrepo/data-db-sidecar:1.4.4
+ image: registry.datalab.tuwien.ac.at/dbrepo/data-db-sidecar:1.4.5
environment:
S3_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-seaweedfsadmin}"
+ S3_BUCKET: "${S3_BUCKET:-dbrepo}"
S3_ENDPOINT: "${S3_ENDPOINT:-http://storage-service:9000}"
- S3_EXPORT_BUCKET: "${S3_EXPORT_BUCKET:-dbrepo-download}"
S3_FILE_PATH: "${S3_FILE_PATH:-/tmp}"
- S3_IMPORT_BUCKET: "${S3_IMPORT_BUCKET:-dbrepo-upload}"
S3_SECRET_ACCESS_KEY: "${S3_SECRET_ACCESS_KEY:-seaweedfsadmin}"
volumes:
- "${SHARED_FILESYSTEM:-/tmp}:/tmp"
@@ -275,7 +274,7 @@ services:
restart: "no"
container_name: dbrepo-ui
hostname: ui
- image: docker.io/dbrepo/ui:1.4.4
+ image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.5
depends_on:
dbrepo-search-service:
condition: service_started
@@ -293,12 +292,12 @@ services:
restart: "no"
container_name: dbrepo-gateway-service
hostname: gateway-service
- image: docker.io/nginx:1.25-alpine-slim
+ image: docker.io/nginx:1.27.0-alpine3.19-slim
ports:
- "80:80"
- "443:443"
volumes:
- - ./dist/dbrepo.conf:/etc/nginx/conf.d/default.conf
+ - ./config/dbrepo.conf:/etc/nginx/conf.d/default.conf
depends_on:
dbrepo-analyse-service:
condition: service_healthy
@@ -315,18 +314,38 @@ services:
logging:
driver: json-file
- dbrepo-search-db-init:
+ dbrepo-identity-service:
+ restart: "no"
+ container_name: dbrepo-identity-service
+ hostname: identity-service
+ image: bitnami/openldap:2.6.8-debian-12-r1
+ environment:
+ LDAP_ADMIN_USERNAME: "${IDENTITY_SERVICE_ADMIN_USERNAME:-admin}"
+ LDAP_ADMIN_PASSWORD: "${IDENTITY_SERVICE_ADMIN_PASSWORD:-admin}"
+ LDAP_USERS: "${SYSTEM_USERNAME:-admin}"
+ LDAP_PASSWORDS: "${SYSTEM_PASSWORD:-admin}"
+ LDAP_GROUP: "${ADMIN_GROUP:-system}"
+ LDAP_ROOT: "${IDENTITY_SERVICE_ROOT:-dc=dbrepo,dc=at}"
+ LDAP_ADMIN_DN: "${IDENTITY_SERVICE_ADMIN_DN:-cn=admin,dc=dbrepo,dc=at}"
+ volumes:
+ - identity-service-data:/bitnami/openldap
+ healthcheck:
+ test: "ldapwhoami -H ldap://localhost:1389 -D ${IDENTITY_SERVICE_ADMIN_DN:-cn=admin,dc=dbrepo,dc=at} -w ${IDENTITY_SERVICE_ADMIN_PASSWORD:-admin} || exit 1"
+ interval: 10s
+ timeout: 5s
+ retries: 12
+
+ dbrepo-search-service-init:
restart: "no"
container_name: dbrepo-search-service-init
hostname: search-service-init
- image: docker.io/dbrepo/search-service-init:1.4.4
+ image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.4.5
environment:
- GATEWAY_SERVICE_ENDPOINT: ${GATEWAY_SERVICE_ENDPOINT:-http://gateway-service}
+ METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}
OPENSEARCH_HOST: ${OPENSEARCH_HOST:-search-db}
OPENSEARCH_PORT: ${OPENSEARCH_PORT:-9200}
- OPENSEARCH_USERNAME: ${OPENSEARCH_USERNAME:-admin}
- OPENSEARCH_PASSWORD: ${OPENSEARCH_PASSWORD:-admin}
- LOG_LEVEL: ${LOG_LEVEL:-info}
+ OPENSEARCH_USERNAME: ${SEARCH_DB_USERNAME:-admin}
+ OPENSEARCH_PASSWORD: ${SEARCH_DB_PASSWORD:-admin}
depends_on:
dbrepo-search-db:
condition: service_healthy
@@ -340,8 +359,10 @@ services:
image: docker.io/chrislusf/seaweedfs:3.59
command: [ "server", "-dir=/data", "-s3", "-s3.port=9000", "-s3.config=/app/s3_config.json", "-metricsPort=9091" ]
volumes:
- - ./dist/s3_config.json:/app/s3_config.json
+ - ./config/s3_config.json:/app/s3_config.json
- storage-service-data:/data
+ ports:
+ - "9000:9000"
healthcheck:
test: echo "cluster.check" | weed shell | grep "checking master.*ok" || exit 1
interval: 10s
@@ -354,9 +375,10 @@ services:
restart: "no"
container_name: dbrepo-storage-service-init
hostname: storage-service-init
- image: docker.io/dbrepo/storage-service-init:1.4.4
+ image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.4.5
environment:
- SEAWEEDFS_ENDPOINT: "${STORAGE_SEAWEEDFS_ENDPOINT:-storage-service:9333}"
+ WEED_CLUSTER_SW_MASTER: "${STORAGE_SERVICE_MASTER_ENDPOINT:-storage-service:9333}"
+ S3_BUCKET: "${S3_BUCKET:-dbrepo}"
depends_on:
dbrepo-storage-service:
condition: service_healthy
@@ -369,9 +391,11 @@ services:
hostname: upload-service
image: docker.io/tusproject/tusd:v2.4.0
command:
- - "--base-path=/api/upload/files/"
+ - "-behind-proxy"
+ - "-max-size=2000000000"
+ - "-base-path=/api/upload/files/"
- "-s3-endpoint=${STORAGE_ENDPOINT:-http://storage-service:9000}"
- - "-s3-bucket=dbrepo-upload"
+ - "-s3-bucket=dbrepo"
environment:
AWS_ACCESS_KEY_ID: "${STORAGE_USERNAME:-seaweedfsadmin}"
AWS_SECRET_ACCESS_KEY: "${STORAGE_PASSWORD:-seaweedfsadmin}"
@@ -391,28 +415,26 @@ services:
restart: "no"
container_name: dbrepo-data-service
hostname: data-service
- image: docker.io/dbrepo/data-service:1.4.4
+ image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.4.5
volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp"
environment:
- ADMIN_PASSWORD: "${ADMIN_PASSWORD:-admin}"
- ADMIN_USERNAME: "${ADMIN_USERNAME:-admin}"
- AUTH_SERVICE_ADMIN: ${AUTH_SERVICE_ADMIN:-fda}
- AUTH_SERVICE_ADMIN_PASSWORD: ${AUTH_SERVICE_ADMIN_PASSWORD:-fda}
+ AUTH_SERVICE_ADMIN: ${AUTH_SERVICE_ADMIN:-admin}
+ AUTH_SERVICE_ADMIN_PASSWORD: ${AUTH_SERVICE_ADMIN_PASSWORD:-admin}
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
AUTH_SERVICE_ENDPOINT: ${AUTH_SERVICE_ENDPOINT:-http://auth-service:8080}
BROKER_EXCHANGE_NAME: ${BROKER_EXCHANGE_NAME:-dbrepo}
BROKER_QUEUE_NAME: ${BROKER_QUEUE_NAME:-dbrepo}
BROKER_HOST: "${BROKER_ENDPOINT:-broker-service}"
- BROKER_PASSWORD: ${BROKER_PASSWORD:-fda}
+ BROKER_PASSWORD: ${SYSTEM_PASSWORD:-admin}
BROKER_PORT: ${BROKER_PORT:-5672}
BROKER_SERVICE_ENDPOINT: ${BROKER_SERVICE_ENDPOINT:-http://gateway-service/admin/broker}
- BROKER_USERNAME: ${BROKER_USERNAME:-fda}
+ BROKER_USERNAME: ${SYSTEM_USERNAME:-admin}
BROKER_VIRTUALHOST: "${BROKER_VIRTUALHOST:-dbrepo}"
CONNECTION_TIMEOUT: ${CONNECTION_TIMEOUT:-60000}
EXCHANGE_NAME: ${EXCHANGE_NAME:-dbrepo}
- METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://gateway-service}
+ METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}
GRANT_DEFAULT_READ: "${GRANT_DEFAULT_READ:-SELECT}"
GRANT_DEFAULT_WRITE: "${GRANT_DEFAULT_WRITE:-SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE}"
JWT_PUBKEY: "${JWT_PUBKEY:-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB}"
@@ -423,13 +445,15 @@ services:
REQUEUE_REJECTED: ${REQUEUE_REJECTED:-false}
ROUTING_KEY: "${ROUTING_KEY:-dbrepo.#}"
S3_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-seaweedfsadmin}"
+ S3_BUCKET: "${S3_BUCKET:-dbrepo}"
S3_ENDPOINT: "${S3_ENDPOINT:-http://storage-service:9000}"
- S3_EXPORT_BUCKET: "${S3_EXPORT_BUCKET:-dbrepo-download}"
S3_FILE_PATH: "${S3_FILE_PATH:-/tmp}"
S3_IMPORT_BUCKET: "${S3_IMPORT_BUCKET:-dbrepo-upload}"
S3_SECRET_ACCESS_KEY: "${S3_SECRET_ACCESS_KEY:-seaweedfsadmin}"
+ SYSTEM_USERNAME: "${SYSTEM_USERNAME:-admin}"
+ SYSTEM_PASSWORD: "${SYSTEM_PASSWORD:-admin}"
healthcheck:
- test: wget -qO- localhost:8080/actuator/health/readiness | grep -q "UP" || exit 1
+ test: curl -sSL localhost:8080/actuator/health/liveness | grep 'UP' || exit 1
interval: 10s
timeout: 5s
retries: 12
diff --git a/.docs/.swagger/api.base.yaml b/.docs/.swagger/api.base.yaml
index aa83c853cedca25eb3f4e27f59ba01fd24cd043b..c7b01fab0ebd3aebaa2f61dd68afdec362ccf236 100644
--- a/.docs/.swagger/api.base.yaml
+++ b/.docs/.swagger/api.base.yaml
@@ -10,13 +10,16 @@ components:
scheme: bearer
type: http
externalDocs:
- description: Sourcecode Documentation
+ description: Project Website
url: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/
info:
contact:
email: andreas.rauber@tuwien.ac.at
name: Prof. Andreas Rauber
- description: The REST API
+ description: |
+ The merged REST API of DBRepo for users, developers and data stewards to be accessed publicly. Have a look at
+ the [source code](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services) for non-public endpoints
+ that are used between the services themselves.
license:
name: Apache 2.0
url: https://www.apache.org/licenses/LICENSE-2.0
diff --git a/.docs/.swagger/api.yaml b/.docs/.swagger/api.yaml
index 7ba582ed3fba3ec1282918bff9f937f57dca36e2..c2b5b17fd4586065a803ed4cfe2a83cce2250abf 100644
--- a/.docs/.swagger/api.yaml
+++ b/.docs/.swagger/api.yaml
@@ -3,7 +3,15 @@ info:
contact:
email: andreas.rauber@tuwien.ac.at
name: Prof. Andreas Rauber
- description: The REST API
+ description: >
+ The merged REST API of DBRepo for users, developers and data stewards to be
+ accessed publicly. Have a look at
+
+ the [source
+ code](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services)
+ for non-public endpoints
+
+ that are used between the services themselves.
license:
name: Apache 2.0
url: 'https://www.apache.org/licenses/LICENSE-2.0'
@@ -15,14 +23,16 @@ servers:
- description: Local Instance
url: 'http://localhost'
externalDocs:
- description: Sourcecode Documentation
+ description: Project Website
url: 'https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/'
paths:
/api/analyse/datatypes:
get:
consumes:
- application/json
- description: This is a simple API which returns the datatypes of a (path) csv file
+ description: >-
+ Determines MySQL 8 datatypes of a given dataset. Requires role
+ `table-semantic-analyse`.
operationId: analyse_datatypes
parameters:
- example: filename_s3_key
@@ -87,8 +97,8 @@ paths:
consumes:
- application/json
description: >-
- This is a simple API which returns the primary keys + ranking of a
- (path) csv file
+ Determines primary keys of a given dataset. Requires role
+ `table-semantic-analyse`.
operationId: analyse_keys
parameters:
- example: filename_s3_key
@@ -133,14 +143,18 @@ paths:
security:
- bearerAuth: []
- basicAuth: []
- summary: Determine primary keys
+ summary: Determine keys
tags:
- analyse-endpoint
'/api/database/{databaseId}/view/{viewId}/data':
get:
tags:
- view-endpoint
- summary: Retrieve view data
+ summary: Get view data
+ description: >-
+ Gets data from a view of a database. For private databases, the user
+ needs at least *READ* access to the associated database. Requires role
+ `view-database-view-data`.
operationId: getData
parameters:
- name: databaseId
@@ -176,6 +190,15 @@ paths:
responses:
'200':
description: Retrieved view data
+ headers:
+ Access-Control-Expose-Headers:
+ description: Expose `X-Count` custom header
+ required: true
+ style: simple
+ X-Count:
+ description: Number of rows
+ required: true
+ style: simple
content:
application/json:
schema:
@@ -216,7 +239,11 @@ paths:
head:
tags:
- view-endpoint
- summary: Retrieve view data
+ summary: Get view data
+ description: >-
+ Gets data from a view of a database. For private databases, the user
+ needs at least *READ* access to the associated database. Requires role
+ `view-database-view-data`.
operationId: getData_1
parameters:
- name: databaseId
@@ -252,6 +279,15 @@ paths:
responses:
'200':
description: Retrieved view data
+ headers:
+ Access-Control-Expose-Headers:
+ description: Expose `X-Count` custom header
+ required: true
+ style: simple
+ X-Count:
+ description: Number of rows
+ required: true
+ style: simple
content:
application/json:
schema:
@@ -293,7 +329,13 @@ paths:
get:
tags:
- table-endpoint
- summary: Retrieve table data
+ summary: Get table data
+ description: >-
+ Gets data from a table with id. For a table in a private database, the
+ user needs to have at least *READ* access to the associated database.
+ Requests with HTTP method **GET** return the full dataset, requests with
+ HTTP method **HEAD** only the number of tuples in the `X-Count` header.
+ Requires role `view-table-data`.
operationId: getData_2
parameters:
- name: databaseId
@@ -328,7 +370,16 @@ paths:
format: int64
responses:
'200':
- description: Retrieved table data
+ description: Get table data
+ headers:
+ Access-Control-Expose-Headers:
+ description: Expose `X-Count` custom header
+ required: true
+ style: simple
+ X-Count:
+ description: Number of rows
+ required: true
+ style: simple
content:
application/json:
schema:
@@ -339,6 +390,12 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/ApiErrorDto'
+ '403':
+ description: Not allowed to get table data
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/ApiErrorDto'
'404':
description: Failed to find table in metadata database
content:
@@ -357,10 +414,11 @@ paths:
put:
tags:
- table-endpoint
- summary: Update a raw data tuple
+ summary: Update tuple
description: >-
- Updates a raw data tuple in a table with at least WRITE_OWN access. Then
- update the table statistics.
+ Updates a data tuple into a table, then the table statistics are
+ updated. The user needs to have at least *WRITE_OWN* access to the
+ associated database. Requires role `insert-table-data`.
operationId: updateRawTuple
parameters:
- name: databaseId
@@ -414,10 +472,11 @@ paths:
post:
tags:
- table-endpoint
- summary: Insert a raw data tuple
+ summary: Insert tuple
description: >-
- Inserts a raw data tuple into a table with at least WRITE_OWN access.
- Then update the table statistics.
+ Inserts a data tuple into a table, then the table statistics are
+ updated. The user needs to have at least *WRITE_OWN* access to the
+ associated database. Requires role `insert-table-data`.
operationId: insertRawTuple
parameters:
- name: databaseId
@@ -473,10 +532,11 @@ paths:
delete:
tags:
- table-endpoint
- summary: Delete table data
+ summary: Delete tuple
description: >-
- Deletes a raw data tuple in a table with at least WRITE_OWN access. Then
- update the table statistics.
+ Deletes a data tuple into a table, then the table statistics are
+ updated. The user needs to have at least *WRITE_OWN* access to the
+ associated database. Requires role `delete-table-data`.
operationId: deleteRawTuple
parameters:
- name: databaseId
@@ -530,7 +590,13 @@ paths:
head:
tags:
- table-endpoint
- summary: Retrieve table data
+ summary: Get table data
+ description: >-
+ Gets data from a table with id. For a table in a private database, the
+ user needs to have at least *READ* access to the associated database.
+ Requests with HTTP method **GET** return the full dataset, requests with
+ HTTP method **HEAD** only the number of tuples in the `X-Count` header.
+ Requires role `view-table-data`.
operationId: getData_3
parameters:
- name: databaseId
@@ -565,7 +631,16 @@ paths:
format: int64
responses:
'200':
- description: Retrieved table data
+ description: Get table data
+ headers:
+ Access-Control-Expose-Headers:
+ description: Expose `X-Count` custom header
+ required: true
+ style: simple
+ X-Count:
+ description: Number of rows
+ required: true
+ style: simple
content:
application/json:
schema:
@@ -576,6 +651,12 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/ApiErrorDto'
+ '403':
+ description: Not allowed to get table data
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/ApiErrorDto'
'404':
description: Failed to find table in metadata database
content:
@@ -595,7 +676,13 @@ paths:
get:
tags:
- subset-endpoint
- summary: Retrieved subset data
+ summary: Get subset data
+ description: >-
+ Gets data of subset with id. For private databases, the user needs at
+ least *READ* access to the associated database. Requests with HTTP
+ method **GET** return the subset dataset, requests with HTTP method
+ **HEAD** only the number of rows in the subset dataset in the `X-Count`
+ header
operationId: getData_4
parameters:
- name: databaseId
@@ -625,12 +712,21 @@ paths:
responses:
'200':
description: Retrieved subset data
+ headers:
+ Access-Control-Expose-Headers:
+ description: Expose `X-Count` custom header
+ required: true
+ style: simple
+ X-Count:
+ description: Number of rows
+ required: true
+ style: simple
content:
application/json:
schema:
$ref: '#/components/schemas/QueryResultDto'
'400':
- description: Malformed select query
+ description: Invalid pagination
content:
application/json:
schema:
@@ -661,7 +757,13 @@ paths:
head:
tags:
- subset-endpoint
- summary: Retrieved subset data
+ summary: Get subset data
+ description: >-
+ Gets data of subset with id. For private databases, the user needs at
+ least *READ* access to the associated database. Requests with HTTP
+ method **GET** return the subset dataset, requests with HTTP method
+ **HEAD** only the number of rows in the subset dataset in the `X-Count`
+ header
operationId: getData_5
parameters:
- name: databaseId
@@ -691,12 +793,21 @@ paths:
responses:
'200':
description: Retrieved subset data
+ headers:
+ Access-Control-Expose-Headers:
+ description: Expose `X-Count` custom header
+ required: true
+ style: simple
+ X-Count:
+ description: Number of rows
+ required: true
+ style: simple
content:
application/json:
schema:
$ref: '#/components/schemas/QueryResultDto'
'400':
- description: Malformed select query
+ description: Invalid pagination
content:
application/json:
schema:
@@ -729,6 +840,7 @@ paths:
tags:
- subset-endpoint
summary: Persist subset
+ description: Persists a subset with id. Requires role `persist-query`.
operationId: persist
parameters:
- name: databaseId
@@ -795,10 +907,12 @@ paths:
post:
tags:
- table-endpoint
- summary: Import data from a dataset
+ summary: Import dataset
description: >-
- Deletes a raw data tuple in a table with at least WRITE_OWN access. Then
- update the table statistics.
+ Imports a dataset in a table. Then update the table statistics. The user
+ needs to have at least *WRITE_OWN* access to the associated database
+ when importing into a owned table. Otherwise *WRITE_ALL* access in
+ needed. Requires role `insert-table-data`.
operationId: importDataset
parameters:
- name: databaseId
@@ -854,6 +968,10 @@ paths:
tags:
- subset-endpoint
summary: Find subsets
+ description: >-
+ Finds subsets in the query store. The result can be optionally filtered
+ by setting `persisted`. When set to *true*, only persisted queries are
+ returned, otherwise only non-persisted queries are returned.
operationId: list
parameters:
- name: databaseId
@@ -873,7 +991,9 @@ paths:
content:
application/json:
schema:
- type: string
+ type: array
+ items:
+ $ref: '#/components/schemas/QueryDto'
'403':
description: Not allowed to find subsets
content:
@@ -901,6 +1021,9 @@ paths:
tags:
- subset-endpoint
summary: Create subset
+ description: >-
+ Creates a subset in the query store of the data database. Requires role
+ `execute-query`
operationId: create
parameters:
- name: databaseId
@@ -985,7 +1108,10 @@ paths:
get:
tags:
- table-endpoint
- summary: Generate table statistic
+ summary: Get table statistic
+ description: >-
+ Gets basic statistical properties (min, max, mean, median, std.dev) of
+ numerical columns of a table with id.
operationId: statistic
parameters:
- name: databaseId
@@ -1029,10 +1155,11 @@ paths:
get:
tags:
- table-endpoint
- summary: Find table history
+ summary: Get history
description: >-
- Lists the insert/delete operations performed. Authentication is only
- required for tables in private databases
+ Gets the insert/delete operations history performed. For tables in
+ private databases, the user needs to have at least *READ* access to the
+ associated database.
operationId: getHistory
parameters:
- name: databaseId
@@ -1059,9 +1186,11 @@ paths:
content:
application/json:
schema:
- type: string
+ type: array
+ items:
+ $ref: '#/components/schemas/TableHistoryDto'
'400':
- description: Invalid pagination request
+ description: 'Invalid pagination size request, must be > 0'
content:
application/json:
schema:
@@ -1091,7 +1220,11 @@ paths:
get:
tags:
- table-endpoint
- summary: Export table data
+ summary: Get table data
+ description: >-
+ Gets data from table with id as downloadable file. For tables in private
+ databases, the user needs to have at least *READ* access to the
+ associated database.
operationId: exportData
parameters:
- name: databaseId
@@ -1152,6 +1285,10 @@ paths:
tags:
- subset-endpoint
summary: Find subset
+ description: >-
+ Finds a subset in the data database. Requests with HTTP header
+ `Accept=application/json` return the metadata, requests with HTTP header
+ `Accept=text/csv` return the data as downloadable file.
operationId: findById
parameters:
- name: databaseId
@@ -1220,6 +1357,10 @@ paths:
tags:
- database-endpoint
summary: List databases
+ description: >-
+ Lists all databases in the metadata database. Requests with HTTP method
+ **GET** return the list of databases, requests with HTTP method **HEAD**
+ only the number in the `X-Count` header.
operationId: list1
parameters:
- name: internal_name
@@ -1230,6 +1371,15 @@ paths:
responses:
'200':
description: List of databases
+ headers:
+ Access-Control-Expose-Headers:
+ description: Expose `X-Count` custom header
+ required: true
+ style: simple
+ X-Count:
+ description: Number of databases
+ required: true
+ style: simple
content:
application/json:
schema:
@@ -1240,6 +1390,9 @@ paths:
tags:
- database-endpoint
summary: Create database
+ description: >-
+ Creates a database in the container with id. Requires roles
+ `create-database`.
operationId: create_5
requestBody:
content:
@@ -1299,6 +1452,10 @@ paths:
tags:
- database-endpoint
summary: List databases
+ description: >-
+ Lists all databases in the metadata database. Requests with HTTP method
+ **GET** return the list of databases, requests with HTTP method **HEAD**
+ only the number in the `X-Count` header.
operationId: list_1
parameters:
- name: internal_name
@@ -1309,6 +1466,15 @@ paths:
responses:
'200':
description: List of databases
+ headers:
+ Access-Control-Expose-Headers:
+ description: Expose `X-Count` custom header
+ required: true
+ style: simple
+ X-Count:
+ description: Number of databases
+ required: true
+ style: simple
content:
application/json:
schema:
@@ -1319,7 +1485,13 @@ paths:
get:
tags:
- access-endpoint
- summary: Check access to some database
+ summary: Find/Check access
+ description: >-
+ Finds or checks access of a user with given id to a database with given
+ id. Requests with HTTP method **GET** return the access object, requests
+ with HTTP method **HEAD** only the status. When the user has at least
+ *READ* access, the status 200 is returned, 403 otherwise. Requires role
+ `check-database-access` or `admin`.
operationId: find
parameters:
- name: databaseId
@@ -1359,7 +1531,10 @@ paths:
put:
tags:
- access-endpoint
- summary: Modify access to some database
+ summary: Modify access
+ description: >-
+ Modifies access of a user with given id to database with given id.
+ Requires role `update-database-access`.
operationId: update_4
parameters:
- name: databaseId
@@ -1382,7 +1557,7 @@ paths:
required: true
responses:
'202':
- description: Modify access succeeded
+ description: Modified access
'400':
description: Modify access query or database connection is malformed
content:
@@ -1423,7 +1598,10 @@ paths:
post:
tags:
- access-endpoint
- summary: Give access to some database
+ summary: Give access
+ description: >-
+ Give a user with given id access to some database with given id.
+ Requires role `create-database-access`.
operationId: create_8
parameters:
- name: databaseId
@@ -1447,6 +1625,10 @@ paths:
responses:
'202':
description: Granting access succeeded
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/DatabaseAccessDto'
'400':
description: Granting access query or database connection is malformed
content:
@@ -1465,12 +1647,6 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/ApiErrorDto'
- '405':
- description: Granting access not permitted
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/ApiErrorDto'
'502':
description: Access could not be created due to connection error
content:
@@ -1489,7 +1665,10 @@ paths:
delete:
tags:
- access-endpoint
- summary: Revoke access to some database
+ summary: Delete access
+ description: >-
+ Delete access of a user with id to a database with id. Requires role
+ `delete-database-access`.
operationId: revoke
parameters:
- name: databaseId
@@ -1506,7 +1685,7 @@ paths:
format: uuid
responses:
'202':
- description: Revoked access successfully
+ description: Deleted access
'400':
description: Modify access query or database connection is malformed
content:
@@ -1543,7 +1722,13 @@ paths:
head:
tags:
- access-endpoint
- summary: Check access to some database
+ summary: Find/Check access
+ description: >-
+ Finds or checks access of a user with given id to a database with given
+ id. Requests with HTTP method **GET** return the access object, requests
+ with HTTP method **HEAD** only the status. When the user has at least
+ *READ* access, the status 200 is returned, 403 otherwise. Requires role
+ `check-database-access` or `admin`.
operationId: find_1
parameters:
- name: databaseId
@@ -1584,7 +1769,8 @@ paths:
get:
tags:
- user-endpoint
- summary: Get a user info
+ summary: Get user
+ description: Gets user with id from the metadata database. Requires authentication.
operationId: find_2
parameters:
- name: userId
@@ -1618,7 +1804,8 @@ paths:
put:
tags:
- user-endpoint
- summary: Modify user information
+ summary: Update user
+ description: Updates user with id. Requires role `modify-user-information`.
operationId: modify
parameters:
- name: userId
@@ -1665,7 +1852,8 @@ paths:
put:
tags:
- user-endpoint
- summary: Modify user password
+ summary: Update user password
+ description: Updates password of user with id. Requires authentication.
operationId: password
parameters:
- name: userId
@@ -1683,10 +1871,12 @@ paths:
responses:
'202':
description: Modified user password
+ '400':
+ description: Invalid password payload
content:
application/json:
schema:
- $ref: '#/components/schemas/UserDto'
+ $ref: '#/components/schemas/ApiErrorDto'
'403':
description: Not allowed to change foreign user password
content:
@@ -1718,7 +1908,8 @@ paths:
put:
tags:
- user-endpoint
- summary: Refresh user token
+ summary: Refresh token
+ description: Refreshes user token by refresh token.
operationId: refreshToken
requestBody:
content:
@@ -1733,12 +1924,18 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/TokenDto'
- '403':
+ '400':
description: Invalid refresh token
content:
application/json:
schema:
$ref: '#/components/schemas/ApiErrorDto'
+ '403':
+ description: Not allowed
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/ApiErrorDto'
'502':
description: Connection to auth service failed
content:
@@ -1748,7 +1945,8 @@ paths:
post:
tags:
- user-endpoint
- summary: Obtain user token
+ summary: Create token
+ description: Creates a user token via the auth service.
operationId: getToken
requestBody:
content:
@@ -1763,6 +1961,12 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/TokenDto'
+ '400':
+ description: Invalid login request
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/ApiErrorDto'
'403':
description: Not allowed to get token
content:
@@ -1799,7 +2003,8 @@ paths:
get:
tags:
- ontology-endpoint
- summary: Find one ontology
+ summary: Find ontology
+ description: Finds an ontology with id in the metadata database.
operationId: find_3
parameters:
- name: ontologyId
@@ -1824,7 +2029,8 @@ paths:
put:
tags:
- ontology-endpoint
- summary: Update an ontology
+ summary: Update ontology
+ description: Updates an ontology with id. Requires role `update-ontology`.
operationId: update
parameters:
- name: ontologyId
@@ -1858,7 +2064,8 @@ paths:
delete:
tags:
- ontology-endpoint
- summary: Delete an ontology
+ summary: Delete ontology
+ description: Deletes an ontology with given id. Requires role `delete-ontology`.
operationId: delete
parameters:
- name: ontologyId
@@ -1885,7 +2092,8 @@ paths:
put:
tags:
- message-endpoint
- summary: Update maintenance message
+ summary: Update message
+ description: Updates a message with id. Requires role `update-maintenance-message`.
operationId: update_1
parameters:
- name: messageId
@@ -1919,7 +2127,8 @@ paths:
delete:
tags:
- message-endpoint
- summary: Delete maintenance message
+ summary: Delete message
+ description: Deletes a message with id. Requires role `delete-maintenance-message`.
operationId: delete_1
parameters:
- name: messageId
@@ -1946,7 +2155,8 @@ paths:
get:
tags:
- image-endpoint
- summary: Find some image
+ summary: Find image
+ description: Finds a container image in the metadata database.
operationId: findById1
parameters:
- name: imageId
@@ -1971,7 +2181,10 @@ paths:
put:
tags:
- image-endpoint
- summary: Update some image
+ summary: Update image
+ description: >-
+ Updates container image in the metadata database. Requires role
+ `modify-image`.
operationId: update_2
parameters:
- name: imageId
@@ -2005,7 +2218,10 @@ paths:
delete:
tags:
- image-endpoint
- summary: Delete some image
+ summary: Delete image
+ description: >-
+ Deletes a container image in the metadata database. Requires role
+ `delete-image`.
operationId: delete_2
parameters:
- name: imageId
@@ -2030,7 +2246,10 @@ paths:
get:
tags:
- identifier-endpoint
- summary: Find some identifier
+ summary: Find identifier
+ description: >-
+ Finds an identifier with id. The response format depends on the HTTP
+ `Accept` header set on the request.
operationId: find_6
parameters:
- name: identifierId
@@ -2112,6 +2331,11 @@ paths:
tags:
- identifier-endpoint
summary: Save identifier
+ description: >-
+ Saves an identifier with id as a draft identifier. Identifiers can only
+ be created for objects the user has at least *READ* access in the
+ associated database (requires role `create-identifier`) or for any
+ object in any database (requires role `create-foreign-identifier`).
operationId: save
parameters:
- name: identifierId
@@ -2151,12 +2375,6 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/ApiErrorDto'
- '405':
- description: Creating identifier not permitted
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/ApiErrorDto'
'502':
description: Connection to search service failed
content:
@@ -2175,7 +2393,8 @@ paths:
delete:
tags:
- identifier-endpoint
- summary: Delete some identifier
+ summary: Delete identifier
+ description: Deletes an identifier with id. Requires role `delete-identifier`.
operationId: delete_3
parameters:
- name: identifierId
@@ -2187,10 +2406,6 @@ paths:
responses:
'202':
description: Deleted identifier
- content:
- '*/*':
- schema:
- type: object
'403':
description: Deleting identifier not permitted
content:
@@ -2223,6 +2438,9 @@ paths:
tags:
- identifier-endpoint
summary: Publish identifier
+ description: >-
+ Publishes an identifier with id. A published identifier cannot be
+ changed anymore. Requires role `publish-identifier`.
operationId: publish
parameters:
- name: identifierId
@@ -2256,12 +2474,6 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/ApiErrorDto'
- '405':
- description: Creating identifier not permitted
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/ApiErrorDto'
'502':
description: Connection to search service failed
content:
@@ -2282,6 +2494,9 @@ paths:
tags:
- database-endpoint
summary: Update database visibility
+ description: >-
+ Updates the database with id on the visibility. Only the database owner
+ can perform this operation. Requires role `modify-database-visibility`.
operationId: visibility
parameters:
- name: databaseId
@@ -2303,6 +2518,12 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/DatabaseDto'
+ '400':
+ description: The visibility payload is malformed
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/ApiErrorDto'
'403':
description: Visibility modification is not permitted
content:
@@ -2334,7 +2555,8 @@ paths:
get:
tags:
- table-endpoint
- summary: Get information about table
+ summary: Find table
+ description: Finds a table with id.
operationId: findById_2
parameters:
- name: databaseId
@@ -2369,13 +2591,13 @@ paths:
schema:
$ref: '#/components/schemas/ApiErrorDto'
'502':
- description: Connection to search service failed
+ description: Failed to establish connection with broker service
content:
application/json:
schema:
$ref: '#/components/schemas/ApiErrorDto'
'503':
- description: Failed to save in search service
+ description: Failed to obtain queue information from broker service
content:
application/json:
schema:
@@ -2386,7 +2608,11 @@ paths:
put:
tags:
- table-endpoint
- summary: Update table statistics
+ summary: Update statistics
+ description: >-
+ Updates basic statistical properties (min, max, mean, median, std.dev)
+ for numerical columns in a table with id. Requires role
+ `update-table-statistic`
operationId: updateStatistic
parameters:
- name: databaseId
@@ -2434,7 +2660,11 @@ paths:
delete:
tags:
- table-endpoint
- summary: Delete a table
+ summary: Delete table
+ description: >-
+ Deletes a table with id. Only the owner of a table can perform this
+ action (requires role `delete-table`) or anyone can delete a table
+ (requires role `delete-foreign-table`).
operationId: delete_5
parameters:
- name: databaseId
@@ -2489,7 +2719,12 @@ paths:
put:
tags:
- table-endpoint
- summary: Update a table column semantic mapping
+ summary: Update semantics
+ description: >-
+ Updates column semantics of a table column with id. Only the table owner
+ with at least *READ* access to the associated database can update the
+ column semantics (requires role `modify-table-column-semantics`) or
+ foreign table columns if role `modify-foreign-table-column-semantics`.
operationId: update_3
parameters:
- name: databaseId
@@ -2563,6 +2798,9 @@ paths:
tags:
- database-endpoint
summary: Update database owner
+ description: >-
+ Updates the database with id on the owner. Only the database owner can
+ perform this operation. Requires role `modify-database-owner`.
operationId: transfer
parameters:
- name: databaseId
@@ -2584,6 +2822,12 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/DatabaseDto'
+ '400':
+ description: Owner payload is malformed
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/ApiErrorDto'
'403':
description: Transfer of ownership is not permitted
content:
@@ -2615,7 +2859,11 @@ paths:
put:
tags:
- database-endpoint
- summary: Refresh database views metadata
+ summary: Update database view schemas
+ description: >-
+ Updates the database with id with generated metadata from view that are
+ not yet known to the database. Only the database owner can perform this
+ operation. Requires role `find-database`.
operationId: refreshViewMetadata
parameters:
- name: databaseId
@@ -2662,7 +2910,11 @@ paths:
put:
tags:
- database-endpoint
- summary: Refresh database tables metadata
+ summary: Update database table schemas
+ description: >-
+ Updates the database with id with generated metadata from tables that
+ are not yet known to the database. Only the database owner can perform
+ this operation. Requires role `find-database`.
operationId: refreshTableMetadata
parameters:
- name: databaseId
@@ -2715,7 +2967,10 @@ paths:
put:
tags:
- database-endpoint
- summary: Update database image
+ summary: Update database preview image
+ description: >-
+ Updates the database with id on the preview image. Only the database
+ owner can perform this operation. Requires role `modify-database-image`.
operationId: modifyImage
parameters:
- name: databaseId
@@ -2774,7 +3029,8 @@ paths:
get:
tags:
- user-endpoint
- summary: Find all users
+ summary: List users
+ description: Lists users known to the metadata database.
operationId: findAll
responses:
'200':
@@ -2789,6 +3045,9 @@ paths:
tags:
- user-endpoint
summary: Create user
+ description: >-
+ Creates a user in the auth service and metadata database. Requires that
+ no credentials are sent in the request.
operationId: create1
requestBody:
content:
@@ -2802,7 +3061,7 @@ paths:
content:
application/json:
schema:
- $ref: '#/components/schemas/UserBriefDto'
+ $ref: '#/components/schemas/UserDto'
'400':
description: Parameters are not well-formed (likely email)
content:
@@ -2841,21 +3100,25 @@ paths:
get:
tags:
- ontology-endpoint
- summary: List all ontologies
+ summary: List ontologies
+ description: Lists all ontologies known to the metadata database.
operationId: findAll_2
responses:
'200':
- description: List all ontologies
+ description: List ontologies
content:
application/json:
schema:
type: array
items:
- $ref: '#/components/schemas/OntologyDto'
+ $ref: '#/components/schemas/OntologyBriefDto'
post:
tags:
- ontology-endpoint
- summary: Register a new ontology
+ summary: Create ontology
+ description: >-
+ Creates an ontology in the metadata database. Requires role
+ `create-ontology`.
operationId: create_1
requestBody:
content:
@@ -2877,14 +3140,20 @@ paths:
get:
tags:
- message-endpoint
- summary: Find maintenance messages
+ summary: List messages
+ description: >-
+ Lists messages known to the metadata database. Messages can be filtered
+ be filtered with the optional `active` parameter. If set to *true*, only
+ active messages (that is, messages whose end time has not been reached)
+ will be returned. Otherwise only inactive messages are returned. If not
+ set, active and inactive messages are returned.
operationId: list_2
parameters:
- - name: filter
+ - name: active
in: query
required: false
schema:
- type: string
+ type: boolean
responses:
'200':
description: List messages
@@ -2897,7 +3166,10 @@ paths:
post:
tags:
- message-endpoint
- summary: Create maintenance message
+ summary: Create message
+ description: >-
+ Creates a message in the metadata database. Requires role
+ `create-maintenance-message`.
operationId: create_2
requestBody:
content:
@@ -2919,7 +3191,8 @@ paths:
get:
tags:
- image-endpoint
- summary: Find all images
+ summary: List images
+ description: Lists all container images known to the metadata database.
operationId: findAll_3
responses:
'200':
@@ -2929,11 +3202,14 @@ paths:
schema:
type: array
items:
- $ref: '#/components/schemas/ContainerImage'
+ $ref: '#/components/schemas/ImageBriefDto'
post:
tags:
- image-endpoint
summary: Create image
+ description: >-
+ Creates a container image in the metadata database. Requires role
+ `create-image`.
operationId: create_3
requestBody:
content:
@@ -2967,7 +3243,8 @@ paths:
get:
tags:
- identifier-endpoint
- summary: Find all identifiers
+ summary: List identifiers
+ description: Lists all identifiers known to the metadata database
operationId: findAll_4
parameters:
- name: dbid
@@ -3005,10 +3282,14 @@ paths:
content:
application/json:
schema:
- type: string
+ type: array
+ items:
+ $ref: '#/components/schemas/ConceptDto'
application/ld+json:
schema:
- type: string
+ type: array
+ items:
+ $ref: '#/components/schemas/LdDatasetDto'
'406':
description: 'Identifier could not be exported, the requested style is not known'
content:
@@ -3018,7 +3299,12 @@ paths:
post:
tags:
- identifier-endpoint
- summary: Draft identifier
+ summary: Create identifier
+ description: >-
+ Create an identifier with id to create a draft identifier. Identifiers
+ can only be created for objects the user has at least *READ* access in
+ the associated database (requires role `create-identifier`) or for any
+ object in any database (requires role `create-foreign-identifier`).
operationId: create_4
requestBody:
content:
@@ -3051,12 +3337,6 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/ApiErrorDto'
- '405':
- description: Creating identifier not permitted
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/ApiErrorDto'
'502':
description: Connection to search service failed
content:
@@ -3076,7 +3356,8 @@ paths:
get:
tags:
- view-endpoint
- summary: Find all views
+ summary: List views
+ description: Lists views known to the metadata database.
operationId: findAll_5
parameters:
- name: databaseId
@@ -3106,7 +3387,8 @@ paths:
post:
tags:
- view-endpoint
- summary: Create a view
+ summary: Create view
+ description: Creates a view. Requires role `create-database-view`.
operationId: create_6
parameters:
- name: databaseId
@@ -3134,12 +3416,6 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/ApiErrorDto'
- '401':
- description: Credentials missing
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/ApiErrorDto'
'403':
description: Credentials missing
content:
@@ -3152,12 +3428,6 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/ApiErrorDto'
- '405':
- description: Create view is not permitted
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/ApiErrorDto'
'423':
description: Create view resulted in an invalid query statement
content:
@@ -3183,7 +3453,8 @@ paths:
get:
tags:
- table-endpoint
- summary: List all tables
+ summary: List tables
+ description: Lists all tables known to the metadata database.
operationId: list_4
parameters:
- name: databaseId
@@ -3219,7 +3490,8 @@ paths:
post:
tags:
- table-endpoint
- summary: Create a table
+ summary: Create table
+ description: Creates a table in the database with id. Requires role `create-table`.
operationId: create_7
parameters:
- name: databaseId
@@ -3284,7 +3556,8 @@ paths:
get:
tags:
- container-endpoint
- summary: Find all containers
+ summary: List containers
+ description: List all containers in the metadata database.
operationId: findAll_6
parameters:
- name: limit
@@ -3301,11 +3574,14 @@ paths:
schema:
type: array
items:
- type: string
+ $ref: '#/components/schemas/ContainerBriefDto'
post:
tags:
- container-endpoint
summary: Create container
+ description: >-
+ Creates a container in the metadata database. Requires role
+ `create-container`.
operationId: create_9
requestBody:
content:
@@ -3319,7 +3595,19 @@ paths:
content:
application/json:
schema:
- $ref: '#/components/schemas/ContainerBriefDto'
+ $ref: '#/components/schemas/ContainerDto'
+ '400':
+ description: Container payload malformed
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/ApiErrorDto'
+ '403':
+ description: 'Create container not permitted, need authority `create-container`'
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/ApiErrorDto'
'404':
description: Container image or user could not be found
content:
@@ -3339,7 +3627,8 @@ paths:
get:
tags:
- unit-endpoint
- summary: List semantic units
+ summary: List units
+ description: Lists units known to the metadata database.
operationId: findAll_1
responses:
'200':
@@ -3355,6 +3644,9 @@ paths:
tags:
- ontology-endpoint
summary: Find entities
+ description: >-
+ Finds semantic entities by label or uri in an ontology with id. Requires
+ role `execute-semantic-query`.
operationId: find_4
parameters:
- name: ontologyId
@@ -3413,7 +3705,7 @@ paths:
get:
tags:
- metadata-endpoint
- summary: Get the record
+ summary: Get record
operationId: identify_1_1_1_1
parameters:
- name: verb
@@ -3432,7 +3724,8 @@ paths:
get:
tags:
- message-endpoint
- summary: Find one maintenance message
+ summary: Find message
+ description: Finds a message with id in the metadata database.
operationId: find_5
parameters:
- name: messageId
@@ -3458,7 +3751,8 @@ paths:
get:
tags:
- license-endpoint
- summary: Get all licenses
+ summary: List licenses
+ description: Lists licenses known to the metadata database.
operationId: list_3
responses:
'200':
@@ -3468,12 +3762,15 @@ paths:
schema:
type: array
items:
- type: string
+ $ref: '#/components/schemas/LicenseDto'
/api/identifier/retrieve:
get:
tags:
- identifier-endpoint
- summary: Retrieve metadata from identifier
+ summary: Retrieve PID metadata
+ description: >-
+ Retrieves Persistent Identifier (PID) metadata from external endpoints.
+ Supported PIDs are: ORCID, ROR, DOI.
operationId: retrieve
parameters:
- name: url
@@ -3498,7 +3795,8 @@ paths:
get:
tags:
- database-endpoint
- summary: Find some database
+ summary: Find database
+ description: Finds a database with id.
operationId: findById_1
parameters:
- name: databaseId
@@ -3539,7 +3837,8 @@ paths:
get:
tags:
- view-endpoint
- summary: Find one view
+ summary: Get view
+ description: Gets a view with id in the metadata database.
operationId: find_7
parameters:
- name: databaseId
@@ -3579,7 +3878,8 @@ paths:
delete:
tags:
- view-endpoint
- summary: Delete one view
+ summary: Delete view
+ description: Deletes a view with id. Requires role `delete-database-view`.
operationId: delete_4
parameters:
- name: databaseId
@@ -3597,6 +3897,10 @@ paths:
responses:
'202':
description: Delete view successfully
+ content:
+ '*/*':
+ schema:
+ $ref: '#/components/schemas/View'
'400':
description: Delete view query is malformed
content:
@@ -3615,12 +3919,6 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/ApiErrorDto'
- '405':
- description: Delete view is not permitted
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/ApiErrorDto'
'423':
description: Delete view resulted in an invalid query statement
content:
@@ -3646,7 +3944,10 @@ paths:
get:
tags:
- table-endpoint
- summary: Suggest table semantics
+ summary: Suggest semantics
+ description: >-
+ Suggests semantic concepts for a table. Requires role
+ `table-semantic-analyse`.
operationId: analyseTable
parameters:
- name: databaseId
@@ -3669,7 +3970,7 @@ paths:
schema:
type: array
items:
- $ref: '#/components/schemas/TableColumnEntityDto'
+ $ref: '#/components/schemas/EntityDto'
'400':
description: Failed to parse statistic in search service
content:
@@ -3701,7 +4002,8 @@ paths:
get:
tags:
- table-endpoint
- summary: Suggest table column semantics
+ summary: Suggest semantics
+ description: Suggests column semantics. Requires role `table-semantic-analyse`.
operationId: analyseTableColumn
parameters:
- name: databaseId
@@ -3756,7 +4058,8 @@ paths:
get:
tags:
- container-endpoint
- summary: Find some container
+ summary: Find container
+ description: Finds a container in the metadata database.
operationId: findById_3
parameters:
- name: containerId
@@ -3781,7 +4084,10 @@ paths:
delete:
tags:
- container-endpoint
- summary: Delete some container
+ summary: Delete container
+ description: >-
+ Deletes a container in the metadata database. Requires role
+ `delete-container`.
operationId: delete_6
parameters:
- name: containerId
@@ -3792,11 +4098,13 @@ paths:
format: int64
responses:
'202':
- description: Deleted container successfully
+ description: Deleted container
+ '403':
+ description: 'Create container not permitted, need authority `delete-container`'
content:
- '*/*':
+ application/json:
schema:
- type: object
+ $ref: '#/components/schemas/ApiErrorDto'
'404':
description: Container not found
content:
@@ -3810,11 +4118,12 @@ paths:
get:
tags:
- concept-endpoint
- summary: List semantic concepts
+ summary: List concepts
+ description: List all semantic concepts known to the metadata database
operationId: findAll_7
responses:
'200':
- description: Find all semantic concepts
+ description: List concepts
content:
application/json:
schema:
@@ -4092,29 +4401,6 @@ components:
column_name:
type: string
type: object
- QueryResultDto:
- required:
- - headers
- - id
- - result
- type: object
- properties:
- result:
- type: array
- items:
- type: object
- additionalProperties:
- type: object
- headers:
- type: array
- items:
- type: object
- additionalProperties:
- type: integer
- format: int32
- id:
- type: integer
- format: int64
ApiErrorDto:
required:
- code
@@ -4201,6 +4487,29 @@ components:
code:
type: string
example: error.service.code
+ QueryResultDto:
+ required:
+ - headers
+ - id
+ - result
+ type: object
+ properties:
+ result:
+ type: array
+ items:
+ type: object
+ additionalProperties:
+ type: object
+ headers:
+ type: array
+ items:
+ type: object
+ additionalProperties:
+ type: integer
+ format: int32
+ id:
+ type: integer
+ format: int64
TupleUpdateDto:
required:
- data
@@ -5323,6 +5632,23 @@ components:
rows:
type: integer
format: int64
+ TableHistoryDto:
+ required:
+ - event
+ - timestamp
+ - total
+ type: object
+ properties:
+ timestamp:
+ type: string
+ format: date-time
+ example: '2021-03-12T15:26:21.000Z'
+ event:
+ type: string
+ total:
+ type: integer
+ format: int64
+ example: 1
TupleDeleteDto:
required:
- keys
@@ -7950,58 +8276,33 @@ components:
privileged_password:
type: string
description: Password of privileged user
- ContainerBriefDto:
+ OntologyBriefDto:
required:
- - created
- - hash
- id
- - image
- - internal_name
- - name
- - running
+ - prefix
+ - rdf
+ - sparql
+ - uri
type: object
properties:
id:
type: integer
format: int64
- hash:
+ uri:
type: string
- example: f829dd8a884182d0da846f365dee1221fd16610a14c81b8f9f295ff162749e50
- name:
+ example: 'http://www.wikidata.org/'
+ prefix:
type: string
- example: Air Quality
- image:
- $ref: '#/components/schemas/ImageBriefDto'
- running:
+ example: wd
+ sparql:
type: boolean
example: true
- created:
- type: string
- format: date-time
- example: '2021-03-12T15:26:21.000Z'
- internal_name:
- type: string
- example: air-quality
- ImageBriefDto:
- required:
- - id
- - jdbc_method
- - name
- - version
- type: object
- properties:
- id:
- type: integer
- format: int64
- name:
- type: string
- example: mariadb
- version:
- type: string
- example: '10.5'
- jdbc_method:
+ rdf:
+ type: boolean
+ example: false
+ uri_pattern:
type: string
- example: mariadb
+ example: 'http://www.wikidata.org/entity/.*'
EntityDto:
required:
- label
@@ -8030,14 +8331,14 @@ components:
type: string
resumptionToken:
type: string
+ parametersString:
+ type: string
fromDate:
type: string
format: date-time
untilDate:
type: string
format: date-time
- parametersString:
- type: string
BannerMessageDto:
required:
- id
@@ -8071,6 +8372,149 @@ components:
type: string
format: date-time
example: '2021-03-12T15:26:21.000Z'
+ ImageBriefDto:
+ required:
+ - id
+ - jdbc_method
+ - name
+ - version
+ type: object
+ properties:
+ id:
+ type: integer
+ format: int64
+ name:
+ type: string
+ example: mariadb
+ version:
+ type: string
+ example: '10.5'
+ jdbc_method:
+ type: string
+ example: mariadb
+ LdCreatorDto:
+ required:
+ - '@type'
+ - name
+ type: object
+ properties:
+ name:
+ type: string
+ sameAs:
+ type: string
+ givenName:
+ type: string
+ familyName:
+ type: string
+ '@type':
+ type: string
+ LdDatasetDto:
+ required:
+ - '@context'
+ - '@type'
+ - citation
+ - creator
+ - description
+ - hasPart
+ - identifier
+ - name
+ - temporalCoverage
+ - url
+ - version
+ type: object
+ properties:
+ name:
+ type: string
+ description:
+ type: string
+ url:
+ type: string
+ identifier:
+ type: array
+ items:
+ type: string
+ license:
+ type: string
+ creator:
+ type: array
+ items:
+ $ref: '#/components/schemas/LdCreatorDto'
+ citation:
+ type: string
+ hasPart:
+ type: array
+ items:
+ $ref: '#/components/schemas/LdDatasetDto'
+ temporalCoverage:
+ type: string
+ version:
+ type: string
+ format: date-time
+ '@context':
+ type: string
+ '@type':
+ type: string
+ TableColumnEntityDto:
+ required:
+ - column_id
+ - database_id
+ - table_id
+ - uri
+ type: object
+ properties:
+ uri:
+ type: string
+ example: 'https://www.wikidata.org/entity/Q1686799'
+ label:
+ type: string
+ example: Apache Jena
+ description:
+ type: string
+ example: open source semantic web framework for Java
+ database_id:
+ type: integer
+ format: int64
+ example: 1
+ table_id:
+ type: integer
+ format: int64
+ example: 1
+ column_id:
+ type: integer
+ format: int64
+ example: 1
+ ContainerBriefDto:
+ required:
+ - created
+ - hash
+ - id
+ - image
+ - internal_name
+ - name
+ - running
+ type: object
+ properties:
+ id:
+ type: integer
+ format: int64
+ hash:
+ type: string
+ example: f829dd8a884182d0da846f365dee1221fd16610a14c81b8f9f295ff162749e50
+ name:
+ type: string
+ example: Air Quality
+ image:
+ $ref: '#/components/schemas/ImageBriefDto'
+ running:
+ type: boolean
+ example: true
+ created:
+ type: string
+ format: date-time
+ example: '2021-03-12T15:26:21.000Z'
+ internal_name:
+ type: string
+ example: air-quality
Constraints:
type: object
properties:
@@ -9510,97 +9954,6 @@ components:
d:
type: integer
format: int64
- LdCreatorDto:
- required:
- - '@type'
- - name
- type: object
- properties:
- name:
- type: string
- sameAs:
- type: string
- givenName:
- type: string
- familyName:
- type: string
- '@type':
- type: string
- LdDatasetDto:
- required:
- - '@context'
- - '@type'
- - citation
- - creator
- - description
- - hasPart
- - identifier
- - name
- - temporalCoverage
- - url
- - version
- type: object
- properties:
- name:
- type: string
- description:
- type: string
- url:
- type: string
- identifier:
- type: array
- items:
- type: string
- license:
- type: string
- creator:
- type: array
- items:
- $ref: '#/components/schemas/LdCreatorDto'
- citation:
- type: string
- hasPart:
- type: array
- items:
- $ref: '#/components/schemas/LdDatasetDto'
- temporalCoverage:
- type: string
- version:
- type: string
- format: date-time
- '@context':
- type: string
- '@type':
- type: string
- TableColumnEntityDto:
- required:
- - column_id
- - database_id
- - table_id
- - uri
- type: object
- properties:
- uri:
- type: string
- example: 'https://www.wikidata.org/entity/Q1686799'
- label:
- type: string
- example: Apache Jena
- description:
- type: string
- example: open source semantic web framework for Java
- database_id:
- type: integer
- format: int64
- example: 1
- table_id:
- type: integer
- format: int64
- example: 1
- column_id:
- type: integer
- format: int64
- example: 1
IndexDto:
properties:
results:
diff --git a/.docs/.swagger/swagger-site.sh b/.docs/.swagger/swagger-site.sh
deleted file mode 100644
index d8d91a73cb3dde9ad4d73b16aea193646e425683..0000000000000000000000000000000000000000
--- a/.docs/.swagger/swagger-site.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-declare -A services
-#services[1080]=upload
-services[4000]=search
-services[5000]=analyse
-services[9093]=data
-services[9099]=metadata
-services[3305]=sidecar
-
-rm -f ./tmp.yaml
-mkdir -p ./site/swagger
-touch ./tmp.yaml
-
-# -> build paths: map
-for key in "${!services[@]}"; do
- cat .docs/.swagger/api-${services[$key]}.yaml | yq .paths >> ./tmp.yaml
-done
-
-# -> merge with api.base.yaml into final api.yaml
-yq ".paths *= load(\"tmp.yaml\")" .docs/.swagger/api.base.yaml > .docs/.swagger/api.yaml
-
diff --git a/.docs/api/analyse-service.md b/.docs/api/analyse-service.md
index 484271bbfe75062897c6a7a2a4497e084337f3e1..3f5921968c7d1ebfd7cc4563c4b3fc4dccf7b23f 100644
--- a/.docs/api/analyse-service.md
+++ b/.docs/api/analyse-service.md
@@ -6,7 +6,7 @@ author: Martin Weise
!!! debug "Debug Information"
- Image: [`dbrepo/analyse-service:__APPVERSION__`](https://hub.docker.com/r/dbrepo/analyse-service)
+ Image: [`registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.4.5`](https://hub.docker.com/r/dbrepo/analyse-service)
* Ports: 5000/tcp
* Prometheus: `http://<hostname>:5000/metrics`
@@ -15,37 +15,37 @@ author: Martin Weise
## Overview
-It suggests data types for the [User Interface](./system-other-ui) when creating a table from a
-*comma separated values* (CSV) -file. It recommends enumerations for columns and returns e.g. a list of potential
+It suggests data types for the [User Interface](../ui) when creating a table from a
+*comma separated values* (CSV) -file. It recommends enumerations for columns and returns e.g. a list of potential
primary key candidates. The researcher is able to confirm these suggestions manually. Moreover, the Analyse Service
determines basic statistical properties of numerical columns.
### Analysis
-After [uploading](./system-services-storage/#buckets) the CSV-file into the `dbrepo-upload` bucket of
-the [Storage Service](./system-services-storage), analysis for data types and primary keys follows the flow:
-
-1. Retrieve the CSV-file from the `dbrepo-upload` bucket of the Storage Service as data stream (=nothing is stored in
+After [uploading](../storage-service/#buckets) the CSV-file into the `dbrepo-upload` bucket of
+the [Storage Service](../storage-service), analysis for data types and primary keys follows the flow:
+
+1. Retrieve the CSV-file from the `dbrepo-upload` bucket of the Storage Service as data stream (=nothing is stored in
the service) with the [`boto3`](https://boto3.amazonaws.com/v1/documentation/api/latest/index.html) client.
-2. When no separator is known, the Analyse Service tries to guess the separator from the first line
+2. When no separator is known, the Analyse Service tries to guess the separator from the first line
with [`csv.Sniff().sniff(...)`](https://docs.python.org/3/library/csv.html#csv.Sniffer). This step is optional when
the separator was provided via HTTP-payload: `{"separator": ";", ...}`
-3. With the separator known (either from step 2 or via HTTP-payload),
- the [`messytables.CSVTableSet(...)`](https://messytables.readthedocs.io/en/latest/#csv-support) guesses the headers
- and column types and enums, if the HTTP-payload contains `{"enum": true, ...}`.
+3. With the separator known (either from step 2 or via HTTP-payload), the [`Pandas`](https://pypi.org/project/pandas/)
+ guesses the headers and column types and enums, if the HTTP-payload contains `{"enum": true, ...}`. The data type
+ is guessed by a combination of Pandas and heuristics.
### Examples
-See the [usage page](./usage-analyse/) for examples.
+See the [usage page](..) for examples.
## Limitations
!!! question "Do you miss functionality? Do these limitations affect you?"
We strongly encourage you to help us implement it as we are welcoming contributors to open-source software and get
- in [contact](./contact) with us, we happily answer requests for collaboration with attached CV and your programming
+ in [contact](../../contact) with us, we happily answer requests for collaboration with attached CV and your programming
experience!
## Security
-1. Credentials for the [Storage Service](./system-services-storage) are stored in plaintext environment variables.
+1. Credentials for the [Storage Service](../storage-service) are stored in plaintext environment variables.
diff --git a/.docs/api/auth-service.md b/.docs/api/auth-service.md
index 5d3e0f42b2bb19b28451c8a8c8e40d937ffe9fab..40ad6d8fd54825245574e578bff4c9fd7de1b463 100644
--- a/.docs/api/auth-service.md
+++ b/.docs/api/auth-service.md
@@ -6,17 +6,50 @@ author: Martin Weise
!!! debug "Debug Information"
- Image: [`dbrepo/authentication-service:__APPVERSION__`](https://hub.docker.com/r/dbrepo/authentication-service)
+ Image: [`quay.io/keycloak/keycloak:24.0`](quay.io/keycloak/keycloak)
* Ports: 8080/tcp
- * UI: `http://<hostname>/api/auth/admin/`
+ * UI: `http://<hostname>/api/auth/`
## Overview
-By default, users are created using the [User Interface](../system-other-ui) and the sign-up page in the User Interface.
-This creates a new user in the [Authentication Database](../system-databases-authentication), the user identity is then
-managed by the
-Authentication Service.
+By default, users are created using the [User Interface](../ui) and the sign-up page in the User Interface.
+This creates a new user in Keycloak. The user identity is then managed by the Auth Service. Only a very small subset
+of immutable properties (id, username) is mirrored in the [Metadata Database](../metadata-db) for faster access.
+
+## Identities
+
+:octicons-tag-16:{ title="Minimum version" } 1.4.5
+
+Identities are managed via LDAP through the [Identity Service](../identity-service). The normal workflow is that the
+[Metadata Service](../metadata-service) adds identities when user register. In some cases, where this is not possible
+(e.g. in workshop-scenarios where accounts are created before the workshop starts), identities need to be created
+manually in Keycloak. The recommended workflow is:
+
+1. Login to the Auth Service as **Admin** and in the dbrepo realm navigate to **Users**
+2. Click the **Add user** button and fill out the Username field and assign the group `researchers` by clicking
+ the **Join Groups** and selecting it. Click **Join** and **Create**.
+3. Click the **Credentials** tab above and **Set password**. In the popup window assign a secure password to the user
+ and set **Temporary** to `Off`.
+
+ !!! example "Create user with specific id"
+
+ The user id is created automatically. In case you need to create a user with specific id such as in migration
+ scenarios, you need to change the `entryUUID` in the [Identity Service](../identity-service) by modifying this
+ protected attribute in `relax` mode:
+
+ ```bash
+ echo "dn: uid=<username>,ou=users,dc=dbrepo,dc=at
+ changetype: modify
+ replace: entryUUID
+ entryUUID: 506ae590-11a2-4d2d-82b8-45121c6b4dab" | \
+ ldapmodify -h localhost -p 1389 -D cn=admin,dc=dbrepo,dc=at -c -x -e relax \
+ -w<adminpassword>
+ ```
+
+4. Finally you need to query the user info once by navigating again to **Users**
+ and search for the **Username** and click :arrow_right: to search. Click the username and ensure that the
+ **User metadata** contains the entry **LDAP_ID**.
## Groups
@@ -41,163 +74,16 @@ Each of the composite role has a set of other associated composite roles.
</figure>
There is one role for one specific action in the services. For example: the `create-database` role authorizes a user to
-create a database in a Docker container. Therefore,
-the [`DatabaseEndpoint.java`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/a5bdd1e2169bae6497e2f7eee82dad8b9b059850/fda-database-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java#L78)
-endpoint requires a JWT access token with this authority.
-
-```java
-@PostMapping
-@PreAuthorize("hasAuthority('create-database')")
-public ResponseEntity<DatabaseBriefDto> create(@NotNull Long containerId,
- @Valid @RequestBody DatabaseCreateDto createDto,
- @NotNull Principal principal) {
-...
-}
-```
-
-### Default Container Handling
-
-| Name | Description |
-|-------------------|-------------------------------|
-| `find-container` | Can find a specific container |
-| `list-containers` | Can list all containers |
-
-### Default Database Handling
-
-| Name | Description |
-|------------------------------|------------------------------------------------------|
-| `check-database-access` | Can check the access to a database of a user |
-| `create-database` | Can create a database |
-| `create-database-access` | Can give a new access to a database of a user |
-| `delete-database-access` | Can delete the access to a database of a user |
-| `find-database` | Can find a specific database in a container |
-| `list-databases` | Can list all databases in a container |
-| `modify-database-image` | Can update the database image |
-| `modify-database-owner` | Can modify the database owner |
-| `modify-database-visibility` | Can modify the database visibility (public, private) |
-| `update-database-access` | Can update the access to a database of a user |
-
-### Default Table Handling
-
-| Name | Description |
-|---------------------------------|------------------------------------------------------|
-| `create-table` | Can create a table |
-| `find-tables` | Can list a specific table in a database |
-| `list-tables` | Can list all tables |
-| `modify-table-column-semantics` | Can modify the column semantics of a specific column |
-| `delete-table` | Can delete tables owned by the user in a database |
-
-### Default Query Handling
-
-| Name | Description |
-|---------------------------|-----------------------------------------------|
-| `create-database-view` | Can create a view in a database |
-| `delete-database-view` | Can delete a view in a database |
-| `delete-table-data` | Can delete data in a table |
-| `execute-query` | Can execute a query statement |
-| `export-query-data` | Can export the data that a query has produced |
-| `export-table-data` | Can export the data stored in a table |
-| `find-database-view` | Can find a specific database view |
-| `find-query` | Can find a specific query in the query store |
-| `insert-table-data` | Can insert data into a table |
-| `list-database-views` | Can list all database views |
-| `list-queries` | Can list all queries in the query store |
-| `persist-query` | Can persist a query in the query store |
-| `re-execute-query` | Can re-execute a query to reproduce a result |
-| `view-database-view-data` | Can view the data produced by a database view |
-| `view-table-data` | Can view the data in a table |
-| `view-table-history` | Can view the data history of a table |
-
-### Default Identifier Handling
-
-| Name | Description |
-|---------------------|---------------------------------------------|
-| `create-identifier` | Can create an identifier (subset, database) |
-| `find-identifier` | Can find a specific identifier |
-| `list-identifier` | Can list all identifiers |
-
-### Default User Handling
-
-| Name | Description |
-|---------------------------|-----------------------------------------|
-| `modify-user-theme` | Can modify the user theme (light, dark) |
-| `modify-user-information` | Can modify the user information |
-
-### Default Maintenance Handling
-
-| Name | Description |
-|------------------------------|------------------------------------------|
-| `create-maintenance-message` | Can create a maintenance message banner |
-| `delete-maintenance-message` | Can delete a maintenance message banner |
-| `find-maintenance-message` | Can find a maintenance message banner |
-| `list-maintenance-messages` | Can list all maintenance message banners |
-| `update-maintenance-message` | Can update a maintenance message banner |
-
-### Default Semantics Handling
-
-| Name | Description |
-|---------------------------|-----------------------------------------------------------------|
-| `create-semantic-unit` | Can save a previously unknown unit for a table column |
-| `create-semantic-concept` | Can save a previously unknown concept for a table column |
-| `execute-semantic-query` | Can query remote SPARQL endpoints to get labels and description |
-| `table-semantic-analyse` | Can automatically suggest units and concepts for a table |
-
-### Escalated User Handling
-
-| Name | Description |
-|-------------|-----------------------------------------------|
-| `find-user` | Can list user information for a specific user |
-
-### Escalated Container Handling
-
-| Name | Description |
-|--------------------|--------------------------|
-| `create-container` | Can create a container |
-| `delete-container` | Can delete any container |
-
-### Escalated Database Handling
-
-| Name | Description |
-|-------------------|------------------------------------------|
-| `delete-database` | Can delete any database in any container |
-
-### Escalated Table Handling
-
-| Name | Description |
-|------------------------|--------------------------------------|
-| `delete-foreign-table` | Can delete any table in any database |
-
-### Escalated Query Handling
-
-| Name | Description |
-|------|-------------|
-| / | |
-
-### Escalated Identifier Handling
-
-| Name | Description |
-|------------------------------|---------------------------------------------------|
-| `create-foreign-identifier` | Can create an identifier to any database or query |
-| `delete-identifier` | Can delete any identifier |
-| `modify-identifier-metadata` | Can modify any identifier metadata |
-
-### Escalated Semantics Handling
-
-| Name | Description |
-|-----------------------------------------|----------------------------------------------|
-| `create-ontology` | Can register a new ontology |
-| `delete-ontology` | Can unregister an ontology |
-| `list-ontologies` | Can list all ontologies |
-| `modify-foreign-table-column-semantics` | Can modify any table column concept and unit |
-| `update-ontology` | Can update ontology metadata |
-| `update-semantic-concept` | Can update own table column concept |
-| `update-semantic-unit` | Can update own table column unit |
+create a database.
+
+A full list of available roles can be obtained
+from [`dbrepo-realm.json`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/fb8d14ba02ee32b9a69a30905437b5c9e28adc21/dbrepo-auth-service/dbrepo-realm.json#L46)
+which is imported into Keycloak on startup.
## Limitations
* No support for sending e-mails through Keycloak by default.
* No support for temporary passwords.
-* No support for adding identifies in Keycloak directly.
* No support for multi-factor authentication.
!!! question "Do you miss functionality? Do these limitations affect you?"
@@ -208,5 +94,5 @@ public ResponseEntity<DatabaseBriefDto> create(@NotNull Long containerId,
## Security
-1. Mount your TLS certificate / private key pair into `/app/tls.crt` and `/app/tls.key` and
- set `KC_HTTPS_CERTIFICATE_FILE=/app/tls.crt` and set `KC_HTTPS_CERTIFICATE_KEY_FILE=/app/tls.key`.
+1. Keycloak should be configured to use TLS certificates, follow
+ the [official documentation](https://www.keycloak.org/server/enabletls).
diff --git a/.docs/api/broker-service.md b/.docs/api/broker-service.md
index 0345271bf1c23545e029b51f2de70311235ade5a..f2f684c4a944f4e726a53f4d050bb19b2f368a8d 100644
--- a/.docs/api/broker-service.md
+++ b/.docs/api/broker-service.md
@@ -19,23 +19,18 @@ It holds exchanges and topics responsible for holding AMQP messages for later co
use [RabbitMQ](https://www.rabbitmq.com/) in the implementation. By default, the endpoint listens to the insecure port `5672` for incoming
AMQP tuples and insecure port `15672` for the management UI.
-The default configuration creates a user with administrative privileges on the default virtual host `dbrepo`:
+The default configuration allows any user in the `cn=system,ou=users,dc=dbrepo,dc=at` from the
+[Identity Service](../identity-service) to access the Broker Service as user with `administrator` role, i.e. the
+`cn=admin,dc=dbrepo,dc=at` user that is created by default.
-* Username: `fda`
-* Password: `fda`
-* Roles: `["administrator"]`
+The Broker Service allows two ways of authentication for AMQP tuples:
-The Broker Service allows two ways of authentication:
+1. LDAP
+2. Plain (RabbitMQ's internal authentication)
-1. Plain
-2. OAuth2
-
-For detailed examples how to authenticate with the Broker Service see
-the [usage](/usage-broker) page.
-
-The architecture of the Broker Service is very simple. There is only one durable, topic exchange `dbrepo` and one quorum
-queue `dbrepo`, connected with a binding of `dbrepo.#` which routes all tuples with routing key prefix `dbrepo.` (mind
-the dot!) to this queue.
+The queue architecture of the Broker Service is very simple. There is only one durable, topic exchange `dbrepo` and one
+quorum queue `dbrepo`, connected with a binding of `dbrepo.#` which routes all tuples with routing key prefix `dbrepo.`
+to this queue.
<figure markdown>
@@ -64,10 +59,10 @@ The consumer takes care of writing it to the correct table in the [Data Service]
For a secure deployment it is necessary to configure the Broker Service as follows:
-1. Download the [`rabbitmq.conf`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/dbrepo-broker-service/rabbitmq.conf.secure) and
- change the `default_user` and `default_pass` lines before mounting it to `/etc/rabbitmq/rabbitmq.conf`.
-2. Mount your previously generated certificate and RSA public key pair (PEM-encoded) to `/app/cert.pem`
+1. Once you change the admin password of the [Identity Service](../identity-service), you need to change it in the
+ `rabbitmq.conf` as well: `auth_ldap.dn_lookup_bind.password=newpassword`.
+2. Enable TLS and mount your previously generated certificate and RSA public key pair (PEM-encoded) to `/app/cert.pem`
and `/app/pubkey.pem`. Note that these are *not* used for TLS encryption, but only for authentication of users. It
- is not recommended to use "real" TLS certificates, self-signed certificates with *sufficient keylength* are best-practice.
-3. Mount your TLS certificate authority file into `/etc/rabbitmq/cacert.crt` and your TLS certificate / private key pair
- into `/etc/tls/tls.crt` and `/etc/tls/tls.key`.
+ is not recommended to use "real" TLS certificates, self-signed certificates with *sufficient keylength* are
+ best-practice. Mount your TLS certificate authority file into `/etc/rabbitmq/cacert.crt` and your TLS certificate
+ / private key pair into `/etc/tls/tls.crt` and `/etc/tls/tls.key`.
diff --git a/.docs/api/data-db.md b/.docs/api/data-db.md
index 859264a53a08da57536c221dfd76899a833b3a6d..648640bb4c85413a7f5afbf65d1649a6e1706c3c 100644
--- a/.docs/api/data-db.md
+++ b/.docs/api/data-db.md
@@ -4,34 +4,39 @@ author: Martin Weise
!!! debug "Debug Information"
- Image: [`bitnami/mariadb-galera:11.2.2-debian-11-r0`](https://hub.docker.com/r/bitnami/mariadb-galera)
+ Image: [`docker.io/bitnami/mariadb:11.1.3-debian-11-r6`](https://hub.docker.com/r/bitnami/mariadb)
* Ports: 3306/tcp
* JDBC: `jdbc://mariadb:<hostname>:3306`
!!! debug "Debug Information"
- Image: [`dbrepo/data-db-sidecar:__APPVERSION__`](https://hub.docker.com/r/dbrepo/data-db-sidecar)
+ Image: [`dbrepo/data-db-sidecar:1.4.5`](https://hub.docker.com/r/dbrepo/data-db-sidecar)
- * Ports: 3305/tcp
- * Swagger UI: `http://<hostname>:1080/swagger-ui/` <a href="../swagger/sidecar" target="_blank">:fontawesome-solid-square-up-right: view online</a>
+ * Ports: 8080/tcp
## Overview
-By default, only one Data Database is deployed. You can deploy multiple (different) Data Database instances and make
-them available in the repository as follows:
+The Data Database contains the research data. In the default configuration, only one database of this type is deployed.
+Any number of MariaDB ata databases can be integrated into DBRepo, even non-empty databases. The database needs to be
+registered in the Metadata Database to be visible in the [User Interface](../ui) and usable from e.g. the Python
+Library.
-=== "Terminal"
+## Architecture
- ```shell
- curl \
- -sSL \
- http://<hostname>/api/container \
- -X POST \
- -d '{"name": "Data Database 2", "imageId": 1, "host": "example.com", "port": 3306, "privilegedUsername": "root", "privilegedPassword": "s3cr3t" }'
- ```
+### Sidecar
+
+We deploy a sidecar that handles the CSV-file upload/download operations between
+the [Storage Service](../system-services-storage) and the Data Database using a Python Flask application and
+the [`boto3`](https://boto3.amazonaws.com/v1/documentation/api/latest/index.html) client until MariaDB supports S3
+natively.
+
+<figure markdown>
+
+<figcaption>Sidecar that handles the CSV-file upload/download.</figcaption>
+</figure>
-### Settings
+## Data
The procedures require the user-generated databases to have the same collation (because of comparison operations).
Ensure that the Data Database has the character set `utf8mb4` and collation `utf8mb4_general_ci` in your `my.cfg`:
@@ -52,18 +57,6 @@ mariadb-galera:
extraFlags: "--character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci"
```
-### Sidecar
-
-We deploy a sidecar that handles the CSV-file upload/download operations between
-the [Storage Service](../system-services-storage) and the Data Database using a Python Flask application and
-the [`boto3`](https://boto3.amazonaws.com/v1/documentation/api/latest/index.html) client until MariaDB supports S3
-natively.
-
-<figure markdown>
-
-<figcaption>Sidecar that handles the CSV-file upload/download.</figcaption>
-</figure>
-
### Backup
Export all databases with `--skip-lock-tables` option for MariaDB Galera clusters as it is not supported currently by
diff --git a/.docs/api/data-service.md b/.docs/api/data-service.md
index 41efb2151420a4507d6d0e15e6df5e8be7486984..186732a472ba3218d0b65c3cc85e3653996040f0 100644
--- a/.docs/api/data-service.md
+++ b/.docs/api/data-service.md
@@ -6,7 +6,7 @@ author: Martin Weise
!!! debug "Debug Information"
- Image: [`dbrepo/data-service:__APPVERSION__`](https://hub.docker.com/r/dbrepo/data-service)
+ Image: [`registry.datalab.tuwien.ac.at/dbrepo/data-service:1.4.5`](https://hub.docker.com/r/dbrepo/data-service)
* Ports: 9093/tcp
* Info: `http://<hostname>:9093/actuator/info`
@@ -27,7 +27,7 @@ Data Service up.
!!! question "Do you miss functionality? Do these limitations affect you?"
We strongly encourage you to help us implement it as we are welcoming contributors to open-source software and get
- in [contact](./contact) with us, we happily answer requests for collaboration with attached CV and your programming
+ in [contact](../../contact) with us, we happily answer requests for collaboration with attached CV and your programming
experience!
## Security
diff --git a/.docs/api/gateway-service.md b/.docs/api/gateway-service.md
index cd3be4f73dd8f4891513615f7b901c055f71fed5..923b95a9f30ac9af06bb029682bd67bc7f2f0961 100644
--- a/.docs/api/gateway-service.md
+++ b/.docs/api/gateway-service.md
@@ -6,21 +6,21 @@ author: Martin Weise
!!! debug "Debug Information"
- Image: [`nginx:1.25-alpine-slim`](https://hub.docker.com/r/nginx)
+ Image: [`docker.io/nginx:1.27.0-alpine3.19-slim`](https://hub.docker.com/r/nginx)
* Ports: 80/tcp
## Overview
Provides a single point of access to the *application programming interface* (API) and configures a
-standard [NGINX](https://www.nginx.com/) reverse proxy for load balancing. This component is optional if you already have a load balancer
-or reverse proxy running.
+standard [NGINX](https://www.nginx.com/) reverse proxy for load balancing. This component is optional if you already
+have a load balancer or reverse proxy running.
## Settings
### SSL/TLS Security
-To setup SSL/TLS encryption, mount your TLS certificate and TLS private key into the container directly into the
+To setup SSL/TLS encryption, mount your TLS certificate and TLS private key into the container directly into the
`/etc/nginx/` directory.
```yaml title="docker-compose.yml"
@@ -41,14 +41,14 @@ If your TLS private key as a password, you need to specify it in the `dbrepo.con
### User Interface
-To serve the [User Interface](./system-other-ui/) under different port than `80`, change the port mapping in
+To serve the [User Interface](../ui/) under different port than `80`, change the port mapping in
the `docker-compose.yml` to e.g. port `8000`:
```yaml title="docker-compose.yml"
services:
...
dbrepo-gateway-service:
- image: docker.io/nginx:1.25-alpine-slim
+ image: docker.io/nginx:1.27.0-alpine3.19-slim
ports:
- "8000:80"
...
@@ -61,13 +61,12 @@ services:
!!! question "Do you miss functionality? Do these limitations affect you?"
We strongly encourage you to help us implement it as we are welcoming contributors to open-source software and get
- in [contact](./contact) with us, we happily answer requests for collaboration with attached CV and your programming
+ in [contact](../../contact) with us, we happily answer requests for collaboration with attached CV and your programming
experience!
-
## Security
-1. Enable TLS encryption by downloading
+1. Enable TLS encryption by downloading
the [`dbrepo.conf`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/master/dbrepo-gateway-service/dbrepo.conf)
and editing the *server* block to include your TLS certificate (with trust chain) `fullchain.pem` and TLS private key
`privkey.pem` (PEM-encoded).
diff --git a/.docs/api/identity-service.md b/.docs/api/identity-service.md
new file mode 100644
index 0000000000000000000000000000000000000000..fc075be448686769204908ff1c5d9ab586b23eec
--- /dev/null
+++ b/.docs/api/identity-service.md
@@ -0,0 +1,66 @@
+---
+author: Martin Weise
+---
+
+## tl;dr
+
+!!! debug "Debug Information"
+
+ Image: [`docker.io/openldap:2.6.8-debian-12-r1`](https://hub.docker.com/r/openldap)
+
+ * Ports: 1389/tcp, 1636/tcp
+
+## Overview
+
+This optional service holds the user identities which we simply call identities in the following. It is integrated into
+the [Auth Service](../auth-service) through an LDAP federation, allowing any identity to authenticate through the Auth
+Service. The LDAP protocol is not used for authentication.
+
+The Identity Service can be optionally replaced with your existing LDAP solution. Your LDAP solution should store
+users using the RFC 2798 [`InetOrgPerson`](https://datatracker.ietf.org/doc/html/rfc2798) schema which is standard
+to most LDAP solutions.
+
+## Identities
+
+Any identity is identified by its `entryUUID` by default in the Auth Service. Note that Keycloak (the software running
+the Auth Service) may assign a different UUID to a user. DBRepo **always** uses the UUID provided through the Identity
+Service.
+
+The field `uid` is the username and is used for bind/unbind operations. The fields `cn` and `sn` are ignored by the
+Auth Service and can be empty `""`.
+
+## Limitations
+
+* Limited support for scaling in Kubernetes, see the
+ [guide](https://github.com/jp-gouin/helm-openldap?tab=readme-ov-file#scaling-your-cluster) of the chart developers.
+* Currently no support for LDAP in the Data Database.
+* Currently no support for LDAP in the Search Database.
+
+!!! question "Do you miss functionality? Do these limitations affect you?"
+
+ We strongly encourage you to help us implement it as we are welcoming contributors to open-source software and get
+ in [contact](../contact) with us, we happily answer requests for collaboration with attached CV and your programming
+ experience!
+
+## Security
+
+1. By default, no ingress is enabled. If you need ingress on LTP Password and phpLDAPadmin, configure the ingress
+ to use your TLS secret `tls-cert-secret` containing the `tls.crt` and `tls.key`, e.g.:
+
+ ```yaml title="values.yaml"
+ identityservice:
+ ltb-passwd:
+ ingress:
+ enabled: true
+ tls:
+ - secretName: tls-cert-secret
+ hosts:
+ - example.com
+ phpldapadmin:
+ ingress:
+ enabled: true
+ tls:
+ - secretName: tls-cert-secret
+ hosts:
+ - example.com
+ ```
\ No newline at end of file
diff --git a/.docs/api/index.md b/.docs/api/index.md
index 1468c2b20fd0786b0f2a7e80f697adf6ae211b26..47d5ba14d1691972a6995d141fdd3f7c1dd40c3f 100644
--- a/.docs/api/index.md
+++ b/.docs/api/index.md
@@ -5,7 +5,7 @@ author: Martin Weise
# Overview
We developed a Python Library for communicating with DBRepo from e.g. Jupyter Notebooks. See
-the [Python Library](./usage-python) page for more details.
+the [Python Library](./open-api) page for more details.
We give usage examples of the most important use-cases we identified.
@@ -34,7 +34,7 @@ A user wants to create an account in DBRepo.
that your administrator has assigned.
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 1: Create user account.</figcaption>
</figure>
@@ -44,7 +44,7 @@ A user wants to create an account in DBRepo.
authenticated with DBRepo in Figure 2.
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 2: Login to the user account.</figcaption>
</figure>
@@ -54,7 +54,7 @@ A user wants to create an account in DBRepo.
identically in field :material-numeric-4-circle-outline:.
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 3: Change user account password.</figcaption>
</figure>
@@ -134,7 +134,7 @@ A user wants to create a database in DBRepo.
Login and press the ":material-plus: DATABASE" button on the top right :material-numeric-1-circle-outline: as seen in Figure 4.
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 4: Open the create database dialog.</figcaption>
</figure>
@@ -143,14 +143,14 @@ A user wants to create a database in DBRepo.
finally create the database, press "Create" :material-numeric-3-circle-outline: as seen in Figure 5.
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 5: Create database form.</figcaption>
</figure>
After a few seconds, you can see the created database in the "Recent Databases" list, as seen in Figure 6.
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 6: View the created database.</figcaption>
</figure>
@@ -213,7 +213,7 @@ access to. This is the default for self-created databases like above in [Create
Figure 7.
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 7: Open the import CSV form.</figcaption>
</figure>
@@ -221,7 +221,7 @@ access to. This is the default for self-created databases like above in [Create
as seen in Figure 8.
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 8: Basic table information.</figcaption>
</figure>
@@ -238,7 +238,7 @@ access to. This is the default for self-created databases like above in [Create
provide this information in :material-numeric-6-circle-outline:.
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 9: Dataset metadata necessary for import.</figcaption>
</figure>
@@ -246,7 +246,7 @@ access to. This is the default for self-created databases like above in [Create
dataset file onto the field in Figure 10.
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 10: Dataset import file.</figcaption>
</figure>
@@ -261,7 +261,7 @@ access to. This is the default for self-created databases like above in [Create
definitions by clicking the "ADD COLUMN" button in Figure 11.
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 11: Confirm the table schema and provide missing information.</figcaption>
</figure>
@@ -270,7 +270,7 @@ access to. This is the default for self-created databases like above in [Create
dataset as seen in Figure 12.
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 12: Confirm the table schema and provide missing information.</figcaption>
</figure>
@@ -284,7 +284,7 @@ access to. This is the default for self-created databases like above in [Create
13.
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 13: Table data.</figcaption>
</figure>
@@ -432,7 +432,7 @@ A user wants to import a database dump in `.sql` (or in `.sql.gz`) format into D
clicking the "OK" button :material-numeric-4-circle-outline:.
<figure markdown>
- 
+ 
<figcaption>Figure 14: Setup New Connection in MySQL Workbench.</figcaption>
</figure>
@@ -440,7 +440,7 @@ A user wants to import a database dump in `.sql` (or in `.sql.gz`) format into D
:material-numeric-1-circle-outline: and basic connection and version information :material-numeric-2-circle-outline:.
<figure markdown>
- 
+ 
<figcaption>Figure 15: Server status of the Data Database in MySQL Workbench.</figcaption>
</figure>
@@ -451,7 +451,7 @@ A user wants to import a database dump in `.sql` (or in `.sql.gz`) format into D
The import starts after clicking "Start Import" :material-numeric-5-circle-outline:.
<figure markdown>
- 
+ 
<figcaption>Figure 16: Data Import/Restore in MySQL Workbench.</figcaption>
</figure>
@@ -510,7 +510,7 @@ A user wants to import live data from e.g. sensor measurements fast and without
database via JDBC, you can obtain the connection string in the UI under the database info (c.f. Figure 14).
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 14: JDBC connection information.</figcaption>
</figure>
@@ -526,7 +526,7 @@ A user wants to import live data from e.g. sensor measurements fast and without
database via AMQP, you can obtain the connection string in the UI under the table info (c.f. Figure 14).
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 14: AMQP connection information.</figcaption>
</figure>
@@ -550,7 +550,7 @@ A user wants to create a subset and export it as csv file.
Figure 17.
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 17: Open the create subset form.</figcaption>
</figure>
@@ -562,7 +562,7 @@ A user wants to create a subset and export it as csv file.
Once you are confident the query covers the desired result, click ":material-run: Create".
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 18: Subset query building.</figcaption>
</figure>
@@ -571,7 +571,7 @@ A user wants to create a subset and export it as csv file.
View" on the top (c.f. Figure 19).
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 19: Subset result set.</figcaption>
</figure>
@@ -584,7 +584,7 @@ A user wants to create a subset and export it as csv file.
a csv file by clicking the ":material-download: DATA .CSV" button :material-numeric-2-circle-outline:.
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 20: Subset information.</figcaption>
</figure>
@@ -648,7 +648,7 @@ A user wants to create a subset and export it as csv file.
under the database info (c.f. Figure 20).
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 20: JDBC connection information.</figcaption>
</figure>
@@ -728,7 +728,7 @@ A user wants to assign a persistent identifier to a database owned by them.
the ":material-identifier: GET PID" button :material-numeric-1-circle-outline: as seen in Figure 21.
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 21: Open the get persisent identifier form.</figcaption>
</figure>
@@ -743,7 +743,7 @@ A user wants to assign a persistent identifier to a database owned by them.
:material-numeric-8-circle-outline:.
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 22: Identifier creator fields.</figcaption>
</figure>
@@ -753,7 +753,7 @@ A user wants to assign a persistent identifier to a database owned by them.
again :material-numeric-4-circle-outline: if they are not needed in Figure 23.
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 23: Identifier title fields.</figcaption>
</figure>
@@ -764,7 +764,7 @@ A user wants to assign a persistent identifier to a database owned by them.
publication month and publication day in Figure 24.
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 24: Identifier description fields and publishing information.</figcaption>
</figure>
@@ -775,7 +775,7 @@ A user wants to assign a persistent identifier to a database owned by them.
your data.
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 25: Related identifiers, license and language of the identifier.</figcaption>
</figure>
@@ -787,7 +787,7 @@ A user wants to assign a persistent identifier to a database owned by them.
language on the identifier summary page (c.f. Figure 26).
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 26: Identifier funder information.</figcaption>
</figure>
@@ -795,7 +795,7 @@ A user wants to assign a persistent identifier to a database owned by them.
result is displayed in Figure 27.
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 27: Identifier summary page.</figcaption>
</figure>
@@ -884,7 +884,7 @@ A user wants a public database to be private and only give specific users access
the dialog (c.f. Figure 28).
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 28: Database settings for visibility and access.</figcaption>
</figure>
@@ -893,7 +893,7 @@ A user wants a public database to be private and only give specific users access
allowing users to view the private data (c.f. Figure 29).
<figure markdown>
- { .img-border }
+ { .img-border }
<figcaption>Figure 29: Database acccess dialog.</figcaption>
</figure>
diff --git a/.docs/api/metadata-db.md b/.docs/api/metadata-db.md
index e56b88ab8b99fb4cdffc9d68c5db28703f4fdaa8..4336c7666c012caf5b7f2b8f6979a77d049c9643 100644
--- a/.docs/api/metadata-db.md
+++ b/.docs/api/metadata-db.md
@@ -2,4 +2,40 @@
author: Martin Weise
---
-TBD
\ No newline at end of file
+!!! debug "Debug Information"
+
+ Image: [`docker.io/bitnami/mariadb:11.1.3-debian-11-r6`](https://hub.docker.com/r/bitnami/mariadb)
+
+ * Ports: 3306/tcp
+ * JDBC: `jdbc://mariadb:<hostname>:3306`
+
+## Overview
+
+The metadata database is the single, central source of truth within DBRepo and holds all metadata information for
+interaction between the services and displaying information in the UI.
+
+On the first start, the schema is generated by the file `/docker-entrypoint-initdb.d/setup-schema.sql` within the
+container. You can add custom files that should be executed on the first start by placing them into the
+`/docker-entrypoint-initdb.d/` folder as well. For example:
+
+```yaml
+services:
+ dbrepo-metadata-db:
+ ...
+ volumes:
+ - /path/to/setup-schema.sql:/docker-entrypoint-initdb.d/1_setup-schema.sql
+ - /path/to/setup-data.sql:/docker-entrypoint-initdb.d/2_setup-data.sql
+ ...
+```
+
+## 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
+ `setup-schema.sql` is executed **after** the file `setup-data.sql`! Thefore a sorting prefix 1-9 is recommended!
\ No newline at end of file
diff --git a/.docs/api/metadata-service.md b/.docs/api/metadata-service.md
index 362a9c36bcf6a32ba8262d002716e108d998b2be..039f2fa097ac3ba89d56ff6d735fc453bc3bc505 100644
--- a/.docs/api/metadata-service.md
+++ b/.docs/api/metadata-service.md
@@ -6,7 +6,7 @@ author: Martin Weise
!!! debug "Debug Information"
- Image: [`dbrepo/metadata-service:__APPVERSION__`](https://hub.docker.com/r/dbrepo/metadata-service)
+ Image: [`registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.4.5`](https://hub.docker.com/r/dbrepo/metadata-service)
* Ports: 9099/tcp
* Info: `http://<hostname>:9099/actuator/info`
@@ -14,45 +14,39 @@ author: Martin Weise
- Readiness: `http://<hostname>:9099/actuator/health/readiness`
- Liveness: `http://<hostname>:9099/actuator/health/liveness`
* Prometheus: `http://<hostname>:9099/actuator/prometheus`
- * Swagger UI: `http://<hostname>:9099/swagger-ui/index.html` <a href="./swagger/metadata" target="_blank">:fontawesome-solid-square-up-right: view online</a>
+ * Swagger UI: `http://<hostname>:9099/swagger-ui/index.html`
## Overview
-This service manages the following topics:
+The metadata service manages metadata of identities, the [Broker Service](../broker-service) (i.e. obtaining queue
+types), semantic concepts (i.e. ontologies) and relational metadata (databases, tables, queries, views) and identifiers.
-* Databases
-* Identifiers (DataCite, OAI-PMH)
-* Queries
-* Semantics (Ontologies)
-* Tables
-* Users
-* Views
+## Generation
-### Databases
+Most of the metadata available in DBRepo is generated automatically, leveraging the available information and taking
+the burden away from researchers, data stewards, etc. For example, the schema (names, constraints, data length) of
+generated tables and views is obtained from the `information_schema` database maintained by MariaDB internally.
-The service handles table operations inside a database. We use [Hibernate](https://hibernate.org/orm/) for schema and
-data ingest operations.
-
-### Identifiers
+## Identifiers
The service is responsible for creating and resolving a *persistent identifier* (PID) attached to a database, subset,
table or view to obtain the metadata attached to it and allow reproduction of the exact same result.
-This service also provides an OAI-PMH endpoint for metadata aggregators
+This service also provides an OAI-PMH endpoint for metadata aggregators
(e.g. [OpenAIRE Graph](https://graph.openaire.eu/)). Through the User Interface, it also exposes metadata through
JSON-LD to metadata aggregators (e.g. [Google Datasets](https://datasetsearch.research.google.com/)). PID metadata
is always exposed, even for private databases.
-The service generates internal PIDs, essentially representing internal URIs in
-the [DataCite Metadata Schema 4.4](https://doi.org/10.14454/3w3z-sa82). This can be enhanced with activating the
-external DataCite Fabrica system to generate DOIs, this is disabled by default.
+The service generates internal PIDs, essentially representing internal URIs in
+the [DataCite Metadata Schema 4.4](https://doi.org/10.14454/3w3z-sa82). This can be enhanced with activating the
+external DataCite Fabrica system to generate DOIs, this is disabled by default.
To activate DOI minting, pass your DataCite Fabrica credentials in the environment variables:
```yaml title="docker-compose.yml"
services:
dbrepo-metadata-service:
- image: docker.io/dbrepo/metadata-service:1.4.0
+ image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.4.5
environment:
spring_profiles_active: doi
DATACITE_URL: https://api.datacite.org
@@ -62,72 +56,13 @@ services:
...
```
-### Queries
-
-It provides an interface to insert data into the tables. It also allows for view-only, paginated and versioned query
-execution to the raw data. Any stale queries (query that have been executed by users in DBRepo but were not saved) are
-periodically being deleted from the query store based on the `DELETE_STALE_QUERIES_RATE` environment variable (defaults
-to 60 seconds).
-
-Executing SQL queries through the Query Endpoint must fulfill some restrictions:
+## Semantics
-* The SQL query does not contain at semicolon `;`
-
-### Semantics
-
-The service provides metadata to the table columns in the [Metadata Database](./system-databases-metadata) from
-registered ontologies like Wikidata [`wd:`](https://wikidata.org), Ontology of Units of
+The service provides metadata to the table columns in the [Metadata Database](../metadata-db) fromregistered ontologies
+like Wikidata [`wd:`](https://wikidata.org), Ontology of Units of
Measurement [`om2:`](https://www.ontology-of-units-of-measure.org/resource/om-2), Friend of a
Friend [`foaf:`](http://xmlns.com/foaf/0.1/), the [`prov:`](http://www.w3.org/ns/prov#) namespace, etc.
-### Tables
-
-The service manages tables in the [Data Database](./system-databases-data) and manages the metadata of these tables
-in the [Metadata Database](./system-databases-metadata). Any tables that are created outside of DBRepo (e.g. directly via the JDBC API) are
-periodically fetched by this service (based on the `OBTAIN_METADATA_RATE` environment variable, default interval is 60
-seconds).
-
-### Users
-
-The service manages users in the [Data Database](./system-databases-data)
-and [Metadata Database](./system-databases-metadata), as well as in the [Broker Service](./system-services-broker)
-and the [Authentication Service](./system-services-authentication).
-
-The default configuration grants the users only very basic permissions on the databases:
-
-* `SELECT`
-* `CREATE`
-* `CREATE VIEW`
-* `CREATE ROUTINE`
-* `CREATE TEMPORARY TABLES`
-* `LOCK TABLES`
-* `INDEX`
-* `TRIGGER`
-* `INSERT`
-* `UPDATE`
-* `DELETE`
-
-This configuration is passed as environment variable `GRANT_PRIVILEGES` to the service as comma-separated string. You
-can add/remove grants by setting this environment variable, e.g. allow the users to only select data and create
-temporary tables:
-
-```yaml title="docker-compose.yml"
-services:
- dbrepo-metadata-service:
- environment:
- GRANT_PRIVILEGES=SELECT,CREATE TEMPORARY TABLES
- ...
-```
-
-A list of all grants is available in the MariaDB documentation for [`GRANT`](https://mariadb.com/kb/en/grant/)
-
-### Views
-
-The service manages views in the [Data Database](./system-databases-data)
-and [Metadata Database](./system-databases-metadata). Any views that are created outside of DBRepo (e.g. directly via
-the JDBC API) are periodically fetched by this service (based on the `OBTAIN_METADATA_RATE` environment variable,
-default interval is 60 seconds).
-
## Limitations
* No support for other databases than [MariaDB](https://mariadb.org/) because of system-versioning capabilities missing
@@ -136,7 +71,7 @@ default interval is 60 seconds).
!!! question "Do you miss functionality? Do these limitations affect you?"
We strongly encourage you to help us implement it as we are welcoming contributors to open-source software and get
- in [contact](./contact) with us, we happily answer requests for collaboration with attached CV and your programming
+ in [contact](../../contact) with us, we happily answer requests for collaboration with attached CV and your programming
experience!
## Security
diff --git a/.docs/api/open-api.md b/.docs/api/open-api.md
index 72395271dea13288dd0065b2a385095faad2955b..575ce9483dce794061572b54e1c485960b52bae7 100644
--- a/.docs/api/open-api.md
+++ b/.docs/api/open-api.md
@@ -6,7 +6,7 @@ author: Martin Weise
## tl;dr
-[:simple-swagger: View Swagger-UI](../../swagger/){ .md-button .md-button--primary tabindex=-1 }
+[:simple-swagger: View Swagger-UI](../../rest/){ .md-button .md-button--primary tabindex=-1 }
## Overview
diff --git a/.docs/api/python.md b/.docs/api/python.md
index 7289639bfad0ed3e3408bab54b717a884e0fead6..aa0c17fec9f2d24d7f03d3b107ddac9692df7a88 100644
--- a/.docs/api/python.md
+++ b/.docs/api/python.md
@@ -6,7 +6,14 @@ author: Martin Weise
## tl;dr
-[:fontawesome-solid-cube: View Docs](../sphinx){ .md-button .md-button--primary }
+[:fontawesome-solid-cube: View Docs](../../python){ .md-button .md-button--primary }
+
+## Overview
+
+The DBRepo Python library is using some of the most pupular and maintained Python packages for Data Scientists under the
+hood. For example: [`requests`](https://requests.readthedocs.io/) to interact with the HTTP API
+endpoints, [`pandas`](https://pandas.pydata.org/) for data operations and [`pydantic`](https://docs.pydantic.dev/) for
+information representation from/to the HTTP API.
## Installing
@@ -26,89 +33,78 @@ This package supports Python 3.11+.
## Quickstart
-Create a table and import a .csv file from your computer.
+Get public data from a table as pandas `DataFrame`:
```python
from dbrepo.RestClient import RestClient
-from dbrepo.api.dto import CreateTableColumn, ColumnType, CreateTableConstraints
-
-client = RestClient(endpoint='https://test.dbrepo.tuwien.ac.at', username="foo",
- password="bar")
-# analyse csv
-analysis = client.analyse_datatypes(file_path="sensor.csv", separator=",")
-print(f"Analysis result: {analysis}")
-# -> columns=(date=date, precipitation=decimal, lat=decimal, lng=decimal), separator=,
-# line_termination=\n
-
-# create table
-table = client.create_table(database_id=1,
- name="Sensor Data",
- constraints=CreateTableConstraints(checks=['precipitation >= 0'],
- uniques=[['precipitation']]),
- columns=[CreateTableColumn(name="date",
- type=ColumnType.DATE,
- dfid=3, # YYYY-MM-dd
- primary_key=True,
- null_allowed=False),
- CreateTableColumn(name="precipitation",
- type=ColumnType.DECIMAL,
- size=10,
- d=4,
- primary_key=False,
- null_allowed=True),
- CreateTableColumn(name="lat",
- type=ColumnType.DECIMAL,
- size=10,
- d=4,
- primary_key=False,
- null_allowed=True),
- CreateTableColumn(name="lng",
- type=ColumnType.DECIMAL,
- size=10,
- d=4,
- primary_key=False,
- null_allowed=True)])
-print(f"Create table result {table}")
-# -> (id=1, internal_name=sensor_data, ...)
-
-client.import_table_data(database_id=1, table_id=1, file_path="sensor.csv", separator=",",
- skip_lines=1, line_encoding="\n")
-print(f"Finished.")
+client = RestClient(endpoint="https://dbrepo1.ec.tuwien.ac.at")
+# Get a small data slice of just three rows
+df = client.get_table_data(database_id=7, table_id=13, page=0, size=3, df=True)
+print(df)
+# x_coord component unit ... value stationid meantype
+# 0 16.52617 Feinstaub (PM10) µg/m³ ... 21.0 01:0001 HMW
+# 1 16.52617 Feinstaub (PM10) µg/m³ ... 23.0 01:0001 HMW
+# 2 16.52617 Feinstaub (PM10) µg/m³ ... 26.0 01:0001 HMW
+#
+# [3 rows x 12 columns]
```
-The library is well-documented, please see the [full documentation](../sphinx) or
-the [PyPI page](https://pypi.org/project/dbrepo/).
+Import data into a table:
-## Supported Features & Best-Practices
+```python
+import pandas as pd
+from dbrepo.RestClient import RestClient
-- Manage user account ([docs](../usage-overview/#create-user-account))
-- Manage databases ([docs](../usage-overview/#create-database))
-- Manage database access & visibility ([docs](../usage-overview/#private-database-access))
-- Import dataset ([docs](../usage-overview/#private-database-access))
-- Create persistent identifiers ([docs](../usage-overview/#assign-database-pid))
-- Execute queries ([docs](../usage-overview/#export-subset))
-- Get data from tables/views/subsets
+client = RestClient(endpoint="https://dbrepo1.ec.tuwien.ac.at", username="foo",
+ password="bar")
+df = pd.DataFrame(data={'x_coord': 16.52617, 'component': 'Feinstaub (PM10)',
+ 'unit': 'µg/m³', ...})
+client.import_table_data(database_id=7, table_id=13, file_name_or_data_frame=df)
+```
-## Secrets
+## Supported Features & Best-Practices
-It is not recommended to store credentials directly in the notebook as they will be versioned with git, etc. Use
-environment variables instead:
+- Manage user
+ account ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.5/api/#create-user-account))
+- Manage
+ databases ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo//usage-overview/#create-database))
+- Manage database access &
+ visibility ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.5/api/#create-database))
+- Import
+ dataset ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.5/api/#import-dataset))
+- Create persistent
+ identifiers ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.5/api/#assign-database-pid))
+- Execute
+ queries ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.5/api/#export-subset))
+- Get data from tables/views/subsets
-```properties title=".env"
-DBREPO_ENDPOINT=https://test.dbrepo.tuwien.ac.at
-DBREPO_USERNAME=foo
-DBREPO_PASSWORD=bar
-DBREPO_SECURE=True
+## Configure
+
+All credentials can optionally be set/overridden with environment variables. This is especially useful when sharing
+Jupyter Notebooks by creating an invisible `.env` file and loading it:
+
+``` title=".env"
+REST_API_ENDPOINT="https://dbrepo1.ec.tuwien.ac.at"
+REST_API_USERNAME="foo"
+REST_API_PASSWORD="bar"
+REST_API_SECURE="True"
+AMQP_API_HOST="https://dbrepo1.ec.tuwien.ac.at"
+AMQP_API_PORT="5672"
+AMQP_API_USERNAME="foo"
+AMQP_API_PASSWORD="bar"
+AMQP_API_VIRTUAL_HOST="dbrepo"
+REST_UPLOAD_ENDPOINT="https://dbrepo1.ec.tuwien.ac.at/api/upload/files"
```
-Then use the default constructor of the `RestClient` to e.g. analyse a CSV. Your secrets are automatically passed:
+You can disable logging by setting the log level to e.g. `INFO`:
-```python title="analysis.py"
+```python
from dbrepo.RestClient import RestClient
-
-client = RestClient()
-analysis = client.analyse_datatypes(file_path="sensor.csv", separator=",")
+import logging
+logging.getLogger().setLevel(logging.INFO)
+...
+client = RestClient(...)
```
## Future
diff --git a/.docs/api/search-service.md b/.docs/api/search-service.md
index fff317d6f8adc093cdf6f725bab31f5bbdb424e7..5c16b499552c32498e9e618284624d53ccf84641 100644
--- a/.docs/api/search-service.md
+++ b/.docs/api/search-service.md
@@ -6,18 +6,17 @@ author: Martin Weise
!!! debug "Debug Information"
- Image: [`dbrepo/search-service:__APPVERSION__`](https://hub.docker.com/r/dbrepo/search-service)
+ Image: [`registry.datalab.tuwien.ac.at/dbrepo/search-service:1.4.5`](https://hub.docker.com/r/dbrepo/search-service)
* Ports: 4000/tcp
* Health: `http://<hostname>:4000/api/search/health`
* Prometheus: `http://<hostname>:4000/metrics`
- * Swagger UI: `http://<hostname>:4000/swagger-ui/` <a href="../swagger/search" target="_blank">:fontawesome-solid-square-up-right: view online</a>
+ * Swagger UI: `http://<hostname>:4000/swagger-ui/`
## Overview
-This service communicates between the [Search Database](../system-databases-search) and
-the [User Interface](../system-other-ui) to allow structured search of databases, tables, columns, users, identifiers,
-views, semantic concepts & units of measurements used in databases.
+This service communicates between the Search Database and the [User Interface](../ui) to allow structured search of
+databases, tables, columns, users, identifiers, views, semantic concepts & units of measurements used in databases.
<figure markdown>
{ .img-border }
@@ -26,9 +25,9 @@ views, semantic concepts & units of measurements used in databases.
## Index
-There is only one
+There is only one
index [`database`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/dbrepo-search-db/init/indices/database.json)
-that holds all the metadata information which is mirrored from the [Metadata Database](../system-databases-metadata).
+that holds all the metadata information which is mirrored from the [Metadata Database](../metadata-db).
<figure markdown>
@@ -37,44 +36,16 @@ that holds all the metadata information which is mirrored from the [Metadata Dat
## Faceted Browsing
-This service enables the frontend to search the `database` index with eight different *types* of desired results
+This service enables the frontend to search the `database` index with eight different *types* of desired results
(database, table, column, view, identifier, user, concept, unit) and their *facets*.
-For example, the [User Interface](../system-other-ui) allows for the search of databases that contain a certain
-semantic concept (provided as URI, e.g.
-temperature [http://www.wikidata.org/entity/Q11466](http://www.wikidata.org/entity/Q11466)) and unit of measurement
-(provided as URI, e.g. degree
+For example, the [User Interface](../ui) allows for the search of databases that contain a certain
+semantic concept (provided as URI, e.g.
+temperature [http://www.wikidata.org/entity/Q11466](http://www.wikidata.org/entity/Q11466)) and unit of measurement
+(provided as URI, e.g. degree
Celsius [http://www.ontology-of-units-of-measure.org/resource/om-2/degreeCelsius](http://www.ontology-of-units-of-measure.org/resource/om-2/degreeCelsius)).
-An example on faceted browsing is found in the [usage examples](../usage-search).
-
-## Unit Independent Search
-
-Since the repository automatically collects statistical properties (min, max, mean, median, std.dev) in both the
-[Metadata Database](../system-databases-metadata) and the [Search Database](../system-databases-search), a special
-search can be performed when at least two columns have the same semantic concept (e.g. temperature) annotated and
-the units of measurements can be transformed.
-
-<figure markdown>
-
-<figcaption>Figure 3: Two tables with compatible semantic concepts and units of measurement</figcaption>
-</figure>
-
-In short, the search service transforms the statistical properties not in the target unit of measurements is transformed
-by using the [`omlib`](https://github.com/dieudonneWillems/OMLib) package.
-
-For example: a user wants to find datasets that contain *"temperature measurements between 0 - 10 °C"*. Then the
-search service transforms the query to the dataset on the right from °F to contain *"temperature measurements
-between 32 - 50 °F"* instead.
-
-<figure markdown>
-
-<figcaption>Figure 4: Unit independent search query transformation</figcaption>
-</figure>
-
-## Examples
-
-View [usage examples](../usage-search/).
+An example on faceted browsing is found in the [usage examples](..).
## Limitations
@@ -86,4 +57,4 @@ View [usage examples](../usage-search/).
## Security
-(nothing)
+(none)
diff --git a/.docs/api/storage-service.md b/.docs/api/storage-service.md
index bf40ca83c8cfde0951a3796df0fbb06e0e486478..a8da4f0721f50cdbc515ca9b0ed240418529f269 100644
--- a/.docs/api/storage-service.md
+++ b/.docs/api/storage-service.md
@@ -6,7 +6,7 @@ author: Martin Weise
!!! debug "Debug Information"
- Image: [`chrislusf/seaweedfs:3.59`](https://hub.docker.com/r/chrislusf/seaweedfs)
+ Image: [`docker.io/chrislusf/seaweedfs:3.59`](https://hub.docker.com/r/chrislusf/seaweedfs)
* Ports: 9000/tcp
* Prometheus: `http://<hostname>:9091/metrics`
@@ -36,7 +36,7 @@ The default configuration creates two buckets `dbrepo-upload`, `dbrepo-download`
!!! question "Do you miss functionality? Do these limitations affect you?"
We strongly encourage you to help us implement it as we are welcoming contributors to open-source software and get
- in [contact](./contact) with us, we happily answer requests for collaboration with attached CV and your programming
+ in [contact](../../contact) with us, we happily answer requests for collaboration with attached CV and your programming
experience!
## Security
diff --git a/.docs/api/ui.md b/.docs/api/ui.md
index 659b21ea90137034872c4312aaeeca4caf5bd346..4ac5c7bad871284cc322bf7be0c8585942f63ea5 100644
--- a/.docs/api/ui.md
+++ b/.docs/api/ui.md
@@ -2,6 +2,14 @@
author: Martin Weise
---
+## tl;dr
+
+!!! debug "Debug Information"
+
+ Image: [`registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.5`](https://hub.docker.com/r/dbrepo/ui)
+
+ * Ports: 3000/tcp
+
The User Interface is configured in the `runtimeConfig` section of the `nuxt.config.ts` file during build time. For the
runtime, you need to override those values through environment variables or by mounting a `.env` file. As a small
example, you can configure the logo :material-numeric-1-circle-outline: in Figure 2. Make sure you mount the logo as
@@ -9,7 +17,7 @@ image as well, in this example we want to mount a custom logo `my_logo.png` into
<figure markdown>
{ .img-border }
-<figcaption>Figure 2: Architecture of the UI microservice</figcaption>
+<figcaption>Figure 1: Architecture of the UI microservice</figcaption>
</figure>
Text values like the version :material-numeric-2-circle-outline: and title :material-numeric-3-circle-outline: can be
@@ -27,7 +35,7 @@ if you use a Kubernetes deployment via ConfigMap and Volumes).
```yaml title="docker-compose.yml"
services:
dbrepo-ui:
- image: docker.io/dbrepo/ui:__APPVERSION__
+ image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.5
volumes:
- ./my_logo.png:/app/.output/public/my_logo.png
...
@@ -40,7 +48,7 @@ User Interface on development.
<figure id="fig3" markdown>
-<figcaption>Figure 3: Architecture of the User Interface</figcaption>
+<figcaption>Figure 2: Architecture of the User Interface</figcaption>
</figure>
* Runtime: [Bun 1+](https://bun.sh/) (preferred), *alternatively* Node.js 18+
@@ -52,7 +60,7 @@ User Interface on development.
### Example
-See the [Usage Overview](../usage-overview/) page for detailed examples.
+See the [API Overview](..) page for detailed examples.
## Limitations
diff --git a/.docs/api/upload-service.md b/.docs/api/upload-service.md
index 88812d308ba856a1d7c77e65a1bf97298cb2e968..f8ad58ebcb1f626aa6064db682d3fffcd958c81a 100644
--- a/.docs/api/upload-service.md
+++ b/.docs/api/upload-service.md
@@ -6,46 +6,31 @@ author: Martin Weise
!!! debug "Debug Information"
- Image: [`tusproject/tusd:v1.12`](https://hub.docker.com/r/tusproject/tusd)
+ Image: [`docker.io/tusproject/tusd:v1.12`](https://hub.docker.com/r/tusproject/tusd)
* Ports: 1080/tcp
* Prometheus: `http://<hostname>:1080/api/upload/metrics`
* API: `http://<hostname>:1080/api/upload`
- * Swagger UI: <a href="../swagger/upload" target="_blank">:fontawesome-solid-square-up-right: view online</a>
## Overview
-We use the [TUS](https://tus.io/) open protocol for resumable file uploads which based entirely on HTTP. Even though
+We use the [TUS](https://tus.io/) open protocol for resume-able file uploads which based entirely on HTTP. Even though
the Upload Service is part of the standard installation, it is an entirely optional component and can be replaced with
any S3-compatible Blob Storage.
-### Settings
-
-The Upload Service is responsible for uploading files (mainly CSV-files) into a Blob Storage that can be accesses trough
-the S3 protocol (e.g. our [Storage Service](../system-services-storage)). Make sure that the Upload Service can be
-accessed from the Gateway Service and set the url in the User Interface configuration file.
-
-```json title="dbrepo.config.json"
-{
- "upload": {
- "url": "example.com",
- "useSsl": true
- },
- ...
-}
-```
-
-If your deployment is secured with SSL/TLS (recommended) set the `useSsl` variable to `true`.
-
### Architecture
-The Upload Service communicates internally with the [Storage Service](../system-services-storage) (c.f. [Figure 1](#fig1)).
+The Upload Service communicates internally with the [Storage Service](../storage-service) (c.f. [Figure 1](#fig1)).
<figure id="fig1" markdown>
<figcaption>Figure 1: Architecture of the Upload Service</figcaption>
</figure>
+The Upload Service is responsible for uploading files (mainly CSV-files) into a Blob Storage that can be accesses trough
+the S3 protocol (e.g. our [Storage Service](../storage-service)). Make sure that the Upload Service can be
+accessed from the Gateway Service.
+
## Limitations
* No support for authentication.
diff --git a/.docs/concepts/authentication.md b/.docs/concepts/authentication.md
index 5919b257239af3cb464bc54271037b179d418727..c49abdf86eb85392bfec24d95da3e1a18f2743dd 100644
--- a/.docs/concepts/authentication.md
+++ b/.docs/concepts/authentication.md
@@ -2,14 +2,32 @@
author: Martin Weise
---
+This is a short conceptional overview on the authentication mechanisms provided by Keycloak. We use Keycloak as the
+single source of truth for authorization and user management.
+
+## Basic Authentication
+
+DBRepo supports `Basic` authentication (that is with username and password) in the REST API. When requesting a resource
+from e.g. the [Metadata Service](../../api/metadata-service), the service internally retrieves a
+[Bearer Token](#bearer-authentication) from the [Auth Service](../../api/auth-service) and checks if a certain role
+is present to perform the desired action. This entails a small overhead on each request, since the service does not
+store anything.
+
## Bearer Authentication
-TBD
+DBRepo supports `Bearer` authentication by accepting JWT tokens in the
+[`Authorization`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Authorization) header of HTTP requests to
+any service. There are two (major) types of tokens:
-## Basic Authentication
+* Access tokens who are short lived (e.g. 15 minutes) to access resources, and
+* Refresh token who are long lived (e.g. 30 days) to request new access tokens without having to provide username and
+ password again.
-TBD
+The [User Interface](../../api/ui) for example refreshes the token on-the-fly by intercepting each request and, in case
+of an expired access token, requests a new one without having to terminate the request. This happens only once after the
+access token has expired (after e.g. 15 minutes).
## OpenID Connect (OIDC)
-TBD
\ No newline at end of file
+We use the widely accepted authentication protocol OIDC for client authentication. Other protocols are e.g. SAML2 which
+are not used by DBRepo.
\ No newline at end of file
diff --git a/.docs/concepts/databases.md b/.docs/concepts/databases.md
index 1076f775efe6b7730f843e5cb83581acc7721730..ecf1025b1d8074698df0b7ec673d19beb516de7a 100644
--- a/.docs/concepts/databases.md
+++ b/.docs/concepts/databases.md
@@ -4,15 +4,22 @@ author: Martin Weise
## Relational Database
-TBD
+DBRepo manages relational databases that store information relations in tables.
## Query
-TBD
+A query is the method to interact with a relational database and is used to read/write data or to create/change/delete
+schema information e.g. tables. DBRepo uses a query store to store certain (important) queries that generate subsets
+to restore the exact same subset at a later point.
## System Versioning
-TBD
+DBRepo uses a mechanism offered by SQL:2013 to version tables with the system (=server) time. When inserting a tuple
+into a system-versioned table, the database engine maintains invisible `ROW_START` and `ROW_END` timestamp columns to
+denote a tuple validity. When deleting a tuple, the database engine actually just marks the tuple as `ROW_END = NOW()`
+and does not delete the tuple.
+
+At a later point in time, the (historic) tuple can still be queried using system versioning.
## Data Ingest
diff --git a/.docs/concepts/index.md b/.docs/concepts/index.md
index 8aa7e58597cac0a23dd1adba87227aea200649f2..ded1b98d89d2029740a5b0eb9d9d67bac53d3489 100644
--- a/.docs/concepts/index.md
+++ b/.docs/concepts/index.md
@@ -13,4 +13,15 @@ datasets, Sec. [Persistent Identifier](../concepts/pid) introduces how data is p
using the DOI system. Sec. [Search](../concepts/search) describes how anything in DBRepo can be searched, Sec.
[Storage](../concepts/storage) shows how datasets can be uploaded/transferred between the services and Sec.
[User Interface](../concepts/ui) introduces the graphical interface for human interaction as part of virtual research
-environments.
\ No newline at end of file
+environments.
+
+## Architecture
+
+The repository is designed as a service-based architecture to ensure scalability and the utilization of various
+technologies. The conceptualized microservices operate the basic database operations, data versioning as well as
+*findability*, *accessability*, *interoperability* and *reuseability* (FAIR).
+
+<figure markdown>
+
+<figcaption>Architecture of the services deployed via Docker Compose</figcaption>
+</figure>
\ No newline at end of file
diff --git a/.docs/concepts/messaging.md b/.docs/concepts/messaging.md
index 448c7a3f63071e0ce8fc0597b8d06e061e519eeb..c19e1fc2a5083cb818f67631b8257db5a29bf60f 100644
--- a/.docs/concepts/messaging.md
+++ b/.docs/concepts/messaging.md
@@ -2,14 +2,23 @@
author: Martin Weise
---
-## Tuple
+We use the message broker RabbitMQ and a single exchange with distributed (`quorum`) queue. Both are named `dbrepo`.
-TBD
+<figure markdown>
+<img src="../../images/exchange-binding.png" />
+<caption>Figure 1: Exchange binding in DBRepo.</caption>
+</figure>
-## AMQP
+## Tuple
-TBD
+A tuple is the atomic granularity of information when transmitting data through message-queue systems. Represented as
+JSON, a tuple looks like this in RabbitMQ:
-## MQTT
+```JSON
+{"firstname": "foo", "lastname": "bar"}
+```
+
+## AMQP
-TBD
\ No newline at end of file
+DBRepo uses AMQP to route messages which allows for both Basic/Bearer authentication. For more information please
+consult the [RabbitMQ AMQP](https://www.rabbitmq.com/tutorials/amqp-concepts) documentation.
\ No newline at end of file
diff --git a/.docs/concepts/pid.md b/.docs/concepts/pid.md
index c5d769192cc561add9f9bba795e8ff78f9edd196..e58ed03ac4ac9be57963d0b009fa9ad88642781d 100644
--- a/.docs/concepts/pid.md
+++ b/.docs/concepts/pid.md
@@ -2,6 +2,56 @@
author: Martin Weise
---
-## tbd
+## Data Versioning
-tbd
+Data is getting bigger and so are expectations of data provisioning in regards to data availability (i.e. immediately
+after quality check and not in snapshot intervals), cost-effectiveness (i.e. no duplication of data), transparent,
+precise citation and many more.
+
+[System-versioned](https://mariadb.com/kb/en/system-versioned-tables/) tables in MariaDB are improved data structures
+that keep track of historical data. For each entry in a system-versioned table, a time period is maintained that denotes
+the validity time span of this tuple from its start to end. Tuples in system-versioned tables are not *actually*
+modified, they are marked as (in-)valid in time periods.
+
+<figure markdown>
+
+| ID | Sensor | Temp | Start | End |
+|----|--------|------|-------|-----|
+| 1 | A | 23.1 | t1 | |
+| 2 | B | 25.8 | t2 | |
+
+</figure>
+
+Assuming that Sensor A was calibrated wrong and an updated measurement is passed to the system-versioned table, the
+table contents show that the old row with Temp 23.1 is not deleted, but marked as valid in time span (t1, t3). The
+updated row with Temp 22.1 is marked as valid from time span t3 onwards.
+
+<figure markdown>
+
+| ID | Sensor | Temp | Start | End |
+|----|--------|------|-------|-----|
+| 1 | A | 23.1 | t1 | t3 |
+| 2 | B | 25.8 | t2 | |
+| 1 | A | 22.1 | t3 | |
+
+</figure>
+
+System-versioned tables are part of the SQL:2011 standard and have been adopted by many database management system
+vendors: MariaDB (10.5 and higher), Google BigQuery, IBM DB2 (12 and higher), SQL Server (2016 and higher), Azure SQL,
+PostgreSQL with [temporal tables extension](https://github.com/nearform/temporal_tables), etc.
+
+## Persistent Identifier
+
+Data in DBRepo always has attached metadata (stored in the [Metadata Database](../../api/metadata-db)). This metadata
+is provided as machine-understandable context in various open-source formats that is available, even when the original
+data is not available anymore due to e.g. a retracted dataset (hence the name **persistent**). A persistent identifier
+globally, uniquely identifies a data record such as:
+
+* Database,
+* Table whose data is continously changed in the background (nature of databases),
+* View who show a denomination, joined schema or aggregated result of tables,
+* Subset which precisely identifies a data record to reproduce the same dataset.
+
+Combining [data versioning](#data-versioning) and queries, subsets can be precisely identified by storing the query
+that creates them and the time when the query was executed. We store both in a table inside the database we call the
+query store.
\ No newline at end of file
diff --git a/.docs/concepts/search.md b/.docs/concepts/search.md
index 8ae41c80ba2566dce997eed8ac4052b0cfa23631..ee738e0bd9e99fb89c4ddf867cfb8600a13f432a 100644
--- a/.docs/concepts/search.md
+++ b/.docs/concepts/search.md
@@ -2,12 +2,30 @@
author: Martin Weise
---
-## Index
+## Document
-TBD
+Each database in DBRepo has their own document where the document id (the identifier of a database in OpenSearch) is
+equivalent to the database id (the identifier of a database in the [Metadata Database](../../api/metadata-db)).
-## Document
+## Unit Independent Search
+
+Since the repository automatically collects statistical properties (min, max, mean, median, std.dev) in both the
+[Metadata Database](../../api/metadata-db) and the Search Database, a special search can be performed when at least two
+columns have the same semantic concept (e.g. temperature) annotated and the units of measurements can be transformed.
+
+<figure markdown>
+
+<figcaption>Figure 3: Two tables with compatible semantic concepts and units of measurement</figcaption>
+</figure>
+
+In short, the search service transforms the statistical properties not in the target unit of measurements is transformed
+by using the [`omlib`](https://github.com/dieudonneWillems/OMLib) package.
-TBD
+For example: a user wants to find datasets that contain *"temperature measurements between 0 - 10 °C"*. Then the
+search service transforms the query to the dataset on the right from °F to contain *"temperature measurements
+between 32 - 50 °F"* instead.
-## Query
\ No newline at end of file
+<figure markdown>
+
+<figcaption>Figure 4: Unit independent search query transformation</figcaption>
+</figure>
\ No newline at end of file
diff --git a/.docs/concepts/storage.md b/.docs/concepts/storage.md
deleted file mode 100644
index fcc975fab2f20d4f3b3b6b0ebd69b02168227bc1..0000000000000000000000000000000000000000
--- a/.docs/concepts/storage.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-author: Martin Weise
----
-
-## S3
-
-TBD
-
-## Sidecar
-
-TBD
-
-## Upload
-
-TBD
\ No newline at end of file
diff --git a/.docs/contributing.md b/.docs/contributing.md
index 259fcae55b1c3cd91ab9e55ce346db3953709876..2faa03fcdab0cb1f1a9a6a5182d53b0b81cec2ef 100644
--- a/.docs/contributing.md
+++ b/.docs/contributing.md
@@ -38,11 +38,9 @@ The Java-based services have the coverage reports generated by `JaCoCo` in the `
Python-based services have the coverage reports generated by `coverage` in the `.coverage` SQLite3 database
and `coverage.txt` log file respectively.
-### Swagger Docs
-
-```shell
-bash .swagger/swagger-generate.sh
-```
+We run SonarQube quality checks on the `master` branch regularly to ensure security, maintainability and remove code
+smells. The internal instance can be found at [https://s34.datalab.tuwien.ac.at/](https://s34.datalab.tuwien.ac.at/)
+(requires internal authentication).
## Code Versioning
@@ -63,7 +61,8 @@ to run our pipeline:
<figcaption>Figure 2: Gitlab runner configuration in the cluster.</figcaption>
</figure>
-Minikube cluster with 6vCPU and 28GB RAM. The CI pipeline is configured as follows in the `config.toml`:
+Kubernetes cluster with PVC-enabled provisioner with 8 vCPU and 32GB RAM. The CI pipeline is configured as follows in
+the `config.toml`:
```toml
concurrent = 10
@@ -72,13 +71,19 @@ concurrent = 10
environment = [
"FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY=false"
]
+ [runners.cache]
+ Type = "s3"
+ Shared = true
+ [runners.cache.s3]
+ ServerAddress = "storageservice-s3:9000"
+ ...
+ Insecure = true
[runners.kubernetes]
namespace = "{{.Release.Namespace}}"
privileged = true
allowed_services = ["docker:24-dind"]
[[runners.kubernetes.services]]
name = "docker:24-dind"
- command = [ "--registry-mirror=http://docker-io-mirror:80", "--insecure-registry=docker-io-mirror:80", "--registry-mirror=http://gcr-io-mirror:80", "--insecure-registry=gcr-io-mirror:80", "--registry-mirror=http://ghcr-io-mirror:80", "--insecure-registry=ghcr-io-mirror:80", "--registry-mirror=http://k8s-io-mirror:80", "--insecure-registry=k8s-io-mirror:80" ]
alias = "docker"
[[runners.kubernetes.volumes.empty_dir]]
name = "rundind"
@@ -102,10 +107,6 @@ dind-sidecar container `svc-0` is started that exposes the Docker socket at `/va
container you can freely configure how you want. We are aware this is not optimal as it exposes *root* privileges in the
cluster.
-The full CI/CD pipeline Helm chart is documented in
-the [`fda-deployment`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-deployment/-/tree/master/charts/dbrepo-devops)
-repository.
-
## Documentation
For consistency reasons across the documentation, the resolution needs to be 1280x800 (16:10 ratio)
diff --git a/.docs/deployment-docker-compose.md b/.docs/deployment-docker-compose.md
deleted file mode 100644
index 7b6d9922561ddeafee790da540e301b65e09f74c..0000000000000000000000000000000000000000
--- a/.docs/deployment-docker-compose.md
+++ /dev/null
@@ -1,196 +0,0 @@
----
-author: Martin Weise
----
-
-# Docker Compose
-
-## TL;DR
-
-If you have [Docker](https://docs.docker.com/engine/install/) already installed on your system, you can install DBRepo with:
-
-```shell
-curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-__APPVERSION__/install.sh | bash
-```
-
-## Requirements
-
-### Hardware
-
-For this small, local, test deployment any modern hardware would suffice, we recommend a dedicated virtual machine with
-the following settings.
-
-- min. 8 vCPU cores
-- min. 8GB free RAM memory
-- min. 200GB free SSD storage
-- min. 100Mbit/s connection
-
-*Optional*: public IP-address if you want to secure the deployment with a (free) TLS-certificate from Let's Encrypt.
-
-!!! tip "Resource Consumption"
-
- Note that most of the vCPU and RAM resources will be needed for starting the infrastructure, this is because of
- Docker. During operation and especially idle times, the deployment will use significantly less resources.
-
-### Software
-
-We only test the Docker Compose deployment with the
-official [Docker engine](https://docs.docker.com/engine/install/debian/) installed on
-a [Debian](https://www.debian.org/)-based operating system. Other software deployments (e.g. Docker Desktop on Windows)
-are *not* recommended and not tested.
-
-## Architecture
-
-### Overview
-
-The repository is designed as a service-based architecture to ensure scalability and the utilization of various
-technologies. The conceptualized microservices operate the basic database operations, data versioning as well as
-*findability*, *accessability*, *interoperability* and *reuseability* (FAIR).
-
-<figure markdown>
-
-<figcaption>Architecture of the services deployed via Docker Compose</figcaption>
-</figure>
-
-### Notes
-
-Please note that we only save the state of the databases as well as the [Broker Service](./system-services-broker)
-since RabbitMQ maintains state inside the container.
-
-## Deployment
-
-We maintain a rapid prototype deployment option through Docker Compose (v2.17.0 and newer). This deployment creates the
-core infrastructure and a single Docker container for all user-generated databases.
-
-=== "Linux"
-
- Download and install [Docker Engine](https://docs.docker.com/desktop/install/linux-install/) for your Linux
- distribution. Although the installation might work, we *do not* recommend Docker Desktop.
-
- Ensure the Docker daemon is running at all times:
-
- systemctl enable docker --now
-
- Install DBRepo with the default configuration:
-
- curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/install.sh | bash
-
-=== "Windows"
-
- Open `cmd.exe` as administrator and install WSL2 and the Debian subsystem:
-
- wsl --install Debian
-
- Open `optionalfeatures` by typing into the open terminal window or searching for it and enable "Windows Subsystem
- for Linux":
-
- <figure markdown>
- { .img-border }
- <figcaption>Enable Subsystem for Linux in Windows Features</figcaption>
- </figure>
-
- Install [Docker Desktop](https://docs.docker.com/desktop/install/windows-install/) on the Windows host machine.
- Open Docker Desktop and go to settings (:fontawesome-solid-gear:) > General > Tick "Use WSL2 based engine" if not
- already ticked.
-
- Open the Debian container by typing "Debian" into the search, you should see a terminal window.
-
- Install DBRepo with the default configuration from the Debian container:
-
- curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/master/install.sh | bash
-
-View the logs:
-
- docker compose logs -f
-
-You should now be able to view the front end at [http://localhost](http://localhost).
-
-Please be warned that the default configuration is not intended for public deployments. It is only intended to have a
-running system within minutes to play around within the system and explore features. It is strongly advised to change
-the default `.env` environment variables.
-
-### Troubleshooting
-
-In case the deployment is unsuccessful, we have explanations on their origin and solutions to the most common errors:
-
-**Are you trying to mount a directory onto a file (or vice-versa)?**
-
-: *Origin*: Docker Compose does not find all files referenced in the `volumes` section of your `docker-compose.yml`
- file.
-: *Solution*: Ensure all mounted files in the `volumes` section of your `docker-compose.yml` exist and have correct
- file permissions (`0644`) to be found in the filesystem. Note that paths containing directories may not
- work when using Windows instead of the supported Linux.
-
-**The Docker images have been updated but my deployment is not receiving the updates**
-
-: *Origin*: Your local Docker image cache is not up-to-date and needs to fetch the remote changes.
-: *Solution*: Update your local Docker image cache by executing `docker compose pull`, it automatically downloads
- all Docker images that have updates. Then apply the new images with `docker compose up -d`.
-
-**Error response from daemon: Error starting userland proxy: listen tcp4 0.0.0.0:xyz: bind: address already in use**
-
-: *Origin*: Your deployment machine (e.g. laptop, virtual machine) has the port `xyz` already assigned. Some service
- or application is already listening to this port.
-: *Solution*: This service or application needs to be stopped. You can find out the service or application via
- `sudo netstat -tulpn` (sudo is necessary for the process id) and then stop the service or application
- gracefully or force a stop via `kill -15 PID` (not recommended).
-
-**IllegalArgumentException values less than -1 bytes are not supported**
-
-: *Origin*: Your deployment machine (e.g. laptop, virtual machine) appears to not have enough RAM assigned.
-: *Solution*: Assign more RAM to the deployment machine (e.g. add vRAM to the virtual machine).
-
-## Next Steps
-
-You should now be able to view the front end at [http://localhost](http://localhost).
-
-Please be warned that the default configuration is not intended for public deployments. It is only intended to have a
-running system within minutes to play around within the system and explore features. It is strongly advised to change
-the default `.env` environment variables.
-
-Next, create a [user account](./usage-overview/#create-user-account) and
-then [create a database](./usage-overview/#create-database) to [import a dataset](./usage-overview/#import-dataset).
-
-## Security
-
-!!! warning "Known security issues with the default configuration"
-
- The system is auto-configured for a small, local, test deployment and is *not* secure! You need to make modifications
- in various places to make it secure:
-
- * **Authentication Service**:
-
- a. You need to use your own instance or configure a secure instance using a (self-signed) certificate.
- Additionally, when serving from a non-default Authentication Service, you need to put it into the
- `JWT_ISSUER` environment variable (`.env`).
-
- b. You need to change the default admin user `fda` password in Realm
- master > Users > fda > Credentials > Reset password.
-
- c. You need to change the client secrets for the clients `dbrepo-client` and `broker-client`. Do this in Realm
- dbrepo > Clients > dbrepo-client > Credentials > Client secret > Regenerate. Do the same for the
- broker-client.
-
- d. You need to regenerate the public key of the `RS256` algorithm which is shared with all services to verify
- the signature of JWT tokens. Add your securely generated private key in Realm
- dbrepo > Realm settings > Keys > Providers > Add provider > rsa.
-
- * **Broker Service**: by default, this service is configured with an administrative user that has major privileges.
- You need to change the password of the user *fda* in Admin > Update this user > Password. We found this
- [simple guide](https://onlinehelp.coveo.com/en/ces/7.0/administrator/changing_the_rabbitmq_administrator_password.htm)
- to be very useful.
-
- * **Search Database**: by default, this service is configured to require authentication with an administrative user
- that is allowed to write into the indizes. Following
- this [simple guide](https://www.elastic.co/guide/en/elasticsearch/reference/8.7/reset-password.html), this can be
- achieved using the command line.
-
- * **Gateway Service**: by default, no HTTPS is used that protects the services behind. You need to provide a trusted
- SSL/TLS certificate in the configuration file or use your own proxy in front of the Gateway Service. See this
- [simple guide](http://nginx.org/en/docs/http/configuring_https_servers.html) on how to install a SSL/TLS
- certificate on NGINX.
-
-## Limitations
-
-!!! info "Alternative Deployments"
-
- Alternatively, you can also deploy DBRepo with [Helm](./deployment-helm/) in your virtual machine instead.
diff --git a/.docs/deployment-helm.md b/.docs/deployment-helm.md
deleted file mode 100644
index 5b0be43553584e6c6be4f582615bc9afcffd918a..0000000000000000000000000000000000000000
--- a/.docs/deployment-helm.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-author: Martin Weise
----
-
-[](https://artifacthub.io/packages/helm/dbrepo/dbrepo){ tabindex=-1 }
-
-## TL;DR
-
-To install DBRepo in your existing cluster, download the
-sample [`values.yaml`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-deployment/-/raw/master/charts/dbrepo-core/values.yaml?inline=false)
-for your deployment and update the variables, especially `hostname`.
-
-```shell
-helm upgrade --install dbrepo \
- -n dbrepo \
- "oci://s210.dl.hpc.tuwien.ac.at/dbrepo/helm/dbrepo" \
- --values ./values.yaml \
- --version "__CHARTVERSION__" \
- --create-namespace \
- --cleanup-on-fail
-```
-
-This chart is also on [Artifact Hub](https://artifacthub.io/packages/helm/dbrepo/dbrepo) with a full documentation
-about values, etc.
-
-## Prerequisites
-
-* Kubernetes 1.24+
-* Kubernetes 3.8.0+
-* PV provisioner support in the underlying infrastructure
-
-## Limitations
-
-1. MariaDB Galera does not (yet) support XA-transactions required by the authentication service (=Keycloak). Therefore
- only a single MariaDB pod can be deployed at once for the [auth database](./system-databases-authentication).
-2. The entire Helm deployment is rootless (=`runAsNonRoot=true`) except for
- the [Storage Service](./system-services-storage/) which still requires a root user.
-
-!!! question "Do you miss functionality? Do these limitations affect you?"
-
- We strongly encourage you to help us implement it as we are welcoming contributors to open-source software and get
- in [contact](./contact) with us, we happily answer requests for collaboration with attached CV and your programming
- experience!
diff --git a/.docs/docker/_header.md b/.docs/docker/_header.md
index 9deeeab3ac512c477b67fe4181dfe289bf94b6c2..e2e0ca0eaf0cbb17bf430831a2cb0501b98b1f76 100644
--- a/.docs/docker/_header.md
+++ b/.docs/docker/_header.md
@@ -10,7 +10,7 @@
# Supported tags
-* [`1.4.4`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/release-1.4.3/dbrepo-DIR/Dockerfile/)
+* [`1.4.5`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/release-1.4.3/dbrepo-DIR/Dockerfile/)
* [`latest`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/release-latest/dbrepo-DIR/Dockerfile/)
# Non-supported tags
@@ -29,7 +29,7 @@
* **Source of this description:**
- [docs repo's `.docs/docker` directory](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/tree/release-1.4.4/.docs/docker)
+ [docs repo's `.docs/docker` directory](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/tree/release-1.4.5/.docs/docker)
([history](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/commits/release-1.4.34/.docs/docker))
# What is DBRepo?
diff --git a/.docs/examples/air.md b/.docs/examples/air.md
new file mode 100644
index 0000000000000000000000000000000000000000..7c290f047c1bc45712fd52da3c00ff16a2b54d9a
--- /dev/null
+++ b/.docs/examples/air.md
@@ -0,0 +1,49 @@
+---
+author: Martin Weise
+---
+
+## tl;dr
+
+[:fontawesome-solid-database: Dataset](https://handle.stage.datacite.org/10.82556/gd17-aq82){ .md-button .md-button--primary target="_blank" }
+[:simple-grafana: Dashboard](https://dbrepo1.ec.tuwien.ac.at/admin/grafana/d/FLB9eAv4z/airquality){ .md-button .md-button--secondary target="_blank" }
+
+## Description
+
+This digital record contains historical air pollution and air quality data from approximately 20 air monitoring stations
+in Vienna, spanning the years from 1980 to 2021. The data was provided by the Umweltbundesamt and is stored in its
+original form in this record. This record forms the basis of an analysis carried out in a bachelor's thesis at the TU
+Wien.
+
+<figure markdown>
+
+<figcaption>Figure 1: Grafana dashboard visualizing the dataset.</figcaption>
+</figure>
+
+The analysis was carried out in a Jupyter Notebook hosted by our IT-department
+[JupyterHub](https://science.datalab.tuwien.ac.at/) as part of TU Wien's virtual research environment.
+
+<figure markdown>
+{ .img-border }
+<figcaption>Figure 2: Jupyter Notebook accessing data on DBRepo using the Python Library.</figcaption>
+</figure>
+
+## Solution
+
+One of the first use-cases of importing external data into DBRepo which was provided as .csv flat file. We developed a
+database schema and a web scraper that scrapes live air quality data from the
+[public map](https://luft.umweltbundesamt.at/pub/map_chart/index.pl) of the environment agency of Austria.
+
+## DBRepo Features
+
+- [x] Import complex dataset
+- [x] System versioning
+- [x] Subset exploration
+- [x] Aggregated views
+- [x] Precise & PID of queries tables
+- [x] External data access for analysis
+
+## Acknowledgement
+
+This work was part of a cooperation with the [Umweltbundesamt](https://www.umweltbundesamt.at/).
+
+<img src="../../images/logos/umweltbundesamt.png" width=100 />
\ No newline at end of file
diff --git a/.docs/examples/covid-19.md b/.docs/examples/covid-19.md
new file mode 100644
index 0000000000000000000000000000000000000000..ba986e76e9275de13e0be646e908ad8e38256d65
--- /dev/null
+++ b/.docs/examples/covid-19.md
@@ -0,0 +1,25 @@
+---
+author: Martin Weise
+---
+
+## tl;dr
+
+[:fontawesome-solid-database: Dataset](https://dbrepo1.ec.tuwien.ac.at/pid/15){ .md-button .md-button--primary target="_blank" }
+[:simple-github: Archive](https://github.com/CSSEGISandData/COVID-19){ .md-button .md-button--secondary target="_blank" }
+
+## Description
+
+This dataset contains the daily COVID-19 data provided publicly
+by [Johns Hopkins University](https://coronavirus.jhu.edu/about/how-to-use-our-data).
+
+## Solution
+
+We imported their daily snapshots provided as 1145 versioned .csv files from their Git repository archive and imported
+them daily into DBRepo as system-versioned data that can be queried. During the time of this project the COVID-19
+pandemic was still ongoing and therefore daily snapshots demanded a correct import script to be maintained.
+
+## DBRepo Features
+
+- [x] Data pipeline from Git repository
+- [x] System versioning
+- [x] Subset exploration
diff --git a/.docs/examples/hazard.md b/.docs/examples/hazard.md
index 56c56d99c5c9fcdc9b594fe673b2293b8d276d73..32e39c1691bf338e050bec9902e1099259276bbd 100644
--- a/.docs/examples/hazard.md
+++ b/.docs/examples/hazard.md
@@ -43,4 +43,10 @@ simple query to the `information_schema` that is maintained by the database engi
- [x] Complex database schema
- [x] Complex views
- [x] System versioning
-- [x] Subset exploration
\ No newline at end of file
+- [x] Subset exploration
+
+## Acknowledgement
+
+This work was part of a cooperation with the [Institute of Water Quality and Resource Management](https://www.tuwien.at/cee/iwr).
+
+<img src="../../images/logos/iwr.png" width=100 />
\ No newline at end of file
diff --git a/.docs/examples/influenza.md b/.docs/examples/influenza.md
deleted file mode 100644
index 074c413d31f3f5e1d590d2491c6562677ee75a39..0000000000000000000000000000000000000000
--- a/.docs/examples/influenza.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-author: Martin Weise
----
-
-## tl;dr
-
-tbd
-
-## Description
-
-TBD
-
-## Solution
-
-TBD
-
-## DBRepo Features
-
-- [x] Import through CSV-dataset upload
-- [x] Data views implementing embargo period (24 hours)
-- [x] External access from Grafana Dashboard
diff --git a/.docs/examples/lute-data.md b/.docs/examples/lute-data.md
new file mode 100644
index 0000000000000000000000000000000000000000..bceecd90529a6dc47bc0ac44895cc1847daf0121
--- /dev/null
+++ b/.docs/examples/lute-data.md
@@ -0,0 +1,34 @@
+---
+author: Martin Weise
+---
+
+## tl;dr
+
+tbd
+
+## Description
+
+The main aim of the E-LAUTE project is to create a novel form of music edition: an "open knowledge platform" in which
+musicology, music practice, music informatics and literary studies intertwine and transform the "classic" edition into a
+space of interdisciplinary and discipline-specific work.
+
+In order to create a comprehensive, complete modern scholarly edition, the E-LAUTE project synchronises high technology
+informatics in the fields of encoding, linking, recognition (OMR) and automatic transcription with manual music
+transcription and musical performance practice. We consider recordings of lute music a conceptual component of the
+edition.
+
+## Solution
+
+tbd
+
+## DBRepo Features
+
+- [x] Data preservation of historic data
+- [x] Subset exploration
+- [x] External visualization of the database
+
+## Acknowledgement
+
+This work was part of a cooperation with the University of Vienna in the context of [E-LAUTE](https://e-laute.info/).
+
+<img src="../../images/logos/univie_small.png" width=100 />
\ No newline at end of file
diff --git a/.docs/examples/music.md b/.docs/examples/music.md
new file mode 100644
index 0000000000000000000000000000000000000000..02a848d59d02142a20a1ffeb403ca634eeb7fc59
--- /dev/null
+++ b/.docs/examples/music.md
@@ -0,0 +1,34 @@
+---
+author: Martin Weise
+---
+
+## tl;dr
+
+[:fontawesome-solid-database: Dataset](https://dbrepo1.ec.tuwien.ac.at/pid/34){ .md-button .md-button--primary target="_blank" }
+[:material-file-document: Archive](https://gitlab.tuwien.ac.at/martin.weise/fairnb){ .md-button .md-button--secondary target="_blank" }
+
+## Description
+
+We use a dataset collected by [Aljanaki et al.](https://www2.projects.science.uu.nl/memotion/emotifydata/), consisting
+of 400 MP3 music files, each having a playtime of one minute and labeled with one of four genres: rock, pop, classical
+and electronic, each genre contains 100 files, the genre will be used as label for the ML model. Then by generating MFCC
+vectors and training a SVM, the ML-model can classify emotions of the provided .mp3 files with and accuracy of 76.25%.
+
+<figure markdown>
+{ .img-border }
+<figcaption>Figure 1: Accuracy of predictions matrix in Jupyter Notebook.</figcaption>
+</figure>
+
+## Solution
+
+DBRepo is used as relational data storage of the raw- and aggregated features, prediction results and the splits of the
+training- and test data. For each of the 400 .mp3 files, 40 MFCC feature vectors are generated. This data is stored
+in aggregated form in the [`aggregated_features`](https://dbrepo1.ec.tuwien.ac.at/pid/47) table.
+
+## DBRepo Features
+
+- [x] Database as storage for machine learning data
+- [x] System versioning
+- [x] Subset exploration
+- [x] Precise & PID of database tables
+- [x] External data access for analysis
diff --git a/.docs/examples/power.md b/.docs/examples/power.md
index ea16727536bd48046e09d1a0fcdba5e5eaf95359..e85b1b98ce32b675829a67866fb3bef4340cd965 100644
--- a/.docs/examples/power.md
+++ b/.docs/examples/power.md
@@ -4,18 +4,33 @@ author: Martin Weise
## tl;dr
-tbd
+[:fontawesome-solid-database: Dataset](https://dbrepo1.ec.tuwien.ac.at/database/18/info){ .md-button .md-button--primary target="_blank" }
## Description
-TBD
+The [Pilotfabrik]() of TU Wien is monitored for energy-efficiency and productivity of machinery. In principle, certain
+conditions/parameters are observed such as: electric rate of energy transfer, transmission of cooling liquid,
+transmission of compressed air, acceleration, forces at work and temperatures to research on preventive/predictive
+maintenance, quality of products and ultimately process efficiency and -productivity.
+
+<figure markdown>
+
+<figcaption>Figure 1: Total power usage of machine floor TU Pilotfabrik, image from <a href="https://publik.tuwien.ac.at/files/PubDat_252294.pdf">Hacksteiner (2016)</a>.</figcaption>
+</figure>
## Solution
-TBD
+We connected our [Broker Service](../../api/broker-service) with the MQTT broker of the Pilotfabrik using a self-written
+connector service, bridging the two different protocols. The tuples are ingested into DBRepo at a rate of about 10/s.
## DBRepo Features
- [x] High-throughput real-time data import (MQTT)
- [x] Private database
- [x] Public embargoed data view
+
+## Acknowledgement
+
+This work was part of a cooperation with the [Institute of Production Engineering and Photonic Technologies](http://ift.at/).
+
+<img src="../../images/logos/ift.jpeg" width=100 />
diff --git a/.docs/examples/survey.md b/.docs/examples/survey.md
new file mode 100644
index 0000000000000000000000000000000000000000..c30f5efb67efc827474dd7a33cba99ae73af323d
--- /dev/null
+++ b/.docs/examples/survey.md
@@ -0,0 +1,41 @@
+---
+author: Martin Weise
+---
+
+## tl;dr
+
+[:fontawesome-solid-database: Dataset](https://handle.stage.datacite.org/10.82556/g2ac-vh88){ .md-button .md-button--primary target="_blank" }
+[:simple-jupyter: Notebook](https://binder.science.datalab.tuwien.ac.at/v2/git/https%3A%2F%2Fgitlab.tuwien.ac.at%2Fmartin.weise%2Ftres/HEAD){ .md-button .md-button--secondary target="_blank" }
+
+## Description
+
+As part of a literature study, the research unit of data science has collected data on 47 Trusted Research Environments
+(TREs) who enable analysis of confidential data under strict security assertions who protect the data with technical,
+organizational and legal measures from (accidentally) being leaked outside the facility. The literature study shows that
+47 TREs worldwide provide access to confidential data of which two-thirds provide data themselves (n=32, 68%),
+predominantly via secure remote access (n=46, 98%).
+
+## Solution
+
+We designed a database schema that allows collection of the data with correct primary key and foreign-key relationships.
+Three defined views allow for a simpler exploration of the study data. The analysis of the data was performed in TU
+Wien's virtual research environment using [JupyterHub](https://science.datalab.tuwien.ac.at/) as well as the chart
+
+<figure markdown>
+{ .img-border }
+<figcaption>Figure 1: Jupyter Notebook accessing data on DBRepo using the Python Library.</figcaption>
+</figure>
+
+## DBRepo Features
+
+- [x] System versioning
+- [x] Subset exploration
+- [x] Aggregated views
+- [x] Precise & PID of queries tables
+- [x] External data access for analysis
+
+## Acknowledgement
+
+This work was part of a cooperation with the [Research Unit of Data Science](https://informatics.tuwien.ac.at/orgs/e194-04).
+
+<img src="../../images/logos/ds-ifs.png" width=100 />
\ No newline at end of file
diff --git a/.docs/examples/transportation.md b/.docs/examples/transportation.md
index aeb8ab94ae57898cd261102e8f0adb750375ef89..a99f78941355bd9d1d19d65fb33b1c8aa01a5b20 100644
--- a/.docs/examples/transportation.md
+++ b/.docs/examples/transportation.md
@@ -18,7 +18,10 @@ and tram schedules, subway routes, ticketing details, and real-time updates on v
We wrote an algorithm that parses open data (available) information from Wiener Linien, Vienna's public transportation
agency directly and feeds it, after some cleaning, into DBRepo on a 5-minute interval.
-
+<figure markdown>
+
+<caption>Figure 1: Dashboard visualizing the live data of the current interruptions.</caption>
+</figure>
## DBRepo Features
diff --git a/.docs/examples/xps-data.md b/.docs/examples/xps-data.md
new file mode 100644
index 0000000000000000000000000000000000000000..9b237c8c6c8ec2be919751475f810605a9ee1925
--- /dev/null
+++ b/.docs/examples/xps-data.md
@@ -0,0 +1,48 @@
+---
+author: Martin Weise
+---
+
+## tl;dr
+
+[:fontawesome-solid-database: Dataset](https://dbrepo1.ec.tuwien.ac.at/database/27/info){ .md-button .md-button--primary target="_blank" }
+[:simple-jupyter: Notebook](https://binder.science.datalab.tuwien.ac.at/v2/git/https%3A%2F%2Fgitlab.tuwien.ac.at%2Ffairdata%2Fxps/HEAD){ .md-button .md-button--secondary target="_blank" }
+
+## Description
+
+X-ray Photoelectron Spectroscopy (XPS) is one of the most used methods in material sciences. Irradiation of solid
+materials with X-ray radiation kicks out electrons from atoms that are near the atomic nucleus. With XPS data being
+highly reproducible once machine parameters are known and understood, the demand for creating a comprehensive database
+connecting material properties to compositions via XPS spectra becomes evident.
+
+## Solution
+
+We read XPS data from the VAMAS-encoded format and inserted it into a
+[database schema](https://gitlab.tuwien.ac.at/fairdata/xps/-/blob/e17860399b1b109c72b01888766f37193dde5870/sql/create_schema.sql)
+that captures the VAMAS-schema. It can then be read using the Python Library that executes a database query in SQL to
+obtain only the experiment data (c.f. [subset page](https://dbrepo1.ec.tuwien.ac.at/database/27/subset/10/info)).
+
+<figure markdown>
+{ .img-border }
+<figcaption>Figure 1: Jupyter Notebook accessing data on DBRepo using the Python Library.</figcaption>
+</figure>
+
+Using the DataFrame representation of the Python Library and the [`plotly`](https://pypi.org/project/plotly/) library,
+we can visualize the ordinate values directly in the Jupyter Notebook.
+
+<figure markdown>
+{ .img-border }
+<figcaption>Figure 2: Plot of ordinate values encoded within the experiment block.</figcaption>
+</figure>
+
+## DBRepo Features
+
+- [x] Data preservation of VAMAS-encoded XPS data
+- [x] Subset exploration
+- [x] External visualization of the database
+- [x] Replication of experiments using only open-source software
+
+## Acknowledgement
+
+This work was part of a cooperation with the [Institute of Applied Physics](http://www.iap.tuwien.ac.at/).
+
+<img src="../../images/logos/iap.png" width=100 />
\ No newline at end of file
diff --git a/.docs/images/architecture-docker-compose.svg b/.docs/images/architecture-docker-compose.svg
index 08c9b5b80474c6b175c4965069a6d158ab5128ad..f1f69f41015048f35566e4e30feecd15d40cecf0 100644
--- a/.docs/images/architecture-docker-compose.svg
+++ b/.docs/images/architecture-docker-compose.svg
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="838px" height="559px" viewBox="-0.5 -0.5 838 559"><defs/><g><path d="M 367.13 90.37 L 367.5 108.5 L 366.5 108.5 L 366.5 125.63" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 367.02 85.12 L 370.66 92.04 L 367.13 90.37 L 363.67 92.19 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 366.5 130.88 L 363 123.88 L 366.5 125.63 L 370 123.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><ellipse cx="367.5" cy="7.5" rx="7.5" ry="7.5" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><path d="M 367.5 15 L 367.5 40 M 367.5 20 L 352.5 20 M 367.5 20 L 382.5 20 M 367.5 40 L 352.5 60 M 367.5 40 L 382.5 60" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 67px; margin-left: 368px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">Researcher</div></div></div></foreignObject><text x="368" y="79" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Resea...</text></switch></g><path d="M 295.13 152 L 265.37 152" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 300.38 152 L 293.38 155.5 L 295.13 152 L 293.38 148.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 260.12 152 L 267.12 148.5 L 265.37 152 L 267.12 155.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 152px; margin-left: 281px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 9px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">HTTP</div></div></div></foreignObject><text x="281" y="155" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="9px" text-anchor="middle">HTTP</text></switch></g><path d="M 334 172 L 334 200 L 194 200 L 194 221.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 194 226.88 L 190.5 219.88 L 194 221.63 L 197.5 219.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 399 172 L 399 200 L 544 200 L 544 221.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 544 226.88 L 540.5 219.88 L 544 221.63 L 547.5 219.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 366.5 178.37 L 366.5 221.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 366.5 173.12 L 370 180.12 L 366.5 178.37 L 363 180.12 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 366.5 226.88 L 363 219.88 L 366.5 221.63 L 370 219.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 200px; margin-left: 367px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 9px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">HTTP</div></div></div></foreignObject><text x="367" y="203" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="9px" text-anchor="middle">HTTP</text></switch></g><path d="M 334 178.37 L 334 200 L 281 200 L 281 294 L 194 294 L 194 317.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 334 173.12 L 337.5 180.12 L 334 178.37 L 330.5 180.12 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 194 322.88 L 190.5 315.88 L 194 317.63 L 197.5 315.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 201px; margin-left: 310px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 9px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">HTTP</div></div></div></foreignObject><text x="310" y="203" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="9px" text-anchor="middle">HTTP</text></switch></g><path d="M 437.87 152 L 472.63 152" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 432.62 152 L 439.62 148.5 L 437.87 152 L 439.62 155.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 477.88 152 L 470.88 155.5 L 472.63 152 L 470.88 148.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 152px; margin-left: 456px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 9px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">S3</div></div></div></foreignObject><text x="456" y="155" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="9px" text-anchor="middle">S3</text></switch></g><path d="M 399 178.37 L 399 200 L 457 200 L 457 294 L 544 294 L 544 317.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 399 173.12 L 402.5 180.12 L 399 178.37 L 395.5 180.12 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 544 322.88 L 540.5 315.88 L 544 317.63 L 547.5 315.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 200px; margin-left: 411px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 9px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">HTTP</div></div></div></foreignObject><text x="411" y="202" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="9px" text-anchor="middle">HTTP</text></switch></g><rect x="301.5" y="132" width="130" height="40" rx="6" ry="6" fill="#e6e6e6" stroke="#000000" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 152px; margin-left: 303px;"><div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Gateway Service<br />(NGINX)</div></div></div></foreignObject><text x="367" y="156" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Gateway Service...</text></switch></g><path d="M 431.5 248 L 445 248 L 445 203 C 448.9 203 448.9 197 445 197 L 445 197 L 445 189 L 544 189 L 544 178.37" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 544 173.12 L 547.5 180.12 L 544 178.37 L 540.5 180.12 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 190px; margin-left: 473px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">S3</div></div></div></foreignObject><text x="473" y="193" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">S3</text></switch></g><rect x="301.5" y="228" width="130" height="40" rx="6" ry="6" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 248px; margin-left: 303px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Analyse Service</div></div></div></foreignObject><text x="367" y="252" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Analyse Service</text></switch></g><path d="M 194 370.37 L 194 397.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 194 365.12 L 197.5 372.12 L 194 370.37 L 190.5 372.12 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 194 402.88 L 190.5 395.88 L 194 397.63 L 197.5 395.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><rect x="129" y="324" width="130" height="40" rx="6" ry="6" fill="#e6e6e6" stroke="#000000" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 344px; margin-left: 130px;"><div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Authentication Service<br />(Keycloak)</div></div></div></foreignObject><text x="194" y="348" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Authentication Servic...</text></switch></g><path d="M 615.37 344.12 L 634.5 344.5 L 652.63 344.13" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 610.12 344.02 L 617.19 340.66 L 615.37 344.12 L 617.05 347.66 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 657.88 344.02 L 650.96 347.66 L 652.63 344.13 L 650.81 340.67 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 345px; margin-left: 633px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 9px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">JDBC</div></div></div></foreignObject><text x="633" y="348" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="9px" text-anchor="middle">JDBC</text></switch></g><path d="M 544 364 L 544 410.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 544 415.88 L 540.5 408.88 L 544 410.63 L 547.5 408.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><rect x="479" y="324" width="130" height="40" rx="6" ry="6" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 344px; margin-left: 480px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Metadata Service</div></div></div></foreignObject><text x="544" y="348" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Metadata Service</text></switch></g><path d="M 259 248 L 278 248 C 278 244.1 284 244.1 284 248 L 284 248 L 289 248 L 289 294 L 369 294 L 369 317.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="1 1" pointer-events="stroke"/><path d="M 369 322.88 L 365.5 315.88 L 369 317.63 L 372.5 315.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 294px; margin-left: 356px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 9px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">Spring AMQP</div></div></div></foreignObject><text x="356" y="297" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="9px" text-anchor="middle">Spring AMQP</text></switch></g><rect x="129" y="228" width="130" height="40" rx="6" ry="6" fill="#e6e6e6" stroke="#000000" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 248px; margin-left: 130px;"><div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Broker Service<br />(RabbitMQ)</div></div></div></foreignObject><text x="194" y="252" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Broker Service...</text></switch></g><path d="M 615.37 248 L 652.63 248" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 610.12 248 L 617.12 244.5 L 615.37 248 L 617.12 251.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 657.88 248 L 650.88 251.5 L 652.63 248 L 650.88 244.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 248px; margin-left: 634px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 9px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">HTTP</div></div></div></foreignObject><text x="634" y="251" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="9px" text-anchor="middle">HTTP</text></switch></g><rect x="479" y="228" width="130" height="40" rx="6" ry="6" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 248px; margin-left: 480px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Search Service</div></div></div></foreignObject><text x="544" y="252" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Search Service</text></switch></g><rect x="129" y="132" width="130" height="40" rx="6" ry="6" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 152px; margin-left: 130px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">UI</div></div></div></foreignObject><text x="194" y="156" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">UI</text></switch></g><path d="M 659 224.6 C 659 219.85 670.19 216 684 216 C 690.63 216 696.99 216.91 701.68 218.52 C 706.37 220.13 709 222.32 709 224.6 L 709 271.4 C 709 276.15 697.81 280 684 280 C 670.19 280 659 276.15 659 271.4 Z" fill="#dae8fc" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 709 224.6 C 709 229.35 697.81 233.2 684 233.2 C 670.19 233.2 659 229.35 659 224.6" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 715.37 344 L 739 344 L 769 344" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 710.12 344 L 717.12 340.5 L 715.37 344 L 717.12 347.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 659 320.6 C 659 315.85 670.19 312 684 312 C 690.63 312 696.99 312.91 701.68 314.52 C 706.37 316.13 709 318.32 709 320.6 L 709 367.4 C 709 372.15 697.81 376 684 376 C 670.19 376 659 372.15 659 367.4 Z" fill="#dae8fc" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 709 320.6 C 709 325.35 697.81 329.2 684 329.2 C 670.19 329.2 659 325.35 659 320.6" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="641.5" y="376" width="85" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 89px; height: 1px; padding-top: 386px; margin-left: 640px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">metadata-db</div></div></div></foreignObject><text x="684" y="390" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">metadata-db</text></switch></g><path d="M 342.5 413.6 C 342.5 408.85 353.69 405 367.5 405 C 374.13 405 380.49 405.91 385.18 407.52 C 389.87 409.13 392.5 411.32 392.5 413.6 L 392.5 460.4 C 392.5 465.15 381.31 469 367.5 469 C 353.69 469 342.5 465.15 342.5 460.4 Z" fill="#dae8fc" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 392.5 413.6 C 392.5 418.35 381.31 422.2 367.5 422.2 C 353.69 422.2 342.5 418.35 342.5 413.6" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="326.5" y="467" width="85" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 89px; height: 1px; padding-top: 477px; margin-left: 325px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">data-db</div></div></div></foreignObject><text x="369" y="481" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">data-db</text></switch></g><path d="M 169 412.6 C 169 407.85 180.19 404 194 404 C 200.63 404 206.99 404.91 211.68 406.52 C 216.37 408.13 219 410.32 219 412.6 L 219 459.4 C 219 464.15 207.81 468 194 468 C 180.19 468 169 464.15 169 459.4 Z" fill="#dae8fc" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 219 412.6 C 219 417.35 207.81 421.2 194 421.2 C 180.19 421.2 169 417.35 169 412.6" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="151.5" y="468" width="85" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 89px; height: 1px; padding-top: 478px; margin-left: 150px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">auth-db</div></div></div></foreignObject><text x="194" y="482" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">auth-db</text></switch></g><rect x="479" y="132" width="130" height="40" rx="6" ry="6" fill="#e6e6e6" stroke="#000000" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 152px; margin-left: 480px;"><div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Storage Service<br />(SeaweedFS)</div></div></div></foreignObject><text x="544" y="156" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Storage Service...</text></switch></g><rect x="729.5" y="358" width="108" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 112px; height: 1px; padding-top: 368px; margin-left: 728px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">metadata-db-data</div></div></div></foreignObject><text x="784" y="372" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">metadata-db-data</text></switch></g><ellipse cx="783.5" cy="344" rx="14" ry="14" fill="#e1d5e7" stroke="#000000" pointer-events="all"/><rect x="729.5" y="262" width="108" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 112px; height: 1px; padding-top: 272px; margin-left: 728px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">search-db-data</div></div></div></foreignObject><text x="784" y="276" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">search-db-data</text></switch></g><path d="M 769.5 248 L 715.37 248" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 710.12 248 L 717.12 244.5 L 715.37 248 L 717.12 251.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><ellipse cx="783.5" cy="248" rx="14" ry="14" fill="#e1d5e7" stroke="#000000" pointer-events="all"/><rect x="313.5" y="538" width="108" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 112px; height: 1px; padding-top: 548px; margin-left: 312px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">data-db-data</div></div></div></foreignObject><text x="368" y="552" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">data-db-data</text></switch></g><path d="M 368 509 L 368 489 L 368 493.37" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 368 488.12 L 371.5 495.12 L 368 493.37 L 364.5 495.12 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><ellipse cx="368" cy="523" rx="14" ry="14" fill="#e1d5e7" stroke="#000000" pointer-events="all"/><path d="M 194 510 L 194 494.37" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 194 489.12 L 197.5 496.12 L 194 494.37 L 190.5 496.12 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><ellipse cx="194" cy="524" rx="14" ry="14" fill="#e1d5e7" stroke="#000000" pointer-events="all"/><rect x="140" y="538" width="108" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 112px; height: 1px; padding-top: 548px; margin-left: 138px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">auth-db-data</div></div></div></foreignObject><text x="194" y="552" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">auth-db-data</text></switch></g><path d="M 369 364 L 369 384.5 L 367.5 384.5 L 367.5 398.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 367.5 403.88 L 364 396.88 L 367.5 398.63 L 371 396.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 385px; margin-left: 369px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 9px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">JDBC</div></div></div></foreignObject><text x="369" y="387" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="9px" text-anchor="middle">JDBC</text></switch></g><rect x="304" y="324" width="130" height="40" rx="6" ry="6" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 344px; margin-left: 305px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Data Service</div></div></div></foreignObject><text x="369" y="348" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Data Service</text></switch></g><rect x="641.5" y="291" width="85" height="17" fill="rgb(255, 255, 255)" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 89px; height: 1px; padding-top: 300px; margin-left: 640px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">search-db</div></div></div></foreignObject><text x="684" y="303" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">search-db</text></switch></g><path d="M 68 248 L 98.5 248 L 122.63 248" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 127.88 248 L 120.88 251.5 L 122.63 248 L 120.88 244.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><ellipse cx="54" cy="248" rx="14" ry="14" fill="#e1d5e7" stroke="#000000" pointer-events="all"/><rect x="0" y="262" width="108" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 112px; height: 1px; padding-top: 272px; margin-left: -2px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">broker-service-data</div></div></div></foreignObject><text x="54" y="276" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">broker-service-data</text></switch></g><path d="M 479 437 L 398.87 437" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 393.62 437 L 400.62 433.5 L 398.87 437 L 400.62 440.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><rect x="479" y="417" width="130" height="40" rx="6" ry="6" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 437px; margin-left: 480px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Data DB Sidecar</div></div></div></foreignObject><text x="544" y="441" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Data DB Sidecar</text></switch></g><ellipse cx="281" cy="414.5" rx="7.5" ry="7.5" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><path d="M 281 422 L 281 447 M 281 427 L 266 427 M 281 427 L 296 427 M 281 447 L 266 467 M 281 447 L 296 467" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 474px; margin-left: 281px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">Researcher</div></div></div></foreignObject><text x="281" y="486" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Resea...</text></switch></g><path d="M 302.37 437 L 336.13 437" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 297.12 437 L 304.12 433.5 L 302.37 437 L 304.12 440.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 341.38 437 L 334.38 440.5 L 336.13 437 L 334.38 433.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 615.37 152 L 729 152 L 729 245 C 732.9 245 732.9 251 729 251 L 729 251 L 729 341 C 732.9 341 732.9 347 729 347 L 729 347 L 729 437 L 615.37 437" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 610.12 152 L 617.12 148.5 L 615.37 152 L 617.12 155.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 610.12 437 L 617.12 433.5 L 615.37 437 L 617.12 440.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 174px; margin-left: 729px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">S3</div></div></div></foreignObject><text x="729" y="177" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">S3</text></switch></g><rect x="649" y="514" width="30" height="16" fill="#e6e6e6" stroke="rgb(0, 0, 0)" pointer-events="all"/><rect x="686.5" y="514" width="140" height="16" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 138px; height: 1px; padding-top: 522px; margin-left: 689px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">External images</div></div></div></foreignObject><text x="689" y="526" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">External images</text></switch></g><rect x="649" y="534" width="30" height="16" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><rect x="686.5" y="534" width="140" height="16" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 138px; height: 1px; padding-top: 542px; margin-left: 689px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Maintained images</div></div></div></foreignObject><text x="689" y="546" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">Maintained images</text></switch></g><rect x="664" y="514" width="15" height="16" fill="#dae8fc" stroke="#000000" pointer-events="all"/></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.drawio.com/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Text is not SVG - cannot display</text></a></switch></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="890px" height="559px" viewBox="-0.5 -0.5 890 559" style="background-color: rgb(255, 255, 255);"><defs/><rect fill="#ffffff" width="100%" height="100%" x="0" y="0"/><g><g data-cell-id="0"><g data-cell-id="1"><g data-cell-id="45LT9Xtm5jvL1Omwo4Uv-6"><g><path d="M 418.14 90.37 L 418.53 108.53 L 417.78 125.64" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 418.02 85.12 L 421.67 92.04 L 418.14 90.37 L 414.68 92.19 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 417.55 130.88 L 414.36 123.74 L 417.78 125.64 L 421.35 124.04 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/></g></g><g data-cell-id="S3Av5TdVFqS_SrXukbwN-2"><g><ellipse cx="418.5" cy="7.5" rx="7.5" ry="7.5" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><path d="M 418.5 15 L 418.5 40 M 418.5 20 L 403.5 20 M 418.5 20 L 433.5 20 M 418.5 40 L 403.5 60 M 418.5 40 L 433.5 60" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 67px; margin-left: 419px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">Researcher</div></div></div></foreignObject><image x="388" y="67.5" width="62" height="17" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="V1Wl26Vbpgnno5Lb-wtg-39"><g><path d="M 346.13 152 L 316.37 152" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 351.38 152 L 344.38 155.5 L 346.13 152 L 344.38 148.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 311.12 152 L 318.12 148.5 L 316.37 152 L 318.12 155.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 152px; margin-left: 331px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 9px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">HTTP</div></div></div></foreignObject><image x="319" y="147" width="24" height="13.25" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAAA1CAYAAAC+2+58AAAAAXNSR0IArs4c6QAAA2NJREFUeF7tm81LMlEUxo8pVAs1KltI4KYWSRlBELg1WwRCENUf0Dpo3d6WQdSynRCBQgXtRJdu2hSulFYtRESxMBT7wLiXt3n7mGbm3rnqC+/jTuec507Pb849d+5Mjk6n0yF8+uaAAwD65j0fGAD66z8A9Nl/AACAfjvQ5/G1HvD09ERut1s7nfPzc1pbWxM6vaurK4rFYlpOvV6nkZER/v3m5oYWFhaE9MyC8/k8vb6+dkV3dnaWD//dF6Nzcjqd/O/1+/20tLTE/VtdXSWHw/FrGgDoWMPAygDQc3lubo4SiQTNz8/rQugZgEKhQOvr64YX9f39PTUaDR7j9XppcnLSMP7i4oLe3t66ojs1NaVbATMzMzQ6Oqp7Xq1Wi8rlMpVKpS/Hh4aGKJPJUDgc/pHXMwBm0wk7zkr28vKSh25tbdHZ2ZmVNNMYO7oyUzO7kI6Pj+ng4IBfIOwzMTFBd3d3X6Z59jsAmOCTAfAhmUwmaXNzUxshHo/T3t7elxEBoIsAmPTKygql02k+yuLiIl1fXwOAyNRmpwKY02wq2tnZ4aazVdLz8zMNDAxoEFABXa6A70vzarVKY2NjAGDauf8E2K0Atqj4fD/1+PhIHo8HAHoF4PDwkHZ3d/lww8PD1Gw20QN62QMikQhls1lu+vLystaQPyj82gPYLfXg4KDVC4XHtdttenh40HI+b0VYEbKzXjfSt6NrZwpKpVK0sbGhndrJyQltb29bqwArhpnF/K8AarUaHR0d0f7+Pr28vHCbgsEg3d7eksvlAgA7U1AoFCKfz6d77bElZqVSoWKxSJ+f9I6Pj1Mul6Pp6ekfeViGCi5Dzar++3G2/3N6ekqBQEA3FQAUAmDbzmwTkW1HM+PZNkQ0GjUcAQAEAcg8JzEaAgAA4K8DdpaL/+Iy1Eq/QAWgAlAB/NVEO3d8HxYaPZS3Uo6Ygrr4VgQA6DuAHoAegB6AHmBQBSp6o6UbMStzNGLUO4DX09V7KqQIAEJ2qQ8GAPWeCikCgJBd6oMBQL2nQooAIGSX+mAAUO+pkCIACNmlPhgA1HsqpAgAQnapDwYA9Z4KKf7+73tCMgiWdQAAZJ1TlAcAioyUlQEAWecU5QGAIiNlZQBA1jlFeQCgyEhZGQCQdU5RHgAoMlJW5h0DqhjC399QigAAAABJRU5ErkJggg=="/></switch></g></g></g><g data-cell-id="V1Wl26Vbpgnno5Lb-wtg-40"><g><path d="M 385 172 L 385 200.06 L 243 200.06 L 243 221.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 243 226.88 L 239.5 219.88 L 243 221.63 L 246.5 219.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g></g><g data-cell-id="V1Wl26Vbpgnno5Lb-wtg-41"><g><path d="M 450 172 L 450.06 200.06 L 595 200.06 L 595 221.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 595 226.88 L 591.5 219.88 L 595 221.63 L 598.5 219.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g></g><g data-cell-id="V1Wl26Vbpgnno5Lb-wtg-42"><g><path d="M 417.5 178.37 L 417.5 221.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 417.5 173.12 L 421 180.12 L 417.5 178.37 L 414 180.12 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 417.5 226.88 L 414 219.88 L 417.5 221.63 L 421 219.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 200px; margin-left: 418px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 9px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">HTTP</div></div></div></foreignObject><image x="406" y="195" width="24" height="13.25" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAAA1CAYAAAC+2+58AAAAAXNSR0IArs4c6QAAA2NJREFUeF7tm81LMlEUxo8pVAs1KltI4KYWSRlBELg1WwRCENUf0Dpo3d6WQdSynRCBQgXtRJdu2hSulFYtRESxMBT7wLiXt3n7mGbm3rnqC+/jTuec507Pb849d+5Mjk6n0yF8+uaAAwD65j0fGAD66z8A9Nl/AACAfjvQ5/G1HvD09ERut1s7nfPzc1pbWxM6vaurK4rFYlpOvV6nkZER/v3m5oYWFhaE9MyC8/k8vb6+dkV3dnaWD//dF6Nzcjqd/O/1+/20tLTE/VtdXSWHw/FrGgDoWMPAygDQc3lubo4SiQTNz8/rQugZgEKhQOvr64YX9f39PTUaDR7j9XppcnLSMP7i4oLe3t66ojs1NaVbATMzMzQ6Oqp7Xq1Wi8rlMpVKpS/Hh4aGKJPJUDgc/pHXMwBm0wk7zkr28vKSh25tbdHZ2ZmVNNMYO7oyUzO7kI6Pj+ng4IBfIOwzMTFBd3d3X6Z59jsAmOCTAfAhmUwmaXNzUxshHo/T3t7elxEBoIsAmPTKygql02k+yuLiIl1fXwOAyNRmpwKY02wq2tnZ4aazVdLz8zMNDAxoEFABXa6A70vzarVKY2NjAGDauf8E2K0Atqj4fD/1+PhIHo8HAHoF4PDwkHZ3d/lww8PD1Gw20QN62QMikQhls1lu+vLystaQPyj82gPYLfXg4KDVC4XHtdttenh40HI+b0VYEbKzXjfSt6NrZwpKpVK0sbGhndrJyQltb29bqwArhpnF/K8AarUaHR0d0f7+Pr28vHCbgsEg3d7eksvlAgA7U1AoFCKfz6d77bElZqVSoWKxSJ+f9I6Pj1Mul6Pp6ekfeViGCi5Dzar++3G2/3N6ekqBQEA3FQAUAmDbzmwTkW1HM+PZNkQ0GjUcAQAEAcg8JzEaAgAA4K8DdpaL/+Iy1Eq/QAWgAlAB/NVEO3d8HxYaPZS3Uo6Ygrr4VgQA6DuAHoAegB6AHmBQBSp6o6UbMStzNGLUO4DX09V7KqQIAEJ2qQ8GAPWeCikCgJBd6oMBQL2nQooAIGSX+mAAUO+pkCIACNmlPhgA1HsqpAgAQnapDwYA9Z4KKf7+73tCMgiWdQAAZJ1TlAcAioyUlQEAWecU5QGAIiNlZQBA1jlFeQCgyEhZGQCQdU5RHgAoMlJW5h0DqhjC399QigAAAABJRU5ErkJggg=="/></switch></g></g></g><g data-cell-id="V1Wl26Vbpgnno5Lb-wtg-43"><g><path d="M 385 178.37 L 385 200.06 L 332.06 200.06 L 332.06 294.06 L 245 294.06 L 245 317.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 385 173.12 L 388.5 180.12 L 385 178.37 L 381.5 180.12 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 245 322.88 L 241.5 315.88 L 245 317.63 L 248.5 315.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g><g data-cell-id="YJRAzF6yD4Hh-bAvO1PB-19"><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 201px; margin-left: 361px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 9px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">HTTP</div></div></div></foreignObject><image x="349" y="196" width="24" height="13.25" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAAA1CAYAAAC+2+58AAAAAXNSR0IArs4c6QAAA2NJREFUeF7tm81LMlEUxo8pVAs1KltI4KYWSRlBELg1WwRCENUf0Dpo3d6WQdSynRCBQgXtRJdu2hSulFYtRESxMBT7wLiXt3n7mGbm3rnqC+/jTuec507Pb849d+5Mjk6n0yF8+uaAAwD65j0fGAD66z8A9Nl/AACAfjvQ5/G1HvD09ERut1s7nfPzc1pbWxM6vaurK4rFYlpOvV6nkZER/v3m5oYWFhaE9MyC8/k8vb6+dkV3dnaWD//dF6Nzcjqd/O/1+/20tLTE/VtdXSWHw/FrGgDoWMPAygDQc3lubo4SiQTNz8/rQugZgEKhQOvr64YX9f39PTUaDR7j9XppcnLSMP7i4oLe3t66ojs1NaVbATMzMzQ6Oqp7Xq1Wi8rlMpVKpS/Hh4aGKJPJUDgc/pHXMwBm0wk7zkr28vKSh25tbdHZ2ZmVNNMYO7oyUzO7kI6Pj+ng4IBfIOwzMTFBd3d3X6Z59jsAmOCTAfAhmUwmaXNzUxshHo/T3t7elxEBoIsAmPTKygql02k+yuLiIl1fXwOAyNRmpwKY02wq2tnZ4aazVdLz8zMNDAxoEFABXa6A70vzarVKY2NjAGDauf8E2K0Atqj4fD/1+PhIHo8HAHoF4PDwkHZ3d/lww8PD1Gw20QN62QMikQhls1lu+vLystaQPyj82gPYLfXg4KDVC4XHtdttenh40HI+b0VYEbKzXjfSt6NrZwpKpVK0sbGhndrJyQltb29bqwArhpnF/K8AarUaHR0d0f7+Pr28vHCbgsEg3d7eksvlAgA7U1AoFCKfz6d77bElZqVSoWKxSJ+f9I6Pj1Mul6Pp6ekfeViGCi5Dzar++3G2/3N6ekqBQEA3FQAUAmDbzmwTkW1HM+PZNkQ0GjUcAQAEAcg8JzEaAgAA4K8DdpaL/+Iy1Eq/QAWgAlAB/NVEO3d8HxYaPZS3Uo6Ygrr4VgQA6DuAHoAegB6AHmBQBSp6o6UbMStzNGLUO4DX09V7KqQIAEJ2qQ8GAPWeCikCgJBd6oMBQL2nQooAIGSX+mAAUO+pkCIACNmlPhgA1HsqpAgAQnapDwYA9Z4KKf7+73tCMgiWdQAAZJ1TlAcAioyUlQEAWecU5QGAIiNlZQBA1jlFeQCgyEhZGQCQdU5RHgAoMlJW5h0DqhjC399QigAAAABJRU5ErkJggg=="/></switch></g></g></g></g><g data-cell-id="V1Wl26Vbpgnno5Lb-wtg-44"><g><path d="M 488.87 152 L 523.63 152" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 483.62 152 L 490.62 148.5 L 488.87 152 L 490.62 155.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 528.88 152 L 521.88 155.5 L 523.63 152 L 521.88 148.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 152px; margin-left: 506px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 9px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">S3</div></div></div></foreignObject><image x="500.5" y="147" width="11" height="13.25" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="V1Wl26Vbpgnno5Lb-wtg-45"><g><path d="M 450.01 178.37 L 450.06 200.06 L 508.06 200.06 L 508.06 294.06 L 595 294.06 L 595 317.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 450 173.12 L 453.52 180.11 L 450.01 178.37 L 446.52 180.13 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 595 322.88 L 591.5 315.88 L 595 317.63 L 598.5 315.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g><g data-cell-id="YJRAzF6yD4Hh-bAvO1PB-18"><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 200px; margin-left: 461px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 9px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">HTTP</div></div></div></foreignObject><image x="449" y="195" width="24" height="13.25" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAAA1CAYAAAC+2+58AAAAAXNSR0IArs4c6QAAA2NJREFUeF7tm81LMlEUxo8pVAs1KltI4KYWSRlBELg1WwRCENUf0Dpo3d6WQdSynRCBQgXtRJdu2hSulFYtRESxMBT7wLiXt3n7mGbm3rnqC+/jTuec507Pb849d+5Mjk6n0yF8+uaAAwD65j0fGAD66z8A9Nl/AACAfjvQ5/G1HvD09ERut1s7nfPzc1pbWxM6vaurK4rFYlpOvV6nkZER/v3m5oYWFhaE9MyC8/k8vb6+dkV3dnaWD//dF6Nzcjqd/O/1+/20tLTE/VtdXSWHw/FrGgDoWMPAygDQc3lubo4SiQTNz8/rQugZgEKhQOvr64YX9f39PTUaDR7j9XppcnLSMP7i4oLe3t66ojs1NaVbATMzMzQ6Oqp7Xq1Wi8rlMpVKpS/Hh4aGKJPJUDgc/pHXMwBm0wk7zkr28vKSh25tbdHZ2ZmVNNMYO7oyUzO7kI6Pj+ng4IBfIOwzMTFBd3d3X6Z59jsAmOCTAfAhmUwmaXNzUxshHo/T3t7elxEBoIsAmPTKygql02k+yuLiIl1fXwOAyNRmpwKY02wq2tnZ4aazVdLz8zMNDAxoEFABXa6A70vzarVKY2NjAGDauf8E2K0Atqj4fD/1+PhIHo8HAHoF4PDwkHZ3d/lww8PD1Gw20QN62QMikQhls1lu+vLystaQPyj82gPYLfXg4KDVC4XHtdttenh40HI+b0VYEbKzXjfSt6NrZwpKpVK0sbGhndrJyQltb29bqwArhpnF/K8AarUaHR0d0f7+Pr28vHCbgsEg3d7eksvlAgA7U1AoFCKfz6d77bElZqVSoWKxSJ+f9I6Pj1Mul6Pp6ekfeViGCi5Dzar++3G2/3N6ekqBQEA3FQAUAmDbzmwTkW1HM+PZNkQ0GjUcAQAEAcg8JzEaAgAA4K8DdpaL/+Iy1Eq/QAWgAlAB/NVEO3d8HxYaPZS3Uo6Ygrr4VgQA6DuAHoAegB6AHmBQBSp6o6UbMStzNGLUO4DX09V7KqQIAEJ2qQ8GAPWeCikCgJBd6oMBQL2nQooAIGSX+mAAUO+pkCIACNmlPhgA1HsqpAgAQnapDwYA9Z4KKf7+73tCMgiWdQAAZJ1TlAcAioyUlQEAWecU5QGAIiNlZQBA1jlFeQCgyEhZGQCQdU5RHgAoMlJW5h0DqhjC399QigAAAABJRU5ErkJggg=="/></switch></g></g></g></g><g data-cell-id="CohMdi7D_fRk0dSxzjYi-1"><g><rect x="352.5" y="132" width="130" height="40" rx="6" ry="6" fill="#e6e6e6" stroke="#000000" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 152px; margin-left: 354px;"><div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Gateway Service<br />(NGINX)</div></div></div></foreignObject><image x="354" y="138" width="128" height="32" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="iy0HhJzZLXsiPmpU2ukH-9"><g><path d="M 482.5 248 L 496.06 248.06 L 496.06 203.06 C 499.96 203.06 499.96 197.06 496.06 197.06 L 496.06 197.06 L 496.06 189 L 595 189 L 595 178.37" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 595 173.12 L 598.5 180.12 L 595 178.37 L 591.5 180.12 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g><g data-cell-id="iy0HhJzZLXsiPmpU2ukH-10"><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 190px; margin-left: 524px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">S3</div></div></div></foreignObject><image x="517.5" y="184" width="13" height="15.75" xlink:href="data:image/png;base64,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"/></switch></g></g></g></g><g data-cell-id="13tBXMPt0xomx7MP2VuM-1"><g><rect x="352.5" y="228" width="130" height="40" rx="6" ry="6" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 248px; margin-left: 354px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Analyse Service</div></div></div></foreignObject><image x="354" y="241.5" width="128" height="17" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAgAAAABECAYAAAD3Lo2pAAAAAXNSR0IArs4c6QAAG4RJREFUeF7t3QW0LMtVBuAd3IO7u7s7BAjBPYFAkBDcJTjBIcE1OAGCu7sEt+AEdyd4AgnOfFldYa+iZ7p6Ts/cc8/svdZd79071dVVf1VX/bWt7hAlhUAhUAgUAoVAIXBxCNzh4npcHS4ECoFCoBAoBAqBKAJQk6AQKAQKgUKgELhABIoAXOCgV5cLgUKgECgECoEiADUHCoFCoBAoBAqBC0SgCMAFDnp1uRAoBAqBQqAQKAJQc6AQKAQKgUKgELhABIoAXOCgV5cLgUKgECgECoEiADUHCoFCoBAoBAqBC0SgCMAFDvpt3uWPi4gPS334roh4vdu8T9X8QuAqCDxeRDyiq+DFIuKXr1JpPXvzESgCcPPH+Kb1sAjA7TOiTxARzxcRzx0Rd4yIJ46Ix42If42If4mIv4yI34+I34uIf7t9unXtWloE4NoNye3RoCIA12Ocvjwi7tE15Xci4nkj4n+uRxOvTSuKAFyboZhtyDNExN0j4s0j4sUj4jEGmuv0+uMR8Q0R8cCIeOTAM1Xk/xAoAlCz4SgEigAcBdumDz15RPx5RPiIe3n1iPiRTd92+1dWBOB6jqHT/odHxPtExONfoYl/HRHvEhHfeoU6Lu3RIgCXNuIb9bcIwEZAXqGa99upRj91z/NfFxF3u0LdN/HRIgDXb1SfKiK+IyJe5kDTqPgfvvPf+I+IeMLJHHCoJx+6Mxd84vXr6rVt0ZN2LXtYRPzXtW1tNexaIFAE4NYOA/x/a7KRaolF8h8j4mmmZv17RDxjRDz01jbzWr29CMC1Go5Hqfip71++a5bN/isi4jsj4lci4i+6359op/J/gYh4rYh4x4h45pluveXODPa116u71ZpC4OYgUATg1o7lnSLiB1MTLJZ/GhHvmv7tgyLifre2mdfq7UUArtVwxLtHxOd0Tfqeyaflbweb+tgR8dE7AvwhXXnmAA6E/zxYTxUrBAqBFQgUAVgB1gmKfmNEvGmq9+0j4k8i4ofSv/GSfq5yBnw0IkUATjARr1ClULMXSc//UkS8bETQXq2Vfmw9/8E7n4L7rq2oyhcChcAyAkUAljE6VYmnmzb7x5peYMF82um0Q1361OnFr9lpCk7Vptuh3iIA12eUzFGn9CxvFRFfc2QTaQJ+MyKeIz3PRCaUsKQQKAQ2RqAIwMaArqjuI3YhUh+TyvN6fuPp758dEe+RfqMpEFa1Vn4qIl4uPfTSEfHz6e+vsIvBfuvJfvusk3MW5yGL+s9GxDfvQrm+/UjtA/vuG02OYRbwp5gcvxAdfg5/PLWF8xiNx2i44xIB+Jbpva2bTqiSohwj3xsRd04P+vtd9lSE0L3Zjqi94mTb5sch7p2NnD0cqbOZieow1iI/jpFni4jXjwikkGaIA573/P1uzlC5/+puzL9vsr3/3TEvWPHMS+ySMP1CV/55IkII67HyDhHxajssf303539j+u8frajsFPjwV/BdNPmniGhOd485RS28TUQ8/zQWfhfdQ5snLLLJ5+38eZhM1opv568ioh0WPM9M+PlTRVeNAnj2iHjDaa4jX4idOv9hytNgHfnKaW6tbbvysJKsy7f0otOchQ9MzVlazh+Y5uzvHvOCeuY4BIoAHIfbVZ+yaPxhRDxTqogpwIZLXrLbqHlOK9uftpbaYSPgZNWkhRVaUL40It5gqYJpgX+TyTdhoPijFsFP79679JxT3z13C8RPLxXcLYJLBOB1p4UkV3VMVrS5Rfeuu0X+67s2Wsg+freh3ysijOuIGE+5H95/hX376SfC+HaD77G4fnJEfMpMlriRNo6UQXY4AGYx/sbz3HJKfIzrf6YOGb/HmcYBmeszUTaCAHtj3MQmjhD890pw3ikiviA9g0QjnEgfOZYAPOU0p9Q/Mnf5diAeyPuIaJcop3tPiaCWnoELoiHT57EEeekd9XtCoAjArZkONt5vS6/Ggi0M2W7Kc/qFU5ljwqKcrvPi5P+x+R+LiBdc0XVkhZ03n4LmHn/tKZmLE9NaEbJEfdxvsH09SwTAQubEKHqiyWftTjPvvbJB/aLrNGTRzRnr/J324lgVtdPOKw0QOwl1vjtFh6zpys9ExOtMp7k1z42U5aD3211BfiwPGHl4wzLnwMemn0/g/l/OA5t8L40AaNeDux9fZfr+1nTfHEPem9ByIeVNjiEATv0ckGlM1ojvwHwyrw4JAs2pmT/IWvmb6QBhDSw5IQJFAE4I7oGqMWmbZRMnZkw5y3tFxGemf7AJU8+Nqso92qvDqagt0E7JhDnACYYKTmpWJwJmAmYBauUschV8wIE+Pee02D1JKqOttBD+SPdKFS5JzLNMqnSEJGeKs7lSK1P97pMlAuC5j52S0rQ6qMKdENc4pv3wpIpudcypb/txVPZHp5h46n6mDhjA9YUmh0+bQhblqbz3ieeQtp5UeTey5LSNmNFE0BzJwue/Wa7imHegaY86NTrV6l+TP5jMPqMRAIfqH/ntXPiYu/IXNOGvY57a6Jros/lsXTUexPjI6NlExMR7jnRsKsOU5DScT+g2f992k7UEgNmIacw3kYUGzrz6sylfA62jdeqVu3KiMqjyrUlzAqefm0wi+XfmKaGhzIu+SWsFbJgKmSDyfuTbealp3VgBVxVdg0ARgDVobVMW47YZ5o3PIsbmmcUCwm4sd3oTNrTvX9EMJoXmV+AxF+fY/OViZ2uVaGhO2HGdOrL9cmkT/erdaVDcdhObOVs1294+sfE5Jcgi1yT7Qsw9N0IA+DPYiPL8Rn6+aRA7iy7s8xj1/hMWJ4tcE+pL/V/SYCBXXzKpkNuzFlkkqRdqZiQta4Isvm+xp3x7XiY9fiT5xCrM7qMG+7+mmA2tt2vzAWDS+Yk1FR1R9pz4ONVncis64ZOmb4l2jtZDGWIDRKiJ7IgIaRPzinZqlMj3YZbU/jRPmcyuJQBSLvsemmg37Rst05zQWMrHkDM8HiKufBPeOVWkr0I8maT2mT/4I1mvsvOzd9B8jGJ1xBS67EeKAJx//C0aYvub2ET2ZVDz0bE7N/GB5LDBpdb3YYbK+wD5BeRQw7l63nZGlUudh7330pzQ8oYji5uFcUk+sMtzwNbaHITmnh0hAJ5DPF4jVbDm1kAOmDbQJk56vcnkI6fY9VbGompjHpH33W0mn5YK2jxoZnrpyzGTvOrgxtpnmLRh0Lw4sW8pFmyn3HbizXUjq4ihjeUUyazOiY+N98lS55AcRNN4HPJdoWqnYcvC7DNKjpjrlG9y/4h4t66+NQSACcLGmsV3srQe8D35su45mzbtVJY5s8eo+RLJhotokCbZN2rLeVt1dSekAuT0CDixSPSTWS6m/IV7Xs3TO5/4bY4yprlFbUTmCMCoJzLNA3tfZv1OltkZqbWB49dnTP3SNyphJ+QRG95cKNm+E7H3jRIAxClnkbN5UmmOYGcRsrg1Yfro0zV/8XTKbWWc9DgDjgjCxHbMmYq/gg2Umj4Lcm6TYVppssaXwfPqpc1pwhnLKWxrgRXCte8OACc46l8bjw3jJzdw8jo3PtT7Wd0Pw0/orqbehyuCkG3hTHv8B5aEBs56kQ9qMi72hGMNAfiq6bTf3k0DR1O3JKN4027RLjZhamDWG3V8tL7wv2mCPDaT5VIb6/eVCJQGYCVgVyxORexE1IQqnjpvX6Yz40OV7aTRZM1GM0cAOG6NhtpwYMo2aypkquQl0e41ajtqUTg0sYD0p4322ygBQLbUmxftkayK1LPCt9q3gXT5tz4Co1dzInFZ7bmE0dLvTn1Of1mYj9aExNlk+Jc0+bXOnLDUhjW/C/s0t7O54tDzyA+i9aBJQ7DW6/vc+PQEAKE0Z0c0G2z+yFsTNnZEfukb6cePJiETwlbfKAFA0JD6bFZck26Zdz4HQOZAeCCtWVM2d2igORDxMip8CzIZXoPz6Duq3IRAEYDzToVenefD8IEckl7VbOGkVhxh1D0B4HsgdnxUnA4y+6a2zmFNo/UsleP/YANp4h1ZRZ6fHyUAnrH55ZPWSFKZXnUukmIuXLI3XSBzTsJOPFsIssJc1OQhHUYj7xCd4LkmNhx2bA5tpxCOamzJ7OO0QmvEok9jg0hxAFuSc+PTEwDkJavmD7WXlgvBySayuZN8X0evOdhHwEcJgJwgvcpe20ZIzNJ4+J0pM0cHmG+cJXn1j4o9iZau3YfiOWvQPv+E0Xqr3AwCRQDONy0siL13O+/aPo66bxG1tVNfdkjDwnnrLklPANbYqdXNoS0nIPrcLkHR0vtHf+/Tydpc58Kr1LeGACAVvXOlRfBQCBOfDOaLJvtskLQCvKDzos7xi4rdJjZiajiET+/ASXXLgXCN+L4Rk3zVtNh9KvhTCww5oDLnONWNrjXIyRdNjnNOq/vk3Pj0BGAucucQpiORP/l5/hq9tkcUEI1gL6MEoNdEwHfOd+PYudFHLiE9ORx3tN4+f8karefoO6rcio+ywLo6An12P2p46vgR6TPSySEgdGZJegJAbZ0vGlp6vndCHCUAd5zsiswHnOdaVjyhbJnItPfLFJbDnLYiAOq32Wcny0Oqeir2vMDO5WfImPUe3u03Jx8Z8oybcEInuZw/YAl3vzsR2zibIG/8N9aKxCp5EZawiP/COYUZhnbEqdd/2YT3+Qu0djG5IBD7HOzOjU9PAHjnrxkPmQKFwDVhZrLJ75New4S0IW9zMkoAaNU4TjaBYR+WepV50WvcrHHZnj9aNw1gzl9yDPkdfddFlxtl5RcN0gadF+bGHm1jbLLmkhOn8Bxexi5m8Viym/YEYCmWv+/qWgJAnUhtza6YT51rIdySALhq1omyCX8LaslHzDTKmOQ76Eec7qhlpXWeIzbtFY+c7N1OgcIc505xfXNoF7Lvx1oMD20s+7QrW71jqR5e3kgADRgNAVV61qS052kvOM/xXbjV+PQEYI3tXNuRX6Qmh7zui6pRHoGEUZN9Drh+HyUAsn/maBMmSVEBWwm/nSWT5jHvWhPBc0z9F/tMEYDzDH2/Ca3xSNdCDm02+5xw5T7dXQJzPTknAbBYiVjYQqW4JQGw8FLH50Q6VOlOFb30p8rRFMJOtkwThxL65Hc5zSEaFrZ90oedbTVTxaTzK7lOwpmOZkq0Ra8ZED1AE9I7zJ0bn54ASFzjnow10hNqRMxc74Wqn79OE9ojGO0ziYwSAHkwcgbBQ3dbrOlXK9ubZY6pY+4ZZtI+GdFWdV90PUUAzjP8PZvf4q3Cg6iskYl9ci4CIFzJQt1v/lSAzA7UuOyZFjCLWb+Yn8oHoOHSh+yJec45ApQTLsdJsMkxlwhxsJQLgNOgbHyHtALew8mSanjO6Y3jlIxtW8ta2/XW7z9UHw936Wl71ficz8u58ekJgNA547dGPJNJg29iLhWvuPkcUmrjzol7+nceSwCEbua7Qtb0Za5s7zN01fra81ubKrZq121fTxGA0w9hnzFuyzcuLULnIgAS2UgclEWMNC1FvkRlX99PTQCoWrMtGQFhF2eWadJHW4geyKmY144bMnSn9GcufEudyKHTTW+SQJ7yMyMan7VtvI7l5xLJzKXPPTc+WxAApg/aqByaan3ob1Ts7wHh75PvDjmWAPQmgEN+BcfMDaY22s4mbr7MdxgcU2c9c0IEigCcENyp6v6j2/KN+0LU2jvOQQDYNKljc2yx++CFg41Kny99SxNAawM7cs7mJ9wvx8iL0Gihay5+kSd9y3z2tANMDzyxc0Y57XMttA0+ixTAOaf/qUIwR8fonOVkm5QVrsncSfXc+GxBAPSnzx9x3ylssvVVbvx8m6KYe+p/c3KfjGoAeic9FznlewquOsYiYPJ9Ib/Y+TFctf56fmMEigBsDGhXHe92tvvs+MNObvE6RnysORUw9T8VInPAnJyDAFAh9nnsneL6zHb7+ktNzjEvX7RyCgLQJ1XJKZjdxcCE0aS/be2Ysdr3DEdJquMcamhzESmRczv0dyusTQO9ZZuX6jKGHFwPhe0t1ZF/7/vue8mEQNlz47MVAegTGPXJfRDBfGfDSObOUQLQh+khFXwuDpkR14xbf4Mm8pL9ltbUVWXPgEARgNOC7ApaKXKbUD0L/csOPmtagFBQW2dHqUOXvJyDAMjaJ/1nE4uKBWkkUZFn5u6UPwUBoHZFxrKmosVV9/czsOHTrpxKvJcKO39/tA/55NfnuZcA6hRRAcf2kflJqmrOn66KpsaWF38LYSfP6WlFT/ADyHJufLYiAMZchEf2c6CZajlC+qRYS3krYDJKADir9jkgOFiOpOz2Ht9O1l5Zz3KGTE6zTv1Z1mav3GL+VB2DCBQBGATqyGK9anvO+Wxt1WKJOY41salZTOZY/DkIQE9yEJR8i+BS/5gL7tYVOgUB8Aq3H+YLe9xQRgWbF2QLGv+AEd+Ftvi6aGeU8LSuCgXMDmB9Uqg+q5rnbLb9AruE76l+58Ges0LaDGwAo5vJvnYJB5QqN2eCkx9eGFyWc+OzFQHQh55wtvnOTOT+hyajuUJGCcBcKmDpffnrjIhIjZz7oG+fsWMOzFeJH8rqOfLOKnNCBIoAnA5cpyFOMFlsPhK6XEXmTsz7QpLOQQD6W8Jkw5NudmRDlOLTSbufh4cWpTWZAHuc+8uVOB9Si+ac+yO5EsSuIy1MHdLtctI6FNI3N979/QdzV0L3BPKBHflbmkccEV3A49TH9CQpUbuydunZpd/5J/SmLFoAceXi94+V/iZG9exzdj0nPlsSgN7kZFw4jPbpjTmm5quE92E6SgA83xNumiVayXy98L73SMd7l/TjXCrz3seBiUNGzjWJsJjIrCPmrD/7TJzHzrF6bkKgCMDppkJ/2hS25GR5yJlntDXZYc0z+27MOgcB6D3stWfumtC+b/wZ5FOnmndFreQ8TQ6Fql2FAJjvFqR88uZghhg0mduI+7bfo7vgBJGgqpXwZ0T6yBDPsZW2O+RbHb3N1r+PmifY5c3BHD62FE420vZcRlIj5DML0ssB9Jhrh+8+mZOymcbi7+6LOY3MOfHZkgDAKzul2nyRNZsdNT2hUWEqop1akjUEgFd+f/XvSG4IxM7Y5j0DaUFesjAH9fdhjJDqVkefrljUBA3nFuvmEo4X93sRgNMMOfWlhSvfa917+17lzb1Dm9O2RRKbz3IOAqCPyA3/hCZC7iw0+zZEmhCx+VSFTiROpVnFO+f01eq+CgFQh6x9vO7nxAk2O+ftGyNJhajwc5y+hZA2ZOm0It8ArUe+lGnfHQ0SQHFWtKg2galQq7lERq0MUkVtnh1GbaD6ttVlRd7FJ0H7+nwFnAGljZaGOKu05/DURwmU2PTv3BWwCXIylRtg37PnwmdrAtBnnTR3RAy13BFrLhtaQwDgKKSwv+DKdyE51Zwp0bj4TrP936VC+crsPD73nzHZMBl5x741wTpCA+LbzPsSjZC5VHICBIoAnADUnTqtT+RhIbPgO31uIU4LbP853a6N0QeW5RwEwPvYENnTs/Cqv9+0Qfjoeb+z2wqFc1omEqFQJUurmq8V9ZvFyAbCrqjcw6ZnrkoAaGHUl+8eaO1ek9+9N32owymFNoZJwVgjNr4xRMdpzimK2aO/QMgVuvvSA3MQQ6hyJkPvQpIkXnGS5G1tLtBs8CW4a2eHVX6NrXfNHOWdT4vC7DMn7Pk0VsipMXTaFRVjM/FN0Lj0fVMPUsu/RA6AQ3IufLYmAK4DNg/bGux7zr4zPOpzCutDGKwlAMIKEUHfZBbaBloitn3frDZS+TetRCsrase4CyOcE+NrfvY3Qrr/QPQG8sDXBtkRbqsuJrU+ARSNCHPb0rXJa+ZrlU0IFAHYfjqY1BbzPJmdYLKaeYu3sgdTmTahKvPBZlXpuQjAvg/+UD+1lwqRHZf2QmTEvvmYk6VclQBoE3t971W+lG51ri9Upy4EOlYspC686dWofX18DbQ5m0nWvJPTWU/Q1jy/VBa5cUIc0Z4s1eV3/hE0QqORGOfAZ2sCoJ9S3M5d8GMuGuuRa5HVs5YAeIYmCnFz2+ga0Sak4NCNmuqjhTJ+jeyveYey1ky+Nb1ZbG09Vf4AAkUAtp8eTnh9itAtnP/6ljrpPaj7R3m+xbA3ORcB8D4LltNDf1qYQxizv+fk7d1+n1Mbtt+2JgA2XXH1WZymnZzXChu4DXZNQhUnGvZz3t+jWiGnNvHhwi7nLs6ZazftwL2nWwnX9mttecSXyUGfjiUCiLOQUqGzax0JT43PKQgAkmPe9+K7zddwL43FMQRAnUyVUg7TZs1pxPr3ujuAZmLJzNWe0y7mSnOwT361r0/MiTSKNIIjjsRL2NTvBxAoArD99LD5IwFNtnT+61v7kMkLvf27hDxUZk3OSQC803xiW7SRUvdbYDh0Uf064VP9uRBl7vRgARIyxMFOClzqdOpjXuy8oR86dWoLDYAN1LjkRcmpxgJ3jNj8JHiBvdOo9jsBSW5kEdN/7Rfjre/GpffXGH0vLY+rUmmUkA7Og/rh1Mj2Tn1L/UpjwBRxK9SnzCzwFLbopMlXgImgXQf98F3GOH+ogc1hRIUW5MGjIBwodyp8TkEAzBGasOwrpGtrLxo6lgA0GM1X7+RvQZvDp6OFDCJl/BH4nBzrP2LsrYktb4T69d3cpAVjehA+av0yb0edaTeYLpddRRGAyx7/S+0984xFp81/JxqbVJ04LnVGVL8LgQtEoAjABQ56dfn/JWK5lIt2augLgUKgEHg0AkUAajJcGgLU5dSaLWyR6pxGIKc0vTRMqr+FQCFwgQgUAbjAQb/wLnMuElvcRD6Ce104JtX9QqAQuEAEigBc4KBfcJellJUEpc17MenSoB7rkHfBUFbXC4FC4HZHoAjA7T6C1f5RBIRiPqC7SfHU8fGjbatyhUAhUAicHYEiAGeHvF54BgSkzhWCJsRIfLj8CP1VtTIVClWskKMzDEi9ohAoBK4fAkUArt+YVIuujsDcjXK5VmlX5TEv1f/Vsa4aCoFC4DZFoAjAbTpw1eyDCBwiAC6PkWVNXvKSQqAQKAQuFoEiABc79De641T+riCViVDWPyd+WfhcriJTYyX8udHDX50rBAqBEQSKAIygVGUKgUKgECgECoEbhkARgBs2oNWdQqAQKAQKgUJgBIEiACMoVZlCoBAoBAqBQuCGIVAE4IYNaHWnECgECoFCoBAYQaAIwAhKVaYQKAQKgUKgELhhCBQBuGEDWt0pBAqBQqAQKARGECgCMIJSlSkECoFCoBAoBG4YAkUAbtiAVncKgUKgECgECoERBIoAjKBUZQqBQqAQKAQKgRuGQBGAGzag1Z1CoBAoBAqBQmAEgSIAIyhVmUKgECgECoFC4IYhUATghg1odacQKAQKgUKgEBhBoAjACEpVphAoBAqBQqAQuGEIFAG4YQNa3SkECoFCoBAoBEYQ+F+6k82Qwlr8SAAAAABJRU5ErkJggg=="/></switch></g></g></g><g data-cell-id="V1Wl26Vbpgnno5Lb-wtg-46"><g><path d="M 245 370.37 L 245 397.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 245 365.12 L 248.5 372.12 L 245 370.37 L 241.5 372.12 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 245 402.88 L 241.5 395.88 L 245 397.63 L 248.5 395.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g></g><g data-cell-id="O_ELZSFbvl3Butg3bv_j-1"><g><rect x="180" y="324" width="130" height="40" rx="6" ry="6" fill="#e6e6e6" stroke="#000000" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 344px; margin-left: 181px;"><div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Authentication Service<br />(Keycloak)</div></div></div></foreignObject><image x="181" y="330" width="128" height="32" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="V1Wl26Vbpgnno5Lb-wtg-48"><g><path d="M 666.37 344.13 L 685.47 344.53 L 703.63 344.14" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 661.12 344.02 L 668.19 340.67 L 666.37 344.13 L 668.04 347.67 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 708.88 344.02 L 701.96 347.67 L 703.63 344.14 L 701.81 340.68 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g><g data-cell-id="YJRAzF6yD4Hh-bAvO1PB-16"><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 345px; margin-left: 684px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 9px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">JDBC</div></div></div></foreignObject><image x="672" y="340" width="24" height="13.25" xlink:href="data:image/png;base64,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"/></switch></g></g></g></g><g data-cell-id="iy0HhJzZLXsiPmpU2ukH-6"><g><path d="M 595 364 L 595 410.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 595 415.88 L 591.5 408.88 L 595 410.63 L 598.5 408.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g></g><g data-cell-id="hBEam5F8n4ZBPeoiEcWH-1"><g><rect x="530" y="324" width="130" height="40" rx="6" ry="6" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 344px; margin-left: 531px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Metadata Service</div></div></div></foreignObject><image x="531" y="337.5" width="128" height="17" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="YJRAzF6yD4Hh-bAvO1PB-15"><g><path d="M 308 248 L 329.06 248.04 C 329.07 244.14 335.07 244.15 335.06 248.05 L 335.06 248.05 L 340.06 248.06 L 340.06 294.06 L 420.06 294.06 L 420.01 317.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="1 1" pointer-events="stroke"/><path d="M 420 322.88 L 416.52 315.88 L 420.01 317.63 L 423.52 315.89 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 294px; margin-left: 407px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 9px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">Spring AMQP</div></div></div></foreignObject><image x="379.5" y="289" width="55" height="13.25" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAANwAAAA1CAYAAAAqEYXLAAAAAXNSR0IArs4c6QAAEzZJREFUeF7tnQOQLEkQhvOdbZtxtv3Otm3btm3btm3btm3jXXx1kR05tdVdPdM78/rmVUZc3O1ud3VVVv2JP7P7+vTr16+fJEkaSBroiAb6JMB1RM/pIUkDTgMJcOkgJA10UAMJcB1UdnpU0kACXDoDSQMd1MAAA7jNNttMTj/9dKfaLbfcUk466aQOqjk9KmngPw3kAu7333+XW265xf3zwgsvyPvvvy8//PCD/PHHHzL00EPLyCOPLJNMMonMMcccstxyy8kMM8xQa50OyID7/vvvZcwxx5Rff/0126Nnn31Wpp9++tJ79tNPP8mwww7bcP3OO+8sRxxxROkx7IXHHHOM7Ljjjg33Mr8hhhii1Hi//PKL3HnnnXLXXXfJ448/Ll988YV8+eWX8tdff8lwww0nE044oVvfEkssIYsttljpcUPrzJvQwAMPLCOMMIKMNdZYMttsszkc8Lw+ffrkriEIuPPOO0923313+eyzz0otnosWXnhhOeecc2ScccYpfU8nLxyQAXfqqafKFlts0aDurbfeWk444YTSWxA6iBy0Dz/8UAYaaKDS4+iFM844owB6K2UA99tvvwnrOeywwxzIyshoo43mwL399tvLoIMOWnhLM4ALDTTNNNPIhRdeKNNNN13wOT0Ax6SOO+64houxjlNNNZXzaoMMMohgMV9//XV58803e1z32GOPyXjjjVdGDx295rvvvhOUiQwzzDDOMg0oMtNMM8kzzzzTsNyRRhpJPvnkExl88MFLqSHvIN5xxx3O2DYjr776qkw55ZQ9bokB7qOPPpJlllmmB1AZiHWMOuqozrsARCI0X/B41113nYw//vi50/XXOcUUUwi6CgnzxSmhRyt46bvvvlvmnHPOHrc1AO6KK66QVVddNbtogQUWkEMPPVRmnXXW4APfeecdOeCAA+T888/P/j7PPPPIAw880Iz+07Vt1MBzzz2XhfsYGf5577333BMvv/xyWWWVVUo93R7E0Ucf3R1qeibWWmstZ9GbkT322MOdKzwjRpxQECkC3Ntvvy2crU8//TR7FMDZdtttZfHFF5fJJ5+8YQqvvfaa3HTTTXLsscc2AAKv/NBDD7mQMyQ+4K699loXKhbJBx984DgBwuS///7bXYpXfeutt3qE4Q2As25+0UUXlZtvvlmIU2Oy9957y0EHHZRdduutt7q4OUn/1wChoxJEgIODwMFA2OPbbrut1CTtQZx00kllxBFHlCeeeMLl81h5ooYyAkg57HACeN5vvvlG3n333ULA4a3wFtZL77TTTu7MxTw0uR7h5GmnnZZNj7CPuYfyxVYApwNfeeWVDQbs4IMPFoyLlQxwLBxro4KXwqKUERJVNkEtJ/nCySefXObWdE0bNUC+g0X/9ttv3VMIpwi75pprLvczHoaDXybvtgeRlGHjjTcWDC1ChLPOOuuUWgnnar755nPX7rXXXi7v15Asz8Ptueeecsghh2Tj899wDM0IBM9RRx2V3UJkpvO341QBHOMsssgijsxBZp55ZnnyySfDgHvppZcE5KtgtQgdysqDDz7oGKJpp522Abh6P9b14osvdj8CRkCJ9bngggvkkksuEUKGr776ylnOqaee2oW2G2ywQa6HtSTImWeeKRtttJG8+OKLzqKwyM8//1z09zwzRppss802cuKJJ7r5YQ033XRTFzJdf/317lAwNuEMVnHiiSd2bBThzCijjBJVEaE6a3/66afdGrmH3GCTTTaRFVZYwa3x3HPPdetFVl55ZeGeqoJe11xzTTcMoSQ6gTSYYIIJhDAIwUtwoGNiDyIgvv3227PzsuCCCzq2sIyg1zPOOMNdSr6PHjH2SAhwMOMAHN4AIV/k2UVMYGgehHoYGhhNBMb1448/7hHyVQUc0QRRBcK+wupbUinzcMSbeCkVDi0I7S3BIp511lnZJnO4llpqqR7JvH0eIQchT+hQW3IHtm2hhRaSWWaZRX7++edsiGYAh8WE+UKOPvpoZxBWWmklF1bnCWQSBy1EAHAPc1l++eUzixcaB4t41VVXuUNImISst956DoBVhRz83nvvdcNgkNAHYj0GxgPyK3aA7UHES5LDcV44NxwoADz22GMXTpnDN8YYYziPO+644zrvysHXPQsBjr3FsKmQk+YxgDF94RTmnXfe7DI1rPa+qoAjb1x66aWzITGwNnLMAPfnn3+6g41FQZZddlm55pprWqJ8QwvffPPNszh6l112cdaN8AKPNv/887sN4NmwO2p9GWf22WeXhx9+uMc8LEAOP/xwQZks1kozgLN56IEHHigk3Xgl5gcosOrMj7nwNxXyXjxXSGDUbrzxxuxPeG42gzFheSEt2GDyXXKUffbZx12L59MifewQ5f0dQos6qb4Mgn7mnntud/kbb7whk002WXbrfffdl4V5eePZg8j88Up2DzBWu+66a+F0ISDw6AjG5cgjj5TBBhtMOHtICHBLLrmkqwXrWXj00UdbVYm7jyiOaA5hbP/MVAUcEZElWfDM1AVVGkgTG3ZxAQeNEgHhT1Whu+OUU05xw2AJcedYcsI4m3ATlrIZxx9/fPZI6oLrrrtuwxSI/0lKkQ033NCFfRQf8U6AgHEII4Yffnh3TSyk3HfffR3jisDKklSvvfbaLvz1C772oHH9I4884hoArOCZYc9UOIzkHja8IGxncwhz0DF0OULYZZP8VnRv9QPw/BIO4RXzRsi/LNMcep49iOiUMssrr7ziykUI/9aDnDffFVdc0Rlx5Pnnn3fpB2UmZfZ8wP3zzz/OO/AshDVhDKvIDjvs4JhLhH1VB6NjVgUc53a77bZzww055JAubbLSADjCBMIy62G4mIOMNSBsI8yMFQ9DCtlqq60aiBQOKFY3xIJilbH4eEEEy8y1Vvbbbz/Zf//93a+wIHggPM1QQw0V3I8Y4Ox4DMBaqTGFQi1CIyhpbQzAw+K1rRAh3HDDDe5XrAUqOjQWngKra2s5VQHHAWZ+GDWEQ8phtUJ4T5iPoDPW4hsWe30IcPyd86Aenn9j7EICaAgnYRxZL91LSBHgOIe2ZoY+bbgWfFDkl0QVq622WnYVOuLsqFQFHPnsPffc44bjDCmBouP3KHxDXpC7ECuHBNQCQGJhcgTAUKZ04AMOVw6I84TajjJfeAVqNbYA6QPk0ksvbVCkP26zgIvlsBAb5F6IzY/4GXaQuWorFaHpGmuskbtWm2hzUVXAkXeSHyOAHPbYb0b48ccfHQDUApNDKgBDE80DnLXo5Fp+04SORXhPqIzQDgZrGAMcnSgWwE899ZQrJVQRP48jksHJ9AbgOA+cCxWMGtGXlWBrF+EYIRr1GnKNIsHlQwzgqotCTws4LCmWHeuWJ1geS1f7ZQoLOPIAxqMmlCfNAA6Lp94hbzxL2visIuGS7VOE3eRw5wnWHz0SQvUG4NgPSgBIEYNIyHzRRRe564g4NMRsBnAYQvTFmaHGh95C+9q3b1+5//77exAsRR6OfB4voQJBA8lTRXw2Hm8Eh1AFcF9//bVLjUgZNB+FSOMc+LqIvi2AlcFiwnYR4vkxqU4US8oG0ucWCuss4GKbq2MCIH2eby0s4GyI0huAg3omnCwSCA7NJwgf9YBzj+3Y0XwndkhsaFbFw5EWYKh044kUKMmEhMMGIFXIIf2OjdBB9NdEmKfkQyhyod+S0JBUwTcARYBjDyjOq5CHko9WEco75I4qGAHLXPohJdfCyoaE1AJ9Q0LZL5VAPmK8LOuf4aSZTyywibh1vA3MFpO1HegMimXnb0pW6IMs4GgnIpaOyUQTTZR1IVC0tN3lFnDUcoroe57TjIcrUwezz/cBBzkESYTg9SEXYkLdUWtvVQAH86f5JLkt3jUvr+WQoGNtWCjq/s8LKX0DE9pbGEwtVFPugCxTKQIcjLAyq1wfC/NjOubvfkip5E3IsJQZz7+GfJ36Z16/ZtTDFT0UsHFIOHy6aVxPLqDFzRDgiGu1Jlc0PjT6yy+/7C6BIFHanJ/tgS8DkGYAx+G/7LLLCvVdBDh76Mk5MFIxsWWTKoDDQ2kaUEbPdh2EvXijUEhYBDhyVmqShMY0BkDAWIOrVDz5P8V3S84UAY6WLwyCSpm+xpie/fYryCrm3grgiOpYJyE1QMPYxBq5KwHOTpJQgQQUIaei4GcVaz2cTzLkKQmqWb2Dz7TZg1IGIJ0EHKzlbrvt5pYVau8Jrdfqp1XAwYSWbcfL0zl1JOqHvhQBjmshRLSwbuuftnkadhByy0qsLEBaAaARdErTcxWhPKPv8NFJ5b+CVpWljM2tVwDHQ6glUaRWIeGFxVSxBwrGTtu8iiZoQ0oIHIgKlToDjgSaVjEEL03eEJPVV18986qtAm799dcXapZVxA+PrVFVAxrKS22oZt8YoaZKbRQh7Cf8Lws4rlOyhf8uajIou2bOqLZ3kXtq6Sa0Tn7XG17Vzq0H4MjTWqmzcR+d25o8+q9+WMABRAAZE0ua0HMJKfN/ABxz1UI9zB1hVEwgkrTu2ArgoPkJjbRNijfwbX2p6PmwbPpsPA5MI/O2EvNw7DuEBh0uhFrkjoxBB5GOF2Iwizwcz7fRAj/7NH5Mr/bvPkMZarruiIej9oarpnAJU0XsbOPaMotio23HCA2mdKqoWMCRK9j3mkLj83d7YHxF19nD+aEd3QyxojLtUlDrSCuAI2fmPoS6KH2Ksd5G1bsPVp+g4roY4LjGduvgacknNerB49vuIX12DHDkWBAQqhuMNf2rsd7P0Jmivnz11Ve7P+GlOWPklXmGpW0ejnwLEGiLDa0p2v5SBmxcQ8sOrTsqbLgttvqF71gTqu0IwHNihW2drc6AoyYINazenjYvS2/7Oj377LNd8VylFcDRjqavglD0tj2cZfaQZnJtmKaGpGSV3lsGcLYBnnwNj6fvSeYxjDHA8XybH/KzLZyXWRvX2KiDnyG2tFm844DjgeRVmtBiPbBQZd9xgtkibgdkSKjO5gMu9qYwBU8NO0NNpnUGHDqge0HZyaIyCN6PWo/qrhUP59eWqAmSizUjPgVPiElHUTOA41rYOhqMISR4DYh8iUZp2/Bt51UGcITkMJ36Zjj3U2qg/FHG02HQMGLqUHjbgL2JsbFt83AMTN8aSSmeRAWPRShAo2uofQuXTM2BxeMlEa5j8+xm8XsLONqe8AKELnSo+Erz4/ZQsl13wPmvlVjmTvWLrumeh3DAQ2ky36yHIyLRcI1UgL0s6uLJAyI1QwWG/8ZCGQ/HuDRdU+JA2Fe8fNE7d2UAx1iEkRheis0q6IwwFobcf/MbToF6Md0f2tvIfURdhPzkliHpSA6nD8YyQQkrePT3hHJUzWk/glAhX6PuxkddbIWdv+EZQ32DFnBsCKCkgRXLhSK1jsOrGHrweH7Iu/H7ugOOJl0YSsIsFaIA6jTkunQnEFHw+gZFcupXyuY1AzieQ66mhpICs307uhkvhwHUHkeK5lDmmuOUBRzvurGX+hEfQAeRgrcLSVnAcS+Gl7Pld/ijT0pISvTQ/UE5idzUCmeN1KeoW6WjgGNyMEkonRxKe/vKbBrtMeR9ed3iFnC83EnXCOD2cwX7LChhcpHQ9zLqDjjWAdgIjW246OsSXeANqQ+1Ajib63K4aX9qtd/QbwuzzHBZwLE++xpO7KNSzQBOdUrUxXdzygoECUaNxonYN1A6DjhdBGEJRVDCHZhL2CImAwhh3PB2JNcUdlFw3lvPOp4FHEVoei7xlGwqXR0cTv3EAjkNOR5lgLwY/f8AONbOGgEUeRVgoDuHXkdyPMCmrUsYIP24DxGAvjsYO1T2Gxo04drwKXZv6O+EuNSeEAyevjHeDODsS5i8SKtvCVT1cPZ+SDfODZESnTV0uWj/KNcRMuIEWAMETtmPHPU3wLWyWUX39EYnRW/PqU7j2W994O30cw91mmOd50LZAKJGv4/CZyTsl+TqMvde6zSJLSgBrlhD1lOF6mAx/aa///deIowkQh5JPTkWQnZabwlwbdI4lpb8lHCcZL7oY6L0CmKdlQzw39Fq0xS7blgaN+yHr8jZ9KsAdVlsAlybdoIaEcVVzSfI3/KsLd9NIQJA+Jwd+bLfAdGmaXbdsPajQ+T/RAu8iV7mqwSdUEYCXJu0TD0LqlqZXt7CpmRiv+DEoyEYaFzW9wqr/B9p2rSU/9WwlCDwcvrxWzV41JJhRGGMqYnar5Z1coEJcG3Utv91L+hpvuRFbyBhJG8F2y/zUnjm56JPRbRxul0zNHrFwOX933Wa/V919aZiEuB6U5veWDQFwJbR+6dtRXmPg8Lm5Ui/S7+N0+vqoWkDo/uG129ozkf/lLKIOiBW8jpN2q2UBLh2a1jEdT2wyXySgs2nAwIvRsM4fae8QGu/YdmBKaVH9CcNdAxw/Wl96bFJA7XSQAJcrbYjTabbNZAA1+07nNZXKw0kwNVqO9Jkul0Dfbp9gWl9SQN10kACXJ12I82l6zWQANf1W5wWWCcNJMDVaTfSXLpeAwlwXb/FaYF10kACXJ12I82l6zWQANf1W5wWWCcNJMDVaTfSXLpeAwlwXb/FaYF10sC/noxASVgUjlMAAAAASUVORK5CYII="/></switch></g></g></g><g data-cell-id="AQz-Vj6r_5Wor37pQVs6-1"><g><rect x="178" y="228" width="130" height="40" rx="6" ry="6" fill="#e6e6e6" stroke="#000000" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 248px; margin-left: 179px;"><div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Broker Service<br />(RabbitMQ)</div></div></div></foreignObject><image x="179" y="234" width="128" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAgAAAACACAYAAAB9V9ELAAAAAXNSR0IArs4c6QAAIABJREFUeF7tnQX4BUtZxj9JCekSFKQ7BCSk4dLdjTR6kQZBpLsUpKSbS3e3tCIpiDSIIN1Ih/u7zvh8fnd2d+ac3f/Zc877Pc997r3/Mzs7887uzvvl/I5JhIAQEAJCQAgIgb1D4Hf2bsaasBAQAkJACAgBIWAiAHoIhIAQEAJCQAjsIQIiAHu46JqyEBACQkAICAERAD0DQkAICAEhIAT2EAERgD1cdE1ZCAgBISAEhIAIgJ4BISAEhIAQEAJ7iIAIwB4uuqYsBISAEBACQkAEQM+AEBACQkAICIE9REAEYA8Xfcem/CAz+xs3p9eZ2ZV2bI6azn4g8E9mdn431TuZ2WP2Y+qa5SYQEAHYBOq655QIiABMieYR+zqymZ3ezM5iZic0s98zs2Oa2c/N7L/N7Dtm9nkz+4yZ/XDeoex87yIAO7/Ey5qgCMCy1sOPBuZ/h4bh/TZ9kH9sZt80s0+Z2cfNDI34Iw39bFtTEYDpV4wN/rpmdm0zu6SZHb3iFr8xsw+Z2WvM7MnpGay4TE0cAiIAehwOFAERgAOFu+lmrQRgqPPPmtl9zeyF3b8hCrskIgDTrubNzAxMT75Gtz/rSMNDzezBZvbrNfrZt0tFAPZtxTc8XxGADS/AwO2nJAD5Nq8wsxua2U+XO+3mkYkANENWvABT/xPN7NYD3f3KzLAwscEfI7kDjjTQHuvT1cyM6yTjCBy7I19Hcc14T3G1SITALAiIAMwC6ySdRgLAh+B5Az2zlnxATpL8tfy7JC9Npt1JBrmATkQAplkENPZ7hK4w67/SzF5mZh8wsy8Gjf5o3TN5OjO7WPfbn4UAttzVk8zsL6YZonoRAkJgSgREAKZEc9q+IgEg2OpEDbc4j5ndxcyuX7iGKHm0s10QEYD1V/EcZvZhM8MKkOVzZnYtM/tYQ/fEDTwtEdF8GS6nPzUzzNsSISAEFoSACMCCFiMMZV0CkLu7Wxe1/YjQ9y5ZAUQA1n+G47OGmf+cZvaFFbq+jJm90ez/nTTK/19+hb50iRAQAjMiIAIwI7hrdj0VAWCNyQY4qxsPWQInXXN8S7lcBGD9lfikmZ3ZdfMUM7vNGt0+uyMPN3HX40o4pZl9dY0+dakQEAITIyACMDGgE3Y3FQFgSI9K7oA8PMyypHb9sme8uAhI58ryqhTMxf8fP/mKr2xmpzaz3zUz/3sfBOSPX8HMLmVm50vuDPLKiRLHvQEpeb+Zvb3zJb+hIfhpHQJAupoPemOjwoyNhWRIjpeKDV2285Gfy8xObGYn6DD+kZl9O+XFv8XMXtsFXZKBUSsf7HDHdZPljzvcP5r+53JmdvvOdfMn6V4E3/nfa+9Rase4iR/JwuYPCVhVmAPFmT7RxZv8W/r3pxuCAZeE7927lNrrOSAgS55Mt2DEWmJZyfKi0Pc6WQBH7dwsPCNYWi6YCD7vFwGb30opmm9KmUA/aRm0a8t7S/+khv5Beu6JA6H//P5yjzc3vL8rDkWXTYGACMAUKM7Tx5QE4K+6qO2Hh2FCAH7RM/RDzIwNLAv/jWn3ZN2/35c2fn/pEAHgA3G7RBpqYxi+klLR2ITG0hZXJQD36nzeDwzz//OUw963opCdO5sZeB63YtkhFM9Nm2GN9vueDvcLuX75b/BmE3pY4X5TEQCIoI8+P7TbQP6hYn5TN1kivmx0ngwzZwgARKBFztDF40CCvMRYnFUJwFXM7JFmxj3G5HvpXXxqxbuV+4J08v24xFjn6fcvpWf+sMr2arYhBEQANgR8xW2nJADkY9/T3RMtFa21T9h42Iyy8N8XSR/CUpndPgLAJvnypDFUTPkITV5gZjcdICpcsAoBwDyNmdoLGutDBgaJNoVGf4EVJoJ2BIEaC6iDaEG+svDfVNdjYyil201FAP6rIz6/7+4LNuB+kLJUfLFgfC1VQcx4UFPjAY3g3Dtcg9ZMrQWfIrkKAbhfqvHROJzDiSk1H8bqNJDdQWCnJ4i19yID5LZmBhGWLBABEYAFLkoa0pQEALO6Z+9jJvvzmtm/OGio8MaL7CO5s+mefHD6J9/bCx8MiIOvbc7vaAfP70jBu8zs6ynyHMsCZkU25pi+CAm4wcAytRKAS6cMCEymWcCauut9cqyUBkc5XC//ambP6cyi/5zcGMfpTKxnSlhcNQTCfT+Z74mu7xMIxhXdj7hZ/rJzjeBqyAIhwHKDmRzNLLsI1nmSqQ/h149N6cJpXuv0W3vt0vHFGoJ1KAuujbPXTi614xrvOnhsodJnKwGAtPL8e/lucsmR1YFrDdcbRBHXFu47L49LbqW+qUAQnhF+5NnjmX99epexHkEeeV5uYWanCO2fkJ7hRrjU/CAQEAE4CJRXu8dUBIBNImqQbCxsNn3CB4MPSBbMnZCAG6dccMzgpBHmGAI+4NSF94KWhHbihUIzdx0oRMQHCu2T8XkhHY1c9JK0EAD8r+9OH8XcF5oQWs6QqwFNxgfF0favk9m1T7vBioL1wxOaf0xEp+9eEDPMuVm4B/n5CB9SYjkgUAiuFfrpi+Pogav4Z/B9SfiFTABcN6zHmBum5V6ltkvHl82N58YLRC+a9PtwYOOHAHjhvSTmw0sLAeAdhXh6IvviRFQw80eBMEK8icPxgmLAcxmF+g6QS97tLHwHeD45+6EkuHAen4iA/x1y/44+cPT3zSEgArA57MfuPAUBIECNjdqXda05LY+8cG+uRlPnQ4DrgA8XmsWQ4F7Aj88mlYWPE1rImPAR4cPGGLJwroGPUvd91BIAotAJMvRYQIKuPhKcdu5Efvw9cafkjXloPgRNYQXxH+lrJmJQug7CwHiycMAOfl3qOfzdGHBr/o5FBjdPFEzgz0zuH8YztWwDvnwnKYJ0Kjd5TPpR++7DBncB7bP8eyrWFdu3EAA21Iu7DtjEsW4NVV3k3eJcEMhLlhzfE8cSySgxLHxP+AaMSbyWLCT/Po9dr98PCAERgAMCeoXbtBKAXAkQcxwv6jVSIRdf3IUPDJHCPxgZz9lS6mBshh/bBwf2dYOWT1BSFqoYolFACmokZiFwTQ6Ii9fXEAC0n/eGjy4bM/MZK4v8dDO7ubspWhFR7rV+zZhpgOnUm/n9fMg+gCB4YdxooHMLlgruxTr1yZeTJgd2BCeyka1rHdgWfGOlRAgy71mNYCnwAXp9BLKWAHA6YyRjJYtCaWw3SoGp+TeeY9bek3qIDjUgfNwJ3xNcRTXyh+l6HzcAGfZuxZp+1GZmBEQAZgZ4je6nPAuANC/6Y7Psi/z3Qy0RAPzdPoVpaGq4DzBRZhmLOYh98eEhcI7AsCxowGjCUcYIANkOpCVd1F3IXPj/MSLEtZhTiXPIQnBcDCAcwoJNwp/GSOwEJI0gsCglAtDy4V3jcTv8UlwwZF7gEqgR/M0QAczjpG6i6bXINuFbeifY1MfSPOP6Q5j+qCOVkKkotQTg/h0BvY+7GILhtfqhNSBd9a1pw2fT5x++DX4eMWARMgAxbCF7lJAmDibLWLxBy3OjthMhIAIwEZAzdDMFAYDdY3rng4EZvVZKHzs2Wm/G7OsLMyOEw7P/VfLKGTfH0WbBxFlKQxoiADzfBBF61wP+SzRq3BpjQgCjD3zkA0jAIuSkVhgDUeS+8BIWACwBUSIBwHICCYrxFbX3XrUd+LDWmJRbvhFsargx8AP3+Yn9mLYNX4ijD/6rcQVFy0HfcwwutQSAXHusV1mIrSFIdyqBzGEpXKd/zn9gXFnQ/rECSBaEQMvLvaBh78VQpiAAHij86uT+Pqsi9adEAGDzr65AnjQ5fO1eKEzSWgs+ajlo65jyowwRgL9Nefv5GjZ9XAm1JW4pvPP37ob4QckLb5X4waYGAamZUSIBwHKAj3xTgqaKBQLCAm5o7DUC8cRcjJY6lC+/bfjGegw16wMROo0DDXcSMRUlqSUA+OG9dewOXXEosgqmEqwCWAqy3CqlArb0zzuPdSgLBYnISNDJkC0oztxWBGBmgNfoPhIAfNVjgWD4+3nJ8omApK3FNUaL4aM+pKGVCEBt8RO07ReGeRMUWBM85C8r5eozN6LTvfQRgLi5kIbHqXXMv1YebWZ3dI0xkw4dl9vXL64LXz+BaGx8sVEiASAy/zq1g525HW4QNDiIAIf7QPT8JlS6Pe4mNiei/EuybfgSSEoWhn+nMI33vUv45TlFMQvvMBYkUjlLUkMASDWNrqtacl7ziFC7g3fFC+mGfjOv6YdnI1bUJHZhKA22pl+1mRABEYAJwZy4q9YgwNLt8TWTyxsr17EZ8wHv+3CVCAB91ZjN2SAJfPNCFHwr8ycvPQYdkWNM0RovJQKAhoULwQcxEeVO1HSLH5N+5iiI05eJEQkAOPr884kfsbW649uB3xl3AXUKcBewOZXklmZGsF+UbcQ3ZktwhHKsspnnGUtwQ4xLp3Pm9jUEABLyHwHIKdPsCADMqaZrPSCFi2sDFae+r/rrQUAEYLmPxhQEIM8OLYXAH5/GNBTNXiIAaAZ9motHMZ4+iB+buIBWYUMheM8LFg0iz71EAkC6FmSldM+hj3VpfDEtr3UOfe0JmvNBibldJABoyNRc2AY5ZirYRP2H6CZB80X7i+WQtxFfCJkvk0wuPxtbFL6tbNRExGfpi/3Iv9cQAGIQohULMo+LbwqJKcBT9Jn74BwQioZJFoKACMBCFqIwjCkJAN2z4bwz3AdtJJrraVIiACXzewm9mAKIGbjWd+z7I8gJ37mXUvGVSACGVrS1wl0MRJzqaenzHUcCQAwDeG6TcKgQ8/DVCxk/R1LjQ/eyjfjiG8cS5ms7cChW1Jpxk5BWmeUbiRgNWcJWJQB9KbKrPDeQbGo/zCFTuirmGN/e9SkCsNwln5oAMFNyl31BDqrrlVK+1iEABAzFk+RWcQFQEAcN0UvJDdFHAKiQh/aM/51gtixYCEhRHEsBpD1Bk5ivs1B8BXPrXLILBABssAbgXsLfnaVUPndb8SUY1lerxOqFud8LwaPEoWQZKzdNuxoCUHIBYC3DwjeF4GaL9TqIncH1IdkxBEQAlrugcxCAWHQFE6XfHDMa6xAAgtY45tQLKXAtqXNcW6pDzsYSC/eUCAD56QQ6YvFAE+Pj5QsixWNY+54Cihl5DZz6Bv643qmfnl0hAOCCX5zYkywQMl8Zkr9vK74cD0x6aRbM7/6QKGJP2ET9AUs8N768dunZqSEApSC9PkveKs8nFT9joC3lf+OJiKv0rWsWhoAIwMIWxA1nDgJAFoE/9IZzwX2t7ykIAB+6WOOcErP+dMEa1DmZj1r4WSAQPpc+/z0SAD68aOlDhU24ti8wzY8tBjSSHlV7pHHNHGObTRMA5taardE3z1IwKM+aP4t+W/GFiGLSx92RhfiaXNwHjdnX1ycV0h8E1IdZDQHg2pimt8rphEPPZzwdEksGhXwkO4aACMByF3QOAsApXhzokwVfptdSpiAAmPspBOT9/hwqQ3GYFkHj8KlzfZHzY5UAuScaGeZ7H3jHRsSphzGo0I8xHorEbyV/b8u8htoeNAGgSh3FliBt/EOqHyRrisJDuF+IYciC5YaNc1fwje8SpzZyYBPCs+4L80BkH1bxkNQSAIJjMftnoeqeP0Ni7Fak6PkYBt5Xv+axlv8mjocem4N+nwABEYAJQJypizkIADm4p3Xj7TNpr+MCoHtyhikEkuWNXZTy5Rtwgjyg5XjrRN/hKzUEgFsTjU0MhD8SlWhqqtFRpKQkVDPEnUAAZJY5D+Y5aAJQOnNhKm2P+BLcMFlK5Wq3GV8q5VExL0smqHxT/9Mdi0tRJKwDNedg1BKAeLgQJnusN2Tc1AjWC39K5Q27swoOcxfGgke8ixyiVVNGvOb+arMQBEQAFrIQhWFMTQBIQYpHABO4RABTlHUJQCwDSuQzEfw15WEZC8fzUrEwC7n7pJGVrq8lAPTFhhSPFR47rzweVcsYMOfWfmy5L7ijYaG58Q8bREkOmgBAtDD3+qpvFIGh4M9YjfuhN6d0VG1fRsO24ktMCdjljRSLEjhiVfFVL0l7I/2tRmoJwBkLpb1JT4z1N0r3ZG1jyiCVCgmOzUIgIPFBPm6mxmXm70cWD248nneyeVAKpji6ugZHtalEQASgEqgNNJuSALB5EhAXzf19gUnrEgAKwpDz7X2kRE5T3GesEA8aOmlyvmYBHxBfm9wvRwsB4Lp4Oh9/w3yKGbUkHIBEzQQvLel5uD98mVbOBWBupY/hQRMA5kSlQ+oNeMGXTXbIKqe3sfljQvb57xyABI6l9LJtxhe/OKb/LJjlOa+CMwKyEMzqyezQp6SWANBHLEiEO4/3ORbK8vfje8+GfIj7Y19NilijASsA/cciRKX5QISYC9+dLKu4AYew0m8TICACMAGIM3UxBQGgIAuV7DDp+c2YIT+j00Rv0TP2dQkA3cZSvPwNbY8Np097ZtMgN9xHVNMWraWvhG8rAcAPTZDimd3cMfOzEfWZaSn8EivyYT3BLdHnPsDHCu6Ya/175n3FEf5NEADGCTn0LhvGhdWGksUQJjTGoeOPmR8bP0F9bHgx2n/sIKltxTeeewExhATkVFusAqRC4mOvkRYCQPEhztzwWjoEiyyc0vkLkHLev1iJEGId620wVlyFEF//3aDWATEjMcjXz41vBxkS/DsLhJL3zQeA1uChNjMjIAIwM8BrdB8JABvh8yr6Y4NDi8bkjqZZWmM0Oz5UfbnwUxAA7suHxQcrMXziENCIKJJCZD/jJbeZwjH4ImNWAoTBH8gTIWglAFzPZs+m5gMV0YTQ3tBWozBGMKNIihc+bPhOMW/iVyXYEF8phIVUMW/F4Dq0Lz64fVaQTRAAxkVQGBplnF+eK24BCBjuD54ZAvrAjk0F8zHPi/cpe4wgEZDQoQI424yvj6tB+2b9s/Bs8EzXSgsBoM8YC8DfsCwRm8B68n7xPqG5XzPEv9B2rNQ06xYPLoIIEqDLPxyqBbkhRobvDc82cSW+BDfjwR3gsyJq8VC7mREQAZgZ4DW6n/o0wDwUXlw+SkNayRQEgPsRVc6BNsQftAofGlIWx045W4UAMJaShYITCO/XM1A2SbCLmnLtvCjUggtkKMJ+UwSAOaDpEQ/BIUxTCCSBEw/xA4+5fbjftuL7wI7ccLpjSQh8JQC2VloJAP2SXRArLNbcD3LCWpcIr7+eNk8LWQM1/dMGjZ9vTZ97rbYftZsJARGAmYCdoNupCQDmPDSGeMBOaahTEQD6JtL70PSR5FTAGsE6QOoUWvmYrEoA6JfgPE9O+BhSQ6Cv6hnnC2CRoMCNzyYYGiNaGJsg/uIhMzp9bJIA5DlgvQB7cPGpYmPrkH/HnQLpY11qIt99v9uIL5pvKZUUixDBdGMbrJ//KgSA69HuKbzkM3z61ov1IUahJmAw94EFAaLhYwfGngesELwrnxlrqN83h4AIwOawH7vzqgQAnzRmWl50yq+S6keK0sfHbuh+n5IA5G7RMNlUMPWTfw8ZIFgI1wbFZ4iMx0yIxoRvs1bWIQCMAdO2L1nLpoWLAPz6BNM3c8G9wceRftBg0XQ5MImIalIOcYGAfV+cQOx/CQQgj4k5YrqlkiJR5wR0HS9ZCjD/Y8kg/ex7KSKdZw1XCFHv60Z7bxu+HzKzc4fFXOUgp1UJALeGrGFx4B+sVLhkeCZ5v77VlS5mjDyP+OdX9cXzrNM/rjLcWzz3ubgTRPdTybWHksF/SxaOgAjAwhdIwxMCQkAICAEhMAcCIgBzoKo+hYAQEAJCQAgsHAERgIUvkIYnBISAEBACQmAOBEQA5kBVfQoBISAEhIAQWDgCIgALXyANTwgIASEgBITAHAiIAMyBqvoUAkJACAgBIbBwBEQAFr5AGp4QEAJCQAgIgTkQEAGYA1X1KQSEgBAQAkJg4QiIACx8gTQ8ISAEhIAQEAJzICACMAeq6lMICAEhIASEwMIREAFY+AJpeEJACAgBISAE5kBABGAOVNWnEBACQkAICIGFIyACsPAF0vCEgBAQAkJACMyBgAjAHKiqTyEgBISAEBACC0dABGDhC6ThCQEhIASEgBCYAwERgDlQVZ9CQAgIASEgBBaOgAjAwhdIwxMCQkAICAEhMAcCIgBzoKo+hYAQEAJCQAgsHAERgIUvkIYnBISAEBACQmAOBEQA5kBVfQoBISAEhIAQWDgCIgALXyANTwgIASEgBITAHAiIAMyB6n70eXQze5uZXShN9zdmdlUze+1+TL93lg8ys79xv77OzK40Eybvcfhzi7uZ2aNmuNfvmtlPQ79/bGYfneFe6nIYgaub2cvMLH+732VmlzazXwg4IdCKgAhAK2JqnxF4npnd0MFxTzN7qOAxEYD9fgj4pp7RzE5vZn/YEbJjm9nROnL232b2IzP7DzP7pJl9dQ2Y7tMRgPu765/V9XuzNfrTpXuKgAjAni78mtO+R9jsX2pm1y70eTwz+94a98KqwEfz+2b2n2b2oU7bea+ZvcbMfrZGv3NeKgKwGrpXM7NXFC5lvS+8WpfFq05tZp93GnRuxLN13hXvwwZ/rfTPpczsOBX9QACwDr3IzN5e0d434bsNVljcssxl/WkcmppvEwIiANu0WssYKx/J95nZUdNwvmZmZzOz785AAPpmDKl4ipk9wMx+sgxY/m8UIgD/C8WfmRmbLfKYROKGlqqPAHDNmczs0xOtM5ozGnSUVQjAUczsNmZ2bzM76Rrj+1jqA2JbKyfqSPe/mdlJ0gW/NLMLmNmHaztQOyEgAqBnoAWBY3Zax0fM7Azuoiua2et7OlnXAjA2ti+a2TUW5oveRQLAOrCWXrDM/Hpggb7hNieIwJdGFnOIADyii0G4+9jDUPE737svmNkfTUAATteZ+l+whtWgNFwsabeqIEv5WiwAr3Qdfaqzjp1ngaS4YmnUZBMIiABsAvXtvSc+fsz/WV5sZtcdmE6JALw/+UBrUMC0etzkT4V0HLlw0XfM7OKd+fUTNR0eQJtdJQAt0J3WzD7nLliXAHw9+dN/1TKIQttLpsDVUjctFoDzJ9J7gkJHPzczgjPfklwN3zKzH5rZ8RMhOrOZXS4RhyMVric+4PJm9uXKub7czAgMzPJgM7tX5bVqtucIiADs+QPQMH0+4v/e+f6J/keIOuZjhkbVJyUCcDsze3zDfXPTE5rZDZKp9MThekyoaD5DGukKt1zpEhEAsxub2XPWJACfTcQvd3OVFPux0qKkixgTY0OwHmUXBf9fSwBwdxGXEP38P06uDrIwflAxyFMmFxbjiUTgM8mcXxM/AzHGFYA7AiE2BpcJwYYSITCIgAiAHpBaBND2faAfft07jVw8JQHIt2Lzf3Nn+jxXuPdNuw/6s2snM2M7EQCzJ5rZX6xJAJ6a4giwAiGv6lw9uAlWld8zMywJuLGQ5zoyUEsA6AOy6YkD137czHCFEajaKqTRvtrMojWBZ/yylZ09wcwOdW1xTUCWJUJgEAERAD0gNQjg7yQIK2sqaNp8BMc+eHMQAMaLiRmTP/npWebMt6/BKLcRAfjfOBFP0FZxAWAlQru9TAIW8/8puo3umy2L4drewsye5v7/luH/aywAcaOlO6wBV0hm/hWHdrjGTibA74cOsA6Qbjsm4IvLxb+fpCFi5ZAIgV4ERAD0cNQgED98fWl/sa+5CAD3eUlKu8r3xASLhlYrZ00aJf5cXBm4GLge1wZph5hQ/yWZnSl49NvKjiMBoDDSld21F+vI1PWTiZcPNxoppl6C5vAdk96F9lcjsRDQXbs5/G26kCyNayb/MEV72Dz5Gz7pryQfNSloaK9jMlYICPMzUei1ghYdLTgxCPDJKaKdf2dZJ9XNY0XGCsVz2PSzjBGAaGrnOuJPzrlmTn++/yFp3f03+b8S0a4p8kMwoE8LfGz3XN2hdkHUbj8REAHYz3VvmTUbFFrXsdxFBFO9o6KTOQkAm90jwxjYwCECQ3KWLrDw0U6zrJjG4bEPaJAEMI5JJACYd/kwnyy5KLJGO9QP2iDR4EPxFVwfCcCd09wgNZi40QKHhDoLbLB/NYLbJgjAM1PkP2mmOfiTdWD9WgUc8KtnoXAOFoYPur+NEYCS9g+Re2HrYAbal+5xk7SWY7fhuXqTa0SWBimCS62XMTYf/X4ACIgAHADIW34L/P74/7OgQWKqrAm4m5MA3DptXh7ek3d52WwYfUL0NZYDqrO1CvPFr+qxKPURCQBR2uSKQx5wpdQK2h/+4aH0uUgAbp+0WiLQs6+75n4QDszYRLCXZBMEANM3JnCsLxDOLBfsouj/qWZSrg2R8VSqzEKUPVYX388QAciWEzJSsmBeZz0hUVMJgYGQPp/tQqlfrEZjghUGK5KPJSBFtlRcaawv/b4nCIgA7MlCrzFNzMTXcdfjR0U7rZE5CQCpTg8Mg2Cj6tvE+FjzkffR25j10Zr4Bx8q1oNjmNmpUioWNfx9hDZ9k21A1HWfRAJwWCIcRLEjuBao5Y7pHVM0rgc0dtIpY649pvJzD2wykQDcpfNFYwXA3I+g4WKBYFNhbhAkTN+4JHLUeJ4HGjEZGiUZIwBcg4UDIUjzX0Mn5wvxIrgLMJ97iS6AnGIaiV7L80f/rB8kirK8CIGAf5Awx3+fZYgAlNIH13FH9MB8+J95Nti4sxD7AKa4pcYEywYFmLLw7Ply3WPX6/c9Q0AEYM8WvHG6PB98qMlhztKiVcxJAN5qZpRdzYJGdpqB+fExxGSbhc2cjRBtuU8ukQ438to0vlafdx2vjQTAp5tRuZDfS/5yNlA+/n8aOrx5R0gwh5ckEoB8L8y/XEesRkn+JMU2+Op1bDTERXhTeb62hgDktswjWmFWCQIEC8rronXTH8QMYW7co7YCZDSN4zbC5UF54Xc7cIYIQKy9z2Vnn6n2BMGJZEB4gRyRBTEmEHUIexbeXSoGSoRAEQERAD0YQwgQHEdhEi9jZnbfdi4CQDniD4QkBHuHAAAQq0lEQVR67nw00RZLQmwA2rbXeilq5M3CfTig6VGJLgsbJWZWNqKSRAKQ2/B3SsYOCdYAshuyNk1btGkCzUoSCQBtsGqQPjZEbGgXN0D+1hc4tkkCwLiIZ7iRA6Al5TMSP0gOz3QLAYjFdsjz5xmY0vyfp0eMQ7QwcbrkQ0aeHX7GhRDz/wlepKaCRAgcAQERAD0UQwhwwtgzXAPS/vjI1MocBID7v7NQzpWockzmJeGjSt0CgqL4B60ILbivve+D9vhWvRBL4AOu/G8lAkBVNwLRaqK50U4fHu6H+4IDbKKUCABBad7SMbRWlHDGH56lb303TQCwxPgDc2r94tF68M8p+4L5thCAmNYI7hepfQka2/FNxrrhU1whQAQD1gixIz6dEJeAL8pU04fa7AkCIgB7stArTvPvQrGfHNFe292UBADfPR8zDnPxLgnG0uoX5rmvTeuj//hRHTLLlwgAmj9/rxHq1Mf8bYrqPKmSALAxsUHVCJp0dC9g9aGmvJdNEwDWCy2W+g9ZIFS+3HBpvgRfetz+3AWOthAAXBDeKrNuUaKxtYnPG0SNQkM1EkkdaaFkzEiEwBEQEAHQQzGEQDR9tuYWlwjAP1Zq3owLk30+CwANP5ch9mNGqyMWgPPW5xLM8piOsxBsBzkqSYkAEMiHFlkrBK0RiJjlcZ0Lgwj/KNECQGQ7AWM1GRr0VSIb1A5g3b1smgAwlhj0WePCIfOCE/KQnybNOJfpbSEAXOODRwm2wzo2l8TnjViFi1beLFZhzLEUlZer2T4hIAKwT6vdPleOFqWITJacZ17b09ynAaKJkSrW54+vHedYu48GP/xQBHgkAMQMEETYUigH/z2FYbIQ8Ej0fpRIAHCNcDBSrRAhz8aYy+1yHRstaXNelkAAiNzHv52zMr6aSFIf2aG6HnUDssSI+BYCQAaFr4PBUdRYF+YSAhIhjVkgMjE4tO/e0YU0Vt9grjmo3y1AQARgCxZpg0OMpkhS1cby4P1w5yIA5G8TzR011VqosCqQAcBHlsNdiIYnUJD6AKUT2piHz81uIQCYqccK8sRx49Kg8FAWUgbPUZhcJACtrhC6ZHzetF6yNiyBADDWN6ST9DIUQ0dRPywcIQyBgkhlaSEAFMLyB1CNnYJZ+xz2tSPew2e0tLgASPvz5YMhSpAniRA4AgIiAHoohhCIpk82TUrb1srUBOC+6eM2ViGvb3wE9LExECTng6xq55PbtRCAFu0t90+lwju6QfWlOEYCUGMWj3ONAW7EBBDj4GUpBIC0QAo5Zekzb0PWCLwkYwXhv3F3+LiPFgIQSRIWmpqKjq3PVW5PxoqPc3l+yIIY6pcUVU+MqR8QY2ZWHZeu2zEERAB2bEEnng5ma586h6/dR2OP3W6dIEDSrDiAyOcxvzFErY/d3/9OAR9q7JfOcG/ph7YtBIBKdt6cX3OvWLmO6ouQlyiRALQEG+a+KIbjzctssL7wE+2WQgBwVaDR5meCrAqKHn07AENmA1pzFuovQB69tBCAWI1wFatOzbrTBisUxNtboiCEuN9qhBRQ3pMsYFSKnanpS212HAERgB1f4DWmx7MR85wpTfu+hj7XIQDcJqYh8rfaE9L8MNkkyKePmz+R5USJo6UTeEcQHQWCYobAOjEAmK0ps9siMY6ANEQfhZ77igTg7qFmQc09Yx8UkrleuHApBIBhRetIKS7FH13NWpJGGa1GLQTgH7oKgmQQeIGQQcymlpjySP/UQMAKUCMECxIL4gUy0ZL1UnMftdkBBEQAdmARZ5xCtADUHgKUh7QuAeD5JOebj3UWqpuRqtby8Y0lUumLwipohQTpjck6BKA1MI+xxPTLPo0zbt6kSN5vbDLh9xjoWYojWBIBIGbDn2BIxDxV+bJg7iZtL2u9ZJ2wqUZpIQC4RJ4eOmipiNmyJH9dKPrTVwei1G+sfMg77IM8W8aitjuOgAjAji/wmtOLMQDUxn9dQ5/rEgBuxQcfP7V3RbQUuyECH5+qN4O+IB3sUzsVosmJKs/S4gJg7D6iu+aeVDWkJGwWCIjPxsh/jwSgxVSc+8AK4g8pomDSncIgl0QAGBpVICnklIWzBji6GTm0C9jjVL0sfYVwWggAKZnxUKbWmhg1604bilP5gE8CcfPZDjV9xBgA3uF4xkRNP2qzBwiIAOzBIq8xxTmyADhwhoNnWoRSvGy6XmoDEqNGRB8tefmYT38Y0sBaCMAqH2BiFXzaH4GXzDdKJACtBWp4/0kD9OSIojEUj/GyNAKAOR6zfJZHuecDIkCpaIT0UKrilWpEtBAA+oqpebjHIE6xaFPLcx3blsoz15SQ9v3ELIBWArHO+HXtliEgArBlC3bAw52jDsAqBIAcbLTwfKIbMHwlFedhcx6SaL7FJMqGVlvHvfRRbiEAjI00LILXagV/NQfoZIEA4d+PEglAa3BaqXY88QrELXhZGgGIJX6xYlDzHsy8rx+zvbek+Dm1EoBIOuhr7GCo2vWmHd9iAmx9HQdqHJAOSBZDrcQ6ALzDBMBKhMAREBAB0EMxhMAclQBXIQCMMZo2+RsBfJTJHZI7pHMAcptWjQh3QQyKayUA5PT7MxWGxgvJiR/8vsDH0lkA5PTXpknSb6wTz/0hV0smAIwtHhBEXAhnNOAGycIm74/89XNqJQC4kiAaObUw99WytkPrjuWF2hZeVqk4GCsB8g5T3VEiBEQA9Aw0IYAp2Kcftfo9p4gB8APGFO5rohPZjMZEoGCfxHr3mIMp61pjAeBerwmnDnKfodPZSqWAW0q5kv/vNzG0QMzYpaDHEgF4YDc3jq+tETTYq7qGfScPrmsBqCElHHn7CjeWsRK2rPs7XHviFohRyUdEZ6tAHw6tBIB+SsGAZI1gdme8qwp1KZ7dVWA8quuA4kOQGuJXWoQYHZ91orMAWtDbs7ayAOzZgjdON26eaKa+Rv1Yd1MTAEy8HJWaz4bn/pxfz3G5P+sZDLXgSfPzUpPOSNAfGyxH9H49pOENBdv1HQdcqrEfh0w1QubnXR1scmRflKREAPB7ExUfj4WN1xNUiF/bfwPIiiBnPkoLAQCvmJfPGnBmw5C0EoB4QBDFeUiBy/EMHPVMYaQ+WYUA0FckTfwNMnmPZGlqKflMdD7WJEibXweILUWPVql0iavJWylIpcWSIBECR0BABEAPxRACZyycDIc2yoZYI1MTAO7Jhz3Wqqe6H+lTJUGrQpvykdAQAjbVPtJAIRzS4diQcQEQyOfzwAk0I/K8JKQX+rFQW4DUNCwP1y7413MfFIAhuyGe+kZRG1/Yxd+TmgwXdH/I96KA0lUSOSqNEb8yZXF9nAHEgaA2sIrSQgDI1gBXXzoZTLCaDEkrAaAv+iydssiGTHzDUNzFqgSA5wiLk089zPOCjEKgsFTlQ4dKc6YeBZYXCjf5NchtyWTwQY417xptSjEdEFmeB4kQOAICIgB6KIYQ4PlAm/MFdPDFowXVyBwEAK2JVCmflkcuPxty34l7cVNm7Ji7Ca4jpYwNi8Iu509FV/KmSuoXEeWYaKmR7wXtEj80Gx7t8oFE/B1tMAt12QkCzMFdVKjDXExQI2Va0ZjZjG5d2AzGKh/60+64H4GCaJRUysM0TfEY7oc1gGh/0snwk98qVZzz8xkqItRCAOgzprKh0TIWznCAGEA08FX7Y4dXIQDMB6tUPL9hDDfGuCoB4FrwfdNAeifPI+QMNwSuGwJVIYFcd5aUwlg6c4LrcLnFZ63mXaMNxJVCTllwH/B8SYRAEQERAD0YYwjEIDhy1NmsamQOAsB9S9XSiHZmAy8V9iGAC62dj2+tUEwGfzIbNRozEfZ97ws56R9MHRPI5c9ff3J3HQV62Kxb3CcUuMGkjVbfJz7ljTYQFTR4Nv2W8q+QlJsMVItrJQAxEr00/oskF0v+bRUCwLXMFSuJl5pDq9YhANwLTPCvE4Q6xXcU1w81C3DLrCqx4FVrvYtV76vrthSBKR7cLZ26hl2JABXPfIATGwxugJogurkIAEOPUeD8Dc374T3zopQu86g5VpU8fKK7fTR8qRxsvpUnAI81MzIdsuQcdawAaME157q/tNMcb9tjjvfTw4rhTdG5UBObK/iMEQ7qxIMXZuuhioitBADygZm8z03CHKYiAPGAIAgTzycWkCFZlwDkvqkpgQ8fy0pJqx97zbBaYQ1hvcbGPNQXlihKRntr3VzVCsfmpN+3BAERgC1ZqA0Ok4A7Nn181FnQwCmxOiZzEgCO8MWE7H37mPKpoobptSQ87/jG0RCxFtAHmxXmezR8zLb44TFVR8F0fZekKWPCJtgLggAORN3nKH3S/Qi8yhIzBihMhKmWwDh8tlgn2LRIT6QvTLi15y3EegE+uJF5kb7IfM+VNkU2CcaJ2RzN+bDubAWOnh2TVgJAf9RuwBJC3EM+bhiXB/dGyyWOw/voV7UAxAOCqAL4l2MTWtMFUOqewDs2XNaVoFQIJ9kmsQwv7xLrjOuJMtHZclQx5MEmseDVj5NbC9ePRAj0fhAFjRAYQyBqtXOfhz42Hv0uBLYBAQgn8Rc+q2Ouo4RjdgJxBLffBpA0xs0hIAvA5rDfpjvjA0erziZOzMWcr95S3W6b5quxCoGpEMAFhOUoC64zqhbWWF5qx4CrB2tQfj+pHXH6icsU145F7bYIARGALVqsDQ8V0zim8yyrHDyz4Sno9kLgwBGIpxcyAPz9BF1OJWj73u2h4L+pkN3xfkQAdnyBJ5weGj8+9xxdTgAZqXhTHoYy4XDVlRBYDAKlTIWWdNqhiaDpk0GQqwgSB8N7OVYIajHgaCCbQ0AEYHPYb+OdYz49AWuxTv42zktjFgJzIsBhPFRC9MWR2KhJIaQEMHUSVhUyWwg+zNJ6euCq99V1O4CACMAOLOIBToGIddKW8GFmoXIdGo5ECAiBfgTiuRq5JXUmOG8CSxpEgIJUZIXUHJlNhgdHQGfBQgfZ+IkWQgjUICACUIOS2ngEqIxHmlo2OVIw56wjBWuEoBDYdwRIwSRSP5Z6LuEydhAS11BVkGJRpLIipKWSgkhBLIkQqEJABKAKJjUKCFA2lvr7WV6SctsFlBAQAv0IQJopFc2Jj94dEK8YIwB8tzkoiNoJWYaOqNaaCIEiAiIAejBWRYDysRyDmmXs9LVV76PrhMCuIUBhJMppU1CL/6ZgEIdFce4GLgEI9XMGJk3hKcpLZyGOgJM7JUKgCQERgCa41NghQDbA28yM6nMI+c2ccMZJaBIhIATmQQCtH+0/f7vf3Z2pcEh3SiZZORIh0ISACEATXGosBISAEBACQmA3EBAB2I111CyEgBAQAkJACDQhIALQBJcaCwEhIASEgBDYDQREAHZjHTULISAEhIAQEAJNCIgANMGlxkJACAgBISAEdgMBEYDdWEfNQggIASEgBIRAEwIiAE1wqbEQEAJCQAgIgd1AQARgN9ZRsxACQkAICAEh0ISACEATXGosBISAEBACQmA3EBAB2I111CyEgBAQAkJACDQhIALQBJcaCwEhIASEgBDYDQREAHZjHTULISAEhIAQEAJNCIgANMGlxkJACAgBISAEdgMBEYDdWEfNQggIASEgBIRAEwIiAE1wqbEQEAJCQAgIgd1AQARgN9ZRsxACQkAICAEh0ISACEATXGosBISAEBACQmA3EBAB2I111CyEgBAQAkJACDQh8D9KOGwXVh6OtAAAAABJRU5ErkJggg=="/></switch></g></g></g><g data-cell-id="V1Wl26Vbpgnno5Lb-wtg-49"><g><path d="M 666.37 248 L 703.63 248" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 661.12 248 L 668.12 244.5 L 666.37 248 L 668.12 251.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 708.88 248 L 701.88 251.5 L 703.63 248 L 701.88 244.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 248px; margin-left: 685px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 9px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">HTTP</div></div></div></foreignObject><image x="673" y="243" width="24" height="13.25" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAAA1CAYAAAC+2+58AAAAAXNSR0IArs4c6QAAA2NJREFUeF7tm81LMlEUxo8pVAs1KltI4KYWSRlBELg1WwRCENUf0Dpo3d6WQdSynRCBQgXtRJdu2hSulFYtRESxMBT7wLiXt3n7mGbm3rnqC+/jTuec507Pb849d+5Mjk6n0yF8+uaAAwD65j0fGAD66z8A9Nl/AACAfjvQ5/G1HvD09ERut1s7nfPzc1pbWxM6vaurK4rFYlpOvV6nkZER/v3m5oYWFhaE9MyC8/k8vb6+dkV3dnaWD//dF6Nzcjqd/O/1+/20tLTE/VtdXSWHw/FrGgDoWMPAygDQc3lubo4SiQTNz8/rQugZgEKhQOvr64YX9f39PTUaDR7j9XppcnLSMP7i4oLe3t66ojs1NaVbATMzMzQ6Oqp7Xq1Wi8rlMpVKpS/Hh4aGKJPJUDgc/pHXMwBm0wk7zkr28vKSh25tbdHZ2ZmVNNMYO7oyUzO7kI6Pj+ng4IBfIOwzMTFBd3d3X6Z59jsAmOCTAfAhmUwmaXNzUxshHo/T3t7elxEBoIsAmPTKygql02k+yuLiIl1fXwOAyNRmpwKY02wq2tnZ4aazVdLz8zMNDAxoEFABXa6A70vzarVKY2NjAGDauf8E2K0Atqj4fD/1+PhIHo8HAHoF4PDwkHZ3d/lww8PD1Gw20QN62QMikQhls1lu+vLystaQPyj82gPYLfXg4KDVC4XHtdttenh40HI+b0VYEbKzXjfSt6NrZwpKpVK0sbGhndrJyQltb29bqwArhpnF/K8AarUaHR0d0f7+Pr28vHCbgsEg3d7eksvlAgA7U1AoFCKfz6d77bElZqVSoWKxSJ+f9I6Pj1Mul6Pp6ekfeViGCi5Dzar++3G2/3N6ekqBQEA3FQAUAmDbzmwTkW1HM+PZNkQ0GjUcAQAEAcg8JzEaAgAA4K8DdpaL/+Iy1Eq/QAWgAlAB/NVEO3d8HxYaPZS3Uo6Ygrr4VgQA6DuAHoAegB6AHmBQBSp6o6UbMStzNGLUO4DX09V7KqQIAEJ2qQ8GAPWeCikCgJBd6oMBQL2nQooAIGSX+mAAUO+pkCIACNmlPhgA1HsqpAgAQnapDwYA9Z4KKf7+73tCMgiWdQAAZJ1TlAcAioyUlQEAWecU5QGAIiNlZQBA1jlFeQCgyEhZGQCQdU5RHgAoMlJW5h0DqhjC399QigAAAABJRU5ErkJggg=="/></switch></g></g></g><g data-cell-id="SsHHCok0RUWS7ODwTELy-4"><g><rect x="530" y="228" width="130" height="40" rx="6" ry="6" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 248px; margin-left: 531px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Search Service</div></div></div></foreignObject><image x="531" y="241.5" width="128" height="17" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="S3Av5TdVFqS_SrXukbwN-1"><g><rect x="180" y="132" width="130" height="40" rx="6" ry="6" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 152px; margin-left: 181px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">UI</div></div></div></foreignObject><image x="181" y="145.5" width="128" height="17" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="V1Wl26Vbpgnno5Lb-wtg-26"><g><path d="M 710 224.6 C 710 219.85 721.19 216 735 216 C 741.63 216 747.99 216.91 752.68 218.52 C 757.37 220.13 760 222.32 760 224.6 L 760 271.4 C 760 276.15 748.81 280 735 280 C 721.19 280 710 276.15 710 271.4 Z" fill="#e6e6e6" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 760 224.6 C 760 229.35 748.81 233.2 735 233.2 C 721.19 233.2 710 229.35 710 224.6" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/></g></g><g data-cell-id="A18w2Y2_AVEIFkgUy5Lv-4"><g><path d="M 766.37 344.01 L 790.06 344.06 L 820 344" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 761.12 344 L 768.12 340.52 L 766.37 344.01 L 768.11 347.52 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g></g><g data-cell-id="V1Wl26Vbpgnno5Lb-wtg-32"><g><path d="M 710 320.6 C 710 315.85 721.19 312 735 312 C 741.63 312 747.99 312.91 752.68 314.52 C 757.37 316.13 760 318.32 760 320.6 L 760 367.4 C 760 372.15 748.81 376 735 376 C 721.19 376 710 372.15 710 367.4 Z" fill="#e6e6e6" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 760 320.6 C 760 325.35 748.81 329.2 735 329.2 C 721.19 329.2 710 325.35 710 320.6" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/></g></g><g data-cell-id="V1Wl26Vbpgnno5Lb-wtg-33"><g><rect x="692.5" y="376" width="85" height="20" fill="none" stroke="none" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 89px; height: 1px; padding-top: 386px; margin-left: 691px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">metadata-db</div></div></div></foreignObject><image x="691" y="379.5" width="89" height="17" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="V1Wl26Vbpgnno5Lb-wtg-34"><g><path d="M 393.5 413.6 C 393.5 408.85 404.69 405 418.5 405 C 425.13 405 431.49 405.91 436.18 407.52 C 440.87 409.13 443.5 411.32 443.5 413.6 L 443.5 460.4 C 443.5 465.15 432.31 469 418.5 469 C 404.69 469 393.5 465.15 393.5 460.4 Z" fill="#e6e6e6" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 443.5 413.6 C 443.5 418.35 432.31 422.2 418.5 422.2 C 404.69 422.2 393.5 418.35 393.5 413.6" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/></g></g><g data-cell-id="V1Wl26Vbpgnno5Lb-wtg-35"><g><rect x="377.5" y="467" width="85" height="20" fill="none" stroke="none" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 89px; height: 1px; padding-top: 477px; margin-left: 376px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">data-db</div></div></div></foreignObject><image x="376" y="470.5" width="89" height="17" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="V1Wl26Vbpgnno5Lb-wtg-36"><g><path d="M 220 412.6 C 220 407.85 231.19 404 245 404 C 251.63 404 257.99 404.91 262.68 406.52 C 267.37 408.13 270 410.32 270 412.6 L 270 459.4 C 270 464.15 258.81 468 245 468 C 231.19 468 220 464.15 220 459.4 Z" fill="#e6e6e6" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 270 412.6 C 270 417.35 258.81 421.2 245 421.2 C 231.19 421.2 220 417.35 220 412.6" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/></g></g><g data-cell-id="V1Wl26Vbpgnno5Lb-wtg-37"><g><rect x="202.5" y="468" width="85" height="20" fill="none" stroke="none" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 89px; height: 1px; padding-top: 478px; margin-left: 201px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">auth-db</div></div></div></foreignObject><image x="201" y="471.5" width="89" height="17" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="V1Wl26Vbpgnno5Lb-wtg-38"><g><rect x="530" y="132" width="130" height="40" rx="6" ry="6" fill="#e6e6e6" stroke="#000000" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 152px; margin-left: 531px;"><div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Storage Service<br />(SeaweedFS)</div></div></div></foreignObject><image x="531" y="138" width="128" height="32" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="A18w2Y2_AVEIFkgUy5Lv-3"><g><rect x="780.5" y="358" width="108" height="20" fill="none" stroke="none" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 112px; height: 1px; padding-top: 368px; margin-left: 779px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">metadata-db-data</div></div></div></foreignObject><image x="779" y="361.5" width="112" height="17" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="A18w2Y2_AVEIFkgUy5Lv-6"><g><ellipse cx="834.5" cy="344" rx="14" ry="14" fill="#e1d5e7" stroke="#000000" pointer-events="all"/></g></g><g data-cell-id="A18w2Y2_AVEIFkgUy5Lv-7"><g><rect x="780.5" y="262" width="108" height="20" fill="none" stroke="none" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 112px; height: 1px; padding-top: 272px; margin-left: 779px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">search-db-data</div></div></div></foreignObject><image x="779" y="265.5" width="112" height="17" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="A18w2Y2_AVEIFkgUy5Lv-9"><g><path d="M 820.5 248 L 766.37 248" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 761.12 248 L 768.12 244.5 L 766.37 248 L 768.12 251.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g></g><g data-cell-id="A18w2Y2_AVEIFkgUy5Lv-8"><g><ellipse cx="834.5" cy="248" rx="14" ry="14" fill="#e1d5e7" stroke="#000000" pointer-events="all"/></g></g><g data-cell-id="A18w2Y2_AVEIFkgUy5Lv-10"><g><rect x="364.5" y="538" width="108" height="20" fill="none" stroke="none" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 112px; height: 1px; padding-top: 548px; margin-left: 363px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">data-db-data</div></div></div></foreignObject><image x="363" y="541.5" width="112" height="17" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="A18w2Y2_AVEIFkgUy5Lv-35"><g><path d="M 419 509 L 419 489 L 419 493.37" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 419 488.12 L 422.5 495.12 L 419 493.37 L 415.5 495.12 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g></g><g data-cell-id="A18w2Y2_AVEIFkgUy5Lv-11"><g><ellipse cx="419" cy="523" rx="14" ry="14" fill="#e1d5e7" stroke="#000000" pointer-events="all"/></g></g><g data-cell-id="A18w2Y2_AVEIFkgUy5Lv-34"><g><path d="M 245 510 L 245 494.37" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 245 489.12 L 248.5 496.12 L 245 494.37 L 241.5 496.12 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g></g><g data-cell-id="A18w2Y2_AVEIFkgUy5Lv-15"><g><ellipse cx="245" cy="524" rx="14" ry="14" fill="#e1d5e7" stroke="#000000" pointer-events="all"/></g></g><g data-cell-id="A18w2Y2_AVEIFkgUy5Lv-16"><g><rect x="191" y="538" width="108" height="20" fill="none" stroke="none" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 112px; height: 1px; padding-top: 548px; margin-left: 189px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">auth-db-data</div></div></div></foreignObject><image x="189" y="541.5" width="112" height="17" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="YJRAzF6yD4Hh-bAvO1PB-2"><g><path d="M 420.06 364 L 420.06 384.53 L 418.53 384.53 L 418.51 398.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 418.5 403.88 L 415.01 396.88 L 418.51 398.63 L 422.01 396.89 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 385px; margin-left: 419px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 9px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">JDBC</div></div></div></foreignObject><image x="407" y="380" width="24" height="13.25" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="YJRAzF6yD4Hh-bAvO1PB-1"><g><rect x="355" y="324" width="130" height="40" rx="6" ry="6" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 344px; margin-left: 356px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Data Service</div></div></div></foreignObject><image x="356" y="337.5" width="128" height="17" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="V1Wl26Vbpgnno5Lb-wtg-27"><g><rect x="692.5" y="291" width="85" height="17" fill="rgb(255, 255, 255)" stroke="none" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 89px; height: 1px; padding-top: 299px; margin-left: 691px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">search-db</div></div></div></foreignObject><image x="691" y="292.5" width="89" height="17" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="OiuNRKl362wFz-YGv0-T-6"><g><path d="M 130 248.06 L 154.06 248.06 L 171.63 248.02" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 176.88 248 L 169.89 251.52 L 171.63 248.02 L 169.87 244.52 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g></g><g data-cell-id="OiuNRKl362wFz-YGv0-T-7"><g><ellipse cx="116" cy="248" rx="14" ry="14" fill="#e1d5e7" stroke="#000000" pointer-events="all"/></g></g><g data-cell-id="OiuNRKl362wFz-YGv0-T-8"><g><rect x="63" y="262" width="108" height="20" fill="none" stroke="none" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 112px; height: 1px; padding-top: 272px; margin-left: 61px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">broker-service-data</div></div></div></foreignObject><image x="61" y="265.5" width="112" height="17" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="iy0HhJzZLXsiPmpU2ukH-7"><g><path d="M 530 437 L 449.87 437" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 444.62 437 L 451.62 433.5 L 449.87 437 L 451.62 440.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g></g><g data-cell-id="iy0HhJzZLXsiPmpU2ukH-4"><g><rect x="530" y="417" width="130" height="40" rx="6" ry="6" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 437px; margin-left: 531px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Data DB Sidecar</div></div></div></foreignObject><image x="531" y="430.5" width="128" height="17" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="ZFea1dL5_0zV0EoV6Noq-2"><g><ellipse cx="332" cy="414.5" rx="7.5" ry="7.5" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><path d="M 332 422 L 332 447 M 332 427 L 317 427 M 332 427 L 347 427 M 332 447 L 317 467 M 332 447 L 347 467" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 474px; margin-left: 332px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">Researcher</div></div></div></foreignObject><image x="301" y="474.5" width="62" height="17" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="ZFea1dL5_0zV0EoV6Noq-3"><g><path d="M 353.37 437 L 387.13 437" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 348.12 437 L 355.12 433.5 L 353.37 437 L 355.12 440.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 392.38 437 L 385.38 440.5 L 387.13 437 L 385.38 433.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/></g></g><g data-cell-id="iy0HhJzZLXsiPmpU2ukH-8"><g><path d="M 666.37 152 L 780.06 152.06 L 780.06 245 C 783.96 245 783.96 251 780.06 251 L 780.06 251 L 780.06 341 C 783.96 341 783.96 347 780.06 347 L 780.06 347 L 780.06 437 L 666.37 437" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 661.12 152 L 668.12 148.5 L 666.37 152 L 668.12 155.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 661.12 437 L 668.12 433.5 L 666.37 437 L 668.12 440.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 174px; margin-left: 780px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">S3</div></div></div></foreignObject><image x="773.5" y="168" width="13" height="15.75" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="ZFea1dL5_0zV0EoV6Noq-4"><g><rect x="701" y="492" width="30" height="16" fill="#e1d5e7" stroke="rgb(0, 0, 0)" pointer-events="all"/></g></g><g data-cell-id="ZFea1dL5_0zV0EoV6Noq-5"><g><rect x="738.5" y="492" width="92.5" height="16" fill="none" stroke="none" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 91px; height: 1px; padding-top: 500px; margin-left: 740px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Docker volumes</div></div></div></foreignObject><image x="740" y="493.5" width="91" height="17" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="ZFea1dL5_0zV0EoV6Noq-6"><g><rect x="701" y="512" width="30" height="16" fill="#e6e6e6" stroke="rgb(0, 0, 0)" pointer-events="all"/></g></g><g data-cell-id="ZFea1dL5_0zV0EoV6Noq-7"><g><rect x="738.5" y="512" width="132.5" height="16" fill="none" stroke="none" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 131px; height: 1px; padding-top: 520px; margin-left: 740px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Ext. maintained images</div></div></div></foreignObject><image x="740" y="513.5" width="131" height="17" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="f61RwCrreTIYbJ5Vt7fi-7"><g><path d="M 65 317.63 L 65 294.06 L 250 294" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 65 322.88 L 61.5 315.88 L 65 317.63 L 68.5 315.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g></g><g data-cell-id="f61RwCrreTIYbJ5Vt7fi-3"><g><rect x="0" y="324" width="130" height="40" rx="6" ry="6" fill="#e6e6e6" stroke="#000000" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 344px; margin-left: 1px;"><div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Identity Service<div>(OpenLDAP)</div></div></div></div></foreignObject><image x="1" y="330" width="128" height="32" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="f61RwCrreTIYbJ5Vt7fi-9"><g><path d="M 64 386 L 64 370.37" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 64 365.12 L 67.5 372.12 L 64 370.37 L 60.5 372.12 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g></g><g data-cell-id="f61RwCrreTIYbJ5Vt7fi-10"><g><ellipse cx="64" cy="400" rx="14" ry="14" fill="#e1d5e7" stroke="#000000" pointer-events="all"/></g></g><g data-cell-id="f61RwCrreTIYbJ5Vt7fi-11"><g><rect x="10" y="415" width="108" height="20" fill="none" stroke="none" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 112px; height: 1px; padding-top: 425px; margin-left: 8px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">identity-service-data</div></div></div></foreignObject><image x="8" y="418.5" width="112" height="17" xlink:href="data:image/png;base64,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"/></switch></g></g></g><g data-cell-id="f61RwCrreTIYbJ5Vt7fi-12"><g><rect x="701" y="532" width="30" height="16" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/></g></g><g data-cell-id="f61RwCrreTIYbJ5Vt7fi-13"><g><rect x="739.5" y="532" width="111.5" height="16" fill="none" stroke="none" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 109px; height: 1px; padding-top: 540px; margin-left: 742px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Maintained images</div></div></div></foreignObject><image x="742" y="533.5" width="109" height="17" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAbQAAABECAYAAADp0cDrAAAAAXNSR0IArs4c6QAAHSBJREFUeF7t3QOwLUuyBuCcZ9u2bc+zbdu2bdu2bVvzbNu2vb6IrhcZdRvVC+esvU9mxI47c1Z3dVV2Vf7pvl8UFQeKA8WB4kBx4BZw4H63YA21hOJAcaA4UBwoDkQBWm2C4kBxoDhQHLgVHChAuxWvsRZRHCgOFAeKAwVotQeKA8WB4kBx4FZwoADtVrzGWkRxoDhQHCgOFKDVHigOFAeKA8WBW8GBArRb8RprEcWB4kBxoDhQgFZ7oDhQHCgOFAduBQcK0OZf40NExL92Pz1jRPzcrXjrl1vEj0fEs6fh3yEiPv5yj7t1I79/RLxfWtV3RMSLn3GVH37Y1++WxvuGw55++TOOX0MVB+4qBwrQCtDOuQEL0E7jZgHaafyru+9xDvSA9ggR8bczPPmXiHjMiPiHM/HLc38nIp5gZryHjYh/OtNzjh2mLLTjOFeAdhzf2l0FaKfxr+6+xzkwCmjY9OYHUPuMM/HrBSLiexfGKkBbZ7J39t4R8cAR8XdX5tIrQDvtgBSgnca/uvse58AeQPuJLj5yCuu+4GChve4VA5qpsVYz/WNE/Pcpiz7TvU8VEb88jfX7C1bumR61e5iHiYgHSXeJQ/777lHu3RsuDWg8D/4a/WdE/PO9y+5a+W3jwB5As/anScL0WF4Qen8WEQ995YB27Poufd8bRcRnXymgXXrtt338SwPabedfre8e58AWoP12RDxhRDzQxKePjYh3OpFnbxgRnzON8b8R8QcR8fhpzGtwOZ64xIvejnd4iK7NQrvowu+BwQvQ7oGXXEu8HAe2AO1nIuI/IuI5pin8ZUQ8dkRwVRxLPxQRzzPd/FMRwWJ7igK0YXb+SkQ8ZQHaML9u0oUFaDfpbdVcr44DW4D2SxHxpRHxoWnmrxQRX3vkSp4kIn4z3esAv8kEku2fy0JbZq643t9E/P9nf8pCO3IjXultBWhX+mJqWjeDA1uA9usR8bIR4b+NviUiXvrI5X3wwbp7r3TvM0XE90TEIx5poYnDvUREvNgU3+MeBYgPNpUYEP4/HxE/EhFfEhF/MTjvPWn7wP490rjveogPflT6/080uQhf8DCHJ52STf4tIv56KtRWPCtJRmnEHL1wRHzX4Lxd9gmH7Me337j+qaeCWkXQrL1HnvjGGpc5CSh/MiK+aXo/XMMjNJrl6P3kZBFrzzFVGZwUJ3/2yGNFxINOc/vDiPjhiWc8CMeQxJUXnfbNc0fEo0fEoxyyR/8rIngh/jgivv+QBPVth+t+9JgHTPc82eHsvMa0Rx83Ih518ngY39y/blIOPRddGtBGC6u33o91vGlEvOS0fx5uakTwe9O7+axpfXOse76IeL2IeK5D6AFPvFfn9Fcnfn/6IawhAWsvKSt6uYi4f0TY3/4/WUDG2dPi9j89ZVd/dUQ4g8cQWfUqk1zkWbJ3rOHPpzV/VUR85bSXjC9cY6/nZKlHWiiPmpsPJZa8JeOeYdpD7sejv4oIYSHy4Zs7Y2HP2vDqlSfPGd5ZE96ZuxKqP4mIXzvw9vsOc/j66XzsGf+OXbsFaL8bEQQyUHi6aVYy/WzEP905S8wx3uNN97WxvRhux0YjFpqx3nECEi93hAjrTzkIlPcc2Mx7AA2YZQv2A6duD+b4QVNnBgJ6jRyGV5+EaH/dOQFNhuTHTcJ8hGeuIWgkovzYwA2jgGYoh5zgbIRH/3MQ8k8/eQXMdYu+8LAP32zgfeZxXu0gXChWvAUjxEX+zgfhLct3lB78IEg/YIo3Z0E2dz9B8dqTsNUlBKg1upudQpbeDyXjcyMCiC0RBegjD+/l3dMFgODzJtBZ4yOFQveSUUXCuM6fPQpYRgiAUjxbLH/kHte8zkHQf8wEKmv3MAC8UyEV8/O8TPb9VtiGDCLjzPPhBybo7HzRZDBQmEaI7PyQyUu2JaPaeOZNAZdLca665JG5Dl2zBWh/NIHX+xzQmqBuRIjT9vbQixy0su9MN3zEtOGldudU4i1AsxlotrTDY+gBEcFaWrKIjLkH0LzYj04T8b/fZdpcNvUotVjlz3Y3nAvQtFCiPWblYXRulJjXnDTPtXv2AFqvyJgXa/G7Bw9wm8fXTNrl1loc2E+e6im3ru1/Z0FJxCEwtogig8+vuHVh+l3qvPfsjxLU6G4C2tz7eaHJohwVfm8XEZ84afs/EBHax40Qq4ClIGFsjTRmYJ2MKif9WPbD24xMaFJqsudl6zZyjWX1W5PHo10P7FuS3dIYPCYsrpa7sPWs/DsvFO8DI2SNWGW8Yy0ev+cZrhU6et7JMt1778Wu3wI0zGF+cp1kt6PF+Lc9xOVHKDZqJQAEedastgDtUw9MfIvuwUziL59MfnMmgGwK7ipa1eN013/x9O9L898DaA5t7lfokDiINFTEfUfA2WC6sNBsHdbXmqkh4xJ5lm5SALxZoVwqXDKNKBzP2l1POPYuGwfe2FmrdrAITH8OHSHykFPGKTeuw5gPHo39mTfKNvYAGl7kWj/7yQFj/dM2ubYJK2v0/yUjUUReYUYgvMwkANb24+dPrq7+8CuB4F7kccBrGbeUL26xh0oX4xcrmjtpjSh+FMBMXF7ccBQ6z+Fe5R43bxYjK84epvlm9/XdBLT+/fDQACUWBwvAGdLblODmdQHgz9+t+++n35xZ+x3hNYXUGcFvcuANZs4oebGmELqXcsoNl8k5o+RInrIGe5jwJny5f3uF7o0HLDXn4Vu759gP1sF9ye1HjvEqqK/lHkTCCt4vJa0RCyd7Jvq9ZG/wBvQeil84eMt4JKzZuM4ylydrllzIstx+Ixec6yXiTu/7hHo3wgy8BsawRq74p03u/zye6zXJuBraAjSMsyDEBfCcaeZ84dwxI4T5fNgEJhKfebbpfwOfrPGtAZoXqKg4C1qC71VXLC7PdPiyxuxFAbulZsN7AO1tp7hV44MOKOIDxuAKIeDmioutU3PYfkMANOAzRwTql6UfRpNCJPY4zI3MhzBdi82ZFy0xC3X+c4CyRHsAjRsmx069x5eaDqEYxdK7cXgJrLxnzNN6lqjnm+soGdxUS/EacTsCq+1T94hZ0Gj9d44oTr+R9rlrCFYCDjDPEaAwf0BOAGee3E1A698PMKb54xtrda49nQ422cK0XorE608CH0C5vydCnDKTG1vzoDzaSuG3GF7fueh9J3fyUsyXsoKnT54mQMEQVlmKqVE2frHLxHYtIDHWHAEx6yYDeFyyZersZY9Ufz+FlRu9kbVQcliHFLs5EgeWqIdfjYANBXCOF8Auu9CNSz5sKWveHzdtBmSguMSHhele7p/3AFou6G0blWY1Qv3me8uD5fdp0417AI2bkk+5EWuEdtj7qPs5EcqEfwNnvzeX59z89wDaWx+swU+aGUQMJcdD5p7zxJM2lOMs4g7mNkfHABrgxJ/8jA+bYolb747rtFmarvWuWkB67t49gAYUWNGZKD0Uja34rFgMIZn3AaVp7sCLZ7EG8mGnnbJAlwREG5cFSeNvcV//7l1TYuaI0BFva0QbZ43nzN65+2jjBF+vud9NQJt7P5JxKDotiaVfCyUDoAOInoCg97ZE3Gt9nJbFxyqcI5ZKVjbcS5Hcol6Yu54F9u0LNwIuik2mEauOUjYHEGuAZu/3yqyYv/O6RXjh/WRv11JGOuAnnxpRMhgFI+QLGuqRGwHuURwYGf+ka/YAWt/hA5g8xmAj4Wzd0W64AJi0aA+gCWDa5ISTP9bQmsWQmdO7KgnfbHHma08FNBodrWykVZY1ZCuN6zRbU3lexwAaYckl2ngG1B3qLR+757pHwkqmNY3sVEBzqOY0+H6T8w70go71nt3i7R4uZ66aRgQKd98WaLbrvQsWbiNWlP07Z3VzPWVh7rlclyMkO7UHymsDNAK3j/H2a7PXuOEzzbnS53jinZApjSiLErl6ApwsEla0PSrrkhWDhyOUazldLx8gu3rzGOKm2fXJjWevjZxtnoQ+lroGaLlpgjnwUnDzbylebb4sVsZDI25SXo+euNkZKI1Y1mTrCFGQ5QkwEGS1Shrb2hMj457lmj2A5oGymzIaj2gqzHs+2Ua9wN4DaP2izX80pby3EvsOJXnsUwFNbV1rT7X1omRNyWZqtOaXPgbQTuGZe8V2CPBGa5r2KYDmfQCakcPrUPUZVkvaPFcW10ujvRoly5blmK3JOc2XK5KgzES751YeIbGgXjBcE6ApMyBct2jOFSjxQmx5i3rlrmUMb93n9z2yoHfBrykevaU66t0wJ/yS6ZhpCdB4EihLLSzjHl4IcdVR6vcQ0HV2ZY5m6t2an9m5OUefd3XX7QU0HT5y3GzEzLcBcvqueELOdjwF0PYwVJ1F1v7FTpZSj08FNLGU0dRZLqqcPbUmOM4BaHt45lrF9dxmjWR1ZpdDHu8UQKMAUARGSQwn166plxTQzkSTl5iQrxu1AvM4X9G5ZLyv7Pp2rXFdl2lPvZH7egvlmgBttO2dWOY3dnxQiiGpYYv6xLHRZ26N2/8OXN8q/aN9Y//0xFrsLXlxxD11oeomc1LaEqCJHzo/jSjqnj9aO+s+8tx8JfI1YqH1CS19KEG8Uhzuxn/AeC+gYRJrKwdVaabZAsubQvIGzVuGGhIYF5jNWvidArTeF85lupTCfgqg0YZyvGbrsIknZreKpBeZX3N0NwDNJieQGjkMuUwhz/MUQCNguIVHyUHnamokZiHjLJOEi961qrh9Lftr7vl9raGsNZmQmfqi6JxQNbqm3pq8JkDjouKh2SKp/Tmrz/WsD1mAWyQTlNenkXPB7Xhu6t2iS80iWPbeSSbya6ucIF/P+uP2brQEaH1yGYW4z84e4YM9A3QbzbkTjasOOMfVyUOKGmtt1B0/Mp87es0xgOYT7rkGbU5bbYsQbxGAb8RPi8GZTgE0GYFqd6SVElQsLu4oB6gnAXe/NboUoAH3PbUdvjPXEmTM7dKApkiTFi0eAjhbVwDgPlcfIzEiZxReCtCAdW/hrB0GbsCsic4BmoxImZmZaKxrNYhzzySk876dEzZ9XGLURZef1wv0awI0saA+OWKOV1y/Oko06rvArL3T3hU2CmgEMwVDUghZIInHWfc3V9jOYs+ZhkuA1sdfJfm4b8Qt3tbZA9USoGl4kDv8SCTK8bA1vuXfeFByJ6el8oe5jFTjsAy5SSXJcAHzwt2YT0AdA2jMYGZ02ygEi5Tjucyn3lWjHkrg/FRA4z4Ejntr4fJzLwVoowHwNpc7BWisRoqIJIe1tOGtg3MpQBupJctzGwE0CRliZuemub3T73VJK31d1tY8uNhkkTW6JkBbywTM6+oBbY+luhfQKKn2IyDIGcxbfO5/XwI09a7ZayDGNdqZqD1D7S1QabQEaH3m7t41LF2/1qqQV0HN5FqhtyQ+2ZMME8rh75xrYpcY5xhAMw8+8lz3QxPu/ebqaZiuzVr6wanPWr+OPRYaxtOEz5Emei8BmuC0uOXewzi3524SoPXa8TnPEIUuZ7oRHLl7DQ0XCOwhNVzZEixAW3Y52stcm6PdR9bew5LQ72NNEqRa+GT0vcoZyCUBS4Ama3M0Y3v02a6T8yAreIlYtVrBjRZI64srLwLPro6OBbTelQPM/FumPjYEhOa05T2A1jdX9Tz3y1qSTSaBgebOzdFbjHcqhnZtFpoDKCDfgxmXBo2YS0H6Le3TYeuzRu9UDO0SFlq/B895ALluc6Zl33nhGDDq6yyPGWNtjaPNiY3RZ/ddk4VGsSWo+7ozpUD2tLiX/S2ezcLoXYSjMTTJbLkGrLUC3LOP+tZ1S4CmZo3b/Nwkc1Z4YYuEbCQ2SY4Rytlqz6UZAJdsK7/aGv+O/H4soNFOvdwWwwAeAo25ZkklemvLJCNN+uhcd4FRQMNw8aVcOCg4K06nFmKL7lVAm2v5pIOJRrhLBbKZlzcZ0LRb0iWmEcFm746Wemztqfy7hBTp/I2WPBJrY/bZdwVo8xaadPa+SBuvuNMpZls0CmjKDfSibLTHfdru0TVEqVKjJUDr46fikLncZGtN5/yd8itu3P6WemWKtbH+tD+7CjoW0ExeBwkmeaP82RTFvMCnkc3XvrLcL3wU0Hp3DOEkqWEEzDyz31j3gstRhxRdQnKSjNZZuafm1kbE3/wB1pvkcpQAQpPMJHHomM+TbPGpVxxGNeM8bh+HK0CbB7T8kWD8E5eXDDIqWCVhiV03WnI5klm5Iz9rL9eJbe0Jv/degiVA67vMHJNUNDKfY65hTCguB/C5NZux9tQKHvPsXfecAmiEXAYTaN0ssv7lrPV9HAW0vpfknJtzbfF9dua9AGjSd/s+ayPdHhofuR241XId100CtL6ptnVJ5dfJ5dzUuwspEn1rr61n9tZwAdp9AQ2gUEhy5q3GBLIER6l3Dy8BGvdbXxgvuaovVF57bt+9YwnQ+oL0Y6zB0fUfe521UxBzQ3SuaZ66PZmfxz5/875TAM3gAoTNj82NI9tRSrOYjHoNpOYHwi/RKKBxLxq/kX5kfSPUtQULIDOhG90LgNZrmHvTjvtCery7SYBmfwOW3NV/KZa7eVg2Lphzg8m8I5hGaM6aLkC7L6BpLdZnSu9plA4QhUZyCc8SoPVKu/eoXV4ugN56t+Sfnq2NlgBNckv/wVqdc8jSayJrEZ/M2MEjN+opu+haTgW0vmGxNFcvO7fw2eoTNgpo/ecsaDT8ziOkLkzCSA503guA1n/aZm+WFvek+rBMNwnQzLvXxpe6Qozso7Vr5preLjWHnRtnrsNGAdp9AU2Rf9/RgiW+1QC68Vwn+/wJJv++BGji9RLMci2bzj7a1Y1QH3pxzxKgeQblKwPtWleekedvXaN8R8H7XutK6j6wbbRHodia00m/nwpoinGl5reOG8xzrsdmOWGUj/CpW1uiUUDLVp+xuBBzJ/il8W0UNUF9RpQXOVeAbZxTOoXcySxHfM2d4Hse9FYDEF/qSt/fK/5E+Pd75L26L3Tn+07pFHKJLEdz67ur2G/iLUvdbeb2kQQarYGUPviba+PEBUbzz27GtUbT/XOM23cfKUC7L6CRJ7pcZNI2auSL4jw8lO3eFayVVe6ukceW3ONbao220uDzvRKS2nfg2r+vNSfu6/BYotrO7Sls5hJ0ztte7WWvJDpnQuiBoi9Zbm8Kft/f1XliMNx1OhXQLCA3LNY3T3yCqwphavvY3amAppYjj7W2CduzrE+WkvY50vlzJ2/X9KnX7b5rBTQaf27vRHukTCxl7c19koNg3vq8PVeLYkoHv+ebWEVupnztgKb4lrs6dxXhKud+HhEUUpjxIis/S3G4vnm3OjU1gFtfNuj7jDaeFqDdF9AoqFLFc1x3TclqvKTIkSFchv2eXkvg6b9IbzwAZ0+s0Vz8zfVrgDZnfbIG8yeJ1p7ZZ2UyNoR+hBoa+QBpbnjM2sWTpe/B9c/rPRHu41oHonedzgFoBOTSy5VGm1NW5xY8aqH1TXyNtdbNnDDWR02xqxeqjqbvMTfXuNO41wpoih+1o8m01iyVy0TPwxxDUncmHXhpA6tFUbzO9cHlSEnJGWH546z9+7xGC80c5xoHU4h0ElnrW6fQVZZbzuyiUCzVC+l2Lg6Sz5XPbLA+lxJR1PLon2fP0chzvKUAbT7LkRWSP4vCVUfx6C23tj8pIN6bWD53GQ9STvsnH/QFtdd7ogR7L/lDt/IE1JctWfnahPnsjHuAaP4y9NYHPvsMTPPRO1VHj6Uz65zzWMk4zHtv7vM7FGA8yH1QyRTenDVPmnno4ctrk3Mi9nxL7eKAdw5AM8m+YbF/o0WpPdtC/lFAUxtBOOSGwu5lgWGqujhCgT8deBFWzR/dfNGyk3KLHBuVsPZfmnz7nta1AhqQtob83mhGXBViCLRQ689d69Wc9d964jLjruWm8X5kL3HbSM1t34jj4iUkKCX9B0wVmzqwtGXXtTT4awU0+3GutZC6SAoXcONGIWzsDwKQNZyzuYxBkHHVrHVAn6v7497WB1HBL7ekPay2B2ACQWQPsn7zZ1ZGvBB7hMRtKayey951LqwPz1oikPcIXPCZS9h7uP9UD9srGNxuPnpJbvF85K9l6KTBCszk3NhTOtkDAuEVMTMKSgNbz+DNyN35twANCFIajZWJl0EDCd4Ve0g+gO/B+bAnF2JLwmv38I4B0jnvzVwCE1C3Fi5WexG4kzNkKCUL36yrb2iMx1fTDutcgKYGrf/KMk1DDcYWjQKacY7pzaeIsvXHmxM2bX45MHytgGauNt1aSyVurrzplg7I2nthtXDJyVySVSZTq98r7X5Cv33z6ZoBjUADzBKXjiHKFEHqi8xrxBXGE8DdO0oUAj0QuXpz379zF9feFkDD1729Dwls8SzKr71MCIvHzVGf+ETZZZksxdnmxgBAPCpAJ39yawvQjEVx9bylDxBv7Sv7j/dqzQ3Y1/Vujdn/rpyHotB7jPaOc9brzwVofcNik6Q50DS2aA+gGUt2I6tsKaGjPY+GAWi5cxoxlSVt5Eyi9ttNATRroKUtNWPtAc36vB9fzx35RD3NTvYqi7fRnBuk/XZTAK3Nl7vQYc6fQFrbozRxbsf3nPmo6NJ9XLysLZrwFvEKsILFcfpMR++ZS/9cdJsAjZuNNTvSkZ73QrmG2GmjPlko83guk5eionk078eScpdliesohn3pywigGYdSrekyGdYXMy/tB54DHhmK20jmonaF9kRunLC111h8mhTjUV8+sXXvxX8/F6CZqAzH9pG8tU+g9IvaC2jup/VwFbIiuNgIEBoYU5w7jd+aptt/1di9MnK4FqSactGpE5KhQ2i1eN81W2jWwL3ABSJJhlvXIVHWwHqgRMx9Tt679n50TOFelCRBKWAdsMAIT+ufq7Fh3XDbCihzleE1wPN1bfWArdD0mi20vO+sRwyExk3gAHwxBZYtNyR3kz1M+3R493xkMT+HexK/7VM9NSkh3F7cmxQrbkiKRmtBRuHIQpfLikvnXHSbAK3xRP2Wb6g5z9rvUVa5DLkBeQ7IJX+5kXS7l0AXm+f2BZCSRR4wfRes/9J0u0fihk479o93yprSoUT8Ti6BzEZx6kb91wfIJMloo0RGcfXJgJVgZJ96JmAxludKOhJvpZRvhXj653JdSnLhnrRfnW/jA3CgSD4432Sk8y0WyVtxlbSlaVzlpGtSxYHiQHHghnCgb+QODJZcnTdkSdc7zQK06303NbPiQHHg5nOgb25wTT0abz53uxUUoN26V1oLKg4UB66IA31xtdAGF2nRBThQgHYBptaQxYHiwK3hgBi9chb/9Sf2LPN3pCi/76SEKRKuFOAXXYADBWgXYGoNWRwoDtwaDkiS6PtEjvZz7L+7Jo1e+62Rb7bdGgbeyYUUoN1JbtezigPFgZvIgb7PpixflhZ34lzhsixaZR46d2RSbiSmVnQhDhSgXYixNWxxoDhwazigQbB0/tw/0uI0HgBq6rGUdkjHV0agVKOvc1RSo/POJT4ue2sYfepCCtBO5WDdXxwoDtwLHFAL9pVdT8fRdavzfOnUWm/0vrpuJwcK0HYyrC4vDhQH7lkOKHLXnSR/TmaNGYro9TwVc9MjsujCHChAuzCDa/jiQHHg1nFAW7/WvJprUaci/R6129MYWYcX/Rv1jcxNjm8dI65tQQVo1/ZGaj7FgeJAcaA4cBQHCtCOYlvdVBwoDhQHigPXxoECtGt7IzWf4kBxoDhQHDiKAwVoR7GtbioOFAeKA8WBa+NAAdq1vZGaT3GgOFAcKA4cxYECtKPYVjcVB4oDxYHiwLVxoADt2t5Izac4UBwoDhQHjuJAAdpRbKubigPFgeJAceDaOFCAdm1vpOZTHCgOFAeKA0dxoADtKLbVTcWB4kBxoDhwbRwoQLu2N1LzKQ4UB4oDxYGjOFCAdhTb6qbiQHGgOFAcuDYOFKBd2xup+RQHigPFgeLAURwoQDuKbXVTcaA4UBwoDlwbB/4Pc+yIrj+veDAAAAAASUVORK5CYII="/></switch></g></g></g></g></g></g></svg>
\ No newline at end of file
diff --git a/.docs/images/architecture.drawio b/.docs/images/architecture.drawio
index 57c8ee946752a574d8cc7c049ee71f6acbb1a7ce..8433da025fa2c2ecf2221a4794a2e2f693df6042 100644
--- a/.docs/images/architecture.drawio
+++ b/.docs/images/architecture.drawio
@@ -1,6 +1,6 @@
-<mxfile host="Electron" modified="2024-02-23T12:34:29.996Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/23.1.5 Chrome/120.0.6099.109 Electron/28.1.0 Safari/537.36" etag="wHh4Le3WT9S2OAsQk6sP" version="23.1.5" type="device" pages="8">
+<mxfile host="Electron" modified="2024-07-18T03:24:43.687Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.6.4 Chrome/124.0.6367.207 Electron/30.0.6 Safari/537.36" etag="yfnnaSFCfO3oi8Cn43Ov" version="24.6.4" type="device" pages="8">
<diagram id="mvBsv1rP8O80Qe3yGnn_" name="docker-compose">
- <mxGraphModel dx="1434" dy="822" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
+ <mxGraphModel dx="683" dy="391" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
<root>
<mxCell id="0" />
<mxCell id="1" parent="0" />
@@ -52,8 +52,8 @@
<Array as="points">
<mxPoint x="480" y="346" />
<mxPoint x="538" y="346" />
- <mxPoint x="538" y="440" />
- <mxPoint x="625" y="440" />
+ <mxPoint x="538" y="430" />
+ <mxPoint x="625" y="430" />
</Array>
</mxGeometry>
</mxCell>
@@ -79,6 +79,14 @@
<mxPoint y="3" as="offset" />
</mxGeometry>
</mxCell>
+ <mxCell id="f61RwCrreTIYbJ5Vt7fi-16" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.75;exitY=1;exitDx=0;exitDy=0;entryX=0.25;entryY=0;entryDx=0;entryDy=0;startArrow=classic;startFill=1;endArrow=none;endFill=0;" edge="1" parent="1" source="13tBXMPt0xomx7MP2VuM-1" target="hBEam5F8n4ZBPeoiEcWH-1">
+ <mxGeometry relative="1" as="geometry">
+ <Array as="points">
+ <mxPoint x="480" y="450" />
+ <mxPoint x="593" y="450" />
+ </Array>
+ </mxGeometry>
+ </mxCell>
<mxCell id="13tBXMPt0xomx7MP2VuM-1" value="Analyse Service" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
<mxGeometry x="382.5" y="374" width="130" height="40" as="geometry" />
</mxCell>
@@ -101,6 +109,9 @@
<mxCell id="iy0HhJzZLXsiPmpU2ukH-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="hBEam5F8n4ZBPeoiEcWH-1" target="iy0HhJzZLXsiPmpU2ukH-4" edge="1">
<mxGeometry relative="1" as="geometry" />
</mxCell>
+ <mxCell id="f61RwCrreTIYbJ5Vt7fi-15" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.75;exitY=0;exitDx=0;exitDy=0;entryX=0.75;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="hBEam5F8n4ZBPeoiEcWH-1" target="SsHHCok0RUWS7ODwTELy-4">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
<mxCell id="hBEam5F8n4ZBPeoiEcWH-1" value="Metadata Service" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
<mxGeometry x="560" y="470" width="130" height="40" as="geometry" />
</mxCell>
@@ -115,7 +126,7 @@
</mxGeometry>
</mxCell>
<mxCell id="AQz-Vj6r_5Wor37pQVs6-1" value="Broker Service<br>(RabbitMQ)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;fontColor=#000000;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="210" y="374" width="130" height="40" as="geometry" />
+ <mxGeometry x="208" y="374" width="130" height="40" as="geometry" />
</mxCell>
<mxCell id="V1Wl26Vbpgnno5Lb-wtg-49" value="HTTP" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;startArrow=classic;startFill=1;fontSize=9;" parent="1" source="SsHHCok0RUWS7ODwTELy-4" target="V1Wl26Vbpgnno5Lb-wtg-26" edge="1">
<mxGeometry relative="1" as="geometry" />
@@ -126,7 +137,7 @@
<mxCell id="S3Av5TdVFqS_SrXukbwN-1" value="UI" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
<mxGeometry x="210" y="278" width="130" height="40" as="geometry" />
</mxCell>
- <mxCell id="V1Wl26Vbpgnno5Lb-wtg-26" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#dae8fc;strokeColor=#000000;" parent="1" vertex="1">
+ <mxCell id="V1Wl26Vbpgnno5Lb-wtg-26" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" parent="1" vertex="1">
<mxGeometry x="740" y="362" width="50" height="64" as="geometry" />
</mxCell>
<mxCell id="A18w2Y2_AVEIFkgUy5Lv-4" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;exitPerimeter=0;startArrow=classic;startFill=1;endArrow=none;endFill=0;" parent="1" source="V1Wl26Vbpgnno5Lb-wtg-32" edge="1">
@@ -134,19 +145,19 @@
<mxPoint x="850" y="490" as="targetPoint" />
</mxGeometry>
</mxCell>
- <mxCell id="V1Wl26Vbpgnno5Lb-wtg-32" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#dae8fc;strokeColor=#000000;" parent="1" vertex="1">
+ <mxCell id="V1Wl26Vbpgnno5Lb-wtg-32" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" parent="1" vertex="1">
<mxGeometry x="740" y="458" width="50" height="64" as="geometry" />
</mxCell>
<mxCell id="V1Wl26Vbpgnno5Lb-wtg-33" value="metadata-db" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" parent="1" vertex="1">
<mxGeometry x="722.5" y="522" width="85" height="20" as="geometry" />
</mxCell>
- <mxCell id="V1Wl26Vbpgnno5Lb-wtg-34" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#dae8fc;strokeColor=#000000;" parent="1" vertex="1">
+ <mxCell id="V1Wl26Vbpgnno5Lb-wtg-34" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" parent="1" vertex="1">
<mxGeometry x="423.5" y="551" width="50" height="64" as="geometry" />
</mxCell>
<mxCell id="V1Wl26Vbpgnno5Lb-wtg-35" value="data-db" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" parent="1" vertex="1">
<mxGeometry x="407.5" y="613" width="85" height="20" as="geometry" />
</mxCell>
- <mxCell id="V1Wl26Vbpgnno5Lb-wtg-36" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#dae8fc;strokeColor=#000000;" parent="1" vertex="1">
+ <mxCell id="V1Wl26Vbpgnno5Lb-wtg-36" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" parent="1" vertex="1">
<mxGeometry x="250" y="550" width="50" height="64" as="geometry" />
</mxCell>
<mxCell id="V1Wl26Vbpgnno5Lb-wtg-37" value="auth-db" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" parent="1" vertex="1">
@@ -195,6 +206,9 @@
<Array as="points" />
</mxGeometry>
</mxCell>
+ <mxCell id="f61RwCrreTIYbJ5Vt7fi-14" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" edge="1" parent="1" source="YJRAzF6yD4Hh-bAvO1PB-1" target="hBEam5F8n4ZBPeoiEcWH-1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
<mxCell id="YJRAzF6yD4Hh-bAvO1PB-1" value="Data Service" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
<mxGeometry x="385" y="470" width="130" height="40" as="geometry" />
</mxCell>
@@ -203,14 +217,14 @@
</mxCell>
<mxCell id="OiuNRKl362wFz-YGv0-T-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="OiuNRKl362wFz-YGv0-T-7" edge="1">
<mxGeometry relative="1" as="geometry">
- <mxPoint x="210" y="394" as="targetPoint" />
+ <mxPoint x="208" y="394" as="targetPoint" />
</mxGeometry>
</mxCell>
<mxCell id="OiuNRKl362wFz-YGv0-T-7" value="" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;fillColor=#e1d5e7;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="121" y="380" width="28" height="28" as="geometry" />
+ <mxGeometry x="132" y="380" width="28" height="28" as="geometry" />
</mxCell>
<mxCell id="OiuNRKl362wFz-YGv0-T-8" value="broker-service-data" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" parent="1" vertex="1">
- <mxGeometry x="81" y="408" width="108" height="20" as="geometry" />
+ <mxGeometry x="93" y="408" width="108" height="20" as="geometry" />
</mxCell>
<mxCell id="iy0HhJzZLXsiPmpU2ukH-7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="iy0HhJzZLXsiPmpU2ukH-4" target="V1Wl26Vbpgnno5Lb-wtg-34" edge="1">
<mxGeometry relative="1" as="geometry" />
@@ -237,20 +251,53 @@
<mxPoint as="offset" />
</mxGeometry>
</mxCell>
- <mxCell id="ZFea1dL5_0zV0EoV6Noq-4" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="1" vertex="1">
- <mxGeometry x="730" y="660" width="30" height="16" as="geometry" />
+ <mxCell id="ZFea1dL5_0zV0EoV6Noq-4" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#E1D5E7;" parent="1" vertex="1">
+ <mxGeometry x="731" y="638" width="30" height="16" as="geometry" />
</mxCell>
- <mxCell id="ZFea1dL5_0zV0EoV6Noq-5" value="External images" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
- <mxGeometry x="767.5" y="660" width="140" height="16" as="geometry" />
+ <mxCell id="ZFea1dL5_0zV0EoV6Noq-5" value="Docker volumes" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+ <mxGeometry x="768.5" y="638" width="92.5" height="16" as="geometry" />
</mxCell>
- <mxCell id="ZFea1dL5_0zV0EoV6Noq-6" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="730" y="680" width="30" height="16" as="geometry" />
+ <mxCell id="ZFea1dL5_0zV0EoV6Noq-6" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="1" vertex="1">
+ <mxGeometry x="731" y="658" width="30" height="16" as="geometry" />
</mxCell>
- <mxCell id="ZFea1dL5_0zV0EoV6Noq-7" value="Maintained images" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
- <mxGeometry x="767.5" y="680" width="140" height="16" as="geometry" />
+ <mxCell id="ZFea1dL5_0zV0EoV6Noq-7" value="Ext. maintained images" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+ <mxGeometry x="768.5" y="658" width="132.5" height="16" as="geometry" />
</mxCell>
- <mxCell id="ZFea1dL5_0zV0EoV6Noq-8" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="745" y="660" width="15" height="16" as="geometry" />
+ <mxCell id="f61RwCrreTIYbJ5Vt7fi-7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;endArrow=none;endFill=0;startArrow=classic;startFill=1;" edge="1" parent="1" source="f61RwCrreTIYbJ5Vt7fi-3">
+ <mxGeometry relative="1" as="geometry">
+ <mxPoint x="280" y="440" as="targetPoint" />
+ <Array as="points">
+ <mxPoint x="95" y="440" />
+ </Array>
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="f61RwCrreTIYbJ5Vt7fi-17" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" edge="1" parent="1" source="f61RwCrreTIYbJ5Vt7fi-3" target="O_ELZSFbvl3Butg3bv_j-1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="f61RwCrreTIYbJ5Vt7fi-18" value="idp" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="f61RwCrreTIYbJ5Vt7fi-17">
+ <mxGeometry x="-0.1676" y="1" relative="1" as="geometry">
+ <mxPoint x="4" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="f61RwCrreTIYbJ5Vt7fi-3" value="Identity Service<div>(OpenLDAP)</div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;fontColor=#000000;strokeColor=#000000;" vertex="1" parent="1">
+ <mxGeometry x="30" y="470" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="f61RwCrreTIYbJ5Vt7fi-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="f61RwCrreTIYbJ5Vt7fi-10">
+ <mxGeometry relative="1" as="geometry">
+ <mxPoint x="94" y="510" as="targetPoint" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="f61RwCrreTIYbJ5Vt7fi-10" value="" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;fillColor=#e1d5e7;strokeColor=#000000;" vertex="1" parent="1">
+ <mxGeometry x="80" y="532" width="28" height="28" as="geometry" />
+ </mxCell>
+ <mxCell id="f61RwCrreTIYbJ5Vt7fi-11" value="identity-service-data" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" vertex="1" parent="1">
+ <mxGeometry x="40" y="561" width="108" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="f61RwCrreTIYbJ5Vt7fi-12" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="731" y="678" width="30" height="16" as="geometry" />
+ </mxCell>
+ <mxCell id="f61RwCrreTIYbJ5Vt7fi-13" value="Maintained images" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+ <mxGeometry x="769.5" y="678" width="111.5" height="16" as="geometry" />
</mxCell>
</root>
</mxGraphModel>
@@ -780,18 +827,18 @@
</mxGraphModel>
</diagram>
<diagram id="0gRvLy_AUZ0Xau8SBKI8" name="Gitlab Runner">
- <mxGraphModel dx="1434" dy="822" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
+ <mxGraphModel dx="925" dy="530" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
<root>
<mxCell id="0" />
<mxCell id="1" parent="0" />
<mxCell id="r9iJ3a_E54lvpWGN0BaG-1" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=2;" parent="1" vertex="1">
- <mxGeometry x="280" y="40" width="730" height="260" as="geometry" />
+ <mxGeometry x="250" y="40" width="760" height="260" as="geometry" />
</mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-3" value="minikube" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=16;fontStyle=1" parent="1" vertex="1">
- <mxGeometry x="322" y="50" width="110" height="10" as="geometry" />
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-3" value="Kubernetes" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=16;fontStyle=1" parent="1" vertex="1">
+ <mxGeometry x="292" y="50" width="110" height="10" as="geometry" />
</mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-4" value="<font style="font-weight: normal; font-size: 10px;">128.130.202.116</font>" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=16;fontStyle=1" parent="1" vertex="1">
- <mxGeometry x="322" y="65" width="110" height="10" as="geometry" />
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-4" value="<font style="font-weight: normal; font-size: 10px;">azimuth.datalab.tuwien.ac.at</font>" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=16;fontStyle=1" parent="1" vertex="1">
+ <mxGeometry x="292" y="65" width="110" height="10" as="geometry" />
</mxCell>
<mxCell id="r9iJ3a_E54lvpWGN0BaG-30" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="r9iJ3a_E54lvpWGN0BaG-5" target="r9iJ3a_E54lvpWGN0BaG-6" edge="1">
<mxGeometry relative="1" as="geometry" />
@@ -813,14 +860,14 @@
<mxCell id="r9iJ3a_E54lvpWGN0BaG-36" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="r9iJ3a_E54lvpWGN0BaG-5" target="r9iJ3a_E54lvpWGN0BaG-29" edge="1">
<mxGeometry relative="1" as="geometry" />
</mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-5" value="<b>agentpool</b><br>6 CPU, 24GB RAM" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-5" value="<b>agentpool</b><br>8 vCPU, 32GB RAM" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
<mxGeometry x="567.5" y="75" width="115" height="40" as="geometry" />
</mxCell>
<mxCell id="r9iJ3a_E54lvpWGN0BaG-6" value="<b>gitlab-runner</b><br>kubernetes" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#666666;" parent="1" vertex="1">
- <mxGeometry x="300" y="140" width="100" height="40" as="geometry" />
+ <mxGeometry x="270" y="140" width="100" height="40" as="geometry" />
</mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-7" value="<b>gitlab-runner</b><br>kubernetes" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#666666;" parent="1" vertex="1">
- <mxGeometry x="420" y="140" width="100" height="40" as="geometry" />
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-7" value="<b>seaweedfs-s3</b><br>kubernetes" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#666666;" parent="1" vertex="1">
+ <mxGeometry x="390" y="140" width="100" height="40" as="geometry" />
</mxCell>
<mxCell id="r9iJ3a_E54lvpWGN0BaG-20" value="" style="group" parent="1" vertex="1" connectable="0">
<mxGeometry x="540" y="140" width="170" height="140" as="geometry" />
@@ -881,8 +928,8 @@
<mxCell id="r9iJ3a_E54lvpWGN0BaG-29" value="•&nbsp;&nbsp;•&nbsp;&nbsp;•&nbsp; •&nbsp;&nbsp;•" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
<mxGeometry x="734" y="193" width="60" height="30" as="geometry" />
</mxCell>
- <mxCell id="vhbaQO3R_VC2zLA3inCI-4" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://miro.medium.com/v2/resize:fit:400/0*KzqL3xqmXzV5PPjX.png;" parent="1" vertex="1">
- <mxGeometry x="290" y="50" width="25.78" height="25" as="geometry" />
+ <mxCell id="EFzMD_oVcaiTEb37ajv_-6" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://cdn4.iconfinder.com/data/icons/logos-and-brands/512/144_Gitlab_logo_logos-512.png;" vertex="1" parent="1">
+ <mxGeometry x="259" y="47" width="30" height="30" as="geometry" />
</mxCell>
</root>
</mxGraphModel>
diff --git a/.docs/images/gitlab-runner.png b/.docs/images/gitlab-runner.png
index 8c530df1e3088aece21467dd58a7909374e9aeaa..e35da45655428a31e516d9bf133265239f334642 100644
Binary files a/.docs/images/gitlab-runner.png and b/.docs/images/gitlab-runner.png differ
diff --git a/.docs/images/logos/ds-ifs.png b/.docs/images/logos/ds-ifs.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bce76feea8eabadf5c63422d927d01284cd5c91
Binary files /dev/null and b/.docs/images/logos/ds-ifs.png differ
diff --git a/.docs/images/logos/iap.jpeg b/.docs/images/logos/iap.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..a2ed3957ff03ad1e1a2a7a8cae8c4186fb83fe60
Binary files /dev/null and b/.docs/images/logos/iap.jpeg differ
diff --git a/.docs/images/logos/iap.png b/.docs/images/logos/iap.png
new file mode 100644
index 0000000000000000000000000000000000000000..763bd0580f2ffb49a283570717471d822ee7045c
Binary files /dev/null and b/.docs/images/logos/iap.png differ
diff --git a/.docs/images/logos/ift.jpeg b/.docs/images/logos/ift.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..dc4f6f23202f35f54099d90a0d32e9101312cfbc
Binary files /dev/null and b/.docs/images/logos/ift.jpeg differ
diff --git a/.docs/images/logos/iwr.png b/.docs/images/logos/iwr.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae01d54ef26141294409dc68d3d37f54d9030fee
Binary files /dev/null and b/.docs/images/logos/iwr.png differ
diff --git a/.docs/images/logos/umweltbundesamt.png b/.docs/images/logos/umweltbundesamt.png
new file mode 100644
index 0000000000000000000000000000000000000000..4230cd264615bf50399d9742efaf49dfca445da6
Binary files /dev/null and b/.docs/images/logos/umweltbundesamt.png differ
diff --git a/.docs/images/logos/univie_small.png b/.docs/images/logos/univie_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..320ae9de895106118db0cc2453317375db04e179
Binary files /dev/null and b/.docs/images/logos/univie_small.png differ
diff --git a/.docs/images/screenshots/air-dashboard.png b/.docs/images/screenshots/air-dashboard.png
new file mode 100644
index 0000000000000000000000000000000000000000..309a1c689f2c7955d36cdd0e724bfb71027db562
Binary files /dev/null and b/.docs/images/screenshots/air-dashboard.png differ
diff --git a/.docs/images/screenshots/air-notebook.png b/.docs/images/screenshots/air-notebook.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f1a21e405da9e2ac01d8b79475d40f8aa61924f
Binary files /dev/null and b/.docs/images/screenshots/air-notebook.png differ
diff --git a/.docs/images/screenshots/auth-service-ldap-1.png b/.docs/images/screenshots/auth-service-ldap-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..26ca69d3f8f3f3553fe322dd0ce886bb08ca78f8
Binary files /dev/null and b/.docs/images/screenshots/auth-service-ldap-1.png differ
diff --git a/.docs/images/screenshots/auth-service-ldap-2.png b/.docs/images/screenshots/auth-service-ldap-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4c26fe2075b79590be6e2b2bc3a61765fb0162e
Binary files /dev/null and b/.docs/images/screenshots/auth-service-ldap-2.png differ
diff --git a/.docs/images/screenshots/mfcc-jupyter.png b/.docs/images/screenshots/mfcc-jupyter.png
new file mode 100644
index 0000000000000000000000000000000000000000..36905661efce77254652ea60ea41629426695ba2
Binary files /dev/null and b/.docs/images/screenshots/mfcc-jupyter.png differ
diff --git a/.docs/images/screenshots/power.png b/.docs/images/screenshots/power.png
new file mode 100644
index 0000000000000000000000000000000000000000..31fbb6483c93d4a5ed0042b35bb894fcaf6e3867
Binary files /dev/null and b/.docs/images/screenshots/power.png differ
diff --git a/.docs/images/screenshots/tre-notebook.png b/.docs/images/screenshots/tre-notebook.png
new file mode 100644
index 0000000000000000000000000000000000000000..26b335113aeea58e1d50200973e60946fe681a73
Binary files /dev/null and b/.docs/images/screenshots/tre-notebook.png differ
diff --git a/.docs/images/screenshots/xps-chart.png b/.docs/images/screenshots/xps-chart.png
new file mode 100644
index 0000000000000000000000000000000000000000..c064c2f2feefeafe831b3d628f5f9bdd63ac6136
Binary files /dev/null and b/.docs/images/screenshots/xps-chart.png differ
diff --git a/.docs/images/screenshots/xps-jupyter.png b/.docs/images/screenshots/xps-jupyter.png
new file mode 100644
index 0000000000000000000000000000000000000000..42fca0f1aefee23cf5cec257d593dd8c97df8ea0
Binary files /dev/null and b/.docs/images/screenshots/xps-jupyter.png differ
diff --git a/.docs/images/screenshots/xps-notebook.png b/.docs/images/screenshots/xps-notebook.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1031b751991eb41d66c1c291f921f13f7cd5304
Binary files /dev/null and b/.docs/images/screenshots/xps-notebook.png differ
diff --git a/.docs/index.md b/.docs/index.md
index aa65b7d9396b0390a68ef2e6bddedb5b5cb397b6..d47bf06b2861569060235cf86bb13b58dd3eb046 100644
--- a/.docs/index.md
+++ b/.docs/index.md
@@ -5,9 +5,10 @@ author: Martin Weise
[](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 }
[](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 }
[](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 }
+[](https://hub.docker.com/u/dbrepo){ tabindex=-1 }
[](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 }
-Documentation for version: [v1.4.4](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/releases).
+Documentation for version: [v1.4.5](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/releases).
DBRepo is a repository for data in databases that are used from the beginning until the end of a research
project supporting data evolution, -citation and -versioning. It implements the query store of the
@@ -29,7 +30,7 @@ Installing DBRepo is very easy or
## Who is using DBRepo?
-
+
## How can I try DBRepo
diff --git a/.docs/installation.md b/.docs/installation.md
new file mode 100644
index 0000000000000000000000000000000000000000..0404133900b41c28679e7a9562b8989783022742
--- /dev/null
+++ b/.docs/installation.md
@@ -0,0 +1,181 @@
+---
+author: Martin Weise
+---
+
+# Installation
+
+[](https://hub.docker.com/u/dbrepo){ tabindex=-1 }
+
+## TL;DR
+
+If you have [Docker](https://docs.docker.com/engine/install/) already installed on your system, you can install DBRepo with:
+
+```shell
+curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.5/install.sh | bash
+```
+
+!!! bug "Default installation security disclaimer"
+
+ This quick default installation should **not be considered secure**. It is intended for **local testing** and
+ demonstration and should not be used in public deployments or in production. It is a quick installation method and
+ is intended for a quick look at DBRepo.
+
+## Requirements
+
+We only support the Debian 12 operating system officially. In theory, any DEB-based operating system (e.g. Ubuntu)
+should be compatible. Any modern hardware suffices, we recommend a dedicated virtual machine with the following
+settings.
+
+- min. 8 vCPU cores
+- min. 8GB free RAM memory
+- min. 200GB free SSD storage
+- min. 100Mbit/s connection
+
+Since DBRepo is intended to be a publicly available repository, an optional fixed/static IP-address with optional
+SSL/TLS certificate is recommended. Follow the [secure install](#secure-install) guide.
+
+## Secure Installation
+
+Execute the install script to download only the environment and save it to `dist`.
+
+```shell
+curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.5/install.sh | DOWNLOAD_ONLY=1 bash
+```
+
+### Static Configuration
+
+Call the helper script to regenerate the client secret of the `dbrepo-client` and set it as value of the
+`AUTH_SERVICE_CLIENT_SECRET` variable in the `.env` file.
+
+```bash
+curl -sSL "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.5/.scripts/reg-client-secret.sh" | bash
+```
+
+Update the rest of the default secrets in the `.env` file to secure passwords. You can use `openssl` for that, e.g.
+`openssl rand -hex 16`. Set `auth_ldap.dn_lookup_bind.password` in `dist/rabbitmq.conf` to the value of
+`SYSTEM_PASSWORD`.
+
+### Runtime Configuration
+
+The [Auth Service](../api/auth-service) can be configured easily when DBRepo is running. Start DBRepo temporarily:
+
+```shell
+docker compose up -d
+```
+
+Log into the Auth Service with the default credentials `admin` and the value of `AUTH_SERVICE_ADMIN_PASSWORD`
+(c.f. Figure 1) and select the "dbrepo" realm :material-numeric-1-circle-outline:. In the sidebar, select the
+"User federation" :material-numeric-2-circle-outline: and from the provider list, select the "Identity Service" provider
+:material-numeric-3-circle-outline:.
+
+<figure markdown>
+{ .img-border }
+<figcaption>Figure 1: Select the Identity Service provider.</figcaption>
+</figure>
+
+If you plan to change the default admin username (c.f. Figure 2), modify the Bind DN :material-numeric-1-circle-outline:
+but this is optional. Change the Bind credentials to the desired password :material-numeric-2-circle-outline: from
+the variable `IDENTITY_SERVICE_ADMIN_PASSWORD` in `.env`.
+
+<figure markdown>
+{ .img-border }
+<figcaption>Figure 2: Update the Identity Service admin user credentials.</figcaption>
+</figure>
+
+Also, update the JWT key according to the
+[Keycloak documentation](https://www.keycloak.org/docs/24.0.1/server_admin/index.html#rotating-keys). To secure your
+deployment traffic with SSL/TLS, tell the Gateway Service to use your certificate secret (e.g. from Let's Encrypt):
+
+```yaml title="docker-compose.yml"
+services:
+ ...
+ dbrepo-gateway-service:
+ ...
+ volumes:
+ - /path/to/cert.crt:/app/cert.crt
+ - /path/to/cert.key:/app/cert.key
+ ...
+```
+
+Now redirect all non-HTTPS routes to HTTPS in the Gateway Service:
+
+```config title="dist/dbrepo.conf"
+server {
+ listen 80 default_server;
+ server_name _;
+ return 301 https://$host$request_uri;
+}
+
+server {
+ listen 443 ssl default_server;
+ server_name my_hostname;
+ ssl_certificate /app/cert.crt;
+ ssl_certificate_key /app/cert.key;
+ ...
+}
+```
+
+### Apply the Configuration
+
+Restart the configured DBRepo system to apply the static and runtime configuration:
+
+```shell
+docker compose down
+docker compose up -d
+```
+
+The secure installation is now finished!
+
+## Troubleshooting
+
+In case the deployment is unsuccessful, we have explanations on their origin and solutions to the most common errors:
+
+**Are you trying to mount a directory onto a file (or vice-versa)?**
+
+: *Origin*: Docker Compose does not find all files referenced in the `volumes` section of your `docker-compose.yml`
+ file.
+: *Solution*: Ensure all mounted files in the `volumes` section of your `docker-compose.yml` exist and have correct
+ file permissions (`0644`) to be found in the filesystem. Note that paths containing directories may not
+ work when using Windows instead of the supported Linux.
+
+**The Docker images have been updated but my deployment is not receiving the updates**
+
+: *Origin*: Your local Docker image cache is not up-to-date and needs to fetch the remote changes.
+: *Solution*: Update your local Docker image cache by executing `docker compose pull`, it automatically downloads
+ all Docker images that have updates. Then apply the new images with `docker compose up -d`.
+
+**Error response from daemon: Error starting userland proxy: listen tcp4 0.0.0.0:xyz: bind: address already in use**
+
+: *Origin*: Your deployment machine (e.g. laptop, virtual machine) has the port `xyz` already assigned. Some service
+ or application is already listening to this port.
+: *Solution*: This service or application needs to be stopped. You can find out the service or application via
+ `sudo netstat -tulpn` (sudo is necessary for the process id) and then stop the service or application
+ gracefully or force a stop via `kill -15 PID` (not recommended).
+
+**IllegalArgumentException values less than -1 bytes are not supported**
+
+: *Origin*: Your deployment machine (e.g. laptop, virtual machine) appears to not have enough RAM assigned.
+: *Solution*: Assign more RAM to the deployment machine (e.g. add vRAM to the virtual machine).
+
+**HTTP access denied: user 'admin' - invalid credentials**
+
+: *Origin*: The broker service cannot bind to the identity service due to wrong configuration.
+: *Solution*: This is very likely due to a wrong `auth_ldap.dn_lookup_bind.password` in `rabbitmq.conf`. The error
+ indicates that LDAP check is not even attempted.
+
+## Next Steps
+
+You should now be able to view the front end at [http://localhost](http://localhost).
+
+Please be warned that the default configuration is not intended for public deployments. It is only intended to have a
+running system within minutes to play around within the system and explore features. It is strongly advised to change
+the default `.env` environment variables.
+
+Next, create a [user account](../api/#create-user-account) and
+then [create a database](../api/#create-database) to [import a dataset](../api/#import-dataset).
+
+## Limitations
+
+!!! info "Alternative Deployments"
+
+ Alternatively, you can also deploy DBRepo with [Kubernetes](../deployment-helm) in your virtual machine instead.
diff --git a/.docs/kubernetes.md b/.docs/kubernetes.md
new file mode 100644
index 0000000000000000000000000000000000000000..04799b4edf3425f5ba46a7b0a1f140e092414ae0
--- /dev/null
+++ b/.docs/kubernetes.md
@@ -0,0 +1,70 @@
+---
+author: Martin Weise
+---
+
+[](https://artifacthub.io/packages/helm/dbrepo/dbrepo){ tabindex=-1 }
+
+## TL;DR
+
+To install DBRepo in your existing cluster, download the
+sample [`values.yaml`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/release-1.4.5/helm/dbrepo/values.yaml)
+for your deployment and update the variables, especially `hostname`.
+
+```shell
+helm upgrade --install dbrepo \
+ -n dbrepo \
+ "oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo" \
+ --values ./values.yaml \
+ --version "1.4.5" \
+ --create-namespace \
+ --cleanup-on-fail
+```
+
+This chart is also on [Artifact Hub](https://artifacthub.io/packages/helm/dbrepo/dbrepo) with a full documentation
+about values, etc. Before installing, you need to change credentials, e.g. the Broker Service administrator user
+password:
+
+```yaml title="values.yaml"
+brokerservice:
+ ...
+ auth:
+ ...
+ username: broker
+ password: broker
+ passwordHash: 1gwjNNTBPKLgyzbsUykfR0JIFC6nNqbNJaxzZ14uPT8JGcTZ
+```
+
+The `brokerservice.auth.passwordHash` field is the RabbitMQ SHA512-hash of the `brokerservice.auth.password` field and
+can be obtained with
+the [`generate-rabbitmq-pw.sh`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/release-1.4.5/helm/dbrepo/hack/generate-rabbitmq-pw.sh)
+script:
+
+```console
+$ ./generate-rabbitmq-pw.sh my_password
+klPdmv4dgnRH64czHolIHAfXvc0G9hc24FQmPlI6eeI1NOf9
+```
+
+The script needs the package `xxd` for generation of the random salt. If you don't have `xxd` installed, install it:
+
+* Debian/Ubuntu: `apt install xxd`
+* Windows: `choco install xxd`
+* MacOS: `brew install coreutils`
+
+## Prerequisites
+
+* Kubernetes 1.24+
+* Kubernetes 3.8.0+
+* PV provisioner support in the underlying infrastructure
+
+## Limitations
+
+1. MariaDB Galera does not (yet) support XA-transactions required by the authentication service (=Keycloak). Therefore
+ only a single MariaDB pod can be deployed at once for the Auth database.
+2. The entire Helm deployment is rootless (=`runAsNonRoot=true`) except for
+ the [Storage Service](../api/storage-service) which still requires a root user.
+
+!!! question "Do you miss functionality? Do these limitations affect you?"
+
+ We strongly encourage you to help us implement it as we are welcoming contributors to open-source software and get
+ in [contact](../../contact) with us, we happily answer requests for collaboration with attached CV and your programming
+ experience!
diff --git a/.docs/migration.md b/.docs/migration.md
deleted file mode 100644
index e56b88ab8b99fb4cdffc9d68c5db28703f4fdaa8..0000000000000000000000000000000000000000
--- a/.docs/migration.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-author: Martin Weise
----
-
-TBD
\ No newline at end of file
diff --git a/.docs/publications.md b/.docs/publications.md
index 4b64d9a5746b2bf9db2c0804e174df08a6e70321..b62114dc0f18530a2c19643c5b43aa0fd3c75047 100644
--- a/.docs/publications.md
+++ b/.docs/publications.md
@@ -20,8 +20,8 @@ hide:
DBRepo logo in various formats:
-* PNG: [bigger](./images/logo/logo.png) ([smaller](./images/logo/favicon.png))
-* SVG: [bigger](./images/logo/logo.svg) ([smaller](./images/logo/favicon.svg))
+* PNG: [bigger](../images/logos/logo.png) ([smaller](../images/logos/favicon.png))
+* SVG: [bigger](../images/logos/logo.svg) ([smaller](../images/logos/favicon.svg))
## Refereed
diff --git a/.docs/redirect.html b/.docs/redirect.html
index dd85a970b2a874ec3abb95888d43c03c8c9e4ee4..4e513b2170628796d31b592b0e5b3190cfb0fe09 100644
--- a/.docs/redirect.html
+++ b/.docs/redirect.html
@@ -5,16 +5,16 @@
<head>
<meta charset="UTF-8">
<title>Redirect Notice</title>
- <meta http-equiv="Refresh" content="0; url='/infrastructures/dbrepo/1.4.4/'" />
+ <meta http-equiv="Refresh" content="0; url='/infrastructures/dbrepo/1.4.5/'" />
</head>
<body>
<h1>Redirect Notice</h1>
<p>
- This page should automatically open the documentation for version <code>1.4.4</code>. In case this page does not load the site is
+ This page should automatically open the documentation for version <code>1.4.5</code>. In case this page does not load the site is
available at:
</p>
<p>
- <a href="/infrastructures/dbrepo/1.4.4/">/infrastructures/dbrepo/1.4.4/</a>
+ <a href="/infrastructures/dbrepo/1.4.5/">/infrastructures/dbrepo/1.4.5/</a>
</p>
</body>
</html>
\ No newline at end of file
diff --git a/.docs/why.md b/.docs/why.md
index 1e6e52cc7f2d0c932fd5640cdfde752d48862e30..2a269cdadb5032d5b482f1bda9b1e0c6804d1756 100644
--- a/.docs/why.md
+++ b/.docs/why.md
@@ -2,8 +2,6 @@
author: Martin Weise
---
-## Why use DBRepo?
-
Digital repositories see themselves more frequently encountered with the problem of making databases accessible in their
collection. Challenges revolve around organizing, searching and retrieving content stored within databases and
constitute a major technical burden as their internal representation greatly differs from static documents most digital
@@ -21,28 +19,29 @@ evolving, allows reproducing of query results and supports findable-, accessible
DBRepo makes your dataset searchable without extra effort: most metadata is generated automatically for data in your
databases. The fast and powerful OpenSearch database allows a fast retrieval of any information. Adding semantic mapping
-through a suggestion-feature, allows machines to properly understand the context of your data. [Learn more.](../system-services-search/)
+through a suggestion-feature, allows machines to properly understand the context of your data
+[Learn more](../concepts/search).
### Citable datasets
Adopting the recommendations of the RDA-WGDC, arbitrary subsets can be precisely, persistently identified using
system-versioned tables of MariaDB and the DataCite schema for minting DOIs. External systems i.e. metadata harvesters
-(OpenAIRE, Google Datasets) can access these datasets through OAI-PMH, JSON-LD and FAIR Signposting protocols.
-[Learn more.](../system-services-metadata/)
+(OpenAIRE, Google Datasets) can access these datasets through OAI-PMH, JSON-LD and FAIR Signposting protocols
+[Learn more](../concepts/pid).
### Powerful API for Data Scientists
With our strongly typed Python Library, Data Scientists can import, export and work with data from Jupyter Notebook or
Python script, optionally using Pandas DataFrames. For example: the AMQP API Client can collect continuous data from
-edge devices like sensors and store them asynchronous in DBRepo. [Learn more.](../usage-python/)
+edge devices like sensors and store them asynchronous in DBRepo [Learn more](../api/python).
### Cloud Native
Our lightweight Helm chart allows for installations on any cloud provider or private-cloud setting that has an
underlying PV storage provider. DBRepo can be installed from
the [Artifact Hub](https://artifacthub.io/packages/helm/dbrepo/dbrepo) repository. Databases are managed as MariaDB
-Galera Cluster with high degree of availability ensuring your data is always accessible.
-[Learn more.](../deployment-helm/)
+Galera Cluster with high degree of availability ensuring your data is always accessible
+[Learn more](../kubernetes).
## Demo Site
diff --git a/.gitignore b/.gitignore
index 25972bf3c965937e2886bc953d708310fb0005f6..d12d172a530b8114251b5d9ed1e289c97c61e5f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,8 @@ build/
*.tar
tmp.yaml
.docs/.swagger/api-*
+.scannerwork/
+.docker/config/*
# docs
.docs/.swagger/dist/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 813ca707d1d9d7ba167f298a1384d7e78a584268..8322e26eb1201fe2c4429c6eca6cee85d74654b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,23 +1,31 @@
variables:
HOSTALIASES: ./hosts
- TRIVY_NO_PROGRESS: "true"
- TRIVY_CACHE_DIR: ".trivycache/"
DOCKER_HOST: "unix:///var/run/dind/docker.sock"
TESTCONTAINERS_RYUK_DISABLED: "false"
- APP_VERSION: "1.4.4"
- CHART_VERSION: "1.4.4"
+ PYTHON_VERSION: "3.11"
+ APP_VERSION: "1.4.5"
+ CHART_VERSION: "1.4.5"
+ CACHE_FALLBACK_KEY: ${CI_DEFAULT_BRANCH}
+ # This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
+ # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
+ MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true -Dstyle.color=always"
+ # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used
+ # when running from the command line.
+ # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins.
+ MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true"
image: debian:12-slim
+# Cache downloaded dependencies and plugins between builds.
+# To keep cache across branches add 'key: "$CI_JOB_NAME"'
cache:
- policy: pull
- key: ${CI_BUILD_REF_NAME}
+ key: ${CI_COMMIT_REF_SLUG}
paths:
- - final/
- - .m2/
+ - .m2/repository
stages:
- build
+ - lint
- test
- docs
- release
@@ -31,7 +39,19 @@ build-metadata-service:
refs:
- /^release-.*/
script:
- - "mvn -f ./dbrepo-metadata-service/pom.xml clean install -Dstyle.color=always -DskipTests"
+ - "mvn -f ./dbrepo-metadata-service/pom.xml clean install $MAVEN_OPTS -DskipTests"
+ # Compiled classes are needed for SonarQube in later stages
+ artifacts:
+ when: always
+ paths:
+ - ./dbrepo-metadata-service/test/target/classes
+ - ./dbrepo-metadata-service/services/target/classes
+ - ./dbrepo-metadata-service/repositories/target/classes
+ - ./dbrepo-metadata-service/rest-service/target/classes
+ - ./dbrepo-metadata-service/api/target/classes
+ - ./dbrepo-metadata-service/oai/target/classes
+ - ./dbrepo-metadata-service/entities/target/classes
+ expire_in: 1 days
build-analyse-service:
image: docker.io/python:3.11-alpine
@@ -77,9 +97,19 @@ build-data-service:
- /^release-.*/
needs:
- build-metadata-service
+ dependencies:
+ - build-metadata-service
script:
- - "mvn -f ./dbrepo-metadata-service/pom.xml clean install -Dstyle.color=always -DskipTests"
- - "mvn -f ./dbrepo-data-service/pom.xml clean package -Dstyle.color=always -DskipTests"
+ - "mvn -f ./dbrepo-metadata-service/pom.xml clean install $MAVEN_OPTS -DskipTests"
+ - "mvn -f ./dbrepo-data-service/pom.xml clean package $MAVEN_OPTS -DskipTests"
+ # Compiled classes are needed for SonarQube in later stages
+ artifacts:
+ when: always
+ paths:
+ - ./dbrepo-data-service/services/target/classes
+ - ./dbrepo-data-service/rest-service/target/classes
+ - ./dbrepo-data-service/querystore/target/classes
+ expire_in: 1 days
build-ui:
image: oven/bun:1.0.26-alpine
@@ -121,6 +151,7 @@ build-helm:
refs:
- /^release-.*/
before_script:
+ - echo "$CI_GPG_KEYRING" | base64 -d > ./secring.gpg
- echo "$CI_REGISTRY_PASSWORD" | docker login --username "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY_URL
script:
- apk add sed helm curl
@@ -139,6 +170,21 @@ verify-install-script:
- bash install.sh
- exit 0
+lint-helm-chart:
+ image: docker.io/alpine:3.20
+ stage: lint
+ except:
+ refs:
+ - /^release-.*/
+ needs:
+ - build-metadata-service
+ dependencies:
+ - build-metadata-service
+ before_script:
+ - apk add helm
+ script:
+ - helm lint ./helm/dbrepo
+
test-metadata-service:
image: maven:3-openjdk-17
stage: test
@@ -147,9 +193,10 @@ test-metadata-service:
- /^release-.*/
needs:
- build-metadata-service
+ dependencies:
+ - build-metadata-service
script:
- - "mvn -f ./dbrepo-metadata-service/pom.xml clean install -Dstyle.color=always -DskipTests"
- - "mvn -f ./dbrepo-metadata-service/pom.xml clean test -Dstyle.color=always verify"
+ - "mvn -f ./dbrepo-metadata-service/pom.xml clean test $MAVEN_OPTS verify"
- "cat ./dbrepo-metadata-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
artifacts:
when: always
@@ -169,9 +216,10 @@ test-data-service:
- /^release-.*/
needs:
- build-data-service
+ dependencies:
+ - build-data-service
script:
- - "mvn -f ./dbrepo-metadata-service/pom.xml clean install -Dstyle.color=always -DskipTests"
- - "mvn -f ./dbrepo-data-service/pom.xml clean test verify -Dstyle.color=always"
+ - "mvn -f ./dbrepo-data-service/pom.xml clean test verify $MAVEN_OPTS"
- "cat ./dbrepo-data-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
artifacts:
when: always
@@ -193,6 +241,8 @@ test-analyse-service:
PIPENV_PIPFILE: "./dbrepo-analyse-service/Pipfile"
needs:
- build-analyse-service
+ dependencies:
+ - build-analyse-service
script:
- "pip install pipenv"
- "pipenv install gunicorn && pipenv install --dev --system --deploy"
@@ -218,10 +268,12 @@ test-search-service:
PIPENV_PIPFILE: "./dbrepo-search-service/Pipfile"
needs:
- build-search-service
+ dependencies:
+ - build-search-service
script:
- "pip install pipenv"
- "pipenv install gunicorn && pipenv install --dev --system --deploy"
- - cd ./dbrepo-search-service/ && coverage run -m pytest test/test_opensearch_client.py --junitxml=report.xml && coverage html --omit="test/*" && coverage report --omit="test/*" > ./coverage.txt
+ - cd ./dbrepo-search-service/ && coverage run -m pytest test/test_opensearch_client.py --junitxml=report.xml && coverage html --omit="test/*,omlib/*" && coverage report --omit="test/*,omlib/*" > ./coverage.txt
- "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
artifacts:
when: always
@@ -243,6 +295,8 @@ test-lib:
PIPENV_PIPFILE: "./lib/python/Pipfile"
needs:
- build-lib
+ dependencies:
+ - build-lib
script:
- "pip install pipenv"
- "pipenv install gunicorn && pipenv install --dev --system --deploy"
@@ -258,305 +312,26 @@ test-lib:
junit: ./lib/python/report.xml
coverage: '/TOTAL.*?([0-9]{1,3})%/'
-scan-analyse-service:
- 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-analyse-service-report.json dbrepo-analyse-service:latest
- - trivy image --insecure --exit-code 0 dbrepo-analyse-service:latest
- - trivy image --insecure --exit-code 1 --severity CRITICAL dbrepo-analyse-service:latest
- cache:
- paths:
- - .trivycache/
- artifacts:
- when: always
- expire_in: 1 days
- reports:
- container_scanning: ./.trivy/trivy-analyse-service-report.json
-
-scan-auth-service:
- 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-authentication-service-report.json dbrepo-auth-service:latest
- - trivy image --insecure --exit-code 0 dbrepo-auth-service:latest
- - trivy image --insecure --exit-code 1 --severity CRITICAL dbrepo-auth-service:latest
- cache:
- paths:
- - .trivycache/
- artifacts:
- when: always
- expire_in: 1 days
- reports:
- container_scanning: ./.trivy/trivy-authentication-service-report.json
-
-scan-broker-service:
- 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-broker-service-report.json dbrepo-broker-service:latest
- - trivy image --insecure --exit-code 0 dbrepo-broker-service:latest
- - trivy image --insecure --exit-code 1 --severity CRITICAL dbrepo-broker-service:latest
- cache:
- paths:
- - .trivycache/
- artifacts:
- when: always
- expire_in: 1 days
- reports:
- container_scanning: ./.trivy/trivy-broker-service-report.json
-
-scan-data-db-sidecar:
- 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-data-db-sidecar-report.json dbrepo-data-db-sidecar:latest
- - trivy image --insecure --exit-code 0 data-db-sidecar:latest
- - trivy image --insecure --exit-code 1 --severity CRITICAL data-db-sidecar:latest
- cache:
- paths:
- - .trivycache/
- artifacts:
- when: always
- expire_in: 1 days
- reports:
- container_scanning: ./.trivy/trivy-data-db-sidecar-report.json
-
-scan-gateway-service:
- 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-gateway-service-report.json docker.io/nginx:1.25.0-alpine-slim
- - trivy image --insecure --exit-code 0 docker.io/nginx:1.25.0-alpine-slim
- - trivy image --insecure --exit-code 1 --severity CRITICAL docker.io/nginx:1.25.0-alpine-slim
- cache:
- paths:
- - .trivycache/
- artifacts:
- when: always
- expire_in: 1 days
- reports:
- container_scanning: ./.trivy/trivy-gateway-service-report.json
-
-scan-metadata-service:
- 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-service-report.json dbrepo-metadata-service:latest
- - trivy image --insecure --exit-code 0 dbrepo-metadata-service:latest
- - trivy image --insecure --exit-code 1 --severity CRITICAL dbrepo-metadata-service:latest
- cache:
- paths:
- - .trivycache/
- artifacts:
- when: always
- expire_in: 1 days
- reports:
- container_scanning: ./.trivy/trivy-metadata-service-report.json
-
-scan-data-service:
- 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-data-service-report.json dbrepo-data-service:latest
- - trivy image --insecure --exit-code 0 dbrepo-data-service:latest
- - trivy image --insecure --exit-code 1 --severity CRITICAL dbrepo-data-service:latest
- cache:
- paths:
- - .trivycache/
- artifacts:
- when: always
- expire_in: 1 days
- reports:
- container_scanning: ./.trivy/trivy-data-service-report.json
-
-scan-search-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-search-db-report.json dbrepo-search-db:latest
- - trivy image --insecure --exit-code 0 dbrepo-search-db:latest
- - trivy image --insecure --exit-code 1 --severity CRITICAL dbrepo-search-db:latest
- cache:
- paths:
- - .trivycache/
- artifacts:
- when: always
- expire_in: 1 days
- reports:
- container_scanning: ./.trivy/trivy-search-db-report.json
-
-scan-search-service-init:
- 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-search-service-init-report.json dbrepo-search-service-init:latest
- - trivy image --insecure --exit-code 0 dbrepo-search-service-init:latest
- - trivy image --insecure --exit-code 1 --severity CRITICAL dbrepo-search-service-init:latest
- cache:
- paths:
- - .trivycache/
- artifacts:
- when: always
- expire_in: 1 days
- reports:
- container_scanning: ./.trivy/trivy-search-service-init-report.json
-
-scan-data-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-data-db-report.json docker.io/bitnami/mariadb:11.2.2-debian-11-r0
- - trivy image --insecure --exit-code 0 docker.io/bitnami/mariadb:11.2.2-debian-11-r0
- - trivy image --insecure --exit-code 1 --severity CRITICAL docker.io/bitnami/mariadb:11.2.2-debian-11-r0
- cache:
- paths:
- - .trivycache/
- artifacts:
- when: always
- expire_in: 1 days
- 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
- only:
- refs:
- - master
- allow_failure: true
- script:
- - trivy image --insecure --exit-code 0 --format template --template "@.gitlab/gitlab.tpl" -o ./.trivy/trivy-ui-report.json dbrepo-ui:latest
- - trivy image --insecure --exit-code 0 dbrepo-ui:latest
- - trivy image --insecure --exit-code 1 --severity CRITICAL dbrepo-ui:latest
- cache:
- paths:
- - .trivycache/
- artifacts:
- when: always
- expire_in: 1 days
- reports:
- container_scanning: ./.trivy/trivy-ui-report.json
-
-scan-search-service:
- 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-ui-report.json dbrepo-search-service:latest
- - trivy image --insecure --exit-code 0 dbrepo-search-service:latest
- - trivy image --insecure --exit-code 1 --severity CRITICAL dbrepo-search-service:latest
- cache:
- paths:
- - .trivycache/
- artifacts:
- when: always
- expire_in: 1 days
- reports:
- container_scanning: ./.trivy/trivy-ui-report.json
-
-scan-storage-service:
- image: bitnami/trivy:latest
+scan-sonarqube:
+ image: sonarsource/sonar-scanner-cli:10.0
stage: scan
only:
refs:
- master
- allow_failure: true
+ needs:
+ - build-data-service
+ - build-metadata-service
+ dependencies:
+ - build-data-service
+ - build-metadata-service
script:
- - trivy image --insecure --exit-code 0 --format template --template "@.gitlab/gitlab.tpl" -o ./.trivy/trivy-storage-service-report.json docker.io/chrislusf/seaweedfs:3.59
- - trivy image --insecure --exit-code 0 docker.io/chrislusf/seaweedfs:3.59
- - trivy image --insecure --exit-code 1 --severity CRITICAL docker.io/chrislusf/seaweedfs:3.59
- cache:
- paths:
- - .trivycache/
- artifacts:
- when: always
- expire_in: 1 days
- reports:
- container_scanning: ./.trivy/trivy-storage-service-report.json
-
-scan-storage-service-init:
- image: bitnami/trivy:latest
- stage: scan
- only:
- refs:
- - master
+ - 'sonar-scanner -Dsonar.token="${CI_SONAR_TOKEN}"'
allow_failure: true
- script:
- - trivy image --insecure --exit-code 0 --format template --template "@.gitlab/gitlab.tpl" -o ./.trivy/trivy-storage-service-init-report.json dbrepo-storage-service-init:latest
- - trivy image --insecure --exit-code 0 dbrepo-storage-service-init:latest
- - trivy image --insecure --exit-code 1 --severity CRITICAL dbrepo-storage-service-init:latest
cache:
+ policy: pull
+ key: "${CI_COMMIT_SHORT_SHA}"
paths:
- - .trivycache/
- artifacts:
- when: always
- expire_in: 1 days
- reports:
- container_scanning: ./.trivy/trivy-storage-service-init-report.json
+ - sonar-scanner/
docs-registry:
stage: docs
@@ -581,29 +356,38 @@ release-images:
refs:
- /^release-.*/
before_script:
- - "echo ${CI_REGISTRY_PASSWORD} | docker login --username ${CI_REGISTRY_USER} --password-stdin $CI_REGISTRY_URL"
- - "echo ${CI_REGISTRY2_PASSWORD} | docker login --username ${CI_REGISTRY2_USER} --password-stdin $CI_REGISTRY2_URL"
+ - "docker logout ${CI_REGISTRY_URL}"
+ - "echo ${CI_REGISTRY_PASSWORD} | docker login --username ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY_URL}"
+ - "docker logout ${CI_REGISTRY2_URL}"
+ - "echo ${CI_REGISTRY2_PASSWORD} | docker login --username ${CI_REGISTRY2_USER} --password-stdin ${CI_REGISTRY2_URL}"
- "ifconfig eth0 mtu 1450 up"
- "apk add make bash"
script:
- "make release-images"
-release-chart:
+release-helm:
stage: release
image: docker:24-dind
only:
refs:
- /^release-.*/
+ when: manual
except:
refs:
- release-latest
before_script:
- - "echo ${CI_REGISTRY2_PASSWORD} | docker login --username ${CI_REGISTRY2_USER} --password-stdin $CI_REGISTRY2_URL"
+ - "docker logout ${CI_REGISTRY_URL}"
+ - "echo ${CI_REGISTRY_PASSWORD} | docker login --username ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY_URL}"
+ - "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"
- - "helm package ./helm/dbrepo --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 push ./build/dbrepo-${CHART_VERSION}.tgz oci://${CI_REGISTRY2_URL}/helm"
+ - "helm sigstore upload ./build/dbrepo-${CHART_VERSION}.tgz"
release-docs:
stage: release
@@ -612,17 +396,16 @@ release-docs:
refs:
- /^release-.*/
before_script:
- - "wget https://github.com/mikefarah/yq/releases/download/v4.2.0/yq_linux_amd64 -O /usr/bin/yq"
- - "chmod +x /usr/bin/yq"
- "apk add --update alpine-sdk bash sed wget openssh"
+ - "pip install pipenv"
- "pip install -r ./requirements.txt"
- - "mkdir -p ./final/${APP_VERSION}/swagger"
+ - "mkdir -p ./final/${APP_VERSION}/rest"
script:
- "make gen-lib-doc gen-docs-doc"
- - "cp -r ./lib/python/docs/build/html ./final/${APP_VERSION}/sphinx" # sphinx
- - "cp .docs/.swagger/api.yaml ./final/${APP_VERSION}/swagger/api.yaml" # swagger
- - "cp .docs/.swagger/swagger-ui.html ./final/${APP_VERSION}/swagger/index.html" # swagger
- - "cp .docs/.swagger/custom.css ./final/${APP_VERSION}/swagger/custom.css" # swagger
+ - "cp -r ./lib/python/docs/build/html ./final/${APP_VERSION}/python" # sphinx
+ - "cp .docs/.swagger/api.yaml ./final/${APP_VERSION}/rest/api.yaml" # swagger
+ - "cp .docs/.swagger/swagger-ui.html ./final/${APP_VERSION}/rest/index.html" # swagger
+ - "cp .docs/.swagger/custom.css ./final/${APP_VERSION}/rest/custom.css" # swagger
- "cp -r ./site/* ./final/${APP_VERSION}" # mkdocs
- eval $(ssh-agent -s)
- "mkdir -p /root/.ssh"
@@ -633,7 +416,7 @@ release-docs:
- "scp -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa final.tar.gz $CI_DOC_USER@$CI_DOC_IP:final.tar.gz"
- "scp -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa versions.json $CI_DOC_USER@$CI_DOC_IP:/system/user/ifs/infrastructures/public_html/dbrepo/versions.json"
- "scp -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa .docs/redirect.html $CI_DOC_USER@$CI_DOC_IP:/system/user/ifs/infrastructures/public_html/dbrepo/index.html"
- - "ssh -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa $CI_DOC_USER@$CI_DOC_IP 'rm -rf /system/user/ifs/infrastructures/public_html/dbrepo/${APP_VERSION}; tar xzf ./final.tar.gz; rm -f ./final.tar.gz; cp -r ./final/* /system/user/ifs/infrastructures/public_html/dbrepo/${APP_VERSION}; rm -rf ./final'"
+ - 'ssh -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa $CI_DOC_USER@$CI_DOC_IP "rm -rf /system/user/ifs/infrastructures/public_html/dbrepo/${APP_VERSION}; tar xzf ./final.tar.gz; rm -f ./final.tar.gz; cp -r ./final/* /system/user/ifs/infrastructures/public_html/dbrepo/${APP_VERSION}; rm -rf ./final"'
release-libs:
stage: release
@@ -650,4 +433,4 @@ release-libs:
- "pipenv install gunicorn && pipenv install --dev --system --deploy"
script:
- bash ./lib/python/package.sh
- - bash ./lib/python/release.sh
\ No newline at end of file
+ - bash ./lib/python/release.sh
diff --git a/.scripts/docker-prune.sh b/.scripts/docker-prune.sh
deleted file mode 100755
index c82dc1b674247df131682619e8bbf30b3d68f541..0000000000000000000000000000000000000000
--- a/.scripts/docker-prune.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-if [[ "$CI_COMMIT_BRANCH" =~ (dev|master) ]]; then
- echo "pruning for branch ${CI_COMMIT_BRANCH} ..."
- docker system prune -f -a --volumes
-fi
\ No newline at end of file
diff --git a/.scripts/reg-client-secret.sh b/.scripts/reg-client-secret.sh
new file mode 100644
index 0000000000000000000000000000000000000000..260e6ed283d185e2d67380464f0f4c793469a5a4
--- /dev/null
+++ b/.scripts/reg-client-secret.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+USERNAME=""
+PASSWORD=""
+
+fancy () {
+ printf "\e[1;34m$1\e[m"
+}
+
+printf "This is a utility script to re-generate the client secret of the %s client.\n" $(fancy dbrepo-client)
+fancy "Your credentials are never transmitted outside your machine!\n\n"
+
+read -rp "Username: " USERNAME
+read -rsp "Password: " PASSWORD
+
+# get admin token
+ADMIN_ACCESS_TOKEN=$(curl -fsSL -X POST -d "username=${USERNAME}&password=${PASSWORD}&grant_type=password&client_id=admin-cli" http://localhost/api/auth/realms/master/protocol/openid-connect/token | jq -r .access_token)
+if [ -z $ADMIN_ACCESS_TOKEN ]; then
+ printf "\n\nFailed to obtain admin token, credentials may not be correct."
+ exit 1
+fi
+printf "\n\nSuccessfully obtained admin token."
+
+# re-generate client secret
+SECRET=$(curl -fsSL -X POST -H "Authorization: Bearer ${ADMIN_ACCESS_TOKEN}" http://localhost/api/auth/admin/realms/dbrepo/clients/6b7ef364-4132-4831-b4e2-b6e9e9dc63ee/client-secret | jq -r .value)
+if [ -z $SECRET ]; then
+ printf "\n\nFailed to re-generate client secret."
+ exit 1
+fi
+printf "\nSuccessfully re-generated client secret: %s" $(fancy $SECRET)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e6a6e8d951f9c9a486408f47827d7e49ed92820f..4e9c81e56350032ae19e8ced1b1d004c71fab418 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -35,4 +35,11 @@ a couple of days at maximum, one could go directly for a PR. It's fine.
- [ ] Change the maven version in the metadata & data services:
- `mvn -f ./dbrepo-metadata-service/pom.xml versions:set -DnewVersion=VERSION`
- `mvn -f ./dbrepo-data-service/pom.xml versions:set -DnewVersion=VERSION`
-- [ ] Change the versions in `versions.json` for the generated website
\ No newline at end of file
+- [ ] Change the versions in `versions.json` for the generated website
+
+Then generate the REST API-, Python Library- and Helm Chart documentation:
+
+```bash
+# optional: pip install -r ./requirements.txt
+make gen-swagger-doc gen-lib-doc gen-helm-doc
+```
\ No newline at end of file
diff --git a/Makefile b/Makefile
index ea9a9d0ce3f29abf801f4a7769ad788259d33629..b279097f827becd26e3e39da0bbf866fd513516f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
.PHONY: all
-APP_VERSION ?= 1.4.4
-CHART_VERSION ?= 1.4.4
-REPOSITORY_URL ?= docker.io/dbrepo
+APP_VERSION ?= 1.4.5
+CHART_VERSION ?= 1.4.5
+REPOSITORY_URL ?= registry.datalab.tuwien.ac.at/dbrepo
.PHONY: all
all: help
diff --git a/README.md b/README.md
index f33e9602e0de7d5bd3ac730d0ef8272126696a96..e4f843507c43232f4817dbd562b49594d75d9385 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@
+
+
<img src="./dbrepo-ui/public/logo.png" width="200" alt="DBRepo — Repository for Data in Databases" />
@@ -13,7 +15,7 @@ If you have [Docker](https://docs.docker.com/engine/install/) already installed
with:
```bash
-curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.3/install.sh | bash
+curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.5/install.sh | bash
```
## Documentation
@@ -71,4 +73,4 @@ We want to thank the following organizations:
## License
-The source code is licensed under [Apache 2.0](https://opensource.org/licenses/Apache-2.0).
\ No newline at end of file
+The source code is licensed under [Apache 2.0](https://opensource.org/licenses/Apache-2.0).
diff --git a/dbrepo-analyse-service/Dockerfile b/dbrepo-analyse-service/Dockerfile
index 980c11cd19227b9e08627b690e74565791a3cf30..97b181c76e3e5207dc145ba2d02f45c78fb27e71 100644
--- a/dbrepo-analyse-service/Dockerfile
+++ b/dbrepo-analyse-service/Dockerfile
@@ -1,5 +1,5 @@
FROM python:3.11-alpine
-MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
+LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
RUN apk add bash curl
diff --git a/dbrepo-analyse-service/Pipfile b/dbrepo-analyse-service/Pipfile
index 98166931a4f958a9ea6a5c94187e5d02d2014b4c..a0fb0bfd7be1fdb83dfacbcf42dc1bc557f83d82 100644
--- a/dbrepo-analyse-service/Pipfile
+++ b/dbrepo-analyse-service/Pipfile
@@ -21,7 +21,7 @@ numpy = "*"
pandas = "*"
minio = "*"
pydantic = "*"
-dbrepo = {path = "./lib/dbrepo-1.4.4.tar.gz"}
+dbrepo = {path = "./lib/dbrepo-1.4.5.tar.gz"}
opensearch-py = "*"
[dev-packages]
diff --git a/dbrepo-analyse-service/Pipfile.lock b/dbrepo-analyse-service/Pipfile.lock
index 2ff8fb46f4e99f2f0b27aea880d3d3b7779bfabb..a47ad241be71bb73dd72e470f0d84c8ecf528c97 100644
--- a/dbrepo-analyse-service/Pipfile.lock
+++ b/dbrepo-analyse-service/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "f862bcd0c3285ad0a48d0d0f738bddf0f3c1d2c5d263af9e07994463e39e5610"
+ "sha256": "a445bc066f06e174431552d155daabfdb4271e7f6ba781b61611e816ad8bf48c"
},
"pipfile-spec": 6,
"requires": {
@@ -167,27 +167,28 @@
},
"boto3": {
"hashes": [
- "sha256:42b140fc850cf261ee4b1e8ef527fa071b1f1592a6d6a68d34b29f37cc46b4dd",
- "sha256:56bec52d485d5670ce96d53ae7b2cd4ae4e8a705fb2298a21093cdd77d642331"
+ "sha256:11edeeacdd517bda3b7615b754d8440820cdc9ddd66794cc995a9693ddeaa3be",
+ "sha256:f4e6489ba9dc7fb37d53e0e82dbc97f2cb0a4969ef3970e2c88b8f94023ae81a"
],
"index": "pypi",
- "version": "==1.34.123"
+ "markers": "python_version >= '3.8'",
+ "version": "==1.34.149"
},
"botocore": {
"hashes": [
- "sha256:8c34ada2a708c82e7174bff700611643db7ce2cb18f1130c35045c24310d299d",
- "sha256:a8577f6574600c4d159b5cd103ee05744a443d77f7778304e17307940b369c4f"
+ "sha256:2e1eb5ef40102a3d796bb3dd05f2ac5e8fb43fe1ff114b4f6d33153437f5a372",
+ "sha256:ae6c4be52eeee96f68c116b27d252bab069cd046d61a17cfe8e9da411cf22906"
],
"markers": "python_version >= '3.8'",
- "version": "==1.34.123"
+ "version": "==1.34.149"
},
"certifi": {
"hashes": [
- "sha256:3cd43f1c6fa7dedc5899d69d3ad0398fd018ad1a17fba83ddaf78aa46c747516",
- "sha256:ddc6c8ce995e6987e7faf5e3f1b02b302836a0e5d98ece18392cb1a36c72ad56"
+ "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b",
+ "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"
],
"markers": "python_version >= '3.6'",
- "version": "==2024.6.2"
+ "version": "==2024.7.4"
},
"cffi": {
"hashes": [
@@ -247,6 +248,15 @@
"markers": "platform_python_implementation != 'PyPy'",
"version": "==1.16.0"
},
+ "chardet": {
+ "hashes": [
+ "sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7",
+ "sha256:e1cf59446890a00105fe7b7912492ea04b6e6f06d4b742b2c788469e34c82970"
+ ],
+ "index": "pypi",
+ "markers": "python_version >= '3.7'",
+ "version": "==5.2.0"
+ },
"charset-normalizer": {
"hashes": [
"sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027",
@@ -353,49 +363,44 @@
},
"cryptography": {
"hashes": [
- "sha256:013629ae70b40af70c9a7a5db40abe5d9054e6f4380e50ce769947b73bf3caad",
- "sha256:2346b911eb349ab547076f47f2e035fc8ff2c02380a7cbbf8d87114fa0f1c583",
- "sha256:2f66d9cd9147ee495a8374a45ca445819f8929a3efcd2e3df6428e46c3cbb10b",
- "sha256:2f88d197e66c65be5e42cd72e5c18afbfae3f741742070e3019ac8f4ac57262c",
- "sha256:31f721658a29331f895a5a54e7e82075554ccfb8b163a18719d342f5ffe5ecb1",
- "sha256:343728aac38decfdeecf55ecab3264b015be68fc2816ca800db649607aeee648",
- "sha256:5226d5d21ab681f432a9c1cf8b658c0cb02533eece706b155e5fbd8a0cdd3949",
- "sha256:57080dee41209e556a9a4ce60d229244f7a66ef52750f813bfbe18959770cfba",
- "sha256:5a94eccb2a81a309806027e1670a358b99b8fe8bfe9f8d329f27d72c094dde8c",
- "sha256:6b7c4f03ce01afd3b76cf69a5455caa9cfa3de8c8f493e0d3ab7d20611c8dae9",
- "sha256:7016f837e15b0a1c119d27ecd89b3515f01f90a8615ed5e9427e30d9cdbfed3d",
- "sha256:81884c4d096c272f00aeb1f11cf62ccd39763581645b0812e99a91505fa48e0c",
- "sha256:81d8a521705787afe7a18d5bfb47ea9d9cc068206270aad0b96a725022e18d2e",
- "sha256:8d09d05439ce7baa8e9e95b07ec5b6c886f548deb7e0f69ef25f64b3bce842f2",
- "sha256:961e61cefdcb06e0c6d7e3a1b22ebe8b996eb2bf50614e89384be54c48c6b63d",
- "sha256:9c0c1716c8447ee7dbf08d6db2e5c41c688544c61074b54fc4564196f55c25a7",
- "sha256:a0608251135d0e03111152e41f0cc2392d1e74e35703960d4190b2e0f4ca9c70",
- "sha256:a0c5b2b0585b6af82d7e385f55a8bc568abff8923af147ee3c07bd8b42cda8b2",
- "sha256:ad803773e9df0b92e0a817d22fd8a3675493f690b96130a5e24f1b8fabbea9c7",
- "sha256:b297f90c5723d04bcc8265fc2a0f86d4ea2e0f7ab4b6994459548d3a6b992a14",
- "sha256:ba4f0a211697362e89ad822e667d8d340b4d8d55fae72cdd619389fb5912eefe",
- "sha256:c4783183f7cb757b73b2ae9aed6599b96338eb957233c58ca8f49a49cc32fd5e",
- "sha256:c9bb2ae11bfbab395bdd072985abde58ea9860ed84e59dbc0463a5d0159f5b71",
- "sha256:cafb92b2bc622cd1aa6a1dce4b93307792633f4c5fe1f46c6b97cf67073ec961",
- "sha256:d45b940883a03e19e944456a558b67a41160e367a719833c53de6911cabba2b7",
- "sha256:dc0fdf6787f37b1c6b08e6dfc892d9d068b5bdb671198c72072828b80bd5fe4c",
- "sha256:dea567d1b0e8bc5764b9443858b673b734100c2871dc93163f58c46a97a83d28",
- "sha256:dec9b018df185f08483f294cae6ccac29e7a6e0678996587363dc352dc65c842",
- "sha256:e3ec3672626e1b9e55afd0df6d774ff0e953452886e06e0f1eb7eb0c832e8902",
- "sha256:e599b53fd95357d92304510fb7bda8523ed1f79ca98dce2f43c115950aa78801",
- "sha256:fa76fbb7596cc5839320000cdd5d0955313696d9511debab7ee7278fc8b5c84a",
- "sha256:fff12c88a672ab9c9c1cf7b0c80e3ad9e2ebd9d828d955c126be4fd3e5578c9e"
+ "sha256:0663585d02f76929792470451a5ba64424acc3cd5227b03921dab0e2f27b1709",
+ "sha256:08a24a7070b2b6804c1940ff0f910ff728932a9d0e80e7814234269f9d46d069",
+ "sha256:232ce02943a579095a339ac4b390fbbe97f5b5d5d107f8a08260ea2768be8cc2",
+ "sha256:2905ccf93a8a2a416f3ec01b1a7911c3fe4073ef35640e7ee5296754e30b762b",
+ "sha256:299d3da8e00b7e2b54bb02ef58d73cd5f55fb31f33ebbf33bd00d9aa6807df7e",
+ "sha256:2c6d112bf61c5ef44042c253e4859b3cbbb50df2f78fa8fae6747a7814484a70",
+ "sha256:31e44a986ceccec3d0498e16f3d27b2ee5fdf69ce2ab89b52eaad1d2f33d8778",
+ "sha256:3d9a1eca329405219b605fac09ecfc09ac09e595d6def650a437523fcd08dd22",
+ "sha256:3dcdedae5c7710b9f97ac6bba7e1052b95c7083c9d0e9df96e02a1932e777895",
+ "sha256:47ca71115e545954e6c1d207dd13461ab81f4eccfcb1345eac874828b5e3eaaf",
+ "sha256:4a997df8c1c2aae1e1e5ac49c2e4f610ad037fc5a3aadc7b64e39dea42249431",
+ "sha256:51956cf8730665e2bdf8ddb8da0056f699c1a5715648c1b0144670c1ba00b48f",
+ "sha256:5bcb8a5620008a8034d39bce21dc3e23735dfdb6a33a06974739bfa04f853947",
+ "sha256:64c3f16e2a4fc51c0d06af28441881f98c5d91009b8caaff40cf3548089e9c74",
+ "sha256:6e2b11c55d260d03a8cf29ac9b5e0608d35f08077d8c087be96287f43af3ccdc",
+ "sha256:7b3f5fe74a5ca32d4d0f302ffe6680fcc5c28f8ef0dc0ae8f40c0f3a1b4fca66",
+ "sha256:844b6d608374e7d08f4f6e6f9f7b951f9256db41421917dfb2d003dde4cd6b66",
+ "sha256:9a8d6802e0825767476f62aafed40532bd435e8a5f7d23bd8b4f5fd04cc80ecf",
+ "sha256:aae4d918f6b180a8ab8bf6511a419473d107df4dbb4225c7b48c5c9602c38c7f",
+ "sha256:ac1955ce000cb29ab40def14fd1bbfa7af2017cca696ee696925615cafd0dce5",
+ "sha256:b88075ada2d51aa9f18283532c9f60e72170041bba88d7f37e49cbb10275299e",
+ "sha256:cb013933d4c127349b3948aa8aaf2f12c0353ad0eccd715ca789c8a0f671646f",
+ "sha256:cc70b4b581f28d0a254d006f26949245e3657d40d8857066c2ae22a61222ef55",
+ "sha256:e9c5266c432a1e23738d178e51c2c7a5e2ddf790f248be939448c0ba2021f9d1",
+ "sha256:ea9e57f8ea880eeea38ab5abf9fbe39f923544d7884228ec67d666abd60f5a47",
+ "sha256:ee0c405832ade84d4de74b9029bedb7b31200600fa524d218fc29bfa371e97f5",
+ "sha256:fdcb265de28585de5b859ae13e3846a8e805268a823a12a4da2597f1f5afc9f0"
],
"markers": "python_version >= '3.7'",
- "version": "==42.0.8"
+ "version": "==43.0.0"
},
"dbrepo": {
"hashes": [
- "sha256:2506475fc8fb3f4fdd722e3e92f8e6ad28d0707023c3d8ea5d6d076cef71f395",
- "sha256:2bdb48c70b4c99b5044fbfc12aa653c1e9281ca8913a433cc08a1e14cb4bd2ef"
+ "sha256:0a04b67204de6dc969ec68fb21aaead898156077e8a5b6f1e03bb5ab0e124a61",
+ "sha256:454a182b772cb777d27a22bb334bf059ce68d4e6b5fecae802678fabfdf3f934"
],
- "path": "./lib/dbrepo-1.4.4.tar.gz",
- "version": "==1.4.4"
+ "markers": "python_version >= '3.11'",
+ "path": "./lib/dbrepo-1.4.5.tar.gz"
},
"events": {
"hashes": [
@@ -405,11 +410,12 @@
},
"exceptiongroup": {
"hashes": [
- "sha256:5258b9ed329c5bbdd31a309f53cbfb0b155341807f6ff7606a1e801a891b29ad",
- "sha256:a4785e48b045528f5bfe627b6ad554ff32def154f42372786903b7abcfe1aa16"
+ "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b",
+ "sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc"
],
"index": "pypi",
- "version": "==1.2.1"
+ "markers": "python_version >= '3.7'",
+ "version": "==1.2.2"
},
"flasgger": {
"hashes": [
@@ -424,6 +430,7 @@
"sha256:ceb27b0af3823ea2737928a4d99d125a06175b8512c445cbd9a9ce200ef76842"
],
"index": "pypi",
+ "markers": "python_version >= '3.8'",
"version": "==3.0.3"
},
"flask-cors": {
@@ -448,6 +455,7 @@
"sha256:9215d05a9413d3855764bcd67035e75819d23af2fafb6b55197eb5a3313fdfb2"
],
"index": "pypi",
+ "markers": "python_version >= '3.7' and python_version < '4'",
"version": "==4.6.0"
},
"frozenlist": {
@@ -578,6 +586,7 @@
"sha256:fbfdce91239fe306772faab57597186710d5699213f4df099d1612da7320d682"
],
"index": "pypi",
+ "markers": "python_version >= '3.8'",
"version": "==24.2.1"
},
"greenlet": {
@@ -642,6 +651,7 @@
"sha256:fe754d231288e1e64323cfad462fcee8f0288654c10bdf4f603a39ed923bef33"
],
"index": "pypi",
+ "markers": "python_version >= '3.7'",
"version": "==3.0.3"
},
"gunicorn": {
@@ -650,6 +660,7 @@
"sha256:4a0b436239ff76fb33f11c07a16482c521a7e09c1ce3cc293c2330afe01bec63"
],
"index": "pypi",
+ "markers": "python_version >= '3.7'",
"version": "==22.0.0"
},
"idna": {
@@ -686,11 +697,11 @@
},
"jsonschema": {
"hashes": [
- "sha256:5b22d434a45935119af990552c862e5d6d564e8f6601206b305a61fdf661a2b7",
- "sha256:ff4cfd6b1367a40e7bc6411caec72effadd3db0bbe5017de188f2d6108335802"
+ "sha256:d71497fef26351a33265337fa77ffeb82423f3ea21283cd9467bb03999266bc4",
+ "sha256:fbadb6f8b144a8f8cf9f0b89ba94501d143e50411a1278633f56a7acf7fd5566"
],
"markers": "python_version >= '3.8'",
- "version": "==4.22.0"
+ "version": "==4.23.0"
},
"jsonschema-specifications": {
"hashes": [
@@ -705,6 +716,7 @@
"sha256:61c9170f92e736b530655e75374681d4fcca9cfa8763ab42be57353b2b203494"
],
"index": "pypi",
+ "markers": "python_version >= '3.6'",
"version": "==1.3.1"
},
"markupsafe": {
@@ -887,45 +899,55 @@
},
"numpy": {
"hashes": [
- "sha256:03a8c78d01d9781b28a6989f6fa1bb2c4f2d51201cf99d3dd875df6fbd96b23b",
- "sha256:08beddf13648eb95f8d867350f6a018a4be2e5ad54c8d8caed89ebca558b2818",
- "sha256:1af303d6b2210eb850fcf03064d364652b7120803a0b872f5211f5234b399f20",
- "sha256:1dda2e7b4ec9dd512f84935c5f126c8bd8b9f2fc001e9f54af255e8c5f16b0e0",
- "sha256:2a02aba9ed12e4ac4eb3ea9421c420301a0c6460d9830d74a9df87efa4912010",
- "sha256:2e4ee3380d6de9c9ec04745830fd9e2eccb3e6cf790d39d7b98ffd19b0dd754a",
- "sha256:3373d5d70a5fe74a2c1bb6d2cfd9609ecf686d47a2d7b1d37a8f3b6bf6003aea",
- "sha256:47711010ad8555514b434df65f7d7b076bb8261df1ca9bb78f53d3b2db02e95c",
- "sha256:4c66707fabe114439db9068ee468c26bbdf909cac0fb58686a42a24de1760c71",
- "sha256:50193e430acfc1346175fcbdaa28ffec49947a06918b7b92130744e81e640110",
- "sha256:52b8b60467cd7dd1e9ed082188b4e6bb35aa5cdd01777621a1658910745b90be",
- "sha256:60dedbb91afcbfdc9bc0b1f3f402804070deed7392c23eb7a7f07fa857868e8a",
- "sha256:62b8e4b1e28009ef2846b4c7852046736bab361f7aeadeb6a5b89ebec3c7055a",
- "sha256:666dbfb6ec68962c033a450943ded891bed2d54e6755e35e5835d63f4f6931d5",
- "sha256:675d61ffbfa78604709862923189bad94014bef562cc35cf61d3a07bba02a7ed",
- "sha256:679b0076f67ecc0138fd2ede3a8fd196dddc2ad3254069bcb9faf9a79b1cebcd",
- "sha256:7349ab0fa0c429c82442a27a9673fc802ffdb7c7775fad780226cb234965e53c",
- "sha256:7ab55401287bfec946ced39700c053796e7cc0e3acbef09993a9ad2adba6ca6e",
- "sha256:7e50d0a0cc3189f9cb0aeb3a6a6af18c16f59f004b866cd2be1c14b36134a4a0",
- "sha256:95a7476c59002f2f6c590b9b7b998306fba6a5aa646b1e22ddfeaf8f78c3a29c",
- "sha256:96ff0b2ad353d8f990b63294c8986f1ec3cb19d749234014f4e7eb0112ceba5a",
- "sha256:9fad7dcb1aac3c7f0584a5a8133e3a43eeb2fe127f47e3632d43d677c66c102b",
- "sha256:9ff0f4f29c51e2803569d7a51c2304de5554655a60c5d776e35b4a41413830d0",
- "sha256:a354325ee03388678242a4d7ebcd08b5c727033fcff3b2f536aea978e15ee9e6",
- "sha256:a4abb4f9001ad2858e7ac189089c42178fcce737e4169dc61321660f1a96c7d2",
- "sha256:ab47dbe5cc8210f55aa58e4805fe224dac469cde56b9f731a4c098b91917159a",
- "sha256:afedb719a9dcfc7eaf2287b839d8198e06dcd4cb5d276a3df279231138e83d30",
- "sha256:b3ce300f3644fb06443ee2222c2201dd3a89ea6040541412b8fa189341847218",
- "sha256:b97fe8060236edf3662adfc2c633f56a08ae30560c56310562cb4f95500022d5",
- "sha256:bfe25acf8b437eb2a8b2d49d443800a5f18508cd811fea3181723922a8a82b07",
- "sha256:cd25bcecc4974d09257ffcd1f098ee778f7834c3ad767fe5db785be9a4aa9cb2",
- "sha256:d209d8969599b27ad20994c8e41936ee0964e6da07478d6c35016bc386b66ad4",
- "sha256:d5241e0a80d808d70546c697135da2c613f30e28251ff8307eb72ba696945764",
- "sha256:edd8b5fe47dab091176d21bb6de568acdd906d1887a4584a15a9a96a1dca06ef",
- "sha256:f870204a840a60da0b12273ef34f7051e98c3b5961b61b0c2c1be6dfd64fbcd3",
- "sha256:ffa75af20b44f8dba823498024771d5ac50620e6915abac414251bd971b4529f"
+ "sha256:08458fbf403bff5e2b45f08eda195d4b0c9b35682311da5a5a0a0925b11b9bd8",
+ "sha256:0fbb536eac80e27a2793ffd787895242b7f18ef792563d742c2d673bfcb75134",
+ "sha256:12f5d865d60fb9734e60a60f1d5afa6d962d8d4467c120a1c0cda6eb2964437d",
+ "sha256:15eb4eca47d36ec3f78cde0a3a2ee24cf05ca7396ef808dda2c0ddad7c2bde67",
+ "sha256:173a00b9995f73b79eb0191129f2455f1e34c203f559dd118636858cc452a1bf",
+ "sha256:1b902ce0e0a5bb7704556a217c4f63a7974f8f43e090aff03fcf262e0b135e02",
+ "sha256:1f682ea61a88479d9498bf2091fdcd722b090724b08b31d63e022adc063bad59",
+ "sha256:1f87fec1f9bc1efd23f4227becff04bd0e979e23ca50cc92ec88b38489db3b55",
+ "sha256:24a0e1befbfa14615b49ba9659d3d8818a0f4d8a1c5822af8696706fbda7310c",
+ "sha256:2c3a346ae20cfd80b6cfd3e60dc179963ef2ea58da5ec074fd3d9e7a1e7ba97f",
+ "sha256:36d3a9405fd7c511804dc56fc32974fa5533bdeb3cd1604d6b8ff1d292b819c4",
+ "sha256:3fdabe3e2a52bc4eff8dc7a5044342f8bd9f11ef0934fcd3289a788c0eb10018",
+ "sha256:4127d4303b9ac9f94ca0441138acead39928938660ca58329fe156f84b9f3015",
+ "sha256:4658c398d65d1b25e1760de3157011a80375da861709abd7cef3bad65d6543f9",
+ "sha256:485b87235796410c3519a699cfe1faab097e509e90ebb05dcd098db2ae87e7b3",
+ "sha256:529af13c5f4b7a932fb0e1911d3a75da204eff023ee5e0e79c1751564221a5c8",
+ "sha256:5a3d94942c331dd4e0e1147f7a8699a4aa47dffc11bf8a1523c12af8b2e91bbe",
+ "sha256:5daab361be6ddeb299a918a7c0864fa8618af66019138263247af405018b04e1",
+ "sha256:61728fba1e464f789b11deb78a57805c70b2ed02343560456190d0501ba37b0f",
+ "sha256:6790654cb13eab303d8402354fabd47472b24635700f631f041bd0b65e37298a",
+ "sha256:69ff563d43c69b1baba77af455dd0a839df8d25e8590e79c90fcbe1499ebde42",
+ "sha256:6bf4e6f4a2a2e26655717a1983ef6324f2664d7011f6ef7482e8c0b3d51e82ac",
+ "sha256:6e4eeb6eb2fced786e32e6d8df9e755ce5be920d17f7ce00bc38fcde8ccdbf9e",
+ "sha256:72dc22e9ec8f6eaa206deb1b1355eb2e253899d7347f5e2fae5f0af613741d06",
+ "sha256:75b4e316c5902d8163ef9d423b1c3f2f6252226d1aa5cd8a0a03a7d01ffc6268",
+ "sha256:7b9853803278db3bdcc6cd5beca37815b133e9e77ff3d4733c247414e78eb8d1",
+ "sha256:7d6fddc5fe258d3328cd8e3d7d3e02234c5d70e01ebe377a6ab92adb14039cb4",
+ "sha256:81b0893a39bc5b865b8bf89e9ad7807e16717f19868e9d234bdaf9b1f1393868",
+ "sha256:8efc84f01c1cd7e34b3fb310183e72fcdf55293ee736d679b6d35b35d80bba26",
+ "sha256:8fae4ebbf95a179c1156fab0b142b74e4ba4204c87bde8d3d8b6f9c34c5825ef",
+ "sha256:99d0d92a5e3613c33a5f01db206a33f8fdf3d71f2912b0de1739894668b7a93b",
+ "sha256:9adbd9bb520c866e1bfd7e10e1880a1f7749f1f6e5017686a5fbb9b72cf69f82",
+ "sha256:a1e01dcaab205fbece13c1410253a9eea1b1c9b61d237b6fa59bcc46e8e89343",
+ "sha256:a8fc2de81ad835d999113ddf87d1ea2b0f4704cbd947c948d2f5513deafe5a7b",
+ "sha256:b83e16a5511d1b1f8a88cbabb1a6f6a499f82c062a4251892d9ad5d609863fb7",
+ "sha256:bb2124fdc6e62baae159ebcfa368708867eb56806804d005860b6007388df171",
+ "sha256:bfc085b28d62ff4009364e7ca34b80a9a080cbd97c2c0630bb5f7f770dae9414",
+ "sha256:cbab9fc9c391700e3e1287666dfd82d8666d10e69a6c4a09ab97574c0b7ee0a7",
+ "sha256:e5eeca8067ad04bc8a2a8731183d51d7cbaac66d86085d5f4766ee6bf19c7f87",
+ "sha256:e9e81fa9017eaa416c056e5d9e71be93d05e2c3c2ab308d23307a8bc4443c368",
+ "sha256:ea2326a4dca88e4a274ba3a4405eb6c6467d3ffbd8c7d38632502eaae3820587",
+ "sha256:eacf3291e263d5a67d8c1a581a8ebbcfd6447204ef58828caf69a5e3e8c75990",
+ "sha256:ec87f5f8aca726117a1c9b7083e7656a9d0d606eec7299cc067bb83d26f16e0c",
+ "sha256:f1659887361a7151f89e79b276ed8dff3d75877df906328f14d8bb40bb4f5101",
+ "sha256:f9cf5ea551aec449206954b075db819f52adc1638d46a6738253a712d553c7b4"
],
"index": "pypi",
- "version": "==1.26.4"
+ "markers": "python_version >= '3.9'",
+ "version": "==2.0.1"
},
"opensearch-py": {
"hashes": [
@@ -933,6 +955,7 @@
"sha256:b6e78b685dd4e9c016d7a4299cf1de69e299c88322e3f81c716e6e23fe5683c1"
],
"index": "pypi",
+ "markers": "python_version >= '3.8' and python_version < '4'",
"version": "==2.6.0"
},
"packaging": {
@@ -976,6 +999,7 @@
"sha256:eee3a87076c0756de40b05c5e9a6069c035ba43e8dd71c379e68cab2c20f16ad"
],
"index": "pypi",
+ "markers": "python_version >= '3.9'",
"version": "==2.2.2"
},
"pika": {
@@ -996,11 +1020,11 @@
},
"prometheus-flask-exporter": {
"hashes": [
- "sha256:7a026b4fdd54ebeddb77589333efe3a1ec43c7c717468825b0b3e9b6c33f7e9e",
- "sha256:e4e6beb1b8e1e164da6d70fe1edefc95ef184f113b5047f66f4b7262233da9c0"
+ "sha256:587c770a1061e93d72c5cbcdefbd7b633fb764e39dffd7dd16932c9124559244",
+ "sha256:ab49b2c40b57cd35cd51e91e59b3c306b3754477095c4f3cf679034c5122398c"
],
"index": "pypi",
- "version": "==0.23.0"
+ "version": "==0.23.1"
},
"pycparser": {
"hashes": [
@@ -1050,96 +1074,107 @@
},
"pydantic": {
"hashes": [
- "sha256:c46c76a40bb1296728d7a8b99aa73dd70a48c3510111ff290034f860c99c419e",
- "sha256:ea91b002777bf643bb20dd717c028ec43216b24a6001a280f83877fd2655d0b4"
+ "sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a",
+ "sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8"
],
"index": "pypi",
- "version": "==2.7.3"
+ "markers": "python_version >= '3.8'",
+ "version": "==2.8.2"
},
"pydantic-core": {
"hashes": [
- "sha256:01dd777215e2aa86dfd664daed5957704b769e726626393438f9c87690ce78c3",
- "sha256:0eb2a4f660fcd8e2b1c90ad566db2b98d7f3f4717c64fe0a83e0adb39766d5b8",
- "sha256:0fbbdc827fe5e42e4d196c746b890b3d72876bdbf160b0eafe9f0334525119c8",
- "sha256:123c3cec203e3f5ac7b000bd82235f1a3eced8665b63d18be751f115588fea30",
- "sha256:14601cdb733d741b8958224030e2bfe21a4a881fb3dd6fbb21f071cabd48fa0a",
- "sha256:18f469a3d2a2fdafe99296a87e8a4c37748b5080a26b806a707f25a902c040a8",
- "sha256:19894b95aacfa98e7cb093cd7881a0c76f55731efad31073db4521e2b6ff5b7d",
- "sha256:1b4de2e51bbcb61fdebd0ab86ef28062704f62c82bbf4addc4e37fa4b00b7cbc",
- "sha256:1d886dc848e60cb7666f771e406acae54ab279b9f1e4143babc9c2258213daa2",
- "sha256:1f4d26ceb5eb9eed4af91bebeae4b06c3fb28966ca3a8fb765208cf6b51102ab",
- "sha256:21a5e440dbe315ab9825fcd459b8814bb92b27c974cbc23c3e8baa2b76890077",
- "sha256:293afe532740370aba8c060882f7d26cfd00c94cae32fd2e212a3a6e3b7bc15e",
- "sha256:2f5966897e5461f818e136b8451d0551a2e77259eb0f73a837027b47dc95dab9",
- "sha256:2fd41f6eff4c20778d717af1cc50eca52f5afe7805ee530a4fbd0bae284f16e9",
- "sha256:2fdf2156aa3d017fddf8aea5adfba9f777db1d6022d392b682d2a8329e087cef",
- "sha256:3c40d4eaad41f78e3bbda31b89edc46a3f3dc6e171bf0ecf097ff7a0ffff7cb1",
- "sha256:43d447dd2ae072a0065389092a231283f62d960030ecd27565672bd40746c507",
- "sha256:44a688331d4a4e2129140a8118479443bd6f1905231138971372fcde37e43528",
- "sha256:44c7486a4228413c317952e9d89598bcdfb06399735e49e0f8df643e1ccd0558",
- "sha256:44cd83ab6a51da80fb5adbd9560e26018e2ac7826f9626bc06ca3dc074cd198b",
- "sha256:46387e38bd641b3ee5ce247563b60c5ca098da9c56c75c157a05eaa0933ed154",
- "sha256:4701b19f7e3a06ea655513f7938de6f108123bf7c86bbebb1196eb9bd35cf724",
- "sha256:4748321b5078216070b151d5271ef3e7cc905ab170bbfd27d5c83ee3ec436695",
- "sha256:4b06beb3b3f1479d32befd1f3079cc47b34fa2da62457cdf6c963393340b56e9",
- "sha256:4d0dcc59664fcb8974b356fe0a18a672d6d7cf9f54746c05f43275fc48636851",
- "sha256:4e99bc050fe65c450344421017f98298a97cefc18c53bb2f7b3531eb39bc7805",
- "sha256:509daade3b8649f80d4e5ff21aa5673e4ebe58590b25fe42fac5f0f52c6f034a",
- "sha256:51991a89639a912c17bef4b45c87bd83593aee0437d8102556af4885811d59f5",
- "sha256:53db086f9f6ab2b4061958d9c276d1dbe3690e8dd727d6abf2321d6cce37fa94",
- "sha256:564d7922e4b13a16b98772441879fcdcbe82ff50daa622d681dd682175ea918c",
- "sha256:574d92eac874f7f4db0ca653514d823a0d22e2354359d0759e3f6a406db5d55d",
- "sha256:578e24f761f3b425834f297b9935e1ce2e30f51400964ce4801002435a1b41ef",
- "sha256:59ff3e89f4eaf14050c8022011862df275b552caef8082e37b542b066ce1ff26",
- "sha256:5f09baa656c904807e832cf9cce799c6460c450c4ad80803517032da0cd062e2",
- "sha256:6891a2ae0e8692679c07728819b6e2b822fb30ca7445f67bbf6509b25a96332c",
- "sha256:6a750aec7bf431517a9fd78cb93c97b9b0c496090fee84a47a0d23668976b4b0",
- "sha256:6f5c4d41b2771c730ea1c34e458e781b18cc668d194958e0112455fff4e402b2",
- "sha256:77450e6d20016ec41f43ca4a6c63e9fdde03f0ae3fe90e7c27bdbeaece8b1ed4",
- "sha256:81b5efb2f126454586d0f40c4d834010979cb80785173d1586df845a632e4e6d",
- "sha256:823be1deb01793da05ecb0484d6c9e20baebb39bd42b5d72636ae9cf8350dbd2",
- "sha256:834b5230b5dfc0c1ec37b2fda433b271cbbc0e507560b5d1588e2cc1148cf1ce",
- "sha256:847a35c4d58721c5dc3dba599878ebbdfd96784f3fb8bb2c356e123bdcd73f34",
- "sha256:86110d7e1907ab36691f80b33eb2da87d780f4739ae773e5fc83fb272f88825f",
- "sha256:8951eee36c57cd128f779e641e21eb40bc5073eb28b2d23f33eb0ef14ffb3f5d",
- "sha256:8a7164fe2005d03c64fd3b85649891cd4953a8de53107940bf272500ba8a788b",
- "sha256:8b8bab4c97248095ae0c4455b5a1cd1cdd96e4e4769306ab19dda135ea4cdb07",
- "sha256:90afc12421df2b1b4dcc975f814e21bc1754640d502a2fbcc6d41e77af5ec312",
- "sha256:938cb21650855054dc54dfd9120a851c974f95450f00683399006aa6e8abb057",
- "sha256:942ba11e7dfb66dc70f9ae66b33452f51ac7bb90676da39a7345e99ffb55402d",
- "sha256:972658f4a72d02b8abfa2581d92d59f59897d2e9f7e708fdabe922f9087773af",
- "sha256:97736815b9cc893b2b7f663628e63f436018b75f44854c8027040e05230eeddb",
- "sha256:98906207f29bc2c459ff64fa007afd10a8c8ac080f7e4d5beff4c97086a3dabd",
- "sha256:99457f184ad90235cfe8461c4d70ab7dd2680e28821c29eca00252ba90308c78",
- "sha256:a0d829524aaefdebccb869eed855e2d04c21d2d7479b6cada7ace5448416597b",
- "sha256:a2fdd81edd64342c85ac7cf2753ccae0b79bf2dfa063785503cb85a7d3593223",
- "sha256:a55b5b16c839df1070bc113c1f7f94a0af4433fcfa1b41799ce7606e5c79ce0a",
- "sha256:a642295cd0c8df1b86fc3dced1d067874c353a188dc8e0f744626d49e9aa51c4",
- "sha256:ab86ce7c8f9bea87b9d12c7f0af71102acbf5ecbc66c17796cff45dae54ef9a5",
- "sha256:abc267fa9837245cc28ea6929f19fa335f3dc330a35d2e45509b6566dc18be23",
- "sha256:ae1d6df168efb88d7d522664693607b80b4080be6750c913eefb77e34c12c71a",
- "sha256:b2ebef0e0b4454320274f5e83a41844c63438fdc874ea40a8b5b4ecb7693f1c4",
- "sha256:b48ece5bde2e768197a2d0f6e925f9d7e3e826f0ad2271120f8144a9db18d5c8",
- "sha256:b7cdf28938ac6b8b49ae5e92f2735056a7ba99c9b110a474473fd71185c1af5d",
- "sha256:bb4462bd43c2460774914b8525f79b00f8f407c945d50881568f294c1d9b4443",
- "sha256:bc4ff9805858bd54d1a20efff925ccd89c9d2e7cf4986144b30802bf78091c3e",
- "sha256:c1322d7dd74713dcc157a2b7898a564ab091ca6c58302d5c7b4c07296e3fd00f",
- "sha256:c67598100338d5d985db1b3d21f3619ef392e185e71b8d52bceacc4a7771ea7e",
- "sha256:ca26a1e73c48cfc54c4a76ff78df3727b9d9f4ccc8dbee4ae3f73306a591676d",
- "sha256:d323a01da91851a4f17bf592faf46149c9169d68430b3146dcba2bb5e5719abc",
- "sha256:dc1803ac5c32ec324c5261c7209e8f8ce88e83254c4e1aebdc8b0a39f9ddb443",
- "sha256:e00a3f196329e08e43d99b79b286d60ce46bed10f2280d25a1718399457e06be",
- "sha256:e85637bc8fe81ddb73fda9e56bab24560bdddfa98aa64f87aaa4e4b6730c23d2",
- "sha256:e858ac0a25074ba4bce653f9b5d0a85b7456eaddadc0ce82d3878c22489fa4ee",
- "sha256:eae237477a873ab46e8dd748e515c72c0c804fb380fbe6c85533c7de51f23a8f",
- "sha256:ebef0dd9bf9b812bf75bda96743f2a6c5734a02092ae7f721c048d156d5fabae",
- "sha256:ec3beeada09ff865c344ff3bc2f427f5e6c26401cc6113d77e372c3fdac73864",
- "sha256:f76d0ad001edd426b92233d45c746fd08f467d56100fd8f30e9ace4b005266e4",
- "sha256:f85d05aa0918283cf29a30b547b4df2fbb56b45b135f9e35b6807cb28bc47951",
- "sha256:f9899c94762343f2cc2fc64c13e7cae4c3cc65cdfc87dd810a31654c9b7358cc"
+ "sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d",
+ "sha256:04024d270cf63f586ad41fff13fde4311c4fc13ea74676962c876d9577bcc78f",
+ "sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686",
+ "sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482",
+ "sha256:10d4204d8ca33146e761c79f83cc861df20e7ae9f6487ca290a97702daf56006",
+ "sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83",
+ "sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6",
+ "sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88",
+ "sha256:177f55a886d74f1808763976ac4efd29b7ed15c69f4d838bbd74d9d09cf6fa86",
+ "sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a",
+ "sha256:1eedfeb6089ed3fad42e81a67755846ad4dcc14d73698c120a82e4ccf0f1f9f6",
+ "sha256:225b67a1f6d602de0ce7f6c1c3ae89a4aa25d3de9be857999e9124f15dab486a",
+ "sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6",
+ "sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6",
+ "sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43",
+ "sha256:26ab812fa0c845df815e506be30337e2df27e88399b985d0bb4e3ecfe72df31c",
+ "sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4",
+ "sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e",
+ "sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203",
+ "sha256:2aafc5a503855ea5885559eae883978c9b6d8c8993d67766ee73d82e841300dd",
+ "sha256:2d036c7187b9422ae5b262badb87a20a49eb6c5238b2004e96d4da1231badef1",
+ "sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24",
+ "sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc",
+ "sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc",
+ "sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3",
+ "sha256:3c5ebac750d9d5f2706654c638c041635c385596caf68f81342011ddfa1e5598",
+ "sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98",
+ "sha256:407653af5617f0757261ae249d3fba09504d7a71ab36ac057c938572d1bc9331",
+ "sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2",
+ "sha256:41e81317dd6a0127cabce83c0c9c3fbecceae981c8391e6f1dec88a77c8a569a",
+ "sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6",
+ "sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688",
+ "sha256:4745f4ac52cc6686390c40eaa01d48b18997cb130833154801a442323cc78f91",
+ "sha256:4868f6bd7c9d98904b748a2653031fc9c2f85b6237009d475b1008bfaeb0a5aa",
+ "sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b",
+ "sha256:4dd484681c15e6b9a977c785a345d3e378d72678fd5f1f3c0509608da24f2ac0",
+ "sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840",
+ "sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c",
+ "sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd",
+ "sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3",
+ "sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231",
+ "sha256:5b5ff4911aea936a47d9376fd3ab17e970cc543d1b68921886e7f64bd28308d1",
+ "sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953",
+ "sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250",
+ "sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a",
+ "sha256:635fee4e041ab9c479e31edda27fcf966ea9614fff1317e280d99eb3e5ab6fe2",
+ "sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20",
+ "sha256:6b507132dcfc0dea440cce23ee2182c0ce7aba7054576efc65634f080dbe9434",
+ "sha256:6b9d9bb600328a1ce523ab4f454859e9d439150abb0906c5a1983c146580ebab",
+ "sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703",
+ "sha256:77bf3ac639c1ff567ae3b47f8d4cc3dc20f9966a2a6dd2311dcc055d3d04fb8a",
+ "sha256:784c1214cb6dd1e3b15dd8b91b9a53852aed16671cc3fbe4786f4f1db07089e2",
+ "sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac",
+ "sha256:7ed1b0132f24beeec5a78b67d9388656d03e6a7c837394f99257e2d55b461611",
+ "sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121",
+ "sha256:964faa8a861d2664f0c7ab0c181af0bea66098b1919439815ca8803ef136fc4e",
+ "sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b",
+ "sha256:9ebfef07dbe1d93efb94b4700f2d278494e9162565a54f124c404a5656d7ff09",
+ "sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906",
+ "sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9",
+ "sha256:a6d511cc297ff0883bc3708b465ff82d7560193169a8b93260f74ecb0a5e08a7",
+ "sha256:a8ad4c766d3f33ba8fd692f9aa297c9058970530a32c728a2c4bfd2616d3358b",
+ "sha256:aa2f457b4af386254372dfa78a2eda2563680d982422641a85f271c859df1987",
+ "sha256:b03f7941783b4c4a26051846dea594628b38f6940a2fdc0df00b221aed39314c",
+ "sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b",
+ "sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e",
+ "sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237",
+ "sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1",
+ "sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19",
+ "sha256:c6514f963b023aeee506678a1cf821fe31159b925c4b76fe2afa94cc70b3222b",
+ "sha256:c693e916709c2465b02ca0ad7b387c4f8423d1db7b4649c551f27a529181c5ad",
+ "sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0",
+ "sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94",
+ "sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312",
+ "sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f",
+ "sha256:d2fe69c5434391727efa54b47a1e7986bb0186e72a41b203df8f5b0a19a4f669",
+ "sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1",
+ "sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe",
+ "sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99",
+ "sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a",
+ "sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a",
+ "sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52",
+ "sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c",
+ "sha256:eaad4ff2de1c3823fddf82f41121bdf453d922e9a238642b1dedb33c4e4f98ad",
+ "sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1",
+ "sha256:f6d6cff3538391e8486a431569b77921adfcdef14eb18fbf19b7c0a5294d4e6a",
+ "sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f",
+ "sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a",
+ "sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27"
],
"markers": "python_version >= '3.8'",
- "version": "==2.18.4"
+ "version": "==2.20.1"
},
"pyjwt": {
"hashes": [
@@ -1235,128 +1270,133 @@
"sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"
],
"index": "pypi",
+ "markers": "python_version >= '3.8'",
"version": "==2.32.3"
},
"rpds-py": {
"hashes": [
- "sha256:05f3d615099bd9b13ecf2fc9cf2d839ad3f20239c678f461c753e93755d629ee",
- "sha256:06d218939e1bf2ca50e6b0ec700ffe755e5216a8230ab3e87c059ebb4ea06afc",
- "sha256:07f2139741e5deb2c5154a7b9629bc5aa48c766b643c1a6750d16f865a82c5fc",
- "sha256:08d74b184f9ab6289b87b19fe6a6d1a97fbfea84b8a3e745e87a5de3029bf944",
- "sha256:0abeee75434e2ee2d142d650d1e54ac1f8b01e6e6abdde8ffd6eeac6e9c38e20",
- "sha256:154bf5c93d79558b44e5b50cc354aa0459e518e83677791e6adb0b039b7aa6a7",
- "sha256:17c6d2155e2423f7e79e3bb18151c686d40db42d8645e7977442170c360194d4",
- "sha256:1805d5901779662d599d0e2e4159d8a82c0b05faa86ef9222bf974572286b2b6",
- "sha256:19ba472b9606c36716062c023afa2484d1e4220548751bda14f725a7de17b4f6",
- "sha256:19e515b78c3fc1039dd7da0a33c28c3154458f947f4dc198d3c72db2b6b5dc93",
- "sha256:1d54f74f40b1f7aaa595a02ff42ef38ca654b1469bef7d52867da474243cc633",
- "sha256:207c82978115baa1fd8d706d720b4a4d2b0913df1c78c85ba73fe6c5804505f0",
- "sha256:2625f03b105328729f9450c8badda34d5243231eef6535f80064d57035738360",
- "sha256:27bba383e8c5231cd559affe169ca0b96ec78d39909ffd817f28b166d7ddd4d8",
- "sha256:2c3caec4ec5cd1d18e5dd6ae5194d24ed12785212a90b37f5f7f06b8bedd7139",
- "sha256:2cc7c1a47f3a63282ab0f422d90ddac4aa3034e39fc66a559ab93041e6505da7",
- "sha256:2fc24a329a717f9e2448f8cd1f960f9dac4e45b6224d60734edeb67499bab03a",
- "sha256:312fe69b4fe1ffbe76520a7676b1e5ac06ddf7826d764cc10265c3b53f96dbe9",
- "sha256:32b7daaa3e9389db3695964ce8e566e3413b0c43e3394c05e4b243a4cd7bef26",
- "sha256:338dee44b0cef8b70fd2ef54b4e09bb1b97fc6c3a58fea5db6cc083fd9fc2724",
- "sha256:352a88dc7892f1da66b6027af06a2e7e5d53fe05924cc2cfc56495b586a10b72",
- "sha256:35b2b771b13eee8729a5049c976197ff58a27a3829c018a04341bcf1ae409b2b",
- "sha256:38e14fb4e370885c4ecd734f093a2225ee52dc384b86fa55fe3f74638b2cfb09",
- "sha256:3c20f05e8e3d4fc76875fc9cb8cf24b90a63f5a1b4c5b9273f0e8225e169b100",
- "sha256:3dd3cd86e1db5aadd334e011eba4e29d37a104b403e8ca24dcd6703c68ca55b3",
- "sha256:489bdfe1abd0406eba6b3bb4fdc87c7fa40f1031de073d0cfb744634cc8fa261",
- "sha256:48c2faaa8adfacefcbfdb5f2e2e7bdad081e5ace8d182e5f4ade971f128e6bb3",
- "sha256:4a98a1f0552b5f227a3d6422dbd61bc6f30db170939bd87ed14f3c339aa6c7c9",
- "sha256:4adec039b8e2928983f885c53b7cc4cda8965b62b6596501a0308d2703f8af1b",
- "sha256:4e0ee01ad8260184db21468a6e1c37afa0529acc12c3a697ee498d3c2c4dcaf3",
- "sha256:51584acc5916212e1bf45edd17f3a6b05fe0cbb40482d25e619f824dccb679de",
- "sha256:531796fb842b53f2695e94dc338929e9f9dbf473b64710c28af5a160b2a8927d",
- "sha256:5463c47c08630007dc0fe99fb480ea4f34a89712410592380425a9b4e1611d8e",
- "sha256:5c45a639e93a0c5d4b788b2613bd637468edd62f8f95ebc6fcc303d58ab3f0a8",
- "sha256:6031b25fb1b06327b43d841f33842b383beba399884f8228a6bb3df3088485ff",
- "sha256:607345bd5912aacc0c5a63d45a1f73fef29e697884f7e861094e443187c02be5",
- "sha256:618916f5535784960f3ecf8111581f4ad31d347c3de66d02e728de460a46303c",
- "sha256:636a15acc588f70fda1661234761f9ed9ad79ebed3f2125d44be0862708b666e",
- "sha256:673fdbbf668dd958eff750e500495ef3f611e2ecc209464f661bc82e9838991e",
- "sha256:6afd80f6c79893cfc0574956f78a0add8c76e3696f2d6a15bca2c66c415cf2d4",
- "sha256:6b5ff7e1d63a8281654b5e2896d7f08799378e594f09cf3674e832ecaf396ce8",
- "sha256:6c4c4c3f878df21faf5fac86eda32671c27889e13570645a9eea0a1abdd50922",
- "sha256:6cd8098517c64a85e790657e7b1e509b9fe07487fd358e19431cb120f7d96338",
- "sha256:6d1e42d2735d437e7e80bab4d78eb2e459af48c0a46e686ea35f690b93db792d",
- "sha256:6e30ac5e329098903262dc5bdd7e2086e0256aa762cc8b744f9e7bf2a427d3f8",
- "sha256:70a838f7754483bcdc830444952fd89645569e7452e3226de4a613a4c1793fb2",
- "sha256:720edcb916df872d80f80a1cc5ea9058300b97721efda8651efcd938a9c70a72",
- "sha256:732672fbc449bab754e0b15356c077cc31566df874964d4801ab14f71951ea80",
- "sha256:740884bc62a5e2bbb31e584f5d23b32320fd75d79f916f15a788d527a5e83644",
- "sha256:7700936ef9d006b7ef605dc53aa364da2de5a3aa65516a1f3ce73bf82ecfc7ae",
- "sha256:7732770412bab81c5a9f6d20aeb60ae943a9b36dcd990d876a773526468e7163",
- "sha256:7750569d9526199c5b97e5a9f8d96a13300950d910cf04a861d96f4273d5b104",
- "sha256:7f1944ce16401aad1e3f7d312247b3d5de7981f634dc9dfe90da72b87d37887d",
- "sha256:81c5196a790032e0fc2464c0b4ab95f8610f96f1f2fa3d4deacce6a79852da60",
- "sha256:8352f48d511de5f973e4f2f9412736d7dea76c69faa6d36bcf885b50c758ab9a",
- "sha256:8927638a4d4137a289e41d0fd631551e89fa346d6dbcfc31ad627557d03ceb6d",
- "sha256:8c7672e9fba7425f79019db9945b16e308ed8bc89348c23d955c8c0540da0a07",
- "sha256:8d2e182c9ee01135e11e9676e9a62dfad791a7a467738f06726872374a83db49",
- "sha256:910e71711d1055b2768181efa0a17537b2622afeb0424116619817007f8a2b10",
- "sha256:942695a206a58d2575033ff1e42b12b2aece98d6003c6bc739fbf33d1773b12f",
- "sha256:9437ca26784120a279f3137ee080b0e717012c42921eb07861b412340f85bae2",
- "sha256:967342e045564cef76dfcf1edb700b1e20838d83b1aa02ab313e6a497cf923b8",
- "sha256:998125738de0158f088aef3cb264a34251908dd2e5d9966774fdab7402edfab7",
- "sha256:9e6934d70dc50f9f8ea47081ceafdec09245fd9f6032669c3b45705dea096b88",
- "sha256:a3d456ff2a6a4d2adcdf3c1c960a36f4fd2fec6e3b4902a42a384d17cf4e7a65",
- "sha256:a7b28c5b066bca9a4eb4e2f2663012debe680f097979d880657f00e1c30875a0",
- "sha256:a888e8bdb45916234b99da2d859566f1e8a1d2275a801bb8e4a9644e3c7e7909",
- "sha256:aa3679e751408d75a0b4d8d26d6647b6d9326f5e35c00a7ccd82b78ef64f65f8",
- "sha256:aaa71ee43a703c321906813bb252f69524f02aa05bf4eec85f0c41d5d62d0f4c",
- "sha256:b646bf655b135ccf4522ed43d6902af37d3f5dbcf0da66c769a2b3938b9d8184",
- "sha256:b906b5f58892813e5ba5c6056d6a5ad08f358ba49f046d910ad992196ea61397",
- "sha256:b9bb1f182a97880f6078283b3505a707057c42bf55d8fca604f70dedfdc0772a",
- "sha256:bd1105b50ede37461c1d51b9698c4f4be6e13e69a908ab7751e3807985fc0346",
- "sha256:bf18932d0003c8c4d51a39f244231986ab23ee057d235a12b2684ea26a353590",
- "sha256:c273e795e7a0f1fddd46e1e3cb8be15634c29ae8ff31c196debb620e1edb9333",
- "sha256:c69882964516dc143083d3795cb508e806b09fc3800fd0d4cddc1df6c36e76bb",
- "sha256:c827576e2fa017a081346dce87d532a5310241648eb3700af9a571a6e9fc7e74",
- "sha256:cbfbea39ba64f5e53ae2915de36f130588bba71245b418060ec3330ebf85678e",
- "sha256:ce0bb20e3a11bd04461324a6a798af34d503f8d6f1aa3d2aa8901ceaf039176d",
- "sha256:d0cee71bc618cd93716f3c1bf56653740d2d13ddbd47673efa8bf41435a60daa",
- "sha256:d21be4770ff4e08698e1e8e0bce06edb6ea0626e7c8f560bc08222880aca6a6f",
- "sha256:d31dea506d718693b6b2cffc0648a8929bdc51c70a311b2770f09611caa10d53",
- "sha256:d44607f98caa2961bab4fa3c4309724b185b464cdc3ba6f3d7340bac3ec97cc1",
- "sha256:d58ad6317d188c43750cb76e9deacf6051d0f884d87dc6518e0280438648a9ac",
- "sha256:d70129cef4a8d979caa37e7fe957202e7eee8ea02c5e16455bc9808a59c6b2f0",
- "sha256:d85164315bd68c0806768dc6bb0429c6f95c354f87485ee3593c4f6b14def2bd",
- "sha256:d960de62227635d2e61068f42a6cb6aae91a7fe00fca0e3aeed17667c8a34611",
- "sha256:dc48b479d540770c811fbd1eb9ba2bb66951863e448efec2e2c102625328e92f",
- "sha256:e1735502458621921cee039c47318cb90b51d532c2766593be6207eec53e5c4c",
- "sha256:e2be6e9dd4111d5b31ba3b74d17da54a8319d8168890fbaea4b9e5c3de630ae5",
- "sha256:e4c39ad2f512b4041343ea3c7894339e4ca7839ac38ca83d68a832fc8b3748ab",
- "sha256:ed402d6153c5d519a0faf1bb69898e97fb31613b49da27a84a13935ea9164dfc",
- "sha256:ee17cd26b97d537af8f33635ef38be873073d516fd425e80559f4585a7b90c43",
- "sha256:f3027be483868c99b4985fda802a57a67fdf30c5d9a50338d9db646d590198da",
- "sha256:f5bab211605d91db0e2995a17b5c6ee5edec1270e46223e513eaa20da20076ac",
- "sha256:f6f8e3fecca256fefc91bb6765a693d96692459d7d4c644660a9fff32e517843",
- "sha256:f7afbfee1157e0f9376c00bb232e80a60e59ed716e3211a80cb8506550671e6e",
- "sha256:fa242ac1ff583e4ec7771141606aafc92b361cd90a05c30d93e343a0c2d82a89",
- "sha256:fab6ce90574645a0d6c58890e9bcaac8d94dff54fb51c69e5522a7358b80ab64"
+ "sha256:01227f8b3e6c8961490d869aa65c99653df80d2f0a7fde8c64ebddab2b9b02fd",
+ "sha256:08ce9c95a0b093b7aec75676b356a27879901488abc27e9d029273d280438505",
+ "sha256:0b02dd77a2de6e49078c8937aadabe933ceac04b41c5dde5eca13a69f3cf144e",
+ "sha256:0d4b52811dcbc1aba08fd88d475f75b4f6db0984ba12275d9bed1a04b2cae9b5",
+ "sha256:13e6d4840897d4e4e6b2aa1443e3a8eca92b0402182aafc5f4ca1f5e24f9270a",
+ "sha256:1a129c02b42d46758c87faeea21a9f574e1c858b9f358b6dd0bbd71d17713175",
+ "sha256:1a8dfa125b60ec00c7c9baef945bb04abf8ac772d8ebefd79dae2a5f316d7850",
+ "sha256:1c32e41de995f39b6b315d66c27dea3ef7f7c937c06caab4c6a79a5e09e2c415",
+ "sha256:1d494887d40dc4dd0d5a71e9d07324e5c09c4383d93942d391727e7a40ff810b",
+ "sha256:1d4af2eb520d759f48f1073ad3caef997d1bfd910dc34e41261a595d3f038a94",
+ "sha256:1fb93d3486f793d54a094e2bfd9cd97031f63fcb5bc18faeb3dd4b49a1c06523",
+ "sha256:24f8ae92c7fae7c28d0fae9b52829235df83f34847aa8160a47eb229d9666c7b",
+ "sha256:24fc5a84777cb61692d17988989690d6f34f7f95968ac81398d67c0d0994a897",
+ "sha256:26ab43b6d65d25b1a333c8d1b1c2f8399385ff683a35ab5e274ba7b8bb7dc61c",
+ "sha256:271accf41b02687cef26367c775ab220372ee0f4925591c6796e7c148c50cab5",
+ "sha256:2ddd50f18ebc05ec29a0d9271e9dbe93997536da3546677f8ca00b76d477680c",
+ "sha256:31dd5794837f00b46f4096aa8ccaa5972f73a938982e32ed817bb520c465e520",
+ "sha256:31e450840f2f27699d014cfc8865cc747184286b26d945bcea6042bb6aa4d26e",
+ "sha256:32e0db3d6e4f45601b58e4ac75c6f24afbf99818c647cc2066f3e4b192dabb1f",
+ "sha256:346557f5b1d8fd9966059b7a748fd79ac59f5752cd0e9498d6a40e3ac1c1875f",
+ "sha256:34bca66e2e3eabc8a19e9afe0d3e77789733c702c7c43cd008e953d5d1463fde",
+ "sha256:3511f6baf8438326e351097cecd137eb45c5f019944fe0fd0ae2fea2fd26be39",
+ "sha256:35af5e4d5448fa179fd7fff0bba0fba51f876cd55212f96c8bbcecc5c684ae5c",
+ "sha256:3837c63dd6918a24de6c526277910e3766d8c2b1627c500b155f3eecad8fad65",
+ "sha256:39d67896f7235b2c886fb1ee77b1491b77049dcef6fbf0f401e7b4cbed86bbd4",
+ "sha256:3b823be829407393d84ee56dc849dbe3b31b6a326f388e171555b262e8456cc1",
+ "sha256:3c73254c256081704dba0a333457e2fb815364018788f9b501efe7c5e0ada401",
+ "sha256:3ddab996807c6b4227967fe1587febade4e48ac47bb0e2d3e7858bc621b1cace",
+ "sha256:3e1dc59a5e7bc7f44bd0c048681f5e05356e479c50be4f2c1a7089103f1621d5",
+ "sha256:4383beb4a29935b8fa28aca8fa84c956bf545cb0c46307b091b8d312a9150e6a",
+ "sha256:4cc4bc73e53af8e7a42c8fd7923bbe35babacfa7394ae9240b3430b5dcf16b2a",
+ "sha256:4dd02e29c8cbed21a1875330b07246b71121a1c08e29f0ee3db5b4cfe16980c4",
+ "sha256:4f580ae79d0b861dfd912494ab9d477bea535bfb4756a2269130b6607a21802e",
+ "sha256:53dbc35808c6faa2ce3e48571f8f74ef70802218554884787b86a30947842a14",
+ "sha256:56313be667a837ff1ea3508cebb1ef6681d418fa2913a0635386cf29cff35165",
+ "sha256:57863d16187995c10fe9cf911b897ed443ac68189179541734502353af33e693",
+ "sha256:5953391af1405f968eb5701ebbb577ebc5ced8d0041406f9052638bafe52209d",
+ "sha256:5beffdbe766cfe4fb04f30644d822a1080b5359df7db3a63d30fa928375b2720",
+ "sha256:5e360188b72f8080fefa3adfdcf3618604cc8173651c9754f189fece068d2a45",
+ "sha256:5e58b61dcbb483a442c6239c3836696b79f2cd8e7eec11e12155d3f6f2d886d1",
+ "sha256:69084fd29bfeff14816666c93a466e85414fe6b7d236cfc108a9c11afa6f7301",
+ "sha256:6d1d7539043b2b31307f2c6c72957a97c839a88b2629a348ebabe5aa8b626d6b",
+ "sha256:6d8b735c4d162dc7d86a9cf3d717f14b6c73637a1f9cd57fe7e61002d9cb1972",
+ "sha256:6ea961a674172ed2235d990d7edf85d15d8dfa23ab8575e48306371c070cda67",
+ "sha256:71157f9db7f6bc6599a852852f3389343bea34315b4e6f109e5cbc97c1fb2963",
+ "sha256:720f3108fb1bfa32e51db58b832898372eb5891e8472a8093008010911e324c5",
+ "sha256:74129d5ffc4cde992d89d345f7f7d6758320e5d44a369d74d83493429dad2de5",
+ "sha256:747251e428406b05fc86fee3904ee19550c4d2d19258cef274e2151f31ae9d38",
+ "sha256:75130df05aae7a7ac171b3b5b24714cffeabd054ad2ebc18870b3aa4526eba23",
+ "sha256:7b3661e6d4ba63a094138032c1356d557de5b3ea6fd3cca62a195f623e381c76",
+ "sha256:7d5c7e32f3ee42f77d8ff1a10384b5cdcc2d37035e2e3320ded909aa192d32c3",
+ "sha256:8124101e92c56827bebef084ff106e8ea11c743256149a95b9fd860d3a4f331f",
+ "sha256:81db2e7282cc0487f500d4db203edc57da81acde9e35f061d69ed983228ffe3b",
+ "sha256:840e18c38098221ea6201f091fc5d4de6128961d2930fbbc96806fb43f69aec1",
+ "sha256:89cc8921a4a5028d6dd388c399fcd2eef232e7040345af3d5b16c04b91cf3c7e",
+ "sha256:8b32cd4ab6db50c875001ba4f5a6b30c0f42151aa1fbf9c2e7e3674893fb1dc4",
+ "sha256:8df1c283e57c9cb4d271fdc1875f4a58a143a2d1698eb0d6b7c0d7d5f49c53a1",
+ "sha256:902cf4739458852fe917104365ec0efbea7d29a15e4276c96a8d33e6ed8ec137",
+ "sha256:97fbb77eaeb97591efdc654b8b5f3ccc066406ccfb3175b41382f221ecc216e8",
+ "sha256:9c7042488165f7251dc7894cd533a875d2875af6d3b0e09eda9c4b334627ad1c",
+ "sha256:9e318e6786b1e750a62f90c6f7fa8b542102bdcf97c7c4de2a48b50b61bd36ec",
+ "sha256:a9421b23c85f361a133aa7c5e8ec757668f70343f4ed8fdb5a4a14abd5437244",
+ "sha256:aaf71f95b21f9dc708123335df22e5a2fef6307e3e6f9ed773b2e0938cc4d491",
+ "sha256:afedc35fe4b9e30ab240b208bb9dc8938cb4afe9187589e8d8d085e1aacb8309",
+ "sha256:b5e28e56143750808c1c79c70a16519e9bc0a68b623197b96292b21b62d6055c",
+ "sha256:b82c9514c6d74b89a370c4060bdb80d2299bc6857e462e4a215b4ef7aa7b090e",
+ "sha256:b8f78398e67a7227aefa95f876481485403eb974b29e9dc38b307bb6eb2315ea",
+ "sha256:bbda75f245caecff8faa7e32ee94dfaa8312a3367397975527f29654cd17a6ed",
+ "sha256:bca34e913d27401bda2a6f390d0614049f5a95b3b11cd8eff80fe4ec340a1208",
+ "sha256:bd04d8cab16cab5b0a9ffc7d10f0779cf1120ab16c3925404428f74a0a43205a",
+ "sha256:c149a652aeac4902ecff2dd93c3b2681c608bd5208c793c4a99404b3e1afc87c",
+ "sha256:c2087dbb76a87ec2c619253e021e4fb20d1a72580feeaa6892b0b3d955175a71",
+ "sha256:c34f751bf67cab69638564eee34023909380ba3e0d8ee7f6fe473079bf93f09b",
+ "sha256:c6d20c8896c00775e6f62d8373aba32956aa0b850d02b5ec493f486c88e12859",
+ "sha256:c7af6f7b80f687b33a4cdb0a785a5d4de1fb027a44c9a049d8eb67d5bfe8a687",
+ "sha256:c7b07959866a6afb019abb9564d8a55046feb7a84506c74a6f197cbcdf8a208e",
+ "sha256:ca0dda0c5715efe2ab35bb83f813f681ebcd2840d8b1b92bfc6fe3ab382fae4a",
+ "sha256:cdb7eb3cf3deb3dd9e7b8749323b5d970052711f9e1e9f36364163627f96da58",
+ "sha256:ce757c7c90d35719b38fa3d4ca55654a76a40716ee299b0865f2de21c146801c",
+ "sha256:d1fa67ef839bad3815124f5f57e48cd50ff392f4911a9f3cf449d66fa3df62a5",
+ "sha256:d2dbd8f4990d4788cb122f63bf000357533f34860d269c1a8e90ae362090ff3a",
+ "sha256:d4ec0046facab83012d821b33cead742a35b54575c4edfb7ed7445f63441835f",
+ "sha256:dbceedcf4a9329cc665452db1aaf0845b85c666e4885b92ee0cddb1dbf7e052a",
+ "sha256:dc733d35f861f8d78abfaf54035461e10423422999b360966bf1c443cbc42705",
+ "sha256:dd635c2c4043222d80d80ca1ac4530a633102a9f2ad12252183bcf338c1b9474",
+ "sha256:de1f7cd5b6b351e1afd7568bdab94934d656abe273d66cda0ceea43bbc02a0c2",
+ "sha256:df7c841813f6265e636fe548a49664c77af31ddfa0085515326342a751a6ba51",
+ "sha256:e0f9d268b19e8f61bf42a1da48276bcd05f7ab5560311f541d22557f8227b866",
+ "sha256:e2d66eb41ffca6cc3c91d8387509d27ba73ad28371ef90255c50cb51f8953301",
+ "sha256:e429fc517a1c5e2a70d576077231538a98d59a45dfc552d1ac45a132844e6dfb",
+ "sha256:e4d2b88efe65544a7d5121b0c3b003ebba92bfede2ea3577ce548b69c5235185",
+ "sha256:e76c902d229a3aa9d5ceb813e1cbcc69bf5bda44c80d574ff1ac1fa3136dea71",
+ "sha256:ef07a0a1d254eeb16455d839cef6e8c2ed127f47f014bbda64a58b5482b6c836",
+ "sha256:f09529d2332264a902688031a83c19de8fda5eb5881e44233286b9c9ec91856d",
+ "sha256:f0a6d4a93d2a05daec7cb885157c97bbb0be4da739d6f9dfb02e101eb40921cd",
+ "sha256:f0cf2a0dbb5987da4bd92a7ca727eadb225581dd9681365beba9accbe5308f7d",
+ "sha256:f2671cb47e50a97f419a02cd1e0c339b31de017b033186358db92f4d8e2e17d8",
+ "sha256:f35b34a5184d5e0cc360b61664c1c06e866aab077b5a7c538a3e20c8fcdbf90b",
+ "sha256:f3d73022990ab0c8b172cce57c69fd9a89c24fd473a5e79cbce92df87e3d9c48",
+ "sha256:f5b8353ea1a4d7dfb59a7f45c04df66ecfd363bb5b35f33b11ea579111d4655f",
+ "sha256:f809a17cc78bd331e137caa25262b507225854073fd319e987bd216bed911b7c",
+ "sha256:f9bc4161bd3b970cd6a6fcda70583ad4afd10f2750609fb1f3ca9505050d4ef3",
+ "sha256:fdf4890cda3b59170009d012fca3294c00140e7f2abe1910e6a730809d0f3f9b"
],
"markers": "python_version >= '3.8'",
- "version": "==0.18.1"
+ "version": "==0.19.1"
},
"s3transfer": {
"hashes": [
- "sha256:5683916b4c724f799e600f41dd9e10a9ff19871bf87623cc8f491cb4f5fa0a19",
- "sha256:ceb252b11bcf87080fb7850a224fb6e05c8a776bab8f2b64b7f25b969464839d"
+ "sha256:0711534e9356d3cc692fdde846b4a1e4b0cb6519971860796e6bc4c7aea00ef6",
+ "sha256:eca1c20de70a39daee580aef4986996620f365c4e0fda6a86100231d62f1bf69"
],
"markers": "python_version >= '3.8'",
- "version": "==0.10.1"
+ "version": "==0.10.2"
},
"setuptools": {
"hashes": [
- "sha256:54faa7f2e8d2d11bcd2c07bed282eef1046b5c080d1c32add737d7b5817b1ad4",
- "sha256:f211a66637b8fa059bb28183da127d4e86396c991a942b028c6650d4319c3fd0"
+ "sha256:5a0d9c6a2f332881a0153f629d8000118efd33255cfa802757924c53312c76da",
+ "sha256:98b4d786a12fadd34eabf69e8d014b84e5fc655981e4ff419994700434ace132"
],
"markers": "python_version >= '3.8'",
- "version": "==70.0.0"
+ "version": "==72.0.0"
},
"six": {
"hashes": [
@@ -1400,11 +1440,11 @@
},
"urllib3": {
"hashes": [
- "sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d",
- "sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19"
+ "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472",
+ "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"
],
"markers": "python_version >= '3.8'",
- "version": "==2.2.1"
+ "version": "==2.2.2"
},
"werkzeug": {
"hashes": [
@@ -1599,11 +1639,11 @@
},
"certifi": {
"hashes": [
- "sha256:3cd43f1c6fa7dedc5899d69d3ad0398fd018ad1a17fba83ddaf78aa46c747516",
- "sha256:ddc6c8ce995e6987e7faf5e3f1b02b302836a0e5d98ece18392cb1a36c72ad56"
+ "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b",
+ "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"
],
"markers": "python_version >= '3.6'",
- "version": "==2024.6.2"
+ "version": "==2024.7.4"
},
"cffi": {
"hashes": [
@@ -1761,61 +1801,62 @@
},
"coverage": {
"hashes": [
- "sha256:015eddc5ccd5364dcb902eaecf9515636806fa1e0d5bef5769d06d0f31b54523",
- "sha256:04aefca5190d1dc7a53a4c1a5a7f8568811306d7a8ee231c42fb69215571944f",
- "sha256:05ac5f60faa0c704c0f7e6a5cbfd6f02101ed05e0aee4d2822637a9e672c998d",
- "sha256:0bbddc54bbacfc09b3edaec644d4ac90c08ee8ed4844b0f86227dcda2d428fcb",
- "sha256:1d2a830ade66d3563bb61d1e3c77c8def97b30ed91e166c67d0632c018f380f0",
- "sha256:239a4e75e09c2b12ea478d28815acf83334d32e722e7433471fbf641c606344c",
- "sha256:244f509f126dc71369393ce5fea17c0592c40ee44e607b6d855e9c4ac57aac98",
- "sha256:25a5caf742c6195e08002d3b6c2dd6947e50efc5fc2c2205f61ecb47592d2d83",
- "sha256:296a7d9bbc598e8744c00f7a6cecf1da9b30ae9ad51c566291ff1314e6cbbed8",
- "sha256:2e079c9ec772fedbade9d7ebc36202a1d9ef7291bc9b3a024ca395c4d52853d7",
- "sha256:33ca90a0eb29225f195e30684ba4a6db05dbef03c2ccd50b9077714c48153cac",
- "sha256:33fc65740267222fc02975c061eb7167185fef4cc8f2770267ee8bf7d6a42f84",
- "sha256:341dd8f61c26337c37988345ca5c8ccabeff33093a26953a1ac72e7d0103c4fb",
- "sha256:34d6d21d8795a97b14d503dcaf74226ae51eb1f2bd41015d3ef332a24d0a17b3",
- "sha256:3538d8fb1ee9bdd2e2692b3b18c22bb1c19ffbefd06880f5ac496e42d7bb3884",
- "sha256:38a3b98dae8a7c9057bd91fbf3415c05e700a5114c5f1b5b0ea5f8f429ba6614",
- "sha256:3d5a67f0da401e105753d474369ab034c7bae51a4c31c77d94030d59e41df5bd",
- "sha256:50084d3516aa263791198913a17354bd1dc627d3c1639209640b9cac3fef5807",
- "sha256:55f689f846661e3f26efa535071775d0483388a1ccfab899df72924805e9e7cd",
- "sha256:5bc5a8c87714b0c67cfeb4c7caa82b2d71e8864d1a46aa990b5588fa953673b8",
- "sha256:62bda40da1e68898186f274f832ef3e759ce929da9a9fd9fcf265956de269dbc",
- "sha256:705f3d7c2b098c40f5b81790a5fedb274113373d4d1a69e65f8b68b0cc26f6db",
- "sha256:75e3f4e86804023e991096b29e147e635f5e2568f77883a1e6eed74512659ab0",
- "sha256:7b2a19e13dfb5c8e145c7a6ea959485ee8e2204699903c88c7d25283584bfc08",
- "sha256:7cec2af81f9e7569280822be68bd57e51b86d42e59ea30d10ebdbb22d2cb7232",
- "sha256:8383a6c8cefba1b7cecc0149415046b6fc38836295bc4c84e820872eb5478b3d",
- "sha256:8c836309931839cca658a78a888dab9676b5c988d0dd34ca247f5f3e679f4e7a",
- "sha256:8e317953bb4c074c06c798a11dbdd2cf9979dbcaa8ccc0fa4701d80042d4ebf1",
- "sha256:923b7b1c717bd0f0f92d862d1ff51d9b2b55dbbd133e05680204465f454bb286",
- "sha256:990fb20b32990b2ce2c5f974c3e738c9358b2735bc05075d50a6f36721b8f303",
- "sha256:9aad68c3f2566dfae84bf46295a79e79d904e1c21ccfc66de88cd446f8686341",
- "sha256:a5812840d1d00eafae6585aba38021f90a705a25b8216ec7f66aebe5b619fb84",
- "sha256:a6519d917abb15e12380406d721e37613e2a67d166f9fb7e5a8ce0375744cd45",
- "sha256:ab0b028165eea880af12f66086694768f2c3139b2c31ad5e032c8edbafca6ffc",
- "sha256:aea7da970f1feccf48be7335f8b2ca64baf9b589d79e05b9397a06696ce1a1ec",
- "sha256:b1196e13c45e327d6cd0b6e471530a1882f1017eb83c6229fc613cd1a11b53cd",
- "sha256:b368e1aee1b9b75757942d44d7598dcd22a9dbb126affcbba82d15917f0cc155",
- "sha256:bde997cac85fcac227b27d4fb2c7608a2c5f6558469b0eb704c5726ae49e1c52",
- "sha256:c4c2872b3c91f9baa836147ca33650dc5c172e9273c808c3c3199c75490e709d",
- "sha256:c59d2ad092dc0551d9f79d9d44d005c945ba95832a6798f98f9216ede3d5f485",
- "sha256:d1da0a2e3b37b745a2b2a678a4c796462cf753aebf94edcc87dcc6b8641eae31",
- "sha256:d8b7339180d00de83e930358223c617cc343dd08e1aa5ec7b06c3a121aec4e1d",
- "sha256:dd4b3355b01273a56b20c219e74e7549e14370b31a4ffe42706a8cda91f19f6d",
- "sha256:e08c470c2eb01977d221fd87495b44867a56d4d594f43739a8028f8646a51e0d",
- "sha256:f5102a92855d518b0996eb197772f5ac2a527c0ec617124ad5242a3af5e25f85",
- "sha256:f542287b1489c7a860d43a7d8883e27ca62ab84ca53c965d11dac1d3a1fab7ce",
- "sha256:f78300789a708ac1f17e134593f577407d52d0417305435b134805c4fb135adb",
- "sha256:f81bc26d609bf0fbc622c7122ba6307993c83c795d2d6f6f6fd8c000a770d974",
- "sha256:f836c174c3a7f639bded48ec913f348c4761cbf49de4a20a956d3431a7c9cb24",
- "sha256:fa21a04112c59ad54f69d80e376f7f9d0f5f9123ab87ecd18fbb9ec3a2beed56",
- "sha256:fcf7d1d6f5da887ca04302db8e0e0cf56ce9a5e05f202720e49b3e8157ddb9a9",
- "sha256:fd27d8b49e574e50caa65196d908f80e4dff64d7e592d0c59788b45aad7e8b35"
+ "sha256:0086cd4fc71b7d485ac93ca4239c8f75732c2ae3ba83f6be1c9be59d9e2c6382",
+ "sha256:01c322ef2bbe15057bc4bf132b525b7e3f7206f071799eb8aa6ad1940bcf5fb1",
+ "sha256:03cafe82c1b32b770a29fd6de923625ccac3185a54a5e66606da26d105f37dac",
+ "sha256:044a0985a4f25b335882b0966625270a8d9db3d3409ddc49a4eb00b0ef5e8cee",
+ "sha256:07ed352205574aad067482e53dd606926afebcb5590653121063fbf4e2175166",
+ "sha256:0d1b923fc4a40c5832be4f35a5dab0e5ff89cddf83bb4174499e02ea089daf57",
+ "sha256:0e7b27d04131c46e6894f23a4ae186a6a2207209a05df5b6ad4caee6d54a222c",
+ "sha256:1fad32ee9b27350687035cb5fdf9145bc9cf0a094a9577d43e909948ebcfa27b",
+ "sha256:289cc803fa1dc901f84701ac10c9ee873619320f2f9aff38794db4a4a0268d51",
+ "sha256:3c59105f8d58ce500f348c5b56163a4113a440dad6daa2294b5052a10db866da",
+ "sha256:46c3d091059ad0b9c59d1034de74a7f36dcfa7f6d3bde782c49deb42438f2450",
+ "sha256:482855914928c8175735a2a59c8dc5806cf7d8f032e4820d52e845d1f731dca2",
+ "sha256:49c76cdfa13015c4560702574bad67f0e15ca5a2872c6a125f6327ead2b731dd",
+ "sha256:4b03741e70fb811d1a9a1d75355cf391f274ed85847f4b78e35459899f57af4d",
+ "sha256:4bea27c4269234e06f621f3fac3925f56ff34bc14521484b8f66a580aacc2e7d",
+ "sha256:4d5fae0a22dc86259dee66f2cc6c1d3e490c4a1214d7daa2a93d07491c5c04b6",
+ "sha256:543ef9179bc55edfd895154a51792b01c017c87af0ebaae092720152e19e42ca",
+ "sha256:54dece71673b3187c86226c3ca793c5f891f9fc3d8aa183f2e3653da18566169",
+ "sha256:6379688fb4cfa921ae349c76eb1a9ab26b65f32b03d46bb0eed841fd4cb6afb1",
+ "sha256:65fa405b837060db569a61ec368b74688f429b32fa47a8929a7a2f9b47183713",
+ "sha256:6616d1c9bf1e3faea78711ee42a8b972367d82ceae233ec0ac61cc7fec09fa6b",
+ "sha256:6fe885135c8a479d3e37a7aae61cbd3a0fb2deccb4dda3c25f92a49189f766d6",
+ "sha256:7221f9ac9dad9492cecab6f676b3eaf9185141539d5c9689d13fd6b0d7de840c",
+ "sha256:76d5f82213aa78098b9b964ea89de4617e70e0d43e97900c2778a50856dac605",
+ "sha256:7792f0ab20df8071d669d929c75c97fecfa6bcab82c10ee4adb91c7a54055463",
+ "sha256:831b476d79408ab6ccfadaaf199906c833f02fdb32c9ab907b1d4aa0713cfa3b",
+ "sha256:9146579352d7b5f6412735d0f203bbd8d00113a680b66565e205bc605ef81bc6",
+ "sha256:9cc44bf0315268e253bf563f3560e6c004efe38f76db03a1558274a6e04bf5d5",
+ "sha256:a73d18625f6a8a1cbb11eadc1d03929f9510f4131879288e3f7922097a429f63",
+ "sha256:a8659fd33ee9e6ca03950cfdcdf271d645cf681609153f218826dd9805ab585c",
+ "sha256:a94925102c89247530ae1dab7dc02c690942566f22e189cbd53579b0693c0783",
+ "sha256:ad4567d6c334c46046d1c4c20024de2a1c3abc626817ae21ae3da600f5779b44",
+ "sha256:b2e16f4cd2bc4d88ba30ca2d3bbf2f21f00f382cf4e1ce3b1ddc96c634bc48ca",
+ "sha256:bbdf9a72403110a3bdae77948b8011f644571311c2fb35ee15f0f10a8fc082e8",
+ "sha256:beb08e8508e53a568811016e59f3234d29c2583f6b6e28572f0954a6b4f7e03d",
+ "sha256:c4cbe651f3904e28f3a55d6f371203049034b4ddbce65a54527a3f189ca3b390",
+ "sha256:c7b525ab52ce18c57ae232ba6f7010297a87ced82a2383b1afd238849c1ff933",
+ "sha256:ca5d79cfdae420a1d52bf177de4bc2289c321d6c961ae321503b2ca59c17ae67",
+ "sha256:cdab02a0a941af190df8782aafc591ef3ad08824f97850b015c8c6a8b3877b0b",
+ "sha256:d17c6a415d68cfe1091d3296ba5749d3d8696e42c37fca5d4860c5bf7b729f03",
+ "sha256:d39bd10f0ae453554798b125d2f39884290c480f56e8a02ba7a6ed552005243b",
+ "sha256:d4b3cd1ca7cd73d229487fa5caca9e4bc1f0bca96526b922d61053ea751fe791",
+ "sha256:d50a252b23b9b4dfeefc1f663c568a221092cbaded20a05a11665d0dbec9b8fb",
+ "sha256:da8549d17489cd52f85a9829d0e1d91059359b3c54a26f28bec2c5d369524807",
+ "sha256:dcd070b5b585b50e6617e8972f3fbbee786afca71b1936ac06257f7e178f00f6",
+ "sha256:ddaaa91bfc4477d2871442bbf30a125e8fe6b05da8a0015507bfbf4718228ab2",
+ "sha256:df423f351b162a702c053d5dddc0fc0ef9a9e27ea3f449781ace5f906b664428",
+ "sha256:dff044f661f59dace805eedb4a7404c573b6ff0cdba4a524141bc63d7be5c7fd",
+ "sha256:e7e128f85c0b419907d1f38e616c4f1e9f1d1b37a7949f44df9a73d5da5cd53c",
+ "sha256:ed8d1d1821ba5fc88d4a4f45387b65de52382fa3ef1f0115a4f7a20cdfab0e94",
+ "sha256:f2501d60d7497fd55e391f423f965bbe9e650e9ffc3c627d5f0ac516026000b8",
+ "sha256:f7db0b6ae1f96ae41afe626095149ecd1b212b424626175a6633c2999eaad45b"
],
"index": "pypi",
- "version": "==7.5.3"
+ "markers": "python_version >= '3.8'",
+ "version": "==7.6.0"
},
"docker": {
"hashes": [
@@ -1861,6 +1902,7 @@
"sha256:b6e78b685dd4e9c016d7a4299cf1de69e299c88322e3f81c716e6e23fe5683c1"
],
"index": "pypi",
+ "markers": "python_version >= '3.8' and python_version < '4'",
"version": "==2.6.0"
},
"packaging": {
@@ -1927,11 +1969,12 @@
},
"pytest": {
"hashes": [
- "sha256:c434598117762e2bd304e526244f67bf66bbd7b5d6cf22138be51ff661980343",
- "sha256:de4bb8104e201939ccdc688b27a89a7be2079b22e2bd2b07f806b6ba71117977"
+ "sha256:4ba08f9ae7dcf84ded419494d229b48d0903ea6407b030eaec46df5e6a73bba5",
+ "sha256:c132345d12ce551242c87269de812483f5bcc87cdbb4722e48487ba194f9fdce"
],
"index": "pypi",
- "version": "==8.2.2"
+ "markers": "python_version >= '3.8'",
+ "version": "==8.3.2"
},
"python-dateutil": {
"hashes": [
@@ -1947,6 +1990,7 @@
"sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"
],
"index": "pypi",
+ "markers": "python_version >= '3.8'",
"version": "==2.32.3"
},
"requests-mock": {
@@ -1955,6 +1999,7 @@
"sha256:e9e12e333b525156e82a3c852f22016b9158220d2f47454de9cae8a77d371401"
],
"index": "pypi",
+ "markers": "python_version >= '3.5'",
"version": "==1.12.1"
},
"six": {
@@ -1977,6 +2022,7 @@
"sha256:54d330d085c0a11fc5da0b001af87aec4dd3e814104376bf7513e8646c77442a"
],
"index": "pypi",
+ "markers": "python_version >= '3.7'",
"version": "==0.0.1rc1"
},
"testcontainers-opensearch": {
@@ -1984,6 +2030,7 @@
"sha256:0bdf270b5b7f53915832f7c31dd2bd3ffdc20b534ea6b32231cc7003049bd0e1"
],
"index": "pypi",
+ "markers": "python_version >= '3.7'",
"version": "==0.0.1rc1"
},
"typing-extensions": {
@@ -1996,11 +2043,11 @@
},
"urllib3": {
"hashes": [
- "sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d",
- "sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19"
+ "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472",
+ "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"
],
"markers": "python_version >= '3.8'",
- "version": "==2.2.1"
+ "version": "==2.2.2"
},
"wrapt": {
"hashes": [
diff --git a/dbrepo-analyse-service/app.py b/dbrepo-analyse-service/app.py
index 0e8a10bf1dccdad1917e85407c53913529b741ba..bbce751508c62e8a5f375447b97a7486668b9673 100644
--- a/dbrepo-analyse-service/app.py
+++ b/dbrepo-analyse-service/app.py
@@ -1,17 +1,15 @@
-import json
+import os
import logging
from typing import Any, List
-import os
from json import dumps
import requests.exceptions
from dbrepo.api.dto import ApiError
-from flasgger import LazyJSONEncoder, Swagger
-from flask_httpauth import HTTPBasicAuth, MultiAuth, HTTPTokenAuth
-from flasgger.utils import swag_from
+from flasgger import LazyJSONEncoder, Swagger, swag_from
from flask import Flask, Response, request
from flask_cors import CORS
+from flask_httpauth import HTTPBasicAuth, MultiAuth, HTTPTokenAuth
from prometheus_flask_exporter import PrometheusMetrics
from botocore.exceptions import ClientError
@@ -52,14 +50,14 @@ app = Flask(__name__)
cors = CORS(app, resources={r"/api/*": {"origins": "*"}})
+metrics = PrometheusMetrics(app)
+metrics.info("app_info", "Application info", version="0.0.1")
+app.config["SWAGGER"] = {"openapi": "3.0.1", "title": "Swagger UI", "uiversion": 3}
+
token_auth = HTTPTokenAuth(scheme='Bearer')
basic_auth = HTTPBasicAuth()
auth = MultiAuth(token_auth, basic_auth)
-metrics = PrometheusMetrics(app)
-metrics.info("app_info", "Application info", version="1.4.4")
-app.config["SWAGGER"] = {"openapi": "3.0.1", "title": "Swagger UI", "uiversion": 3}
-
swagger_config = {
"headers": [],
"specs": [
@@ -153,7 +151,7 @@ template = {
"info": {
"title": "Database Repository Analyse Service API",
"description": "Service that analyses data structures",
- "version": "1.4.4",
+ "version": "1.4.5",
"contact": {
"name": "Prof. Andreas Rauber",
"email": "andreas.rauber@tuwien.ac.at"
@@ -165,7 +163,7 @@ template = {
},
"externalDocs": {
"description": "Sourcecode Documentation",
- "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/__APPVERSION__/"
+ "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.5/"
},
"servers": [
{
@@ -180,19 +178,15 @@ template = {
}
swagger = Swagger(app, config=swagger_config, template=template)
-app.config["GATEWAY_SERVICE_ENDPOINT"] = os.getenv("GATEWAY_SERVICE_ENDPOINT", "http://localhost")
app.config["JWT_ALGORITHM"] = "HS256"
app.config["JWT_PUBKEY"] = '-----BEGIN PUBLIC KEY-----\n' + os.getenv("JWT_PUBKEY",
"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB") + '\n-----END PUBLIC KEY-----'
app.config["AUTH_SERVICE_ENDPOINT"] = os.getenv("AUTH_SERVICE_ENDPOINT", "http://localhost/api/auth")
-app.config["AUTH_SERVICE_CLIENT"] = os.getenv("AUTH_SERVICE_CLIENT", "dbrepo")
+app.config["AUTH_SERVICE_CLIENT"] = os.getenv("AUTH_SERVICE_CLIENT", "dbrepo-client")
app.config["AUTH_SERVICE_CLIENT_SECRET"] = os.getenv("AUTH_SERVICE_CLIENT_SECRET", "MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG")
-app.config["ADMIN_USERNAME"] = os.getenv('ADMIN_USERNAME', 'admin')
-app.config["ADMIN_PASSWORD"] = os.getenv('ADMIN_PASSWORD', 'admin')
app.config["S3_ACCESS_KEY_ID"] = os.getenv('S3_ACCESS_KEY_ID', 'seaweedfsadmin')
+app.config["S3_BUCKET"] = os.getenv('S3_BUCKET', 'dbrepo')
app.config["S3_ENDPOINT"] = os.getenv('S3_ENDPOINT', 'http://localhost:9000')
-app.config["S3_EXPORT_BUCKET"] = os.getenv('S3_EXPORT_BUCKET', 'dbrepo-download')
-app.config["S3_IMPORT_BUCKET"] = os.getenv('S3_IMPORT_BUCKET', 'dbrepo-upload')
app.config["S3_SECRET_ACCESS_KEY"] = os.getenv('S3_SECRET_ACCESS_KEY', 'seaweedfsadmin')
app.json_encoder = LazyJSONEncoder
@@ -213,8 +207,6 @@ def verify_token(token: str):
def verify_password(username: str, password: str) -> Any:
if username is None or username == "" or password is None or password == "":
return False
- if username == app.config["ADMIN_USERNAME"] and password == app.config["ADMIN_PASSWORD"]:
- return User(username=username, roles=["admin"])
client = KeycloakClient()
try:
return client.verify_jwt(access_token=client.obtain_user_token(username=username, password=password))
@@ -253,7 +245,7 @@ def analyse_datatypes():
if filename is None or separator is None:
return Response(
- json.dumps({'success': False, 'message': "Missing required query parameters 'filename' and 'separator'"}),
+ dumps({'success': False, 'message': "Missing required query parameters 'filename' and 'separator'"}),
mimetype="application/json"), 400
try:
@@ -262,10 +254,10 @@ def analyse_datatypes():
return Response(res, mimetype="application/json"), 202
except OSError as e:
logging.error(f"Failed to determine data types: {e}")
- return ApiError(status='BAD_REQUEST', message=str(e), code='analyse.csv.invalid'), 400
+ return ApiError(status='BAD_REQUEST', message=str(e), code='error.analyse.invalid').model_dump_json(), 400
except ClientError as e:
logging.error(f"Failed to determine separator: {e}")
- return ApiError(status='NOT_FOUND', message='Failed to find csv', code='analyse.csv.missing'), 404
+ return ApiError(status='NOT_FOUND', message='Failed to find csv', code='error.analyse.missing').model_dump_json(), 404
@app.route("/api/analyse/keys", methods=["GET"], endpoint="analyse_analyse_keys")
@@ -277,7 +269,7 @@ def analyse_keys():
logging.debug(f"Analyse keys from filename '{filename}' with separator {separator}")
if filename is None or separator is None:
return ApiError(status='BAD_REQUEST', message="Missing required query parameters 'filename' and 'separator'",
- code='analyse.csv.invalid'), 400
+ code='analyse.csv.invalid').model_dump_json(), 400
try:
res = {
'keys': determine_pk(filename, separator)
@@ -286,4 +278,4 @@ def analyse_keys():
return Response(dumps(res), mimetype="application/json"), 202
except OSError as e:
logging.error(f"Failed to determine primary key: {e}")
- return ApiError(status='BAD_REQUEST', message=str(e), code='analyse.database.invalid'), 400
+ return ApiError(status='BAD_REQUEST', message=str(e), code='analyse.database.invalid').model_dump_json(), 400
diff --git a/dbrepo-analyse-service/as-yml/analyse_datatypes.yml b/dbrepo-analyse-service/as-yml/analyse_datatypes.yml
index ae52198766a9e7842f8320d338791a4f099f26a5..14529bb34bee7d9ef28df2ccc8ad4be6dd208929 100644
--- a/dbrepo-analyse-service/as-yml/analyse_datatypes.yml
+++ b/dbrepo-analyse-service/as-yml/analyse_datatypes.yml
@@ -2,7 +2,7 @@ tags:
- analyse-endpoint
summary: "Determine datatypes"
operationId: analyse_datatypes
-description: "This is a simple API which returns the datatypes of a (path) csv file"
+description: "Determines MySQL 8 datatypes of a given dataset. Requires role `table-semantic-analyse`."
consumes:
- "application/json"
produces:
diff --git a/dbrepo-analyse-service/as-yml/analyse_keys.yml b/dbrepo-analyse-service/as-yml/analyse_keys.yml
index da4f0bbca04b65b8f4131a6d8ab1a4d43270ad60..fb760930f4ac6c5d1f8649e91d2fe46d07c95b82 100644
--- a/dbrepo-analyse-service/as-yml/analyse_keys.yml
+++ b/dbrepo-analyse-service/as-yml/analyse_keys.yml
@@ -1,8 +1,8 @@
tags:
- analyse-endpoint
-summary: "Determine primary keys"
+summary: "Determine keys"
operationId: analyse_keys
-description: "This is a simple API which returns the primary keys + ranking of a (path) csv file"
+description: "Determines primary keys of a given dataset. Requires role `table-semantic-analyse`."
consumes:
- "application/json"
produces:
diff --git a/dbrepo-analyse-service/as-yml/analyse_table_stat.yml b/dbrepo-analyse-service/as-yml/analyse_table_stat.yml
deleted file mode 100644
index 8639d4dd9278ddf118f552249021fc60498dd47c..0000000000000000000000000000000000000000
--- a/dbrepo-analyse-service/as-yml/analyse_table_stat.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-tags:
- - analyse-endpoint
-summary: Determine table statistics
-operationId: analyse_table_stat
-parameters:
- - name: database_id
- in: path
- required: true
- example: 1
- schema:
- type: integer
- format: int64
- - name: table_id
- in: path
- required: true
- example: 1
- schema:
- type: integer
- format: int64
-security:
- - bearerAuth: [ ]
- - basicAuth: [ ]
-responses:
- 202:
- description: Determined statistics
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/TableStats'
- 400:
- description: "Missing parameters"
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/ErrorDto'
- 404:
- description: "Table not found"
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/ErrorDto'
diff --git a/dbrepo-analyse-service/clients/s3_client.py b/dbrepo-analyse-service/clients/s3_client.py
index 5e8f3bb4378f7c448cf9722f63a27e91fb3e9f39..e9f58ea40727a36dbb53dea5e759a1d32aac254f 100644
--- a/dbrepo-analyse-service/clients/s3_client.py
+++ b/dbrepo-analyse-service/clients/s3_client.py
@@ -17,10 +17,9 @@ class S3Client:
endpoint_url, aws_access_key_id)
self.client = boto3.client(service_name='s3', endpoint_url=endpoint_url, aws_access_key_id=aws_access_key_id,
aws_secret_access_key=aws_secret_access_key)
- self.bucket_exists_or_exit(current_app.config['S3_EXPORT_BUCKET'])
- self.bucket_exists_or_exit(current_app.config['S3_IMPORT_BUCKET'])
+ self.bucket_exists_or_exit(current_app.config['S3_BUCKET'])
- def upload_file(self, filename: str, path: str = "/tmp", bucket: str = "dbrepo-upload") -> bool:
+ def upload_file(self, filename: str, path: str = "/tmp", bucket: str = "dbrepo") -> bool:
"""
Uploads a file to the blob storage.
Follows the official API https://boto3.amazonaws.com/v1/documentation/api/latest/guide/s3-uploading-files.html.
@@ -43,7 +42,7 @@ class S3Client:
logging.warning(f"Failed to upload file with key {filename}")
raise ConnectionRefusedError(f"Failed to upload file with key {filename}", e)
- def download_file(self, filename: str, path: str = "/tmp", bucket: str = "dbrepo-download"):
+ def download_file(self, filename: str, path: str = "/tmp", bucket: str = "dbrepo"):
"""
Downloads a file from the blob storage.
Follows the official API https://boto3.amazonaws.com/v1/documentation/api/latest/guide/s3-example-download-file.html
diff --git a/dbrepo-analyse-service/determine_dt.py b/dbrepo-analyse-service/determine_dt.py
index 7c5401a20c3c37c12405c424161a5fb89e585bcd..6a224018665e9d2583da023f558837a9f24ab4e2 100644
--- a/dbrepo-analyse-service/determine_dt.py
+++ b/dbrepo-analyse-service/determine_dt.py
@@ -9,17 +9,18 @@ import pandas
from numpy import dtype, max, min
from flask import current_app
+from pandas.errors import EmptyDataError
from clients.s3_client import S3Client
-def determine_datatypes(filename, enum=False, enum_tol=0.0001, separator=None) -> {}:
+def determine_datatypes(filename, enum=False, enum_tol=0.0001, separator=',') -> {}:
# Use option enum=True for searching Postgres ENUM Types in CSV file. Remark
# Enum is not SQL standard, hence, it might not be supported by all db-engines.
# However, it can be used in Postgres and MySQL.
s3_client = S3Client()
- s3_client.file_exists(current_app.config['S3_IMPORT_BUCKET'], filename)
- response = s3_client.get_file(current_app.config['S3_IMPORT_BUCKET'], filename)
+ s3_client.file_exists(current_app.config['S3_BUCKET'], filename)
+ response = s3_client.get_file(current_app.config['S3_BUCKET'], filename)
stream = response['Body']
if response['ContentLength'] == 0:
logging.warning(f'Failed to determine data types: file {filename} has empty body')
@@ -35,10 +36,22 @@ def determine_datatypes(filename, enum=False, enum_tol=0.0001, separator=None) -
line_terminator = "\r"
elif b"\r\n" in line:
line_terminator = "\r\n"
- logging.info("Analysing corpus with separator: %s", separator)
+ logging.info(f"Analysing corpus with separator: {separator}")
# index_col=False -> prevent shared index & count length correct
- df = pandas.read_csv(fh, delimiter=separator, nrows=100, lineterminator=line_terminator, index_col=False)
+ df = None
+ for encoding in ['utf-8', 'cp1252', 'latin1', 'iso-8859-1']:
+ try:
+ logging.debug(f"attempt parsing .csv using encoding {encoding}")
+ df = pandas.read_csv(fh, delimiter=separator, nrows=100, lineterminator=line_terminator,
+ index_col=False, encoding=encoding)
+ logging.debug(f"parsing .csv using encoding {encoding} was successful")
+ break
+ except (UnicodeDecodeError, EmptyDataError) as error:
+ logging.warning(f"Failed to parse .csv using encoding {encoding}: {error}")
+ if df is None:
+ raise IOError(
+ f"Failed to parse .csv: no supported encoding found (one of: utf-8, cp1252, latin1, iso-8859-1)")
if b"," in line:
separator = ","
@@ -51,31 +64,44 @@ def determine_datatypes(filename, enum=False, enum_tol=0.0001, separator=None) -
for name, dataType in df.dtypes.items():
if dataType == dtype('float64'):
- r[name] = 'decimal'
+ if pandas.to_numeric(df[name], errors='coerce').notnull().all():
+ logging.debug(f"mapped column {name} from float64 to decimal")
+ r[name] = 'decimal'
+ else:
+ logging.debug(f"mapped column {name} from float64 to text")
+ r[name] = 'text'
elif dataType == dtype('int64'):
min_val = min(df[name])
max_val = max(df[name])
if 0 <= min_val <= 1 and 0 <= max_val <= 1:
+ logging.debug(f"mapped column {name} from int64 to bool")
r[name] = 'bool'
continue
+ logging.debug(f"mapped column {name} from int64 to bigint")
r[name] = 'bigint'
elif dataType == dtype('O'):
try:
pandas.to_datetime(df[name], format='mixed')
+ logging.debug(f"mapped column {name} from O to timestamp")
r[name] = 'timestamp'
continue
except ValueError:
pass
max_size = max(df[name].astype(str).map(len))
if max_size <= 1:
+ logging.debug(f"mapped column {name} from O to char")
r[name] = 'char'
if 0 <= max_size <= 255:
+ logging.debug(f"mapped column {name} from O to varchar")
r[name] = 'varchar'
else:
+ logging.debug(f"mapped column {name} from O to text")
r[name] = 'text'
elif dataType == dtype('bool'):
+ logging.debug(f"mapped column {name} from bool to bool")
r[name] = 'bool'
elif dataType == dtype('datetime64'):
+ logging.debug(f"mapped column {name} from datetime64 to datetime")
r[name] = 'datetime'
else:
logging.warning(f'default to \'text\' for column {name} and type {dtype}')
diff --git a/dbrepo-analyse-service/determine_pk.py b/dbrepo-analyse-service/determine_pk.py
index 82ecca465c983346fd825c4e225ed03ec8d3212f..141d90b78e43b05cce8b2f6c10700a18d14c6073 100644
--- a/dbrepo-analyse-service/determine_pk.py
+++ b/dbrepo-analyse-service/determine_pk.py
@@ -8,7 +8,7 @@ from determine_dt import determine_datatypes
from clients.s3_client import S3Client
-def determine_pk(filename, separator=","):
+def determine_pk(filename: str, separator: str = ','):
dt = json.loads(determine_datatypes(filename=filename, separator=separator))
dt = {k.lower(): v for k, v in dt["columns"].items()}
# {k.lower(): v for k, v in dt['columns'].items() if v != 'Numeric'}
@@ -16,8 +16,8 @@ def determine_pk(filename, separator=","):
colindex = list(range(0, len(colnames)))
s3_client = S3Client()
- s3_client.file_exists('dbrepo-upload', filename)
- response = s3_client.get_file('dbrepo-upload', filename)
+ s3_client.file_exists('dbrepo', filename)
+ response = s3_client.get_file('dbrepo', filename)
stream = response['Body']
if response['ContentLength'] == 0:
raise OSError(f'Failed to determine primary key: file {filename} has empty body')
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.4.4-py3-none-any.whl b/dbrepo-analyse-service/lib/dbrepo-1.4.4-py3-none-any.whl
deleted file mode 100644
index 503cfef91315990bbf06027d6de14c8b3184507b..0000000000000000000000000000000000000000
Binary files a/dbrepo-analyse-service/lib/dbrepo-1.4.4-py3-none-any.whl and /dev/null differ
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.4.4.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.4.4.tar.gz
deleted file mode 100644
index 9a90176f0a093b05d89d1cd74cf701cd0730861a..0000000000000000000000000000000000000000
Binary files a/dbrepo-analyse-service/lib/dbrepo-1.4.4.tar.gz and /dev/null differ
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.4.5-py3-none-any.whl b/dbrepo-analyse-service/lib/dbrepo-1.4.5-py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..249fd5dc181271a3069745f5a6ef8a26de398037
Binary files /dev/null and b/dbrepo-analyse-service/lib/dbrepo-1.4.5-py3-none-any.whl differ
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.4.5.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.4.5.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..2f21496bd2280550f4242bbc0fff4a47116d6ad5
Binary files /dev/null and b/dbrepo-analyse-service/lib/dbrepo-1.4.5.tar.gz differ
diff --git a/dbrepo-analyse-service/test/conftest.py b/dbrepo-analyse-service/test/conftest.py
index 1a4775158f91ae80467542ddc8598a8c5dd2dc37..424588bdfd7479ac742401d91858864f47639a9e 100644
--- a/dbrepo-analyse-service/test/conftest.py
+++ b/dbrepo-analyse-service/test/conftest.py
@@ -41,9 +41,8 @@ def session(request, app_context):
app.config["S3_ENDPOINT"] = endpoint
client = container.get_client()
# create buckets
- logging.debug("[fixture] make buckets dbrepo-upload, dbrepo-download")
- client.make_bucket("dbrepo-upload")
- client.make_bucket("dbrepo-download")
+ logging.debug("[fixture] make bucket dbrepo")
+ client.make_bucket("dbrepo")
# destructor
def stop_minio():
@@ -61,17 +60,15 @@ def cleanup(request, session):
:param session: /
:return:
"""
- logging.info("[fixture] truncate buckets")
- for bucket in ["dbrepo-upload", "dbrepo-download"]:
- objects = []
- for obj in session.get_client().list_objects(bucket):
- objects.append(DeleteObject(obj.object_name))
- logging.info(f"request to remove objects {objects}")
- errors = session.get_client().remove_objects(bucket, objects)
- for error in errors:
- raise ConnectionError(
- f"Failed to delete object with key {error.object_name} of bucket {bucket}"
- )
+ bucket = "dbrepo"
+ logging.info(f"[fixture] truncate bucket: {bucket}")
+ objects = []
+ for obj in session.get_client().list_objects(bucket):
+ objects.append(DeleteObject(obj.object_name))
+ logging.info(f"request to remove objects {objects}")
+ errors = session.get_client().remove_objects(bucket, objects)
+ for error in errors:
+ raise ConnectionError(f"Failed to delete object with key {error.object_name} of bucket: {bucket}")
@pytest.fixture(scope="function")
diff --git a/dbrepo-analyse-service/test/test_determine_dt.py b/dbrepo-analyse-service/test/test_determine_dt.py
index e1f8dff291b2b0391a314235de35c5d1b42ba377..3d7e4f8d3bee3f60d593572d420b3243fea179a2 100644
--- a/dbrepo-analyse-service/test/test_determine_dt.py
+++ b/dbrepo-analyse-service/test/test_determine_dt.py
@@ -24,7 +24,7 @@ class DetermineDatatypesTest(unittest.TestCase):
}
# mock
- S3Client().upload_file("datetime.csv", './data/test_dt/', 'dbrepo-upload')
+ S3Client().upload_file("datetime.csv", './data/test_dt/', 'dbrepo')
# test
response = determine_datatypes(filename="datetime.csv", separator=",")
@@ -47,7 +47,7 @@ class DetermineDatatypesTest(unittest.TestCase):
}
# mock
- S3Client().upload_file("datetime_tz.csv", './data/test_dt/', 'dbrepo-upload')
+ S3Client().upload_file("datetime_tz.csv", './data/test_dt/', 'dbrepo')
# test
response = determine_datatypes(filename="datetime_tz.csv", separator=",")
@@ -70,7 +70,7 @@ class DetermineDatatypesTest(unittest.TestCase):
}
# mock
- S3Client().upload_file("datetime_t.csv", './data/test_dt/', 'dbrepo-upload')
+ S3Client().upload_file("datetime_t.csv", './data/test_dt/', 'dbrepo')
# test
response = determine_datatypes(filename="datetime_t.csv", separator=",")
@@ -94,7 +94,7 @@ class DetermineDatatypesTest(unittest.TestCase):
}
# mock
- S3Client().upload_file("datatypes.csv", './data/test_dt/', 'dbrepo-upload')
+ S3Client().upload_file("datatypes.csv", './data/test_dt/', 'dbrepo')
# test
response = determine_datatypes(filename="datatypes.csv", separator=",")
@@ -117,7 +117,7 @@ class DetermineDatatypesTest(unittest.TestCase):
def test_determine_datatypes_fileEmpty_succeeds(self):
# mock
- S3Client().upload_file("empty.csv", './data/test_dt/', 'dbrepo-upload')
+ S3Client().upload_file("empty.csv", './data/test_dt/', 'dbrepo')
# test
response = determine_datatypes("empty.csv")
@@ -129,7 +129,7 @@ class DetermineDatatypesTest(unittest.TestCase):
def test_determine_datatypes_separatorSemicolon_succeeds(self):
# mock
- S3Client().upload_file("separator.csv", './data/test_dt/', 'dbrepo-upload')
+ S3Client().upload_file("separator.csv", './data/test_dt/', 'dbrepo')
# test
response = determine_datatypes(filename="separator.csv", separator=";")
@@ -140,7 +140,7 @@ class DetermineDatatypesTest(unittest.TestCase):
def test_determine_datatypes_separatorGuess_succeeds(self):
# mock
- S3Client().upload_file("separator.csv", './data/test_dt/', 'dbrepo-upload')
+ S3Client().upload_file("separator.csv", './data/test_dt/', 'dbrepo')
# test
response = determine_datatypes(filename="separator.csv")
@@ -151,7 +151,7 @@ class DetermineDatatypesTest(unittest.TestCase):
def test_determine_datatypes_separatorGuessLargeDataset_succeeds(self):
# mock
- S3Client().upload_file("large.csv", './data/test_dt/', 'dbrepo-upload')
+ S3Client().upload_file("large.csv", './data/test_dt/', 'dbrepo')
# test
response = determine_datatypes(filename="large.csv")
@@ -171,7 +171,7 @@ class DetermineDatatypesTest(unittest.TestCase):
}
# mock
- S3Client().upload_file("novel.csv", './data/test_dt/', 'dbrepo-upload')
+ S3Client().upload_file("novel.csv", './data/test_dt/', 'dbrepo')
# test
response = determine_datatypes(filename="novel.csv", separator=";")
diff --git a/dbrepo-analyse-service/test/test_determine_pk.py b/dbrepo-analyse-service/test/test_determine_pk.py
index 43bcf4e00f9ff5fa1fdf392279824e63042a50cd..4e960d39c0b0bebd263c0453a94477fcae964319 100644
--- a/dbrepo-analyse-service/test/test_determine_pk.py
+++ b/dbrepo-analyse-service/test/test_determine_pk.py
@@ -7,7 +7,7 @@ class DeterminePrimaryKeyTest(unittest.TestCase):
# @Test
def test_determine_pk_largeFileIdFirst_succeeds(self):
# mock
- S3Client().upload_file("largefile_idfirst.csv", './data/test_pk/', 'dbrepo-upload')
+ S3Client().upload_file("largefile_idfirst.csv", './data/test_pk/', 'dbrepo')
# test
response = determine_pk('largefile_idfirst.csv')
@@ -16,7 +16,7 @@ class DeterminePrimaryKeyTest(unittest.TestCase):
# @Test
def test_determine_pk_largeFileIdInBetween_succeeds(self):
# mock
- S3Client().upload_file("largefile_idinbtw.csv", './data/test_pk/', 'dbrepo-upload')
+ S3Client().upload_file("largefile_idinbtw.csv", './data/test_pk/', 'dbrepo')
# test
response = determine_pk('largefile_idinbtw.csv')
@@ -25,7 +25,7 @@ class DeterminePrimaryKeyTest(unittest.TestCase):
# @Test
def test_determine_pk_largeFileNoPrimaryKey_fails(self):
# mock
- S3Client().upload_file("largefile_no_pk.csv", './data/test_pk/', 'dbrepo-upload')
+ S3Client().upload_file("largefile_no_pk.csv", './data/test_pk/', 'dbrepo')
# test
response = determine_pk('largefile_no_pk.csv')
@@ -34,7 +34,7 @@ class DeterminePrimaryKeyTest(unittest.TestCase):
# @Test
def test_determine_pk_largeFileNullInUnique_fails(self):
# mock
- S3Client().upload_file("largefile_nullinunique.csv", './data/test_pk/', 'dbrepo-upload')
+ S3Client().upload_file("largefile_nullinunique.csv", './data/test_pk/', 'dbrepo')
# test
response = determine_pk('largefile_nullinunique.csv')
@@ -43,7 +43,7 @@ class DeterminePrimaryKeyTest(unittest.TestCase):
# @Test
def test_determine_pk_smallFileIdFirst_fails(self):
# mock
- S3Client().upload_file("smallfile_idfirst.csv", './data/test_pk/', 'dbrepo-upload')
+ S3Client().upload_file("smallfile_idfirst.csv", './data/test_pk/', 'dbrepo')
# test
response = determine_pk('smallfile_idfirst.csv')
@@ -52,7 +52,7 @@ class DeterminePrimaryKeyTest(unittest.TestCase):
# @Test
def test_determine_pk_smallFileIdIntBetween_fails(self):
# mock
- S3Client().upload_file("smallfile_idinbtw.csv", './data/test_pk/', 'dbrepo-upload')
+ S3Client().upload_file("smallfile_idinbtw.csv", './data/test_pk/', 'dbrepo')
# test
response = determine_pk('smallfile_idinbtw.csv')
@@ -61,7 +61,7 @@ class DeterminePrimaryKeyTest(unittest.TestCase):
# @Test
def test_determine_pk_smallFileNoPrimaryKey_fails(self):
# mock
- S3Client().upload_file("smallfile_no_pk.csv", './data/test_pk/', 'dbrepo-upload')
+ S3Client().upload_file("smallfile_no_pk.csv", './data/test_pk/', 'dbrepo')
# test
response = determine_pk('smallfile_no_pk.csv')
@@ -70,7 +70,7 @@ class DeterminePrimaryKeyTest(unittest.TestCase):
# @Test
def test_determine_pk_smallFileNullInUnique_fails(self):
# mock
- S3Client().upload_file("smallfile_nullinunique.csv", './data/test_pk/', 'dbrepo-upload')
+ S3Client().upload_file("smallfile_nullinunique.csv", './data/test_pk/', 'dbrepo')
# test
response = determine_pk('smallfile_nullinunique.csv')
diff --git a/dbrepo-analyse-service/test/test_s3_client.py b/dbrepo-analyse-service/test/test_s3_client.py
index 11eb115e6d87120102e6d6fbf6e20111640ed9fd..4ab03078242ae5f68bd01e23887b603c6de239f9 100644
--- a/dbrepo-analyse-service/test/test_s3_client.py
+++ b/dbrepo-analyse-service/test/test_s3_client.py
@@ -43,17 +43,17 @@ class S3ClientTest(unittest.TestCase):
def test_download_file_succeeds(self):
# mock
- S3Client().upload_file(filename="testdt01.csv", path="./data/", bucket="dbrepo-upload")
+ S3Client().upload_file(filename="testdt01.csv", path="./data/", bucket="dbrepo")
# test
- S3Client().download_file(filename="testdt01.csv", bucket="dbrepo-upload")
+ S3Client().download_file(filename="testdt01.csv", bucket="dbrepo")
# @Test
def test_download_file_notFound_fails(self):
# test
try:
- S3Client().download_file(filename="testdt01.csv", bucket="dbrepo-upload")
+ S3Client().download_file(filename="testdt01.csv", bucket="dbrepo")
except ClientError:
pass
except Exception:
@@ -78,10 +78,10 @@ class S3ClientTest(unittest.TestCase):
def test_get_file_succeeds(self):
# mock
- S3Client().upload_file(filename="testdt01.csv", path="./data/", bucket="dbrepo-upload")
+ S3Client().upload_file(filename="testdt01.csv", path="./data/", bucket="dbrepo")
# test
- response = S3Client().get_file(bucket="dbrepo-upload", filename="testdt01.csv")
+ response = S3Client().get_file(bucket="dbrepo", filename="testdt01.csv")
self.assertIsNotNone(response)
# @Test
@@ -89,7 +89,7 @@ class S3ClientTest(unittest.TestCase):
# test
try:
- S3Client().get_file(bucket="dbrepo-upload", filename="idonotexist.csv")
+ S3Client().get_file(bucket="dbrepo", filename="idonotexist.csv")
except ClientError:
pass
except Exception:
@@ -101,7 +101,7 @@ class S3ClientTest(unittest.TestCase):
def test_bucket_exists_succeeds(self):
# test
- response = S3Client().bucket_exists_or_exit("dbrepo-upload")
+ response = S3Client().bucket_exists_or_exit("dbrepo")
self.assertIsNotNone(response)
# @Test
diff --git a/dbrepo-auth-service/Dockerfile b/dbrepo-auth-service/Dockerfile
index e988d634127d9c0e89a8f7a4e6b3328761c0b544..47fabff4ed802e5ccf1f066250b174a04f041847 100644
--- a/dbrepo-auth-service/Dockerfile
+++ b/dbrepo-auth-service/Dockerfile
@@ -1,6 +1,6 @@
###### FIRST STAGE ######
-FROM keycloak/keycloak:21.0 as config
-MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
+FROM keycloak/keycloak:24.0 AS config
+LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
# Enable health and metrics support
ENV KC_HEALTH_ENABLED=true
@@ -17,12 +17,12 @@ COPY ./server.keystore ./conf/server.keystore
RUN /opt/keycloak/bin/kc.sh build
###### SECOND STAGE ######
-FROM redhat/ubi9-minimal as binary
+FROM redhat/ubi9-minimal AS binary
RUN microdnf update -y && microdnf install -y curl-minimal libcurl-minimal
###### THIRD STAGE ######
-FROM keycloak/keycloak:21.0 as runtime
+FROM keycloak/keycloak:21.0 AS runtime
COPY --from=config /opt/keycloak/ /opt/keycloak/
COPY --from=binary /usr/lib64 /usr/lib64
diff --git a/dbrepo-auth-service/dbrepo-realm.json b/dbrepo-auth-service/dbrepo-realm.json
index bd5a5464e7aeadd4c4012e7c0fa7e74efa2b6d04..a39f7de1b0ab0611057af4890ee281bb202609ca 100644
--- a/dbrepo-auth-service/dbrepo-realm.json
+++ b/dbrepo-auth-service/dbrepo-realm.json
@@ -37,6 +37,7 @@
"editUsernameAllowed" : false,
"bruteForceProtected" : false,
"permanentLockout" : false,
+ "maxTemporaryLockouts" : 0,
"maxFailureWaitSeconds" : 900,
"minimumQuickLoginWaitSeconds" : 60,
"waitIncrementSeconds" : 60,
@@ -66,6 +67,17 @@
"clientRole" : false,
"containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
"attributes" : { }
+ }, {
+ "id" : "7ee1c424-11b0-46a9-b0ed-725e9b7fc40c",
+ "name" : "default-system-roles",
+ "description" : "${default-system-roles}",
+ "composite" : true,
+ "composites" : {
+ "realm" : [ "delete-database-view", "update-semantic-unit", "export-query-data", "check-foreign-database-access", "default-data-steward-roles", "execute-query", "default-user-handling", "delete-table-data", "find-query", "list-database-views", "persist-query", "update-search-index", "delete-database-access", "view-table-history", "create-ontology", "update-ontology", "modify-user-theme", "default-system-roles", "create-semantic-concept", "default-container-handling", "create-container", "create-table", "default-broker-handling", "default-maintenance-handling", "execute-semantic-query", "uma_authorization", "table-semantic-analyse", "list-containers", "check-database-access", "escalated-query-handling", "delete-identifier", "modify-database-owner", "list-tables", "export-table-data", "create-database-access", "delete-container", "re-execute-query", "create-semantic-unit", "escalated-identifier-handling", "system", "update-table-statistic", "escalated-semantics-handling", "default-database-handling", "delete-ontology", "find-database", "find-database-view", "update-semantic-concept", "find-user", "import-database-data", "publish-identifier", "default-roles-dbrepo", "find-foreign-user", "create-database", "create-maintenance-message", "find-maintenance-message", "escalated-container-handling", "default-researcher-roles", "default-identifier-handling", "escalated-user-handling", "modify-user-information", "create-database-view", "update-maintenance-message", "delete-foreign-table", "offline_access", "modify-foreign-table-column-semantics", "delete-maintenance-message", "find-container", "insert-table-data", "modify-identifier-metadata", "modify-database-image", "escalated-broker-handling", "modify-table-column-semantics", "escalated-database-handling", "default-semantics-handling", "update-database-access", "default-query-handling", "find-table", "list-queries", "default-developer-roles", "create-identifier", "escalated-table-handling", "find-identifier", "view-database-view-data", "view-table-data", "list-licenses", "default-table-handling", "list-identifiers", "create-foreign-identifier", "list-databases", "list-ontologies", "modify-database-visibility", "list-maintenance-messages", "delete-table" ]
+ },
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
}, {
"id" : "143ba359-5fa2-451e-8296-43ecf20bb251",
"name" : "update-semantic-concept",
@@ -104,6 +116,14 @@
"clientRole" : false,
"containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
"attributes" : { }
+ }, {
+ "id" : "74648f9a-777e-4ef9-b97b-4c5d749d862f",
+ "name" : "update-search-index",
+ "description" : "${update-search-index}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
}, {
"id" : "22492b64-c633-48a0-9678-b28669f2885b",
"name" : "execute-semantic-query",
@@ -381,6 +401,14 @@
"clientRole" : false,
"containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
"attributes" : { }
+ }, {
+ "id" : "b05e9b2b-748d-490b-949b-e78655bf7805",
+ "name" : "check-foreign-database-access",
+ "description" : "${check-foreign-database-access}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
}, {
"id" : "c047d521-cec3-4444-86c4-aef098489b7b",
"name" : "delete-maintenance-message",
@@ -389,6 +417,14 @@
"clientRole" : false,
"containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
"attributes" : { }
+ }, {
+ "id" : "88f82262-be80-4d18-9fb4-5529da031f33",
+ "name" : "system",
+ "description" : "${system}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
}, {
"id" : "e14ab76b-1c24-484d-ae2d-478b8457edea",
"name" : "list-licenses",
@@ -638,6 +674,14 @@
"clientRole" : false,
"containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
"attributes" : { }
+ }, {
+ "id" : "0c487c93-448f-4a82-8b9f-ebd8a0904bf8",
+ "name" : "find-foreign-user",
+ "description" : "${find-foreign-user}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
}, {
"id" : "cf9735a9-fb70-4cc5-b5f4-75afc4e5654b",
"name" : "modify-identifier-metadata",
@@ -1061,26 +1105,34 @@
"id" : "f2ce17fe-7b15-47a4-bbf8-86f415298fa9",
"name" : "data-stewards",
"path" : "/data-stewards",
+ "subGroups" : [ ],
"attributes" : { },
"realmRoles" : [ "default-data-steward-roles" ],
- "clientRoles" : { },
- "subGroups" : [ ]
+ "clientRoles" : { }
}, {
"id" : "124d9888-0b6e-46aa-8225-077dcedaf16e",
"name" : "developers",
"path" : "/developers",
+ "subGroups" : [ ],
"attributes" : { },
"realmRoles" : [ "default-developer-roles" ],
- "clientRoles" : { },
- "subGroups" : [ ]
+ "clientRoles" : { }
}, {
"id" : "f467c38e-9041-4faa-ae0b-39cec65ff4db",
"name" : "researchers",
"path" : "/researchers",
+ "subGroups" : [ ],
"attributes" : { },
"realmRoles" : [ "default-researcher-roles" ],
- "clientRoles" : { },
- "subGroups" : [ ]
+ "clientRoles" : { }
+ }, {
+ "id" : "2b9f94b4-d434-4a98-8eab-25678cfee983",
+ "name" : "system",
+ "path" : "/system",
+ "subGroups" : [ ],
+ "attributes" : { },
+ "realmRoles" : [ "default-system-roles" ],
+ "clientRoles" : { }
} ],
"defaultRole" : {
"id" : "abd2d9ee-ebc4-4d0a-839e-6b588a6d442a",
@@ -1100,6 +1152,7 @@
"otpPolicyPeriod" : 30,
"otpPolicyCodeReusable" : false,
"otpSupportedApplications" : [ "totpAppFreeOTPName", "totpAppGoogleName", "totpAppMicrosoftAuthenticatorName" ],
+ "localizationTexts" : { },
"webAuthnPolicyRpEntityName" : "keycloak",
"webAuthnPolicySignatureAlgorithms" : [ "ES256" ],
"webAuthnPolicyRpId" : "",
@@ -1110,6 +1163,7 @@
"webAuthnPolicyCreateTimeout" : 0,
"webAuthnPolicyAvoidSameAuthenticatorRegister" : false,
"webAuthnPolicyAcceptableAaguids" : [ ],
+ "webAuthnPolicyExtraOrigins" : [ ],
"webAuthnPolicyPasswordlessRpEntityName" : "keycloak",
"webAuthnPolicyPasswordlessSignatureAlgorithms" : [ "ES256" ],
"webAuthnPolicyPasswordlessRpId" : "",
@@ -1120,6 +1174,7 @@
"webAuthnPolicyPasswordlessCreateTimeout" : 0,
"webAuthnPolicyPasswordlessAvoidSameAuthenticatorRegister" : false,
"webAuthnPolicyPasswordlessAcceptableAaguids" : [ ],
+ "webAuthnPolicyPasswordlessExtraOrigins" : [ ],
"scopeMappings" : [ {
"clientScope" : "rabbitmq.tag:administrator",
"roles" : [ "escalated-broker-handling" ]
@@ -1295,60 +1350,46 @@
"fullScopeAllowed" : true,
"nodeReRegistrationTimeout" : -1,
"protocolMappers" : [ {
- "id" : "6a8cae99-294f-4fc2-9561-5a52f3f6a1ba",
- "name" : "Audience",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-hardcoded-claim-mapper",
- "consentRequired" : false,
- "config" : {
- "claim.value" : "spring",
- "userinfo.token.claim" : "false",
- "id.token.claim" : "false",
- "access.token.claim" : "true",
- "claim.name" : "aud",
- "access.tokenResponse.claim" : "false"
- }
- }, {
- "id" : "8ae79e43-b2b7-4bb9-a420-b498690dd8c3",
- "name" : "given name",
+ "id" : "da0b27c1-ae2e-4baa-bf78-db233e15c78d",
+ "name" : "preferred_username",
"protocol" : "openid-connect",
"protocolMapper" : "oidc-usermodel-property-mapper",
"consentRequired" : false,
"config" : {
- "userinfo.token.claim" : "false",
- "user.attribute" : "firstName",
- "id.token.claim" : "false",
+ "user.attribute" : "username",
+ "id.token.claim" : "true",
"access.token.claim" : "true",
- "claim.name" : "user.firstname",
- "jsonType.label" : "String"
+ "claim.name" : "preferred_username",
+ "userinfo.token.claim" : "true"
}
}, {
- "id" : "ef081a47-f023-4056-958c-4194d3878d8c",
- "name" : "username",
+ "id" : "7c94de93-f60f-487b-b4b7-1891c67f74cc",
+ "name" : "aud",
"protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
+ "protocolMapper" : "oidc-hardcoded-claim-mapper",
"consentRequired" : false,
"config" : {
- "userinfo.token.claim" : "false",
- "user.attribute" : "username",
- "id.token.claim" : "false",
+ "claim.value" : "dbrepo",
+ "userinfo.token.claim" : "true",
+ "id.token.claim" : "true",
"access.token.claim" : "true",
- "claim.name" : "client_id",
- "jsonType.label" : "String"
+ "claim.name" : "aud",
+ "access.tokenResponse.claim" : "false"
}
}, {
- "id" : "99e3b48b-86ff-4e5b-8652-fcd2738b0ad1",
- "name" : "family name",
+ "id" : "030a1cd9-53d1-4a62-a375-94d50a2dc6fc",
+ "name" : "uid",
"protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
"consentRequired" : false,
"config" : {
+ "aggregate.attrs" : "false",
+ "multivalued" : "false",
"userinfo.token.claim" : "true",
- "user.attribute" : "lastName",
+ "user.attribute" : "LDAP_ID",
"id.token.claim" : "true",
"access.token.claim" : "true",
- "claim.name" : "user.lastname",
- "jsonType.label" : "String"
+ "claim.name" : "uid"
}
} ],
"defaultClientScopes" : [ "roles", "attributes" ],
@@ -2045,6 +2086,7 @@
"browserSecurityHeaders" : {
"contentSecurityPolicyReportOnly" : "",
"xContentTypeOptions" : "nosniff",
+ "referrerPolicy" : "no-referrer",
"xRobotsTag" : "none",
"xFrameOptions" : "SAMEORIGIN",
"contentSecurityPolicy" : "frame-src 'self'; frame-ancestors 'self'; object-src 'none';",
@@ -2078,23 +2120,6 @@
"config" : {
"allow-default-scopes" : [ "true" ]
}
- }, {
- "id" : "1849e52a-b8c9-44a8-af3d-ee19376a1ed1",
- "name" : "Trusted Hosts",
- "providerId" : "trusted-hosts",
- "subType" : "anonymous",
- "subComponents" : { },
- "config" : {
- "host-sending-registration-request-must-match" : [ "true" ],
- "client-uris-must-match" : [ "true" ]
- }
- }, {
- "id" : "f565cb47-3bcf-4078-8f94-eb4179c375b8",
- "name" : "Full Scope Disabled",
- "providerId" : "scope",
- "subType" : "anonymous",
- "subComponents" : { },
- "config" : { }
}, {
"id" : "0efa669d-1017-4b4a-82e1-c2eaf72de2c9",
"name" : "Allowed Client Scopes",
@@ -2112,25 +2137,193 @@
"subComponents" : { },
"config" : { }
}, {
- "id" : "104ec5a9-025b-4c44-8ac0-82d22887ca3e",
+ "id" : "3ab11d74-5e76-408a-b85a-26bf8950f979",
"name" : "Allowed Protocol Mapper Types",
"providerId" : "allowed-protocol-mappers",
- "subType" : "authenticated",
+ "subType" : "anonymous",
"subComponents" : { },
"config" : {
- "allowed-protocol-mapper-types" : [ "oidc-full-name-mapper", "oidc-usermodel-attribute-mapper", "saml-role-list-mapper", "oidc-sha256-pairwise-sub-mapper", "saml-user-attribute-mapper", "saml-user-property-mapper", "oidc-usermodel-property-mapper", "oidc-address-mapper" ]
+ "allowed-protocol-mapper-types" : [ "oidc-full-name-mapper", "saml-user-attribute-mapper", "saml-user-property-mapper", "saml-role-list-mapper", "oidc-usermodel-attribute-mapper", "oidc-usermodel-property-mapper", "oidc-address-mapper", "oidc-sha256-pairwise-sub-mapper" ]
}
}, {
- "id" : "3ab11d74-5e76-408a-b85a-26bf8950f979",
+ "id" : "1849e52a-b8c9-44a8-af3d-ee19376a1ed1",
+ "name" : "Trusted Hosts",
+ "providerId" : "trusted-hosts",
+ "subType" : "anonymous",
+ "subComponents" : { },
+ "config" : {
+ "host-sending-registration-request-must-match" : [ "true" ],
+ "client-uris-must-match" : [ "true" ]
+ }
+ }, {
+ "id" : "f565cb47-3bcf-4078-8f94-eb4179c375b8",
+ "name" : "Full Scope Disabled",
+ "providerId" : "scope",
+ "subType" : "anonymous",
+ "subComponents" : { },
+ "config" : { }
+ }, {
+ "id" : "104ec5a9-025b-4c44-8ac0-82d22887ca3e",
"name" : "Allowed Protocol Mapper Types",
"providerId" : "allowed-protocol-mappers",
- "subType" : "anonymous",
+ "subType" : "authenticated",
+ "subComponents" : { },
+ "config" : {
+ "allowed-protocol-mapper-types" : [ "saml-user-property-mapper", "oidc-usermodel-property-mapper", "saml-role-list-mapper", "oidc-address-mapper", "saml-user-attribute-mapper", "oidc-full-name-mapper", "oidc-sha256-pairwise-sub-mapper", "oidc-usermodel-attribute-mapper" ]
+ }
+ } ],
+ "org.keycloak.storage.UserStorageProvider" : [ {
+ "id" : "c109d473-5ce1-4032-af7b-02e5442f5c07",
+ "name" : "Identity Service",
+ "providerId" : "ldap",
+ "subComponents" : {
+ "org.keycloak.storage.ldap.mappers.LDAPStorageMapper" : [ {
+ "id" : "db9963a3-03d1-468e-998c-9f3338fdb493",
+ "name" : "creation date",
+ "providerId" : "user-attribute-ldap-mapper",
+ "subComponents" : { },
+ "config" : {
+ "ldap.attribute" : [ "createTimestamp" ],
+ "is.mandatory.in.ldap" : [ "false" ],
+ "always.read.value.from.ldap" : [ "true" ],
+ "read.only" : [ "true" ],
+ "user.model.attribute" : [ "createTimestamp" ]
+ }
+ }, {
+ "id" : "9d7b9abc-321e-4674-ba36-b104b9990641",
+ "name" : "last name",
+ "providerId" : "user-attribute-ldap-mapper",
+ "subComponents" : { },
+ "config" : {
+ "ldap.attribute" : [ "sn" ],
+ "is.mandatory.in.ldap" : [ "true" ],
+ "always.read.value.from.ldap" : [ "true" ],
+ "read.only" : [ "false" ],
+ "user.model.attribute" : [ "lastName" ]
+ }
+ }, {
+ "id" : "b5b7253b-984e-4aa3-b862-20dbe06e4cf9",
+ "name" : "first name",
+ "providerId" : "user-attribute-ldap-mapper",
+ "subComponents" : { },
+ "config" : {
+ "ldap.attribute" : [ "cn" ],
+ "is.mandatory.in.ldap" : [ "true" ],
+ "read.only" : [ "false" ],
+ "always.read.value.from.ldap" : [ "true" ],
+ "user.model.attribute" : [ "firstName" ]
+ }
+ }, {
+ "id" : "ea383c2f-3bfe-4117-a8fd-f012d6ebbf9e",
+ "name" : "email",
+ "providerId" : "user-attribute-ldap-mapper",
+ "subComponents" : { },
+ "config" : {
+ "ldap.attribute" : [ "mail" ],
+ "is.mandatory.in.ldap" : [ "false" ],
+ "read.only" : [ "false" ],
+ "always.read.value.from.ldap" : [ "false" ],
+ "user.model.attribute" : [ "email" ]
+ }
+ }, {
+ "id" : "5692d060-55b8-4cb1-b68f-0ae123cd9d02",
+ "name" : "system",
+ "providerId" : "group-ldap-mapper",
+ "subComponents" : { },
+ "config" : {
+ "membership.attribute.type" : [ "DN" ],
+ "group.name.ldap.attribute" : [ "cn" ],
+ "preserve.group.inheritance" : [ "false" ],
+ "membership.user.ldap.attribute" : [ "uid" ],
+ "groups.dn" : [ "ou=users,dc=dbrepo,dc=at" ],
+ "mode" : [ "LDAP_ONLY" ],
+ "user.roles.retrieve.strategy" : [ "LOAD_GROUPS_BY_MEMBER_ATTRIBUTE" ],
+ "membership.ldap.attribute" : [ "member" ],
+ "ignore.missing.groups" : [ "false" ],
+ "group.object.classes" : [ "groupOfNames" ],
+ "memberof.ldap.attribute" : [ "memberOf" ],
+ "groups.path" : [ "/" ],
+ "drop.non.existing.groups.during.sync" : [ "false" ]
+ }
+ }, {
+ "id" : "b6ff3285-35af-4e86-8bb4-d94b8e0d70bb",
+ "name" : "modify date",
+ "providerId" : "user-attribute-ldap-mapper",
+ "subComponents" : { },
+ "config" : {
+ "ldap.attribute" : [ "modifyTimestamp" ],
+ "is.mandatory.in.ldap" : [ "false" ],
+ "always.read.value.from.ldap" : [ "true" ],
+ "read.only" : [ "true" ],
+ "user.model.attribute" : [ "modifyTimestamp" ]
+ }
+ }, {
+ "id" : "b5d08699-ba3a-4ffd-bf2e-36d1bcac48d9",
+ "name" : "username",
+ "providerId" : "user-attribute-ldap-mapper",
+ "subComponents" : { },
+ "config" : {
+ "ldap.attribute" : [ "uid" ],
+ "is.mandatory.in.ldap" : [ "true" ],
+ "attribute.force.default" : [ "false" ],
+ "is.binary.attribute" : [ "false" ],
+ "always.read.value.from.ldap" : [ "false" ],
+ "read.only" : [ "false" ],
+ "user.model.attribute" : [ "username" ]
+ }
+ } ]
+ },
+ "config" : {
+ "pagination" : [ "false" ],
+ "fullSyncPeriod" : [ "-1" ],
+ "startTls" : [ "false" ],
+ "usersDn" : [ "ou=users,dc=dbrepo,dc=at" ],
+ "connectionPooling" : [ "true" ],
+ "cachePolicy" : [ "DEFAULT" ],
+ "useKerberosForPasswordAuthentication" : [ "false" ],
+ "importEnabled" : [ "true" ],
+ "enabled" : [ "true" ],
+ "usernameLDAPAttribute" : [ "uid" ],
+ "bindCredential" : [ "admin" ],
+ "bindDn" : [ "cn=admin,dc=dbrepo,dc=at" ],
+ "changedSyncPeriod" : [ "-1" ],
+ "lastSync" : [ "1719252666" ],
+ "vendor" : [ "other" ],
+ "uuidLDAPAttribute" : [ "entryUUID" ],
+ "connectionUrl" : [ "ldap://identity-service:1389" ],
+ "allowKerberosAuthentication" : [ "false" ],
+ "syncRegistrations" : [ "true" ],
+ "authType" : [ "simple" ],
+ "useTruststoreSpi" : [ "always" ],
+ "usePasswordModifyExtendedOp" : [ "false" ],
+ "trustEmail" : [ "false" ],
+ "userObjectClasses" : [ "inetOrgPerson, organizationalPerson, person" ],
+ "rdnLDAPAttribute" : [ "uid" ],
+ "editMode" : [ "WRITABLE" ],
+ "validatePasswordPolicy" : [ "false" ]
+ }
+ } ],
+ "org.keycloak.userprofile.UserProfileProvider" : [ {
+ "id" : "a407a1d6-a7f6-4a72-ba3a-149de03d5a43",
+ "providerId" : "declarative-user-profile",
"subComponents" : { },
"config" : {
- "allowed-protocol-mapper-types" : [ "oidc-usermodel-property-mapper", "oidc-usermodel-attribute-mapper", "saml-user-property-mapper", "oidc-full-name-mapper", "oidc-sha256-pairwise-sub-mapper", "oidc-address-mapper", "saml-role-list-mapper", "saml-user-attribute-mapper" ]
+ "kc.user.profile.config" : [ "{\"attributes\":[{\"name\":\"username\",\"displayName\":\"${username}\",\"validations\":{\"length\":{\"min\":3,\"max\":255},\"username-prohibited-characters\":{},\"up-username-not-idn-homograph\":{}},\"permissions\":{\"view\":[\"admin\",\"user\"],\"edit\":[\"admin\",\"user\"]},\"multivalued\":false},{\"name\":\"email\",\"displayName\":\"${email}\",\"validations\":{\"email\":{},\"length\":{\"max\":255}},\"required\":{\"roles\":[\"user\"]},\"permissions\":{\"view\":[\"admin\",\"user\"],\"edit\":[\"admin\",\"user\"]},\"multivalued\":false},{\"name\":\"firstName\",\"displayName\":\"${firstName}\",\"validations\":{\"length\":{\"max\":255},\"person-name-prohibited-characters\":{}},\"required\":{\"roles\":[\"user\"]},\"permissions\":{\"view\":[\"admin\",\"user\"],\"edit\":[\"admin\",\"user\"]},\"multivalued\":false},{\"name\":\"lastName\",\"displayName\":\"${lastName}\",\"validations\":{\"length\":{\"max\":255},\"person-name-prohibited-characters\":{}},\"required\":{\"roles\":[\"user\"]},\"permissions\":{\"view\":[\"admin\",\"user\"],\"edit\":[\"admin\",\"user\"]},\"multivalued\":false}],\"groups\":[{\"name\":\"user-metadata\",\"displayHeader\":\"User metadata\",\"displayDescription\":\"Attributes, which refer to user metadata\"}],\"unmanagedAttributePolicy\":\"ENABLED\"}" ]
}
} ],
"org.keycloak.keys.KeyProvider" : [ {
+ "id" : "2f53ccf3-37b0-4d34-83e7-ed497499ee51",
+ "name" : "rsa-enc-generated",
+ "providerId" : "rsa-enc-generated",
+ "subComponents" : { },
+ "config" : {
+ "privateKey" : [ "MIIEowIBAAKCAQEA3b1tNLfcjFLUw9UShVDNf+ZD8sQqb4YBaIXcSJTX/zDQUPiCp176BBGI3s4VplDArnOW+LumozmKogeoHEnGEIDW8ovgK5uMU9tSA2p0qqGBUMOdR8YATTIfCJe7qGiiuGa3WZy3sQLM70SuRzx02YU8gvUcvl2Js4KyqAziOUX/w3Wa59H9jjGNUXYyqaPWJp73eHzbVYWySzyLG22mVlcUtBx5siL5T2/Xu0p9z4l7/bapwwmOVi1ZrcHjbEAwdGEiSMGI/uWqAF+r1BRpmJLR7HNXcL3eK4/56VYLaiwSejfyYeRFMITEn/UxGYhcXZ5xMUUCG0TxjBhLYpTBuwIDAQABAoIBAA4dwebcxkrH99Poa8+WkiE7JgaS9sahx9OBI2xwJANoIU2TpzGuNLQZ76uLgB+rPWZTD9Xm5a1iJjwOyQ9/937TzPCk91D0tpgcusRikb8jx/6TGB9acL4kBjYUVCCHr3BA2G75MKKGtJ2OMvAbCQSosZj+r2VDwYFEPUkV2jheE5JHSBkwyIRrus3JCwu8gu5fyCg9z8ljcxJxI5HIsi4v8Z21aCw/cLj7h5cMt44wCjQz4rOfYNBEFeHDtlfR1QtWKgjm4ZHHJbKrzf9b2kQXclziceEbSM0tYbROEXKi+s0Zc+z3HEG89vv0vfN400clmzzIAijKY6gg3pPRWdECgYEA+lnWYbSlXDMNYx6RBXm1RnlMUYIm4oy4/9ljgnoGJ6WCn3SjFkgaDtiKfGIG1BSB85r04pAPANgcWHf5tWDnq0ARvBVG0BX2bKd++7B3D4d3CRYKCwm88SslJXv9dfHVhq4+zViFPiUWwT20A72jCuUCvL88y5fh/YBecfdh+jECgYEA4r5RD0NB9dMaeg5/jk/GEHIo4Z9KLc6FrSoOFo2xFkPOy1sgDpDOiNtypuWvniO7k7Ose3DS3hlfTMsKzIW/CgQJ20+Y4cvBWDaOsRxfjj7w3d+jH5OSJdKKSzTrgLKc9ZhlRzVXy0J0hipIA6HG5kdVdLXmh85ITmf1CbJhE6sCgYBjPVeBNbXTHZ2x6/z62aslO5IoQVqetb/kE82hfDOSZcao5Ph9Lam+ttH2ynkAevykj4mBgi+gWwqpey2uW7KaLPSaxShj9kDQA3mP1fzsV/u0y1rB02Nlin/YIxVvOqU1FT9p8SwoXVVu1sHUNck62VtDbN9xqUx5S/ikXrclEQKBgQCoTssOwEcK+Vty9KYcdfy4onTUHZBLdjxl8Iyqkxy7QTQUYRznkvesQPDXEDGO+kk3dyx2KKZt9Hl4IFNww2quPZcvcuMx4DQxjbXXpA8OIIxcta95NepLJwA+mRai3nKCH1A2TlNP7pFeMa5o+8IPly3Ix2lKr4Wepa4PN5i1pwKBgCZ1QP6XAOERl9NznNmU0rXVcvYNP4PIIfQWfvGsldZ4QKkmjjAGiS0/oYqdWs+UDRZyCRChaVjDXO9fk0PEG5OGKAj9nyiYCT/M8xtJ3UeP5ffZZvJ/vnye3QdDIo1e38ZzsWwJHmLYw7fRqY9W5Vxo0Vsy22U3CJY70KTxVdTy" ],
+ "keyUse" : [ "ENC" ],
+ "certificate" : [ "MIICmzCCAYMCBgGG3GWycDANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZkYnJlcG8wHhcNMjMwMzEzMTkxMzE3WhcNMzMwMzEzMTkxNDU3WjARMQ8wDQYDVQQDDAZkYnJlcG8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDdvW00t9yMUtTD1RKFUM1/5kPyxCpvhgFohdxIlNf/MNBQ+IKnXvoEEYjezhWmUMCuc5b4u6ajOYqiB6gcScYQgNbyi+Arm4xT21IDanSqoYFQw51HxgBNMh8Il7uoaKK4ZrdZnLexAszvRK5HPHTZhTyC9Ry+XYmzgrKoDOI5Rf/DdZrn0f2OMY1RdjKpo9Ymnvd4fNtVhbJLPIsbbaZWVxS0HHmyIvlPb9e7Sn3PiXv9tqnDCY5WLVmtweNsQDB0YSJIwYj+5aoAX6vUFGmYktHsc1dwvd4rj/npVgtqLBJ6N/Jh5EUwhMSf9TEZiFxdnnExRQIbRPGMGEtilMG7AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAK3kQ1VkQrzvSWvmXmazmNoA1ZiPzRDs1XhGUWxgsxzgPylr3dGBuqQbKvgnLUBQLSqlJHpI4fZflHswu1qrvVZYtekPcGef4WhcKAu2i1RwxrKa6RJQ1tRbrLuVYCzPv5p/DWgltWVn88aoLnqQn0SK/0PB/o4a4Cm7Kq2ZzCr1dACBr06LvOHsc7249OySmbG4HH+pLK6jVURhZ9VaObqAHe2FJBVVoIzURbdiRRURqumrIvbnpeaU1aFyg6ED5wTnXvmMPmVPt9F79mcB33bASO5wyu00X8t1hyN2Show2l2vxLACGUzVkTQt15s7uDLKE7qLmKSR3EuSGXWv3wA=" ],
+ "priority" : [ "100" ],
+ "algorithm" : [ "RSA-OAEP" ]
+ }
+ }, {
"id" : "28ca0b6d-b2e2-4785-b04b-2391e6344e30",
"name" : "aes-generated",
"providerId" : "aes-generated",
@@ -2146,23 +2339,11 @@
"providerId" : "hmac-generated",
"subComponents" : { },
"config" : {
- "kid" : [ "c8500166-5cc4-4085-ad0f-853c3b0b0233" ],
- "secret" : [ "TI3xg__G2Qy8C47DracpYir2X4ItQZSrhgr5KSlwRNISDbBqZ-ky3OcAyokSXMcpweSOaCPvbivpvzJNklUBvw" ],
+ "kid" : [ "7f9f9054-5697-4f60-bdc8-67e3bd0f4db6" ],
+ "secret" : [ "1SCIY20z3AbAHCL28LuJfBU-7zfsZv5dacgliUeGdRW_WK3vH9fJUpPu1f7iDrdlhF7YQmHxLXsWjxhQId4ShI7QBdgKCArHWqi0GeH37oNXfZFg_uv-K_3JSfxfGBRu5jpRQhhSBxESZWsFVkskhxWUvNe6b5l9dFbMIif72rI" ],
"priority" : [ "100" ],
"algorithm" : [ "HS256" ]
}
- }, {
- "id" : "2f53ccf3-37b0-4d34-83e7-ed497499ee51",
- "name" : "rsa-enc-generated",
- "providerId" : "rsa-enc-generated",
- "subComponents" : { },
- "config" : {
- "privateKey" : [ "MIIEowIBAAKCAQEA3b1tNLfcjFLUw9UShVDNf+ZD8sQqb4YBaIXcSJTX/zDQUPiCp176BBGI3s4VplDArnOW+LumozmKogeoHEnGEIDW8ovgK5uMU9tSA2p0qqGBUMOdR8YATTIfCJe7qGiiuGa3WZy3sQLM70SuRzx02YU8gvUcvl2Js4KyqAziOUX/w3Wa59H9jjGNUXYyqaPWJp73eHzbVYWySzyLG22mVlcUtBx5siL5T2/Xu0p9z4l7/bapwwmOVi1ZrcHjbEAwdGEiSMGI/uWqAF+r1BRpmJLR7HNXcL3eK4/56VYLaiwSejfyYeRFMITEn/UxGYhcXZ5xMUUCG0TxjBhLYpTBuwIDAQABAoIBAA4dwebcxkrH99Poa8+WkiE7JgaS9sahx9OBI2xwJANoIU2TpzGuNLQZ76uLgB+rPWZTD9Xm5a1iJjwOyQ9/937TzPCk91D0tpgcusRikb8jx/6TGB9acL4kBjYUVCCHr3BA2G75MKKGtJ2OMvAbCQSosZj+r2VDwYFEPUkV2jheE5JHSBkwyIRrus3JCwu8gu5fyCg9z8ljcxJxI5HIsi4v8Z21aCw/cLj7h5cMt44wCjQz4rOfYNBEFeHDtlfR1QtWKgjm4ZHHJbKrzf9b2kQXclziceEbSM0tYbROEXKi+s0Zc+z3HEG89vv0vfN400clmzzIAijKY6gg3pPRWdECgYEA+lnWYbSlXDMNYx6RBXm1RnlMUYIm4oy4/9ljgnoGJ6WCn3SjFkgaDtiKfGIG1BSB85r04pAPANgcWHf5tWDnq0ARvBVG0BX2bKd++7B3D4d3CRYKCwm88SslJXv9dfHVhq4+zViFPiUWwT20A72jCuUCvL88y5fh/YBecfdh+jECgYEA4r5RD0NB9dMaeg5/jk/GEHIo4Z9KLc6FrSoOFo2xFkPOy1sgDpDOiNtypuWvniO7k7Ose3DS3hlfTMsKzIW/CgQJ20+Y4cvBWDaOsRxfjj7w3d+jH5OSJdKKSzTrgLKc9ZhlRzVXy0J0hipIA6HG5kdVdLXmh85ITmf1CbJhE6sCgYBjPVeBNbXTHZ2x6/z62aslO5IoQVqetb/kE82hfDOSZcao5Ph9Lam+ttH2ynkAevykj4mBgi+gWwqpey2uW7KaLPSaxShj9kDQA3mP1fzsV/u0y1rB02Nlin/YIxVvOqU1FT9p8SwoXVVu1sHUNck62VtDbN9xqUx5S/ikXrclEQKBgQCoTssOwEcK+Vty9KYcdfy4onTUHZBLdjxl8Iyqkxy7QTQUYRznkvesQPDXEDGO+kk3dyx2KKZt9Hl4IFNww2quPZcvcuMx4DQxjbXXpA8OIIxcta95NepLJwA+mRai3nKCH1A2TlNP7pFeMa5o+8IPly3Ix2lKr4Wepa4PN5i1pwKBgCZ1QP6XAOERl9NznNmU0rXVcvYNP4PIIfQWfvGsldZ4QKkmjjAGiS0/oYqdWs+UDRZyCRChaVjDXO9fk0PEG5OGKAj9nyiYCT/M8xtJ3UeP5ffZZvJ/vnye3QdDIo1e38ZzsWwJHmLYw7fRqY9W5Vxo0Vsy22U3CJY70KTxVdTy" ],
- "keyUse" : [ "ENC" ],
- "certificate" : [ "MIICmzCCAYMCBgGG3GWycDANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZkYnJlcG8wHhcNMjMwMzEzMTkxMzE3WhcNMzMwMzEzMTkxNDU3WjARMQ8wDQYDVQQDDAZkYnJlcG8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDdvW00t9yMUtTD1RKFUM1/5kPyxCpvhgFohdxIlNf/MNBQ+IKnXvoEEYjezhWmUMCuc5b4u6ajOYqiB6gcScYQgNbyi+Arm4xT21IDanSqoYFQw51HxgBNMh8Il7uoaKK4ZrdZnLexAszvRK5HPHTZhTyC9Ry+XYmzgrKoDOI5Rf/DdZrn0f2OMY1RdjKpo9Ymnvd4fNtVhbJLPIsbbaZWVxS0HHmyIvlPb9e7Sn3PiXv9tqnDCY5WLVmtweNsQDB0YSJIwYj+5aoAX6vUFGmYktHsc1dwvd4rj/npVgtqLBJ6N/Jh5EUwhMSf9TEZiFxdnnExRQIbRPGMGEtilMG7AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAK3kQ1VkQrzvSWvmXmazmNoA1ZiPzRDs1XhGUWxgsxzgPylr3dGBuqQbKvgnLUBQLSqlJHpI4fZflHswu1qrvVZYtekPcGef4WhcKAu2i1RwxrKa6RJQ1tRbrLuVYCzPv5p/DWgltWVn88aoLnqQn0SK/0PB/o4a4Cm7Kq2ZzCr1dACBr06LvOHsc7249OySmbG4HH+pLK6jVURhZ9VaObqAHe2FJBVVoIzURbdiRRURqumrIvbnpeaU1aFyg6ED5wTnXvmMPmVPt9F79mcB33bASO5wyu00X8t1hyN2Show2l2vxLACGUzVkTQt15s7uDLKE7qLmKSR3EuSGXWv3wA=" ],
- "priority" : [ "100" ],
- "algorithm" : [ "RSA-OAEP" ]
- }
}, {
"id" : "2293ff99-3c6d-46d1-8635-5e679d5b134a",
"name" : "rsa-generated",
@@ -2174,12 +2355,23 @@
"certificate" : [ "MIICmzCCAYMCBgGG3GWyBTANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZkYnJlcG8wHhcNMjMwMzEzMTkxMzE3WhcNMzMwMzEzMTkxNDU3WjARMQ8wDQYDVQQDDAZkYnJlcG8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqqcdDYFZZb28M0tEJzEP77FmD/Xqioyj9zWX6VwUSOMAgmMmn8eqs9hT9T0a+q4YTo9tUW1PNbUpwprA5b4Uk04DcIajxDVMUR/PjcHytmkqwVskq9AZW/Vngdoo+8tSbuIybwe/3Vwt266hbHpDcM97a+DXcYooRl7tQWCEX7RP27wQrMD9epDQ6IgKayZg9vC9/03dsIqwH9jXQRiZlFvwiEKhX2aY7lPGBaCK414JO00K/Z49iov9TRa/IYVbSt5qwgrx6DcqsBSPwOnI6A85UGfeUEZ/7coVJiL7RvBlsllapsL9eWTbQajVh94k9Ei3sibEPbtH+U2OAM78zAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAASnN1Cuif1sdfEK2kWAURSXGJCohCROLWdKFjaeHPRaEfpbFJsgxW0Yj3nwX5O3bUlOWoTyENwnXSsXMQsqnNi+At32CKaKO8+AkhAbgQL9F0B+KeJwmYv3cUj5N/LYkJjBvZBzUZ4Ugu5dcxH0k7AktLAIwimkyEnxTNolOA3UyrGGpREr8MCKWVr10RFuOpF/0CsJNNwbHXzalO9D756EUcRWZ9VSg6QVNso0YYRKTnILWDn9hcTRnqGy3SHo3anFTqQZ+BB57YbgFWy6udC0LYRB3zdp6zNti87eu/VEymiDY/mmo1AB8Tm0b6vxFz4AKcL3ax5qS6YnZ9efSzk=" ],
"priority" : [ "100" ]
}
+ }, {
+ "id" : "addbae10-c6ae-4735-851f-7a5ea035ce25",
+ "name" : "hmac-generated-hs512",
+ "providerId" : "hmac-generated",
+ "subComponents" : { },
+ "config" : {
+ "kid" : [ "352d0ea1-8218-42b5-ab78-e2ca56cf6a95" ],
+ "secret" : [ "_kr6EZOZ8IKqPWgJltHAAsQ34wCIGPs8oOQLYWwJrSIH7Qie3CEVKZnICyBP1goR-QgUtg25tR8Qu5MkvYkb8assJ8Iok5x_8iYCR4Txkf_mS-emrlAtQajlIjmOfNBtx704dTnZlP9rWzqpW6mrpeiOaiCw1K0XCpY5C_ZjXKw" ],
+ "priority" : [ "100" ],
+ "algorithm" : [ "HS512" ]
+ }
} ]
},
"internationalizationEnabled" : false,
"supportedLocales" : [ ],
"authenticationFlows" : [ {
- "id" : "8b55b559-905f-4f73-b050-0cd68f676a42",
+ "id" : "259dd7b6-01b7-433a-bda4-028857151ecd",
"alias" : "Account verification options",
"description" : "Method with which to verity the existing account",
"providerId" : "basic-flow",
@@ -2201,36 +2393,7 @@
"userSetupAllowed" : false
} ]
}, {
- "id" : "293efab0-aa10-44e6-8f5a-dd63d6908d9e",
- "alias" : "Authentication Options",
- "description" : "Authentication options.",
- "providerId" : "basic-flow",
- "topLevel" : false,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "basic-auth",
- "authenticatorFlow" : false,
- "requirement" : "REQUIRED",
- "priority" : 10,
- "autheticatorFlow" : false,
- "userSetupAllowed" : false
- }, {
- "authenticator" : "basic-auth-otp",
- "authenticatorFlow" : false,
- "requirement" : "DISABLED",
- "priority" : 20,
- "autheticatorFlow" : false,
- "userSetupAllowed" : false
- }, {
- "authenticator" : "auth-spnego",
- "authenticatorFlow" : false,
- "requirement" : "DISABLED",
- "priority" : 30,
- "autheticatorFlow" : false,
- "userSetupAllowed" : false
- } ]
- }, {
- "id" : "f3c7659d-9c24-43e7-b94c-8bfb4811084f",
+ "id" : "542ca1d7-9627-4102-b843-98837ce433fb",
"alias" : "Browser - Conditional OTP",
"description" : "Flow to determine if the OTP is required for the authentication",
"providerId" : "basic-flow",
@@ -2252,7 +2415,7 @@
"userSetupAllowed" : false
} ]
}, {
- "id" : "1d83f267-0342-41c1-9a64-11cc9b8e62fc",
+ "id" : "4f153b98-6851-440b-a022-0a14e67a9b2f",
"alias" : "Direct Grant - Conditional OTP",
"description" : "Flow to determine if the OTP is required for the authentication",
"providerId" : "basic-flow",
@@ -2274,7 +2437,7 @@
"userSetupAllowed" : false
} ]
}, {
- "id" : "bb881bf0-e8f5-418e-91ec-09624683ec66",
+ "id" : "3d791b35-d35c-40b2-bb3e-e806d72b27ee",
"alias" : "First broker login - Conditional OTP",
"description" : "Flow to determine if the OTP is required for the authentication",
"providerId" : "basic-flow",
@@ -2296,7 +2459,7 @@
"userSetupAllowed" : false
} ]
}, {
- "id" : "aea83d83-6c28-4df6-9543-2bf74cc4b78a",
+ "id" : "9b746104-9371-4c3f-b69f-9322cead1b08",
"alias" : "Handle Existing Account",
"description" : "Handle what to do if there is existing account with same email/username like authenticated identity provider",
"providerId" : "basic-flow",
@@ -2318,7 +2481,7 @@
"userSetupAllowed" : false
} ]
}, {
- "id" : "78283326-7419-4cca-a5dd-cf510db7041c",
+ "id" : "7a164efe-c97b-4fbb-950d-7745359ba9a4",
"alias" : "Reset - Conditional OTP",
"description" : "Flow to determine if the OTP should be reset or not. Set to REQUIRED to force.",
"providerId" : "basic-flow",
@@ -2340,7 +2503,7 @@
"userSetupAllowed" : false
} ]
}, {
- "id" : "c88bb673-7092-4996-8c46-e9b08c94eb8c",
+ "id" : "4fdc5e1b-1b55-4662-8360-67d75fa22677",
"alias" : "User creation or linking",
"description" : "Flow for the existing/non-existing user alternatives",
"providerId" : "basic-flow",
@@ -2363,7 +2526,7 @@
"userSetupAllowed" : false
} ]
}, {
- "id" : "6632c7a3-8a7f-4f94-a15d-bdce1563f419",
+ "id" : "75893341-c338-44d8-ae27-a3fc7bfe8f2d",
"alias" : "Verify Existing Account by Re-authentication",
"description" : "Reauthentication of existing account",
"providerId" : "basic-flow",
@@ -2385,7 +2548,7 @@
"userSetupAllowed" : false
} ]
}, {
- "id" : "3a383f61-8ad4-4815-93a8-d04eefc48791",
+ "id" : "89626b76-f4cf-4c46-934c-4408c225a44b",
"alias" : "browser",
"description" : "browser based authentication",
"providerId" : "basic-flow",
@@ -2421,7 +2584,7 @@
"userSetupAllowed" : false
} ]
}, {
- "id" : "fc65865d-d3a4-4769-a665-fd49b34d2687",
+ "id" : "4112115a-e7a7-44c2-9af5-65d538e4ba0d",
"alias" : "clients",
"description" : "Base authentication for clients",
"providerId" : "client-flow",
@@ -2457,7 +2620,7 @@
"userSetupAllowed" : false
} ]
}, {
- "id" : "40077362-bb0b-41c7-a297-1d4c3625b17d",
+ "id" : "f82a9b0a-2c0a-4cb1-96b2-6c78b0b1f14f",
"alias" : "direct grant",
"description" : "OpenID Connect Resource Owner Grant",
"providerId" : "basic-flow",
@@ -2486,7 +2649,7 @@
"userSetupAllowed" : false
} ]
}, {
- "id" : "5b2f7f25-f5dd-4013-800d-6030b79e257e",
+ "id" : "3614e155-e8ce-4958-98fb-a27e4706cc70",
"alias" : "docker auth",
"description" : "Used by Docker clients to authenticate against the IDP",
"providerId" : "basic-flow",
@@ -2501,7 +2664,7 @@
"userSetupAllowed" : false
} ]
}, {
- "id" : "e9da2536-e792-461d-aceb-085f18ca533c",
+ "id" : "506f9b96-5002-47c0-96e3-3830a0fcfa26",
"alias" : "first broker login",
"description" : "Actions taken after first broker login with identity provider account, which is not yet linked to any Keycloak account",
"providerId" : "basic-flow",
@@ -2524,7 +2687,7 @@
"userSetupAllowed" : false
} ]
}, {
- "id" : "4c17ae53-d99e-4f47-92ef-47accae912fd",
+ "id" : "4b7a7e91-36db-4b27-8e2d-01a04a822980",
"alias" : "forms",
"description" : "Username, password, otp and other auth forms.",
"providerId" : "basic-flow",
@@ -2546,29 +2709,7 @@
"userSetupAllowed" : false
} ]
}, {
- "id" : "da0ed32c-3259-4571-877b-914fa2aa30b3",
- "alias" : "http challenge",
- "description" : "An authentication flow based on challenge-response HTTP Authentication Schemes",
- "providerId" : "basic-flow",
- "topLevel" : true,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "no-cookie-redirect",
- "authenticatorFlow" : false,
- "requirement" : "REQUIRED",
- "priority" : 10,
- "autheticatorFlow" : false,
- "userSetupAllowed" : false
- }, {
- "authenticatorFlow" : true,
- "requirement" : "REQUIRED",
- "priority" : 20,
- "autheticatorFlow" : true,
- "flowAlias" : "Authentication Options",
- "userSetupAllowed" : false
- } ]
- }, {
- "id" : "476d469b-5c54-42af-a41c-5dbe08412395",
+ "id" : "04c2fe01-5076-4aa4-9596-4efb4004195f",
"alias" : "registration",
"description" : "registration flow",
"providerId" : "basic-flow",
@@ -2584,7 +2725,7 @@
"userSetupAllowed" : false
} ]
}, {
- "id" : "714c4dc0-d7b3-4e12-93bd-59a7c4fbeef2",
+ "id" : "d12f77e1-7733-44a2-98ff-fd75c784d721",
"alias" : "registration form",
"description" : "registration form",
"providerId" : "form-flow",
@@ -2597,13 +2738,6 @@
"priority" : 20,
"autheticatorFlow" : false,
"userSetupAllowed" : false
- }, {
- "authenticator" : "registration-profile-action",
- "authenticatorFlow" : false,
- "requirement" : "REQUIRED",
- "priority" : 40,
- "autheticatorFlow" : false,
- "userSetupAllowed" : false
}, {
"authenticator" : "registration-password-action",
"authenticatorFlow" : false,
@@ -2620,7 +2754,7 @@
"userSetupAllowed" : false
} ]
}, {
- "id" : "316122ff-d003-49f7-9a0d-a570489bec9d",
+ "id" : "91f6048c-a376-4809-8f37-c8d7a517830c",
"alias" : "reset credentials",
"description" : "Reset credentials for a user if they forgot their password or something",
"providerId" : "basic-flow",
@@ -2656,7 +2790,7 @@
"userSetupAllowed" : false
} ]
}, {
- "id" : "5c90488c-9d5c-460d-9deb-9740740c3a9e",
+ "id" : "7b8fb487-53b8-4533-a696-76bc05256cb1",
"alias" : "saml ecp",
"description" : "SAML ECP Profile Authentication Flow",
"providerId" : "basic-flow",
@@ -2672,13 +2806,13 @@
} ]
} ],
"authenticatorConfig" : [ {
- "id" : "874c7063-05d5-45fb-b919-840798663176",
+ "id" : "48372696-0579-45e5-b074-5e8dbdbbe7d6",
"alias" : "create unique user config",
"config" : {
"require.password.update.after.registration" : "false"
}
}, {
- "id" : "93cf220e-2830-4ccb-9054-b3b87ef75fd4",
+ "id" : "08df3b83-e522-42a7-9e24-9028b960bf39",
"alias" : "review profile config",
"config" : {
"update.profile.on.first.login" : "missing"
@@ -2748,6 +2882,14 @@
"defaultAction" : false,
"priority" : 80,
"config" : { }
+ }, {
+ "alias" : "delete_credential",
+ "name" : "Delete Credential",
+ "providerId" : "delete_credential",
+ "enabled" : true,
+ "defaultAction" : false,
+ "priority" : 100,
+ "config" : { }
}, {
"alias" : "update_user_locale",
"name" : "Update User Locale",
@@ -2763,6 +2905,7 @@
"resetCredentialsFlow" : "reset credentials",
"clientAuthenticationFlow" : "clients",
"dockerAuthenticationFlow" : "docker auth",
+ "firstBrokerLoginFlow" : "first broker login",
"attributes" : {
"cibaBackchannelTokenDeliveryMode" : "poll",
"cibaAuthRequestedUserHint" : "login_hint",
@@ -2782,7 +2925,7 @@
"clientSessionMaxLifespan" : "0",
"shortVerificationUri" : ""
},
- "keycloakVersion" : "21.0.2",
+ "keycloakVersion" : "24.0.5",
"userManagedAccessAllowed" : false,
"clientProfiles" : {
"profiles" : [ ]
diff --git a/dbrepo-broker-service/README.md b/dbrepo-broker-service/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..95e5afaefdfc73751db6856526ca8c5e3a8f4c7c
--- /dev/null
+++ b/dbrepo-broker-service/README.md
@@ -0,0 +1,5 @@
+# Broker Service
+
+## Advanced Config
+
+https://www.rabbitmq.com/docs/ldap
\ No newline at end of file
diff --git a/dbrepo-broker-service/advanced.config b/dbrepo-broker-service/advanced.config
new file mode 100644
index 0000000000000000000000000000000000000000..4445ea601954e5c93c32edeba1638135c5af5e59
--- /dev/null
+++ b/dbrepo-broker-service/advanced.config
@@ -0,0 +1,17 @@
+[
+ {
+ rabbitmq_auth_backend_ldap,
+ [
+ {
+ tag_queries, [
+ {
+ administrator, {in_group_nested, "cn=system,ou=users,dc=dbrepo,dc=at", "member"}
+ },
+ {
+ management, {constant, true}
+ }
+ ]
+ }
+ ]
+ }
+].
\ No newline at end of file
diff --git a/dbrepo-broker-service/cert.pem b/dbrepo-broker-service/cert.pem
deleted file mode 100644
index e66555558cfa59a12b3d754401e9f84fef7299e4..0000000000000000000000000000000000000000
--- a/dbrepo-broker-service/cert.pem
+++ /dev/null
@@ -1,3 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICmzCCAYMCBgGG3GWyBTANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZkYnJlcG8wHhcNMjMwMzEzMTkxMzE3WhcNMzMwMzEzMTkxNDU3WjARMQ8wDQYDVQQDDAZkYnJlcG8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqqcdDYFZZb28M0tEJzEP77FmD/Xqioyj9zWX6VwUSOMAgmMmn8eqs9hT9T0a+q4YTo9tUW1PNbUpwprA5b4Uk04DcIajxDVMUR/PjcHytmkqwVskq9AZW/Vngdoo+8tSbuIybwe/3Vwt266hbHpDcM97a+DXcYooRl7tQWCEX7RP27wQrMD9epDQ6IgKayZg9vC9/03dsIqwH9jXQRiZlFvwiEKhX2aY7lPGBaCK414JO00K/Z49iov9TRa/IYVbSt5qwgrx6DcqsBSPwOnI6A85UGfeUEZ/7coVJiL7RvBlsllapsL9eWTbQajVh94k9Ei3sibEPbtH+U2OAM78zAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAASnN1Cuif1sdfEK2kWAURSXGJCohCROLWdKFjaeHPRaEfpbFJsgxW0Yj3nwX5O3bUlOWoTyENwnXSsXMQsqnNi+At32CKaKO8+AkhAbgQL9F0B+KeJwmYv3cUj5N/LYkJjBvZBzUZ4Ugu5dcxH0k7AktLAIwimkyEnxTNolOA3UyrGGpREr8MCKWVr10RFuOpF/0CsJNNwbHXzalO9D756EUcRWZ9VSg6QVNso0YYRKTnILWDn9hcTRnqGy3SHo3anFTqQZ+BB57YbgFWy6udC0LYRB3zdp6zNti87eu/VEymiDY/mmo1AB8Tm0b6vxFz4AKcL3ax5qS6YnZ9efSzk=
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/dbrepo-broker-service/definitions.json b/dbrepo-broker-service/definitions.json
index f9186096c542b3873c5a19f9371f8527c5a531cd..a3b70c989de5cb287e37588860e664afb6b7d6ec 100644
--- a/dbrepo-broker-service/definitions.json
+++ b/dbrepo-broker-service/definitions.json
@@ -21,15 +21,7 @@
],
"global_parameters": [],
"parameters": [],
- "permissions": [
- {
- "configure": ".*",
- "read": ".*",
- "user": "fda",
- "vhost": "dbrepo",
- "write": ".*"
- }
- ],
+ "permissions": [],
"policies": [],
"queues": [
{
@@ -46,17 +38,7 @@
"rabbit_version": "3.10.25",
"rabbitmq_version": "3.10.25",
"topic_permissions": [],
- "users": [
- {
- "hashing_algorithm": "rabbit_password_hashing_sha256",
- "limits": {},
- "name": "fda",
- "password_hash": "7e3Pa0qgP4kvQmCecg6mfFLDWuBEtKagLcNvPcgCd1XCr3sR",
- "tags": [
- "administrator"
- ]
- }
- ],
+ "users": [],
"vhosts": [
{
"limits": [],
diff --git a/dbrepo-broker-service/enabled_plugins b/dbrepo-broker-service/enabled_plugins
index a6ad748caa0392cb3193d79164349243639fc46c..95f1c0014dd4ee232580adea29176756a25274ed 100644
--- a/dbrepo-broker-service/enabled_plugins
+++ b/dbrepo-broker-service/enabled_plugins
@@ -1 +1 @@
-[rabbitmq_prometheus,rabbitmq_auth_backend_oauth2,rabbitmq_auth_mechanism_ssl,rabbitmq_management].
\ No newline at end of file
+[rabbitmq_prometheus,rabbitmq_auth_backend_ldap,rabbitmq_auth_mechanism_ssl,rabbitmq_management].
\ No newline at end of file
diff --git a/dbrepo-broker-service/pubkey.pem b/dbrepo-broker-service/pubkey.pem
deleted file mode 100644
index 9e4e9308e115194765587bb0451e85f98996f1c6..0000000000000000000000000000000000000000
--- a/dbrepo-broker-service/pubkey.pem
+++ /dev/null
@@ -1,3 +0,0 @@
------BEGIN RSA PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB
------END RSA PUBLIC KEY-----
\ No newline at end of file
diff --git a/dbrepo-broker-service/rabbitmq.conf b/dbrepo-broker-service/rabbitmq.conf
index 9efa167ba41d77d9c91a12fa63382a4d626f0b90..ff592bb3ecd4b003d180dbb44d8bd9acc5a70394 100644
--- a/dbrepo-broker-service/rabbitmq.conf
+++ b/dbrepo-broker-service/rabbitmq.conf
@@ -1,9 +1,6 @@
# user
default_vhost = dbrepo
default_user_tags.administrator = false
-default_permissions.configure = .*
-default_permissions.read = .*
-default_permissions.write = .*
# enable http outside localhost
listeners.tcp.1 = 0.0.0.0:5672
@@ -15,23 +12,19 @@ management.load_definitions = /app/definitions.json
# logging
log.console = true
log.console.level = warning
+auth_ldap.log = true
# 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
+auth_backends.1.authn = ldap
+auth_backends.1.authz = ldap
+auth_backends.2 = internal
-# management.oauth_enabled = true
-# management.oauth_client_id = rabbitmq-client
-# management.oauth_client_secret = JEC2FexxrX4N65fLeDGukAl6R3Lc9y0u
-# management.oauth_scopes = openid
-# management.oauth_provider_url = http://localhost/api/auth/realms/dbrepo
-
-# OAuth 2.0 files
-auth_oauth2.resource_server_id = rabbitmq
-auth_oauth2.preferred_username_claims.1 = client_id
-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
+# LDAP
+auth_ldap.servers.1 = identity-service
+auth_ldap.port = 1389
+auth_ldap.user_dn_pattern = ${username}
+auth_ldap.dn_lookup_base = dc=dbrepo,dc=at
+auth_ldap.dn_lookup_attribute = uid
+auth_ldap.dn_lookup_bind.user_dn = cn=admin,dc=dbrepo,dc=at
+auth_ldap.dn_lookup_bind.password = admin
diff --git a/dbrepo-broker-service/rabbitmq.conf.secure b/dbrepo-broker-service/rabbitmq.conf.secure
deleted file mode 100644
index dd6edf75ae2ee0e54612657667c1892cb74bafa6..0000000000000000000000000000000000000000
--- a/dbrepo-broker-service/rabbitmq.conf.secure
+++ /dev/null
@@ -1,40 +0,0 @@
-# user
-default_vhost = dbrepo
-default_user = fda
-default_pass = fda
-default_user_tags.administrator = true
-default_permissions.configure = .*
-default_permissions.read = .*
-default_permissions.write = .*
-
-# enable http outside localhost
-listeners.tcp.1 = 0.0.0.0:5672
-listeners.ssl.2 = 0.0.0.0:5671
-
-# management prefix (https://www.rabbitmq.com/management.html#path-prefix)
-management.path_prefix = /admin/broker
-management.load_definitions = /app/definitions.json
-
-# logging
-log.console = true
-log.console.level = warning
-ssl_options.cacertfile = /etc/rabbitmq/cacert.crt
-ssl_options.certfile = /etc/tls/tls.crt
-ssl_options.keyfile = /etc/tls/tls.key
-ssl_options.verify = verify_peer
-ssl_options.fail_if_no_peer_cert = true
-
-# 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.1 = client_id
-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
diff --git a/dbrepo-data-db/README.md b/dbrepo-data-db/README.md
index 94eb341d841ea5150c920ada2461cf9f1302555f..c2dfb1b0c65e7e97903457dfafc7ed7d913d2b94 100644
--- a/dbrepo-data-db/README.md
+++ b/dbrepo-data-db/README.md
@@ -1 +1,5 @@
-# Data Database
\ No newline at end of file
+# Data Database
+
+S3 Import
+
+https://mariadb.com/kb/en/s3-storage-engine-system-variables/
\ No newline at end of file
diff --git a/dbrepo-data-db/sidecar/app.py b/dbrepo-data-db/sidecar/app.py
index c88966bb00e789e8b102985a5abbdf4ec7034c90..955e3d9c3d6cb3b9e8140bc0773607db9118a0e0 100644
--- a/dbrepo-data-db/sidecar/app.py
+++ b/dbrepo-data-db/sidecar/app.py
@@ -119,14 +119,11 @@ app.config["JWT_PUBKEY"] = '-----BEGIN PUBLIC KEY-----\n' + os.getenv("JWT_PUBKE
app.config["AUTH_SERVICE_ENDPOINT"] = os.getenv("AUTH_SERVICE_ENDPOINT", "http://localhost/api/auth")
app.config["AUTH_SERVICE_CLIENT"] = os.getenv("AUTH_SERVICE_CLIENT", "dbrepo-client")
app.config["AUTH_SERVICE_CLIENT_SECRET"] = os.getenv("AUTH_SERVICE_CLIENT_SECRET", "MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG")
-app.config["ADMIN_USERNAME"] = os.getenv('ADMIN_USERNAME', 'admin')
-app.config["ADMIN_PASSWORD"] = os.getenv('ADMIN_PASSWORD', 'admin')
app.config["S3_ACCESS_KEY_ID"] = os.getenv('S3_ACCESS_KEY_ID', 'seaweedfsadmin')
app.config["S3_ENDPOINT"] = os.getenv('S3_ENDPOINT', 'http://localhost:9000')
-app.config["S3_EXPORT_BUCKET"] = os.getenv('S3_EXPORT_BUCKET', 'dbrepo-download')
app.config["S3_FILE_PATH"] = os.getenv('S3_FILE_PATH', '/tmp')
app.config["S3_SECRET_ACCESS_KEY"] = os.getenv('S3_SECRET_ACCESS_KEY', 'seaweedfsadmin')
-app.config["S3_IMPORT_BUCKET"] = os.getenv('S3_IMPORT_BUCKET', 'dbrepo-upload')
+app.config["S3_BUCKET"] = os.getenv('S3_BUCKET', 'dbrepo')
app.json_encoder = LazyJSONEncoder
@@ -146,8 +143,6 @@ def verify_token(token: str):
def verify_password(username: str, password: str) -> Any:
if username is None or username == "" or password is None or password == "":
return False
- if username == app.config["ADMIN_USERNAME"] and password == app.config["ADMIN_PASSWORD"]:
- return User(username=username, roles=["admin"])
client = KeycloakClient()
try:
return client.verify_jwt(access_token=client.obtain_user_token(username=username, password=password))
@@ -178,13 +173,13 @@ def health():
@app.route("/sidecar/import/<string:filename>", methods=["POST"], endpoint="sidecar_import")
@metrics.gauge(name='dbrepo_sidecar_import_dataset', description='Time needed to import dataset from S3')
-@auth.login_required(role=['admin', 'import-database-data'])
+@auth.login_required(role=['import-database-data'])
@swag_from("ds-yml/import.yml")
def import_csv(filename):
auth.current_user()
logging.debug('endpoint import csv, filename=%s, body=%s', filename, request)
s3_client = S3Client()
- response = s3_client.download_file(filename, app.config["S3_FILE_PATH"], app.config['S3_IMPORT_BUCKET'])
+ response = s3_client.download_file(filename, app.config["S3_FILE_PATH"], app.config['S3_BUCKET'])
if response is False:
return Response(), 400
return Response(json.dumps(response)), 202
@@ -192,12 +187,12 @@ def import_csv(filename):
@app.route("/sidecar/export/<string:filename>", methods=["POST"], endpoint="sidecar_export")
@metrics.gauge(name='dbrepo_sidecar_export_dataset', description='Time needed to export dataset to S3')
-@auth.login_required(role=['admin', 'export-query-data', 'export-table-data'])
+@auth.login_required(role=['export-query-data', 'export-table-data'])
@swag_from("ds-yml/export.yml")
def import_csv(filename):
logging.debug('endpoint export csv, filename=%s, body=%s', filename, request)
s3_client = S3Client()
- response = s3_client.upload_file(filename, app.config["S3_FILE_PATH"], app.config['S3_EXPORT_BUCKET'])
+ response = s3_client.upload_file(filename, app.config["S3_FILE_PATH"], app.config['S3_BUCKET'])
if response is False:
return Response(), 400
return Response(), 202
diff --git a/dbrepo-data-db/sidecar/clients/s3_client.py b/dbrepo-data-db/sidecar/clients/s3_client.py
index 547a1c3a30d5dce07000a49852aef04673163de1..d34760f6230321a4219df43124d404c43c98e043 100644
--- a/dbrepo-data-db/sidecar/clients/s3_client.py
+++ b/dbrepo-data-db/sidecar/clients/s3_client.py
@@ -17,8 +17,7 @@ class S3Client:
f"retrieve file from S3, endpoint_url={endpoint_url}, aws_access_key_id={aws_access_key_id}, aws_secret_access_key=(hidden)")
self.client = boto3.client(service_name='s3', endpoint_url=endpoint_url, aws_access_key_id=aws_access_key_id,
aws_secret_access_key=aws_secret_access_key)
- self.bucket_exists_or_exit(current_app.config['S3_IMPORT_BUCKET'])
- self.bucket_exists_or_exit(current_app.config['S3_EXPORT_BUCKET'])
+ self.bucket_exists_or_exit(current_app.config['S3_BUCKET'])
def upload_file(self, filename, path, bucket) -> bool:
"""
diff --git a/dbrepo-data-service/Dockerfile b/dbrepo-data-service/Dockerfile
index d4016836d91bf88f09ad60279689d9b16b5d9bb8..bd6d428695f2b85126a0a1b4dea604667510198c 100644
--- a/dbrepo-data-service/Dockerfile
+++ b/dbrepo-data-service/Dockerfile
@@ -1,10 +1,10 @@
###### FIRST STAGE ######
-FROM dbrepo-metadata-service:build as dependency
-MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
+FROM dbrepo-metadata-service:build AS dependency
+LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
###### SECOND STAGE ######
-FROM maven:3-openjdk-17 as build
-MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
+FROM maven:3-openjdk-17 AS build
+LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
COPY ./pom.xml ./
@@ -21,16 +21,16 @@ COPY ./services ./services
RUN mvn clean package -DskipTests
###### THIRD STAGE ######
-FROM amazoncorretto:17-alpine3.19 as runtime
-MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
+FROM amazoncorretto:17-alpine3.19 AS runtime
+LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
RUN apk add --no-cache curl bash jq
WORKDIR /app
-USER 65534
+USER 1001
-COPY --from=build --chown=65534 ./rest-service/target/rest-service-*.jar ./data-service.jar
+COPY --from=build --chown=1001 ./rest-service/target/rest-service-*.jar ./data-service.jar
# non-root port
EXPOSE 8080
diff --git a/dbrepo-data-service/metrics.md b/dbrepo-data-service/metrics.md
index 425b58ad17e24683a606cf0a4cb9d3123412e4cf..8219898284d6a830e52f3f2f3ee4ee80dd635e52 100644
--- a/dbrepo-data-service/metrics.md
+++ b/dbrepo-data-service/metrics.md
@@ -2,18 +2,18 @@
|-----------------------------|-------------------------------------------|
| `dbrepo_message_receive` | Received AMQP message from Broker Service |
| `dbrepo_subset_create` | Create subset |
-| `dbrepo_subset_data` | Retrieved subset data |
+| `dbrepo_subset_data` | Get subset data |
| `dbrepo_subset_find` | Find subset |
| `dbrepo_subset_list` | Find subsets |
| `dbrepo_subset_persist` | Persist subset |
-| `dbrepo_table_data_create` | Insert a raw data tuple |
-| `dbrepo_table_data_delete` | Delete table data |
-| `dbrepo_table_data_export` | Export table data |
-| `dbrepo_table_data_history` | Find table history |
-| `dbrepo_table_data_import` | Import data from a dataset |
-| `dbrepo_table_data_list` | Retrieve table data |
-| `dbrepo_table_data_update` | Update a raw data tuple |
-| `dbrepo_table_schema_list` | Find table schemas |
-| `dbrepo_table_statistic` | Generate table statistic |
-| `dbrepo_view_data` | Retrieve view data |
-| `dbrepo_view_schema_list` | Find view schemas |
+| `dbrepo_table_data_create` | Insert tuple |
+| `dbrepo_table_data_delete` | Delete tuple |
+| `dbrepo_table_data_export` | Get table data |
+| `dbrepo_table_data_history` | Get history |
+| `dbrepo_table_data_import` | Import dataset |
+| `dbrepo_table_data_list` | Get table data |
+| `dbrepo_table_data_update` | Update tuple |
+| `dbrepo_table_schema_list` | Find tables |
+| `dbrepo_table_statistic` | Get table statistic |
+| `dbrepo_view_data` | Get view data |
+| `dbrepo_view_schema_list` | Find views |
diff --git a/dbrepo-data-service/pom.xml b/dbrepo-data-service/pom.xml
index 3df58f676f876a8729e6485eef9291717404a242..fa6f32a02f94b182dbbe3b50ed6385521bcd03cb 100644
--- a/dbrepo-data-service/pom.xml
+++ b/dbrepo-data-service/pom.xml
@@ -11,7 +11,7 @@
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
<name>dbrepo-data-service</name>
- <version>1.4.4</version>
+ <version>1.4.5</version>
<description>Service that manages the data</description>
@@ -30,26 +30,6 @@
<email>martin.weise@tuwien.ac.at</email>
<organization>TU Wien</organization>
</developer>
- <developer>
- <name>Moritz Staudinger</name>
- <email>moritz.staudinger@tuwien.ac.at</email>
- <organization>TU Wien</organization>
- </developer>
- <developer>
- <name>Tobias Grantner</name>
- <email>tobias.grantner@tuwien.ac.at</email>
- <organization>TU Wien</organization>
- </developer>
- <developer>
- <name>Sotirios Tsepelakis</name>
- <email>sotirios.tsepelakis@tuwien.ac.at</email>
- <organization>TU Wien</organization>
- </developer>
- <developer>
- <name>Geoffrey Karnbach</name>
- <email>geoffrey.karnbach@tuwien.ac.at</email>
- <organization>TU Wien</organization>
- </developer>
</developers>
<properties>
@@ -176,6 +156,11 @@
<artifactId>commons-validator</artifactId>
<version>${commons-validator.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-hibernate6</artifactId>
+ <version>${jackson-datatype.version}</version>
+ </dependency>
<!-- Authentication -->
<dependency>
<groupId>com.auth0</groupId>
@@ -188,6 +173,12 @@
<artifactId>dbrepo-metadata-service-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <!-- Exceptions -->
+ <dependency>
+ <groupId>at.tuwien</groupId>
+ <artifactId>dbrepo-metadata-service-repositories</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- AMPQ -->
<dependency>
<groupId>org.springframework.amqp</groupId>
diff --git a/dbrepo-data-service/querystore/pom.xml b/dbrepo-data-service/querystore/pom.xml
index 4e08bccd72ee108c77bb795468a44eefed375073..57bb5dd76ca4f08668eab02c0391ef54a7ea5fa5 100644
--- a/dbrepo-data-service/querystore/pom.xml
+++ b/dbrepo-data-service/querystore/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
- <version>1.4.4</version>
+ <version>1.4.5</version>
</parent>
<artifactId>dbrepo-data-service-querystore</artifactId>
<name>dbrepo-data-service-querystore</name>
- <version>1.4.4</version>
+ <version>1.4.5</version>
<dependencies/>
diff --git a/dbrepo-data-service/report/pom.xml b/dbrepo-data-service/report/pom.xml
index 9a46c8f2fbe3d5a4257835c1a6935d36e4376d36..10663ef86dfa470e69a0254308d00761af5f7a44 100644
--- a/dbrepo-data-service/report/pom.xml
+++ b/dbrepo-data-service/report/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
- <version>1.4.4</version>
+ <version>1.4.5</version>
</parent>
<artifactId>report</artifactId>
<name>dbrepo-data-service-report</name>
- <version>1.4.4</version>
+ <version>1.4.5</version>
<description>
This module is only intended for the pipeline coverage report. See the detailed report in the
respective modules
diff --git a/dbrepo-data-service/rest-service/pom.xml b/dbrepo-data-service/rest-service/pom.xml
index 72f1a8f5d927f7334692c032bc3169d2b83d2b60..9eb7ec933b8a66a8984d900f2382b838e2c6b2d5 100644
--- a/dbrepo-data-service/rest-service/pom.xml
+++ b/dbrepo-data-service/rest-service/pom.xml
@@ -6,18 +6,18 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
- <version>1.4.4</version>
+ <version>1.4.5</version>
</parent>
<artifactId>rest-service</artifactId>
<name>dbrepo-data-service-rest-service</name>
- <version>1.4.4</version>
+ <version>1.4.5</version>
<dependencies>
<dependency>
<groupId>at.tuwien</groupId>
<artifactId>services</artifactId>
- <version>1.4.4</version>
+ <version>1.4.5</version>
</dependency>
</dependencies>
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java
index 4b58c5de3363606e17358de63e35fc8125c555b0..133bee769c792602ae89114a218381dd913f5c93 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java
@@ -8,7 +8,6 @@ import at.tuwien.api.user.UserDto;
import at.tuwien.exception.*;
import at.tuwien.gateway.MetadataServiceGateway;
import at.tuwien.service.AccessService;
-import io.micrometer.observation.annotation.Observed;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -42,8 +41,9 @@ public class AccessEndpoint {
}
@PostMapping("/{userId}")
- @PreAuthorize("hasAuthority('admin')")
- @Operation(summary = "Give access to some database", security = {@SecurityRequirement(name = "basicAuth")},
+ @PreAuthorize("hasAuthority('system')")
+ @Operation(summary = "Give access",
+ security = {@SecurityRequirement(name = "basicAuth")},
hidden = true)
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
@@ -74,11 +74,11 @@ public class AccessEndpoint {
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
})
- public ResponseEntity<?> create(@NotBlank @PathVariable("databaseId") Long databaseId,
- @NotBlank @PathVariable("userId") UUID userId,
- @Valid @RequestBody UpdateDatabaseAccessDto data)
- throws NotAllowedException, QueryMalformedException, DatabaseNotFoundException, RemoteUnavailableException,
- UserNotFoundException, DatabaseMalformedException, ServiceException {
+ public ResponseEntity<Void> create(@NotBlank @PathVariable("databaseId") Long databaseId,
+ @NotBlank @PathVariable("userId") UUID userId,
+ @Valid @RequestBody UpdateDatabaseAccessDto data)
+ throws NotAllowedException, DatabaseUnavailableException, DatabaseNotFoundException,
+ RemoteUnavailableException, UserNotFoundException, DatabaseMalformedException, MetadataServiceException {
log.debug("endpoint give access to database, databaseId={}, userId={}", databaseId, userId);
final PrivilegedDatabaseDto database = metadataServiceGateway.getDatabaseById(databaseId);
final PrivilegedUserDto user = metadataServiceGateway.getPrivilegedUserById(userId);
@@ -91,18 +91,19 @@ public class AccessEndpoint {
return ResponseEntity.accepted()
.build();
} catch (SQLException e) {
- throw new QueryMalformedException(e);
+ log.error("Failed to establish connection to database: {}", e.getMessage());
+ throw new DatabaseUnavailableException("Failed to establish connection to database", e);
}
}
@PutMapping("/{userId}")
- @PreAuthorize("hasAuthority('admin')")
- @Operation(summary = "Update access to some database", security = {@SecurityRequirement(name = "basicAuth")},
+ @PreAuthorize("hasAuthority('system')")
+ @Operation(summary = "Update access",
+ security = {@SecurityRequirement(name = "basicAuth")},
hidden = true)
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
- description = "Update access succeeded",
- content = {@Content}),
+ description = "Update access succeeded"),
@ApiResponse(responseCode = "400",
description = "Update access query or database connection is malformed",
content = {@Content(
@@ -129,11 +130,11 @@ public class AccessEndpoint {
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
})
- public ResponseEntity<?> update(@NotBlank @PathVariable("databaseId") Long databaseId,
- @NotBlank @PathVariable("userId") UUID userId,
- @Valid @RequestBody UpdateDatabaseAccessDto access) throws NotAllowedException,
- QueryMalformedException, DatabaseNotFoundException, RemoteUnavailableException, UserNotFoundException,
- DatabaseMalformedException, ServiceException {
+ public ResponseEntity<Void> update(@NotBlank @PathVariable("databaseId") Long databaseId,
+ @NotBlank @PathVariable("userId") UUID userId,
+ @Valid @RequestBody UpdateDatabaseAccessDto access) throws NotAllowedException,
+ DatabaseUnavailableException, DatabaseNotFoundException, RemoteUnavailableException, UserNotFoundException,
+ DatabaseMalformedException, MetadataServiceException {
log.debug("endpoint modify access to database, databaseId={}, userId={}, access.type={}", databaseId, userId,
access.getType());
final PrivilegedDatabaseDto database = metadataServiceGateway.getDatabaseById(databaseId);
@@ -147,13 +148,15 @@ public class AccessEndpoint {
return ResponseEntity.accepted()
.build();
} catch (SQLException e) {
- throw new QueryMalformedException(e);
+ log.error("Failed to establish connection to database: {}", e.getMessage());
+ throw new DatabaseUnavailableException("Failed to establish connection to database", e);
}
}
@DeleteMapping("/{userId}")
- @PreAuthorize("hasAuthority('admin')")
- @Operation(summary = "Revoke access to some database", security = {@SecurityRequirement(name = "basicAuth")},
+ @PreAuthorize("hasAuthority('system')")
+ @Operation(summary = "Revoke access",
+ security = {@SecurityRequirement(name = "basicAuth")},
hidden = true)
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
@@ -184,10 +187,10 @@ public class AccessEndpoint {
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
})
- public ResponseEntity<?> revoke(@NotBlank @PathVariable("databaseId") Long databaseId,
- @NotBlank @PathVariable("userId") UUID userId) throws NotAllowedException,
- QueryMalformedException, DatabaseNotFoundException, RemoteUnavailableException, UserNotFoundException,
- DatabaseMalformedException, ServiceException {
+ public ResponseEntity<Void> revoke(@NotBlank @PathVariable("databaseId") Long databaseId,
+ @NotBlank @PathVariable("userId") UUID userId) throws NotAllowedException,
+ DatabaseUnavailableException, DatabaseNotFoundException, RemoteUnavailableException, UserNotFoundException,
+ DatabaseMalformedException, MetadataServiceException {
log.debug("endpoint revoke access to database, databaseId={}, userId={}", databaseId, userId);
final PrivilegedDatabaseDto database = metadataServiceGateway.getDatabaseById(databaseId);
final UserDto user = metadataServiceGateway.getUserById(userId);
@@ -200,7 +203,8 @@ public class AccessEndpoint {
return ResponseEntity.accepted()
.build();
} catch (SQLException e) {
- throw new QueryMalformedException(e);
+ log.error("Failed to establish connection to database: {}", e.getMessage());
+ throw new DatabaseUnavailableException("Failed to establish connection to database", e);
}
}
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java
index bd32093068efc009a835975c9622f7bbe83eb1a5..9cefc57fa2b70db65daee6d4bc1d1ddd6434aa24 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java
@@ -53,8 +53,9 @@ public class DatabaseEndpoint {
}
@PostMapping
- @PreAuthorize("hasAuthority('admin')")
- @Operation(summary = "Create database", security = {@SecurityRequirement(name = "basicAuth")},
+ @PreAuthorize("hasAuthority('system')")
+ @Operation(summary = "Create database",
+ security = {@SecurityRequirement(name = "basicAuth")},
hidden = true)
@ApiResponses(value = {
@ApiResponse(responseCode = "201",
@@ -85,7 +86,7 @@ public class DatabaseEndpoint {
})
public ResponseEntity<DatabaseDto> create(@Valid @RequestBody CreateDatabaseDto data)
throws DatabaseUnavailableException, RemoteUnavailableException, ContainerNotFoundException,
- DatabaseMalformedException, QueryStoreCreateException, ServiceException {
+ DatabaseMalformedException, QueryStoreCreateException, MetadataServiceException {
log.debug("endpoint create database, data.containerId={}, data.internalName={}, data.username={}",
data.getContainerId(), data.getInternalName(), data.getUsername());
final PrivilegedContainerDto container = metadataServiceGateway.getContainerById(data.getContainerId());
@@ -107,8 +108,9 @@ public class DatabaseEndpoint {
}
@PutMapping("/{databaseId}")
- @PreAuthorize("hasAuthority('admin')")
- @Operation(summary = "Update user password in database", security = {@SecurityRequirement(name = "basicAuth")},
+ @PreAuthorize("hasAuthority('system')")
+ @Operation(summary = "Update user password",
+ security = {@SecurityRequirement(name = "basicAuth")},
hidden = true)
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
@@ -132,7 +134,7 @@ public class DatabaseEndpoint {
public ResponseEntity<Void> update(@NotBlank @PathVariable("databaseId") Long databaseId,
@Valid @RequestBody UpdateUserPasswordDto data)
throws DatabaseUnavailableException, DatabaseNotFoundException, RemoteUnavailableException,
- DatabaseMalformedException, ServiceException {
+ DatabaseMalformedException, MetadataServiceException {
log.debug("endpoint update user password in database, databaseId={}, data.username={}", databaseId,
data.getUsername());
final PrivilegedDatabaseDto database = metadataServiceGateway.getDatabaseById(databaseId);
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/SubsetEndpoint.java b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/SubsetEndpoint.java
index 0d4b53b92c9cb32ee588abc917a81b3d222fa8d8..8f5f4a821484d23a51dd5c60a6bba658278fdb14 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/SubsetEndpoint.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/SubsetEndpoint.java
@@ -1,6 +1,7 @@
package at.tuwien.endpoints;
import at.tuwien.ExportResourceDto;
+import at.tuwien.api.database.DatabaseDto;
import at.tuwien.api.database.internal.PrivilegedDatabaseDto;
import at.tuwien.api.database.query.ExecuteStatementDto;
import at.tuwien.api.database.query.QueryDto;
@@ -14,6 +15,8 @@ import at.tuwien.utils.UserUtil;
import at.tuwien.validation.EndpointValidator;
import io.micrometer.observation.annotation.Observed;
import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.headers.Header;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -57,13 +60,15 @@ public class SubsetEndpoint {
@GetMapping
@Observed(name = "dbrepo_subset_list")
- @Operation(summary = "Find subsets", security = {@SecurityRequirement(name = "basicAuth"), @SecurityRequirement(name = "bearerAuth")})
+ @Operation(summary = "Find subsets",
+ description = "Finds subsets in the query store. The result can be optionally filtered by setting `persisted`. When set to *true*, only persisted queries are returned, otherwise only non-persisted queries are returned.",
+ security = {@SecurityRequirement(name = "basicAuth"), @SecurityRequirement(name = "bearerAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Found subsets",
content = {@Content(
mediaType = "application/json",
- schema = @Schema(implementation = QueryDto[].class))}),
+ array = @ArraySchema(schema = @Schema(implementation = QueryDto.class)))}),
@ApiResponse(responseCode = "403",
description = "Not allowed to find subsets",
content = {@Content(
@@ -84,9 +89,8 @@ public class SubsetEndpoint {
@RequestParam(name = "persisted", required = false) Boolean filterPersisted,
Principal principal)
throws DatabaseUnavailableException, DatabaseNotFoundException, RemoteUnavailableException,
- QueryNotFoundException, NotAllowedException, ServiceException {
- log.debug("endpoint find subsets in database, databaseId={}, filterPersisted={}, principal.name={}", databaseId,
- filterPersisted, principal != null ? principal.getName() : null);
+ QueryNotFoundException, NotAllowedException, MetadataServiceException {
+ log.debug("endpoint find subsets in database, databaseId={}, filterPersisted={}", databaseId, filterPersisted);
final PrivilegedDatabaseDto database = metadataServiceGateway.getDatabaseById(databaseId);
if (!database.getIsPublic()) {
if (principal == null) {
@@ -102,13 +106,15 @@ public class SubsetEndpoint {
log.error("Failed to establish connection to database: {}", e.getMessage());
throw new DatabaseUnavailableException("Failed to establish connection to database: " + e.getMessage(), e);
}
- log.info("Found {} subsets in data database", queries.size());
+ log.info("Found {} subset(s)", queries.size());
return ResponseEntity.ok(queries);
}
@GetMapping("/{subsetId}")
@Observed(name = "dbrepo_subset_find")
- @Operation(summary = "Find subset", security = {@SecurityRequirement(name = "basicAuth"), @SecurityRequirement(name = "bearerAuth")})
+ @Operation(summary = "Find subset",
+ description = "Finds a subset in the data database. Requests with HTTP header `Accept=application/json` return the metadata, requests with HTTP header `Accept=text/csv` return the data as downloadable file.",
+ security = {@SecurityRequirement(name = "basicAuth"), @SecurityRequirement(name = "bearerAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Found subset",
@@ -150,7 +156,7 @@ public class SubsetEndpoint {
throws DatabaseUnavailableException, DatabaseNotFoundException, RemoteUnavailableException,
QueryNotFoundException, FormatNotAvailableException, StorageUnavailableException, QueryMalformedException,
SidecarExportException, StorageNotFoundException, NotAllowedException, UserNotFoundException,
- ServiceException {
+ MetadataServiceException {
String accept = httpServletRequest.getHeader("Accept");
log.debug("endpoint find subset in database, databaseId={}, subsetId={}, accept={}, timestamp={}", databaseId,
subsetId, accept, timestamp);
@@ -171,12 +177,12 @@ public class SubsetEndpoint {
}
/* parameters */
if (timestamp == null) {
- log.debug("timestamp not set: default to now");
timestamp = Instant.now();
+ log.debug("timestamp not set: default to {}", timestamp);
}
if (accept == null) {
- log.debug("accept header not set: default to application/json");
accept = MediaType.APPLICATION_JSON_VALUE;
+ log.debug("accept header not set: default to {}", accept);
}
switch (accept) {
case MediaType.APPLICATION_JSON_VALUE:
@@ -205,7 +211,9 @@ public class SubsetEndpoint {
@PostMapping
@Observed(name = "dbrepo_subset_create")
@PreAuthorize("hasAuthority('execute-query')")
- @Operation(summary = "Create subset", security = {@SecurityRequirement(name = "basicAuth"), @SecurityRequirement(name = "bearerAuth")})
+ @Operation(summary = "Create subset",
+ description = "Creates a subset in the query store of the data database. Requires role `execute-query`",
+ security = {@SecurityRequirement(name = "basicAuth"), @SecurityRequirement(name = "bearerAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "201",
description = "Created subset",
@@ -252,25 +260,25 @@ public class SubsetEndpoint {
throws DatabaseUnavailableException, DatabaseNotFoundException, RemoteUnavailableException,
QueryNotFoundException, StorageUnavailableException, QueryMalformedException, SidecarExportException,
StorageNotFoundException, QueryStoreInsertException, TableMalformedException, PaginationException,
- QueryNotSupportedException, NotAllowedException, UserNotFoundException, ServiceException {
- log.debug("endpoint create subset in database, databaseId={}, data.statement={}, principal.name={}, page={}, size={}, timestamp={}",
- databaseId, data.getStatement(), principal.getName(), page, size, timestamp);
+ QueryNotSupportedException, NotAllowedException, UserNotFoundException, MetadataServiceException {
+ log.debug("endpoint create subset in database, databaseId={}, data.statement={}, principal.name={}, " +
+ "page={}, size={}, timestamp={}", databaseId, data.getStatement(), principal.getName(), page, size,
+ timestamp);
/* check */
endpointValidator.validateDataParams(page, size);
endpointValidator.validateForbiddenStatements(data.getStatement());
- metadataServiceGateway.getAccess(databaseId, UserUtil.getId(principal));
/* parameters */
if (page == null) {
- log.debug("page not set: default to 0");
page = 0L;
+ log.debug("page not set: default to {}", page);
}
if (size == null) {
- log.debug("size not set: default to 10");
size = 10L;
+ log.debug("size not set: default to {}", size);
}
if (timestamp == null) {
- log.debug("timestamp not set: default to now");
timestamp = Instant.now();
+ log.debug("timestamp not set: default to {}", timestamp);
}
/* create */
final PrivilegedDatabaseDto database = metadataServiceGateway.getDatabaseById(databaseId);
@@ -282,22 +290,26 @@ public class SubsetEndpoint {
log.error("Failed to establish connection to database: {}", e.getMessage());
throw new DatabaseUnavailableException("Failed to establish connection to database: " + e.getMessage(), e);
}
- log.info("Created subset with id {} in data database", queryResult.getId());
+ log.info("Created subset with id: {}", queryResult.getId());
return ResponseEntity.status(HttpStatus.CREATED)
.body(queryResult);
}
@RequestMapping(value = "/{subsetId}/data", method = {RequestMethod.GET, RequestMethod.HEAD})
@Observed(name = "dbrepo_subset_data")
- @Operation(summary = "Retrieved subset data", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Get subset data",
+ description = "Gets data of subset with id. For private databases, the user needs at least *READ* access to the associated database. Requests with HTTP method **GET** return the subset dataset, requests with HTTP method **HEAD** only the number of rows in the subset dataset in the `X-Count` header",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Retrieved subset data",
+ headers = {@Header(name = "X-Count", description = "Number of rows", schema = @Schema(implementation = Long.class), required = true),
+ @Header(name = "Access-Control-Expose-Headers", description = "Expose `X-Count` custom header", schema = @Schema(implementation = String.class), required = true)},
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = QueryResultDto.class))}),
@ApiResponse(responseCode = "400",
- description = "Malformed select query",
+ description = "Invalid pagination",
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
@@ -325,7 +337,7 @@ public class SubsetEndpoint {
@RequestParam(required = false) Long size) throws PaginationException,
DatabaseNotFoundException, RemoteUnavailableException, NotAllowedException, QueryNotFoundException,
DatabaseUnavailableException, TableMalformedException, QueryMalformedException, UserNotFoundException,
- ServiceException {
+ MetadataServiceException {
log.debug("endpoint re-execute query, databaseId={}, subsetId={}, principal.name={} page={}, size={}",
databaseId, subsetId, principal != null ? principal.getName() : null, page, size);
endpointValidator.validateDataParams(page, size);
@@ -339,12 +351,12 @@ public class SubsetEndpoint {
}
/* parameters */
if (page == null) {
- log.debug("page not set: default to 0");
page = 0L;
+ log.debug("page not set: default to {}", page);
}
if (size == null) {
- log.debug("size not set: default to 10");
size = 10L;
+ log.debug("size not set: default to {}", size);
}
try {
final QueryDto query = subsetService.findById(database, subsetId);
@@ -372,7 +384,9 @@ public class SubsetEndpoint {
@PutMapping("/{queryId}")
@PreAuthorize("hasAuthority('persist-query')")
@Observed(name = "dbrepo_subset_persist")
- @Operation(summary = "Persist subset", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Persist subset",
+ description = "Persists a subset with id. Requires role `persist-query`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
description = "Persisted subset",
@@ -410,7 +424,7 @@ public class SubsetEndpoint {
@NotNull @Valid @RequestBody QueryPersistDto data,
@NotNull Principal principal) throws NotAllowedException,
RemoteUnavailableException, DatabaseNotFoundException, QueryStorePersistException,
- DatabaseUnavailableException, QueryNotFoundException, UserNotFoundException, ServiceException {
+ DatabaseUnavailableException, QueryNotFoundException, UserNotFoundException, MetadataServiceException {
log.debug("endpoint persist query, databaseId={}, queryId={}, data.persist={}, principal.name={}", databaseId,
queryId, data.getPersist(), principal.getName());
metadataServiceGateway.getAccess(databaseId, UserUtil.getId(principal));
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
index b03621c85e5f74eecf546a178b7c9747cd593b94..f4d31bbc216b333656d1ac70d0e3f28ddd49be0f 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
@@ -5,6 +5,7 @@ import at.tuwien.api.database.DatabaseAccessDto;
import at.tuwien.api.database.DatabaseDto;
import at.tuwien.api.database.internal.PrivilegedDatabaseDto;
import at.tuwien.api.database.query.ImportCsvDto;
+import at.tuwien.api.database.query.QueryDto;
import at.tuwien.api.database.query.QueryResultDto;
import at.tuwien.api.database.table.*;
import at.tuwien.api.database.table.internal.PrivilegedTableDto;
@@ -17,6 +18,8 @@ import at.tuwien.utils.UserUtil;
import at.tuwien.validation.EndpointValidator;
import io.micrometer.observation.annotation.Observed;
import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.headers.Header;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -58,8 +61,9 @@ public class TableEndpoint {
}
@PostMapping
- @PreAuthorize("hasAuthority('admin')")
- @Operation(summary = "Create table", security = {@SecurityRequirement(name = "basicAuth")},
+ @PreAuthorize("hasAuthority('system')")
+ @Operation(summary = "Create table",
+ security = {@SecurityRequirement(name = "basicAuth")},
hidden = true)
@ApiResponses(value = {
@ApiResponse(responseCode = "201",
@@ -91,7 +95,7 @@ public class TableEndpoint {
public ResponseEntity<TableDto> create(@NotNull @PathVariable("databaseId") Long databaseId,
@Valid @RequestBody TableCreateDto data) throws DatabaseNotFoundException,
RemoteUnavailableException, TableMalformedException, DatabaseUnavailableException, TableExistsException,
- TableNotFoundException, QueryMalformedException, ServiceException {
+ TableNotFoundException, QueryMalformedException, MetadataServiceException {
log.debug("endpoint create table, databaseId={}, data.name={}", databaseId, data.getName());
final PrivilegedDatabaseDto database = metadataServiceGateway.getDatabaseById(databaseId);
try {
@@ -104,8 +108,9 @@ public class TableEndpoint {
}
@DeleteMapping("/{tableId}")
- @PreAuthorize("hasAuthority('admin')")
- @Operation(summary = "Delete table", security = {@SecurityRequirement(name = "basicAuth")},
+ @PreAuthorize("hasAuthority('system')")
+ @Operation(summary = "Delete table",
+ security = {@SecurityRequirement(name = "basicAuth")},
hidden = true)
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
@@ -132,7 +137,7 @@ public class TableEndpoint {
public ResponseEntity<Void> delete(@NotBlank @PathVariable("databaseId") Long databaseId,
@NotBlank @PathVariable("tableId") Long tableId)
throws DatabaseUnavailableException, RemoteUnavailableException, TableNotFoundException,
- QueryMalformedException, ServiceException {
+ QueryMalformedException, MetadataServiceException {
log.debug("endpoint delete table, databaseId={}, tableId={}", databaseId, tableId);
final PrivilegedTableDto table = metadataServiceGateway.getTableById(databaseId, tableId);
try {
@@ -147,10 +152,14 @@ public class TableEndpoint {
@RequestMapping(value = "/{tableId}/data", method = {RequestMethod.GET, RequestMethod.HEAD})
@Observed(name = "dbrepo_table_data_list")
- @Operation(summary = "Retrieve table data", security = {@SecurityRequirement(name = "basicAuth"), @SecurityRequirement(name = "bearerAuth")})
+ @Operation(summary = "Get table data",
+ description = "Gets data from a table with id. For a table in a private database, the user needs to have at least *READ* access to the associated database. Requests with HTTP method **GET** return the full dataset, requests with HTTP method **HEAD** only the number of tuples in the `X-Count` header.",
+ security = {@SecurityRequirement(name = "basicAuth"), @SecurityRequirement(name = "bearerAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
- description = "Retrieved table data",
+ description = "Get table data",
+ headers = {@Header(name = "X-Count", description = "Number of rows", schema = @Schema(implementation = Long.class), required = true),
+ @Header(name = "Access-Control-Expose-Headers", description = "Expose `X-Count` custom header", schema = @Schema(implementation = String.class), required = true)},
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = QueryResultDto.class))}),
@@ -159,6 +168,11 @@ public class TableEndpoint {
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
+ @ApiResponse(responseCode = "403",
+ description = "Not allowed to get table data",
+ content = {@Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = ApiErrorDto.class))}),
@ApiResponse(responseCode = "404",
description = "Failed to find table in metadata database",
content = {@Content(
@@ -174,26 +188,36 @@ public class TableEndpoint {
@NotBlank @PathVariable("tableId") Long tableId,
@RequestParam(required = false) Instant timestamp,
@RequestParam(required = false) Long page,
- @RequestParam(required = false) Long size)
+ @RequestParam(required = false) Long size,
+ Principal principal)
throws DatabaseUnavailableException, RemoteUnavailableException, TableNotFoundException,
- TableMalformedException, PaginationException, QueryMalformedException, ServiceException {
+ TableMalformedException, PaginationException, QueryMalformedException, MetadataServiceException,
+ NotAllowedException {
log.debug("endpoint find table data, databaseId={}, tableId={}, timestamp={}, page={}, size={}", databaseId,
tableId, timestamp, page, size);
endpointValidator.validateDataParams(page, size);
/* parameters */
if (page == null) {
- log.debug("page not set: default to 0");
page = 0L;
+ log.debug("page not set: default to {}", page);
}
if (size == null) {
- log.debug("size not set: default to 10");
size = 10L;
+ log.debug("size not set: default to {}", size);
}
if (timestamp == null) {
- log.debug("timestamp not set: default to now");
timestamp = Instant.now();
+ log.debug("timestamp not set: default to {}", timestamp);
}
final PrivilegedTableDto table = metadataServiceGateway.getTableById(databaseId, tableId);
+ if (!table.getIsPublic()) {
+ if (principal == null) {
+ log.error("Failed find table data: authentication required");
+ throw new NotAllowedException("Failed to find table data: authentication required");
+ }
+ final DatabaseAccessDto access = metadataServiceGateway.getAccess(databaseId, UserUtil.getId(principal));
+ endpointValidator.validateOnlyWriteOwnOrWriteAllAccess(access.getType(), table.getOwner().getId(), UserUtil.getId(principal));
+ }
final HttpHeaders headers = new HttpHeaders();
headers.set("Access-Control-Expose-Headers", "X-Count");
try {
@@ -211,8 +235,8 @@ public class TableEndpoint {
@PostMapping("/{tableId}/data")
@PreAuthorize("hasAuthority('insert-table-data')")
@Observed(name = "dbrepo_table_data_create")
- @Operation(summary = "Insert a raw data tuple",
- description = "Inserts a raw data tuple into a table with at least WRITE_OWN access. Then update the table statistics.",
+ @Operation(summary = "Insert tuple",
+ description = "Inserts a data tuple into a table, then the table statistics are updated. The user needs to have at least *WRITE_OWN* access to the associated database. Requires role `insert-table-data`.",
security = {@SecurityRequirement(name = "basicAuth"), @SecurityRequirement(name = "bearerAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "201",
@@ -244,7 +268,7 @@ public class TableEndpoint {
@NotNull Principal principal)
throws DatabaseUnavailableException, RemoteUnavailableException, TableNotFoundException,
TableMalformedException, QueryMalformedException, NotAllowedException, StorageUnavailableException,
- StorageNotFoundException, ServiceException {
+ StorageNotFoundException, MetadataServiceException {
log.debug("endpoint insert raw table data, databaseId={}, tableId={}", databaseId, tableId);
final PrivilegedTableDto table = metadataServiceGateway.getTableById(databaseId, tableId);
final DatabaseAccessDto access = metadataServiceGateway.getAccess(databaseId, UserUtil.getId(principal));
@@ -263,8 +287,8 @@ public class TableEndpoint {
@PutMapping("/{tableId}/data")
@PreAuthorize("hasAuthority('insert-table-data')")
@Observed(name = "dbrepo_table_data_update")
- @Operation(summary = "Update a raw data tuple",
- description = "Updates a raw data tuple in a table with at least WRITE_OWN access. Then update the table statistics.",
+ @Operation(summary = "Update tuple",
+ description = "Updates a data tuple into a table, then the table statistics are updated. The user needs to have at least *WRITE_OWN* access to the associated database. Requires role `insert-table-data`.",
security = {@SecurityRequirement(name = "basicAuth"), @SecurityRequirement(name = "bearerAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
@@ -295,7 +319,7 @@ public class TableEndpoint {
@Valid @RequestBody TupleUpdateDto data,
@NotNull Principal principal)
throws DatabaseUnavailableException, RemoteUnavailableException, TableNotFoundException,
- TableMalformedException, QueryMalformedException, NotAllowedException, ServiceException {
+ TableMalformedException, QueryMalformedException, NotAllowedException, MetadataServiceException {
log.debug("endpoint update raw table data, databaseId={}, tableId={}, data.keys={}", databaseId, tableId,
data.getKeys());
final PrivilegedTableDto table = metadataServiceGateway.getTableById(databaseId, tableId);
@@ -315,8 +339,8 @@ public class TableEndpoint {
@DeleteMapping("/{tableId}/data")
@PreAuthorize("hasAuthority('delete-table-data')")
@Observed(name = "dbrepo_table_data_delete")
- @Operation(summary = "Delete table data",
- description = "Deletes a raw data tuple in a table with at least WRITE_OWN access. Then update the table statistics.",
+ @Operation(summary = "Delete tuple",
+ description = "Deletes a data tuple into a table, then the table statistics are updated. The user needs to have at least *WRITE_OWN* access to the associated database. Requires role `delete-table-data`.",
security = {@SecurityRequirement(name = "basicAuth"), @SecurityRequirement(name = "bearerAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
@@ -347,7 +371,7 @@ public class TableEndpoint {
@Valid @RequestBody TupleDeleteDto data,
@NotNull Principal principal)
throws DatabaseUnavailableException, RemoteUnavailableException, TableNotFoundException,
- TableMalformedException, QueryMalformedException, NotAllowedException, ServiceException {
+ TableMalformedException, QueryMalformedException, NotAllowedException, MetadataServiceException {
log.debug("endpoint delete raw table data, databaseId={}, tableId={}, data.keys={}", databaseId, tableId,
data.getKeys());
final PrivilegedTableDto table = metadataServiceGateway.getTableById(databaseId, tableId);
@@ -366,17 +390,17 @@ public class TableEndpoint {
@GetMapping("/{tableId}/history")
@Observed(name = "dbrepo_table_data_history")
- @Operation(summary = "Find table history",
- description = "Lists the insert/delete operations performed. Authentication is only required for tables in private databases",
+ @Operation(summary = "Get history",
+ description = "Gets the insert/delete operations history performed. For tables in private databases, the user needs to have at least *READ* access to the associated database.",
security = {@SecurityRequirement(name = "basicAuth"), @SecurityRequirement(name = "bearerAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Found table history",
content = {@Content(
mediaType = "application/json",
- schema = @Schema(implementation = TableHistoryDto[].class))}),
+ array = @ArraySchema(schema = @Schema(implementation = TableHistoryDto.class)))}),
@ApiResponse(responseCode = "400",
- description = "Invalid pagination request",
+ description = "Invalid pagination size request, must be > 0",
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
@@ -400,7 +424,7 @@ public class TableEndpoint {
@NotNull @PathVariable("tableId") Long tableId,
@RequestParam(value = "size", required = false) Long size,
Principal principal) throws DatabaseUnavailableException,
- RemoteUnavailableException, TableNotFoundException, NotAllowedException, ServiceException,
+ RemoteUnavailableException, TableNotFoundException, NotAllowedException, MetadataServiceException,
PaginationException {
log.debug("endpoint find table history, databaseId={}, tableId={}", databaseId, tableId);
if (size != null && size <= 0) {
@@ -429,15 +453,16 @@ public class TableEndpoint {
}
@GetMapping
- @PreAuthorize("hasAuthority('admin')")
+ @PreAuthorize("hasAuthority('system')")
@Observed(name = "dbrepo_table_schema_list")
- @Operation(summary = "Find table schemas", hidden = true)
+ @Operation(summary = "Find tables",
+ hidden = true)
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Got table schemas",
content = {@Content(
mediaType = "application/json",
- schema = @Schema(implementation = TableDto[].class))}),
+ array = @ArraySchema(schema = @Schema(implementation = TableDto.class)))}),
@ApiResponse(responseCode = "400",
description = "Schema data malformed",
content = {@Content(
@@ -466,7 +491,7 @@ public class TableEndpoint {
})
public ResponseEntity<List<TableDto>> getSchema(@NotBlank @PathVariable("databaseId") Long databaseId)
throws DatabaseUnavailableException, DatabaseNotFoundException, RemoteUnavailableException,
- DatabaseMalformedException, TableNotFoundException, QueryMalformedException, ServiceException {
+ DatabaseMalformedException, TableNotFoundException, MetadataServiceException {
log.debug("endpoint inspect table schemas, databaseId={}", databaseId);
final PrivilegedDatabaseDto database = metadataServiceGateway.getDatabaseById(databaseId);
try {
@@ -479,7 +504,9 @@ public class TableEndpoint {
@GetMapping("/{tableId}/export")
@Observed(name = "dbrepo_table_data_export")
- @Operation(summary = "Export table data", security = {@SecurityRequirement(name = "basicAuth"), @SecurityRequirement(name = "bearerAuth")})
+ @Operation(summary = "Get table data",
+ description = "Gets data from table with id as downloadable file. For tables in private databases, the user needs to have at least *READ* access to the associated database.",
+ security = {@SecurityRequirement(name = "basicAuth"), @SecurityRequirement(name = "bearerAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Exported table data",
@@ -513,8 +540,13 @@ public class TableEndpoint {
Principal principal)
throws DatabaseUnavailableException, RemoteUnavailableException, TableNotFoundException,
NotAllowedException, StorageUnavailableException, QueryMalformedException, SidecarExportException,
- StorageNotFoundException, ServiceException {
+ StorageNotFoundException, MetadataServiceException {
log.debug("endpoint find table history, databaseId={}, tableId={}, timestamp={}", databaseId, tableId, timestamp);
+ /* parameters */
+ if (timestamp == null) {
+ timestamp = Instant.now();
+ log.debug("timestamp not set: default to {}", timestamp);
+ }
final PrivilegedTableDto table = metadataServiceGateway.getTableById(databaseId, tableId);
if (!table.getIsPublic()) {
if (principal == null) {
@@ -523,11 +555,6 @@ public class TableEndpoint {
}
metadataServiceGateway.getAccess(databaseId, UserUtil.getId(principal));
}
- /* parameters */
- if (timestamp == null) {
- log.debug("timestamp not set: default to now");
- timestamp = Instant.now();
- }
try {
final HttpHeaders headers = new HttpHeaders();
final ExportResourceDto resource = tableService.exportDataset(table, timestamp);
@@ -546,8 +573,8 @@ public class TableEndpoint {
@PostMapping("/{tableId}/data/import")
@Observed(name = "dbrepo_table_data_import")
@PreAuthorize("hasAuthority('insert-table-data')")
- @Operation(summary = "Import data from a dataset",
- description = "Deletes a raw data tuple in a table with at least WRITE_OWN access. Then update the table statistics.",
+ @Operation(summary = "Import dataset",
+ description = "Imports a dataset in a table. Then update the table statistics. The user needs to have at least *WRITE_OWN* access to the associated database when importing into a owned table. Otherwise *WRITE_ALL* access in needed. Requires role `insert-table-data`.",
security = {@SecurityRequirement(name = "basicAuth"), @SecurityRequirement(name = "bearerAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
@@ -579,18 +606,18 @@ public class TableEndpoint {
@NotNull Principal principal)
throws DatabaseUnavailableException, RemoteUnavailableException, TableNotFoundException,
QueryMalformedException, StorageNotFoundException, SidecarImportException, NotAllowedException,
- ServiceException {
+ MetadataServiceException {
log.debug("endpoint insert table data, databaseId={}, tableId={}, data.location={}", databaseId, tableId, data.getLocation());
final PrivilegedTableDto table = metadataServiceGateway.getTableById(databaseId, tableId);
final DatabaseAccessDto access = metadataServiceGateway.getAccess(databaseId, UserUtil.getId(principal));
endpointValidator.validateOnlyWriteOwnOrWriteAllAccess(access.getType(), table.getOwner().getId(), UserUtil.getId(principal));
if (data.getNullElement() == null) {
- log.debug("null element not present, default to empty string");
data.setNullElement("");
+ log.debug("null element not present, default to empty string");
}
if (data.getLineTermination() == null) {
- log.debug("line termination not present, default to \\r\\n");
data.setLineTermination("\\r\\n");
+ log.debug("line termination not present, default to {}", data.getLineTermination());
}
try {
tableService.importDataset(table, data);
@@ -605,7 +632,8 @@ public class TableEndpoint {
@GetMapping("/{tableId}/statistic")
@Observed(name = "dbrepo_table_statistic")
- @Operation(summary = "Generate table statistic")
+ @Operation(summary = "Get table statistic",
+ description = "Gets basic statistical properties (min, max, mean, median, std.dev) of numerical columns of a table with id.")
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Generated table statistic",
@@ -618,7 +646,7 @@ public class TableEndpoint {
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
@ApiResponse(responseCode = "404",
- description = "Failed to find table in metadata database",
+ description = "Failed to find table or database in metadata database",
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
@@ -631,9 +659,10 @@ public class TableEndpoint {
public ResponseEntity<TableStatisticDto> statistic(@NotBlank @PathVariable("databaseId") Long databaseId,
@NotBlank @PathVariable("tableId") Long tableId)
throws DatabaseUnavailableException, RemoteUnavailableException, TableNotFoundException,
- ServiceException, TableMalformedException, QueryMalformedException {
+ MetadataServiceException, TableMalformedException, DatabaseNotFoundException {
log.debug("endpoint generate table statistic, databaseId={}, tableId={}", databaseId, tableId);
final PrivilegedTableDto table = metadataServiceGateway.getTableById(databaseId, tableId);
+ table.setDatabase(metadataServiceGateway.getDatabaseById(databaseId));
try {
final TableStatisticDto dto = tableService.getStatistics(table);
return ResponseEntity.ok(dto);
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java
index 64eea4ebd0ba058691faad70cafd5d9d7df1fec0..e9dbfd5c3a7f3d59088f048398cd2c4f9d9d8f45 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java
@@ -12,6 +12,7 @@ import at.tuwien.utils.UserUtil;
import at.tuwien.validation.EndpointValidator;
import io.micrometer.observation.annotation.Observed;
import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.headers.Header;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -53,9 +54,10 @@ public class ViewEndpoint {
}
@GetMapping
- @PreAuthorize("hasAuthority('admin')")
+ @PreAuthorize("hasAuthority('system')")
@Observed(name = "dbrepo_view_schema_list")
- @Operation(summary = "Find view schemas", hidden = true)
+ @Operation(summary = "Find views",
+ hidden = true)
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Found view schemas",
@@ -91,7 +93,7 @@ public class ViewEndpoint {
public ResponseEntity<List<ViewDto>> getSchema(@NotBlank @PathVariable("databaseId") Long databaseId)
throws DatabaseUnavailableException, DatabaseNotFoundException, RemoteUnavailableException,
ViewMalformedException, ViewNotFoundException, DatabaseMalformedException, ViewSchemaException,
- ServiceException {
+ MetadataServiceException {
log.debug("endpoint inspect view schemas, databaseId={}", databaseId);
final PrivilegedDatabaseDto database = metadataServiceGateway.getDatabaseById(databaseId);
try {
@@ -103,8 +105,9 @@ public class ViewEndpoint {
}
@PostMapping
- @PreAuthorize("hasAuthority('admin')")
- @Operation(summary = "Create view", security = {@SecurityRequirement(name = "basicAuth"), @SecurityRequirement(name = "bearerAuth")},
+ @PreAuthorize("hasAuthority('system')")
+ @Operation(summary = "Create view",
+ security = {@SecurityRequirement(name = "basicAuth"), @SecurityRequirement(name = "bearerAuth")},
hidden = true)
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
@@ -135,7 +138,7 @@ public class ViewEndpoint {
})
public ResponseEntity<ViewDto> create(@NotNull @PathVariable("databaseId") Long databaseId,
@Valid @RequestBody ViewCreateDto data) throws DatabaseUnavailableException,
- DatabaseNotFoundException, RemoteUnavailableException, ViewMalformedException, ServiceException {
+ DatabaseNotFoundException, RemoteUnavailableException, ViewMalformedException, MetadataServiceException {
log.debug("endpoint create view, databaseId={}, data.name={}", databaseId, data.getName());
final PrivilegedDatabaseDto database = metadataServiceGateway.getDatabaseById(databaseId);
try {
@@ -148,8 +151,9 @@ public class ViewEndpoint {
}
@DeleteMapping("/{viewId}")
- @PreAuthorize("hasAuthority('admin')")
- @Operation(summary = "Delete view", security = {@SecurityRequirement(name = "basicAuth"), @SecurityRequirement(name = "bearerAuth")},
+ @PreAuthorize("hasAuthority('system')")
+ @Operation(summary = "Delete view",
+ security = {@SecurityRequirement(name = "basicAuth"), @SecurityRequirement(name = "bearerAuth")},
hidden = true)
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
@@ -178,7 +182,7 @@ public class ViewEndpoint {
public ResponseEntity<Void> delete(@NotBlank @PathVariable("databaseId") Long databaseId,
@NotBlank @PathVariable("viewId") Long viewId)
throws DatabaseUnavailableException, RemoteUnavailableException, ViewNotFoundException,
- ViewMalformedException, ServiceException {
+ ViewMalformedException, MetadataServiceException {
log.debug("endpoint delete view, databaseId={}, viewId={}", databaseId, viewId);
final PrivilegedViewDto view = metadataServiceGateway.getViewById(databaseId, viewId);
try {
@@ -193,10 +197,14 @@ public class ViewEndpoint {
@RequestMapping(value = "/{viewId}/data", method = {RequestMethod.GET, RequestMethod.HEAD})
@Observed(name = "dbrepo_view_data")
- @Operation(summary = "Retrieve view data", security = {@SecurityRequirement(name = "basicAuth"), @SecurityRequirement(name = "bearerAuth")})
+ @Operation(summary = "Get view data",
+ description = "Gets data from a view of a database. For private databases, the user needs at least *READ* access to the associated database. Requires role `view-database-view-data`.",
+ security = {@SecurityRequirement(name = "basicAuth"), @SecurityRequirement(name = "bearerAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Retrieved view data",
+ headers = {@Header(name = "X-Count", description = "Number of rows", schema = @Schema(implementation = Long.class), required = true),
+ @Header(name = "Access-Control-Expose-Headers", description = "Expose `X-Count` custom header", schema = @Schema(implementation = String.class), required = true)},
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = QueryResultDto.class))}),
@@ -235,22 +243,22 @@ public class ViewEndpoint {
Principal principal)
throws DatabaseUnavailableException, RemoteUnavailableException, ViewNotFoundException,
QueryMalformedException, ViewMalformedException, PaginationException, NotAllowedException,
- ServiceException {
+ MetadataServiceException {
log.debug("endpoint get view data, databaseId={}, viewId={}, page={}, size={}, timestamp={}", databaseId,
viewId, page, size, timestamp);
endpointValidator.validateDataParams(page, size);
/* parameters */
if (page == null) {
- log.debug("page not set: default to 0");
page = 0L;
+ log.debug("page not set: default to {}", page);
}
if (size == null) {
- log.debug("size not set: default to 10");
size = 10L;
+ log.debug("size not set: default to {}", size);
}
if (timestamp == null) {
- log.debug("timestamp not set: default to now");
timestamp = Instant.now();
+ log.debug("timestamp not set: default to {}", timestamp);
}
final PrivilegedViewDto view = metadataServiceGateway.getViewById(databaseId, viewId);
if (!view.getIsPublic()) {
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
index 18373423c5dd58d5236670a63989134132e4685d..cbbb4c76b0c12e7846151746093728212a4d3b8d 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
@@ -7,16 +7,79 @@ import lombok.extern.log4j.Log4j2;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.AccessDeniedException;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.context.request.WebRequest;
import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
@Log4j2
@ControllerAdvice
public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
+ @Hidden
+ @ResponseStatus(code = HttpStatus.UNAUTHORIZED)
+ @ExceptionHandler(AccessDeniedException.class)
+ public ResponseEntity<ApiErrorDto> handle(AccessDeniedException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.NOT_FOUND)
+ @ExceptionHandler(AccessNotFoundException.class)
+ public ResponseEntity<ApiErrorDto> handle(AccessNotFoundException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.PRECONDITION_REQUIRED)
+ @ExceptionHandler(AccountNotSetupException.class)
+ public ResponseEntity<ApiErrorDto> handle(AccountNotSetupException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.BAD_GATEWAY)
+ @ExceptionHandler(AuthServiceConnectionException.class)
+ public ResponseEntity<ApiErrorDto> handle(AuthServiceConnectionException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE)
+ @ExceptionHandler(AuthServiceException.class)
+ public ResponseEntity<ApiErrorDto> handle(AuthServiceException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.BAD_GATEWAY)
+ @ExceptionHandler(BrokerServiceConnectionException.class)
+ public ResponseEntity<ApiErrorDto> handle(BrokerServiceConnectionException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE)
+ @ExceptionHandler(BrokerServiceException.class)
+ public ResponseEntity<ApiErrorDto> handle(BrokerServiceException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.NOT_FOUND)
+ @ExceptionHandler(ConceptNotFoundException.class)
+ public ResponseEntity<ApiErrorDto> handle(ConceptNotFoundException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.CONFLICT)
+ @ExceptionHandler(ContainerAlreadyExistsException.class)
+ public ResponseEntity<ApiErrorDto> handle(ContainerAlreadyExistsException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
@Hidden
@ResponseStatus(code = HttpStatus.NOT_FOUND)
@ExceptionHandler(ContainerNotFoundException.class)
@@ -24,6 +87,13 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
+ @Hidden
+ @ResponseStatus(code = HttpStatus.FORBIDDEN)
+ @ExceptionHandler(CredentialsInvalidException.class)
+ public ResponseEntity<ApiErrorDto> handle(CredentialsInvalidException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
@Hidden
@ResponseStatus(code = HttpStatus.EXPECTATION_FAILED)
@ExceptionHandler(DatabaseMalformedException.class)
@@ -45,6 +115,41 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
+ @Hidden
+ @ResponseStatus(code = HttpStatus.NOT_FOUND)
+ @ExceptionHandler(DoiNotFoundException.class)
+ public ResponseEntity<ApiErrorDto> handle(DoiNotFoundException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.EXPECTATION_FAILED)
+ @ExceptionHandler(EmailExistsException.class)
+ public ResponseEntity<ApiErrorDto> handle(EmailExistsException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.NOT_FOUND)
+ @ExceptionHandler(ExchangeNotFoundException.class)
+ public ResponseEntity<ApiErrorDto> handle(ExchangeNotFoundException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE)
+ @ExceptionHandler(ExternalServiceException.class)
+ public ResponseEntity<ApiErrorDto> handle(ExternalServiceException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.BAD_REQUEST)
+ @ExceptionHandler(FilterBadRequestException.class)
+ public ResponseEntity<ApiErrorDto> handle(FilterBadRequestException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
@Hidden
@ResponseStatus(code = HttpStatus.NOT_ACCEPTABLE)
@ExceptionHandler(FormatNotAvailableException.class)
@@ -52,6 +157,76 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
+ @Hidden
+ @ResponseStatus(code = HttpStatus.NOT_FOUND)
+ @ExceptionHandler(IdentifierNotFoundException.class)
+ public ResponseEntity<ApiErrorDto> handle(IdentifierNotFoundException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.NOT_FOUND)
+ @ExceptionHandler(IdentifierNotSupportedException.class)
+ public ResponseEntity<ApiErrorDto> handle(IdentifierNotSupportedException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.CONFLICT)
+ @ExceptionHandler(ImageAlreadyExistsException.class)
+ public ResponseEntity<ApiErrorDto> handle(ImageAlreadyExistsException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.BAD_REQUEST)
+ @ExceptionHandler(ImageInvalidException.class)
+ public ResponseEntity<ApiErrorDto> handle(ImageInvalidException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.NOT_FOUND)
+ @ExceptionHandler(ImageNotFoundException.class)
+ public ResponseEntity<ApiErrorDto> handle(ImageNotFoundException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.NOT_FOUND)
+ @ExceptionHandler(LicenseNotFoundException.class)
+ public ResponseEntity<ApiErrorDto> handle(LicenseNotFoundException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.BAD_REQUEST)
+ @ExceptionHandler(MalformedException.class)
+ public ResponseEntity<ApiErrorDto> handle(MalformedException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.NOT_FOUND)
+ @ExceptionHandler(MessageNotFoundException.class)
+ public ResponseEntity<ApiErrorDto> handle(MessageNotFoundException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.BAD_GATEWAY)
+ @ExceptionHandler(MetadataServiceConnectionException.class)
+ public ResponseEntity<ApiErrorDto> handle(MetadataServiceConnectionException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE)
+ @ExceptionHandler(MetadataServiceException.class)
+ public ResponseEntity<ApiErrorDto> handle(MetadataServiceException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
@Hidden
@ResponseStatus(code = HttpStatus.FORBIDDEN)
@ExceptionHandler(NotAllowedException.class)
@@ -59,6 +234,20 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
+ @Hidden
+ @ResponseStatus(code = HttpStatus.NOT_FOUND)
+ @ExceptionHandler(OntologyNotFoundException.class)
+ public ResponseEntity<ApiErrorDto> handle(OntologyNotFoundException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.NOT_FOUND)
+ @ExceptionHandler(OrcidNotFoundException.class)
+ public ResponseEntity<ApiErrorDto> handle(OrcidNotFoundException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
@Hidden
@ResponseStatus(code = HttpStatus.BAD_REQUEST)
@ExceptionHandler(PaginationException.class)
@@ -87,6 +276,13 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
+ @Hidden
+ @ResponseStatus(code = HttpStatus.NOT_FOUND)
+ @ExceptionHandler(QueueNotFoundException.class)
+ public ResponseEntity<ApiErrorDto> handle(QueueNotFoundException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
@Hidden
@ResponseStatus(code = HttpStatus.EXPECTATION_FAILED)
@ExceptionHandler(QueryStoreCreateException.class)
@@ -122,17 +318,45 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
+ @Hidden
+ @ResponseStatus(code = HttpStatus.NOT_FOUND)
+ @ExceptionHandler(RorNotFoundException.class)
+ public ResponseEntity<ApiErrorDto> handle(RorNotFoundException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
@Hidden
@ResponseStatus(code = HttpStatus.BAD_GATEWAY)
- @ExceptionHandler(ServiceConnectionException.class)
- public ResponseEntity<ApiErrorDto> handle(ServiceConnectionException e) {
+ @ExceptionHandler(SearchServiceConnectionException.class)
+ public ResponseEntity<ApiErrorDto> handle(SearchServiceConnectionException e) {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
@Hidden
@ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE)
- @ExceptionHandler(ServiceException.class)
- public ResponseEntity<ApiErrorDto> handle(ServiceException e) {
+ @ExceptionHandler(SearchServiceException.class)
+ public ResponseEntity<ApiErrorDto> handle(SearchServiceException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.NOT_FOUND)
+ @ExceptionHandler(SemanticEntityNotFoundException.class)
+ public ResponseEntity<ApiErrorDto> handle(SemanticEntityNotFoundException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.BAD_GATEWAY)
+ @ExceptionHandler(DataServiceConnectionException.class)
+ public ResponseEntity<ApiErrorDto> handle(DataServiceConnectionException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE)
+ @ExceptionHandler(DataServiceException.class)
+ public ResponseEntity<ApiErrorDto> handle(DataServiceException e) {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
@@ -150,6 +374,13 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
+ @Hidden
+ @ResponseStatus(code = HttpStatus.BAD_REQUEST)
+ @ExceptionHandler(SortException.class)
+ public ResponseEntity<ApiErrorDto> handle(SortException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
@Hidden
@ResponseStatus(code = HttpStatus.NOT_FOUND)
@ExceptionHandler(StorageNotFoundException.class)
@@ -178,6 +409,13 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
+ @Hidden
+ @ResponseStatus(code = HttpStatus.CONFLICT)
+ @ExceptionHandler(TableSchemaException.class)
+ public ResponseEntity<ApiErrorDto> handle(TableSchemaException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
@Hidden
@ResponseStatus(code = HttpStatus.NOT_FOUND)
@ExceptionHandler(TableNotFoundException.class)
@@ -185,10 +423,24 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
+ @Hidden
+ @ResponseStatus(code = HttpStatus.NOT_FOUND)
+ @ExceptionHandler(UnitNotFoundException.class)
+ public ResponseEntity<ApiErrorDto> handle(UnitNotFoundException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.EXPECTATION_FAILED)
+ @ExceptionHandler(UriMalformedException.class)
+ public ResponseEntity<ApiErrorDto> handle(UriMalformedException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
@Hidden
@ResponseStatus(code = HttpStatus.CONFLICT)
- @ExceptionHandler(TableSchemaException.class)
- public ResponseEntity<ApiErrorDto> handle(TableSchemaException e) {
+ @ExceptionHandler(UserExistsException.class)
+ public ResponseEntity<ApiErrorDto> handle(UserExistsException e) {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
diff --git a/dbrepo-data-service/rest-service/src/main/resources/application-local.yml b/dbrepo-data-service/rest-service/src/main/resources/application-local.yml
index c36b248b7ea2a72bf60d27eeaef910679035e01b..43cea9b9a538c7331562e7a068444d72826235a4 100644
--- a/dbrepo-data-service/rest-service/src/main/resources/application-local.yml
+++ b/dbrepo-data-service/rest-service/src/main/resources/application-local.yml
@@ -9,8 +9,8 @@ spring:
rabbitmq:
host: localhost
virtual-host: dbrepo
- password: guest
- username: guest
+ password: admin
+ username: admin
port: 5672
jpa:
show-sql: false
@@ -55,17 +55,15 @@ dbrepo:
s3:
accessKeyId: seaweedfsadmin
secretAccessKey: seaweedfsadmin
- importBucket: dbrepo-upload
- exportBucket: dbrepo-download
- filePath: /tmp
- admin:
+ bucket: dbrepo
+ system:
username: admin
password: admin
jwt:
public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB
keycloak:
- username: fda
- password: fda
+ username: admin
+ password: admin
client: dbrepo-client
clientSecret: MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG
defaultDateFormatId: 1
diff --git a/dbrepo-data-service/rest-service/src/main/resources/application.yml b/dbrepo-data-service/rest-service/src/main/resources/application.yml
index 771f95d8d75fe38cc4832bedeeb6a74132d0440e..6684368fb250cdd4323278d329c5ce1fc2845d67 100644
--- a/dbrepo-data-service/rest-service/src/main/resources/application.yml
+++ b/dbrepo-data-service/rest-service/src/main/resources/application.yml
@@ -10,8 +10,8 @@ spring:
rabbitmq:
host: "${BROKER_HOST:broker-service}"
virtual-host: "${BROKER_VIRTUALHOST:dbrepo}"
- password: "${BROKER_PASSWORD:fda}"
- username: "${BROKER_USERNAME:fda}"
+ password: "${BROKER_PASSWORD:admin}"
+ username: "${BROKER_USERNAME:admin}"
port: ${BROKER_PORT:5672}
jpa:
show-sql: false
@@ -50,18 +50,17 @@ logging:
org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
dbrepo:
endpoints:
- metadataService: "${METADATA_SERVICE_ENDPOINT:http://gateway-service}"
- storageService: "${S3_ENDPOINT:http://gateway-service/api/storage}"
- authService: "${AUTH_SERVICE_HOST:http://gateway-service/api/auth}"
+ metadataService: "${METADATA_SERVICE_ENDPOINT:http://metadata-service:8080}"
+ storageService: "${S3_ENDPOINT:http://storage-service:9000}"
+ authService: "${AUTH_SERVICE_ENDPOINT:http://auth-service:8080}"
s3:
accessKeyId: "${S3_ACCESS_KEY_ID:seaweedfsadmin}"
secretAccessKey: "${S3_SECRET_ACCESS_KEY:seaweedfsadmin}"
- importBucket: "${S3_IMPORT_BUCKET:dbrepo-upload}"
- exportBucket: "${S3_EXPORT_BUCKET:dbrepo-download}"
+ bucket: "${S3_BUCKET:dbrepo}"
filePath: "${S3_FILE_PATH:/tmp}"
- admin:
- username: "${ADMIN_USERNAME:admin}"
- password: "${ADMIN_PASSWORD:admin}"
+ system:
+ username: "${SYSTEM_USERNAME:admin}"
+ password: "${SYSTEM_PASSWORD:admin}"
jwt:
public_key: "${JWT_PUBKEY:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB}"
keycloak:
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/config/MariaDbConfig.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/config/MariaDbConfig.java
index 54af799db3fd021475222be7fac444ad83ed4535..8f73fa1b53b41be7d8cbfbe71f25a27c94ccbb01 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/config/MariaDbConfig.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/config/MariaDbConfig.java
@@ -177,7 +177,8 @@ public class MariaDbConfig {
if (set.next()) {
final Matcher matcher = Pattern.compile("GRANT (.*) ON.*").matcher(set.getString(1));
if (matcher.find()) {
- final List<String> privileges = Arrays.asList(matcher.group(1).split(","));;
+ final List<String> privileges = Arrays.asList(matcher.group(1).split(","));
+ ;
log.trace("found privileges: {}", privileges);
return privileges;
}
@@ -224,7 +225,7 @@ public class MariaDbConfig {
public static Long mockUserQueryInsert(PrivilegedDatabaseDto database, String query, String username, String password)
throws SQLException {
final String jdbc = "jdbc:mariadb://" + database.getContainer().getHost() + ":" + database.getContainer().getPort() + "/" + database.getInternalName();
- log.trace("connect to database {}", jdbc);
+ log.trace("connect to database: {}", jdbc);
try (Connection connection = DriverManager.getConnection(jdbc, username, password)) {
final String call = "{call store_query(?,?,?)}";
log.trace("prepare procedure '{}'", call);
@@ -255,7 +256,7 @@ public class MariaDbConfig {
public static void insertQueryStore(PrivilegedDatabaseDto database, QueryDto query, UUID userId) throws SQLException {
final String jdbc = "jdbc:mariadb://" + database.getContainer().getHost() + ":" + database.getContainer().getPort() + "/" + database.getInternalName();
- log.trace("connect to database {}", jdbc);
+ log.trace("connect to database: {}", jdbc);
try (Connection connection = DriverManager.getConnection(jdbc, database.getContainer().getUsername(), database.getContainer().getPassword())) {
final PreparedStatement prepareStatement = connection.prepareStatement(
"INSERT INTO qs_queries (created_by, query, query_normalized, is_persisted, query_hash, result_hash, result_number, created, executed) VALUES (?,?,?,?,?,?,?,?,?)");
@@ -332,13 +333,27 @@ public class MariaDbConfig {
public static void execute(PrivilegedContainerDto container, String query)
throws SQLException {
final String jdbc = "jdbc:mariadb://" + container.getHost() + ":" + container.getPort();
- log.trace("connect to database {}", jdbc);
+ log.trace("connect to database: {}", jdbc);
try (Connection connection = DriverManager.getConnection(jdbc, container.getUsername(), container.getPassword())) {
final Statement statement = connection.createStatement();
statement.executeUpdate(query);
}
}
+ public static void dropQueryStore(PrivilegedDatabaseDto database)
+ throws SQLException {
+ final String jdbc = "jdbc:mariadb://" + database.getContainer().getHost() + ":" + database.getContainer().getPort() + "/" + database.getInternalName();
+ log.trace("connect to database: {}", jdbc);
+ try (Connection connection = DriverManager.getConnection(jdbc, database.getContainer().getUsername(), database.getContainer().getPassword())) {
+ final Statement statement = connection.createStatement();
+ statement.executeUpdate("DROP SEQUENCE IF EXISTS `qs_queries_seq`;");
+ statement.executeUpdate("DROP TABLE IF EXISTS `qs_queries`;");
+ statement.executeUpdate("DROP PROCEDURE IF EXISTS `hash_table`;");
+ statement.executeUpdate("DROP PROCEDURE IF EXISTS `store_query`;");
+ statement.executeUpdate("DROP PROCEDURE IF EXISTS `_store_query`;");
+ }
+ }
+
public static Map<String, List<Object>> describeTableSchema(PrivilegedTableDto table, String username, String password)
throws SQLException {
final String jdbc = "jdbc:mariadb://" + table.getDatabase().getContainer().getHost() + ":" + table.getDatabase().getContainer().getPort() + "/" + table.getDatabase().getInternalName();
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java
index 544f3f0d17d95c6fbb807743a58698f090ee8b37..1dc008dbebffdd0a02ef0ffb12a12b9f6e8e6f08 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java
@@ -1,5 +1,7 @@
package at.tuwien.endpoint;
+import at.tuwien.api.database.internal.PrivilegedDatabaseDto;
+import at.tuwien.api.user.UserDto;
import at.tuwien.endpoints.AccessEndpoint;
import at.tuwien.exception.*;
import at.tuwien.gateway.MetadataServiceGateway;
@@ -15,9 +17,10 @@ import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.test.context.junit.jupiter.SpringExtension;
+import java.sql.SQLException;
+
import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
@Log4j2
@SpringBootTest
@@ -28,10 +31,10 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
private AccessEndpoint accessEndpoint;
@MockBean
- private AccessService accessService;
+ private MetadataServiceGateway metadataServiceGateway;
@MockBean
- private MetadataServiceGateway metadataServiceGateway;
+ private AccessService accessService;
@BeforeEach
public void beforeEach() {
@@ -39,9 +42,9 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
- public void create_succeeds() throws UserNotFoundException, NotAllowedException, QueryMalformedException,
- DatabaseNotFoundException, RemoteUnavailableException, DatabaseMalformedException, ServiceException {
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
+ public void create_succeeds() throws UserNotFoundException, NotAllowedException, DatabaseUnavailableException,
+ DatabaseNotFoundException, RemoteUnavailableException, DatabaseMalformedException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getDatabaseById(DATABASE_1_ID))
@@ -54,9 +57,9 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void create_alreadyAccess_fails() throws UserNotFoundException, DatabaseNotFoundException,
- RemoteUnavailableException, ServiceException {
+ RemoteUnavailableException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getDatabaseById(DATABASE_1_ID))
@@ -71,9 +74,9 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void create_databaseNotFound_fails() throws DatabaseNotFoundException, RemoteUnavailableException,
- ServiceException {
+ MetadataServiceException {
/* mock */
doThrow(DatabaseNotFoundException.class)
@@ -87,9 +90,9 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void create_userNotFound_fails() throws UserNotFoundException, DatabaseNotFoundException,
- RemoteUnavailableException, ServiceException {
+ RemoteUnavailableException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getDatabaseById(DATABASE_1_ID))
@@ -115,9 +118,9 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void update_succeeds() throws DatabaseNotFoundException, RemoteUnavailableException, UserNotFoundException,
- NotAllowedException, QueryMalformedException, DatabaseMalformedException, ServiceException {
+ NotAllowedException, DatabaseUnavailableException, DatabaseMalformedException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getDatabaseById(DATABASE_1_ID))
@@ -140,9 +143,9 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void update_databaseNotFound_fails() throws DatabaseNotFoundException, RemoteUnavailableException,
- ServiceException {
+ MetadataServiceException {
/* mock */
doThrow(DatabaseNotFoundException.class)
@@ -156,9 +159,9 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void update_userNotFound_fails() throws DatabaseNotFoundException, RemoteUnavailableException,
- UserNotFoundException, ServiceException {
+ UserNotFoundException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getDatabaseById(DATABASE_1_ID))
@@ -174,15 +177,19 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
- public void revoke_succeeds() throws UserNotFoundException, NotAllowedException, QueryMalformedException,
- DatabaseNotFoundException, RemoteUnavailableException, DatabaseMalformedException, ServiceException {
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
+ public void revoke_succeeds() throws UserNotFoundException, NotAllowedException, DatabaseUnavailableException,
+ DatabaseNotFoundException, RemoteUnavailableException, DatabaseMalformedException, MetadataServiceException,
+ SQLException {
/* mock */
when(metadataServiceGateway.getDatabaseById(DATABASE_1_ID))
.thenReturn(DATABASE_1_PRIVILEGED_DTO);
when(metadataServiceGateway.getPrivilegedUserById(USER_1_ID))
.thenReturn(USER_1_PRIVILEGED_DTO);
+ doNothing()
+ .when(accessService)
+ .delete(any(PrivilegedDatabaseDto.class), any(UserDto.class));
/* test */
accessEndpoint.revoke(DATABASE_1_ID, USER_1_ID);
@@ -199,9 +206,9 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void revoke_databaseNotFound_fails() throws DatabaseNotFoundException, RemoteUnavailableException,
- ServiceException {
+ MetadataServiceException {
/* mock */
doThrow(DatabaseNotFoundException.class)
@@ -215,9 +222,9 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void revoke_userNotFound_fails() throws DatabaseNotFoundException, RemoteUnavailableException,
- UserNotFoundException, ServiceException {
+ UserNotFoundException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getDatabaseById(DATABASE_1_ID))
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/DatabaseEndpointUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/DatabaseEndpointUnitTest.java
index 21769ff5eb39d5448a0dd05036a6efc7444eb0d2..c2b04d5aa914b86ef3edde0ebdf5d82f130c1e40 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/DatabaseEndpointUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/DatabaseEndpointUnitTest.java
@@ -5,7 +5,6 @@ import at.tuwien.api.user.PrivilegedUserDto;
import at.tuwien.endpoints.DatabaseEndpoint;
import at.tuwien.exception.*;
import at.tuwien.gateway.MetadataServiceGateway;
-import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.AccessService;
import at.tuwien.service.DatabaseService;
import at.tuwien.service.SubsetService;
@@ -41,9 +40,6 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
@MockBean
private AccessService accessService;
- @MockBean
- private MetadataMapper metadataMapper;
-
@MockBean
private DatabaseService databaseService;
@@ -56,9 +52,9 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void create_succeeds() throws DatabaseUnavailableException, RemoteUnavailableException,
- QueryStoreCreateException, ContainerNotFoundException, DatabaseMalformedException, ServiceException {
+ QueryStoreCreateException, ContainerNotFoundException, DatabaseMalformedException, MetadataServiceException {
/* test */
databaseEndpoint.create(DATABASE_1_CREATE_INTERNAL);
@@ -67,7 +63,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_LOCAL_ADMIN_USERNAME)
public void create_noRole_fails() throws RemoteUnavailableException, ContainerNotFoundException,
- SQLException, QueryStoreCreateException, DatabaseMalformedException, ServiceException {
+ SQLException, QueryStoreCreateException, DatabaseMalformedException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getContainerById(CONTAINER_1_ID))
@@ -88,9 +84,9 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void create_containerNotFound_fails() throws RemoteUnavailableException, ContainerNotFoundException,
- ServiceException {
+ MetadataServiceException {
/* mock */
doThrow(ContainerNotFoundException.class)
@@ -104,9 +100,9 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void create_queryStore_fails() throws RemoteUnavailableException, ContainerNotFoundException, SQLException,
- DatabaseMalformedException, QueryStoreCreateException, ServiceException {
+ DatabaseMalformedException, QueryStoreCreateException, MetadataServiceException {
/* mock */
doThrow(ContainerNotFoundException.class)
@@ -125,9 +121,9 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void update_succeeds() throws DatabaseUnavailableException, RemoteUnavailableException,
- DatabaseMalformedException, DatabaseNotFoundException, ServiceException {
+ DatabaseMalformedException, DatabaseNotFoundException, MetadataServiceException {
/* test */
databaseEndpoint.update(DATABASE_1_ID, USER_1_UPDATE_PASSWORD_DTO);
@@ -135,7 +131,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_LOCAL_ADMIN_USERNAME)
- public void update_noRole_fails() throws RemoteUnavailableException, DatabaseNotFoundException, ServiceException {
+ public void update_noRole_fails() throws RemoteUnavailableException, DatabaseNotFoundException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getDatabaseById(DATABASE_1_ID))
@@ -148,9 +144,9 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void update_databaseNotFound_fails() throws RemoteUnavailableException, DatabaseNotFoundException,
- ServiceException {
+ MetadataServiceException {
/* mock */
doThrow(DatabaseNotFoundException.class)
@@ -164,9 +160,9 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void update_password_fails() throws RemoteUnavailableException, DatabaseNotFoundException, SQLException,
- DatabaseMalformedException, ServiceException {
+ DatabaseMalformedException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getDatabaseById(DATABASE_1_ID))
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/SubsetEndpointUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/SubsetEndpointUnitTest.java
index 6cdb0c6753488d84be16798636d46d42c139392f..d554667467009b396caee8f2800b522f21f8ace6 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/SubsetEndpointUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/SubsetEndpointUnitTest.java
@@ -66,7 +66,7 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
public void findAllById_succeeds() throws DatabaseUnavailableException, NotAllowedException, QueryNotFoundException,
- DatabaseNotFoundException, RemoteUnavailableException, SQLException, ServiceException {
+ DatabaseNotFoundException, RemoteUnavailableException, SQLException, MetadataServiceException {
/* test */
final List<QueryDto> response = generic_findAllById(DATABASE_3_ID, DATABASE_3_PRIVILEGED_DTO, null);
@@ -98,7 +98,7 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
public void findById_succeeds() throws DatabaseNotFoundException, RemoteUnavailableException, UserNotFoundException,
DatabaseUnavailableException, StorageUnavailableException, NotAllowedException, QueryMalformedException,
QueryNotFoundException, SidecarExportException, FormatNotAvailableException, StorageNotFoundException,
- SQLException, ServiceException {
+ SQLException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getDatabaseById(DATABASE_3_ID))
@@ -113,7 +113,7 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
public void findById_acceptCsv_succeeds() throws DatabaseNotFoundException, RemoteUnavailableException,
UserNotFoundException, DatabaseUnavailableException, StorageUnavailableException, NotAllowedException,
QueryMalformedException, QueryNotFoundException, SidecarExportException, FormatNotAvailableException,
- StorageNotFoundException, SQLException, ServiceException {
+ StorageNotFoundException, SQLException, MetadataServiceException {
final ExportResourceDto mock = ExportResourceDto.builder()
.filename("deadbeef")
.resource(new InputStreamResource(InputStream.nullInputStream()))
@@ -134,7 +134,7 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
public void findById_timestamp_succeeds() throws DatabaseNotFoundException, RemoteUnavailableException,
UserNotFoundException, DatabaseUnavailableException, StorageUnavailableException, NotAllowedException,
QueryMalformedException, QueryNotFoundException, SidecarExportException, FormatNotAvailableException,
- StorageNotFoundException, SQLException, ServiceException {
+ StorageNotFoundException, SQLException, MetadataServiceException {
final ExportResourceDto mock = ExportResourceDto.builder()
.filename("deadbeef")
.resource(new InputStreamResource(InputStream.nullInputStream()))
@@ -152,7 +152,7 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void findById_fails() throws DatabaseNotFoundException, RemoteUnavailableException, ServiceException {
+ public void findById_fails() throws DatabaseNotFoundException, RemoteUnavailableException, MetadataServiceException {
/* mock */
doThrow(DatabaseNotFoundException.class)
@@ -167,18 +167,16 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"execute-query"})
- public void create_succeeds() throws UserNotFoundException, QueryStoreInsertException, TableMalformedException,
+ public void create_noAccess_succeeds() throws UserNotFoundException, QueryStoreInsertException, TableMalformedException,
NotAllowedException, SidecarExportException, QueryNotSupportedException, PaginationException,
StorageNotFoundException, DatabaseUnavailableException, StorageUnavailableException,
QueryMalformedException, QueryNotFoundException, DatabaseNotFoundException, RemoteUnavailableException,
- SQLException, ServiceException {
+ SQLException, MetadataServiceException {
final ExecuteStatementDto request = ExecuteStatementDto.builder()
.statement(QUERY_5_STATEMENT)
.build();
/* mock */
- when(metadataServiceGateway.getAccess(DATABASE_3_ID, USER_1_ID))
- .thenReturn(DATABASE_3_USER_1_READ_ACCESS_DTO);
when(metadataServiceGateway.getDatabaseById(DATABASE_3_ID))
.thenReturn(DATABASE_3_PRIVILEGED_DTO);
when(queryService.execute(eq(DATABASE_3_PRIVILEGED_DTO), anyString(), any(Instant.class), eq(USER_1_ID), eq(0L), eq(10L), eq(null), eq(null)))
@@ -207,14 +205,12 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
TableMalformedException, NotAllowedException, SidecarExportException, QueryNotSupportedException,
PaginationException, StorageNotFoundException, DatabaseUnavailableException, StorageUnavailableException,
QueryMalformedException, QueryNotFoundException, DatabaseNotFoundException, RemoteUnavailableException,
- SQLException, ServiceException {
+ SQLException, MetadataServiceException {
final ExecuteStatementDto request = ExecuteStatementDto.builder()
.statement(QUERY_5_STATEMENT)
.build();
/* mock */
- when(metadataServiceGateway.getAccess(DATABASE_3_ID, USER_1_ID))
- .thenReturn(DATABASE_3_USER_1_READ_ACCESS_DTO);
when(metadataServiceGateway.getDatabaseById(DATABASE_3_ID))
.thenReturn(DATABASE_3_PRIVILEGED_DTO);
when(queryService.execute(eq(DATABASE_3_PRIVILEGED_DTO), anyString(), any(Instant.class), eq(USER_1_ID), eq(0L), eq(10L), eq(null), eq(null)))
@@ -226,15 +222,13 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"execute-query"})
- public void create_databaseNotFound_fails() throws NotAllowedException, RemoteUnavailableException,
- DatabaseNotFoundException, ServiceException {
+ public void create_databaseNotFound_fails() throws RemoteUnavailableException,
+ DatabaseNotFoundException, MetadataServiceException {
final ExecuteStatementDto request = ExecuteStatementDto.builder()
.statement(QUERY_5_STATEMENT)
.build();
/* mock */
- when(metadataServiceGateway.getAccess(DATABASE_3_ID, USER_1_ID))
- .thenReturn(DATABASE_3_USER_1_READ_ACCESS_DTO);
doThrow(DatabaseNotFoundException.class)
.when(metadataServiceGateway)
.getDatabaseById(DATABASE_3_ID);
@@ -258,28 +252,10 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
});
}
- @Test
- @WithMockUser(username = USER_4_USERNAME, authorities = {"execute-query"})
- public void create_noAccess_fails() throws NotAllowedException, RemoteUnavailableException, ServiceException {
- final ExecuteStatementDto request = ExecuteStatementDto.builder()
- .statement(QUERY_5_STATEMENT)
- .build();
-
- /* mock */
- doThrow(NotAllowedException.class)
- .when(metadataServiceGateway)
- .getAccess(DATABASE_3_ID, USER_4_ID);
-
- /* test */
- assertThrows(NotAllowedException.class, () -> {
- subsetEndpoint.create(DATABASE_3_ID, request, USER_4_PRINCIPAL, null, null, null);
- });
- }
-
@Test
public void getData_succeeds() throws DatabaseNotFoundException, RemoteUnavailableException, UserNotFoundException,
NotAllowedException, SQLException, QueryNotFoundException, TableMalformedException, QueryMalformedException,
- DatabaseUnavailableException, PaginationException, ServiceException {
+ DatabaseUnavailableException, PaginationException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getDatabaseById(DATABASE_3_ID))
@@ -308,7 +284,7 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
@Test
public void getData_onlyHead_succeeds() throws DatabaseNotFoundException, RemoteUnavailableException, UserNotFoundException,
NotAllowedException, SQLException, QueryNotFoundException, TableMalformedException, QueryMalformedException,
- DatabaseUnavailableException, PaginationException, ServiceException {
+ DatabaseUnavailableException, PaginationException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getDatabaseById(DATABASE_3_ID))
@@ -332,7 +308,7 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_1_USERNAME)
public void getData_private_succeeds() throws DatabaseNotFoundException, RemoteUnavailableException,
UserNotFoundException, DatabaseUnavailableException, NotAllowedException, TableMalformedException,
- QueryMalformedException, QueryNotFoundException, PaginationException, SQLException, ServiceException {
+ QueryMalformedException, QueryNotFoundException, PaginationException, SQLException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getDatabaseById(DATABASE_1_ID))
@@ -358,7 +334,7 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
public void getData_privateAnonymous_succeeds() throws DatabaseNotFoundException, RemoteUnavailableException,
- ServiceException {
+ MetadataServiceException {
/* mock */
when(metadataServiceGateway.getDatabaseById(DATABASE_1_ID))
@@ -373,7 +349,7 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME)
public void getData_privateNoAccess_fails() throws DatabaseNotFoundException, RemoteUnavailableException,
- NotAllowedException, ServiceException {
+ NotAllowedException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getDatabaseById(DATABASE_1_ID))
@@ -392,7 +368,7 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_1_USERNAME)
public void getData_privateOnlyHead_succeeds() throws DatabaseNotFoundException, RemoteUnavailableException,
UserNotFoundException, DatabaseUnavailableException, NotAllowedException, TableMalformedException,
- QueryMalformedException, QueryNotFoundException, PaginationException, SQLException, ServiceException {
+ QueryMalformedException, QueryNotFoundException, PaginationException, SQLException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getDatabaseById(DATABASE_1_ID))
@@ -416,7 +392,7 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_3_USERNAME, authorities = {"persist-query"})
public void persist_succeeds() throws NotAllowedException, RemoteUnavailableException, DatabaseNotFoundException,
QueryStorePersistException, SQLException, UserNotFoundException, QueryNotFoundException,
- DatabaseUnavailableException, ServiceException {
+ DatabaseUnavailableException, MetadataServiceException {
final QueryPersistDto request = QueryPersistDto.builder()
.persist(true)
.build();
@@ -451,7 +427,7 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_3_USERNAME, authorities = {"persist-query"})
- public void persist_noAccess_fails() throws NotAllowedException, RemoteUnavailableException, ServiceException {
+ public void persist_noAccess_fails() throws NotAllowedException, RemoteUnavailableException, MetadataServiceException {
final QueryPersistDto request = QueryPersistDto.builder()
.persist(true)
.build();
@@ -470,7 +446,7 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_3_USERNAME, authorities = {"persist-query"})
public void persist_databaseNotFound_fails() throws NotAllowedException, RemoteUnavailableException,
- DatabaseNotFoundException, ServiceException {
+ DatabaseNotFoundException, MetadataServiceException {
final QueryPersistDto request = QueryPersistDto.builder()
.persist(true)
.build();
@@ -490,7 +466,7 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
protected List<QueryDto> generic_findAllById(Long databaseId, PrivilegedDatabaseDto database, Principal principal)
throws DatabaseUnavailableException, NotAllowedException, QueryNotFoundException, DatabaseNotFoundException,
- RemoteUnavailableException, SQLException, ServiceException {
+ RemoteUnavailableException, SQLException, MetadataServiceException {
/* mock */
if (database != null) {
@@ -514,7 +490,7 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
Principal principal) throws UserNotFoundException, DatabaseUnavailableException,
StorageUnavailableException, NotAllowedException, QueryMalformedException, QueryNotFoundException,
DatabaseNotFoundException, SidecarExportException, RemoteUnavailableException, FormatNotAvailableException,
- StorageNotFoundException, SQLException, ServiceException {
+ StorageNotFoundException, SQLException, MetadataServiceException {
/* mock */
when(queryService.findById(DATABASE_3_PRIVILEGED_DTO, subsetId))
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/TableEndpointUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/TableEndpointUnitTest.java
index 62375e2ab4e397924ce1f6d3a8428111be633478..29a33d1d9cbb3dd95a5640610d7620a36d1800db 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/TableEndpointUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/TableEndpointUnitTest.java
@@ -52,10 +52,10 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void create_succeeds() throws DatabaseUnavailableException, TableMalformedException,
DatabaseNotFoundException, TableExistsException, RemoteUnavailableException, SQLException,
- TableNotFoundException, QueryMalformedException, ServiceException {
+ TableNotFoundException, QueryMalformedException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getDatabaseById(DATABASE_1_ID))
@@ -79,9 +79,9 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void create_databaseNotFound_fails() throws DatabaseNotFoundException, RemoteUnavailableException,
- ServiceException {
+ MetadataServiceException {
/* mock */
doThrow(DatabaseNotFoundException.class)
@@ -95,9 +95,9 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void delete_succeeds() throws RemoteUnavailableException, DatabaseUnavailableException,
- TableNotFoundException, QueryMalformedException, SQLException, ServiceException {
+ TableNotFoundException, QueryMalformedException, SQLException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getTableById(DATABASE_1_ID, TABLE_1_ID))
@@ -122,9 +122,9 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void delete_tableNotFound_fails() throws RemoteUnavailableException, TableNotFoundException,
- ServiceException {
+ MetadataServiceException {
/* mock */
doThrow(TableNotFoundException.class)
@@ -140,7 +140,8 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
public void getData_succeeds() throws DatabaseUnavailableException, TableNotFoundException, TableMalformedException,
- SQLException, QueryMalformedException, RemoteUnavailableException, PaginationException, ServiceException {
+ SQLException, QueryMalformedException, RemoteUnavailableException, PaginationException, MetadataServiceException,
+ NotAllowedException {
/* mock */
when(metadataServiceGateway.getTableById(DATABASE_3_ID, TABLE_8_ID))
@@ -151,7 +152,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
.thenReturn(TABLE_8_DATA_DTO);
/* test */
- final ResponseEntity<QueryResultDto> response = tableEndpoint.getData(DATABASE_3_ID, TABLE_8_ID, null, null, null);
+ final ResponseEntity<QueryResultDto> response = tableEndpoint.getData(DATABASE_3_ID, TABLE_8_ID, null, null, null, null);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertNotNull(response.getHeaders().get("X-Count"));
assertEquals(1, response.getHeaders().get("X-Count").size());
@@ -165,7 +166,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
public void getData_tableNotFound_fails() throws TableNotFoundException, RemoteUnavailableException,
- ServiceException {
+ MetadataServiceException {
/* mock */
doThrow(TableNotFoundException.class)
@@ -174,7 +175,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
/* test */
assertThrows(TableNotFoundException.class, () -> {
- tableEndpoint.getData(DATABASE_3_ID, TABLE_8_ID, null, null, null);
+ tableEndpoint.getData(DATABASE_3_ID, TABLE_8_ID, null, null, null, null);
});
}
@@ -182,7 +183,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_1_USERNAME, authorities = {"insert-table-data"})
public void createTuple_succeeds() throws DatabaseUnavailableException, TableNotFoundException,
TableMalformedException, NotAllowedException, QueryMalformedException, RemoteUnavailableException,
- SQLException, StorageUnavailableException, StorageNotFoundException, ServiceException {
+ SQLException, StorageUnavailableException, StorageNotFoundException, MetadataServiceException {
final TupleDto request = TupleDto.builder()
.data(new HashMap<>() {{
put(COLUMN_8_1_INTERNAL_NAME, 7L);
@@ -226,7 +227,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_3_USERNAME, authorities = {"insert-table-data"})
public void createTuple_tableNotFound_fails() throws TableNotFoundException, RemoteUnavailableException,
- ServiceException {
+ MetadataServiceException {
final TupleDto request = TupleDto.builder()
.data(new HashMap<>() {{
put(COLUMN_8_1_INTERNAL_NAME, 7L);
@@ -248,7 +249,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_3_USERNAME, authorities = {"insert-table-data"})
public void createTuple_readAccess_fails() throws TableNotFoundException, RemoteUnavailableException,
- NotAllowedException, ServiceException {
+ NotAllowedException, MetadataServiceException {
final TupleDto request = TupleDto.builder()
.data(new HashMap<>() {{
put(COLUMN_8_1_INTERNAL_NAME, 7L);
@@ -272,7 +273,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_1_USERNAME, authorities = {"insert-table-data"})
public void createTuple_writeOwnAccess_succeeds() throws TableNotFoundException, RemoteUnavailableException,
NotAllowedException, DatabaseUnavailableException, TableMalformedException, QueryMalformedException,
- StorageUnavailableException, StorageNotFoundException, ServiceException {
+ StorageUnavailableException, StorageNotFoundException, MetadataServiceException {
final TupleDto request = TupleDto.builder()
.data(new HashMap<>() {{
put(COLUMN_8_1_INTERNAL_NAME, 7L);
@@ -293,7 +294,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_3_USERNAME, authorities = {"insert-table-data"})
public void createTuple_writeOwnAccessForeign_fails() throws TableNotFoundException, RemoteUnavailableException,
- NotAllowedException, ServiceException {
+ NotAllowedException, MetadataServiceException {
final TupleDto request = TupleDto.builder()
.data(new HashMap<>() {{
put(COLUMN_8_1_INTERNAL_NAME, 7L);
@@ -317,7 +318,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_3_USERNAME, authorities = {"insert-table-data"})
public void createTuple_writeAllAccessForeign_succeeds() throws TableNotFoundException, RemoteUnavailableException,
NotAllowedException, DatabaseUnavailableException, TableMalformedException, QueryMalformedException,
- StorageUnavailableException, StorageNotFoundException, ServiceException {
+ StorageUnavailableException, StorageNotFoundException, MetadataServiceException {
final TupleDto request = TupleDto.builder()
.data(new HashMap<>() {{
put(COLUMN_8_1_INTERNAL_NAME, 7L);
@@ -339,7 +340,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_1_USERNAME, authorities = {"insert-table-data"})
public void updateTuple_succeeds() throws DatabaseUnavailableException, TableNotFoundException,
TableMalformedException, NotAllowedException, QueryMalformedException, RemoteUnavailableException,
- SQLException, ServiceException {
+ SQLException, MetadataServiceException {
final TupleUpdateDto request = TupleUpdateDto.builder()
.keys(new HashMap<>() {{
put(COLUMN_8_1_INTERNAL_NAME, 6L);
@@ -389,7 +390,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_3_USERNAME, authorities = {"insert-table-data"})
public void updateTuple_tableNotFound_fails() throws TableNotFoundException, RemoteUnavailableException,
- ServiceException {
+ MetadataServiceException {
final TupleUpdateDto request = TupleUpdateDto.builder()
.keys(new HashMap<>() {{
put(COLUMN_8_1_INTERNAL_NAME, 6L);
@@ -414,7 +415,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_3_USERNAME, authorities = {"insert-table-data"})
public void updateTuple_readAccess_fails() throws TableNotFoundException, RemoteUnavailableException,
- NotAllowedException, ServiceException {
+ NotAllowedException, MetadataServiceException {
final TupleUpdateDto request = TupleUpdateDto.builder()
.keys(new HashMap<>() {{
put(COLUMN_8_1_INTERNAL_NAME, 6L);
@@ -441,7 +442,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_1_USERNAME, authorities = {"insert-table-data"})
public void updateTuple_writeOwnAccess_succeeds() throws DatabaseUnavailableException, TableNotFoundException,
TableMalformedException, NotAllowedException, QueryMalformedException, RemoteUnavailableException,
- SQLException, ServiceException {
+ SQLException, MetadataServiceException {
final TupleUpdateDto request = TupleUpdateDto.builder()
.keys(new HashMap<>() {{
put(COLUMN_8_1_INTERNAL_NAME, 6L);
@@ -472,7 +473,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_3_USERNAME, authorities = {"insert-table-data"})
public void updateTuple_writeOwnAccessForeign_fails() throws TableNotFoundException, RemoteUnavailableException,
- NotAllowedException, ServiceException {
+ NotAllowedException, MetadataServiceException {
final TupleUpdateDto request = TupleUpdateDto.builder()
.keys(new HashMap<>() {{
put(COLUMN_8_1_INTERNAL_NAME, 6L);
@@ -499,7 +500,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_3_USERNAME, authorities = {"insert-table-data"})
public void updateTuple_writeAllAccessForeign_succeeds() throws TableNotFoundException, RemoteUnavailableException,
NotAllowedException, DatabaseUnavailableException, TableMalformedException, QueryMalformedException,
- SQLException, ServiceException {
+ SQLException, MetadataServiceException {
final TupleUpdateDto request = TupleUpdateDto.builder()
.keys(new HashMap<>() {{
put(COLUMN_8_1_INTERNAL_NAME, 6L);
@@ -531,7 +532,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_1_USERNAME, authorities = {"delete-table-data"})
public void deleteTuple_succeeds() throws DatabaseUnavailableException, TableNotFoundException,
TableMalformedException, NotAllowedException, QueryMalformedException, RemoteUnavailableException,
- SQLException, ServiceException {
+ SQLException, MetadataServiceException {
final TupleDeleteDto request = TupleDeleteDto.builder()
.keys(new HashMap<>() {{
put(COLUMN_8_1_INTERNAL_NAME, 6L);
@@ -573,7 +574,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_3_USERNAME, authorities = {"delete-table-data"})
public void deleteTuple_tableNotFound_fails() throws TableNotFoundException, RemoteUnavailableException,
- ServiceException {
+ MetadataServiceException {
final TupleDeleteDto request = TupleDeleteDto.builder()
.keys(new HashMap<>() {{
put(COLUMN_8_1_INTERNAL_NAME, 6L);
@@ -594,7 +595,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"delete-table-data"})
public void deleteTuple_readAccess_fails() throws TableNotFoundException, RemoteUnavailableException,
- NotAllowedException, ServiceException {
+ NotAllowedException, MetadataServiceException {
final TupleDeleteDto request = TupleDeleteDto.builder()
.keys(new HashMap<>() {{
put(COLUMN_8_1_INTERNAL_NAME, 6L);
@@ -617,7 +618,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_1_USERNAME, authorities = {"delete-table-data"})
public void deleteTuple_writeOwnAccess_succeeds() throws TableNotFoundException, RemoteUnavailableException,
NotAllowedException, TableMalformedException, SQLException, QueryMalformedException,
- DatabaseUnavailableException, ServiceException {
+ DatabaseUnavailableException, MetadataServiceException {
final TupleDeleteDto request = TupleDeleteDto.builder()
.keys(new HashMap<>() {{
put(COLUMN_8_1_INTERNAL_NAME, 6L);
@@ -644,7 +645,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_3_USERNAME, authorities = {"delete-table-data"})
public void deleteTuple_writeOwnAccessForeign_fails() throws TableNotFoundException, RemoteUnavailableException,
- NotAllowedException, ServiceException {
+ NotAllowedException, MetadataServiceException {
final TupleDeleteDto request = TupleDeleteDto.builder()
.keys(new HashMap<>() {{
put(COLUMN_8_1_INTERNAL_NAME, 6L);
@@ -667,7 +668,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_3_USERNAME, authorities = {"delete-table-data"})
public void deleteTuple_writeAllAccessForeign_succeeds() throws TableNotFoundException, RemoteUnavailableException,
NotAllowedException, DatabaseUnavailableException, TableMalformedException, QueryMalformedException,
- SQLException, ServiceException {
+ SQLException, MetadataServiceException {
final TupleDeleteDto request = TupleDeleteDto.builder()
.keys(new HashMap<>() {{
put(COLUMN_8_1_INTERNAL_NAME, 6L);
@@ -694,7 +695,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
public void getHistory_succeeds() throws DatabaseUnavailableException, TableNotFoundException,
- RemoteUnavailableException, SQLException, NotAllowedException, ServiceException, PaginationException {
+ RemoteUnavailableException, SQLException, NotAllowedException, MetadataServiceException, PaginationException {
/* mock */
when(metadataServiceGateway.getTableById(DATABASE_3_ID, TABLE_8_ID))
@@ -710,7 +711,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
public void getHistory_privateNoRole_fails() throws TableNotFoundException, RemoteUnavailableException,
- ServiceException {
+ MetadataServiceException {
/* mock */
when(metadataServiceGateway.getTableById(DATABASE_1_ID, TABLE_1_ID))
@@ -725,7 +726,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_4_USERNAME)
public void getHistory_privateNoAccess_fails() throws NotAllowedException, RemoteUnavailableException,
- TableNotFoundException, ServiceException {
+ TableNotFoundException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getTableById(DATABASE_1_ID, TABLE_1_ID))
@@ -743,7 +744,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
public void getHistory_tableNotFound_fails() throws TableNotFoundException, RemoteUnavailableException,
- ServiceException {
+ MetadataServiceException {
/* mock */
doThrow(TableNotFoundException.class)
@@ -760,7 +761,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@WithAnonymousUser
public void exportData_succeeds() throws DatabaseUnavailableException, TableNotFoundException, NotAllowedException,
StorageUnavailableException, QueryMalformedException, SidecarExportException, RemoteUnavailableException,
- StorageNotFoundException, SQLException, ServiceException {
+ StorageNotFoundException, SQLException, MetadataServiceException {
final ExportResourceDto mock = ExportResourceDto.builder()
.filename("deadbeef")
.resource(new InputStreamResource(InputStream.nullInputStream()))
@@ -781,7 +782,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_4_USERNAME)
public void exportData_privateNoAccess_fails() throws TableNotFoundException, NotAllowedException,
- RemoteUnavailableException, ServiceException {
+ RemoteUnavailableException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getTableById(DATABASE_1_ID, TABLE_1_ID))
@@ -801,7 +802,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_1_USERNAME, authorities = {"insert-table-data"})
public void importData_succeeds() throws DatabaseUnavailableException, TableNotFoundException,
SidecarImportException, NotAllowedException, QueryMalformedException, RemoteUnavailableException,
- StorageNotFoundException, SQLException, ServiceException {
+ StorageNotFoundException, SQLException, MetadataServiceException {
final ImportCsvDto request = ImportCsvDto.builder()
.skipLines(1L)
.lineTermination("\\n")
@@ -843,7 +844,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_3_USERNAME, authorities = {"insert-table-data"})
public void importData_tableNotFound_fails() throws TableNotFoundException, RemoteUnavailableException,
- ServiceException {
+ MetadataServiceException {
final ImportCsvDto request = ImportCsvDto.builder()
.skipLines(1L)
.lineTermination("\\n")
@@ -864,7 +865,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_3_USERNAME, authorities = {"insert-table-data"})
public void importData_readAccess_fails() throws TableNotFoundException, RemoteUnavailableException,
- NotAllowedException, ServiceException {
+ NotAllowedException, MetadataServiceException {
final ImportCsvDto request = ImportCsvDto.builder()
.skipLines(1L)
.lineTermination("\\n")
@@ -887,7 +888,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_1_USERNAME, authorities = {"insert-table-data"})
public void importData_writeOwnAccess_succeeds() throws TableNotFoundException, RemoteUnavailableException,
NotAllowedException, DatabaseUnavailableException, SidecarImportException, QueryMalformedException,
- StorageNotFoundException, ServiceException {
+ StorageNotFoundException, MetadataServiceException {
final ImportCsvDto request = ImportCsvDto.builder()
.skipLines(1L)
.lineTermination("\\n")
@@ -907,7 +908,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_3_USERNAME, authorities = {"insert-table-data"})
public void importData_writeOwnAccessForeign_fails() throws TableNotFoundException, RemoteUnavailableException,
- NotAllowedException, ServiceException {
+ NotAllowedException, MetadataServiceException {
final ImportCsvDto request = ImportCsvDto.builder()
.skipLines(1L)
.lineTermination("\\n")
@@ -930,7 +931,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_3_USERNAME, authorities = {"insert-table-data"})
public void importData_writeAllAccessForeign_succeeds() throws TableNotFoundException, RemoteUnavailableException,
NotAllowedException, DatabaseUnavailableException, SidecarImportException, QueryMalformedException,
- StorageNotFoundException, ServiceException {
+ StorageNotFoundException, MetadataServiceException {
final ImportCsvDto request = ImportCsvDto.builder()
.skipLines(1L)
.lineTermination("\\n")
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java
index af4767b0490d69c2d704e8a5243cfced6a61cbe9..b9b814378e9bd537d42c421c3e3fab81d381443f 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java
@@ -17,7 +17,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -50,9 +49,9 @@ public class ViewEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void create_succeeds() throws DatabaseNotFoundException, RemoteUnavailableException, ViewMalformedException,
- SQLException, DatabaseUnavailableException, ServiceException {
+ SQLException, DatabaseUnavailableException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getDatabaseById(DATABASE_1_ID))
@@ -68,7 +67,7 @@ public class ViewEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_LOCAL_ADMIN_USERNAME)
public void create_noRole_fails() throws DatabaseNotFoundException, RemoteUnavailableException, ViewMalformedException,
- SQLException, ServiceException {
+ SQLException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getDatabaseById(DATABASE_1_ID))
@@ -83,9 +82,9 @@ public class ViewEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void create_databaseNotFound_fails() throws DatabaseNotFoundException, RemoteUnavailableException,
- ServiceException {
+ MetadataServiceException {
/* mock */
doThrow(DatabaseNotFoundException.class)
@@ -99,9 +98,9 @@ public class ViewEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void delete_succeeds() throws DatabaseNotFoundException, RemoteUnavailableException, ViewMalformedException,
- SQLException, DatabaseUnavailableException, ViewNotFoundException, ServiceException {
+ SQLException, DatabaseUnavailableException, ViewNotFoundException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getDatabaseById(DATABASE_1_ID))
@@ -118,7 +117,7 @@ public class ViewEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_LOCAL_ADMIN_USERNAME)
public void delete_noRole_fails() throws DatabaseNotFoundException, RemoteUnavailableException, ViewMalformedException,
- SQLException, ServiceException {
+ SQLException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getDatabaseById(DATABASE_1_ID))
@@ -134,9 +133,9 @@ public class ViewEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void delete_databaseNotFound_fails() throws RemoteUnavailableException, ViewNotFoundException,
- ServiceException {
+ MetadataServiceException {
/* mock */
doThrow(ViewNotFoundException.class)
@@ -153,7 +152,7 @@ public class ViewEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_1_USERNAME, authorities = {"view-database-view-data"})
public void getData_succeeds() throws RemoteUnavailableException, ViewNotFoundException, ViewMalformedException,
SQLException, DatabaseUnavailableException, QueryMalformedException, PaginationException,
- NotAllowedException, ServiceException {
+ NotAllowedException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getViewById(DATABASE_1_ID, VIEW_1_ID))
@@ -183,7 +182,7 @@ public class ViewEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_1_USERNAME, authorities = {"view-database-view-data"})
public void getData_onlyHead_succeeds() throws RemoteUnavailableException, ViewNotFoundException,
ViewMalformedException, SQLException, DatabaseUnavailableException, QueryMalformedException,
- PaginationException, NotAllowedException, ServiceException {
+ PaginationException, NotAllowedException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getViewById(DATABASE_1_ID, VIEW_1_ID))
@@ -210,7 +209,7 @@ public class ViewEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"view-database-view-data"})
public void getData_viewNotFound_fails() throws RemoteUnavailableException, ViewNotFoundException,
- ServiceException {
+ MetadataServiceException {
/* mock */
doThrow(ViewNotFoundException.class)
@@ -226,7 +225,7 @@ public class ViewEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_3_USERNAME, authorities = {"view-database-view-data"})
public void getData_privateNoAccess_fails() throws RemoteUnavailableException, ViewNotFoundException,
- NotAllowedException, ServiceException {
+ NotAllowedException, MetadataServiceException {
/* mock */
when(metadataServiceGateway.getViewById(DATABASE_1_ID, VIEW_3_ID))
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/DataDatabaseGatewayUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/DataDatabaseGatewayUnitTest.java
index 30a4d31cfbb288b58817bc52d803d913fa353421..b00f871d5ca92797197e40b898ce95c94463b807 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/DataDatabaseGatewayUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/DataDatabaseGatewayUnitTest.java
@@ -41,7 +41,8 @@ public class DataDatabaseGatewayUnitTest extends AbstractUnitTest {
}
@Test
- public void importFile_succeeds() throws RemoteUnavailableException, StorageNotFoundException, ServiceException {
+ public void importFile_succeeds() throws RemoteUnavailableException, StorageNotFoundException,
+ SidecarImportException {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), eq(HttpEntity.EMPTY), eq(Void.class)))
@@ -75,7 +76,7 @@ public class DataDatabaseGatewayUnitTest extends AbstractUnitTest {
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(SidecarImportException.class, () -> {
dataDatabaseSidecarGateway.importFile(CONTAINER_1_HOST, CONTAINER_1_PORT, "filename");
});
}
@@ -95,7 +96,8 @@ public class DataDatabaseGatewayUnitTest extends AbstractUnitTest {
}
@Test
- public void exportFile_succeeds() throws RemoteUnavailableException, StorageNotFoundException, ServiceException {
+ public void exportFile_succeeds() throws RemoteUnavailableException, StorageNotFoundException,
+ SidecarExportException {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), eq(HttpEntity.EMPTY), eq(Void.class)))
@@ -129,7 +131,7 @@ public class DataDatabaseGatewayUnitTest extends AbstractUnitTest {
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(SidecarExportException.class, () -> {
dataDatabaseSidecarGateway.exportFile(CONTAINER_1_HOST, CONTAINER_1_PORT, "filename");
});
}
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/InterceptorUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/InterceptorUnitTest.java
index 0fd20a8025bc209df9c645f4d2b01329660dbf03..b87793a8bcd00c499b74de68748c001750430584 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/InterceptorUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/InterceptorUnitTest.java
@@ -1,9 +1,6 @@
package at.tuwien.gateway;
import at.tuwien.api.keycloak.TokenDto;
-import at.tuwien.exception.RemoteUnavailableException;
-import at.tuwien.exception.ServiceException;
-import at.tuwien.exception.StorageNotFoundException;
import at.tuwien.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
@@ -15,16 +12,11 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.springframework.web.client.HttpClientErrorException;
-import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.client.RestTemplate;
-import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.when;
@Log4j2
@@ -36,9 +28,6 @@ public class InterceptorUnitTest extends AbstractUnitTest {
@Qualifier("keycloakRestTemplate")
private RestTemplate restTemplate;
- @Autowired
- private DataDatabaseSidecarGateway dataDatabaseSidecarGateway;
-
@BeforeEach
public void beforeEach() {
genesis();
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/KeycloakSidecarGatewayUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/KeycloakSidecarGatewayUnitTest.java
deleted file mode 100644
index 2a02e03466d57116c3c529d5750229e80b015b26..0000000000000000000000000000000000000000
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/KeycloakSidecarGatewayUnitTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package at.tuwien.gateway;
-
-import at.tuwien.api.keycloak.TokenDto;
-import at.tuwien.exception.RemoteUnavailableException;
-import at.tuwien.exception.ServiceConnectionException;
-import at.tuwien.exception.ServiceException;
-import at.tuwien.test.AbstractUnitTest;
-import lombok.extern.log4j.Log4j2;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.springframework.web.client.HttpClientErrorException;
-import org.springframework.web.client.HttpServerErrorException;
-import org.springframework.web.client.RestTemplate;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.when;
-
-@Log4j2
-@SpringBootTest
-@ExtendWith(SpringExtension.class)
-public class KeycloakSidecarGatewayUnitTest extends AbstractUnitTest {
-
- @MockBean
- @Qualifier("restTemplate")
- private RestTemplate restTemplate;
-
- @Autowired
- private KeycloakGateway keycloakGateway;
-
- @BeforeEach
- public void beforeEach() {
- genesis();
- }
-
- @Test
- public void obtainUserToken_succeeds() throws ServiceException, RemoteUnavailableException {
-
- /* mock */
- when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
- .thenReturn(ResponseEntity.ok()
- .build());
-
- /* test */
- final TokenDto response = keycloakGateway.obtainUserToken(USER_1_USERNAME, USER_1_PASSWORD);
- }
-
- @Test
- public void obtainUserToken_unavailable_fails() {
-
- /* mock */
- doThrow(HttpServerErrorException.class)
- .when(restTemplate)
- .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class));
-
- /* test */
- assertThrows(RemoteUnavailableException.class, () -> {
- keycloakGateway.obtainUserToken(USER_1_USERNAME, USER_1_PASSWORD);
- });
- }
-
- @Test
- public void obtainUserToken_badRequest_fails() {
-
- /* mock */
- doThrow(HttpClientErrorException.BadRequest.class)
- .when(restTemplate)
- .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class));
-
- /* test */
- assertThrows(ServiceException.class, () -> {
- keycloakGateway.obtainUserToken(USER_1_USERNAME, USER_1_PASSWORD);
- });
- }
-
- @Test
- public void obtainUserToken_statusCode_fails() {
-
- /* mock */
- when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
- .thenReturn(ResponseEntity.status(HttpStatus.NO_CONTENT)
- .build());
-
- /* test */
- assertThrows(ServiceException.class, () -> {
- keycloakGateway.obtainUserToken(USER_1_USERNAME, USER_1_PASSWORD);
- });
- }
-
-}
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/MetadataServiceGatewayUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/MetadataServiceGatewayUnitTest.java
index 1ba4978788d7ee5d05d881d397a453086eaed41c..c224af4cb28604c2554da1942a782932db8d7390 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/MetadataServiceGatewayUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/MetadataServiceGatewayUnitTest.java
@@ -53,7 +53,8 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
}
@Test
- public void getTableById_succeeds() throws TableNotFoundException, RemoteUnavailableException, ServiceException {
+ public void getTableById_succeeds() throws TableNotFoundException, RemoteUnavailableException,
+ MetadataServiceException {
final HttpHeaders headers = new HttpHeaders();
headers.set("X-Type", IMAGE_1_JDBC);
headers.set("X-Host", CONTAINER_1_HOST);
@@ -119,7 +120,7 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.body(TABLE_1_DTO));
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.getTableById(DATABASE_1_ID, TABLE_1_ID);
});
}
@@ -139,7 +140,7 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.headers(headers)
.body(TABLE_1_DTO));
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.getTableById(DATABASE_1_ID, TABLE_1_ID);
});
}
@@ -164,14 +165,14 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.getTableById(DATABASE_1_ID, TABLE_1_ID);
});
}
@Test
public void getDatabaseByInternalName_succeeds() throws DatabaseNotFoundException, RemoteUnavailableException,
- ServiceException {
+ MetadataServiceException {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(PrivilegedDatabaseDto[].class)))
@@ -206,7 +207,7 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.body(new PrivilegedDatabaseDto[]{DATABASE_1_PRIVILEGED_DTO}));
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.getDatabaseByInternalName(DATABASE_1_INTERNALNAME);
});
}
@@ -220,7 +221,7 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.getDatabaseByInternalName(DATABASE_1_INTERNALNAME);
});
}
@@ -240,7 +241,7 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
}
@Test
- public void getDatabaseById_succeeds() throws RemoteUnavailableException, ServiceException,
+ public void getDatabaseById_succeeds() throws RemoteUnavailableException, MetadataServiceException,
DatabaseNotFoundException {
final HttpHeaders headers = new HttpHeaders();
headers.set("X-Username", CONTAINER_1_PRIVILEGED_USERNAME);
@@ -294,7 +295,7 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.getDatabaseById(DATABASE_1_ID);
});
}
@@ -312,7 +313,7 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.getDatabaseById(DATABASE_1_ID);
});
}
@@ -332,14 +333,14 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.headers(headers)
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.getDatabaseById(DATABASE_1_ID);
});
}
}
@Test
- public void getContainerById_succeeds() throws RemoteUnavailableException, ContainerNotFoundException, ServiceException {
+ public void getContainerById_succeeds() throws RemoteUnavailableException, ContainerNotFoundException, MetadataServiceException {
final HttpHeaders headers = new HttpHeaders();
headers.set("X-Username", CONTAINER_1_PRIVILEGED_USERNAME);
headers.set("X-Password", CONTAINER_1_PRIVILEGED_PASSWORD);
@@ -392,7 +393,7 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.getContainerById(CONTAINER_1_ID);
});
}
@@ -412,7 +413,7 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.getContainerById(CONTAINER_1_ID);
});
}
@@ -431,13 +432,13 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.getContainerById(CONTAINER_1_ID);
});
}
@Test
- public void getViewById_succeeds() throws RemoteUnavailableException, ViewNotFoundException, ServiceException {
+ public void getViewById_succeeds() throws RemoteUnavailableException, ViewNotFoundException, MetadataServiceException {
final HttpHeaders headers = new HttpHeaders();
headers.set("X-Type", IMAGE_1_JDBC);
headers.set("X-Host", CONTAINER_1_HOST);
@@ -494,7 +495,7 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.getViewById(CONTAINER_1_ID, VIEW_1_ID);
});
}
@@ -514,7 +515,7 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.getViewById(CONTAINER_1_ID, VIEW_1_ID);
});
}
@@ -537,13 +538,13 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.getViewById(CONTAINER_1_ID, VIEW_1_ID);
});
}
@Test
- public void getUserById_succeeds() throws RemoteUnavailableException, UserNotFoundException, ServiceException {
+ public void getUserById_succeeds() throws RemoteUnavailableException, UserNotFoundException, MetadataServiceException {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(UserDto.class)))
@@ -592,7 +593,7 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.getUserById(USER_1_ID);
});
}
@@ -606,14 +607,14 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.getUserById(USER_1_ID);
});
}
@Test
public void getPrivilegedUserById_succeeds() throws RemoteUnavailableException, UserNotFoundException,
- ServiceException {
+ MetadataServiceException {
final HttpHeaders headers = new HttpHeaders();
headers.set("X-Username", CONTAINER_1_PRIVILEGED_USERNAME);
headers.set("X-Password", CONTAINER_1_PRIVILEGED_PASSWORD);
@@ -668,7 +669,7 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.getPrivilegedUserById(USER_1_ID);
});
}
@@ -688,7 +689,7 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.getPrivilegedUserById(USER_1_ID);
});
}
@@ -707,13 +708,13 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.getPrivilegedUserById(USER_1_ID);
});
}
@Test
- public void getAccess_succeeds() throws RemoteUnavailableException, NotAllowedException, ServiceException {
+ public void getAccess_succeeds() throws RemoteUnavailableException, NotAllowedException, MetadataServiceException {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(DatabaseAccessDto.class)))
@@ -775,7 +776,7 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.getAccess(DATABASE_1_ID, USER_1_ID);
});
}
@@ -789,13 +790,13 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.getAccess(DATABASE_1_ID, USER_1_ID);
});
}
@Test
- public void getIdentifiers_witSubset_succeeds() throws RemoteUnavailableException, DatabaseNotFoundException, ServiceException {
+ public void getIdentifiers_witSubset_succeeds() throws RemoteUnavailableException, DatabaseNotFoundException, MetadataServiceException {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(IdentifierDto[].class)))
@@ -808,7 +809,7 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
}
@Test
- public void getIdentifiers_succeeds() throws RemoteUnavailableException, DatabaseNotFoundException, ServiceException {
+ public void getIdentifiers_succeeds() throws RemoteUnavailableException, DatabaseNotFoundException, MetadataServiceException {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(IdentifierDto[].class)))
@@ -857,7 +858,7 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.getIdentifiers(DATABASE_1_ID, QUERY_1_ID);
});
}
@@ -871,13 +872,13 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.getIdentifiers(DATABASE_1_ID, QUERY_1_ID);
});
}
@Test
- public void updateTableStatistics_succeeds() throws RemoteUnavailableException, ServiceException, TableNotFoundException {
+ public void updateTableStatistics_succeeds() throws RemoteUnavailableException, MetadataServiceException, TableNotFoundException {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.PUT), eq(HttpEntity.EMPTY), eq(Void.class)))
@@ -925,7 +926,7 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(MetadataServiceException.class, () -> {
metadataServiceGateway.updateTableStatistics(DATABASE_1_ID, TABLE_1_ID);
});
}
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/handlers/ApiExceptionHandlerTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/handlers/ApiExceptionHandlerTest.java
deleted file mode 100644
index 9075ec2a02d0420b9fe0cec8c307a9dc8ac1c13e..0000000000000000000000000000000000000000
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/handlers/ApiExceptionHandlerTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package at.tuwien.handlers;
-
-import at.tuwien.test.AbstractUnitTest;
-import lombok.extern.log4j.Log4j2;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.http.HttpStatus;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-
-import static at.tuwien.test.utils.EndpointUtils.getErrorCodes;
-import static at.tuwien.test.utils.EndpointUtils.getExceptions;
-
-@Log4j2
-@ExtendWith(SpringExtension.class)
-@SpringBootTest
-public class ApiExceptionHandlerTest extends AbstractUnitTest {
-
- @Test
- public void handle_succeeds() throws ClassNotFoundException, IOException {
- final List<Method> handlers = Arrays.asList(ApiExceptionHandler.class.getMethods());
- final List<String> errorCodes = getErrorCodes();
-
- /* test */
- for (Class<?> exception : getExceptions()) {
- final Optional<Method> optional = handlers.stream().filter(h -> Arrays.asList(h.getParameterTypes()).contains(exception)).findFirst();
- if (optional.isEmpty()) {
- Assertions.fail("Exception " + exception.getName() + " does not have a corresponding handle method in the endpoint");
- }
- final Method method = optional.get();
- /* exception */
- Assertions.assertNotNull(exception.getDeclaredAnnotation(ResponseStatus.class).code());
- Assertions.assertNotEquals(exception.getDeclaredAnnotation(ResponseStatus.class).code(), HttpStatus.INTERNAL_SERVER_ERROR);
- Assertions.assertNotNull(exception.getDeclaredAnnotation(ResponseStatus.class).reason(), "Exception " + exception.getName() + " does not provide a reason code");
- Assertions.assertTrue(errorCodes.contains(exception.getDeclaredAnnotation(ResponseStatus.class).reason()), "Exception code " + exception.getDeclaredAnnotation(ResponseStatus.class).reason() + " does have a reason code mapped in localized ui error messages");
- /* handler method */
- Assertions.assertEquals(method.getDeclaredAnnotation(ResponseStatus.class).code(), exception.getDeclaredAnnotation(ResponseStatus.class).code());
- }
- }
-}
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/listener/DefaultListenerIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/listener/DefaultListenerIntegrationTest.java
index dec1fcc0282993ba0a7b527dc4dda7088fc0e4a5..88bad7b06124df10f5a3cec690e993ac5b8ffcd5 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/listener/DefaultListenerIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/listener/DefaultListenerIntegrationTest.java
@@ -2,8 +2,8 @@ package at.tuwien.listener;
import at.tuwien.config.MariaDbConfig;
import at.tuwien.config.MariaDbContainerConfig;
+import at.tuwien.exception.MetadataServiceException;
import at.tuwien.exception.RemoteUnavailableException;
-import at.tuwien.exception.ServiceException;
import at.tuwien.exception.TableNotFoundException;
import at.tuwien.gateway.MetadataServiceGateway;
import at.tuwien.test.AbstractUnitTest;
@@ -63,7 +63,7 @@ public class DefaultListenerIntegrationTest extends AbstractUnitTest {
@Test
public void onMessage_succeeds(CapturedOutput output) throws TableNotFoundException, RemoteUnavailableException,
- ServiceException {
+ MetadataServiceException {
final Message request = buildMessage("dbrepo." + DATABASE_1_ID + "." + TABLE_1_ID, "{\"id\":4,\"date\":\"2023-10-03\",\"mintemp\":15.0,\"rainfall\":0.2}", new HashMap<>());
/* mock */
@@ -78,7 +78,7 @@ public class DefaultListenerIntegrationTest extends AbstractUnitTest {
@Test
@Disabled
public void onMessage_tableNotFound_fails(CapturedOutput output) throws TableNotFoundException,
- RemoteUnavailableException, ServiceException {
+ RemoteUnavailableException, MetadataServiceException {
final Message request = buildMessage("dbrepo." + DATABASE_1_ID + "." + TABLE_1_ID, "{\"id\":4,\"date\":\"2023-10-03\",\"mintemp\":15.0,\"rainfall\":0.2}", new HashMap<>());
/* mock */
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/listener/DefaultListenerUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/listener/DefaultListenerUnitTest.java
index ab4a171c8915440055934c904247832ce0cf7549..648e36caa938f11e564ce772b00c25ba24d18281 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/listener/DefaultListenerUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/listener/DefaultListenerUnitTest.java
@@ -2,8 +2,8 @@ package at.tuwien.listener;
import at.tuwien.config.MariaDbConfig;
import at.tuwien.config.MariaDbContainerConfig;
+import at.tuwien.exception.MetadataServiceException;
import at.tuwien.exception.RemoteUnavailableException;
-import at.tuwien.exception.ServiceException;
import at.tuwien.exception.TableNotFoundException;
import at.tuwien.gateway.MetadataServiceGateway;
import at.tuwien.test.AbstractUnitTest;
@@ -76,7 +76,7 @@ public class DefaultListenerUnitTest extends AbstractUnitTest {
@Test
public void onMessage_messageMalformed_fails(CapturedOutput output) throws TableNotFoundException,
- RemoteUnavailableException, ServiceException {
+ RemoteUnavailableException, MetadataServiceException {
final Message request = buildMessage("dbrepo.1.1", "{,}", new HashMap<>());
/* mock */
@@ -90,7 +90,7 @@ public class DefaultListenerUnitTest extends AbstractUnitTest {
@Test
public void onMessage_tableNotFound_fails(CapturedOutput output) throws TableNotFoundException,
- RemoteUnavailableException, ServiceException {
+ RemoteUnavailableException, MetadataServiceException {
final Message request = buildMessage("dbrepo.1.1", "{\"id\":1}", new HashMap<>());
/* mock */
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java
index 803632c078717ef92de0bbedd246734276aa0f9a..9d42c1a54df551749416b0b1fcc5c6c56abed3f8 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java
@@ -171,7 +171,7 @@ public class PrometheusEndpointMvcTest extends AbstractUnitTest {
/* mock */
try {
- tableEndpoint.getData(DATABASE_1_ID, TABLE_1_ID, null, null, null);
+ tableEndpoint.getData(DATABASE_1_ID, TABLE_1_ID, null, null, null, null);
} catch (Exception e) {
/* ignore */
}
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
index e53f6ad88f92095ae405d586d39a399e0a6b0304..c89d53282ce3086cb28a88125b07549780b83d6b 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
@@ -9,6 +9,7 @@ import at.tuwien.mapper.MariaDbMapper;
import at.tuwien.mapper.MariaDbMapperImpl;
import at.tuwien.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -38,6 +39,11 @@ public class DatabaseServiceIntegrationTest extends AbstractUnitTest {
@Autowired
private MariaDbMapper mariaDbMapper;
+ @BeforeAll
+ public static void beforeAll() throws InterruptedException {
+ Thread.sleep(1000) /* wait for test container some more */;
+ }
+
@BeforeEach
public void beforeEach() throws SQLException {
genesis();
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
index 4bfa5b443a19ed6bf7af2c55183fd94fa0366baf..bd57eafacc47a1107e309be0fba94de75371bc95 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
@@ -3,13 +3,14 @@ package at.tuwien.service;
import at.tuwien.config.MariaDbConfig;
import at.tuwien.config.MariaDbContainerConfig;
import at.tuwien.exception.ContainerNotFoundException;
+import at.tuwien.exception.MetadataServiceException;
import at.tuwien.exception.RemoteUnavailableException;
-import at.tuwien.exception.ServiceException;
import at.tuwien.exception.TableNotFoundException;
import at.tuwien.gateway.MetadataServiceGateway;
import at.tuwien.service.impl.QueueServiceRabbitMqImpl;
import at.tuwien.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -42,6 +43,11 @@ public class QueueServiceIntegrationTest extends AbstractUnitTest {
@Container
private static MariaDBContainer<?> mariaDBContainer = MariaDbContainerConfig.getContainer();
+ @BeforeAll
+ public static void beforeAll() throws InterruptedException {
+ Thread.sleep(1000) /* wait for test container some more */;
+ }
+
@BeforeEach
public void beforeEach() throws SQLException {
genesis();
@@ -51,8 +57,8 @@ public class QueueServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void insert_succeeds() throws InterruptedException, SQLException, RemoteUnavailableException,
- ContainerNotFoundException, TableNotFoundException, ServiceException {
+ public void insert_succeeds() throws SQLException, RemoteUnavailableException, ContainerNotFoundException,
+ TableNotFoundException, MetadataServiceException {
final Map<String, Object> request = new HashMap<>() {{
put("id", 4L);
put("date", "2023-10-03");
@@ -61,9 +67,6 @@ public class QueueServiceIntegrationTest extends AbstractUnitTest {
put("rainfall", 0.2);
}};
- /* pre-condition */
- Thread.sleep(1000) /* wait for test container some more */;
-
/* mock */
when(metadataServiceGateway.getContainerById(CONTAINER_1_ID))
.thenReturn(CONTAINER_1_PRIVILEGED_DTO);
@@ -75,16 +78,13 @@ public class QueueServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void insert_onlyMandatoryFields_succeeds() throws InterruptedException, SQLException,
- RemoteUnavailableException, TableNotFoundException, ServiceException {
+ public void insert_onlyMandatoryFields_succeeds() throws SQLException, RemoteUnavailableException,
+ TableNotFoundException, MetadataServiceException {
final Map<String, Object> request = new HashMap<>() {{
put("id", 5L);
put("date", "2023-10-04");
}};
- /* pre-condition */
- Thread.sleep(1000) /* wait for test container some more */;
-
/* mock */
when(metadataServiceGateway.getTableById(DATABASE_1_ID, TABLE_1_ID))
.thenReturn(TABLE_1_PRIVILEGED_DTO);
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/SchemaServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/SchemaServiceIntegrationTest.java
index db00195e049295bfd4b054f831ffd2c50f17f01c..cc644769272b4697cbe6091284287690b10c1944 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/SchemaServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/SchemaServiceIntegrationTest.java
@@ -59,7 +59,7 @@ public class SchemaServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void inspectTable_succeeds() throws TableNotFoundException, SQLException, QueryMalformedException {
+ public void inspectTable_succeeds() throws TableNotFoundException, SQLException {
/* test */
final TableDto response = schemaService.inspectTable(DATABASE_1_PRIVILEGED_DTO, "not_in_metadata_db");
@@ -95,7 +95,7 @@ public class SchemaServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void inspectTableEnum_succeeds() throws TableNotFoundException, SQLException, QueryMalformedException {
+ public void inspectTableEnum_succeeds() throws TableNotFoundException, SQLException {
/* test */
final TableDto response = schemaService.inspectTable(DATABASE_2_PRIVILEGED_DTO, "experiments");
@@ -135,7 +135,7 @@ public class SchemaServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void inspectTableFullConstraints_succeeds() throws TableNotFoundException, SQLException, QueryMalformedException {
+ public void inspectTableFullConstraints_succeeds() throws TableNotFoundException, SQLException {
/* test */
final TableDto response = schemaService.inspectTable(DATABASE_1_PRIVILEGED_DTO, "weather_aus");
@@ -241,7 +241,7 @@ public class SchemaServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void inspectTable_multipleForeignKeyReferences_succeeds() throws TableNotFoundException, SQLException, QueryMalformedException {
+ public void inspectTable_multipleForeignKeyReferences_succeeds() throws TableNotFoundException, SQLException {
/* test */
final TableDto response = schemaService.inspectTable(DATABASE_1_PRIVILEGED_DTO, "complex_foreign_keys");
@@ -294,7 +294,7 @@ public class SchemaServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void inspectTable_multiplePrimaryKey_succeeds() throws TableNotFoundException, SQLException, QueryMalformedException {
+ public void inspectTable_multiplePrimaryKey_succeeds() throws TableNotFoundException, SQLException {
/* test */
final TableDto response = schemaService.inspectTable(DATABASE_1_PRIVILEGED_DTO, "complex_primary_key");
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/StorageServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/StorageServiceIntegrationTest.java
index 336a2072c58f36762e74ad154f1737647466c7a7..d3432ad78b3ec1587619ff4cdf7ca2a8427f887b 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/StorageServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/StorageServiceIntegrationTest.java
@@ -15,12 +15,10 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.DynamicPropertyRegistry;
import org.springframework.test.context.DynamicPropertySource;
import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.testcontainers.containers.MariaDBContainer;
import org.testcontainers.containers.MinIOContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
@@ -32,7 +30,6 @@ import software.amazon.awssdk.services.s3.model.PutObjectRequest;
import java.io.File;
import java.io.InputStream;
import java.sql.SQLException;
-import java.util.List;
import static org.junit.jupiter.api.Assertions.*;
@@ -63,14 +60,14 @@ public class StorageServiceIntegrationTest extends AbstractUnitTest {
public void beforeEach() throws SQLException {
genesis();
/* s3 */
- if (s3Client.listBuckets().buckets().stream().noneMatch(b -> b.name().equals(s3Config.getS3ImportBucket()))) {
+ if (s3Client.listBuckets().buckets().stream().noneMatch(b -> b.name().equals(s3Config.getS3Bucket()))) {
s3Client.createBucket(CreateBucketRequest.builder()
- .bucket(s3Config.getS3ImportBucket())
+ .bucket(s3Config.getS3Bucket())
.build());
}
- if (s3Client.listBuckets().buckets().stream().noneMatch(b -> b.name().equals(s3Config.getS3ExportBucket()))) {
+ if (s3Client.listBuckets().buckets().stream().noneMatch(b -> b.name().equals(s3Config.getS3Bucket()))) {
s3Client.createBucket(CreateBucketRequest.builder()
- .bucket(s3Config.getS3ExportBucket())
+ .bucket(s3Config.getS3Bucket())
.build());
}
}
@@ -81,11 +78,11 @@ public class StorageServiceIntegrationTest extends AbstractUnitTest {
/* mock */
s3Client.putObject(PutObjectRequest.builder()
.key("s3key")
- .bucket(s3Config.getS3ImportBucket())
+ .bucket(s3Config.getS3Bucket())
.build(), RequestBody.fromFile(new File("src/test/resources/csv/weather_aus.csv")));
/* test */
- final InputStream response = storageService.getObject(s3Config.getS3ImportBucket(), "s3key");
+ final InputStream response = storageService.getObject(s3Config.getS3Bucket(), "s3key");
assertNotNull(response);
}
@@ -94,7 +91,7 @@ public class StorageServiceIntegrationTest extends AbstractUnitTest {
/* test */
assertThrows(StorageNotFoundException.class, () -> {
- storageService.getObject(s3Config.getS3ImportBucket(), "i_do_not_exist");
+ storageService.getObject(s3Config.getS3Bucket(), "i_do_not_exist");
});
}
@@ -113,11 +110,11 @@ public class StorageServiceIntegrationTest extends AbstractUnitTest {
/* mock */
s3Client.putObject(PutObjectRequest.builder()
.key("s3key")
- .bucket(s3Config.getS3ImportBucket())
+ .bucket(s3Config.getS3Bucket())
.build(), RequestBody.fromFile(new File("src/test/resources/csv/weather_aus.csv")));
/* test */
- final byte[] response = storageService.getBytes(s3Config.getS3ImportBucket(), "s3key");
+ final byte[] response = storageService.getBytes(s3Config.getS3Bucket(), "s3key");
assertNotNull(response);
}
@@ -127,7 +124,7 @@ public class StorageServiceIntegrationTest extends AbstractUnitTest {
/* mock */
s3Client.putObject(PutObjectRequest.builder()
.key("s3key")
- .bucket(s3Config.getS3ImportBucket())
+ .bucket(s3Config.getS3Bucket())
.build(), RequestBody.fromFile(new File("src/test/resources/csv/weather_aus.csv")));
/* test */
@@ -140,7 +137,7 @@ public class StorageServiceIntegrationTest extends AbstractUnitTest {
/* test */
assertThrows(StorageNotFoundException.class, () -> {
- storageService.getBytes(s3Config.getS3ImportBucket(), "i_do_not_exist");
+ storageService.getBytes(s3Config.getS3Bucket(), "i_do_not_exist");
});
}
@@ -150,11 +147,11 @@ public class StorageServiceIntegrationTest extends AbstractUnitTest {
/* mock */
s3Client.putObject(PutObjectRequest.builder()
.key("s3key")
- .bucket(s3Config.getS3ImportBucket())
+ .bucket(s3Config.getS3Bucket())
.build(), RequestBody.fromFile(new File("src/test/resources/csv/weather_aus.csv")));
/* test */
- final ExportResourceDto response = storageService.getResource(s3Config.getS3ImportBucket(), "s3key");
+ final ExportResourceDto response = storageService.getResource(s3Config.getS3Bucket(), "s3key");
assertEquals("s3key", response.getFilename());
assertNotNull(response.getResource());
}
@@ -164,7 +161,7 @@ public class StorageServiceIntegrationTest extends AbstractUnitTest {
/* test */
assertThrows(StorageNotFoundException.class, () -> {
- storageService.getBytes(s3Config.getS3ImportBucket(), "i_do_not_exist");
+ storageService.getBytes(s3Config.getS3Bucket(), "i_do_not_exist");
});
}
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/SubsetServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/SubsetServiceIntegrationTest.java
index aa30bc0580ff3b0aba950a1f1ea495b135280782..aeaae0ecf2626ff88027a210bd8e24a5c66d4ede 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/SubsetServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/SubsetServiceIntegrationTest.java
@@ -1,14 +1,21 @@
package at.tuwien.service;
+import at.tuwien.ExportResourceDto;
import at.tuwien.api.database.query.QueryDto;
import at.tuwien.api.database.query.QueryResultDto;
import at.tuwien.api.identifier.IdentifierDto;
import at.tuwien.config.MariaDbConfig;
import at.tuwien.config.MariaDbContainerConfig;
+import at.tuwien.config.S3Config;
import at.tuwien.exception.*;
+import at.tuwien.gateway.DataDatabaseSidecarGateway;
import at.tuwien.gateway.MetadataServiceGateway;
import at.tuwien.test.AbstractUnitTest;
+import com.google.common.hash.Hashing;
import lombok.extern.log4j.Log4j2;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.RandomUtils;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -20,15 +27,19 @@ import org.testcontainers.containers.MariaDBContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
import java.math.BigInteger;
+import java.nio.charset.Charset;
import java.sql.SQLException;
import java.time.Instant;
import java.util.List;
import java.util.Map;
import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.when;
@Log4j2
@@ -43,9 +54,18 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
@MockBean
private MetadataServiceGateway metadataServiceGateway;
+ @MockBean
+ private DataDatabaseSidecarGateway dataDatabaseSidecarGateway;
+
+ @MockBean
+ private StorageService storageService;
+
@Container
private static MariaDBContainer<?> mariaDBContainer = MariaDbContainerConfig.getContainer();
+ @Autowired
+ private S3Config s3Config;
+
@BeforeEach
public void beforeEach() throws SQLException {
genesis();
@@ -56,8 +76,8 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
@Test
public void execute_succeeds() throws QueryStoreInsertException, TableMalformedException, SQLException,
- QueryNotFoundException, InterruptedException, UserNotFoundException, NotAllowedException,
- RemoteUnavailableException, ServiceException, DatabaseNotFoundException {
+ QueryNotFoundException, UserNotFoundException, NotAllowedException, RemoteUnavailableException,
+ MetadataServiceException, DatabaseNotFoundException, InterruptedException {
/* pre-condition */
Thread.sleep(1000) /* wait for test container some more */;
@@ -95,10 +115,39 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
assertEquals(0.0, response.getResult().get(2).get("rainfall"));
}
+ @Test
+ public void execute_joinWithAlias_succeeds() throws QueryStoreInsertException, TableMalformedException,
+ SQLException, QueryNotFoundException, UserNotFoundException, NotAllowedException,
+ RemoteUnavailableException, MetadataServiceException, DatabaseNotFoundException, InterruptedException {
+
+ /* pre-condition */
+ Thread.sleep(1000) /* wait for test container some more */;
+
+ /* mock */
+ when(metadataServiceGateway.getUserById(QUERY_1_CREATED_BY))
+ .thenReturn(QUERY_1_CREATOR);
+
+ /* test */
+ final QueryResultDto response = queryService.execute(DATABASE_1_PRIVILEGED_DTO, QUERY_7_STATEMENT, Instant.now(), USER_1_ID, 0L, 10L, null, null);
+ assertNotNull(response);
+ assertNotNull(response.getId());
+ assertNotNull(response.getHeaders());
+ assertEquals(5, response.getHeaders().size());
+ assertEquals(List.of(Map.of("id", 0), Map.of("date", 1), Map.of("location", 2), Map.of("lat", 3), Map.of("lng", 4)), response.getHeaders());
+ assertNotNull(response.getResult());
+ assertEquals(1, response.getResult().size());
+ /* row 0 */
+ assertEquals(BigInteger.valueOf(1L), response.getResult().get(0).get("id"));
+ assertEquals(Instant.ofEpochSecond(1228089600), response.getResult().get(0).get("date"));
+ assertEquals("Albury", response.getResult().get(0).get("location"));
+ assertEquals(-36.0653583, response.getResult().get(0).get("lat"));
+ assertEquals(146.9112214, response.getResult().get(0).get("lng"));
+ }
+
@Test
public void execute_oneResult_succeeds() throws QueryStoreInsertException, TableMalformedException, SQLException,
- QueryNotFoundException, InterruptedException, UserNotFoundException, NotAllowedException,
- RemoteUnavailableException, ServiceException, DatabaseNotFoundException {
+ QueryNotFoundException, UserNotFoundException, NotAllowedException, RemoteUnavailableException,
+ MetadataServiceException, DatabaseNotFoundException, InterruptedException {
/* pre-condition */
Thread.sleep(1000) /* wait for test container some more */;
@@ -128,8 +177,8 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
@Test
public void execute_oneResultPagination_succeeds() throws QueryStoreInsertException, TableMalformedException,
- SQLException, QueryNotFoundException, InterruptedException, UserNotFoundException, NotAllowedException,
- RemoteUnavailableException, ServiceException, DatabaseNotFoundException {
+ SQLException, QueryNotFoundException, UserNotFoundException, NotAllowedException,
+ RemoteUnavailableException, MetadataServiceException, DatabaseNotFoundException, InterruptedException {
/* pre-condition */
Thread.sleep(1000) /* wait for test container some more */;
@@ -158,8 +207,8 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void findAll_succeeds() throws SQLException, QueryNotFoundException, InterruptedException,
- NotAllowedException, RemoteUnavailableException, ServiceException, DatabaseNotFoundException {
+ public void findAll_succeeds() throws SQLException, QueryNotFoundException, NotAllowedException,
+ RemoteUnavailableException, MetadataServiceException, DatabaseNotFoundException, InterruptedException {
/* test */
final List<QueryDto> response = findAll_generic(null);
@@ -169,8 +218,8 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void findAll_onlyPersisted_succeeds() throws SQLException, QueryNotFoundException, InterruptedException,
- NotAllowedException, RemoteUnavailableException, ServiceException, DatabaseNotFoundException {
+ public void findAll_onlyPersisted_succeeds() throws SQLException, QueryNotFoundException, NotAllowedException,
+ RemoteUnavailableException, MetadataServiceException, DatabaseNotFoundException, InterruptedException {
/* test */
final List<QueryDto> response = findAll_generic(true);
@@ -179,8 +228,8 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void findAll_onlyNonPersisted_succeeds() throws SQLException, QueryNotFoundException, InterruptedException,
- NotAllowedException, RemoteUnavailableException, ServiceException, DatabaseNotFoundException {
+ public void findAll_onlyNonPersisted_succeeds() throws SQLException, QueryNotFoundException, NotAllowedException,
+ RemoteUnavailableException, MetadataServiceException, DatabaseNotFoundException, InterruptedException {
/* test */
final List<QueryDto> response = findAll_generic(false);
@@ -189,9 +238,9 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void findById_succeeds() throws SQLException, QueryNotFoundException, InterruptedException,
- UserNotFoundException, NotAllowedException, RemoteUnavailableException, ServiceException,
- DatabaseNotFoundException {
+ public void findById_succeeds() throws SQLException, QueryNotFoundException, UserNotFoundException,
+ NotAllowedException, RemoteUnavailableException, MetadataServiceException, DatabaseNotFoundException,
+ InterruptedException {
/* test */
findById_generic(QUERY_1_ID);
@@ -207,9 +256,9 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void persist_succeeds() throws SQLException, InterruptedException, QueryStorePersistException,
- QueryNotFoundException, UserNotFoundException, NotAllowedException, RemoteUnavailableException,
- ServiceException, DatabaseNotFoundException {
+ public void persist_succeeds() throws SQLException, QueryStorePersistException, QueryNotFoundException,
+ UserNotFoundException, NotAllowedException, RemoteUnavailableException, MetadataServiceException,
+ DatabaseNotFoundException, InterruptedException {
/* mock */
when(metadataServiceGateway.getUserById(QUERY_2_CREATED_BY))
@@ -223,9 +272,9 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void persist_unPersist_succeeds() throws SQLException, InterruptedException, QueryStorePersistException,
- QueryNotFoundException, UserNotFoundException, NotAllowedException, RemoteUnavailableException,
- ServiceException, DatabaseNotFoundException {
+ public void persist_unPersist_succeeds() throws SQLException, QueryStorePersistException, QueryNotFoundException,
+ UserNotFoundException, NotAllowedException, RemoteUnavailableException, MetadataServiceException,
+ DatabaseNotFoundException, InterruptedException {
/* mock */
when(metadataServiceGateway.getUserById(QUERY_1_CREATED_BY))
@@ -238,9 +287,40 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
assertFalse(response.getIsPersisted());
}
- protected void findById_generic(Long queryId) throws InterruptedException, NotAllowedException,
- RemoteUnavailableException, SQLException, UserNotFoundException, QueryNotFoundException, ServiceException,
- DatabaseNotFoundException {
+ @Test
+ public void createQueryStore_succeeds() throws SQLException, QueryStoreCreateException, InterruptedException {
+
+ /* mock */
+ MariaDbConfig.dropQueryStore(DATABASE_1_PRIVILEGED_DTO);
+
+ /* test */
+ createQueryStore_generic(DATABASE_1_INTERNALNAME);
+ }
+
+ @Test
+ public void createQueryStore_fails() {
+
+ /* test */
+ assertThrows(QueryStoreCreateException.class, () -> {
+ createQueryStore_generic(DATABASE_1_INTERNALNAME);
+ });
+ }
+
+ @Test
+ public void export_succeeds() throws SQLException, StorageUnavailableException, QueryMalformedException,
+ SidecarExportException, MetadataServiceException, RemoteUnavailableException, IOException,
+ StorageNotFoundException, InterruptedException {
+
+ /* mock */
+ MariaDbConfig.dropQueryStore(DATABASE_1_PRIVILEGED_DTO);
+
+ /* test */
+ export_generic();
+ }
+
+ protected void findById_generic(Long queryId) throws NotAllowedException, RemoteUnavailableException, SQLException,
+ UserNotFoundException, QueryNotFoundException, MetadataServiceException, DatabaseNotFoundException,
+ InterruptedException {
/* pre-condition */
Thread.sleep(1000) /* wait for test container some more */;
@@ -258,9 +338,9 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
assertEquals(DATABASE_1_ID, response.getDatabaseId());
}
- protected List<QueryDto> findAll_generic(Boolean filterPersisted) throws InterruptedException, SQLException,
- QueryNotFoundException, NotAllowedException, RemoteUnavailableException, ServiceException,
- DatabaseNotFoundException {
+ protected List<QueryDto> findAll_generic(Boolean filterPersisted) throws SQLException, QueryNotFoundException,
+ NotAllowedException, RemoteUnavailableException, MetadataServiceException, DatabaseNotFoundException,
+ InterruptedException {
/* pre-condition */
Thread.sleep(1000) /* wait for test container some more */;
@@ -276,8 +356,8 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
}
protected void persist_generic(Long queryId, List<IdentifierDto> identifiers, Boolean persist)
- throws InterruptedException, RemoteUnavailableException, SQLException, QueryStorePersistException,
- ServiceException, DatabaseNotFoundException {
+ throws RemoteUnavailableException, SQLException, QueryStorePersistException, MetadataServiceException,
+ DatabaseNotFoundException, InterruptedException {
/* pre-condition */
Thread.sleep(1000) /* wait for test container some more */;
@@ -292,4 +372,38 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
queryService.persist(DATABASE_1_PRIVILEGED_DTO, queryId, persist);
}
+ protected void createQueryStore_generic(String databaseName) throws SQLException, QueryStoreCreateException,
+ InterruptedException {
+
+ /* pre-condition */
+ Thread.sleep(1000) /* wait for test container some more */;
+
+ /* test */
+ queryService.createQueryStore(CONTAINER_1_PRIVILEGED_DTO, databaseName);
+ final List<Map<String, Object>> response = MariaDbConfig.listQueryStore(DATABASE_1_PRIVILEGED_DTO);
+ assertEquals(0, response.size());
+ }
+
+ protected void export_generic() throws StorageUnavailableException, SQLException,
+ QueryMalformedException, SidecarExportException, MetadataServiceException, RemoteUnavailableException,
+ StorageNotFoundException, IOException, InterruptedException {
+ final String filename = "68b329da9893e34099c7d8ad5cb9c940";
+
+ /* pre-condition */
+ Thread.sleep(1000) /* wait for test container some more */;
+
+ /* mock */
+ FileUtils.deleteQuietly(new File(s3Config.getS3FilePath() + "/" + filename));
+ doNothing()
+ .when(dataDatabaseSidecarGateway)
+ .exportFile(anyString(), anyInt(), eq(filename));
+ when(storageService.getResource(anyString()))
+ .thenReturn(EXPORT_RESOURCE_DTO);
+
+ /* test */
+ final ExportResourceDto response = queryService.export(DATABASE_1_PRIVILEGED_DTO, QUERY_1_DTO, Instant.now(), filename);
+ assertEquals(filename, response.getFilename());
+ assertNotNull(response.getResource().getInputStream());
+ }
+
}
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java
index 86a0442ef60a4dc80365c48b8567a15ad04f9e85..41fa4963fb26158f11060db383c4cb973e66e1c0 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java
@@ -25,6 +25,7 @@ import at.tuwien.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.io.FileUtils;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -74,6 +75,11 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
@Container
private static MariaDBContainer<?> mariaDBContainer = MariaDbContainerConfig.getContainer();
+ @BeforeAll
+ public static void beforeAll() throws InterruptedException {
+ Thread.sleep(1000) /* wait for test container some more */;
+ }
+
@BeforeEach
public void beforeEach() throws SQLException {
genesis();
@@ -84,9 +90,8 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void updateTuple_succeeds() throws InterruptedException, SQLException, RemoteUnavailableException,
- ContainerNotFoundException, TableNotFoundException, TableMalformedException, QueryMalformedException,
- ServiceException {
+ public void updateTuple_succeeds() throws SQLException, RemoteUnavailableException, ContainerNotFoundException,
+ TableNotFoundException, TableMalformedException, QueryMalformedException, MetadataServiceException {
/* modify row based on primary key */
final TupleUpdateDto request = TupleUpdateDto.builder()
.data(new HashMap<>() {{
@@ -100,9 +105,6 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
}})
.build();
- /* pre-condition */
- Thread.sleep(1000) /* wait for test container some more */;
-
/* mock */
when(metadataServiceGateway.getContainerById(CONTAINER_1_ID))
.thenReturn(CONTAINER_1_PRIVILEGED_DTO);
@@ -120,9 +122,9 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void updateTuple_modifyPrimaryKey_succeeds() throws InterruptedException, SQLException,
- RemoteUnavailableException, ContainerNotFoundException, TableNotFoundException, TableMalformedException,
- QueryMalformedException, ServiceException {
+ public void updateTuple_modifyPrimaryKey_succeeds() throws SQLException, RemoteUnavailableException,
+ ContainerNotFoundException, TableNotFoundException, TableMalformedException, QueryMalformedException,
+ MetadataServiceException {
/* modify row primary key based on primary key */
final TupleUpdateDto request = TupleUpdateDto.builder()
.data(new HashMap<>() {{
@@ -137,9 +139,6 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
}})
.build();
- /* pre-condition */
- Thread.sleep(1000) /* wait for test container some more */;
-
/* mock */
when(metadataServiceGateway.getContainerById(CONTAINER_1_ID))
.thenReturn(CONTAINER_1_PRIVILEGED_DTO);
@@ -157,9 +156,9 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void updateTuple_missingPrimaryKey_succeeds() throws InterruptedException, SQLException,
- RemoteUnavailableException, ContainerNotFoundException, TableNotFoundException, TableMalformedException,
- QueryMalformedException, ServiceException {
+ public void updateTuple_missingPrimaryKey_succeeds() throws SQLException, RemoteUnavailableException,
+ ContainerNotFoundException, TableNotFoundException, TableMalformedException, QueryMalformedException,
+ MetadataServiceException {
/* modify row based on non-primary key column */
final TupleUpdateDto request = TupleUpdateDto.builder()
.data(new HashMap<>() {{
@@ -173,9 +172,6 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
}})
.build();
- /* pre-condition */
- Thread.sleep(1000) /* wait for test container some more */;
-
/* mock */
when(metadataServiceGateway.getContainerById(CONTAINER_1_ID))
.thenReturn(CONTAINER_1_PRIVILEGED_DTO);
@@ -193,9 +189,9 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void updateTuple_notInOrder_succeeds() throws InterruptedException, SQLException, RemoteUnavailableException,
+ public void updateTuple_notInOrder_succeeds() throws SQLException, RemoteUnavailableException,
ContainerNotFoundException, TableNotFoundException, TableMalformedException, QueryMalformedException,
- ServiceException {
+ MetadataServiceException {
/* modify row based on non-primary key column */
final TupleUpdateDto request = TupleUpdateDto.builder()
.data(new HashMap<>() {{
@@ -209,9 +205,6 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
}})
.build();
- /* pre-condition */
- Thread.sleep(1000) /* wait for test container some more */;
-
/* mock */
when(metadataServiceGateway.getContainerById(CONTAINER_1_ID))
.thenReturn(CONTAINER_1_PRIVILEGED_DTO);
@@ -229,9 +222,9 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void createTuple_succeeds() throws InterruptedException, SQLException, RemoteUnavailableException,
- ContainerNotFoundException, TableNotFoundException, TableMalformedException, QueryMalformedException,
- StorageUnavailableException, StorageNotFoundException, ServiceException {
+ public void createTuple_succeeds() throws SQLException, RemoteUnavailableException, ContainerNotFoundException,
+ TableNotFoundException, TableMalformedException, QueryMalformedException, StorageUnavailableException,
+ StorageNotFoundException, MetadataServiceException {
/* add row with primary key */
final TupleDto request = TupleDto.builder()
.data(new HashMap<>() {{
@@ -243,9 +236,6 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
}})
.build();
- /* pre-condition */
- Thread.sleep(1000) /* wait for test container some more */;
-
/* mock */
when(metadataServiceGateway.getContainerById(CONTAINER_1_ID))
.thenReturn(CONTAINER_1_PRIVILEGED_DTO);
@@ -263,9 +253,9 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void createTuple_notInOrder_succeeds() throws InterruptedException, SQLException, RemoteUnavailableException,
+ public void createTuple_notInOrder_succeeds() throws SQLException, RemoteUnavailableException,
ContainerNotFoundException, TableNotFoundException, TableMalformedException, QueryMalformedException,
- StorageUnavailableException, StorageNotFoundException, ServiceException {
+ StorageUnavailableException, StorageNotFoundException, MetadataServiceException {
/* add row with primary key */
final TupleDto request = TupleDto.builder()
.data(new HashMap<>() {{
@@ -277,9 +267,6 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
}})
.build();
- /* pre-condition */
- Thread.sleep(1000) /* wait for test container some more */;
-
/* mock */
when(metadataServiceGateway.getContainerById(CONTAINER_1_ID))
.thenReturn(CONTAINER_1_PRIVILEGED_DTO);
@@ -297,9 +284,8 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void deleteTuple_succeeds() throws InterruptedException, SQLException, RemoteUnavailableException,
- ContainerNotFoundException, TableNotFoundException, TableMalformedException, QueryMalformedException,
- ServiceException {
+ public void deleteTuple_succeeds() throws SQLException, RemoteUnavailableException, ContainerNotFoundException,
+ TableNotFoundException, TableMalformedException, QueryMalformedException, MetadataServiceException {
/* delete row based on primary key */
final TupleDeleteDto request = TupleDeleteDto.builder()
.keys(new HashMap<>() {{
@@ -307,9 +293,6 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
}})
.build();
- /* pre-condition */
- Thread.sleep(1000) /* wait for test container some more */;
-
/* mock */
when(metadataServiceGateway.getContainerById(CONTAINER_1_ID))
.thenReturn(CONTAINER_1_PRIVILEGED_DTO);
@@ -323,9 +306,9 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void deleteTuple_withoutPrimaryKey_succeeds() throws InterruptedException, SQLException,
- RemoteUnavailableException, ContainerNotFoundException, TableNotFoundException, TableMalformedException,
- QueryMalformedException, ServiceException {
+ public void deleteTuple_withoutPrimaryKey_succeeds() throws SQLException, RemoteUnavailableException,
+ ContainerNotFoundException, TableNotFoundException, TableMalformedException, QueryMalformedException,
+ MetadataServiceException {
/* remove row based on non-primary key */
final TupleDeleteDto request = TupleDeleteDto.builder()
.keys(new HashMap<>() {{
@@ -334,9 +317,6 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
}})
.build();
- /* pre-condition */
- Thread.sleep(1000) /* wait for test container some more */;
-
/* mock */
when(metadataServiceGateway.getContainerById(CONTAINER_1_ID))
.thenReturn(CONTAINER_1_PRIVILEGED_DTO);
@@ -350,8 +330,7 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void getSchemas_succeeds() throws TableNotFoundException, SQLException, QueryMalformedException,
- DatabaseMalformedException {
+ public void getSchemas_succeeds() throws TableNotFoundException, SQLException, DatabaseMalformedException {
/* test */
final List<TableDto> response = tableService.getSchemas(DATABASE_1_PRIVILEGED_DTO);
@@ -462,7 +441,7 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
@Test
public void create_succeeds() throws TableNotFoundException, TableMalformedException, SQLException,
- QueryMalformedException, TableExistsException {
+ TableExistsException {
/* test */
final TableDto response = tableService.createTable(DATABASE_1_PRIVILEGED_DTO, TABLE_4_CREATE_INTERNAL_DTO);
@@ -472,7 +451,7 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void getStatistics_succeeds() throws TableMalformedException, SQLException, QueryMalformedException {
+ public void getStatistics_succeeds() throws TableMalformedException, SQLException, TableNotFoundException {
/* test */
final TableStatisticDto response = tableService.getStatistics(TABLE_1_PRIVILEGED_DTO);
@@ -514,13 +493,8 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
@Test
public void create_malformed_fails() {
final at.tuwien.api.database.table.internal.TableCreateDto request = TableCreateDto.builder()
- .needSequence(false)
.name("missing_foreign_key")
- .columns(List.of(ColumnCreateDto.builder()
- .name("id")
- .type(ColumnTypeDto.BIGINT)
- .nullAllowed(false)
- .build()))
+ .columns(List.of())
.constraints(ConstraintsCreateDto.builder()
.foreignKeys(List.of(ForeignKeyCreateDto.builder()
.columns(List.of("i_do_not_exist"))
@@ -538,7 +512,7 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
@Test
public void create_needSequence_succeeds() throws TableNotFoundException, TableMalformedException, SQLException,
- QueryMalformedException, TableExistsException {
+ TableExistsException {
/* mock */
MariaDbConfig.dropTable(DATABASE_1_PRIVILEGED_DTO, TABLE_1_INTERNALNAME);
@@ -665,8 +639,8 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void importDataset_withSeparatorAndQuoteAndNullElement_succeeds() throws SidecarImportException, ServiceException, SQLException,
- QueryMalformedException, RemoteUnavailableException, StorageNotFoundException, IOException {
+ public void importDataset_withSeparatorAndQuoteAndNullElement_succeeds() throws SidecarImportException,
+ SQLException, QueryMalformedException, RemoteUnavailableException, StorageNotFoundException, IOException {
final ImportCsvDto request = ImportCsvDto.builder()
.location("weather_aus.csv")
.separator(';')
@@ -688,8 +662,8 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void importDataset_malformedData_fails() throws ServiceException, RemoteUnavailableException, StorageNotFoundException,
- IOException {
+ public void importDataset_malformedData_fails() throws RemoteUnavailableException, StorageNotFoundException,
+ IOException, SidecarImportException {
final ImportCsvDto request = ImportCsvDto.builder()
.location("weather_aus.csv")
.separator(';')
@@ -712,9 +686,8 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void exportDataset_succeeds() throws ServiceException, SQLException,
- QueryMalformedException, RemoteUnavailableException, StorageNotFoundException, StorageUnavailableException,
- SidecarExportException {
+ public void exportDataset_succeeds() throws SQLException, QueryMalformedException, RemoteUnavailableException,
+ StorageNotFoundException, StorageUnavailableException, SidecarExportException {
final ExportResourceDto mock = ExportResourceDto.builder()
.filename("weather_aus.csv")
.resource(new InputStreamResource(InputStream.nullInputStream()))
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
index eea4d65320ed1002ebcff6c6120e3c372a2e0027..20a769f8ce8e8b8a5f4cdf1f4e42610e0e3f561d 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
@@ -86,21 +86,24 @@ public class ViewServiceIntegrationTest extends AbstractUnitTest {
assertEquals(VIEW_2_ID, response.getId());
assertNotNull(response.getHeaders());
assertEquals(4, response.getHeaders().size());
- assertEquals(List.of(Map.of("date", 0), Map.of("location", 1), Map.of("mintemp", 2), Map.of("location", 3)), response.getHeaders());
+ assertEquals(List.of(Map.of("date", 0), Map.of("loc", 1), Map.of("mintemp", 2), Map.of("rainfall", 3)), response.getHeaders());
assertNotNull(response.getResult());
assertEquals(3, response.getResult().size());
/* row 0 */
assertEquals(Instant.ofEpochSecond(1228089600), response.getResult().get(0).get("date"));
- assertEquals("Albury", response.getResult().get(0).get("location"));
+ assertEquals("Albury", response.getResult().get(0).get("loc"));
assertEquals(13.4, response.getResult().get(0).get("mintemp"));
+ assertEquals(0.6, response.getResult().get(0).get("rainfall"));
/* row 1 */
assertEquals(Instant.ofEpochSecond(1228176000), response.getResult().get(1).get("date"));
- assertEquals("Albury", response.getResult().get(1).get("location"));
+ assertEquals("Albury", response.getResult().get(1).get("loc"));
assertEquals(7.4, response.getResult().get(1).get("mintemp"));
+ assertEquals(0.0, response.getResult().get(1).get("rainfall"));
/* row 2 */
assertEquals(Instant.ofEpochSecond(1228262400), response.getResult().get(2).get("date"));
- assertEquals("Albury", response.getResult().get(2).get("location"));
+ assertEquals("Albury", response.getResult().get(2).get("loc"));
assertEquals(12.9, response.getResult().get(2).get("mintemp"));
+ assertEquals(0.0, response.getResult().get(2).get("rainfall"));
}
@Test
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/utils/UserUtilTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/utils/UserUtilTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..13806e93ddd1cbeb7a8e1c0ab4e0fe38db0830ad
--- /dev/null
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/utils/UserUtilTest.java
@@ -0,0 +1,40 @@
+package at.tuwien.utils;
+
+import at.tuwien.test.BaseTest;
+import org.junit.jupiter.api.Test;
+
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class UserUtilTest extends BaseTest {
+
+ @Test
+ public void hasRole_succeeds() {
+ assertTrue(UserUtil.hasRole(USER_1_PRINCIPAL, "find-container"));
+ }
+
+ @Test
+ public void hasRole_principalMissing_fails() {
+ assertFalse(UserUtil.hasRole(null, "find-container"));
+ }
+
+ @Test
+ public void hasRole_roleMissing_fails() {
+ assertFalse(UserUtil.hasRole(USER_1_PRINCIPAL, null));
+ }
+
+ @Test
+ public void getId_succeeds() {
+ assertEquals(USER_1_ID, UserUtil.getId(USER_1_PRINCIPAL));
+ }
+
+ @Test
+ public void getId_principalMissing_fails() {
+ assertNull(UserUtil.getId(null));
+ }
+
+ @Test
+ public void getId_roleMissing_fails() {
+ assertNull(UserUtil.getId(USER_LOCAL_ADMIN_PRINCIPAL));
+ }
+}
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/validation/EndpointValidatorUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/validation/EndpointValidatorUnitTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..b12313dfe957d0f02f05c58bfce1066979973d07
--- /dev/null
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/validation/EndpointValidatorUnitTest.java
@@ -0,0 +1,101 @@
+package at.tuwien.validation;
+
+import at.tuwien.annotations.MockAmqp;
+import at.tuwien.exception.PaginationException;
+import at.tuwien.exception.QueryNotSupportedException;
+import at.tuwien.test.AbstractUnitTest;
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.actuate.observability.AutoConfigureObservability;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@Log4j2
+@ExtendWith(SpringExtension.class)
+@AutoConfigureMockMvc
+@SpringBootTest
+@AutoConfigureObservability
+@MockAmqp
+public class EndpointValidatorUnitTest extends AbstractUnitTest {
+
+ @Autowired
+ private EndpointValidator endpointValidator;
+
+ @Test
+ public void validateDataParams_succeeds() throws Exception {
+
+ /* test */
+ endpointValidator.validateDataParams(null, null);
+ }
+
+ @Test
+ public void validateDataParams_onlyPage_fails() {
+
+ /* test */
+ assertThrows(PaginationException.class, () -> {
+ endpointValidator.validateDataParams(0L, null);
+ });
+ }
+
+ @Test
+ public void validateDataParams_negativePage_fails() {
+
+ /* test */
+ assertThrows(PaginationException.class, () -> {
+ endpointValidator.validateDataParams(-1L, 10L);
+ });
+ }
+
+ @Test
+ public void validateDataParams_onlySize_fails() {
+
+ /* test */
+ assertThrows(PaginationException.class, () -> {
+ endpointValidator.validateDataParams(null, 10L);
+ });
+ }
+
+ @Test
+ public void validateDataParams_zeroSize_fails() {
+
+ /* test */
+ assertThrows(PaginationException.class, () -> {
+ endpointValidator.validateDataParams(0L, 0L);
+ });
+ }
+
+ @Test
+ public void validateForbiddenStatements_succeeds() throws QueryNotSupportedException {
+
+ /* test */
+ endpointValidator.validateForbiddenStatements("SELECT country FROM some_table");
+ }
+
+ @Test
+ public void validateForbiddenStatements_fails() {
+
+ /* test */
+ assertThrows(QueryNotSupportedException.class, () -> {
+ endpointValidator.validateForbiddenStatements("SELECT COUNT(id) FROM some_table");
+ });
+ }
+
+ @Test
+ public void validateForbiddenStatements_lowercase_fails() {
+
+ /* test */
+ assertThrows(QueryNotSupportedException.class, () -> {
+ endpointValidator.validateForbiddenStatements("SELECT COUNT(id) FROM some_table");
+ });
+ }
+
+}
diff --git a/dbrepo-data-service/rest-service/src/test/resources/application.properties b/dbrepo-data-service/rest-service/src/test/resources/application.properties
index 07eb7f642bd62128618f3d0b86d04c0ba4743644..764d9609c99fb1609b24d6d7f61d6d8d6b06ec00 100644
--- a/dbrepo-data-service/rest-service/src/test/resources/application.properties
+++ b/dbrepo-data-service/rest-service/src/test/resources/application.properties
@@ -29,4 +29,4 @@ spring.rabbitmq.password=guest
# s3
dbrepo.s3.accessKeyId=minioadmin
-dbrepo.s3.secretAccessKey=minioadmin
\ No newline at end of file
+dbrepo.s3.secretAccessKey=minioadmin
diff --git a/dbrepo-data-service/rest-service/src/test/resources/init/weather.sql b/dbrepo-data-service/rest-service/src/test/resources/init/weather.sql
index 052f23adf8f5772a996d430877c8785d24651305..79755c97bf68fd822869277e3ad867c582f4e68c 100644
--- a/dbrepo-data-service/rest-service/src/test/resources/init/weather.sql
+++ b/dbrepo-data-service/rest-service/src/test/resources/init/weather.sql
@@ -66,7 +66,7 @@ VALUES ('2022-12-24 17:00:00', 10.0),
CREATE VIEW junit2 AS
(
-select `date`, `location`, `mintemp`, `rainfall`
+select `date`, `location` as loc, `mintemp`, `rainfall`
from `weather_aus`
where `location` = 'Albury');
diff --git a/dbrepo-data-service/services/pom.xml b/dbrepo-data-service/services/pom.xml
index d5f6be25c8c35716eb34186b20d5711210e6f923..0b57ceef9d0e575cdedd03c769ecc24aacf682e5 100644
--- a/dbrepo-data-service/services/pom.xml
+++ b/dbrepo-data-service/services/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
- <version>1.4.4</version>
+ <version>1.4.5</version>
</parent>
<artifactId>services</artifactId>
<name>dbrepo-data-service-services</name>
- <version>1.4.4</version>
+ <version>1.4.5</version>
<dependencies>
<dependency>
@@ -22,7 +22,7 @@
<dependency>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service-querystore</artifactId>
- <version>1.4.4</version>
+ <version>1.4.5</version>
</dependency>
</dependencies>
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java b/dbrepo-data-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java
index 46ec0e6a24bdd2bc2a9a88f8fad4815467ebff08..35e55797ebffb688f801bfcf64163d3a4a630049 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java
@@ -74,8 +74,8 @@ public class AuthTokenFilter extends OncePerRequestFilter {
final DecodedJWT jwt = verifier.verify(token);
final RealmAccessDto realmAccess = jwt.getClaim("realm_access").as(RealmAccessDto.class);
return UserDetailsDto.builder()
- .id(jwt.getSubject())
- .username(jwt.getClaim("client_id").asString())
+ .id(jwt.getClaim("uid").asString())
+ .username(jwt.getClaim("preferred_username").asString())
.authorities(Arrays.stream(realmAccess.getRoles()).map(SimpleGrantedAuthority::new).collect(Collectors.toList()))
.build();
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/auth/BasicAuthenticationProvider.java b/dbrepo-data-service/services/src/main/java/at/tuwien/auth/BasicAuthenticationProvider.java
index 805035d42171ba59b997639d26f8104129628a74..80fdd15f1daff7625508eb8d46d9b54332a5150f 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/auth/BasicAuthenticationProvider.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/auth/BasicAuthenticationProvider.java
@@ -1,60 +1,40 @@
package at.tuwien.auth;
import at.tuwien.api.keycloak.TokenDto;
-import at.tuwien.api.user.UserDetailsDto;
-import at.tuwien.config.GatewayConfig;
-import at.tuwien.exception.RemoteUnavailableException;
-import at.tuwien.exception.ServiceConnectionException;
-import at.tuwien.exception.ServiceException;
+import at.tuwien.exception.*;
import at.tuwien.gateway.KeycloakGateway;
import jakarta.servlet.ServletException;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.stereotype.Component;
-import java.util.List;
-
@Log4j2
@Component
public class BasicAuthenticationProvider implements AuthenticationManager {
- private final GatewayConfig gatewayConfig;
private final AuthTokenFilter authTokenFilter;
private final KeycloakGateway keycloakGateway;
@Autowired
- public BasicAuthenticationProvider(GatewayConfig gatewayConfig, AuthTokenFilter authTokenFilter,
- KeycloakGateway keycloakGateway) {
- this.gatewayConfig = gatewayConfig;
+ public BasicAuthenticationProvider(AuthTokenFilter authTokenFilter, KeycloakGateway keycloakGateway) {
this.authTokenFilter = authTokenFilter;
this.keycloakGateway = keycloakGateway;
}
@Override
public Authentication authenticate(Authentication auth) throws AuthenticationException {
- if (auth.getName().equals(gatewayConfig.getAdminUsername())
- && auth.getCredentials().toString().equals(gatewayConfig.getAdminPassword())) {
- log.trace("current user is {}: skip authentication", gatewayConfig.getAdminUsername());
- final UserDetails userDetails = UserDetailsDto.builder()
- .username(auth.getName())
- .authorities(List.of(new SimpleGrantedAuthority("admin")))
- .build();
- return new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
- }
- log.trace("current user is {}: begin authentication", auth.getName());
try {
final TokenDto tokenDto = keycloakGateway.obtainUserToken(auth.getName(), auth.getCredentials().toString());
final UserDetails userDetails = authTokenFilter.verifyJwt(tokenDto.getAccessToken());
return new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
- } catch (ServletException | RemoteUnavailableException | ServiceException e) {
+ } catch (ServletException | CredentialsInvalidException | AccountNotSetupException |
+ AuthServiceConnectionException e) {
throw new BadCredentialsException("Failed to authenticate with authentication service", e);
}
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/auth/InternalRequestInterceptor.java b/dbrepo-data-service/services/src/main/java/at/tuwien/auth/InternalRequestInterceptor.java
new file mode 100644
index 0000000000000000000000000000000000000000..20955bcdb36912e3f8dd4ed695a4e688f1177ccf
--- /dev/null
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/auth/InternalRequestInterceptor.java
@@ -0,0 +1,45 @@
+package at.tuwien.auth;
+
+import at.tuwien.api.keycloak.TokenDto;
+import at.tuwien.config.GatewayConfig;
+import at.tuwien.exception.*;
+import at.tuwien.gateway.KeycloakGateway;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpRequest;
+import org.springframework.http.MediaType;
+import org.springframework.http.client.ClientHttpRequestExecution;
+import org.springframework.http.client.ClientHttpRequestInterceptor;
+import org.springframework.http.client.ClientHttpResponse;
+
+import java.io.IOException;
+import java.util.List;
+
+@Log4j2
+public class InternalRequestInterceptor implements ClientHttpRequestInterceptor {
+
+ private final GatewayConfig gatewayConfig;
+ private final KeycloakGateway keycloakGateway;
+
+ public InternalRequestInterceptor(GatewayConfig gatewayConfig, KeycloakGateway keycloakGateway) {
+ this.gatewayConfig = gatewayConfig;
+ this.keycloakGateway = keycloakGateway;
+ }
+
+ @Override
+ public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
+ throws IOException {
+ final HttpHeaders headers = request.getHeaders();
+ headers.setAccept(List.of(MediaType.APPLICATION_JSON));
+ try {
+ final TokenDto token = keycloakGateway.obtainUserToken(gatewayConfig.getSystemUsername(),
+ gatewayConfig.getSystemPassword());
+ headers.setBearerAuth(token.getAccessToken());
+ log.trace("set bearer token for internal user: {}", gatewayConfig.getSystemUsername());
+ } catch (AuthServiceConnectionException | CredentialsInvalidException | AccountNotSetupException e) {
+ log.error("Failed to obtain token for internal user: {}", gatewayConfig.getSystemUsername());
+ throw new IOException("Failed to obtain token for internal user", e);
+ }
+ return execution.execute(request, body);
+ }
+}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/config/GatewayConfig.java b/dbrepo-data-service/services/src/main/java/at/tuwien/config/GatewayConfig.java
index b04aff18ce5a49d68c01519a97b3550b14bddc6e..6ebd6744576fd034db2faf569ffb764e43d9c7f8 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/config/GatewayConfig.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/config/GatewayConfig.java
@@ -1,19 +1,16 @@
package at.tuwien.config;
+import at.tuwien.auth.InternalRequestInterceptor;
+import at.tuwien.gateway.KeycloakGateway;
import lombok.Getter;
import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.client.ClientHttpRequestInterceptor;
-import org.springframework.http.client.support.BasicAuthenticationInterceptor;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.DefaultUriBuilderFactory;
-import java.util.List;
-
@Log4j2
@Getter
@Configuration
@@ -22,30 +19,26 @@ public class GatewayConfig {
@Value("${dbrepo.endpoints.metadataService}")
private String metadataEndpoint;
- @Value("${dbrepo.admin.username}")
- private String adminUsername;
+ @Value("${dbrepo.system.username}")
+ private String systemUsername;
+
+ @Value("${dbrepo.system.password}")
+ private String systemPassword;
- @Value("${dbrepo.admin.password}")
- private String adminPassword;
+ private final KeycloakGateway keycloakGateway;
+
+ @Autowired
+ public GatewayConfig(KeycloakGateway keycloakGateway) {
+ this.keycloakGateway = keycloakGateway;
+ }
@Bean
public RestTemplate restTemplate() {
final RestTemplate restTemplate = new RestTemplate();
restTemplate.setUriTemplateHandler(new DefaultUriBuilderFactory(metadataEndpoint));
- log.debug("add basic authentication for metadata service: username={}, password=(hidden)", adminUsername);
restTemplate.getInterceptors()
- .addAll(List.of(new BasicAuthenticationInterceptor(adminUsername, adminPassword),
- clientHttpRequestInterceptor()));
+ .add(new InternalRequestInterceptor(this, keycloakGateway));
return restTemplate;
}
- @Bean
- public ClientHttpRequestInterceptor clientHttpRequestInterceptor() {
- return (request, body, execution) -> {
- final HttpHeaders headers = request.getHeaders();
- headers.setAccept(List.of(MediaType.APPLICATION_JSON));
- return execution.execute(request, body);
- };
- }
-
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/config/JacksonConfig.java b/dbrepo-data-service/services/src/main/java/at/tuwien/config/JacksonConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..d6a30b52508a71c5ff9f3ad33b7e90f8846caa90
--- /dev/null
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/config/JacksonConfig.java
@@ -0,0 +1,29 @@
+package at.tuwien.config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.hibernate6.Hibernate6Module;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.TimeZone;
+
+@Slf4j
+@Configuration
+public class JacksonConfig {
+
+ @Bean
+ public ObjectMapper objectMapper() {
+ final ObjectMapper objectMapper = new ObjectMapper();
+ objectMapper.registerModule(new Jdk8Module());
+ objectMapper.registerModule(new JavaTimeModule());
+ objectMapper.registerModule(new Hibernate6Module()); /* lazy load mapping on REST endpoints */
+ objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+ objectMapper.setTimeZone(TimeZone.getTimeZone("UTC"));
+ return objectMapper;
+ }
+
+}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/config/KeycloakConfig.java b/dbrepo-data-service/services/src/main/java/at/tuwien/config/KeycloakConfig.java
index 4d258d496aa6ebe825ac2d84a1f00a1b4f9c0298..e0d7d0321513387f1e1c9c235c1c4b51e309be1d 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/config/KeycloakConfig.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/config/KeycloakConfig.java
@@ -2,16 +2,12 @@ package at.tuwien.config;
import at.tuwien.interceptor.KeycloakInterceptor;
import lombok.Getter;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.http.client.ClientHttpRequestInterceptor;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.DefaultUriBuilderFactory;
-import java.util.List;
-
@Getter
@Configuration
public class KeycloakConfig {
@@ -31,20 +27,12 @@ public class KeycloakConfig {
@Value("${dbrepo.keycloak.clientSecret}")
private String keycloakClientSecret;
- private final ClientHttpRequestInterceptor clientHttpRequestInterceptor;
-
- @Autowired
- public KeycloakConfig(ClientHttpRequestInterceptor clientHttpRequestInterceptor) {
- this.clientHttpRequestInterceptor = clientHttpRequestInterceptor;
- }
-
@Bean("keycloakRestTemplate")
public RestTemplate brokerRestTemplate() {
final RestTemplate restTemplate = new RestTemplate();
restTemplate.setUriTemplateHandler(new DefaultUriBuilderFactory(keycloakEndpoint));
restTemplate.getInterceptors()
- .addAll(List.of(new KeycloakInterceptor(keycloakUsername, keycloakPassword, keycloakEndpoint),
- clientHttpRequestInterceptor));
+ .add(new KeycloakInterceptor(keycloakUsername, keycloakPassword, keycloakEndpoint));
return restTemplate;
}
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/config/RabbitConfig.java b/dbrepo-data-service/services/src/main/java/at/tuwien/config/RabbitConfig.java
index 8d2ef4bbe9f92d6e0cf374c8af8277c14d6af7bc..3cdff97a17aaf48bb5fa69507bcfdc2895e7e0fd 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/config/RabbitConfig.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/config/RabbitConfig.java
@@ -1,5 +1,6 @@
package at.tuwien.config;
+import at.tuwien.listener.DefaultListener;
import lombok.Getter;
import lombok.extern.log4j.Log4j2;
import org.springframework.amqp.core.AcknowledgeMode;
@@ -7,6 +8,8 @@ import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFacto
import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
import org.springframework.amqp.rabbit.connection.ConnectionFactory;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
+import org.springframework.amqp.rabbit.listener.adapter.MessageListenerAdapter;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -53,34 +56,25 @@ public class RabbitConfig {
private Integer connectionTimeout;
@Bean
- public SimpleRabbitListenerContainerFactory getSimpleRabbitListenerContainerFactory() {
- log.debug("container factory settings: concurrentConsumers={}, maxConcurrentConsumers={}, acknowledgeMode={}, requeueRejected={}",
- minConcurrent, maxConcurrent, AcknowledgeMode.AUTO, requeueRejected);
- final SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory();
- factory.setConnectionFactory(getConnectionFactory());
- factory.setConcurrentConsumers(minConcurrent);
- factory.setMaxConcurrentConsumers(maxConcurrent);
- factory.setConsecutiveActiveTrigger(1);
- factory.setAcknowledgeMode(AcknowledgeMode.AUTO);
- factory.setDefaultRequeueRejected(requeueRejected);
- return factory;
+ public SimpleMessageListenerContainer container(ConnectionFactory connectionFactory,
+ MessageListenerAdapter listenerAdapter) {
+ SimpleMessageListenerContainer container = new SimpleMessageListenerContainer();
+ container.setConnectionFactory(connectionFactory);
+ container.setQueueNames(queueName);
+ container.setMessageListener(listenerAdapter);
+ container.setConcurrentConsumers(minConcurrent);
+ container.setMaxConcurrentConsumers(maxConcurrent);
+ return container;
}
@Bean
- public ConnectionFactory getConnectionFactory() {
- log.debug("rabbitmq endpoint: amqp://{}:{}/{}", host, port, virtualHost);
- final CachingConnectionFactory factory = new CachingConnectionFactory();
- factory.setAddresses(host);
- factory.setPort(port);
- factory.setUsername(username);
- factory.setPassword(password);
- factory.setVirtualHost(virtualHost);
- return factory;
+ public MessageListenerAdapter listenerAdapter(DefaultListener listener) {
+ return new MessageListenerAdapter(listener, "onMessage");
}
@Bean
- public RabbitTemplate rabbitTemplate() {
- return new RabbitTemplate(getConnectionFactory());
+ public RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory) {
+ return new RabbitTemplate(connectionFactory);
}
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/config/S3Config.java b/dbrepo-data-service/services/src/main/java/at/tuwien/config/S3Config.java
index 8adaf38d19ba81ae61a54a57988dd1c08910a09b..10630c717fe153f230703d045b6a2bda63706b6a 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/config/S3Config.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/config/S3Config.java
@@ -27,11 +27,8 @@ public class S3Config {
@Value("${dbrepo.s3.secretAccessKey}")
private String s3SecretAccessKey;
- @Value("${dbrepo.s3.importBucket}")
- private String s3ImportBucket;
-
- @Value("${dbrepo.s3.exportBucket}")
- private String s3ExportBucket;
+ @Value("${dbrepo.s3.bucket}")
+ private String s3Bucket;
@Value("${dbrepo.s3.filePath}")
private String s3FilePath;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java b/dbrepo-data-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java
index 5bb4b2e9705f36d0e4168f5688ac42ca13de8882..1560c14b7aaa6272c76515a734a1ad99f7075222 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java
@@ -43,8 +43,8 @@ public class WebSecurityConfig {
}
@Bean
- public SecurityFilterChain filterChain(HttpSecurity http, KeycloakGateway keycloakGateway,
- GatewayConfig gatewayConfig) throws Exception {
+ public SecurityFilterChain filterChain(HttpSecurity http, KeycloakGateway keycloakGateway)
+ throws Exception {
final OrRequestMatcher internalEndpoints = new OrRequestMatcher(
new AntPathRequestMatcher("/actuator/**", "GET"),
new AntPathRequestMatcher("/v3/api-docs.yaml"),
@@ -85,8 +85,8 @@ public class WebSecurityConfig {
http.addFilterBefore(authTokenFilter(),
UsernamePasswordAuthenticationFilter.class
);
- http.addFilterBefore(new BasicAuthenticationFilter(new BasicAuthenticationProvider(gatewayConfig,
- authTokenFilter(), keycloakGateway)),
+ http.addFilterBefore(new BasicAuthenticationFilter(new BasicAuthenticationProvider(authTokenFilter(),
+ keycloakGateway)),
UsernamePasswordAuthenticationFilter.class
);
return http.build();
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/ContainerNotFoundException.java b/dbrepo-data-service/services/src/main/java/at/tuwien/exception/ContainerNotFoundException.java
deleted file mode 100644
index 8d3b2b2243f220da74d0635ce24ec43a3583e03f..0000000000000000000000000000000000000000
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/ContainerNotFoundException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package at.tuwien.exception;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-@ResponseStatus(code = HttpStatus.NOT_FOUND, reason = "error.container.missing")
-public class ContainerNotFoundException extends Exception {
-
- public ContainerNotFoundException(String message) {
- super(message);
- }
-
- public ContainerNotFoundException(String message, Throwable thr) {
- super(message, thr);
- }
-
- public ContainerNotFoundException(Throwable thr) {
- super(thr);
- }
-
-}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/DatabaseNotFoundException.java b/dbrepo-data-service/services/src/main/java/at/tuwien/exception/DatabaseNotFoundException.java
deleted file mode 100644
index ff4ce77cf2b00c229f0b5ccec991efbcb81b3d1c..0000000000000000000000000000000000000000
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/DatabaseNotFoundException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package at.tuwien.exception;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-@ResponseStatus(code = HttpStatus.NOT_FOUND, reason = "error.database.missing")
-public class DatabaseNotFoundException extends Exception {
-
- public DatabaseNotFoundException(String message) {
- super(message);
- }
-
- public DatabaseNotFoundException(String message, Throwable thr) {
- super(message, thr);
- }
-
- public DatabaseNotFoundException(Throwable thr) {
- super(thr);
- }
-
-}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/FormatNotAvailableException.java b/dbrepo-data-service/services/src/main/java/at/tuwien/exception/FormatNotAvailableException.java
deleted file mode 100644
index d46b7b2baaee08ddbec3bb3682e9f9b640498e85..0000000000000000000000000000000000000000
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/FormatNotAvailableException.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package at.tuwien.exception;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import java.io.IOException;
-
-@ResponseStatus(code = HttpStatus.NOT_ACCEPTABLE, reason = "error.subset.format")
-public class FormatNotAvailableException extends IOException {
-
- public FormatNotAvailableException(String msg) {
- super(msg);
- }
-
- public FormatNotAvailableException(String msg, Throwable thr) {
- super(msg + ": " + thr.getLocalizedMessage(), thr);
- }
-
- public FormatNotAvailableException(Throwable thr) {
- super(thr);
- }
-
-}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/NotAllowedException.java b/dbrepo-data-service/services/src/main/java/at/tuwien/exception/NotAllowedException.java
deleted file mode 100644
index 33b2f7f9e3daa933c35bb947332fd30c30c94c82..0000000000000000000000000000000000000000
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/NotAllowedException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package at.tuwien.exception;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-@ResponseStatus(code = HttpStatus.FORBIDDEN, reason = "error.request.forbidden")
-public class NotAllowedException extends Exception {
-
- public NotAllowedException(String message) {
- super(message);
- }
-
- public NotAllowedException(String message, Throwable thr) {
- super(message, thr);
- }
-
- public NotAllowedException(Throwable thr) {
- super(thr);
- }
-
-}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/PaginationException.java b/dbrepo-data-service/services/src/main/java/at/tuwien/exception/PaginationException.java
deleted file mode 100644
index 53446bdb646dabd621510fe543380a936b3d290d..0000000000000000000000000000000000000000
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/PaginationException.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package at.tuwien.exception;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-@ResponseStatus(code = HttpStatus.BAD_REQUEST, reason = "error.pagination.malformed")
-public class PaginationException extends Exception {
-
- public PaginationException(String msg) {
- super(msg);
- }
-
- public PaginationException(String msg, Throwable thr) {
- super(msg + ": " + thr.getLocalizedMessage(), thr);
- }
-
- public PaginationException(Throwable thr) {
- super(thr);
- }
-
-}
-
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/QueryNotFoundException.java b/dbrepo-data-service/services/src/main/java/at/tuwien/exception/QueryNotFoundException.java
deleted file mode 100644
index d55be584cf25a3acdc403617971fe08baee82721..0000000000000000000000000000000000000000
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/QueryNotFoundException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package at.tuwien.exception;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-@ResponseStatus(code = HttpStatus.NOT_FOUND, reason = "error.query.missing")
-public class QueryNotFoundException extends Exception {
-
- public QueryNotFoundException(String message) {
- super(message);
- }
-
- public QueryNotFoundException(String message, Throwable thr) {
- super(message, thr);
- }
-
- public QueryNotFoundException(Throwable thr) {
- super(thr);
- }
-
-}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/StorageNotFoundException.java b/dbrepo-data-service/services/src/main/java/at/tuwien/exception/StorageNotFoundException.java
deleted file mode 100644
index bbb780ea919d33c64c34f719f99c5ed30eae326a..0000000000000000000000000000000000000000
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/StorageNotFoundException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package at.tuwien.exception;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-@ResponseStatus(code = HttpStatus.NOT_FOUND, reason = "error.storage.missing")
-public class StorageNotFoundException extends Exception {
-
- public StorageNotFoundException(String message) {
- super(message);
- }
-
- public StorageNotFoundException(String message, Throwable thr) {
- super(message, thr);
- }
-
- public StorageNotFoundException(Throwable thr) {
- super(thr);
- }
-
-}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/TableExistsException.java b/dbrepo-data-service/services/src/main/java/at/tuwien/exception/TableExistsException.java
deleted file mode 100644
index fdc23ad7d3a254ed02cbefd49ba733aac3e277bd..0000000000000000000000000000000000000000
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/TableExistsException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package at.tuwien.exception;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-@ResponseStatus(code = HttpStatus.CONFLICT, reason = "error.table.exists")
-public class TableExistsException extends Exception {
-
- public TableExistsException(String message) {
- super(message);
- }
-
- public TableExistsException(String message, Throwable thr) {
- super(message, thr);
- }
-
- public TableExistsException(Throwable thr) {
- super(thr);
- }
-
-}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/TableNotFoundException.java b/dbrepo-data-service/services/src/main/java/at/tuwien/exception/TableNotFoundException.java
deleted file mode 100644
index 199ce9c74cc0ba8f37b2ad55eb86cd2c6877a2ab..0000000000000000000000000000000000000000
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/TableNotFoundException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package at.tuwien.exception;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-@ResponseStatus(code = HttpStatus.NOT_FOUND, reason = "error.table.missing")
-public class TableNotFoundException extends Exception {
-
- public TableNotFoundException(String message) {
- super(message);
- }
-
- public TableNotFoundException(String message, Throwable thr) {
- super(message, thr);
- }
-
- public TableNotFoundException(Throwable thr) {
- super(thr);
- }
-
-}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/UserNotFoundException.java b/dbrepo-data-service/services/src/main/java/at/tuwien/exception/UserNotFoundException.java
deleted file mode 100644
index 5aeabab27de7abf68f88df1346019e398dc921e6..0000000000000000000000000000000000000000
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/UserNotFoundException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package at.tuwien.exception;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-@ResponseStatus(code = HttpStatus.NOT_FOUND, reason = "error.user.missing")
-public class UserNotFoundException extends Exception {
-
- public UserNotFoundException(String message) {
- super(message);
- }
-
- public UserNotFoundException(String message, Throwable thr) {
- super(message, thr);
- }
-
- public UserNotFoundException(Throwable thr) {
- super(thr);
- }
-
-}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/ViewNotFoundException.java b/dbrepo-data-service/services/src/main/java/at/tuwien/exception/ViewNotFoundException.java
deleted file mode 100644
index 7ba64c5e8fc0ddb90c5845d483105c849ac4bd78..0000000000000000000000000000000000000000
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/ViewNotFoundException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package at.tuwien.exception;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-@ResponseStatus(code = HttpStatus.NOT_FOUND, reason = "error.view.missing")
-public class ViewNotFoundException extends Exception {
-
- public ViewNotFoundException(String message) {
- super(message);
- }
-
- public ViewNotFoundException(String message, Throwable thr) {
- super(message, thr);
- }
-
- public ViewNotFoundException(Throwable thr) {
- super(thr);
- }
-
-}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/DataDatabaseSidecarGateway.java b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/DataDatabaseSidecarGateway.java
index ecac6865f6e4704b915e10016afe8a5b25afaa63..23dc08a55d366f6560bcbaafbf6c79a94dfc2af3 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/DataDatabaseSidecarGateway.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/DataDatabaseSidecarGateway.java
@@ -3,9 +3,28 @@ package at.tuwien.gateway;
import at.tuwien.exception.*;
public interface DataDatabaseSidecarGateway {
+
+ /**
+ * Imports a given dataset name into the given database.
+ * @param hostname The database hostname.
+ * @param port The database port.
+ * @param filename The dataset name.
+ * @throws StorageNotFoundException The dataset name was not found in the storage service.
+ * @throws RemoteUnavailableException Connection to the sidecar could not be established.
+ * @throws SidecarImportException The sidecar failed to import the dataset.
+ */
void importFile(String hostname, Integer port, String filename) throws StorageNotFoundException,
- RemoteUnavailableException, ServiceException;
+ RemoteUnavailableException, SidecarImportException;
+ /**
+ * Exports a given dataset name from the given database.
+ * @param hostname The database hostname.
+ * @param port The database port.
+ * @param filename The dataset name.
+ * @throws StorageNotFoundException The dataset name was not found in the storage service.
+ * @throws RemoteUnavailableException Connection to the sidecar could not be established.
+ * @throws SidecarExportException The sidecar failed to export the dataset.
+ */
void exportFile(String hostname, Integer port, String filename) throws StorageNotFoundException,
- ServiceException, RemoteUnavailableException;
+ SidecarExportException, RemoteUnavailableException;
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
index 1058119a25c8b5de2affbc05b72cd9417c7887a7..9e6a5f56bda37fc1b3d9af9fca8158a5fcce27f7 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
@@ -1,14 +1,13 @@
package at.tuwien.gateway;
import at.tuwien.api.keycloak.TokenDto;
-import at.tuwien.exception.RemoteUnavailableException;
-import at.tuwien.exception.ServiceConnectionException;
-import at.tuwien.exception.ServiceException;
-
-import javax.naming.ServiceUnavailableException;
+import at.tuwien.exception.AccountNotSetupException;
+import at.tuwien.exception.AuthServiceConnectionException;
+import at.tuwien.exception.CredentialsInvalidException;
public interface KeycloakGateway {
- TokenDto obtainUserToken(String username, String password) throws RemoteUnavailableException, ServiceException;
+ TokenDto obtainUserToken(String username, String password) throws AuthServiceConnectionException,
+ CredentialsInvalidException, AccountNotSetupException;
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/MetadataServiceGateway.java b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/MetadataServiceGateway.java
index 4c01a40a447954ae666bf7ef9d330b5879b85e59..d16c8c8eba81efd22a64757a6dd1eb51dc56318f 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/MetadataServiceGateway.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/MetadataServiceGateway.java
@@ -24,10 +24,10 @@ public interface MetadataServiceGateway {
* @return The container with privileged connection information, if successful.
* @throws ContainerNotFoundException The table was not found in the metadata service.
* @throws RemoteUnavailableException The remote service is not available.
- * @throws ServiceException The remote service returned invalid data.
+ * @throws MetadataServiceException The remote service returned invalid data.
*/
PrivilegedContainerDto getContainerById(Long containerId) throws RemoteUnavailableException,
- ContainerNotFoundException, ServiceException;
+ ContainerNotFoundException, MetadataServiceException;
/**
* Get a database with given id from the metadata service.
@@ -36,10 +36,10 @@ public interface MetadataServiceGateway {
* @return The database, if successful.
* @throws DatabaseNotFoundException The database was not found in the metadata service.
* @throws RemoteUnavailableException The remote service is not available.
- * @throws ServiceException The remote service returned invalid data.
+ * @throws MetadataServiceException The remote service returned invalid data.
*/
PrivilegedDatabaseDto getDatabaseById(Long id) throws DatabaseNotFoundException, RemoteUnavailableException,
- ServiceException;
+ MetadataServiceException;
/**
* Get a database with given internal name from the metadata service.
@@ -48,10 +48,10 @@ public interface MetadataServiceGateway {
* @return The database, if successful.
* @throws DatabaseNotFoundException The database was not found in the metadata service.
* @throws RemoteUnavailableException The remote service is not available.
- * @throws ServiceException The remote service returned invalid data.
+ * @throws MetadataServiceException The remote service returned invalid data.
*/
PrivilegedDatabaseDto getDatabaseByInternalName(String internalName) throws DatabaseNotFoundException,
- RemoteUnavailableException, ServiceException;
+ RemoteUnavailableException, MetadataServiceException;
/**
* Get a table with given database id and table id from the metadata service.
@@ -61,10 +61,10 @@ public interface MetadataServiceGateway {
* @return The table, if successful.
* @throws TableNotFoundException The table was not found in the metadata service.
* @throws RemoteUnavailableException The remote service is not available.
- * @throws ServiceException The remote service returned invalid data.
+ * @throws MetadataServiceException The remote service returned invalid data.
*/
PrivilegedTableDto getTableById(Long databaseId, Long id) throws TableNotFoundException, RemoteUnavailableException,
- ServiceException;
+ MetadataServiceException;
/**
* Get a view with given database id and view id from the metadata service.
@@ -73,10 +73,10 @@ public interface MetadataServiceGateway {
* @return The view, if successful.
* @throws ViewNotFoundException The view was not found in the metadata service.
* @throws RemoteUnavailableException The remote service is not available.
- * @throws ServiceException The remote service returned invalid data.
+ * @throws MetadataServiceException The remote service returned invalid data.
*/
PrivilegedViewDto getViewById(Long databaseId, Long id) throws RemoteUnavailableException, ViewNotFoundException,
- ServiceException;
+ MetadataServiceException;
/**
* Get a user with given user id from the metadata service.
@@ -85,9 +85,9 @@ public interface MetadataServiceGateway {
* @return The user, if successful.
* @throws RemoteUnavailableException The remote service is not available and invalid data was returned.
* @throws UserNotFoundException The user was not found in the metadata service.
- * @throws ServiceException The remote service returned invalid data.
+ * @throws MetadataServiceException The remote service returned invalid data.
*/
- UserDto getUserById(UUID userId) throws RemoteUnavailableException, UserNotFoundException, ServiceException;
+ UserDto getUserById(UUID userId) throws RemoteUnavailableException, UserNotFoundException, MetadataServiceException;
/**
* Get a user with given user id from the metadata service.
@@ -96,10 +96,10 @@ public interface MetadataServiceGateway {
* @return The user, if successful.
* @throws RemoteUnavailableException The remote service is not available and invalid data was returned.
* @throws UserNotFoundException The user was not found in the metadata service.
- * @throws ServiceException The remote service returned invalid data.
+ * @throws MetadataServiceException The remote service returned invalid data.
*/
PrivilegedUserDto getPrivilegedUserById(UUID userId) throws RemoteUnavailableException, UserNotFoundException,
- ServiceException;
+ MetadataServiceException;
/**
* Get database access for a given user and database id from the metadata service.
@@ -108,10 +108,10 @@ public interface MetadataServiceGateway {
* @return The database access, if successful.
* @throws RemoteUnavailableException The remote service is not available and invalid data was returned.
* @throws NotAllowedException The access to this database is denied for the given user.
- * @throws ServiceException The remote service returned invalid data.
+ * @throws MetadataServiceException The remote service returned invalid data.
*/
DatabaseAccessDto getAccess(Long databaseId, UUID userId) throws RemoteUnavailableException, NotAllowedException,
- ServiceException;
+ MetadataServiceException;
/**
* Get a list of identifiers for a given database id and optional subset id.
@@ -120,9 +120,9 @@ public interface MetadataServiceGateway {
* @return The list of identifiers.
* @throws RemoteUnavailableException The remote service is not available and invalid data was returned.
* @throws DatabaseNotFoundException The database was not found.
- * @throws ServiceException The remote service returned invalid data.
+ * @throws MetadataServiceException The remote service returned invalid data.
*/
- List<IdentifierDto> getIdentifiers(@NotNull Long databaseId, Long subsetId) throws ServiceException,
+ List<IdentifierDto> getIdentifiers(@NotNull Long databaseId, Long subsetId) throws MetadataServiceException,
RemoteUnavailableException, DatabaseNotFoundException;
/**
@@ -131,7 +131,7 @@ public interface MetadataServiceGateway {
* @param tableId The table id.
* @throws RemoteUnavailableException The remote service is not available and invalid data was returned.
* @throws TableNotFoundException The table was not found.
- * @throws ServiceException The remote service returned invalid data.
+ * @throws MetadataServiceException The remote service returned invalid data.
*/
- void updateTableStatistics(Long databaseId, Long tableId) throws TableNotFoundException, ServiceException, RemoteUnavailableException;
+ void updateTableStatistics(Long databaseId, Long tableId) throws TableNotFoundException, MetadataServiceException, RemoteUnavailableException;
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/DataDatabaseSidecarGatewayImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/DataDatabaseSidecarGatewayImpl.java
index b3e7c3bd41545e07b344406d00b29e9daecd0aab..841aace47460c99a09a5d1cff0a26cf03bed1ce9 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/DataDatabaseSidecarGatewayImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/DataDatabaseSidecarGatewayImpl.java
@@ -24,13 +24,13 @@ public class DataDatabaseSidecarGatewayImpl implements DataDatabaseSidecarGatewa
@Override
public void importFile(String hostname, Integer port, String filename) throws StorageNotFoundException,
- RemoteUnavailableException, ServiceException {
+ RemoteUnavailableException, SidecarImportException {
final ResponseEntity<Void> response;
final String url = "http://" + hostname + ":" + port + "/sidecar/import/" + filename;
log.debug("import file into data database sidecar");
try {
response = restTemplate.exchange(url, HttpMethod.POST, new HttpEntity<>(null), Void.class);
- } catch (ResourceAccessException | HttpServerErrorException e) {
+ } catch (HttpServerErrorException e) {
log.error("Failed to import dataset with filename: {}: {}", filename, e.getMessage());
throw new RemoteUnavailableException("Failed to import dataset: " + e.getMessage(), e);
} catch (HttpClientErrorException.BadRequest e) {
@@ -39,19 +39,19 @@ public class DataDatabaseSidecarGatewayImpl implements DataDatabaseSidecarGatewa
}
if (!response.getStatusCode().equals(HttpStatus.ACCEPTED)) {
log.error("Failed to import dataset with filename: {}: service responded unsuccessful: {}", filename, response.getStatusCode());
- throw new ServiceException("Failed to import dataset: service responded unsuccessful: " + response.getStatusCode());
+ throw new SidecarImportException("Failed to import dataset: service responded unsuccessful: " + response.getStatusCode());
}
}
@Override
public void exportFile(String hostname, Integer port, String filename) throws StorageNotFoundException,
- RemoteUnavailableException, ServiceException {
+ RemoteUnavailableException, SidecarExportException {
final ResponseEntity<Void> response;
final String url = "http://" + hostname + ":" + port + "/sidecar/export/" + filename;
log.debug("export file from data database sidecar: {}", url);
try {
response = restTemplate.exchange(url, HttpMethod.POST, new HttpEntity<>(null), Void.class);
- } catch (ResourceAccessException | HttpServerErrorException e) {
+ } catch (HttpServerErrorException e) {
log.error("Failed to export dataset with filename: {}: {}", filename, e.getMessage());
throw new RemoteUnavailableException("Failed to export dataset: " + e.getMessage(), e);
} catch (HttpClientErrorException.BadRequest e) {
@@ -60,7 +60,7 @@ public class DataDatabaseSidecarGatewayImpl implements DataDatabaseSidecarGatewa
}
if (!response.getStatusCode().equals(HttpStatus.ACCEPTED)) {
log.error("Failed to export dataset with filename: {}: service responded unsuccessful: {}", filename, response.getStatusCode());
- throw new ServiceException("Failed to export dataset: service responded unsuccessful: " + response.getStatusCode());
+ throw new SidecarExportException("Failed to export dataset: service responded unsuccessful: " + response.getStatusCode());
}
}
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java
index 545e259097951b3ed79d34c73bef72ccd2270b6b..6e233395d92ae03785ba820055cb7d421cfc7b38 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java
@@ -1,61 +1,77 @@
package at.tuwien.gateway.impl;
+import at.tuwien.api.auth.KeycloakErrorDto;
import at.tuwien.api.keycloak.TokenDto;
import at.tuwien.config.KeycloakConfig;
-import at.tuwien.exception.RemoteUnavailableException;
-import at.tuwien.exception.ServiceConnectionException;
-import at.tuwien.exception.ServiceException;
+import at.tuwien.exception.*;
import at.tuwien.gateway.KeycloakGateway;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.http.*;
import org.springframework.stereotype.Service;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.HttpServerErrorException;
-import org.springframework.web.client.ResourceAccessException;
import org.springframework.web.client.RestTemplate;
@Log4j2
@Service
public class KeycloakGatewayImpl implements KeycloakGateway {
- private final RestTemplate restTemplate;
private final KeycloakConfig keycloakConfig;
@Autowired
- public KeycloakGatewayImpl(RestTemplate restTemplate, KeycloakConfig keycloakConfig) {
- this.restTemplate = restTemplate;
+ public KeycloakGatewayImpl(KeycloakConfig keycloakConfig) {
this.keycloakConfig = keycloakConfig;
}
@Override
- public TokenDto obtainUserToken(String username, String password) throws RemoteUnavailableException, ServiceException {
+ public TokenDto obtainUserToken(String username, String password) throws AuthServiceConnectionException,
+ CredentialsInvalidException, AccountNotSetupException {
final HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
final MultiValueMap<String, String> payload = new LinkedMultiValueMap<>();
payload.add("username", username);
payload.add("password", password);
payload.add("grant_type", "password");
- payload.add("scope", "openid roles attributes");
+ payload.add("scope", "openid roles");
payload.add("client_id", keycloakConfig.getKeycloakClient());
payload.add("client_secret", keycloakConfig.getKeycloakClientSecret());
final String url = keycloakConfig.getKeycloakEndpoint() + "/realms/dbrepo/protocol/openid-connect/token";
- log.debug("request user token from url {}", url);
+ log.trace("request user token from url: {}", url);
+ log.trace("request username: {}", username);
+ if (password.isEmpty() || password.isBlank()) {
+ log.warn("request password: (empty)");
+ } else {
+ log.trace("request password: (set)");
+ }
+ log.trace("request client_id: {}", keycloakConfig.getKeycloakClient());
+ if (keycloakConfig.getKeycloakClientSecret().isEmpty() || keycloakConfig.getKeycloakClientSecret().isBlank()) {
+ log.warn("request client_secret: (empty)");
+ } else {
+ log.trace("request client_secret: (set)");
+ }
final ResponseEntity<TokenDto> response;
try {
- response = restTemplate.exchange(url, HttpMethod.POST, new HttpEntity<>(payload, headers), TokenDto.class);
+ response = new RestTemplate()
+ .exchange(url, HttpMethod.POST, new HttpEntity<>(payload, headers), TokenDto.class);
} catch (HttpServerErrorException e) {
log.error("Failed to obtain user token: {}", e.getMessage());
- throw new RemoteUnavailableException("Failed to obtain user token: " + e.getMessage(), e);
- } catch (Exception e) {
- log.error("Failed to obtain user token: unexpected response: {}", e.getMessage(), e);
- throw new ServiceException("Failed to obtain user token: unexpected response: " + e.getMessage(), e);
- }
- if (!response.getStatusCode().equals(HttpStatus.OK)) {
- log.error("Failed to obtain user token: service responded unsuccessful: {}", response.getStatusCode());
- throw new ServiceException("obtain user token: service responded unsuccessful: " + response.getStatusCode());
+ throw new AuthServiceConnectionException("Service unavailable", e);
+ } catch (HttpClientErrorException.BadRequest e) {
+ if (e.getResponseBodyAsByteArray() != null && e.getResponseBodyAsByteArray().length > 0) {
+ final KeycloakErrorDto error = e.getResponseBodyAs(KeycloakErrorDto.class);
+ if (error != null && error.getError().equals("invalid_grant")) {
+ log.error("Failed to obtain user token: {}", error.getErrorDescription());
+ throw new AccountNotSetupException(error.getErrorDescription());
+ }
+ }
+ log.error("Failed to obtain user token: bad request");
+ throw new CredentialsInvalidException("Bad request", e);
+ } catch (HttpClientErrorException.Unauthorized e) {
+ log.error("Failed to obtain user token: invalid credentials");
+ throw new CredentialsInvalidException("Invalid credentials", e);
}
return response.getBody();
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/MetadataServiceGatewayImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/MetadataServiceGatewayImpl.java
index 1fcf3e50ee3df4487eae8492867aa4952413c699..06641b738b91c4798e9a57b26eb011fbc6c3c4cd 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/MetadataServiceGatewayImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/MetadataServiceGatewayImpl.java
@@ -46,7 +46,7 @@ public class MetadataServiceGatewayImpl implements MetadataServiceGateway {
@Override
public PrivilegedContainerDto getContainerById(Long containerId) throws RemoteUnavailableException,
- ContainerNotFoundException, ServiceException {
+ ContainerNotFoundException, MetadataServiceException {
final ResponseEntity<ContainerDto> response;
try {
response = restTemplate.exchange("/api/container/" + containerId, HttpMethod.GET, HttpEntity.EMPTY,
@@ -60,15 +60,15 @@ public class MetadataServiceGatewayImpl implements MetadataServiceGateway {
}
if (response.getStatusCode() != HttpStatus.OK) {
log.error("Failed to find container with id {}: service responded unsuccessful: {}", containerId, response.getStatusCode());
- throw new ServiceException("Failed to find container: service responded unsuccessful: " + response.getStatusCode());
+ throw new MetadataServiceException("Failed to find container: service responded unsuccessful: " + response.getStatusCode());
}
if (!response.getHeaders().keySet().containsAll(List.of("X-Username", "X-Password"))) {
log.error("Failed to find all privileged container headers");
- throw new ServiceException("Failed to find all privileged container headers");
+ throw new MetadataServiceException("Failed to find all privileged container headers");
}
if (response.getBody() == null) {
log.error("Failed to find container with id {}: body is empty", containerId);
- throw new ServiceException("Failed to find container with id " + containerId + ": body is empty");
+ throw new MetadataServiceException("Failed to find container with id " + containerId + ": body is empty");
}
final PrivilegedContainerDto container = metadataMapper.containerDtoToPrivilegedContainerDto(response.getBody());
container.setUsername(response.getHeaders().get("X-Username").get(0));
@@ -78,7 +78,7 @@ public class MetadataServiceGatewayImpl implements MetadataServiceGateway {
@Override
public PrivilegedDatabaseDto getDatabaseById(Long id) throws DatabaseNotFoundException, RemoteUnavailableException,
- ServiceException {
+ MetadataServiceException {
final ResponseEntity<PrivilegedDatabaseDto> response;
try {
response = restTemplate.exchange("/api/database/" + id, HttpMethod.GET, HttpEntity.EMPTY,
@@ -92,15 +92,15 @@ public class MetadataServiceGatewayImpl implements MetadataServiceGateway {
}
if (response.getStatusCode() != HttpStatus.OK) {
log.error("Failed to find database with id {}: service responded unsuccessful: {}", id, response.getStatusCode());
- throw new ServiceException("Failed to find database: service responded unsuccessful: " + response.getStatusCode());
+ throw new MetadataServiceException("Failed to find database: service responded unsuccessful: " + response.getStatusCode());
}
if (!response.getHeaders().keySet().containsAll(List.of("X-Username", "X-Password"))) {
log.error("Failed to find all privileged database headers");
- throw new ServiceException("Failed to find all privileged database headers");
+ throw new MetadataServiceException("Failed to find all privileged database headers");
}
if (response.getBody() == null) {
log.error("Failed to find database with id {}: body is empty", id);
- throw new ServiceException("Failed to find database with id " + id + ": body is empty");
+ throw new MetadataServiceException("Failed to find database with id " + id + ": body is empty");
}
final PrivilegedDatabaseDto database = response.getBody();
database.getContainer().setUsername(response.getHeaders().get("X-Username").get(0));
@@ -111,7 +111,7 @@ public class MetadataServiceGatewayImpl implements MetadataServiceGateway {
@Override
public PrivilegedDatabaseDto getDatabaseByInternalName(String internalName) throws DatabaseNotFoundException,
- RemoteUnavailableException, ServiceException {
+ RemoteUnavailableException, MetadataServiceException {
final ResponseEntity<PrivilegedDatabaseDto[]> response;
try {
response = restTemplate.exchange("/api/database/", HttpMethod.GET, HttpEntity.EMPTY, PrivilegedDatabaseDto[].class);
@@ -121,7 +121,7 @@ public class MetadataServiceGatewayImpl implements MetadataServiceGateway {
}
if (!response.getStatusCode().equals(HttpStatus.OK) || response.getBody() == null) {
log.error("Failed to find database with internal name {}: service responded unsuccessful: {}", internalName, response.getStatusCode());
- throw new ServiceException("Failed to find database: service responded unsuccessful: " + response.getStatusCode());
+ throw new MetadataServiceException("Failed to find database: service responded unsuccessful: " + response.getStatusCode());
}
if (response.getBody().length != 1) {
log.error("Failed to find database with internal name {}: body is empty", internalName);
@@ -132,7 +132,7 @@ public class MetadataServiceGatewayImpl implements MetadataServiceGateway {
@Override
public PrivilegedTableDto getTableById(Long databaseId, Long id) throws TableNotFoundException,
- RemoteUnavailableException, ServiceException {
+ RemoteUnavailableException, MetadataServiceException {
final ResponseEntity<TableDto> response;
try {
response = restTemplate.exchange("/api/database/" + databaseId + "/table/" + id, HttpMethod.GET, HttpEntity.EMPTY, TableDto.class);
@@ -145,15 +145,15 @@ public class MetadataServiceGatewayImpl implements MetadataServiceGateway {
}
if (!response.getStatusCode().equals(HttpStatus.OK)) {
log.error("Failed to find table with id {}: service responded unsuccessful: {}", id, response.getStatusCode());
- throw new ServiceException("Failed to find table: service responded unsuccessful: " + response.getStatusCode());
+ throw new MetadataServiceException("Failed to find table: service responded unsuccessful: " + response.getStatusCode());
}
if (!response.getHeaders().keySet().containsAll(List.of("X-Type", "X-Host", "X-Port", "X-Username", "X-Password", "X-Database", "X-Sidecar-Host", "X-Sidecar-Port"))) {
log.error("Failed to find all privileged table headers");
- throw new ServiceException("Failed to find all privileged table headers");
+ throw new MetadataServiceException("Failed to find all privileged table headers");
}
if (response.getBody() == null) {
log.error("Failed to find table with id {}: body is empty", id);
- throw new ServiceException("Failed to find table with id " + id + ": body is empty");
+ throw new MetadataServiceException("Failed to find table with id " + id + ": body is empty");
}
final PrivilegedTableDto table = metadataMapper.tableDtoToPrivilegedTableDto(response.getBody());
table.getDatabase().getContainer().getImage().setJdbcMethod(response.getHeaders().get("X-Type").get(0));
@@ -170,7 +170,7 @@ public class MetadataServiceGatewayImpl implements MetadataServiceGateway {
@Override
public PrivilegedViewDto getViewById(Long databaseId, Long id) throws RemoteUnavailableException,
- ViewNotFoundException, ServiceException {
+ ViewNotFoundException, MetadataServiceException {
final ResponseEntity<ViewDto> response;
try {
response = restTemplate.exchange("/api/database/" + databaseId + "/view/" + id, HttpMethod.GET, HttpEntity.EMPTY, ViewDto.class);
@@ -183,15 +183,15 @@ public class MetadataServiceGatewayImpl implements MetadataServiceGateway {
}
if (!response.getStatusCode().equals(HttpStatus.OK)) {
log.error("Failed to find view with id {}: service responded unsuccessful: {}", id, response.getStatusCode());
- throw new ServiceException("Failed to find view: service responded unsuccessful: " + response.getStatusCode());
+ throw new MetadataServiceException("Failed to find view: service responded unsuccessful: " + response.getStatusCode());
}
if (!response.getHeaders().keySet().containsAll(List.of("X-Type", "X-Host", "X-Port", "X-Username", "X-Password", "X-Database"))) {
log.error("Failed to find all privileged view headers");
- throw new ServiceException("Failed to find all privileged view headers");
+ throw new MetadataServiceException("Failed to find all privileged view headers");
}
if (response.getBody() == null) {
log.error("Failed to find view with id {}: body is empty", id);
- throw new ServiceException("Failed to find view with id " + id + ": body is empty");
+ throw new MetadataServiceException("Failed to find view with id " + id + ": body is empty");
}
final PrivilegedViewDto table = metadataMapper.viewDtoToPrivilegedViewDto(response.getBody());
table.getDatabase().getContainer().getImage().setJdbcMethod(response.getHeaders().get("X-Type").get(0));
@@ -205,7 +205,7 @@ public class MetadataServiceGatewayImpl implements MetadataServiceGateway {
@Override
public UserDto getUserById(UUID userId) throws RemoteUnavailableException, UserNotFoundException,
- ServiceException {
+ MetadataServiceException {
final ResponseEntity<UserDto> response;
try {
response = restTemplate.exchange("/api/user/" + userId, HttpMethod.GET, HttpEntity.EMPTY, UserDto.class);
@@ -218,18 +218,18 @@ public class MetadataServiceGatewayImpl implements MetadataServiceGateway {
}
if (!response.getStatusCode().equals(HttpStatus.OK)) {
log.error("Failed to find user with id {}: service responded unsuccessful: {}", userId, response.getStatusCode());
- throw new ServiceException("Failed to find user: service responded unsuccessful: " + response.getStatusCode());
+ throw new MetadataServiceException("Failed to find user: service responded unsuccessful: " + response.getStatusCode());
}
if (response.getBody() == null) {
log.error("Failed to find user with id {}: body is empty", userId);
- throw new ServiceException("Failed to find user with id " + userId + ": body is empty");
+ throw new MetadataServiceException("Failed to find user with id " + userId + ": body is empty");
}
return response.getBody();
}
@Override
public PrivilegedUserDto getPrivilegedUserById(UUID userId) throws RemoteUnavailableException, UserNotFoundException,
- ServiceException {
+ MetadataServiceException {
final ResponseEntity<UserDto> response;
try {
response = restTemplate.exchange("/api/user/" + userId, HttpMethod.GET, HttpEntity.EMPTY, UserDto.class);
@@ -242,15 +242,15 @@ public class MetadataServiceGatewayImpl implements MetadataServiceGateway {
}
if (!response.getStatusCode().equals(HttpStatus.OK)) {
log.error("Failed to find user with id {}: service responded unsuccessful: {}", userId, response.getStatusCode());
- throw new ServiceException("Failed to find user: service responded unsuccessful: " + response.getStatusCode());
+ throw new MetadataServiceException("Failed to find user: service responded unsuccessful: " + response.getStatusCode());
}
if (!response.getHeaders().keySet().containsAll(List.of("X-Username", "X-Password"))) {
log.error("Failed to find all privileged user headers");
- throw new ServiceException("Failed to find all privileged user headers");
+ throw new MetadataServiceException("Failed to find all privileged user headers");
}
if (response.getBody() == null) {
log.error("Failed to find user with id {}: body is empty", userId);
- throw new ServiceException("Failed to find user with id " + userId + ": body is empty");
+ throw new MetadataServiceException("Failed to find user with id " + userId + ": body is empty");
}
final PrivilegedUserDto user = metadataMapper.userDtoToPrivilegedUserDto(response.getBody());
user.setUsername(response.getHeaders().get("X-Username").get(0));
@@ -260,7 +260,7 @@ public class MetadataServiceGatewayImpl implements MetadataServiceGateway {
@Override
public DatabaseAccessDto getAccess(Long databaseId, UUID userId) throws RemoteUnavailableException,
- NotAllowedException, ServiceException {
+ NotAllowedException, MetadataServiceException {
final ResponseEntity<DatabaseAccessDto> response;
try {
response = restTemplate.exchange("/api/database/" + databaseId + "/access/" + userId, HttpMethod.GET, HttpEntity.EMPTY, DatabaseAccessDto.class);
@@ -273,17 +273,17 @@ public class MetadataServiceGatewayImpl implements MetadataServiceGateway {
}
if (!response.getStatusCode().equals(HttpStatus.OK)) {
log.error("Failed to find database access for user with id {}: service responded unsuccessful: {}", userId, response.getStatusCode());
- throw new ServiceException("Failed to find database access: service responded unsuccessful: " + response.getStatusCode());
+ throw new MetadataServiceException("Failed to find database access: service responded unsuccessful: " + response.getStatusCode());
}
if (response.getBody() == null) {
log.error("Failed to find database access: body is empty");
- throw new ServiceException("Failed to find database access: body is empty");
+ throw new MetadataServiceException("Failed to find database access: body is empty");
}
return response.getBody();
}
@Override
- public List<IdentifierDto> getIdentifiers(@NotNull Long databaseId, Long subsetId) throws ServiceException,
+ public List<IdentifierDto> getIdentifiers(@NotNull Long databaseId, Long subsetId) throws MetadataServiceException,
RemoteUnavailableException, DatabaseNotFoundException {
final ResponseEntity<IdentifierDto[]> response;
final String url = "/api/identifier?dbid=" + databaseId + (subsetId != null ? ("&qid=" + subsetId) : "");
@@ -299,20 +299,21 @@ public class MetadataServiceGatewayImpl implements MetadataServiceGateway {
}
if (!response.getStatusCode().equals(HttpStatus.OK)) {
log.error("Failed to find identifiers for database with id {} and subset with id {}: service responded unsuccessful: {}", databaseId, subsetId, response.getStatusCode());
- throw new ServiceException("Failed to find identifiers for database: service responded unsuccessful: " + response.getStatusCode());
+ throw new MetadataServiceException("Failed to find identifiers for database: service responded unsuccessful: " + response.getStatusCode());
}
if (response.getBody() == null) {
log.error("Failed to find identifiers: body is null");
- throw new ServiceException("Failed to find identifiers: body is null");
+ throw new MetadataServiceException("Failed to find identifiers: body is null");
}
return List.of(response.getBody());
}
@Override
- public void updateTableStatistics(Long databaseId, Long tableId) throws TableNotFoundException, ServiceException,
+ public void updateTableStatistics(Long databaseId, Long tableId) throws TableNotFoundException, MetadataServiceException,
RemoteUnavailableException {
final ResponseEntity<Void> response;
final String url = "/api/database/" + databaseId + "/table/" + tableId;
+ log.trace("mapped url: {}", url);
try {
response = restTemplate.exchange(url, HttpMethod.PUT, HttpEntity.EMPTY, Void.class);
} catch (ResourceAccessException | HttpServerErrorException e) {
@@ -324,7 +325,7 @@ public class MetadataServiceGatewayImpl implements MetadataServiceGateway {
}
if (!response.getStatusCode().equals(HttpStatus.ACCEPTED)) {
log.error("Failed to update table statistic for table with id {}: service responded unsuccessful: {}", tableId, response.getStatusCode());
- throw new ServiceException("Failed to update table statistic for database: service responded unsuccessful: " + response.getStatusCode());
+ throw new MetadataServiceException("Failed to update table statistic for database: service responded unsuccessful: " + response.getStatusCode());
}
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/listener/DefaultListener.java b/dbrepo-data-service/services/src/main/java/at/tuwien/listener/DefaultListener.java
index 89b18b3275323545e0defadc3e8b851ada914072..fac47a3d80f6030f5e7d4d561c4262123e9feea7 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/listener/DefaultListener.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/listener/DefaultListener.java
@@ -12,7 +12,6 @@ import lombok.extern.log4j.Log4j2;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.core.MessageListener;
import org.springframework.amqp.core.MessageProperties;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -23,7 +22,6 @@ import java.util.Map;
@Log4j2
@Component
-@RabbitListener(queues = "dbrepo")
public class DefaultListener implements MessageListener {
private final ObjectMapper objectMapper;
@@ -66,7 +64,7 @@ public class DefaultListener implements MessageListener {
log.error("Failed to read object: {}", e.getMessage());
} catch (SQLException | RemoteUnavailableException e) {
log.error("Failed to insert tuple: {}", e.getMessage());
- } catch (TableNotFoundException | ServiceException e) {
+ } catch (TableNotFoundException | MetadataServiceException e) {
log.error("Failed to find table: {}", e.getMessage());
}
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/DataMapper.java b/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/DataMapper.java
index 1516d698bdf0fbe1d702abfb32ff23b9303ac98c..2e95fc34d28fdcea292f6336717ff4be2c5c03f6 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/DataMapper.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/DataMapper.java
@@ -1,23 +1,81 @@
package at.tuwien.mapper;
+import at.tuwien.api.container.image.ImageDateDto;
+import at.tuwien.api.database.DatabaseDto;
+import at.tuwien.api.database.ViewColumnDto;
+import at.tuwien.api.database.ViewDto;
+import at.tuwien.api.database.query.QueryDto;
+import at.tuwien.api.database.query.QueryResultDto;
+import at.tuwien.api.database.table.TableBriefDto;
import at.tuwien.api.database.table.TableDto;
+import at.tuwien.api.database.table.TableHistoryDto;
+import at.tuwien.api.database.table.TableStatisticDto;
+import at.tuwien.api.database.table.columns.ColumnBriefDto;
import at.tuwien.api.database.table.columns.ColumnDto;
+import at.tuwien.api.database.table.columns.ColumnStatisticDto;
import at.tuwien.api.database.table.columns.ColumnTypeDto;
+import at.tuwien.api.database.table.constraints.ConstraintsDto;
+import at.tuwien.api.database.table.constraints.foreign.ForeignKeyBriefDto;
+import at.tuwien.api.database.table.constraints.foreign.ForeignKeyDto;
+import at.tuwien.api.database.table.constraints.foreign.ForeignKeyReferenceDto;
+import at.tuwien.api.database.table.constraints.foreign.ReferenceTypeDto;
+import at.tuwien.api.database.table.constraints.primary.PrimaryKeyDto;
+import at.tuwien.api.database.table.constraints.unique.UniqueDto;
+import at.tuwien.config.QueryConfig;
+import at.tuwien.exception.QueryNotFoundException;
+import at.tuwien.exception.TableNotFoundException;
+import com.github.dockerjava.zerodep.shaded.org.apache.commons.codec.binary.Hex;
+import com.google.common.hash.Hashing;
+import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.parser.CCJSqlParserManager;
+import net.sf.jsqlparser.schema.Column;
+import net.sf.jsqlparser.schema.Table;
+import net.sf.jsqlparser.statement.select.*;
+import org.jetbrains.annotations.NotNull;
import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Mappings;
import org.testcontainers.shaded.org.apache.commons.io.FileUtils;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.io.StringReader;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
import java.sql.*;
-import java.util.Map;
+import java.sql.Date;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.util.*;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
@Mapper(componentModel = "spring")
public interface DataMapper {
org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(DataMapper.class);
+ DateTimeFormatter mariaDbFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss[.SSSSSS]")
+ .withZone(ZoneId.of("UTC"));
+
+ /* redundant */
+ ColumnBriefDto columnDtoToColumnBriefDto(ColumnDto data);
+
+ /* redundant */
+ @Mappings({
+ @Mapping(target = "databaseId", source = "tdbid")
+ })
+ TableBriefDto tableDtoToTableBriefDto(TableDto data);
+
+ /* redundant */
+ ColumnDto viewColumnDtoToColumnDto(ViewColumnDto data);
+
+ ForeignKeyBriefDto foreignKeyDtoToForeignKeyBriefDto(ForeignKeyDto data);
+
default String rabbitMqTupleToInsertOrUpdateQuery(TableDto table, Map<String, Object> data) {
/* parameterized query for prepared statement */
final StringBuilder statement = new StringBuilder("INSERT INTO `")
@@ -37,6 +95,572 @@ public interface DataMapper {
return statement.toString();
}
+ /**
+ * Map the inspected schema to either an existing view/table and append e.g. column or (if not existing) create a new view/table.
+ * @param database The database.
+ * @param resultSet The inspected schema.
+ * @return The database containing the updated view/table.
+ * @throws SQLException
+ */
+ default ViewDto schemaResultSetToView(DatabaseDto database, ResultSet resultSet) throws SQLException {
+ return ViewDto.builder()
+ .name(resultSet.getString(1))
+ .internalName(resultSet.getString(1))
+ .vdbid(database.getId())
+ .database(database)
+ .isInitialView(false)
+ .isPublic(database.getIsPublic())
+ .query(resultSet.getString(9))
+ .queryHash(Hashing.sha256()
+ .hashString(resultSet.getString(9), StandardCharsets.UTF_8)
+ .toString())
+ .columns(new LinkedList<>())
+ .identifiers(new LinkedList<>())
+ .creator(database.getOwner())
+ .createdBy(database.getOwner().getId())
+ .build();
+ }
+
+ default TableStatisticDto resultSetToTableStatistic(ResultSet data) throws SQLException {
+ final TableStatisticDto statistic = TableStatisticDto.builder()
+ .columns(new LinkedHashMap<>())
+ .build();
+ while (data.next()) {
+ final ColumnStatisticDto columnStatistic = ColumnStatisticDto.builder()
+ .min(data.getBigDecimal(2))
+ .max(data.getBigDecimal(3))
+ .median(data.getBigDecimal(4))
+ .mean(data.getBigDecimal(5))
+ .stdDev(data.getBigDecimal(6))
+ .build();
+ statistic.getColumns().put(data.getString(1), columnStatistic);
+ }
+ return statistic;
+ }
+
+ default TableDto resultSetToTable(ResultSet resultSet, TableDto table, QueryConfig queryConfig) throws SQLException {
+ final ColumnDto column = ColumnDto.builder()
+ .ordinalPosition(resultSet.getInt(1) - 1) /* start at zero */
+ .autoGenerated(resultSet.getString(2) != null && resultSet.getString(2).startsWith("nextval"))
+ .isNullAllowed(resultSet.getString(3).equals("YES"))
+ .columnType(ColumnTypeDto.valueOf(resultSet.getString(4).toUpperCase()))
+ .d(resultSet.getString(7) != null ? resultSet.getLong(7) : null)
+ .name(resultSet.getString(10))
+ .internalName(resultSet.getString(10))
+ .table(table)
+ .tableId(table.getId())
+ .databaseId(table.getTdbid())
+ .description(resultSet.getString(11))
+ .build();
+ if (column.getColumnType().equals(ColumnTypeDto.ENUM)) {
+ column.setEnums(Arrays.stream(resultSet.getString(8)
+ .substring(0, resultSet.getString(8).length() - 1)
+ .replace("enum(", "")
+ .split(","))
+ .map(value -> value.replace("'", ""))
+ .toList());
+ }
+ if (column.getColumnType().equals(ColumnTypeDto.SET)) {
+ column.setSets(Arrays.stream(resultSet.getString(8)
+ .substring(0, resultSet.getString(8).length() - 1)
+ .replace("set(", "")
+ .split(","))
+ .map(value -> value.replace("'", ""))
+ .toList());
+ }
+ /* constraints */
+ if (resultSet.getString(9) != null && resultSet.getString(9).equals("PRI")) {
+ table.getConstraints().getPrimaryKey().add(PrimaryKeyDto.builder()
+ .table(tableDtoToTableBriefDto(table))
+ .column(columnDtoToColumnBriefDto(column))
+ .build());
+ }
+ /* fix boolean and set size for others */
+ if (resultSet.getString(8).equalsIgnoreCase("tinyint(1)")) {
+ column.setColumnType(ColumnTypeDto.BOOL);
+ } else if (resultSet.getString(5) != null) {
+ column.setSize(resultSet.getLong(5));
+ } else if (resultSet.getString(6) != null) {
+ column.setSize(resultSet.getLong(6));
+ }
+ if (column.getColumnType().equals(ColumnTypeDto.TIMESTAMP) || column.getColumnType().equals(ColumnTypeDto.DATETIME)) {
+ column.setDateFormat(ImageDateDto.builder()
+ .id(queryConfig.getDefaultTimestampFormatId())
+ .build());
+ } else if (column.getColumnType().equals(ColumnTypeDto.DATE)) {
+ column.setDateFormat(ImageDateDto.builder()
+ .id(queryConfig.getDefaultDateFormatId())
+ .build());
+ } else if (column.getColumnType().equals(ColumnTypeDto.TIME)) {
+ column.setDateFormat(ImageDateDto.builder()
+ .id(queryConfig.getDefaultTimeFormatId())
+ .build());
+ }
+ table.getColumns()
+ .add(column);
+ return table;
+ }
+
+ default ViewDto resultSetToTable(ResultSet resultSet, ViewDto view, QueryConfig queryConfig) throws SQLException {
+ final ViewColumnDto column = ViewColumnDto.builder()
+ .ordinalPosition(resultSet.getInt(1) - 1) /* start at zero */
+ .autoGenerated(resultSet.getString(2) != null && resultSet.getString(2).startsWith("nextval"))
+ .isNullAllowed(resultSet.getString(3).equals("YES"))
+ .columnType(ColumnTypeDto.valueOf(resultSet.getString(4).toUpperCase()))
+ .d(resultSet.getString(7) != null ? resultSet.getLong(7) : null)
+ .name(resultSet.getString(10))
+ .internalName(resultSet.getString(10))
+ .databaseId(view.getDatabase().getId())
+ .build();
+ /* fix boolean and set size for others */
+ if (resultSet.getString(8).equalsIgnoreCase("tinyint(1)")) {
+ column.setColumnType(ColumnTypeDto.BOOL);
+ } else if (resultSet.getString(5) != null) {
+ column.setSize(resultSet.getLong(5));
+ } else if (resultSet.getString(6) != null) {
+ column.setSize(resultSet.getLong(6));
+ }
+ if (column.getColumnType().equals(ColumnTypeDto.TIMESTAMP) || column.getColumnType().equals(ColumnTypeDto.DATETIME)) {
+ column.setDateFormat(ImageDateDto.builder()
+ .id(queryConfig.getDefaultTimestampFormatId())
+ .build());
+ } else if (column.getColumnType().equals(ColumnTypeDto.DATE)) {
+ column.setDateFormat(ImageDateDto.builder()
+ .id(queryConfig.getDefaultDateFormatId())
+ .build());
+ } else if (column.getColumnType().equals(ColumnTypeDto.TIME)) {
+ column.setDateFormat(ImageDateDto.builder()
+ .id(queryConfig.getDefaultTimeFormatId())
+ .build());
+ }
+ view.getColumns()
+ .add(column);
+ log.trace("parsed view {}.{} column: {}", view.getDatabase().getInternalName(), view.getInternalName(), column.getInternalName());
+ return view;
+ }
+
+ /**
+ * Parse columns from a SQL statement of a known database.
+ * @param database The database.
+ * @param query The SQL statement.
+ * @return The list of columns.
+ * @throws JSQLParserException The table/view or column was not found in the database.
+ */
+ default List<ColumnDto> parseColumns(DatabaseDto database, String query) throws JSQLParserException {
+ final List<ColumnDto> columns = new ArrayList<>();
+ final CCJSqlParserManager parserRealSql = new CCJSqlParserManager();
+ final net.sf.jsqlparser.statement.Statement statement = parserRealSql.parse(new StringReader(query));
+ log.trace("parse columns from query: {}", query);
+ /* bi-directional mapping */
+ database.getTables()
+ .forEach(table -> table.getColumns()
+ .forEach(column -> column.setTable(table)));
+ /* check */
+ if (!(statement instanceof Select selectStatement)) {
+ log.error("Query attempts to update the dataset, not a SELECT statement");
+ throw new JSQLParserException("Query attempts to update the dataset");
+ }
+ /* start parsing */
+ final PlainSelect ps = (PlainSelect) selectStatement.getSelectBody();
+ final List<SelectItem> clauses = ps.getSelectItems();
+ log.trace("columns referenced in the from-clause: {}", clauses);
+ /* Parse all tables */
+ final List<FromItem> fromItems = new ArrayList<>(fromItemToFromItems(ps.getFromItem()));
+ if (ps.getJoins() != null && !ps.getJoins().isEmpty()) {
+ log.trace("query contains join items: {}", ps.getJoins());
+ for (net.sf.jsqlparser.statement.select.Join j : ps.getJoins()) {
+ if (j.getRightItem() != null) {
+ fromItems.add(j.getRightItem());
+ }
+ }
+ }
+ final List<ColumnDto> allColumns = database.getTables()
+ .stream()
+ .map(TableDto::getColumns)
+ .flatMap(List::stream)
+ .toList();
+ log.trace("columns referenced in the from-clause and join-clause(s): {}", clauses);
+ /* Checking if all columns exist */
+ for (SelectItem clause : clauses) {
+ final SelectExpressionItem item = (SelectExpressionItem) clause;
+ final Column column = (Column) item.getExpression();
+ final String columnName = column.getColumnName().replace("`", "");
+ final List<ColumnDto> filteredColumns = allColumns.stream()
+ .filter(c -> (c.getAlias() != null && c.getAlias().equals(columnName)) || c.getInternalName().equals(columnName))
+ .toList();
+ String tableOrView = null;
+ for (Table t : fromItems.stream().map(t -> (net.sf.jsqlparser.schema.Table) t).toList()) {
+ if (column.getTable() == null) {
+ /* column does not reference a specific table, find out */
+ final List<String> filteredTables = filteredColumns.stream()
+ .map(c -> c.getTable().getInternalName())
+ .filter(table -> fromItems.stream().map(f -> (Table) f).anyMatch(otherTable -> otherTable.getName().replace("`", "").equals(table)))
+ .toList();
+ if (filteredTables.size() != 1) {
+ log.error("Failed to filter column {} to exactly one match: {}", columnName, filteredTables.stream().map(table -> table + "." + columnName).toList());
+ throw new JSQLParserException("Failed to filter column " + columnName + " to exactly one match");
+ }
+ if (tableMatches(t, filteredTables.get(0))) {
+ tableOrView = t.getName().replace("`", "");
+ break;
+ }
+ }
+ /* column references a specific table */
+ final String tableOrAlias = (t.getAlias() != null ? t.getAlias().getName() : column.getTable().getName())
+ .replace("`", "");
+ if (tableMatches(t, tableOrAlias)) {
+ tableOrView = t.getName().replace("`", "");
+ break;
+ }
+ }
+ if (tableOrView == null) {
+ log.error("Failed to find table/view {} (with designator {})", column.getTable().getName(), column.getTable().getAlias());
+ throw new JSQLParserException("Failed to find table/view " + column.getTable().getName() + " (with alias " + column.getTable().getAlias() + ")");
+ }
+ final String finalTableOrView = tableOrView;
+ final List<ColumnDto> selectColumns = filteredColumns.stream()
+ .filter(c -> c.getTable().getInternalName().equals(finalTableOrView))
+ .toList();
+ final ColumnDto resultColumn;
+ if (selectColumns.size() != 1) {
+ if (filteredColumns.size() != 1) {
+ log.error("Failed to filter column {} to exactly one match: {}", columnName, selectColumns.stream().map(c -> c.getTable().getInternalName() + "." + c.getInternalName()).toList());
+ throw new JSQLParserException("Failed to filter column " + columnName + " to exactly one match");
+ }
+ resultColumn = filteredColumns.get(0);
+ } else {
+ resultColumn = selectColumns.get(0);
+ }
+ if (item.getAlias() != null) {
+ resultColumn.setAlias(item.getAlias().getName().replace("`", ""));
+ }
+ resultColumn.setDatabaseId(database.getId());
+ resultColumn.setTable(resultColumn.getTable());
+ resultColumn.setTableId(resultColumn.getTable().getId());
+ log.trace("found column with internal name {} and alias {}", resultColumn.getInternalName(), resultColumn.getAlias());
+ columns.add(resultColumn);
+ }
+ return columns;
+ }
+
+ default boolean tableMatches(net.sf.jsqlparser.schema.Table table, String tableOrDesignator) {
+ final String tableName = table.getName()
+ .trim()
+ .replace("`", "");
+ if (table.getAlias() == null) {
+ /* table does not have designator */
+ log.trace("table '{}' has no designator", tableName);
+ return tableName.equals(tableOrDesignator);
+ }
+ /* has designator */
+ final String designator = table.getAlias()
+ .getName()
+ .trim()
+ .replace("`", "");
+ log.trace("table '{}' has designator {}", tableName, designator);
+ return designator.equals(tableOrDesignator);
+ }
+
+ default List<FromItem> fromItemToFromItems(FromItem data) throws JSQLParserException {
+ return fromItemToFromItems(data, 0);
+ }
+
+ default List<FromItem> fromItemToFromItems(FromItem data, Integer level) throws JSQLParserException {
+ final List<FromItem> fromItems = new LinkedList<>();
+ if (data instanceof net.sf.jsqlparser.schema.Table table) {
+ fromItems.add(data);
+ log.trace("from-item {} is of type table: level ~> {}", table.getName(), level);
+ return fromItems;
+ }
+ if (data instanceof SubJoin subJoin) {
+ log.trace("from-item is of type sub-join: level ~> {}", level);
+ for (Join join : subJoin.getJoinList()) {
+ final List<FromItem> tmp = fromItemToFromItems(join.getRightItem(), level + 1);
+ if (tmp == null) {
+ log.error("Failed to find right sub-join table: {}", join.getRightItem());
+ throw new JSQLParserException("Failed to find right sub-join table");
+ }
+ fromItems.addAll(tmp);
+ }
+ final List<FromItem> tmp = fromItemToFromItems(subJoin.getLeft(), level + 1);
+ if (tmp == null) {
+ log.error("Failed to find left sub-join table: {}", subJoin.getLeft());
+ throw new JSQLParserException("Failed to find left sub-join table");
+ }
+ fromItems.addAll(tmp);
+ return fromItems;
+ }
+ log.warn("unknown from-item {}", data);
+ return null;
+ }
+
+ default QueryDto resultSetToQueryDto(@NotNull ResultSet data) throws SQLException, QueryNotFoundException {
+ /* note that next() is called outside this mapping function */
+ return QueryDto.builder()
+ .id(data.getLong(1))
+ .created(LocalDateTime.parse(data.getString(2), mariaDbFormatter)
+ .atZone(ZoneId.of("UTC"))
+ .toInstant())
+ .createdBy(UUID.fromString(data.getString(3)))
+ .query(data.getString(4))
+ .queryHash(data.getString(5))
+ .resultHash(data.getString(6))
+ .resultNumber(data.getLong(7))
+ .isPersisted(data.getBoolean(8))
+ .execution(LocalDateTime.parse(data.getString(9), mariaDbFormatter)
+ .atZone(ZoneId.of("UTC"))
+ .toInstant())
+ .build();
+ }
+
+ default List<TableHistoryDto> resultSetToTableHistory(ResultSet resultSet) throws SQLException {
+ /* columns */
+ final List<TableHistoryDto> history = new LinkedList<>();
+ while (resultSet.next()) {
+ history.add(TableHistoryDto.builder()
+ .timestamp(LocalDateTime.parse(resultSet.getString(1), mariaDbFormatter)
+ .atZone(ZoneId.of("UTC"))
+ .toInstant())
+ .event(resultSet.getString(2))
+ .total(resultSet.getLong(3))
+ .build());
+ }
+ log.trace("found {} history event(s)", history.size());
+ return history;
+ }
+
+ default TableDto resultSetToConstraint(ResultSet resultSet, TableDto table) throws SQLException {
+ final String type = resultSet.getString(2);
+ final String name = resultSet.getString(3);
+ final String columnName = resultSet.getString(4);
+ final String referencedTable = resultSet.getString(5);
+ final String referencedColumnName = resultSet.getString(6);
+ final ReferenceTypeDto deleteRule = resultSet.getString(7) != null ? ReferenceTypeDto.fromType(resultSet.getString(7)) : null;
+ final ReferenceTypeDto updateRule = resultSet.getString(8) != null ? ReferenceTypeDto.fromType(resultSet.getString(8)) : null;
+ final Optional<ColumnDto> optional = table.getColumns().stream()
+ .filter(c -> c.getInternalName().equals(columnName))
+ .findFirst();
+ if (optional.isEmpty()) {
+ log.error("Failed to find table column: {}", columnName);
+ throw new IllegalArgumentException("Failed to find table column");
+ }
+ final ColumnDto column = optional.get();
+ if (type.equals("FOREIGN KEY") || type.equals("UNIQUE")) {
+ final Optional<UniqueDto> optional2 = table.getConstraints().getUniques().stream().filter(u -> u.getName().equals(name)).findFirst();
+ if (optional2.isPresent()) {
+ optional2.get()
+ .getColumns()
+ .add(column);
+ return table;
+ }
+ if (type.equals("UNIQUE")) {
+ table.getConstraints()
+ .getUniques()
+ .add(UniqueDto.builder()
+ .name(name)
+ .columns(new LinkedList<>(List.of(column)))
+ .build());
+ return table;
+ }
+ final Optional<ForeignKeyDto> optional1 = table.getConstraints()
+ .getForeignKeys()
+ .stream()
+ .filter(fk -> fk.getName().equals(name))
+ .findFirst();
+ final ForeignKeyReferenceDto foreignKeyReference = ForeignKeyReferenceDto.builder()
+ .column(ColumnBriefDto.builder()
+ .name(columnName)
+ .internalName(columnName)
+ .databaseId(table.getTdbid())
+ .build())
+ .referencedColumn(ColumnBriefDto.builder()
+ .name(referencedColumnName)
+ .internalName(referencedColumnName)
+ .databaseId(table.getTdbid())
+ .build())
+ .build();
+ if (optional1.isPresent()) {
+ foreignKeyReference.setForeignKey(foreignKeyDtoToForeignKeyBriefDto(optional1.get()));
+ optional1.get()
+ .getReferences()
+ .add(foreignKeyReference);
+ log.debug("found foreign key: create part ({}) referencing table {} ({})", columnName, referencedTable, referencedColumnName);
+ return table;
+ }
+ final ForeignKeyDto foreignKey = ForeignKeyDto.builder()
+ .name(name)
+ .table(tableDtoToTableBriefDto(table))
+ .referencedTable(TableBriefDto.builder()
+ .name(referencedTable)
+ .internalName(referencedTable)
+ .databaseId(table.getTdbid())
+ .build())
+ .references(new LinkedList<>(List.of(foreignKeyReference)))
+ .onDelete(deleteRule)
+ .onUpdate(updateRule)
+ .build();
+ foreignKey.getReferences()
+ .forEach(ref -> ref.setForeignKey(foreignKeyDtoToForeignKeyBriefDto(foreignKey)));
+ table.getConstraints()
+ .getForeignKeys()
+ .add(foreignKey);
+ log.debug("create foreign key: add part ({}) referencing table {} ({})", columnName, referencedTable, referencedColumnName);
+ return table;
+ }
+ return table;
+ }
+
+ default TableDto schemaResultSetToTable(DatabaseDto database, ResultSet resultSet) throws SQLException,
+ TableNotFoundException {
+ if (!resultSet.next()) {
+ throw new TableNotFoundException("Failed to find table in the information schema");
+ }
+ final TableDto table = TableDto.builder()
+ .name(resultSet.getString(1))
+ .internalName(resultSet.getString(1))
+ .isVersioned(resultSet.getString(2).equals("SYSTEM VERSIONED"))
+ .numRows(resultSet.getLong(3))
+ .avgRowLength(resultSet.getLong(4))
+ .dataLength(resultSet.getLong(5))
+ .maxDataLength(resultSet.getLong(6))
+ .tdbid(database.getId())
+ .queueName("dbrepo")
+ .routingKey("dbrepo")
+ .description(resultSet.getString(10))
+ .columns(new LinkedList<>())
+ .identifiers(new LinkedList<>())
+ .creator(database.getOwner())
+ .createdBy(database.getOwner().getId())
+ .owner(database.getOwner())
+ .constraints(ConstraintsDto.builder()
+ .foreignKeys(new LinkedList<>())
+ .primaryKey(new LinkedHashSet<>())
+ .uniques(new LinkedList<>())
+ .checks(new LinkedHashSet<>())
+ .build())
+ .isPublic(database.getIsPublic())
+ .build();
+ if (resultSet.getString(7) != null && !resultSet.getString(7).isEmpty()) {
+ table.setCreated(Timestamp.valueOf(resultSet.getString(7))
+ .toInstant());
+ }
+ return table;
+ }
+
+ default Object dataColumnToObject(Object data, ColumnDto column) {
+ if (data == null) {
+ return null;
+ }
+ /* boolean encoding fix */
+ if (column.getColumnType().equals(ColumnTypeDto.TINYINT) && column.getSize() == 1) {
+ log.trace("column {} is of type tinyint with size {}: map to boolean", column.getInternalName(), column.getSize());
+ column.setColumnType(ColumnTypeDto.BOOL);
+ }
+ switch (column.getColumnType()) {
+ case DATE -> {
+ if (column.getDateFormat() == null) {
+ log.error("Missing date format for column {}", column.getId());
+ throw new IllegalArgumentException("Missing date format");
+ }
+ log.trace("mapping {} to date with format '{}'", data, column.getDateFormat());
+ final DateTimeFormatter formatter = new DateTimeFormatterBuilder()
+ .parseCaseInsensitive() /* case insensitive to parse JAN and FEB */
+ .appendPattern(column.getDateFormat().getUnixFormat())
+ .toFormatter(Locale.ENGLISH);
+ final LocalDate date = LocalDate.parse(String.valueOf(data), formatter);
+ return date.atStartOfDay(ZoneId.of("UTC"))
+ .toInstant();
+ }
+ case TIMESTAMP, DATETIME -> {
+ if (column.getDateFormat() == null) {
+ log.error("Missing date format for column {}", column.getId());
+ throw new IllegalArgumentException("Missing date format");
+ }
+ log.trace("mapping {} to timestamp with format '{}'", data, column.getDateFormat());
+ return Timestamp.valueOf(data.toString())
+ .toInstant();
+ }
+ case BINARY, VARBINARY, BIT -> {
+ log.trace("mapping {} -> binary", data);
+ return Long.parseLong(String.valueOf(data), 2);
+ }
+ case TEXT, CHAR, VARCHAR, TINYTEXT, MEDIUMTEXT, LONGTEXT, ENUM, SET -> {
+ log.trace("mapping {} -> string", data);
+ return String.valueOf(data);
+ }
+ case BIGINT -> {
+ log.trace("mapping {} -> biginteger", data);
+ return new BigInteger(String.valueOf(data));
+ }
+ case INT, SMALLINT, MEDIUMINT, TINYINT -> {
+ log.trace("mapping {} -> integer", data);
+ return Integer.parseInt(String.valueOf(data));
+ }
+ case DECIMAL, FLOAT, DOUBLE -> {
+ log.trace("mapping {} -> double", data);
+ return Double.valueOf(String.valueOf(data));
+ }
+ case BOOL -> {
+ log.trace("mapping {} -> boolean", data);
+ return Boolean.valueOf(String.valueOf(data));
+ }
+ case TIME -> {
+ log.trace("mapping {} -> time", data);
+ return String.valueOf(data);
+ }
+ case YEAR -> {
+ final String date = String.valueOf(data);
+ log.trace("mapping {} -> year", date);
+ return Short.valueOf(date.substring(0, date.indexOf('-')));
+ }
+ }
+ log.warn("column type {} is not known", column.getColumnType());
+ throw new IllegalArgumentException("Column type not known");
+ }
+
+ default QueryResultDto resultListToQueryResultDto(List<ColumnDto> columns, ResultSet result) throws SQLException {
+ log.trace("mapping result list to query result, columns.size={}", columns.size());
+ final List<Map<String, Object>> resultList = new LinkedList<>();
+ while (result.next()) {
+ /* map the result set to the columns through the stored metadata in the metadata database */
+ int[] idx = new int[]{1};
+ final Map<String, Object> map = new HashMap<>();
+ for (final ColumnDto column : columns) {
+ final String columnOrAlias;
+ if (column.getAlias() != null) {
+ log.debug("column {} has alias {}", column.getInternalName(), column.getAlias());
+ columnOrAlias = column.getAlias();
+ } else {
+ columnOrAlias = column.getInternalName();
+ }
+ if (List.of(ColumnTypeDto.BLOB, ColumnTypeDto.TINYBLOB, ColumnTypeDto.MEDIUMBLOB, ColumnTypeDto.LONGBLOB).contains(column.getColumnType())) {
+ log.trace("column {} is of type {}", columnOrAlias, column.getColumnType().getType().toLowerCase());
+ final Blob blob = result.getBlob(idx[0]++);
+ final String value = blob == null ? null : Hex.encodeHexString(blob.getBytes(1, (int) blob.length())).toUpperCase();
+ map.put(columnOrAlias, value);
+ continue;
+ }
+ final Object object = dataColumnToObject(result.getObject(idx[0]++), column);
+ if (object == null) {
+ log.warn("result set for column {} is empty (=null)", column.getInternalName());
+ }
+ map.put(columnOrAlias, object);
+ }
+ resultList.add(map);
+ }
+ final int[] idx = new int[]{0};
+ final List<Map<String, Integer>> headers = columns.stream()
+ .map(c -> (Map<String, Integer>) new LinkedHashMap<String, Integer>() {{
+ put(c.getAlias() != null ? c.getAlias() : c.getInternalName(), idx[0]++);
+ }})
+ .toList();
+ log.trace("created ordered header list: {}", headers);
+ return QueryResultDto.builder()
+ .result(resultList)
+ .headers(headers)
+ .build();
+ }
+
default void prepareStatementWithColumnTypeObject(PreparedStatement ps, ColumnTypeDto columnType, int idx, Object value) throws SQLException {
switch (columnType) {
case BLOB, TINYBLOB, MEDIUMBLOB, LONGBLOB:
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java b/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java
index afb0701455515758c8bec86eac138bdccb151a20..b2ed933049687a9ea35aa4cfa673999b81db31af 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java
@@ -1,41 +1,16 @@
package at.tuwien.mapper;
-import at.tuwien.api.container.image.ImageDateDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.ViewColumnDto;
-import at.tuwien.api.database.ViewDto;
import at.tuwien.api.database.query.ImportCsvDto;
-import at.tuwien.api.database.query.QueryDto;
-import at.tuwien.api.database.query.QueryResultDto;
import at.tuwien.api.database.table.*;
import at.tuwien.api.database.table.columns.*;
-import at.tuwien.api.database.table.constraints.ConstraintsDto;
-import at.tuwien.api.database.table.constraints.foreign.ForeignKeyBriefDto;
-import at.tuwien.api.database.table.constraints.foreign.ForeignKeyDto;
-import at.tuwien.api.database.table.constraints.foreign.ForeignKeyReferenceDto;
-import at.tuwien.api.database.table.constraints.foreign.ReferenceTypeDto;
-import at.tuwien.api.database.table.constraints.primary.PrimaryKeyDto;
-import at.tuwien.api.database.table.constraints.unique.UniqueDto;
import at.tuwien.api.database.table.internal.PrivilegedTableDto;
-import at.tuwien.config.QueryConfig;
import at.tuwien.exception.*;
import at.tuwien.utils.MariaDbUtil;
-import com.github.dockerjava.zerodep.shaded.org.apache.commons.codec.binary.Hex;
-import com.google.common.hash.Hashing;
-import net.sf.jsqlparser.JSQLParserException;
-import net.sf.jsqlparser.parser.CCJSqlParserManager;
-import net.sf.jsqlparser.schema.Column;
-import net.sf.jsqlparser.statement.select.*;
-import org.jetbrains.annotations.NotNull;
import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.Mappings;
import org.mapstruct.Named;
-import javax.swing.table.TableColumn;
import java.io.*;
import java.math.BigInteger;
-import java.nio.charset.StandardCharsets;
import java.sql.*;
import java.sql.Date;
import java.text.Normalizer;
@@ -45,9 +20,8 @@ import java.time.format.DateTimeFormatterBuilder;
import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
-@Mapper(componentModel = "spring", uses = {MetadataMapper.class})
+@Mapper(componentModel = "spring", uses = {MetadataMapper.class, DataMapper.class})
public interface MariaDbMapper {
org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(MariaDbMapper.class);
@@ -108,49 +82,6 @@ public interface MariaDbMapper {
return statement.toString();
}
- default QueryResultDto resultListToQueryResultDto(List<ColumnDto> columns, ResultSet result) throws SQLException {
- log.trace("mapping result list to query result, columns.size={}", columns.size());
- final List<Map<String, Object>> resultList = new LinkedList<>();
- while (result.next()) {
- /* map the result set to the columns through the stored metadata in the metadata database */
- int[] idx = new int[]{1};
- final Map<String, Object> map = new HashMap<>();
- for (final ColumnDto column : columns) {
- final String columnOrAlias;
- if (column.getAlias() != null) {
- log.debug("column {} has alias {}", column.getInternalName(), column.getAlias());
- columnOrAlias = column.getAlias();
- } else {
- columnOrAlias = column.getInternalName();
- }
- if (List.of(ColumnTypeDto.BLOB, ColumnTypeDto.TINYBLOB, ColumnTypeDto.MEDIUMBLOB, ColumnTypeDto.LONGBLOB).contains(column.getColumnType())) {
- log.trace("column {} is of type {}", columnOrAlias, column.getColumnType().getType().toLowerCase());
- final Blob blob = result.getBlob(idx[0]++);
- final String value = blob == null ? null : Hex.encodeHexString(blob.getBytes(1, (int) blob.length())).toUpperCase();
- map.put(columnOrAlias, value);
- continue;
- }
- final Object object = dataColumnToObject(result.getObject(idx[0]++), column);
- if (object == null) {
- log.warn("result set for column {} is empty (=null)", column.getInternalName());
- }
- map.put(columnOrAlias, object);
- }
- resultList.add(map);
- }
- final int[] idx = new int[]{0};
- final List<Map<String, Integer>> headers = columns.stream()
- .map(c -> (Map<String, Integer>) new LinkedHashMap<String, Integer>() {{
- put(c.getAlias() != null ? c.getAlias() : c.getInternalName(), idx[0]++);
- }})
- .toList();
- log.trace("created ordered header list: {}", headers);
- return QueryResultDto.builder()
- .result(resultList)
- .headers(headers)
- .build();
- }
-
default String databaseTablesSelectRawQuery() {
final String statement = "SELECT DISTINCT t.`TABLE_NAME` FROM information_schema.TABLES t WHERE t.`TABLE_SCHEMA` = ? AND t.`TABLE_TYPE` = 'SYSTEM VERSIONED' AND t.`TABLE_NAME` != 'qs_queries' ORDER BY t.`TABLE_NAME` ASC";
log.trace("mapped select tables statement: {}", statement);
@@ -163,6 +94,13 @@ public interface MariaDbMapper {
return statement;
}
+ @Named("dropView")
+ default String dropViewRawQuery(String viewName) {
+ final String statement = "DROP VIEW IF EXISTS `" + viewName + "`;";
+ log.trace("mapped drop view statement: {}", statement);
+ return statement;
+ }
+
default String databaseViewSelectRawQuery() {
final String statement = "SELECT t.`TABLE_NAME`, t.`TABLE_TYPE`, t.`TABLE_ROWS`, t.`AVG_ROW_LENGTH`, t.`DATA_LENGTH`, t.`MAX_DATA_LENGTH`, COALESCE(t.`CREATE_TIME`, NOW()) as `CREATE_TIME`, t.`UPDATE_TIME`, v.`VIEW_DEFINITION` FROM information_schema.TABLES t LEFT JOIN information_schema.VIEWS v ON t.`TABLE_NAME` = v.`TABLE_NAME` WHERE t.`TABLE_SCHEMA` = ? AND t.`TABLE_TYPE` = 'VIEW' AND t.`TABLE_NAME` != 'qs_queries' AND t.`TABLE_NAME` = ?";
log.trace("mapped select view statement: {}", statement);
@@ -182,7 +120,7 @@ public interface MariaDbMapper {
}
default String databaseTableConstraintsSelectRawQuery() {
- final String statement = "SELECT k.`ORDINAL_POSITION`, c.`CONSTRAINT_TYPE`, k.`CONSTRAINT_NAME`, k.`COLUMN_NAME`, k.`REFERENCED_TABLE_NAME`, k.`REFERENCED_COLUMN_NAME`, r.`DELETE_RULE`, r.`UPDATE_RULE` FROM information_schema.TABLE_CONSTRAINTS c JOIN information_schema.KEY_COLUMN_USAGE k ON c.`TABLE_NAME` = k.`TABLE_NAME` AND c.`CONSTRAINT_NAME` = k.`CONSTRAINT_NAME` LEFT JOIN information_schema.REFERENTIAL_CONSTRAINTS r ON r.`CONSTRAINT_NAME` = k.`CONSTRAINT_NAME` WHERE LOWER(k.`COLUMN_NAME`) != 'row_end' AND c.`TABLE_SCHEMA` = ? AND c.`TABLE_NAME` = ? GROUP BY k.`ORDINAL_POSITION`, k.`CONSTRAINT_NAME` ORDER BY k.`ORDINAL_POSITION` ASC;";
+ final String statement = "SELECT k.`ORDINAL_POSITION`, c.`CONSTRAINT_TYPE`, k.`CONSTRAINT_NAME`, k.`COLUMN_NAME`, k.`REFERENCED_TABLE_NAME`, k.`REFERENCED_COLUMN_NAME`, r.`DELETE_RULE`, r.`UPDATE_RULE` FROM information_schema.TABLE_CONSTRAINTS c JOIN information_schema.KEY_COLUMN_USAGE k ON c.`TABLE_NAME` = k.`TABLE_NAME` AND c.`CONSTRAINT_NAME` = k.`CONSTRAINT_NAME` LEFT JOIN information_schema.REFERENTIAL_CONSTRAINTS r ON r.`CONSTRAINT_NAME` = k.`CONSTRAINT_NAME` AND r.`CONSTRAINT_SCHEMA` = c.`TABLE_SCHEMA` AND r.`TABLE_NAME` = c.`TABLE_NAME` WHERE LOWER(k.`COLUMN_NAME`) != 'row_end' AND c.`TABLE_SCHEMA` = ? AND c.`TABLE_NAME` = ? ORDER BY k.`ORDINAL_POSITION` ASC;";
log.trace("mapped select table constraints statement: {}", statement);
return statement;
}
@@ -296,9 +234,7 @@ public interface MariaDbMapper {
/* data type */
.append(columnTypeDtoToDataType(column))
/* null expressions */
- .append(column.getNullAllowed() != null && column.getNullAllowed() ? " NULL" : " NOT NULL")
- /* default expressions */
- .append(data.getNeedSequence() && column.getName().equals("id") ? " DEFAULT NEXTVAL(`" + tableCreateDtoToSequenceName(data) + "`)" : "");
+ .append(column.getNullAllowed() != null && column.getNullAllowed() ? " NULL" : " NOT NULL");
if (column.getDescription() != null && !column.getDescription().isEmpty()) {
/* comments */
stringBuilder.append(" COMMENT \"")
@@ -411,23 +347,6 @@ public interface MariaDbMapper {
return data.getLong(1);
}
- default TableStatisticDto resultSetToTableStatistic(ResultSet data) throws SQLException {
- final TableStatisticDto statistic = TableStatisticDto.builder()
- .columns(new LinkedHashMap<>())
- .build();
- while (data.next()) {
- final ColumnStatisticDto columnStatistic = ColumnStatisticDto.builder()
- .min(data.getBigDecimal(2))
- .max(data.getBigDecimal(3))
- .median(data.getBigDecimal(4))
- .mean(data.getBigDecimal(5))
- .stdDev(data.getBigDecimal(6))
- .build();
- statistic.getColumns().put(data.getString(1), columnStatistic);
- }
- return statistic;
- }
-
/**
* Selects the dataset page from a table/view.
*
@@ -439,12 +358,8 @@ public interface MariaDbMapper {
*/
default String selectDatasetRawQuery(String databaseName, String tableOrView, List<ColumnDto> columns,
Instant timestamp, Long size, Long page) {
- final int[] idx = new int[]{0};
- final StringBuilder statement = new StringBuilder("SELECT ");
- columns.forEach(column -> statement.append(idx[0]++ > 0 ? "," : "")
- .append("`")
- .append(column.getInternalName())
- .append("`"));
+ final StringBuilder statement = new StringBuilder("SELECT ")
+ .append(String.join(",", columns.stream().map(c -> "`" + c.getInternalName() + "`").toList()));
statement.append(" FROM `")
.append(databaseName)
.append("`.`")
@@ -490,48 +405,6 @@ public interface MariaDbMapper {
return "DROP TABLE `" + tableName + "`;";
}
- default String tupleToRawInsertQuery(PrivilegedTableDto table, TupleDto data) throws TableMalformedException {
- log.trace("mapping table data to insert query, table={}, data={}", table, data);
- if (table.getColumns().isEmpty()) {
- throw new TableMalformedException("Columns are not known: empty");
- }
- /* parameterized query for prepared statement */
- final StringBuilder statement = new StringBuilder("INSERT INTO `")
- .append(table.getInternalName())
- .append("` (")
- .append(data.getData()
- .keySet()
- .stream()
- .map(o -> "`" + o + "`")
- .collect(Collectors.joining(",")))
- .append(") VALUES (")
- .append(data.getData()
- .keySet()
- .stream()
- .map(o -> "?")
- .collect(Collectors.joining(",")));
- statement.append(");");
- for (int i = 0; i < table.getColumns().size(); i++) {
- final ColumnDto column = table.getColumns()
- .get(i);
- if (column.getAutoGenerated()) {
- log.trace("column is auto-generated, skip.");
- continue;
- }
- final Optional<Map.Entry<String, Object>> tuple = data.getData()
- .entrySet()
- .stream()
- .filter(d -> d.getKey().equals(column.getInternalName()))
- .findFirst();
- if (tuple.isEmpty()) {
- log.error("Failed to map column name {}, known names: {}", column.getInternalName(), data.getData().keySet());
- throw new TableMalformedException("Failed to map column names: not all columns are present in the tuple!");
- }
- }
- log.trace("mapped tuple insert query: {}", statement);
- return statement.toString();
- }
-
default String tableOrViewToRawExportQuery(String databaseName, String tableOrView, List<ColumnDto> columns,
Instant timestamp, String filePath) {
final StringBuilder statement = new StringBuilder("SELECT ");
@@ -571,9 +444,20 @@ public interface MariaDbMapper {
return statement.toString();
}
- default String subsetToRawExportQuery(String query, Instant timestamp, String filePath) {
- final StringBuilder statement = new StringBuilder(query.replaceAll(";", ""))
- .append(" FOR SYSTEM_TIME AS OF TIMESTAMP'")
+ default String subsetToRawTemporaryViewQuery(String viewName, String query) {
+ final StringBuilder statement = new StringBuilder("CREATE VIEW `")
+ .append(viewName)
+ .append("` AS (")
+ .append(query)
+ .append(");");
+ log.debug("mapped temporary view query: {}", statement);
+ return statement.toString();
+ }
+
+ default String subsetToRawExportQuery(String viewName, Instant timestamp, String filePath) {
+ final StringBuilder statement = new StringBuilder("SELECT * FROM `")
+ .append(viewName)
+ .append("` FOR SYSTEM_TIME AS OF TIMESTAMP'")
.append(mariaDbFormatter.format(timestamp))
.append("'")
.append(" INTO OUTFILE '")
@@ -583,280 +467,6 @@ public interface MariaDbMapper {
return statement.toString();
}
- /**
- * Map the inspected schema to either an existing view/table and append e.g. column or (if not existing) create a new view/table.
- * @param database The database.
- * @param resultSet The inspected schema.
- * @return The database containing the updated view/table.
- * @throws SQLException
- */
- default ViewDto schemaResultSetToView(DatabaseDto database, ResultSet resultSet) throws SQLException {
- return ViewDto.builder()
- .name(resultSet.getString(1))
- .internalName(resultSet.getString(1))
- .vdbid(database.getId())
- .database(database)
- .isInitialView(false)
- .isPublic(database.getIsPublic())
- .query(resultSet.getString(9))
- .queryHash(Hashing.sha256()
- .hashString(resultSet.getString(9), StandardCharsets.UTF_8)
- .toString())
- .columns(new LinkedList<>())
- .identifiers(new LinkedList<>())
- .creator(database.getOwner())
- .createdBy(database.getOwner().getId())
- .build();
- }
-
- ViewColumnDto columnDtoToViewColumnDto(ColumnDto data);
-
- ColumnDto viewColumnDtoToColumnDto(ViewColumnDto data);
-
- default TableDto schemaResultSetToTable(DatabaseDto database, ResultSet resultSet) throws SQLException,
- TableNotFoundException {
- if (!resultSet.next()) {
- throw new TableNotFoundException("Failed to find table in the information schema");
- }
- final TableDto table = TableDto.builder()
- .name(resultSet.getString(1))
- .internalName(resultSet.getString(1))
- .isVersioned(resultSet.getString(2).equals("SYSTEM VERSIONED"))
- .numRows(resultSet.getLong(3))
- .avgRowLength(resultSet.getLong(4))
- .dataLength(resultSet.getLong(5))
- .maxDataLength(resultSet.getLong(6))
- .tdbid(database.getId())
- .queueName("dbrepo")
- .routingKey("dbrepo")
- .description(resultSet.getString(10))
- .columns(new LinkedList<>())
- .identifiers(new LinkedList<>())
- .creator(database.getOwner())
- .createdBy(database.getOwner().getId())
- .owner(database.getOwner())
- .constraints(ConstraintsDto.builder()
- .foreignKeys(new LinkedList<>())
- .primaryKey(new LinkedHashSet<>())
- .uniques(new LinkedList<>())
- .checks(new LinkedHashSet<>())
- .build())
- .isPublic(database.getIsPublic())
- .build();
- if (resultSet.getString(7) != null && !resultSet.getString(7).isEmpty()) {
- table.setCreated(Timestamp.valueOf(resultSet.getString(7))
- .toInstant());
- }
- return table;
- }
-
- ForeignKeyBriefDto foreignKeyDtoToForeignKeyBriefDto(ForeignKeyDto data);
-
- default TableDto resultSetToConstraint(ResultSet resultSet, TableDto table) throws SQLException {
- final String type = resultSet.getString(2);
- final String name = resultSet.getString(3);
- final String columnName = resultSet.getString(4);
- final String referencedTable = resultSet.getString(5);
- final String referencedColumnName = resultSet.getString(6);
- final ReferenceTypeDto deleteRule = resultSet.getString(7) != null ? ReferenceTypeDto.fromType(resultSet.getString(7)) : null;
- final ReferenceTypeDto updateRule = resultSet.getString(8) != null ? ReferenceTypeDto.fromType(resultSet.getString(8)) : null;
- final Optional<ColumnDto> optional = table.getColumns().stream()
- .filter(c -> c.getInternalName().equals(columnName))
- .findFirst();
- if (optional.isEmpty()) {
- log.error("Failed to find table column: {}", columnName);
- throw new IllegalArgumentException("Failed to find table column");
- }
- final ColumnDto column = optional.get();
- if (type.equals("FOREIGN KEY") || type.equals("UNIQUE")) {
- final Optional<UniqueDto> optional2 = table.getConstraints().getUniques().stream().filter(u -> u.getName().equals(name)).findFirst();
- if (optional2.isPresent()) {
- optional2.get()
- .getColumns()
- .add(column);
- return table;
- }
- if (type.equals("UNIQUE")) {
- table.getConstraints()
- .getUniques()
- .add(UniqueDto.builder()
- .name(name)
- .columns(new LinkedList<>(List.of(column)))
- .build());
- return table;
- }
- final Optional<ForeignKeyDto> optional1 = table.getConstraints()
- .getForeignKeys()
- .stream()
- .filter(fk -> fk.getName().equals(name))
- .findFirst();
- final ForeignKeyReferenceDto foreignKeyReference = ForeignKeyReferenceDto.builder()
- .column(ColumnBriefDto.builder()
- .name(columnName)
- .internalName(columnName)
- .databaseId(table.getTdbid())
- .build())
- .referencedColumn(ColumnBriefDto.builder()
- .name(referencedColumnName)
- .internalName(referencedColumnName)
- .databaseId(table.getTdbid())
- .build())
- .build();
- if (optional1.isPresent()) {
- foreignKeyReference.setForeignKey(foreignKeyDtoToForeignKeyBriefDto(optional1.get()));
- optional1.get()
- .getReferences()
- .add(foreignKeyReference);
- log.debug("found foreign key: create part ({}) referencing table {} ({})", columnName, referencedTable, referencedColumnName);
- return table;
- }
- final ForeignKeyDto foreignKey = ForeignKeyDto.builder()
- .name(name)
- .table(tableDtoToTableBriefDto(table))
- .referencedTable(TableBriefDto.builder()
- .name(referencedTable)
- .internalName(referencedTable)
- .databaseId(table.getTdbid())
- .build())
- .references(new LinkedList<>(List.of(foreignKeyReference)))
- .onDelete(deleteRule)
- .onUpdate(updateRule)
- .build();
- foreignKey.getReferences()
- .forEach(ref -> ref.setForeignKey(foreignKeyDtoToForeignKeyBriefDto(foreignKey)));
- table.getConstraints()
- .getForeignKeys()
- .add(foreignKey);
- log.debug("create foreign key: add part ({}) referencing table {} ({})", columnName, referencedTable, referencedColumnName);
- return table;
- }
- return table;
- }
-
- @Mappings({
- @Mapping(target = "databaseId", source = "tdbid")
- })
- TableBriefDto tableDtoToTableBriefDto(TableDto data);
-
- ColumnBriefDto columnDtoToColumnBriefDto(ColumnDto data);
-
- default TableDto resultSetToTable(ResultSet resultSet, TableDto table, QueryConfig queryConfig) throws SQLException {
- final ColumnDto column = ColumnDto.builder()
- .ordinalPosition(resultSet.getInt(1) - 1) /* start at zero */
- .autoGenerated(resultSet.getString(2) != null && resultSet.getString(2).startsWith("nextval"))
- .isNullAllowed(resultSet.getString(3).equals("YES"))
- .columnType(ColumnTypeDto.valueOf(resultSet.getString(4).toUpperCase()))
- .d(resultSet.getString(7) != null ? resultSet.getLong(7) : null)
- .name(resultSet.getString(10))
- .internalName(resultSet.getString(10))
- .table(table)
- .tableId(table.getId())
- .databaseId(table.getTdbid())
- .description(resultSet.getString(11))
- .build();
- if (column.getColumnType().equals(ColumnTypeDto.ENUM)) {
- column.setEnums(Arrays.stream(resultSet.getString(8)
- .substring(0, resultSet.getString(8).length() - 1)
- .replace("enum(", "")
- .split(","))
- .map(value -> value.replace("'", ""))
- .toList());
- }
- if (column.getColumnType().equals(ColumnTypeDto.SET)) {
- column.setSets(Arrays.stream(resultSet.getString(8)
- .substring(0, resultSet.getString(8).length() - 1)
- .replace("set(", "")
- .split(","))
- .map(value -> value.replace("'", ""))
- .toList());
- }
- /* constraints */
- if (resultSet.getString(9) != null && resultSet.getString(9).equals("PRI")) {
- table.getConstraints().getPrimaryKey().add(PrimaryKeyDto.builder()
- .table(tableDtoToTableBriefDto(table))
- .column(columnDtoToColumnBriefDto(column))
- .build());
- }
- /* fix boolean and set size for others */
- if (resultSet.getString(8).equalsIgnoreCase("tinyint(1)")) {
- column.setColumnType(ColumnTypeDto.BOOL);
- } else if (resultSet.getString(5) != null) {
- column.setSize(resultSet.getLong(5));
- } else if (resultSet.getString(6) != null) {
- column.setSize(resultSet.getLong(6));
- }
- if (column.getColumnType().equals(ColumnTypeDto.TIMESTAMP) || column.getColumnType().equals(ColumnTypeDto.DATETIME)) {
- column.setDateFormat(ImageDateDto.builder()
- .id(queryConfig.getDefaultTimestampFormatId())
- .build());
- } else if (column.getColumnType().equals(ColumnTypeDto.DATE)) {
- column.setDateFormat(ImageDateDto.builder()
- .id(queryConfig.getDefaultDateFormatId())
- .build());
- } else if (column.getColumnType().equals(ColumnTypeDto.TIME)) {
- column.setDateFormat(ImageDateDto.builder()
- .id(queryConfig.getDefaultTimeFormatId())
- .build());
- }
- table.getColumns()
- .add(column);
- return table;
- }
-
- default ViewDto resultSetToTable(ResultSet resultSet, ViewDto view, QueryConfig queryConfig) throws SQLException {
- final ViewColumnDto column = ViewColumnDto.builder()
- .ordinalPosition(resultSet.getInt(1) - 1) /* start at zero */
- .autoGenerated(resultSet.getString(2) != null && resultSet.getString(2).startsWith("nextval"))
- .isNullAllowed(resultSet.getString(3).equals("YES"))
- .columnType(ColumnTypeDto.valueOf(resultSet.getString(4).toUpperCase()))
- .d(resultSet.getString(7) != null ? resultSet.getLong(7) : null)
- .name(resultSet.getString(10))
- .internalName(resultSet.getString(10))
- .databaseId(view.getDatabase().getId())
- .build();
- /* fix boolean and set size for others */
- if (resultSet.getString(8).equalsIgnoreCase("tinyint(1)")) {
- column.setColumnType(ColumnTypeDto.BOOL);
- } else if (resultSet.getString(5) != null) {
- column.setSize(resultSet.getLong(5));
- } else if (resultSet.getString(6) != null) {
- column.setSize(resultSet.getLong(6));
- }
- if (column.getColumnType().equals(ColumnTypeDto.TIMESTAMP) || column.getColumnType().equals(ColumnTypeDto.DATETIME)) {
- column.setDateFormat(ImageDateDto.builder()
- .id(queryConfig.getDefaultTimestampFormatId())
- .build());
- } else if (column.getColumnType().equals(ColumnTypeDto.DATE)) {
- column.setDateFormat(ImageDateDto.builder()
- .id(queryConfig.getDefaultDateFormatId())
- .build());
- } else if (column.getColumnType().equals(ColumnTypeDto.TIME)) {
- column.setDateFormat(ImageDateDto.builder()
- .id(queryConfig.getDefaultTimeFormatId())
- .build());
- }
- view.getColumns()
- .add(column);
- log.trace("parsed view {}.{} column: {}", view.getDatabase().getInternalName(), view.getInternalName(), column.getInternalName());
- return view;
- }
-
- default List<TableHistoryDto> resultSetToTableHistory(ResultSet resultSet) throws SQLException {
- /* columns */
- final List<TableHistoryDto> history = new LinkedList<>();
- while (resultSet.next()) {
- history.add(TableHistoryDto.builder()
- .timestamp(LocalDateTime.parse(resultSet.getString(1), mariaDbFormatter)
- .atZone(ZoneId.of("UTC"))
- .toInstant())
- .event(resultSet.getString(2))
- .total(resultSet.getLong(3))
- .build());
- }
- log.trace("found {} history event(s)", history.size());
- return history;
- }
-
default String datasetToRawInsertQuery(String databaseName, PrivilegedTableDto table, ImportCsvDto data) {
final StringBuilder statement = new StringBuilder("LOAD DATA INFILE '")
.append(data.getLocation())
@@ -953,10 +563,10 @@ public interface MariaDbMapper {
final int[] jdx = new int[]{0};
data.getKeys()
.forEach((key, value) -> {
- statement.append(jdx[0] == 0 ? "" : ", ")
+ statement.append(jdx[0] == 0 ? "" : " AND ")
.append("`")
.append(key)
- .append("` ");
+ .append("`");
if (value == null) {
statement.append(" IS NULL");
} else {
@@ -1292,258 +902,6 @@ public interface MariaDbMapper {
}
}
- default Object dataColumnToObject(Object data, ColumnDto column) {
- if (data == null) {
- return null;
- }
- /* boolean encoding fix */
- if (column.getColumnType().equals(ColumnTypeDto.TINYINT) && column.getSize() == 1) {
- log.trace("column {} is of type tinyint with size {}: map to boolean", column.getInternalName(), column.getSize());
- column.setColumnType(ColumnTypeDto.BOOL);
- }
- switch (column.getColumnType()) {
- case DATE -> {
- if (column.getDateFormat() == null) {
- log.error("Missing date format for column {}", column.getId());
- throw new IllegalArgumentException("Missing date format");
- }
- log.trace("mapping {} to date with format '{}'", data, column.getDateFormat());
- final DateTimeFormatter formatter = new DateTimeFormatterBuilder()
- .parseCaseInsensitive() /* case insensitive to parse JAN and FEB */
- .appendPattern(column.getDateFormat().getUnixFormat())
- .toFormatter(Locale.ENGLISH);
- final LocalDate date = LocalDate.parse(String.valueOf(data), formatter);
- return date.atStartOfDay(ZoneId.of("UTC"))
- .toInstant();
- }
- case TIMESTAMP, DATETIME -> {
- if (column.getDateFormat() == null) {
- log.error("Missing date format for column {}", column.getId());
- throw new IllegalArgumentException("Missing date format");
- }
- log.trace("mapping {} to timestamp with format '{}'", data, column.getDateFormat());
- return Timestamp.valueOf(data.toString())
- .toInstant();
- }
- case BINARY, VARBINARY, BIT -> {
- log.trace("mapping {} -> binary", data);
- return Long.parseLong(String.valueOf(data), 2);
- }
- case TEXT, CHAR, VARCHAR, TINYTEXT, MEDIUMTEXT, LONGTEXT, ENUM, SET -> {
- log.trace("mapping {} -> string", data);
- return String.valueOf(data);
- }
- case BIGINT -> {
- log.trace("mapping {} -> biginteger", data);
- return new BigInteger(String.valueOf(data));
- }
- case INT, SMALLINT, MEDIUMINT, TINYINT -> {
- log.trace("mapping {} -> integer", data);
- return Integer.parseInt(String.valueOf(data));
- }
- case DECIMAL, FLOAT, DOUBLE -> {
- log.trace("mapping {} -> double", data);
- return Double.valueOf(String.valueOf(data));
- }
- case BOOL -> {
- log.trace("mapping {} -> boolean", data);
- return Boolean.valueOf(String.valueOf(data));
- }
- case TIME -> {
- log.trace("mapping {} -> time", data);
- return String.valueOf(data);
- }
- case YEAR -> {
- final String date = String.valueOf(data);
- log.trace("mapping {} -> year", date);
- return Short.valueOf(date.substring(0, date.indexOf('-')));
- }
- }
- log.warn("column type {} is not known", column.getColumnType());
- throw new IllegalArgumentException("Column type not known");
- }
-
- /**
- * Parse columns from a SQL statement of a known database.
- * @param database The database.
- * @param query The SQL statement.
- * @return The list of columns.
- * @throws JSQLParserException The table/view or column was not found in the database.
- */
- default List<ColumnDto> parseColumns(DatabaseDto database, String query) throws JSQLParserException {
- final List<ColumnDto> columns = new ArrayList<>();
- final CCJSqlParserManager parserRealSql = new CCJSqlParserManager();
- final net.sf.jsqlparser.statement.Statement statement = parserRealSql.parse(new StringReader(query));
- log.trace("parse columns from query: {}", query);
- /* bi-directional mapping */
- database.getTables()
- .forEach(table -> table.getColumns()
- .forEach(column -> column.setTable(table)));
- /* check */
- if (!(statement instanceof Select selectStatement)) {
- log.error("Query attempts to update the dataset, not a SELECT statement");
- throw new JSQLParserException("Query attempts to update the dataset");
- }
- /* start parsing */
- final PlainSelect ps = (PlainSelect) selectStatement.getSelectBody();
- final List<SelectItem> clauses = ps.getSelectItems();
- log.trace("columns referenced in the from-clause: {}", clauses);
- /* Parse all tables */
- final List<FromItem> fromItems = new ArrayList<>(fromItemToFromItems(ps.getFromItem()));
- if (ps.getJoins() != null && !ps.getJoins().isEmpty()) {
- log.trace("query contains join items: {}", ps.getJoins());
- for (net.sf.jsqlparser.statement.select.Join j : ps.getJoins()) {
- if (j.getRightItem() != null) {
- fromItems.add(j.getRightItem());
- }
- }
- }
- final List<ColumnDto> allColumns = Stream.of(database.getViews()
- .stream()
- .map(ViewDto::getColumns)
- .flatMap(List::stream)
- .map(this::viewColumnDtoToColumnDto),
- database.getTables()
- .stream()
- .map(TableDto::getColumns)
- .flatMap(List::stream))
- .flatMap(i -> i)
- .toList();
- log.trace("columns referenced in the from-clause and join-clause(s): {}", clauses);
- /* Checking if all columns exist */
- for (SelectItem clause : clauses) {
- final SelectExpressionItem item = (SelectExpressionItem) clause;
- final Column column = (Column) item.getExpression();
- final Optional<net.sf.jsqlparser.schema.Table> optional = fromItems.stream()
- .map(t -> (net.sf.jsqlparser.schema.Table) t)
- .filter(t -> {
- if (column.getTable() == null) {
- /* column does not reference a specific table, so there is only one table */
- final String tableName = ((net.sf.jsqlparser.schema.Table) fromItems.get(0)).getName().replace("`", "");
- return tableMatches(t, tableName);
- }
- final String tableName = column.getTable().getName().replace("`", "");
- return tableMatches(t, tableName);
- })
- .findFirst();
- if (optional.isEmpty()) {
- log.error("Failed to find table/view {} (with designator {})", column.getTable().getName(), column.getTable().getAlias());
- throw new JSQLParserException("Failed to find table/view " + column.getTable().getName() + " (with alias " + column.getTable().getAlias() + ")");
- }
- final String columnName = column.getColumnName().replace("`", "");
- final String tableOrView = optional.get().getName().replace("`", "");
- final List<ColumnDto> filteredColumns = allColumns.stream()
- .filter(c -> (c.getAlias() != null && c.getAlias().equals(columnName)) || c.getInternalName().equals(columnName))
- .toList();
- final Optional<ColumnDto> optionalColumn = filteredColumns.stream()
- .filter(c -> columnMatches(c, tableOrView))
- .findFirst();
- if (optionalColumn.isEmpty()) {
- log.error("Failed to find column with name {} of table/view {} in {}", columnName, tableOrView, filteredColumns.stream().map(c -> c.getTable().getInternalName() + "." + c.getInternalName()).toList());
- throw new JSQLParserException("Failed to find column with name " + columnName + " of table/view " + tableOrView);
- }
- final ColumnDto resultColumn = optionalColumn.get();
- if (item.getAlias() != null) {
- resultColumn.setAlias(item.getAlias().getName().replace("`", ""));
- }
- resultColumn.setDatabaseId(database.getId());
- resultColumn.setTable(resultColumn.getTable());
- resultColumn.setTableId(resultColumn.getTable().getId());
- log.trace("found column with internal name {} and alias {}", resultColumn.getInternalName(), resultColumn.getAlias());
- columns.add(resultColumn);
- }
- return columns;
- }
-
- default boolean tableMatches(net.sf.jsqlparser.schema.Table table, String otherTableName) {
- final String tableName = table.getName()
- .trim()
- .replace("`", "");
- if (table.getAlias() == null) {
- /* table does not have designator */
- log.trace("table '{}' has no designator", tableName);
- return tableName.equals(otherTableName);
- }
- /* has designator */
- final String designator = table.getAlias()
- .getName()
- .trim()
- .replace("`", "");
- log.trace("table '{}' has designator {}", tableName, designator);
- return designator.equals(otherTableName);
- }
-
- default boolean columnMatches(ColumnDto column, String tableOrView) {
- if (column.getTable() != null && column.getTable().getInternalName().equals(tableOrView)) {
- log.trace("table '{}' found in column table", tableOrView);
- return true;
- }
- if (column.getViews() == null) {
- log.trace("table/view '{}' not found among column views: empty list", tableOrView);
- return false;
- }
- /* maybe matches one of the other views */
- final boolean found = column.getViews()
- .stream()
- .anyMatch(v -> v.getInternalName().equals(tableOrView));
- if (!found) {
- log.trace("table/view '{}' not found among column views: {}", tableOrView, column.getViews().stream().map(ViewDto::getInternalName).toList());
- }
- return found;
- }
-
- default List<FromItem> fromItemToFromItems(FromItem data) throws JSQLParserException {
- return fromItemToFromItems(data, 0);
- }
-
- default List<FromItem> fromItemToFromItems(FromItem data, Integer level) throws JSQLParserException {
- final List<FromItem> fromItems = new LinkedList<>();
- if (data instanceof net.sf.jsqlparser.schema.Table table) {
- fromItems.add(data);
- log.trace("from-item {} is of type table: level ~> {}", table.getName(), level);
- return fromItems;
- }
- if (data instanceof SubJoin subJoin) {
- log.trace("from-item is of type sub-join: level ~> {}", level);
- for (Join join : subJoin.getJoinList()) {
- final List<FromItem> tmp = fromItemToFromItems(join.getRightItem(), level + 1);
- if (tmp == null) {
- log.error("Failed to find right sub-join table: {}", join.getRightItem());
- throw new JSQLParserException("Failed to find right sub-join table");
- }
- fromItems.addAll(tmp);
- }
- final List<FromItem> tmp = fromItemToFromItems(subJoin.getLeft(), level + 1);
- if (tmp == null) {
- log.error("Failed to find left sub-join table: {}", subJoin.getLeft());
- throw new JSQLParserException("Failed to find left sub-join table");
- }
- fromItems.addAll(tmp);
- return fromItems;
- }
- log.warn("unknown from-item {}", data);
- return null;
- }
-
- default QueryDto resultSetToQueryDto(@NotNull ResultSet data) throws SQLException, QueryNotFoundException {
- /* note that next() is called outside this mapping function */
- return QueryDto.builder()
- .id(data.getLong(1))
- .created(LocalDateTime.parse(data.getString(2), mariaDbFormatter)
- .atZone(ZoneId.of("UTC"))
- .toInstant())
- .createdBy(UUID.fromString(data.getString(3)))
- .query(data.getString(4))
- .queryHash(data.getString(5))
- .resultHash(data.getString(6))
- .resultNumber(data.getLong(7))
- .isPersisted(data.getBoolean(8))
- .execution(LocalDateTime.parse(data.getString(9), mariaDbFormatter)
- .atZone(ZoneId.of("UTC"))
- .toInstant())
- .build();
- }
-
default String selectRawSelectQuery(String query, Instant timestamp, Long page, Long size) {
query = query.toLowerCase(Locale.ROOT)
.trim();
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MetadataMapper.java b/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MetadataMapper.java
index 4cde78c7d913108bdf9d3d0d1b13c541ca44724d..fca56314af224c36719d7c5b424b47df50893033 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MetadataMapper.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MetadataMapper.java
@@ -10,6 +10,7 @@ import at.tuwien.api.database.internal.PrivilegedDatabaseDto;
import at.tuwien.api.database.internal.PrivilegedViewDto;
import at.tuwien.api.database.table.TableBriefDto;
import at.tuwien.api.database.table.TableDto;
+import at.tuwien.api.database.table.columns.ColumnBriefDto;
import at.tuwien.api.database.table.columns.ColumnDto;
import at.tuwien.api.database.table.internal.PrivilegedTableDto;
import at.tuwien.api.user.PrivilegedUserDto;
@@ -33,9 +34,6 @@ public interface MetadataMapper {
ViewColumnDto columnDtoToViewColumnDto(ColumnDto data);
- /* keep */
- TableBriefDto tableDtoToTableBriefDto(TableDto data);
-
@Mappings({
@Mapping(target = "database", expression = "java(PrivilegedDatabaseDto.builder().container(PrivilegedContainerDto.builder().image(new ImageDto()).build()).build())")
})
@@ -47,4 +45,9 @@ public interface MetadataMapper {
PrivilegedUserDto userDtoToPrivilegedUserDto(UserDto data);
+ @Mappings({
+ @Mapping(target = "databaseId", source = "tdbid")
+ })
+ TableBriefDto tableDtoToTableBriefDto(TableDto data);
+
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/SchemaService.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/SchemaService.java
index 2319d16b3974feaa206ab99235c3cc43b92579c8..f5ef05b44aed27a8fb43dbd123b5096e36c2283d 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/SchemaService.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/SchemaService.java
@@ -9,8 +9,25 @@ import java.sql.SQLException;
public interface SchemaService {
+ /**
+ * Inspects the schema (columns with names, data types, unique-, check-, primary- and foreign key constraints) of
+ * a table with given name in the given database.
+ * @param database The database.
+ * @param tableName The table name.
+ * @return The inspected table if successful.
+ * @throws SQLException The connection to the database could not be established.
+ * @throws TableNotFoundException The table was not found in the given database.
+ */
TableDto inspectTable(PrivilegedDatabaseDto database, String tableName) throws SQLException,
- QueryMalformedException, TableNotFoundException;
+ TableNotFoundException;
- ViewDto inspectView(PrivilegedDatabaseDto database, String viewName) throws SQLException, ViewMalformedException, ViewNotFoundException, ViewSchemaException;
+ /**
+ * Inspects the schema (columns with names, data types) of a view with given name in the given database.
+ * @param database The database.
+ * @param viewName The table name.
+ * @return The inspected view if successful.
+ * @throws SQLException The connection to the database could not be established.
+ * @throws ViewNotFoundException The view was not found in the given database.
+ */
+ ViewDto inspectView(PrivilegedDatabaseDto database, String viewName) throws SQLException, ViewNotFoundException;
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/SubsetService.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/SubsetService.java
index 7c2575b9cc348724f801dfd7e67d322b5ddd2070..3c3ff101fead4b51caadc8c207848d2b962f98eb 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/SubsetService.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/SubsetService.java
@@ -28,7 +28,9 @@ public interface SubsetService {
QueryResultDto execute(PrivilegedDatabaseDto database, String statement, Instant timestamp, UUID userId, Long page,
Long size, SortTypeDto sortDirection, String sortColumn)
- throws QueryStoreInsertException, SQLException, QueryNotFoundException, TableMalformedException, UserNotFoundException, NotAllowedException, RemoteUnavailableException, ServiceException, DatabaseNotFoundException;
+ throws QueryStoreInsertException, SQLException, QueryNotFoundException, TableMalformedException,
+ UserNotFoundException, NotAllowedException, RemoteUnavailableException, DatabaseNotFoundException,
+ MetadataServiceException;
QueryResultDto reExecute(PrivilegedDatabaseDto database, QueryDto query, Long page, Long size,
SortTypeDto sortDirection, String sortColumn) throws TableMalformedException,
@@ -45,11 +47,12 @@ public interface SubsetService {
* @return The list of queries.
*/
List<QueryDto> findAll(PrivilegedDatabaseDto database, Boolean filterPersisted) throws SQLException,
- QueryNotFoundException, NotAllowedException, RemoteUnavailableException, ServiceException, DatabaseNotFoundException;
+ QueryNotFoundException, NotAllowedException, RemoteUnavailableException, DatabaseNotFoundException,
+ MetadataServiceException;
ExportResourceDto export(PrivilegedDatabaseDto database, QueryDto query, Instant timestamp, String filename)
throws SQLException, QueryMalformedException, SidecarExportException, StorageNotFoundException,
- StorageUnavailableException, ServiceException, RemoteUnavailableException;
+ StorageUnavailableException, MetadataServiceException, RemoteUnavailableException;
Long executeCountNonPersistent(PrivilegedDatabaseDto database, String statement, Instant timestamp)
throws SQLException, QueryMalformedException, TableMalformedException;
@@ -62,7 +65,9 @@ public interface SubsetService {
* @return The query.
* @throws QueryNotFoundException The query store did not return a query
*/
- QueryDto findById(PrivilegedDatabaseDto database, Long queryId) throws QueryNotFoundException, SQLException, NotAllowedException, RemoteUnavailableException, UserNotFoundException, ServiceException, DatabaseNotFoundException;
+ QueryDto findById(PrivilegedDatabaseDto database, Long queryId) throws QueryNotFoundException, SQLException,
+ NotAllowedException, RemoteUnavailableException, UserNotFoundException, DatabaseNotFoundException,
+ MetadataServiceException;
/**
* Inserts a query and metadata to the query store of a given database id.
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/TableService.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/TableService.java
index fb045b4a19217d968fdf27e4753c2596bc0f9431..765a3b7e2e630b70b4e52d99aaddecd8559754a3 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/TableService.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/TableService.java
@@ -21,11 +21,10 @@ public interface TableService {
* @return List of tables, if successful.
* @throws SQLException Failed to parse SQL query, contains invalid syntax.
* @throws TableNotFoundException The table could not be inspected in the data database.
- * @throws QueryMalformedException The inspection query is malformed.
* @throws DatabaseMalformedException The database inspection was unsuccessful, likely due to a bug in the mapping.
*/
List<TableDto> getSchemas(PrivilegedDatabaseDto database) throws SQLException, TableNotFoundException,
- QueryMalformedException, DatabaseMalformedException;
+ DatabaseMalformedException;
/**
* Generate table statistic for a given table. Only numerical columns are calculated.
@@ -33,10 +32,10 @@ public interface TableService {
* @return The table statistic, if successful.
* @throws SQLException Failed to parse SQL query, contains invalid syntax.
* @throws TableMalformedException The table statistic generation was unsuccessful, likely due to a bug in the mapping.
- * @throws QueryMalformedException The inspection query is malformed.
+ * @throws TableNotFoundException The table could not be inspected in the data database.
*/
TableStatisticDto getStatistics(PrivilegedTableDto table) throws SQLException, TableMalformedException,
- QueryMalformedException;
+ TableNotFoundException;
/**
* Finds a table with given data database and table name.
@@ -59,10 +58,9 @@ public interface TableService {
* @throws TableNotFoundException The table could not be inspected in the data database.
* @throws TableExistsException The table name already exists in the information_schema.
* @throws TableNotFoundException The table could not be inspected in the data database.
- * @throws QueryMalformedException The create/inspection query is malformed.
*/
TableDto createTable(PrivilegedDatabaseDto database, TableCreateDto data) throws SQLException,
- TableMalformedException, TableExistsException, TableNotFoundException, QueryMalformedException;
+ TableMalformedException, TableExistsException, TableNotFoundException;
/**
* Drops a table in given table object.
@@ -107,7 +105,7 @@ public interface TableService {
QueryMalformedException;
void importDataset(PrivilegedTableDto table, ImportCsvDto data) throws SidecarImportException,
- StorageNotFoundException, SQLException, QueryMalformedException, ServiceException, RemoteUnavailableException;
+ StorageNotFoundException, SQLException, QueryMalformedException, RemoteUnavailableException;
void deleteTuple(PrivilegedTableDto table, TupleDeleteDto data) throws SQLException,
TableMalformedException, QueryMalformedException;
@@ -120,5 +118,5 @@ public interface TableService {
ExportResourceDto exportDataset(PrivilegedTableDto table, Instant timestamp)
throws SQLException, SidecarExportException, StorageNotFoundException, StorageUnavailableException,
- QueryMalformedException, ServiceException, RemoteUnavailableException;
+ QueryMalformedException, RemoteUnavailableException;
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/ViewService.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/ViewService.java
index 3455c320cd10c2e488220843db8ac3d644ef902d..5acca0018de6bc3e29de49aea9f1da4ae95ff492 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/ViewService.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/ViewService.java
@@ -58,5 +58,5 @@ public interface ViewService {
ExportResourceDto exportDataset(PrivilegedDatabaseDto database, ViewDto view, Instant timestamp)
throws SQLException, QueryMalformedException, SidecarExportException, StorageNotFoundException,
- StorageUnavailableException, ServiceException, RemoteUnavailableException;
+ StorageUnavailableException, RemoteUnavailableException;
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/QueueServiceRabbitMqImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/QueueServiceRabbitMqImpl.java
index fd7966e0bebe65df727b903452d792ac59625a77..f2675d4e5b537d751743ae70ea7c366e19a05351 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/QueueServiceRabbitMqImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/QueueServiceRabbitMqImpl.java
@@ -46,6 +46,7 @@ public class QueueServiceRabbitMqImpl extends HibernateConnector implements Queu
dataMapper.prepareStatementWithColumnTypeObject(preparedStatement, optional.get().getColumnType(), idx[0]++,
entry.getValue());
}
+ preparedStatement.executeUpdate();
log.trace("successfully inserted tuple");
} finally {
dataSource.close();
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/SchemaServiceMariaDbImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/SchemaServiceMariaDbImpl.java
index 537c4878a4f44a1b47e39278b3233f03448cf439..cc5840080b21ae8549632db7123e12ec72b1ee30 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/SchemaServiceMariaDbImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/SchemaServiceMariaDbImpl.java
@@ -1,17 +1,14 @@
package at.tuwien.service.impl;
import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.ViewColumnDto;
import at.tuwien.api.database.ViewDto;
import at.tuwien.api.database.internal.PrivilegedDatabaseDto;
import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.database.table.columns.ColumnDto;
import at.tuwien.api.database.table.constraints.unique.UniqueDto;
import at.tuwien.config.QueryConfig;
import at.tuwien.exception.TableNotFoundException;
-import at.tuwien.exception.ViewMalformedException;
import at.tuwien.exception.ViewNotFoundException;
-import at.tuwien.exception.ViewSchemaException;
+import at.tuwien.mapper.DataMapper;
import at.tuwien.mapper.MariaDbMapper;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.SchemaService;
@@ -25,20 +22,20 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
@Log4j2
@Service
public class SchemaServiceMariaDbImpl extends HibernateConnector implements SchemaService {
+ private final DataMapper dataMapper;
private final QueryConfig queryConfig;
private final MariaDbMapper mariaDbMapper;
private final MetadataMapper metadataMapper;
@Autowired
- public SchemaServiceMariaDbImpl(QueryConfig queryConfig, MariaDbMapper mariaDbMapper,
+ public SchemaServiceMariaDbImpl(DataMapper dataMapper, QueryConfig queryConfig, MariaDbMapper mariaDbMapper,
MetadataMapper metadataMapper) {
+ this.dataMapper = dataMapper;
this.queryConfig = queryConfig;
this.mariaDbMapper = mariaDbMapper;
this.metadataMapper = metadataMapper;
@@ -56,7 +53,7 @@ public class SchemaServiceMariaDbImpl extends HibernateConnector implements Sche
statement1.setString(1, database.getInternalName());
statement1.setString(2, tableName);
log.trace("1={}, 2={}", database.getInternalName(), tableName);
- TableDto table = mariaDbMapper.schemaResultSetToTable(metadataMapper.privilegedDatabaseDtoToDatabaseDto(database), statement1.executeQuery());
+ TableDto table = dataMapper.schemaResultSetToTable(metadataMapper.privilegedDatabaseDtoToDatabaseDto(database), statement1.executeQuery());
/* obtain columns metadata */
final PreparedStatement statement2 = connection.prepareStatement(mariaDbMapper.databaseTableColumnsSelectRawQuery());
statement2.setString(1, database.getInternalName());
@@ -64,7 +61,7 @@ public class SchemaServiceMariaDbImpl extends HibernateConnector implements Sche
log.trace("1={}, 2={}", database.getInternalName(), tableName);
final ResultSet resultSet2 = statement2.executeQuery();
while (resultSet2.next()) {
- table = mariaDbMapper.resultSetToTable(resultSet2, table, queryConfig);
+ table = dataMapper.resultSetToTable(resultSet2, table, queryConfig);
}
/* obtain check constraints metadata */
final PreparedStatement statement3 = connection.prepareStatement(mariaDbMapper.columnsCheckConstraintSelectRawQuery());
@@ -86,7 +83,7 @@ public class SchemaServiceMariaDbImpl extends HibernateConnector implements Sche
log.trace("1={}, 2={}", database.getInternalName(), tableName);
final ResultSet resultSet4 = statement4.executeQuery();
while (resultSet4.next()) {
- table = mariaDbMapper.resultSetToConstraint(resultSet4, table);
+ table = dataMapper.resultSetToConstraint(resultSet4, table);
for (UniqueDto uk : table.getConstraints().getUniques()) {
uk.setTable(metadataMapper.tableDtoToTableBriefDto(table));
final TableDto tmpTable = table;
@@ -133,7 +130,7 @@ public class SchemaServiceMariaDbImpl extends HibernateConnector implements Sche
if (!resultSet1.next()) {
throw new ViewNotFoundException("Failed to find view in the information schema");
}
- ViewDto view = mariaDbMapper.schemaResultSetToView(metadataMapper.privilegedDatabaseDtoToDatabaseDto(privilegedDatabase), resultSet1);
+ ViewDto view = dataMapper.schemaResultSetToView(metadataMapper.privilegedDatabaseDtoToDatabaseDto(privilegedDatabase), resultSet1);
view.setDatabase(database);
view.setVdbid(database.getId());
view.setCreator(database.getCreator());
@@ -148,7 +145,7 @@ public class SchemaServiceMariaDbImpl extends HibernateConnector implements Sche
.columns(new LinkedList<>())
.build();
while (resultSet2.next()) {
- tmp = mariaDbMapper.resultSetToTable(resultSet2, tmp, queryConfig);
+ tmp = dataMapper.resultSetToTable(resultSet2, tmp, queryConfig);
}
view.setColumns(tmp.getColumns()
.stream()
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/StorageServiceS3Impl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/StorageServiceS3Impl.java
index b2d3f1b5504faec2313b6fc7b6b8b9b522b8fdab..9a748d96dcfadcaa5c3b669cfb290b6803100db0 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/StorageServiceS3Impl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/StorageServiceS3Impl.java
@@ -14,9 +14,6 @@ import software.amazon.awssdk.services.s3.model.*;
import java.io.IOException;
import java.io.InputStream;
-import java.time.ZonedDateTime;
-import java.util.LinkedList;
-import java.util.List;
@Log4j2
@Service
@@ -50,7 +47,7 @@ public class StorageServiceS3Impl implements StorageService {
@Override
public byte[] getBytes(String key) throws StorageNotFoundException, StorageUnavailableException {
- return getBytes(s3Config.getS3ImportBucket(), key);
+ return getBytes(s3Config.getS3Bucket(), key);
}
@Override
@@ -66,15 +63,16 @@ public class StorageServiceS3Impl implements StorageService {
@Override
public ExportResourceDto getResource(String key) throws StorageNotFoundException, StorageUnavailableException {
- return getResource(s3Config.getS3ExportBucket(), key);
+ return getResource(s3Config.getS3Bucket(), key);
}
@Override
public ExportResourceDto getResource(String bucket, String key) throws StorageNotFoundException,
StorageUnavailableException {
- final InputStream stream = getObject(bucket, key);
+ final InputStreamResource resource = new InputStreamResource(getObject(bucket, key));
+ log.trace("return export resource with filename: {}", key);
return ExportResourceDto.builder()
- .resource(new InputStreamResource(stream))
+ .resource(resource)
.filename(key)
.build();
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/SubsetServiceMariaDbImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/SubsetServiceMariaDbImpl.java
index d298f2fada278f1eba060b030fbcc1040324adc1..3d19276196895efc00834b60383ddfa226a46bc3 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/SubsetServiceMariaDbImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/SubsetServiceMariaDbImpl.java
@@ -14,16 +14,21 @@ import at.tuwien.config.S3Config;
import at.tuwien.exception.*;
import at.tuwien.gateway.DataDatabaseSidecarGateway;
import at.tuwien.gateway.MetadataServiceGateway;
+import at.tuwien.mapper.DataMapper;
import at.tuwien.mapper.MariaDbMapper;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.SubsetService;
import at.tuwien.service.StorageService;
+import com.google.common.hash.Hashing;
import com.mchange.v2.c3p0.ComboPooledDataSource;
import lombok.extern.log4j.Log4j2;
import net.sf.jsqlparser.JSQLParserException;
+import org.apache.commons.lang3.RandomUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.sql.*;
import java.time.Instant;
import java.util.LinkedList;
@@ -35,6 +40,7 @@ import java.util.UUID;
public class SubsetServiceMariaDbImpl extends HibernateConnector implements SubsetService {
private final S3Config s3Config;
+ private final DataMapper dataMapper;
private final MariaDbMapper mariaDbMapper;
private final MetadataMapper metadataMapper;
private final StorageService storageService;
@@ -42,10 +48,12 @@ public class SubsetServiceMariaDbImpl extends HibernateConnector implements Subs
private final DataDatabaseSidecarGateway dataDatabaseSidecarGateway;
@Autowired
- public SubsetServiceMariaDbImpl(S3Config s3Config, MariaDbMapper mariaDbMapper, MetadataMapper metadataMapper,
- StorageService storageService, MetadataServiceGateway metadataServiceGateway,
+ public SubsetServiceMariaDbImpl(S3Config s3Config, DataMapper dataMapper, MariaDbMapper mariaDbMapper,
+ MetadataMapper metadataMapper, StorageService storageService,
+ MetadataServiceGateway metadataServiceGateway,
DataDatabaseSidecarGateway dataDatabaseSidecarGateway) {
this.s3Config = s3Config;
+ this.dataMapper = dataMapper;
this.mariaDbMapper = mariaDbMapper;
this.metadataMapper = metadataMapper;
this.storageService = storageService;
@@ -54,7 +62,8 @@ public class SubsetServiceMariaDbImpl extends HibernateConnector implements Subs
}
@Override
- public void createQueryStore(PrivilegedContainerDto container, String databaseName) throws SQLException, QueryStoreCreateException {
+ public void createQueryStore(PrivilegedContainerDto container, String databaseName) throws SQLException,
+ QueryStoreCreateException {
final ComboPooledDataSource dataSource = getPrivilegedDataSource(container, databaseName);
final Connection connection = dataSource.getConnection();
try {
@@ -84,8 +93,8 @@ public class SubsetServiceMariaDbImpl extends HibernateConnector implements Subs
public QueryResultDto execute(PrivilegedDatabaseDto database, String statement, Instant timestamp,
UUID userId, Long page, Long size, SortTypeDto sortDirection, String sortColumn)
throws QueryStoreInsertException, SQLException, QueryNotFoundException, TableMalformedException,
- UserNotFoundException, NotAllowedException, RemoteUnavailableException, ServiceException,
- DatabaseNotFoundException {
+ UserNotFoundException, NotAllowedException, RemoteUnavailableException, DatabaseNotFoundException,
+ MetadataServiceException {
final Long queryId = storeQuery(database, statement, timestamp, userId);
final QueryDto query = findById(database, queryId);
return reExecute(database, query, page, size, sortDirection, sortColumn);
@@ -97,7 +106,7 @@ public class SubsetServiceMariaDbImpl extends HibernateConnector implements Subs
SQLException {
final List<ColumnDto> columns;
try {
- columns = mariaDbMapper.parseColumns(metadataMapper.privilegedDatabaseDtoToDatabaseDto(database), query.getQuery());
+ columns = dataMapper.parseColumns(metadataMapper.privilegedDatabaseDtoToDatabaseDto(database), query.getQuery());
} catch (JSQLParserException e) {
log.error("Failed to map/parse columns: {}", e.getMessage());
throw new TableMalformedException("Failed to map/parse columns: " + e.getMessage(), e);
@@ -116,7 +125,7 @@ public class SubsetServiceMariaDbImpl extends HibernateConnector implements Subs
@Override
public List<QueryDto> findAll(PrivilegedDatabaseDto database, Boolean filterPersisted) throws SQLException,
- QueryNotFoundException, RemoteUnavailableException, ServiceException, DatabaseNotFoundException {
+ QueryNotFoundException, RemoteUnavailableException, DatabaseNotFoundException, MetadataServiceException {
final List<IdentifierDto> identifiers = metadataServiceGateway.getIdentifiers(database.getId(), null);
final ComboPooledDataSource dataSource = getPrivilegedDataSource(database);
final Connection connection = dataSource.getConnection();
@@ -129,7 +138,7 @@ public class SubsetServiceMariaDbImpl extends HibernateConnector implements Subs
final ResultSet resultSet = statement.executeQuery();
final List<QueryDto> queries = new LinkedList<>();
while (resultSet.next()) {
- final QueryDto query = mariaDbMapper.resultSetToQueryDto(resultSet);
+ final QueryDto query = dataMapper.resultSetToQueryDto(resultSet);
query.setIdentifiers(identifiers.stream()
.filter(i -> i.getType().equals(IdentifierTypeDto.SUBSET))
.filter(i -> i.getQueryId().equals(query.getId()))
@@ -149,13 +158,21 @@ public class SubsetServiceMariaDbImpl extends HibernateConnector implements Subs
@Override
public ExportResourceDto export(PrivilegedDatabaseDto database, QueryDto query, Instant timestamp, String filename)
throws SQLException, QueryMalformedException, SidecarExportException, StorageNotFoundException,
- StorageUnavailableException, ServiceException, RemoteUnavailableException {
+ StorageUnavailableException, RemoteUnavailableException {
final String filePath = s3Config.getS3FilePath() + "/" + filename;
+ final String viewName = "ex_" + Hashing.sha512()
+ .hashString(new String(RandomUtils.nextBytes(256), Charset.defaultCharset()), Charset.defaultCharset())
+ .toString()
+ .substring(0, 60);
final ComboPooledDataSource dataSource = getPrivilegedDataSource(database);
final Connection connection = dataSource.getConnection();
try {
/* export to data database sidecar */
- connection.prepareStatement(mariaDbMapper.subsetToRawExportQuery(query.getQuery(), timestamp, filePath))
+ connection.prepareStatement(mariaDbMapper.subsetToRawTemporaryViewQuery(viewName, query.getQuery()))
+ .executeUpdate();
+ connection.prepareStatement(mariaDbMapper.subsetToRawExportQuery(viewName, timestamp, filePath))
+ .executeUpdate();
+ connection.prepareStatement(mariaDbMapper.dropViewRawQuery(viewName))
.executeUpdate();
connection.commit();
} catch (SQLException e) {
@@ -176,7 +193,7 @@ public class SubsetServiceMariaDbImpl extends HibernateConnector implements Subs
try {
final PreparedStatement preparedStatement = connection.prepareStatement(statement);
final ResultSet resultSet = preparedStatement.executeQuery();
- return mariaDbMapper.resultListToQueryResultDto(columns, resultSet);
+ return dataMapper.resultListToQueryResultDto(columns, resultSet);
} catch (SQLException e) {
log.error("Failed to execute and map time-versioned query: {}", e.getMessage());
throw new TableMalformedException("Failed to execute and map time-versioned query: " + e.getMessage(), e);
@@ -204,7 +221,7 @@ public class SubsetServiceMariaDbImpl extends HibernateConnector implements Subs
@Override
public QueryDto findById(PrivilegedDatabaseDto database, Long queryId) throws QueryNotFoundException, SQLException,
- RemoteUnavailableException, UserNotFoundException, ServiceException, DatabaseNotFoundException {
+ RemoteUnavailableException, UserNotFoundException, DatabaseNotFoundException, MetadataServiceException {
final ComboPooledDataSource dataSource = getPrivilegedDataSource(database);
final Connection connection = dataSource.getConnection();
try {
@@ -214,7 +231,7 @@ public class SubsetServiceMariaDbImpl extends HibernateConnector implements Subs
if (!resultSet.next()) {
throw new QueryNotFoundException("Failed to find query");
}
- final QueryDto query = mariaDbMapper.resultSetToQueryDto(resultSet);
+ final QueryDto query = dataMapper.resultSetToQueryDto(resultSet);
query.setIdentifiers(metadataServiceGateway.getIdentifiers(database.getId(), queryId));
final UserDto creator = metadataServiceGateway.getUserById(query.getCreatedBy());
log.debug("retrieved creator from metadata service: creator.id={}, creator.username={}", creator.getId(), creator.getUsername());
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/TableServiceMariaDbImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/TableServiceMariaDbImpl.java
index 55e96c516185699e6c17e8e58ed43de1637da1bf..4dacc1e094f0c0f11e6d9949ee4cbf2fbc9e8621 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/TableServiceMariaDbImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/TableServiceMariaDbImpl.java
@@ -13,6 +13,7 @@ import at.tuwien.api.database.table.internal.TableCreateDto;
import at.tuwien.config.S3Config;
import at.tuwien.exception.*;
import at.tuwien.gateway.DataDatabaseSidecarGateway;
+import at.tuwien.mapper.DataMapper;
import at.tuwien.mapper.MariaDbMapper;
import at.tuwien.service.SchemaService;
import at.tuwien.service.StorageService;
@@ -33,16 +34,18 @@ import java.util.*;
public class TableServiceMariaDbImpl extends HibernateConnector implements TableService {
private final S3Config s3Config;
+ private final DataMapper dataMapper;
private final MariaDbMapper mariaDbMapper;
private final SchemaService schemaService;
private final StorageService storageService;
private final DataDatabaseSidecarGateway dataDatabaseSidecarGateway;
@Autowired
- public TableServiceMariaDbImpl(S3Config s3Config, MariaDbMapper mariaDbMapper, SchemaService schemaService,
- StorageService storageService,
+ public TableServiceMariaDbImpl(S3Config s3Config, DataMapper dataMapper, MariaDbMapper mariaDbMapper,
+ SchemaService schemaService, StorageService storageService,
DataDatabaseSidecarGateway dataDatabaseSidecarGateway) {
this.s3Config = s3Config;
+ this.dataMapper = dataMapper;
this.mariaDbMapper = mariaDbMapper;
this.schemaService = schemaService;
this.storageService = storageService;
@@ -51,7 +54,7 @@ public class TableServiceMariaDbImpl extends HibernateConnector implements Table
@Override
public List<TableDto> getSchemas(PrivilegedDatabaseDto database) throws SQLException, TableNotFoundException,
- QueryMalformedException, DatabaseMalformedException {
+ DatabaseMalformedException {
final ComboPooledDataSource dataSource = getPrivilegedDataSource(database);
final Connection connection = dataSource.getConnection();
final List<TableDto> tables = new LinkedList<>();
@@ -83,7 +86,7 @@ public class TableServiceMariaDbImpl extends HibernateConnector implements Table
@Override
public TableStatisticDto getStatistics(PrivilegedTableDto table) throws SQLException, TableMalformedException,
- QueryMalformedException {
+ TableNotFoundException {
final ComboPooledDataSource dataSource = getPrivilegedDataSource(table.getDatabase());
final Connection connection = dataSource.getConnection();
final TableStatisticDto statistic;
@@ -91,8 +94,12 @@ public class TableServiceMariaDbImpl extends HibernateConnector implements Table
/* obtain statistic */
final ResultSet resultSet = connection.prepareStatement(mariaDbMapper.tableColumnStatisticsSelectRawQuery(table.getColumns(), table.getInternalName()))
.executeQuery();
- statistic = mariaDbMapper.resultSetToTableStatistic(resultSet);
- statistic.setRows(getCount(table, null));
+ statistic = dataMapper.resultSetToTableStatistic(resultSet);
+ final TableDto tmpTable = schemaService.inspectTable(table.getDatabase(), table.getInternalName());
+ statistic.setAvgRowLength(tmpTable.getAvgRowLength());
+ statistic.setDataLength(tmpTable.getDataLength());
+ statistic.setMaxDataLength(tmpTable.getMaxDataLength());
+ statistic.setRows(tmpTable.getNumRows());
} catch (SQLException e) {
connection.rollback();
log.error("Failed to obtain column statistics: {}", e.getMessage());
@@ -104,29 +111,23 @@ public class TableServiceMariaDbImpl extends HibernateConnector implements Table
.stream()
.filter(column -> !MariaDbUtil.numericDataTypes.contains(column.getColumnType()))
.forEach(column -> statistic.getColumns().put(column.getInternalName(), new ColumnStatisticDto()));
- log.info("Obtained column statistics for table: {}", table.getInternalName());
+ log.info("Obtained statistics for the table and {} column(s)", statistic.getColumns().size());
+ log.trace("obtained statistics: {}", statistic);
return statistic;
}
@Override
- public TableDto find(PrivilegedDatabaseDto database, String tableName) throws TableNotFoundException, SQLException,
- QueryMalformedException {
+ public TableDto find(PrivilegedDatabaseDto database, String tableName) throws TableNotFoundException, SQLException {
return schemaService.inspectTable(database, tableName);
}
@Override
public TableDto createTable(PrivilegedDatabaseDto database, TableCreateDto data) throws SQLException,
- TableMalformedException, TableExistsException, TableNotFoundException, QueryMalformedException {
+ TableMalformedException, TableExistsException, TableNotFoundException {
final String tableName = mariaDbMapper.nameToInternalName(data.getName());
final ComboPooledDataSource dataSource = getPrivilegedDataSource(database);
final Connection connection = dataSource.getConnection();
try {
- if (data.getNeedSequence()) {
- /* create table sequence if not exists */
- connection.prepareStatement(mariaDbMapper.tableCreateDtoToCreateSequenceRawQuery(data))
- .execute();
- log.info("Created sequence as primary key");
- }
/* create table if not exists */
connection.prepareStatement(mariaDbMapper.tableCreateDtoToCreateTableRawQuery(data))
.execute();
@@ -181,7 +182,7 @@ public class TableServiceMariaDbImpl extends HibernateConnector implements Table
timestamp, size, page))
.executeQuery();
connection.commit();
- queryResult = mariaDbMapper.resultListToQueryResultDto(table.getColumns(), resultSet);
+ queryResult = dataMapper.resultListToQueryResultDto(table.getColumns(), resultSet);
} catch (SQLException e) {
connection.rollback();
log.error("Failed to find data from table {}.{}: {}", table.getDatabase().getInternalName(), table.getInternalName(), e.getMessage());
@@ -205,7 +206,7 @@ public class TableServiceMariaDbImpl extends HibernateConnector implements Table
final ResultSet resultSet = connection.prepareStatement(mariaDbMapper.selectHistoryRawQuery(
table.getDatabase().getInternalName(), table.getInternalName(), size))
.executeQuery();
- history = mariaDbMapper.resultSetToTableHistory(resultSet);
+ history = dataMapper.resultSetToTableHistory(resultSet);
connection.commit();
} catch (SQLException e) {
connection.rollback();
@@ -243,8 +244,8 @@ public class TableServiceMariaDbImpl extends HibernateConnector implements Table
}
@Override
- public void importDataset(PrivilegedTableDto table, ImportCsvDto data)
- throws StorageNotFoundException, SQLException, QueryMalformedException, ServiceException, RemoteUnavailableException {
+ public void importDataset(PrivilegedTableDto table, ImportCsvDto data) throws StorageNotFoundException,
+ SQLException, QueryMalformedException, RemoteUnavailableException, SidecarImportException {
/* import .csv from blob storage to sidecar */
dataDatabaseSidecarGateway.importFile(table.getDatabase().getContainer().getSidecarHost(), table.getDatabase().getContainer().getSidecarPort(), data.getLocation());
/* import .csv from sidecar to database */
@@ -295,8 +296,8 @@ public class TableServiceMariaDbImpl extends HibernateConnector implements Table
}
@Override
- public void createTuple(PrivilegedTableDto table, TupleDto data) throws SQLException,
- QueryMalformedException, TableMalformedException, StorageUnavailableException, StorageNotFoundException {
+ public void createTuple(PrivilegedTableDto table, TupleDto data) throws SQLException, QueryMalformedException,
+ TableMalformedException, StorageUnavailableException, StorageNotFoundException {
log.trace("create tuple: {}", data);
/* for each LOB-like data-column, retrieve the bytes and replace the value */
for (String key : data.getData().keySet()) {
@@ -383,8 +384,8 @@ public class TableServiceMariaDbImpl extends HibernateConnector implements Table
@Override
public ExportResourceDto exportDataset(PrivilegedTableDto table, Instant timestamp) throws SQLException,
- StorageNotFoundException, StorageUnavailableException, QueryMalformedException, ServiceException,
- RemoteUnavailableException {
+ StorageNotFoundException, StorageUnavailableException, QueryMalformedException, RemoteUnavailableException,
+ SidecarExportException {
final String fileName = RandomStringUtils.randomAlphabetic(40) + ".csv";
final String filePath = s3Config.getS3FilePath() + "/" + fileName;
final ComboPooledDataSource dataSource = getPrivilegedDataSource(table.getDatabase());
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/ViewServiceMariaDbImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/ViewServiceMariaDbImpl.java
index c85f5bfbdba9ffbe83d512a37f3f5cdebf5e4c1d..3cdba35f085491334300cc3fb5a3ab3ee30801fd 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/ViewServiceMariaDbImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/ViewServiceMariaDbImpl.java
@@ -11,6 +11,7 @@ import at.tuwien.config.QueryConfig;
import at.tuwien.config.S3Config;
import at.tuwien.exception.*;
import at.tuwien.gateway.DataDatabaseSidecarGateway;
+import at.tuwien.mapper.DataMapper;
import at.tuwien.mapper.MariaDbMapper;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.SchemaService;
@@ -37,6 +38,7 @@ import java.util.List;
public class ViewServiceMariaDbImpl extends HibernateConnector implements ViewService {
private final S3Config s3Config;
+ private final DataMapper dataMapper;
private final QueryConfig queryConfig;
private final MariaDbMapper mariaDbMapper;
private final SchemaService schemaService;
@@ -45,11 +47,12 @@ public class ViewServiceMariaDbImpl extends HibernateConnector implements ViewSe
private final DataDatabaseSidecarGateway dataDatabaseSidecarGateway;
@Autowired
- public ViewServiceMariaDbImpl(S3Config s3Config, QueryConfig queryConfig, MariaDbMapper mariaDbMapper,
- SchemaService schemaService, StorageService storageService,
- MetadataMapper metadataMapper,
+ public ViewServiceMariaDbImpl(S3Config s3Config, DataMapper dataMapper, QueryConfig queryConfig,
+ MariaDbMapper mariaDbMapper, SchemaService schemaService,
+ StorageService storageService, MetadataMapper metadataMapper,
DataDatabaseSidecarGateway dataDatabaseSidecarGateway) {
this.s3Config = s3Config;
+ this.dataMapper = dataMapper;
this.queryConfig = queryConfig;
this.mariaDbMapper = mariaDbMapper;
this.schemaService = schemaService;
@@ -122,7 +125,7 @@ public class ViewServiceMariaDbImpl extends HibernateConnector implements ViewSe
statement2.setString(2, view.getInternalName());
final ResultSet resultSet2 = statement2.executeQuery();
while (resultSet2.next()) {
- view = mariaDbMapper.resultSetToTable(resultSet2, view, queryConfig);
+ view = dataMapper.resultSetToTable(resultSet2, view, queryConfig);
}
connection.commit();
} catch (SQLException e) {
@@ -152,7 +155,7 @@ public class ViewServiceMariaDbImpl extends HibernateConnector implements ViewSe
mariaDbMapper.selectDatasetRawQuery(view.getDatabase().getInternalName(),
view.getInternalName(), mappedColumns, timestamp, size, page))
.executeQuery();
- queryResult = mariaDbMapper.resultListToQueryResultDto(mappedColumns, resultSet);
+ queryResult = dataMapper.resultListToQueryResultDto(mappedColumns, resultSet);
queryResult.setId(view.getId());
connection.commit();
} catch (SQLException e) {
@@ -171,7 +174,7 @@ public class ViewServiceMariaDbImpl extends HibernateConnector implements ViewSe
final Connection connection = dataSource.getConnection();
try {
/* drop view if exists */
- connection.prepareStatement("DROP VIEW IF EXISTS `" + view.getInternalName() + "`;")
+ connection.prepareStatement(mariaDbMapper.dropViewRawQuery(view.getInternalName()))
.execute();
connection.commit();
} catch (SQLException e) {
@@ -211,8 +214,8 @@ public class ViewServiceMariaDbImpl extends HibernateConnector implements ViewSe
@Override
public ExportResourceDto exportDataset(PrivilegedDatabaseDto database, ViewDto view, Instant timestamp)
- throws SQLException, QueryMalformedException, StorageNotFoundException,
- StorageUnavailableException, ServiceException, RemoteUnavailableException {
+ throws SQLException, QueryMalformedException, StorageNotFoundException, StorageUnavailableException,
+ RemoteUnavailableException, SidecarExportException {
final String fileName = RandomStringUtils.randomAlphabetic(40) + ".csv";
final String filePath = s3Config.getS3FilePath() + "/" + fileName;
final ComboPooledDataSource dataSource = getPrivilegedDataSource(database);
diff --git a/dbrepo-metadata-db/setup-schema.sql b/dbrepo-metadata-db/1_setup-schema.sql
similarity index 100%
rename from dbrepo-metadata-db/setup-schema.sql
rename to dbrepo-metadata-db/1_setup-schema.sql
diff --git a/dbrepo-metadata-db/setup-data.sql b/dbrepo-metadata-db/2_setup-data.sql
similarity index 67%
rename from dbrepo-metadata-db/setup-data.sql
rename to dbrepo-metadata-db/2_setup-data.sql
index 0e1a3971b7676bb67cf18a378766673a12d552d4..24e587fc50cb9beb6363c6bc562c7120a9d9a714 100644
--- a/dbrepo-metadata-db/setup-data.sql
+++ b/dbrepo-metadata-db/2_setup-data.sql
@@ -2,7 +2,7 @@ BEGIN;
INSERT INTO `mdb_containers` (name, internal_name, image_id, host, port, ui_host, ui_port, sidecar_host, sidecar_port,
privileged_username, privileged_password)
-VALUES ('MariaDB Galera 11.1.3', 'mariadb_11_1_3', 1, 'data-db', 3306, 'localhost', 3306, 'data-db-sidecar', 8080,
+VALUES ('MariaDB 11.1.3', 'mariadb_11_1_3', 1, 'data-db', 3306, 'localhost', 3306, 'data-db-sidecar', 8080,
'root', 'dbrepo');
COMMIT;
diff --git a/dbrepo-metadata-db/Dockerfile b/dbrepo-metadata-db/Dockerfile
deleted file mode 100644
index dab74c702c6cab912ed060e9cc92a3d74b1e66c8..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-db/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM bitnami/mariadb:11.2.2-debian-11-r0 as runtime
-
-ENV MARIADB_DATABASE=fda
-ENV MARIADB_ROOT_PASSWORD=dbrepo
-
-COPY ./setup-schema.sql /docker-entrypoint-initdb.d/setup-schema.sql
\ No newline at end of file
diff --git a/dbrepo-metadata-db/migrate_1.4.0-1.4.1.sql b/dbrepo-metadata-db/migrate_1.4.0-1.4.1.sql
deleted file mode 100644
index a849d52476bae19b896c710432f511efafd4ebf6..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-db/migrate_1.4.0-1.4.1.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-ALTER TABLE mdb_databases DROP SYSTEM VERSIONING;
-ALTER TABLE mdb_databases ADD COLUMN image longblob;
-ALTER TABLE mdb_databases ADD SYSTEM VERSIONING;
-ALTER TABLE mdb_tables DROP SYSTEM VERSIONING;
-ALTER TABLE mdb_tables ADD COLUMN processed_constraints BOOLEAN NOT NULL DEFAULT false;
-ALTER TABLE mdb_tables ADD SYSTEM VERSIONING;
-ALTER TABLE mdb_columns DROP SYSTEM VERSIONING;
-ALTER TABLE mdb_columns DROP COLUMN alias;
-ALTER TABLE mdb_columns ADD SYSTEM VERSIONING;
-ALTER TABLE mdb_constraints_foreign_key DROP SYSTEM VERSIONING;
-ALTER TABLE mdb_constraints_foreign_key ADD COLUMN name VARCHAR(255) NOT NULL;
-ALTER TABLE mdb_constraints_foreign_key ADD SYSTEM VERSIONING;
-ALTER TABLE mdb_constraints_unique DROP SYSTEM VERSIONING;
-ALTER TABLE mdb_constraints_unique ADD COLUMN name VARCHAR(255) NOT NULL;
-ALTER TABLE mdb_constraints_unique ADD SYSTEM VERSIONING;
-ALTER TABLE mdb_view_columns DROP SYSTEM VERSIONING;
-ALTER TABLE mdb_view_columns ADD COLUMN alias VARCHAR(100);
-ALTER TABLE mdb_view_columns CHANGE COLUMN position ordinal_position INTEGER;
-ALTER TABLE mdb_view_columns ADD SYSTEM VERSIONING;
\ No newline at end of file
diff --git a/dbrepo-metadata-service/Dockerfile b/dbrepo-metadata-service/Dockerfile
index 75fe485c16073094c202a476cd55ddf5c6fb84e7..74e82043731ab8970c2d42b58032f2b5e5b00f3c 100644
--- a/dbrepo-metadata-service/Dockerfile
+++ b/dbrepo-metadata-service/Dockerfile
@@ -1,6 +1,6 @@
###### FIRST STAGE ######
-FROM maven:3-openjdk-17 as build
-MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
+FROM maven:3-openjdk-17 AS build
+LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
COPY ./pom.xml ./
COPY ./api/pom.xml ./api/
@@ -27,16 +27,16 @@ COPY ./test ./test
RUN mvn clean install -DskipTests
###### SECOND STAGE ######
-FROM amazoncorretto:17-alpine3.19 as runtime
-MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
+FROM amazoncorretto:17-alpine3.19 AS runtime
+LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
RUN apk add --no-cache curl bash jq
WORKDIR /app
-USER 65534
+USER 1001
-COPY --from=build --chown=65534 ./rest-service/target/dbrepo-metadata-service-rest-service-*.jar ./metadata-service.jar
+COPY --from=build --chown=1001 ./rest-service/target/dbrepo-metadata-service-rest-service-*.jar ./metadata-service.jar
# non-root port
EXPOSE 8080
diff --git a/dbrepo-metadata-service/api/pom.xml b/dbrepo-metadata-service/api/pom.xml
index 6815b5f9e6139001d2908d339a254e1424d21732..b62bfdc94ad922ffa7b1c8f44e3f1e54d89a2d87 100644
--- a/dbrepo-metadata-service/api/pom.xml
+++ b/dbrepo-metadata-service/api/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
- <version>1.4.4</version>
+ <version>1.4.5</version>
</parent>
<artifactId>dbrepo-metadata-service-api</artifactId>
<name>dbrepo-metadata-service-api</name>
- <version>1.4.4</version>
+ <version>1.4.5</version>
<dependencies/>
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/auth/KeycloakErrorDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/auth/KeycloakErrorDto.java
index 4b9eefa16d30fcc264a4673aaf6ddde8f1d4aeb0..9b8ad90ea55d8d4aba75e637e4f9906fcc7e86d9 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/auth/KeycloakErrorDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/auth/KeycloakErrorDto.java
@@ -6,6 +6,8 @@ import jakarta.validation.constraints.NotNull;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
+import java.io.Serializable;
+
@Getter
@Setter
@Builder
@@ -13,7 +15,7 @@ import lombok.extern.jackson.Jacksonized;
@AllArgsConstructor
@Jacksonized
@ToString
-public class KeycloakErrorDto {
+public class KeycloakErrorDto implements Serializable {
@NotNull
@Schema(example = "invalid_grant")
@@ -23,4 +25,6 @@ public class KeycloakErrorDto {
@JsonProperty("error_description")
private String errorDescription;
+ private String errorMessage;
+
}
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableCreateDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableCreateDto.java
index 312ecaf2ac45058a5c52677815e05194a647bfd4..e2ef252708c4457165e126ea228b17aa00177c57 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableCreateDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableCreateDto.java
@@ -27,9 +27,6 @@ public class TableCreateDto {
@Schema(example = "Air Quality")
private String name;
- @JsonProperty("need_sequence")
- private transient boolean needSequence;
-
@Size(max = 180)
@Schema(example = "Air Quality in Austria")
private String description;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableDto.java
index 5764b311cacdd773e1e071718c2caf6db65977a7..a512cf8010195e5c107f35d8d2756251460bca62 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableDto.java
@@ -25,6 +25,7 @@ import java.util.UUID;
@AllArgsConstructor
@Jacksonized
@ToString
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
public class TableDto {
@NotNull
@@ -32,6 +33,7 @@ public class TableDto {
@NotNull
@JsonProperty("database_id")
+ @EqualsAndHashCode.Include
private Long tdbid;
@NotBlank
@@ -41,6 +43,7 @@ public class TableDto {
@NotBlank
@JsonProperty("internal_name")
@Schema(example = "air_quality")
+ @EqualsAndHashCode.Include
private String internalName;
@Schema
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableStatisticDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableStatisticDto.java
index 8d41bcc7ff79ba6a51ea1caabad2fd52686cd4a5..8862723b9ca573a9b7356f207d145850d1c233af 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableStatisticDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableStatisticDto.java
@@ -2,6 +2,7 @@ package at.tuwien.api.database.table;
import at.tuwien.api.database.table.columns.ColumnStatisticDto;
import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
@@ -17,10 +18,23 @@ import java.util.Map;
@ToString
public class TableStatisticDto {
- @NotNull
@JsonProperty("rows")
+ @Schema(example = "5")
private Long rows;
+ @JsonProperty("data_length")
+ @Schema(example = "16384", description = "in bytes")
+ private Long dataLength;
+
+ @JsonProperty("max_data_length")
+ @Schema(example = "0", description = "in bytes")
+ private Long maxDataLength;
+
+ @JsonProperty("avg_row_length")
+ @Schema(example = "3276", description = "in bytes")
+ private Long avgRowLength;
+
@NotNull
+ @ToString.Exclude
private Map<String, ColumnStatisticDto> columns;
}
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TupleDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TupleDto.java
index 88170c4e0f4e2ec5f805b2b045b7f9a0f65b5c3e..a428cb572604815ae80ab9f47f28965a7a784a69 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TupleDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TupleDto.java
@@ -16,7 +16,7 @@ import java.util.Map;
@ToString
public class TupleDto {
- @NotNull(message = "data is required")
+ @NotNull
private Map<String, Object> data;
}
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java
index 026d5d89b7dbb77a6bf4cd94b60448f8a73bc424..a506dbca82e9e64d4a0cec4fec12640452f56456 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java
@@ -25,6 +25,7 @@ import java.util.List;
@AllArgsConstructor
@Jacksonized
@ToString
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
public class ColumnDto {
@NotNull
@@ -52,6 +53,7 @@ public class ColumnDto {
@Size(max = 64)
@JsonProperty("internal_name")
@Schema(example = "mdb_date")
+ @EqualsAndHashCode.Include
private String internalName;
@Schema
@@ -122,6 +124,7 @@ public class ColumnDto {
@ToString.Exclude
@JsonIgnore
+ @EqualsAndHashCode.Include
private TableDto table;
@ToString.Exclude
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/internal/TableCreateDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/internal/TableCreateDto.java
index 9e92a46c484eadf1fd486995c39260294241d6c5..0db45a9f1b5690c4cb1d4e3a988b4c76824713e1 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/internal/TableCreateDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/internal/TableCreateDto.java
@@ -2,7 +2,6 @@ package at.tuwien.api.database.table.internal;
import at.tuwien.api.database.table.columns.ColumnCreateDto;
import at.tuwien.api.database.table.constraints.ConstraintsCreateDto;
-import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
@@ -26,10 +25,6 @@ public class TableCreateDto {
@Schema(example = "Air Quality")
private String name;
- @NotNull
- @JsonProperty("need_sequence")
- private Boolean needSequence;
-
@Size(max = 180)
@Schema(example = "Air Quality in Austria")
private String description;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/RoleRepresentationDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/RoleRepresentationDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..8f7d795fdbb0a529fa4492c18f9028016e306d9e
--- /dev/null
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/RoleRepresentationDto.java
@@ -0,0 +1,34 @@
+package at.tuwien.api.keycloak;
+
+import lombok.*;
+import lombok.extern.jackson.Jacksonized;
+
+import java.util.UUID;
+
+/**
+ * https://www.keycloak.org/docs-api/22.0.1/rest-api/index.html#RoleRepresentation
+ */
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Jacksonized
+@ToString
+public class RoleRepresentationDto {
+
+ private UUID id;
+
+ private String name;
+
+ private String description;
+
+ private Boolean scopeParamRequired;
+
+ private Boolean composite;
+
+ private Boolean clientRole;
+
+ private UUID containerId;
+
+}
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UserAttributesDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UserAttributesDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..027955ba77b69fd708c1c18463c1a92d09c93c95
--- /dev/null
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UserAttributesDto.java
@@ -0,0 +1,27 @@
+package at.tuwien.api.keycloak;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import lombok.extern.jackson.Jacksonized;
+
+import java.util.UUID;
+
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Jacksonized
+@ToString
+public class UserAttributesDto {
+
+ @Schema(example = "s3cr3t")
+ @JsonProperty("LDAP_ENTRY_DN")
+ private String[] ldapEntryDn;
+
+ @Schema(example = "false")
+ @JsonProperty("LDAP_ID")
+ private UUID[] ldapId;
+
+}
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UserCreateDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UserCreateDto.java
index 0ebaffff10441d984ea13005d8dc1ff3db6954cb..fe4b69550259023b135bf2ae43a70c85c888cce0 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UserCreateDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UserCreateDto.java
@@ -32,4 +32,8 @@ public class UserCreateDto {
@NotNull
private List<CredentialDto> credentials;
+ private List<String> realmRoles;
+
+ private List<String> groups;
+
}
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UserDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UserDto.java
index a96c6932abc2a3a6015cd730427f45b3120cee50..a2d7811ab0aa334a4f3a5d49916428b58166317b 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UserDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UserDto.java
@@ -46,4 +46,7 @@ public class UserDto {
@Schema(example = "0")
private Long notBefore;
+ @NotNull
+ private UserAttributesDto attributes;
+
}
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/ldap/UserDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/ldap/UserDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..3cb0a86e738a994a829fa064a95c5db1ac90b3a3
--- /dev/null
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/ldap/UserDto.java
@@ -0,0 +1,29 @@
+package at.tuwien.api.ldap;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
+import lombok.extern.jackson.Jacksonized;
+
+import java.util.UUID;
+
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Jacksonized
+@ToString
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
+public class UserDto {
+
+ @NotNull
+ @EqualsAndHashCode.Include
+ private UUID id;
+
+ @NotNull
+ private String username;
+
+ @NotNull
+ private String email;
+
+}
diff --git a/dbrepo-metadata-service/entities/pom.xml b/dbrepo-metadata-service/entities/pom.xml
index 62dec0e318ee6dc3f660220db1d4f233a2b7a7e0..2fb8efa9e9f07076e4891377c876658dbb04d146 100644
--- a/dbrepo-metadata-service/entities/pom.xml
+++ b/dbrepo-metadata-service/entities/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
- <version>1.4.4</version>
+ <version>1.4.5</version>
</parent>
<artifactId>dbrepo-metadata-service-entities</artifactId>
<name>dbrepo-metadata-service-entity</name>
- <version>1.4.4</version>
+ <version>1.4.5</version>
<dependencies/>
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java
index f463370e4d252f87cdaf11266e3497a4af4c2c36..2e154b86973601af8560c6055fe388fd614858a6 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java
@@ -117,6 +117,7 @@ public class Database implements Serializable {
private List<Identifier> subsets;
@ToString.Exclude
+ @OrderBy("id DESC")
@OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.ALL, CascadeType.PERSIST}, mappedBy = "database", orphanRemoval = true)
private List<Table> tables;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/Table.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/Table.java
index 57d9dbab1b9b95b143fde6752384457d99653857..9a402201eaf38191213abb609544709d28b516c4 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/Table.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/Table.java
@@ -88,6 +88,7 @@ public class Table {
})
private Database database;
+ @ToString.Exclude
@OnDelete(action = OnDeleteAction.CASCADE)
@OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE, CascadeType.PERSIST}, mappedBy = "table")
@OrderBy("ordinalPosition")
@@ -104,6 +105,7 @@ public class Table {
@OrderBy("id DESC")
private List<Identifier> identifiers;
+ @ToString.Exclude
@Embedded
private Constraints constraints;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
index 9a50f5c0545c8351b5fae16157b171d2f52dd870..c869e41637659675e317281fd55092e3b331fc6b 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
@@ -86,13 +86,13 @@ public class TableColumn implements Comparable<TableColumn> {
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC")
private Instant created;
- @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.ALL, CascadeType.PERSIST})
+ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE, CascadeType.PERSIST})
@JoinTable(name = "mdb_columns_concepts",
joinColumns = @JoinColumn(name = "cid", referencedColumnName = "id", nullable = false),
inverseJoinColumns = @JoinColumn(name = "id", referencedColumnName = "id"))
private TableColumnConcept concept;
- @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.ALL, CascadeType.PERSIST})
+ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE, CascadeType.PERSIST})
@JoinTable(name = "mdb_columns_units",
joinColumns = @JoinColumn(name = "cid", referencedColumnName = "id", nullable = false),
inverseJoinColumns = @JoinColumn(name = "id", referencedColumnName = "id"))
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/user/User.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/user/User.java
index aff997a3ae3caf76f70c056d9dbf8b7bbc016f3e..797b0bd30f760fd27c2a82789ff22674b14acab1 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/user/User.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/user/User.java
@@ -3,6 +3,7 @@ package at.tuwien.entities.user;
import at.tuwien.entities.database.DatabaseAccess;
import jakarta.persistence.*;
import lombok.*;
+import lombok.extern.log4j.Log4j2;
import org.hibernate.annotations.JdbcTypeCode;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
@@ -10,6 +11,7 @@ import java.security.Principal;
import java.util.List;
import java.util.UUID;
+@Log4j2
@Data
@Entity
@Builder
@@ -19,9 +21,6 @@ import java.util.UUID;
@EntityListeners(AuditingEntityListener.class)
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
@Table(name = "mdb_users")
-@NamedQueries({
- @NamedQuery(name = "User.findByUsername", query = "select u from User u where u.username = ?1")
-})
public class User {
@Id
@@ -71,12 +70,16 @@ public class User {
return true;
}
if (o instanceof Principal principal) {
- return this.getUsername().equals(principal.getName());
+ final boolean result = this.getUsername().equals(principal.getName());
+ log.trace("check if username {} equals principal name {}: {}", username, principal.getName(), result);
+ return result;
}
if (!(o instanceof User other)) {
return false;
}
- return this.getId().equals(other.getId());
+ final boolean result = this.getId().equals(other.getId());
+ log.trace("check if id {} equals other id {}: {}", id, other.getId(), result);
+ return result;
}
}
diff --git a/dbrepo-metadata-service/metrics.md b/dbrepo-metadata-service/metrics.md
index 976bacc4aaf07d381b939b457d9af19f5417de41..c8cd48baf08069f079f5ce9df58123751be65f2d 100644
--- a/dbrepo-metadata-service/metrics.md
+++ b/dbrepo-metadata-service/metrics.md
@@ -1,67 +1,67 @@
-| **Metric** | **Description** |
-|------------------------------------|----------------------------------------|
-| `dbrepo_access_delete` | Revoke access to some database |
-| `dbrepo_access_get` | Check access to some database |
-| `dbrepo_access_give` | Give access to some database |
-| `dbrepo_access_modify` | Modify access to some database |
-| `dbrepo_container_create` | Create container |
-| `dbrepo_container_delete` | Delete some container |
-| `dbrepo_container_find` | Find some container |
-| `dbrepo_container_findall` | Find all containers |
-| `dbrepo_database_create` | Create database |
-| `dbrepo_database_find` | Find some database |
-| `dbrepo_database_findall` | List databases |
-| `dbrepo_database_image` | Update database image |
-| `dbrepo_database_transfer` | Update database owner |
-| `dbrepo_database_visibility` | Update database visibility |
-| `dbrepo_identifier_create` | Draft identifier |
-| `dbrepo_identifier_delete` | Delete some identifier |
-| `dbrepo_identifier_find` | Find some identifier |
-| `dbrepo_identifier_list` | Find all identifiers |
-| `dbrepo_identifier_publish` | Publish identifier |
-| `dbrepo_identifier_retrieve` | Retrieve metadata from identifier |
-| `dbrepo_identifier_save` | Save identifier |
-| `dbrepo_image_create` | Create image |
-| `dbrepo_image_delete` | Delete some image |
-| `dbrepo_image_find` | Find some image |
-| `dbrepo_image_findall` | Find all images |
-| `dbrepo_image_update` | Update some image |
-| `dbrepo_license_findall` | Get all licenses |
-| `dbrepo_maintenance_create` | Create maintenance message |
-| `dbrepo_maintenance_delete` | Delete maintenance message |
-| `dbrepo_maintenance_find` | Find one maintenance message |
-| `dbrepo_maintenance_findall` | Find maintenance messages |
-| `dbrepo_maintenance_update` | Update maintenance message |
-| `dbrepo_oai_identifiers_list` | List the identifiers |
-| `dbrepo_oai_identify` | Identify the repository |
-| `dbrepo_oai_metadataformats_list` | List the metadata formats |
-| `dbrepo_oai_record_get` | Get the record |
-| `dbrepo_ontologies_create` | Register a new ontology |
-| `dbrepo_ontologies_delete` | Delete an ontology |
-| `dbrepo_ontologies_entities_find` | Find entities |
-| `dbrepo_ontologies_find` | Find one ontology |
-| `dbrepo_ontologies_findall` | List all ontologies |
-| `dbrepo_ontologies_update` | Update an ontology |
-| `dbrepo_semantic_column_analyse` | Suggest table column semantics |
-| `dbrepo_semantic_concepts_findall` | List semantic concepts |
-| `dbrepo_semantic_table_analyse` | Suggest table semantics |
-| `dbrepo_semantic_units_findall` | List semantic units |
-| `dbrepo_semantics_column_save` | Update a table column semantic mapping |
-| `dbrepo_statistic_table_update` | Update table statistics |
-| `dbrepo_table_create` | Create a table |
-| `dbrepo_table_delete` | Delete a table |
-| `dbrepo_tables_find` | Get information about table |
-| `dbrepo_tables_findall` | List all tables |
-| `dbrepo_tables_refresh` | Refresh database tables metadata |
-| `dbrepo_user_create` | Create user |
-| `dbrepo_user_find` | Get a user info |
-| `dbrepo_user_modify` | Modify user information |
-| `dbrepo_user_password_modify` | Modify user password |
-| `dbrepo_user_refresh_token` | Refresh user token |
-| `dbrepo_user_token` | Obtain user token |
-| `dbrepo_users_list` | Find all users |
-| `dbrepo_view_create` | Create a view |
-| `dbrepo_view_delete` | Delete one view |
-| `dbrepo_view_find` | Find one view |
-| `dbrepo_views_findall` | Find all views |
-| `dbrepo_views_refresh` | Refresh database views metadata |
+| **Metric** | **Description** |
+|------------------------------------|-------------------------------|
+| `dbrepo_access_delete` | Delete access |
+| `dbrepo_access_get` | Find/Check access |
+| `dbrepo_access_give` | Give access |
+| `dbrepo_access_modify` | Modify access |
+| `dbrepo_container_create` | Create container |
+| `dbrepo_container_delete` | Delete container |
+| `dbrepo_container_find` | Find container |
+| `dbrepo_container_findall` | List containers |
+| `dbrepo_database_create` | Create database |
+| `dbrepo_database_find` | Find database |
+| `dbrepo_database_findall` | List databases |
+| `dbrepo_database_image` | Update database preview image |
+| `dbrepo_database_transfer` | Update database owner |
+| `dbrepo_database_visibility` | Update database visibility |
+| `dbrepo_identifier_create` | Create identifier |
+| `dbrepo_identifier_delete` | Delete identifier |
+| `dbrepo_identifier_find` | Find identifier |
+| `dbrepo_identifier_list` | List identifiers |
+| `dbrepo_identifier_publish` | Publish identifier |
+| `dbrepo_identifier_retrieve` | Retrieve PID metadata |
+| `dbrepo_identifier_save` | Save identifier |
+| `dbrepo_image_create` | Create image |
+| `dbrepo_image_delete` | Delete image |
+| `dbrepo_image_find` | Find image |
+| `dbrepo_image_findall` | List images |
+| `dbrepo_image_update` | Update image |
+| `dbrepo_license_findall` | List licenses |
+| `dbrepo_maintenance_create` | Create message |
+| `dbrepo_maintenance_delete` | Delete message |
+| `dbrepo_maintenance_find` | Find message |
+| `dbrepo_maintenance_findall` | List messages |
+| `dbrepo_maintenance_update` | Update message |
+| `dbrepo_oai_identifiers_list` | List identifiers |
+| `dbrepo_oai_identify` | Identify repository |
+| `dbrepo_oai_metadataformats_list` | List metadata formats |
+| `dbrepo_oai_record_get` | Get record |
+| `dbrepo_ontologies_create` | Create ontology |
+| `dbrepo_ontologies_delete` | Delete ontology |
+| `dbrepo_ontologies_entities_find` | Find entities |
+| `dbrepo_ontologies_find` | Find ontology |
+| `dbrepo_ontologies_findall` | List ontologies |
+| `dbrepo_ontologies_update` | Update ontology |
+| `dbrepo_semantic_column_analyse` | Suggest semantics |
+| `dbrepo_semantic_concepts_findall` | List concepts |
+| `dbrepo_semantic_table_analyse` | Suggest semantics |
+| `dbrepo_semantic_units_findall` | List units |
+| `dbrepo_semantics_column_save` | Update semantics |
+| `dbrepo_statistic_table_update` | Update statistics |
+| `dbrepo_table_create` | Create table |
+| `dbrepo_table_delete` | Delete table |
+| `dbrepo_tables_find` | Find table |
+| `dbrepo_tables_findall` | List tables |
+| `dbrepo_tables_refresh` | Update database table schemas |
+| `dbrepo_user_create` | Create user |
+| `dbrepo_user_find` | Get user |
+| `dbrepo_user_modify` | Update user |
+| `dbrepo_user_password_modify` | Update user password |
+| `dbrepo_user_refresh_token` | Refresh token |
+| `dbrepo_user_token` | Create token |
+| `dbrepo_users_list` | List users |
+| `dbrepo_view_create` | Create view |
+| `dbrepo_view_delete` | Delete view |
+| `dbrepo_view_find` | Get view |
+| `dbrepo_views_findall` | List views |
+| `dbrepo_views_refresh` | Update database view schemas |
diff --git a/dbrepo-metadata-service/oai/pom.xml b/dbrepo-metadata-service/oai/pom.xml
index e432736721cba310f5a48416beeeb9ed3196774e..5b37750134eb43f3c077ac3c719c94fcad8d6d77 100644
--- a/dbrepo-metadata-service/oai/pom.xml
+++ b/dbrepo-metadata-service/oai/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
- <version>1.4.4</version>
+ <version>1.4.5</version>
</parent>
<artifactId>dbrepo-metadata-service-oai</artifactId>
<name>dbrepo-metadata-service-oai</name>
- <version>1.4.4</version>
+ <version>1.4.5</version>
<dependencies/>
diff --git a/dbrepo-metadata-service/pom.xml b/dbrepo-metadata-service/pom.xml
index 563373645070c416f257ec69b25354e1d00111c5..0fdc80b428c3120888362bed339edbd9097f0ac4 100644
--- a/dbrepo-metadata-service/pom.xml
+++ b/dbrepo-metadata-service/pom.xml
@@ -11,7 +11,7 @@
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
<name>dbrepo-metadata-service</name>
- <version>1.4.4</version>
+ <version>1.4.5</version>
<description>Service that manages the metadata</description>
@@ -58,6 +58,7 @@
<keycloak-testcontainer.version>3.2.0</keycloak-testcontainer.version>
<aws-s3.version>2.25.23</aws-s3.version>
<jackson.version>2.15.2</jackson.version>
+ <minio.version>8.5.7</minio.version>
</properties>
<dependencies>
@@ -248,6 +249,11 @@
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>minio</artifactId>
+ <version>${testcontainers.version}</version>
+ </dependency>
<dependency>
<groupId>com.github.dasniko</groupId>
<artifactId>testcontainers-keycloak</artifactId>
diff --git a/dbrepo-metadata-service/report/pom.xml b/dbrepo-metadata-service/report/pom.xml
index 9012f19379811a0fec2a80cdb869ec0720ce98e1..6a7874d4e9352a783ca03711ab1e8efe4eabadea 100644
--- a/dbrepo-metadata-service/report/pom.xml
+++ b/dbrepo-metadata-service/report/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
- <version>1.4.4</version>
+ <version>1.4.5</version>
</parent>
<artifactId>dbrepo-metadata-service-report</artifactId>
<name>dbrepo-metadata-service-report</name>
- <version>1.4.4</version>
+ <version>1.4.5</version>
<dependencies>
<dependency>
diff --git a/dbrepo-metadata-service/repositories/pom.xml b/dbrepo-metadata-service/repositories/pom.xml
index 1fa4ba34e789e6d9f12a45e756b7e7d481309baa..b67917715a5c2e1200e3e14884e45cd1ff60c055 100644
--- a/dbrepo-metadata-service/repositories/pom.xml
+++ b/dbrepo-metadata-service/repositories/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
- <version>1.4.4</version>
+ <version>1.4.5</version>
</parent>
<artifactId>dbrepo-metadata-service-repositories</artifactId>
<name>dbrepo-metadata-service-repositories</name>
- <version>1.4.4</version>
+ <version>1.4.5</version>
<dependencies>
<dependency>
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AuthServiceConnectionException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AuthServiceConnectionException.java
new file mode 100644
index 0000000000000000000000000000000000000000..08cb54f9de186033e1513c270e4461c5638db9d0
--- /dev/null
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AuthServiceConnectionException.java
@@ -0,0 +1,21 @@
+package at.tuwien.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(code = HttpStatus.BAD_GATEWAY, reason = "error.auth.connection")
+public class AuthServiceConnectionException extends Exception {
+
+ public AuthServiceConnectionException(String msg) {
+ super(msg);
+ }
+
+ public AuthServiceConnectionException(String msg, Throwable thr) {
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
+ }
+
+ public AuthServiceConnectionException(Throwable thr) {
+ super(thr);
+ }
+
+}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/StorageUnavailableException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AuthServiceException.java
similarity index 52%
rename from dbrepo-data-service/services/src/main/java/at/tuwien/exception/StorageUnavailableException.java
rename to dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AuthServiceException.java
index b25bac260eba40176933114765c0633de3caa21a..de43ce1cbefab60f6e56d4aa942d107c921f7291 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/StorageUnavailableException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AuthServiceException.java
@@ -3,18 +3,18 @@ package at.tuwien.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
-@ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE, reason = "error.storage.missing")
-public class StorageUnavailableException extends Exception {
+@ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE, reason = "error.auth.invalid")
+public class AuthServiceException extends Exception {
- public StorageUnavailableException(String message) {
+ public AuthServiceException(String message) {
super(message);
}
- public StorageUnavailableException(String message, Throwable thr) {
+ public AuthServiceException(String message, Throwable thr) {
super(message, thr);
}
- public StorageUnavailableException(Throwable thr) {
+ public AuthServiceException(Throwable thr) {
super(thr);
}
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerServiceConnectionException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerServiceConnectionException.java
new file mode 100644
index 0000000000000000000000000000000000000000..6efa16fa8757fbfcf218f09f0750a500d40161b3
--- /dev/null
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerServiceConnectionException.java
@@ -0,0 +1,21 @@
+package at.tuwien.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(code = HttpStatus.BAD_GATEWAY, reason = "error.broker.connection")
+public class BrokerServiceConnectionException extends Exception {
+
+ public BrokerServiceConnectionException(String msg) {
+ super(msg);
+ }
+
+ public BrokerServiceConnectionException(String msg, Throwable thr) {
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
+ }
+
+ public BrokerServiceConnectionException(Throwable thr) {
+ super(thr);
+ }
+
+}
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerServiceException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerServiceException.java
new file mode 100644
index 0000000000000000000000000000000000000000..86201c5d691bdede33bca6bef2606125b29775de
--- /dev/null
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerServiceException.java
@@ -0,0 +1,21 @@
+package at.tuwien.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE, reason = "error.broker.invalid")
+public class BrokerServiceException extends Exception {
+
+ public BrokerServiceException(String message) {
+ super(message);
+ }
+
+ public BrokerServiceException(String message, Throwable thr) {
+ super(message, thr);
+ }
+
+ public BrokerServiceException(Throwable thr) {
+ super(thr);
+ }
+
+}
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ServiceConnectionException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DataServiceConnectionException.java
similarity index 57%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ServiceConnectionException.java
rename to dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DataServiceConnectionException.java
index 069e1d774a564e7286bd6cbc73d6d501f7e81562..0125a781add4e384e43ec87690b0f8afaeb30c92 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ServiceConnectionException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DataServiceConnectionException.java
@@ -4,17 +4,17 @@ import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
@ResponseStatus(code = HttpStatus.BAD_GATEWAY, reason = "error.data.connection")
-public class ServiceConnectionException extends Exception {
+public class DataServiceConnectionException extends Exception {
- public ServiceConnectionException(String msg) {
+ public DataServiceConnectionException(String msg) {
super(msg);
}
- public ServiceConnectionException(String msg, Throwable thr) {
+ public DataServiceConnectionException(String msg, Throwable thr) {
super(msg + ": " + thr.getLocalizedMessage(), thr);
}
- public ServiceConnectionException(Throwable thr) {
+ public DataServiceConnectionException(Throwable thr) {
super(thr);
}
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ServiceException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DataServiceException.java
similarity index 59%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ServiceException.java
rename to dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DataServiceException.java
index 70bef91528a3731b387b6ab55d95a7a1c99f4572..f76e662a655593ffe5991ec84da207b58df052b2 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ServiceException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DataServiceException.java
@@ -4,17 +4,17 @@ import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
@ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE, reason = "error.data.invalid")
-public class ServiceException extends Exception {
+public class DataServiceException extends Exception {
- public ServiceException(String message) {
+ public DataServiceException(String message) {
super(message);
}
- public ServiceException(String message, Throwable thr) {
+ public DataServiceException(String message, Throwable thr) {
super(message, thr);
}
- public ServiceException(Throwable thr) {
+ public DataServiceException(Throwable thr) {
super(thr);
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/DatabaseMalformedException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseMalformedException.java
similarity index 100%
rename from dbrepo-data-service/services/src/main/java/at/tuwien/exception/DatabaseMalformedException.java
rename to dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseMalformedException.java
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/DatabaseUnavailableException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseUnavailableException.java
similarity index 100%
rename from dbrepo-data-service/services/src/main/java/at/tuwien/exception/DatabaseUnavailableException.java
rename to dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseUnavailableException.java
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ExternalServiceException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ExternalServiceException.java
new file mode 100644
index 0000000000000000000000000000000000000000..d5f399c40205b886607f5fc1c22d17d9b159f6e4
--- /dev/null
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ExternalServiceException.java
@@ -0,0 +1,21 @@
+package at.tuwien.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE, reason = "error.external.invalid")
+public class ExternalServiceException extends Exception {
+
+ public ExternalServiceException(String message) {
+ super(message);
+ }
+
+ public ExternalServiceException(String message, Throwable thr) {
+ super(message, thr);
+ }
+
+ public ExternalServiceException(Throwable thr) {
+ super(thr);
+ }
+
+}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/ServiceConnectionException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/MetadataServiceConnectionException.java
similarity index 56%
rename from dbrepo-data-service/services/src/main/java/at/tuwien/exception/ServiceConnectionException.java
rename to dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/MetadataServiceConnectionException.java
index 6a91dac23aeaf7ff7efd0b5439e344606ce968a7..329de6ffc4b82b859da0ea41aca7ed99a3b1802c 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/ServiceConnectionException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/MetadataServiceConnectionException.java
@@ -4,17 +4,17 @@ import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
@ResponseStatus(code = HttpStatus.BAD_GATEWAY, reason = "error.metadata.connection")
-public class ServiceConnectionException extends Exception {
+public class MetadataServiceConnectionException extends Exception {
- public ServiceConnectionException(String msg) {
+ public MetadataServiceConnectionException(String msg) {
super(msg);
}
- public ServiceConnectionException(String msg, Throwable thr) {
+ public MetadataServiceConnectionException(String msg, Throwable thr) {
super(msg + ": " + thr.getLocalizedMessage(), thr);
}
- public ServiceConnectionException(Throwable thr) {
+ public MetadataServiceConnectionException(Throwable thr) {
super(thr);
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/ServiceException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/MetadataServiceException.java
similarity index 58%
rename from dbrepo-data-service/services/src/main/java/at/tuwien/exception/ServiceException.java
rename to dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/MetadataServiceException.java
index a543d02c9a4fe32335332eeef980c6283e4c4450..a6784d6dd01ed0c60379246373b26d3c49a8875d 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/ServiceException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/MetadataServiceException.java
@@ -4,17 +4,17 @@ import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
@ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE, reason = "error.metadata.invalid")
-public class ServiceException extends Exception {
+public class MetadataServiceException extends Exception {
- public ServiceException(String message) {
+ public MetadataServiceException(String message) {
super(message);
}
- public ServiceException(String message, Throwable thr) {
+ public MetadataServiceException(String message, Throwable thr) {
super(message, thr);
}
- public ServiceException(Throwable thr) {
+ public MetadataServiceException(Throwable thr) {
super(thr);
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/QueryMalformedException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryMalformedException.java
similarity index 100%
rename from dbrepo-data-service/services/src/main/java/at/tuwien/exception/QueryMalformedException.java
rename to dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryMalformedException.java
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/QueryNotSupportedException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryNotSupportedException.java
similarity index 100%
rename from dbrepo-data-service/services/src/main/java/at/tuwien/exception/QueryNotSupportedException.java
rename to dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryNotSupportedException.java
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/QueryStoreCreateException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStoreCreateException.java
similarity index 100%
rename from dbrepo-data-service/services/src/main/java/at/tuwien/exception/QueryStoreCreateException.java
rename to dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStoreCreateException.java
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/QueryStoreGCException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStoreGCException.java
similarity index 100%
rename from dbrepo-data-service/services/src/main/java/at/tuwien/exception/QueryStoreGCException.java
rename to dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStoreGCException.java
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/QueryStoreInsertException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStoreInsertException.java
similarity index 100%
rename from dbrepo-data-service/services/src/main/java/at/tuwien/exception/QueryStoreInsertException.java
rename to dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStoreInsertException.java
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/QueryStorePersistException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStorePersistException.java
similarity index 100%
rename from dbrepo-data-service/services/src/main/java/at/tuwien/exception/QueryStorePersistException.java
rename to dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStorePersistException.java
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/RemoteUnavailableException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RemoteUnavailableException.java
similarity index 100%
rename from dbrepo-data-service/services/src/main/java/at/tuwien/exception/RemoteUnavailableException.java
rename to dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RemoteUnavailableException.java
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/SidecarExportException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SidecarExportException.java
similarity index 100%
rename from dbrepo-data-service/services/src/main/java/at/tuwien/exception/SidecarExportException.java
rename to dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SidecarExportException.java
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/SidecarImportException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SidecarImportException.java
similarity index 100%
rename from dbrepo-data-service/services/src/main/java/at/tuwien/exception/SidecarImportException.java
rename to dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SidecarImportException.java
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/TableMalformedException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableMalformedException.java
similarity index 100%
rename from dbrepo-data-service/services/src/main/java/at/tuwien/exception/TableMalformedException.java
rename to dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableMalformedException.java
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/TableSchemaException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableSchemaException.java
similarity index 100%
rename from dbrepo-data-service/services/src/main/java/at/tuwien/exception/TableSchemaException.java
rename to dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableSchemaException.java
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/ViewMalformedException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ViewMalformedException.java
similarity index 100%
rename from dbrepo-data-service/services/src/main/java/at/tuwien/exception/ViewMalformedException.java
rename to dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ViewMalformedException.java
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/exception/ViewSchemaException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ViewSchemaException.java
similarity index 100%
rename from dbrepo-data-service/services/src/main/java/at/tuwien/exception/ViewSchemaException.java
rename to dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ViewSchemaException.java
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
index bb355f02c4729338ecc4518b6c5af1267d0a5ae9..557d1e49aba58b799f3dfa65fea8c4d0a8f7cf4c 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
@@ -467,8 +467,8 @@ public interface MetadataMapper {
TableBriefDto tableToTableBriefDto(Table data);
default UniqueDto uniqueToUniqueDto(Unique data) {
- data.getTable().setOwner(null); /* loop */
- data.getTable().setCreator(null); /* loop */
+// data.getTable().setOwner(null); /* loop */
+// data.getTable().setCreator(null); /* loop */
return UniqueDto.builder()
.id(data.getId())
.name(data.getName())
@@ -564,6 +564,9 @@ public interface MetadataMapper {
column.setDatabaseId(data.getDatabase().getId());
});
});
+ if (data.getConstraints().getChecks() == null || data.getConstraints().getChecks().isEmpty()) {
+ table.getConstraints().setChecks(new LinkedHashSet<>());
+ }
if (data.getIdentifiers() != null) {
table.setIdentifiers(new LinkedList<>(data.getIdentifiers()
.stream()
@@ -829,8 +832,9 @@ public interface MetadataMapper {
final Pattern WHITESPACE = Pattern.compile("[\\s]");
String nowhitespace = WHITESPACE.matcher(data).replaceAll("_");
String normalized = Normalizer.normalize(nowhitespace, Normalizer.Form.NFD);
- String slug = NONLATIN.matcher(normalized).replaceAll("");
- final String name = slug.toLowerCase(Locale.ENGLISH);
+ String slug = NONLATIN.matcher(normalized).replaceAll("_");
+ final String name = slug.toLowerCase(Locale.ENGLISH)
+ .replaceAll("-", "_");
log.debug("mapping name {} to internal name {}", data, name);
return name;
}
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ContainerRepository.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ContainerRepository.java
index e1a1f209e3adf49d1d85ce2ced2779857da16a38..8155aef9cc3f67eb83c52ed5bb15c4a67c50c208 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ContainerRepository.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ContainerRepository.java
@@ -1,7 +1,6 @@
package at.tuwien.repository;
import at.tuwien.entities.container.Container;
-import at.tuwien.entities.container.image.ContainerImageDate;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/IdentifierRepository.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/IdentifierRepository.java
index 338d0e269b828daf1ed2165877a0c8377d491dd7..12b309ec521e84c7eaed1bf446442498bfd4c481 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/IdentifierRepository.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/IdentifierRepository.java
@@ -1,11 +1,7 @@
package at.tuwien.repository;
import at.tuwien.entities.identifier.Identifier;
-import at.tuwien.entities.identifier.IdentifierType;
import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/utils/UserUtil.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/utils/UserUtil.java
index 7a99e839edd3b97758e713260f798ae5357c53c6..4e517625ed8bc7d700c1815a8437675d17534d85 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/utils/UserUtil.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/utils/UserUtil.java
@@ -18,6 +18,16 @@ public class UserUtil {
.anyMatch(a -> a.getAuthority().equals(role));
}
+ public static boolean isSystem(Principal principal) {
+ if (principal == null) {
+ return false;
+ }
+ final Authentication authentication = (Authentication) principal;
+ return authentication.getAuthorities()
+ .stream()
+ .anyMatch(a -> a.getAuthority().equals("system"));
+ }
+
public static UUID getId(Principal principal) {
if (principal == null) {
return null;
diff --git a/dbrepo-metadata-service/rest-service/pom.xml b/dbrepo-metadata-service/rest-service/pom.xml
index 97e108fa0d55fb1b46c9220ab6368a61fb5c123b..ab556f9c4521be25c046a5777200ce9ab59cfc6b 100644
--- a/dbrepo-metadata-service/rest-service/pom.xml
+++ b/dbrepo-metadata-service/rest-service/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
- <version>1.4.4</version>
+ <version>1.4.5</version>
</parent>
<artifactId>dbrepo-metadata-service-rest-service</artifactId>
<name>dbrepo-metadata-service-rest</name>
- <version>1.4.4</version>
+ <version>1.4.5</version>
<dependencies>
<dependency>
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/DbrepoMetadataServiceApplication.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/DbrepoMetadataServiceApplication.java
index 8e51c7cff9cb56000678b60d5e1c60dc41b7c3e7..bd979054e64314a6055467249587f1311a50da10 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/DbrepoMetadataServiceApplication.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/DbrepoMetadataServiceApplication.java
@@ -2,13 +2,10 @@ package at.tuwien;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@EnableJpaAuditing
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java
index 17c1e20978453458732be953ed05e478691444d7..9cdcfdedf9e88fd0138e236db6f15afb959ff2dc 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java
@@ -56,11 +56,15 @@ public class AccessEndpoint {
@Transactional
@Observed(name = "dbrepo_access_give")
@PreAuthorize("hasAuthority('create-database-access')")
- @Operation(summary = "Give access to some database", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Give access",
+ description = "Give a user with given id access to some database with given id. Requires role `create-database-access`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
description = "Granting access succeeded",
- content = {@Content}),
+ content = {@Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = DatabaseAccessDto.class))}),
@ApiResponse(responseCode = "400",
description = "Granting access query or database connection is malformed",
content = {@Content(
@@ -76,11 +80,6 @@ public class AccessEndpoint {
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
- @ApiResponse(responseCode = "405",
- description = "Granting access not permitted",
- content = {@Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ApiErrorDto.class))}),
@ApiResponse(responseCode = "502",
description = "Access could not be created due to connection error",
content = {@Content(
@@ -92,11 +91,11 @@ public class AccessEndpoint {
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
})
- public ResponseEntity<?> create(@NotBlank @PathVariable("databaseId") Long databaseId,
- @NotBlank @PathVariable("userId") UUID userId,
- @Valid @RequestBody UpdateDatabaseAccessDto data,
- @NotNull Principal principal) throws NotAllowedException, ServiceException,
- ServiceConnectionException, DatabaseNotFoundException, UserNotFoundException, AccessNotFoundException,
+ public ResponseEntity<DatabaseAccessDto> create(@NotBlank @PathVariable("databaseId") Long databaseId,
+ @NotBlank @PathVariable("userId") UUID userId,
+ @Valid @RequestBody UpdateDatabaseAccessDto data,
+ @NotNull Principal principal) throws NotAllowedException, DataServiceException,
+ DataServiceConnectionException, DatabaseNotFoundException, UserNotFoundException, AccessNotFoundException,
SearchServiceException, SearchServiceConnectionException {
log.debug("endpoint give access to database, databaseId={}, userId={}, access.type={}", databaseId, userId,
data.getType());
@@ -122,11 +121,12 @@ public class AccessEndpoint {
@Transactional
@Observed(name = "dbrepo_access_modify")
@PreAuthorize("hasAuthority('update-database-access')")
- @Operation(summary = "Modify access to some database", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Modify access",
+ description = "Modifies access of a user with given id to database with given id. Requires role `update-database-access`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
- description = "Modify access succeeded",
- content = {@Content}),
+ description = "Modified access"),
@ApiResponse(responseCode = "400",
description = "Modify access query or database connection is malformed",
content = {@Content(
@@ -153,11 +153,11 @@ public class AccessEndpoint {
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
})
- public ResponseEntity<?> update(@NotBlank @PathVariable("databaseId") Long databaseId,
- @NotBlank @PathVariable("userId") UUID userId,
- @Valid @RequestBody UpdateDatabaseAccessDto data,
- @NotNull Principal principal) throws NotAllowedException,
- ServiceException, ServiceConnectionException, DatabaseNotFoundException, UserNotFoundException,
+ public ResponseEntity<Void> update(@NotBlank @PathVariable("databaseId") Long databaseId,
+ @NotBlank @PathVariable("userId") UUID userId,
+ @Valid @RequestBody UpdateDatabaseAccessDto data,
+ @NotNull Principal principal) throws NotAllowedException,
+ DataServiceException, DataServiceConnectionException, DatabaseNotFoundException, UserNotFoundException,
AccessNotFoundException, SearchServiceException, SearchServiceConnectionException {
log.debug("endpoint modify database access, databaseId={}, userId={}, access.type={}", databaseId, userId,
data.getType());
@@ -176,8 +176,10 @@ public class AccessEndpoint {
@RequestMapping(value = "/{userId}", method = {RequestMethod.GET, RequestMethod.HEAD})
@Transactional(readOnly = true)
@Observed(name = "dbrepo_access_get")
- @PreAuthorize("hasAuthority('check-database-access') or hasAuthority('admin')")
- @Operation(summary = "Check access to some database", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @PreAuthorize("hasAuthority('check-database-access') or hasAuthority('check-foreign-database-access')")
+ @Operation(summary = "Find/Check access",
+ description = "Finds or checks access of a user with given id to a database with given id. Requests with HTTP method **GET** return the access object, requests with HTTP method **HEAD** only the status. When the user has at least *READ* access, the status 200 is returned, 403 otherwise. Requires role `check-database-access` or `check-foreign-database-access`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Found database access",
@@ -202,7 +204,7 @@ public class AccessEndpoint {
log.debug("endpoint get database access, databaseId={}, userId={}, principal.name={}", databaseId, userId,
principal.getName());
if (!userId.equals(UserUtil.getId(principal))) {
- if (!UserUtil.hasRole(principal, "admin")) {
+ if (!UserUtil.hasRole(principal, "check-foreign-database-access")) {
log.error("Failed to find access: foreign user");
throw new NotAllowedException("Failed to find access: foreign user");
}
@@ -220,11 +222,12 @@ public class AccessEndpoint {
@Transactional
@Observed(name = "dbrepo_access_delete")
@PreAuthorize("hasAuthority('delete-database-access')")
- @Operation(summary = "Revoke access to some database", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Delete access",
+ description = "Delete access of a user with id to a database with id. Requires role `delete-database-access`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
- description = "Revoked access successfully",
- content = {@Content}),
+ description = "Deleted access"),
@ApiResponse(responseCode = "400",
description = "Modify access query or database connection is malformed",
content = {@Content(
@@ -251,10 +254,10 @@ public class AccessEndpoint {
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
})
- public ResponseEntity<?> revoke(@NotBlank @PathVariable("databaseId") Long databaseId,
- @NotBlank @PathVariable("userId") UUID userId,
- @NotNull Principal principal) throws NotAllowedException, ServiceException,
- ServiceConnectionException, DatabaseNotFoundException, UserNotFoundException, AccessNotFoundException,
+ public ResponseEntity<Void> revoke(@NotBlank @PathVariable("databaseId") Long databaseId,
+ @NotBlank @PathVariable("userId") UUID userId,
+ @NotNull Principal principal) throws NotAllowedException, DataServiceException,
+ DataServiceConnectionException, DatabaseNotFoundException, UserNotFoundException, AccessNotFoundException,
SearchServiceException, SearchServiceConnectionException {
log.debug("endpoint revoke database access, databaseId={}, userId={}", databaseId, userId);
final Database database = databaseService.findById(databaseId);
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ConceptEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ConceptEndpoint.java
index cb58e62def0c45aebe04519a650d1232b681e9e9..44a592658ea3f8a512a07cbfe261b39192e3b1e4 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ConceptEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ConceptEndpoint.java
@@ -36,10 +36,11 @@ public class ConceptEndpoint {
@GetMapping
@Transactional(readOnly = true)
@Observed(name = "dbrepo_semantic_concepts_findall")
- @Operation(summary = "List semantic concepts")
+ @Operation(summary = "List concepts",
+ description = "List all semantic concepts known to the metadata database")
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
- description = "Find all semantic concepts",
+ description = "List concepts",
content = {@Content(
mediaType = "application/json",
array = @ArraySchema(schema = @Schema(implementation = ConceptDto.class)))}),
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ContainerEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ContainerEndpoint.java
index 9d6e24801b453b8f79caf923dcaaa90d44ba2e0b..294d471e8fefe4ccafcf06f5aac47e23fce6f757 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ContainerEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ContainerEndpoint.java
@@ -10,6 +10,7 @@ import at.tuwien.exception.ContainerNotFoundException;
import at.tuwien.exception.ImageNotFoundException;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.ContainerService;
+import at.tuwien.utils.UserUtil;
import io.micrometer.observation.annotation.Observed;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.ArraySchema;
@@ -54,13 +55,14 @@ public class ContainerEndpoint {
@GetMapping
@Transactional(readOnly = true)
@Observed(name = "dbrepo_container_findall")
- @Operation(summary = "Find all containers")
+ @Operation(summary = "List containers",
+ description = "List all containers in the metadata database.")
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "List containers",
content = {@Content(
mediaType = "application/json",
- array = @ArraySchema(schema = @Schema(implementation = ContainerBriefDto[].class)))}),
+ array = @ArraySchema(schema = @Schema(implementation = ContainerBriefDto.class)))}),
})
public ResponseEntity<List<ContainerBriefDto>> findAll(@RequestParam(required = false) Integer limit) {
log.debug("endpoint find all containers, limit={}", limit);
@@ -77,13 +79,25 @@ public class ContainerEndpoint {
@Transactional
@Observed(name = "dbrepo_container_create")
@PreAuthorize("hasAuthority('create-container')")
- @Operation(summary = "Create container", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Create container",
+ description = "Creates a container in the metadata database. Requires role `create-container`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "201",
description = "Created a new container",
content = {@Content(
mediaType = "application/json",
- schema = @Schema(implementation = ContainerBriefDto.class))}),
+ schema = @Schema(implementation = ContainerDto.class))}),
+ @ApiResponse(responseCode = "400",
+ description = "Container payload malformed",
+ content = {@Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = ApiErrorDto.class))}),
+ @ApiResponse(responseCode = "403",
+ description = "Create container not permitted, need authority `create-container`",
+ content = {@Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = ApiErrorDto.class))}),
@ApiResponse(responseCode = "404",
description = "Container image or user could not be found",
content = {@Content(
@@ -95,11 +109,11 @@ public class ContainerEndpoint {
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
})
- public ResponseEntity<ContainerBriefDto> create(@Valid @RequestBody ContainerCreateDto data)
+ public ResponseEntity<ContainerDto> create(@Valid @RequestBody ContainerCreateDto data)
throws ImageNotFoundException, ContainerAlreadyExistsException {
log.debug("endpoint create container, data={}", data);
final Container container = containerService.create(data);
- final ContainerBriefDto dto = metadataMapper.containerToDatabaseContainerBriefDto(container);
+ final ContainerDto dto = metadataMapper.containerToContainerDto(container);
log.trace("create container resulted in container {}", dto);
return ResponseEntity.status(HttpStatus.CREATED)
.body(dto);
@@ -108,7 +122,8 @@ public class ContainerEndpoint {
@GetMapping("/{containerId}")
@Transactional(readOnly = true)
@Observed(name = "dbrepo_container_find")
- @Operation(summary = "Find some container")
+ @Operation(summary = "Find container",
+ description = "Finds a container in the metadata database.")
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Found container",
@@ -129,14 +144,11 @@ public class ContainerEndpoint {
final ContainerDto dto = metadataMapper.containerToContainerDto(container);
log.trace("find container resulted in container {}", dto);
final HttpHeaders headers = new HttpHeaders();
- if (principal != null) {
- final Authentication authentication = (Authentication) principal;
- if (authentication.isAuthenticated() && authentication.getAuthorities().stream().anyMatch(a -> a.getAuthority().equals("admin"))) {
- log.trace("attach privileged credential information");
- headers.set("X-Username", container.getPrivilegedUsername());
- headers.set("X-Password", container.getPrivilegedPassword());
- headers.set("Access-Control-Expose-Headers", "X-Username X-Password");
- }
+ if (UserUtil.isSystem(principal)) {
+ log.trace("attach privileged credential information");
+ headers.set("X-Username", container.getPrivilegedUsername());
+ headers.set("X-Password", container.getPrivilegedPassword());
+ headers.set("Access-Control-Expose-Headers", "X-Username X-Password");
}
return ResponseEntity.ok()
.headers(headers)
@@ -147,17 +159,24 @@ public class ContainerEndpoint {
@Transactional
@Observed(name = "dbrepo_container_delete")
@PreAuthorize("hasAuthority('delete-container')")
- @Operation(summary = "Delete some container", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Delete container",
+ description = "Deletes a container in the metadata database. Requires role `delete-container`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
- description = "Deleted container successfully"),
+ description = "Deleted container"),
+ @ApiResponse(responseCode = "403",
+ description = "Create container not permitted, need authority `delete-container`",
+ content = {@Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = ApiErrorDto.class))}),
@ApiResponse(responseCode = "404",
description = "Container not found",
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
})
- public ResponseEntity<?> delete(@NotNull @PathVariable("containerId") Long containerId) throws ContainerNotFoundException {
+ public ResponseEntity<Void> delete(@NotNull @PathVariable("containerId") Long containerId) throws ContainerNotFoundException {
log.debug("endpoint delete container, containerId={}", containerId);
final Container container = containerService.find(containerId);
containerService.remove(container);
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java
index b5248ed23265c67e7a666e4364a0069ff9d5e6de..8be62ea5c400719b31764b0b931a329481b75018 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java
@@ -1,17 +1,17 @@
package at.tuwien.endpoints;
-import at.tuwien.api.amqp.ExchangeDto;
import at.tuwien.api.database.*;
import at.tuwien.api.error.ApiErrorDto;
-import at.tuwien.config.RabbitConfig;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.DatabaseAccess;
import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.*;
+import at.tuwien.utils.UserUtil;
import io.micrometer.observation.annotation.Observed;
import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.headers.Header;
import io.swagger.v3.oas.annotations.media.ArraySchema;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -26,7 +26,6 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.core.Authentication;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -42,21 +41,16 @@ import java.util.stream.Collectors;
public class DatabaseEndpoint {
private final UserService userService;
- private final RabbitConfig rabbitConfig;
private final AccessService accessService;
- private final BrokerService brokerService;
private final MetadataMapper databaseMapper;
private final StorageService storageService;
private final DatabaseService databaseService;
@Autowired
- public DatabaseEndpoint(UserService userService, RabbitConfig rabbitConfig, AccessService accessService,
- BrokerService brokerService, MetadataMapper databaseMapper,
+ public DatabaseEndpoint(UserService userService, AccessService accessService, MetadataMapper databaseMapper,
StorageService storageService, DatabaseService databaseService) {
this.userService = userService;
- this.rabbitConfig = rabbitConfig;
this.accessService = accessService;
- this.brokerService = brokerService;
this.databaseMapper = databaseMapper;
this.storageService = storageService;
this.databaseService = databaseService;
@@ -65,10 +59,13 @@ public class DatabaseEndpoint {
@RequestMapping(method = {RequestMethod.GET, RequestMethod.HEAD})
@Transactional(readOnly = true)
@Observed(name = "dbrepo_database_findall")
- @Operation(summary = "List databases")
+ @Operation(summary = "List databases",
+ description = "Lists all databases in the metadata database. Requests with HTTP method **GET** return the list of databases, requests with HTTP method **HEAD** only the number in the `X-Count` header.")
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "List of databases",
+ headers = {@Header(name = "X-Count", description = "Number of databases", schema = @Schema(implementation = Long.class), required = true),
+ @Header(name = "Access-Control-Expose-Headers", description = "Expose `X-Count` custom header", schema = @Schema(implementation = String.class), required = true)},
content = {@Content(
mediaType = "application/json",
array = @ArraySchema(schema = @Schema(implementation = DatabaseDto.class)))}),
@@ -101,7 +98,9 @@ public class DatabaseEndpoint {
@Transactional(rollbackFor = Exception.class)
@PreAuthorize("hasAuthority('create-database')")
@Observed(name = "dbrepo_database_create")
- @Operation(summary = "Create database", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Create database",
+ description = "Creates a database in the container with id. Requires roles `create-database`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "201",
description = "Created a new database",
@@ -140,8 +139,8 @@ public class DatabaseEndpoint {
schema = @Schema(implementation = ApiErrorDto.class))}),
})
public ResponseEntity<DatabaseDto> create(@Valid @RequestBody DatabaseCreateDto data,
- @NotNull Principal principal) throws ServiceException,
- ServiceConnectionException, UserNotFoundException, DatabaseNotFoundException, ContainerNotFoundException,
+ @NotNull Principal principal) throws DataServiceException,
+ DataServiceConnectionException, UserNotFoundException, DatabaseNotFoundException, ContainerNotFoundException,
SearchServiceException, SearchServiceConnectionException {
log.debug("endpoint create database, data.name={}", data.getName());
final User user = userService.findByUsername(principal.getName());
@@ -152,10 +151,12 @@ public class DatabaseEndpoint {
}
@PutMapping("/{databaseId}/metadata/table")
- @Transactional(rollbackFor = {SearchServiceException.class, SearchServiceConnectionException.class, DatabaseNotFoundException.class})
+ @Transactional(rollbackFor = {Exception.class})
@PreAuthorize("hasAuthority('find-database')")
@Observed(name = "dbrepo_tables_refresh")
- @Operation(summary = "Refresh database tables metadata", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Update database table schemas",
+ description = "Updates the database with id with generated metadata from tables that are not yet known to the database. Only the database owner can perform this operation. Requires role `find-database`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Refreshed database tables metadata",
@@ -189,9 +190,10 @@ public class DatabaseEndpoint {
schema = @Schema(implementation = ApiErrorDto.class))}),
})
public ResponseEntity<DatabaseDto> refreshTableMetadata(@NotNull @PathVariable("databaseId") Long databaseId,
- @NotNull Principal principal) throws ServiceException,
- ServiceConnectionException, DatabaseNotFoundException, SearchServiceException,
- SearchServiceConnectionException, NotAllowedException, QueryNotFoundException, MalformedException {
+ @NotNull Principal principal) throws DataServiceException,
+ DataServiceConnectionException, DatabaseNotFoundException, SearchServiceException,
+ SearchServiceConnectionException, NotAllowedException, QueryNotFoundException, MalformedException,
+ TableNotFoundException {
log.debug("endpoint refresh database metadata, databaseId={}", databaseId);
Database database = databaseService.findById(databaseId);
if (!database.getOwner().equals(principal)) {
@@ -206,7 +208,9 @@ public class DatabaseEndpoint {
@Transactional(rollbackFor = {SearchServiceException.class, SearchServiceConnectionException.class, DatabaseNotFoundException.class})
@PreAuthorize("hasAuthority('find-database')")
@Observed(name = "dbrepo_views_refresh")
- @Operation(summary = "Refresh database views metadata", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Update database view schemas",
+ description = "Updates the database with id with generated metadata from view that are not yet known to the database. Only the database owner can perform this operation. Requires role `find-database`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Refreshed database views metadata",
@@ -235,9 +239,9 @@ public class DatabaseEndpoint {
schema = @Schema(implementation = ApiErrorDto.class))}),
})
public ResponseEntity<DatabaseDto> refreshViewMetadata(@NotNull @PathVariable("databaseId") Long databaseId,
- @NotNull Principal principal) throws ServiceException,
- ServiceConnectionException, DatabaseNotFoundException, SearchServiceException,
- SearchServiceConnectionException, NotAllowedException, QueryNotFoundException {
+ @NotNull Principal principal) throws DataServiceException,
+ DataServiceConnectionException, DatabaseNotFoundException, SearchServiceException,
+ SearchServiceConnectionException, NotAllowedException, QueryNotFoundException, ViewNotFoundException {
log.debug("endpoint refresh database metadata, databaseId={}", databaseId);
Database database = databaseService.findById(databaseId);
if (!database.getOwner().equals(principal)) {
@@ -252,13 +256,20 @@ public class DatabaseEndpoint {
@Transactional
@PreAuthorize("hasAuthority('modify-database-visibility')")
@Observed(name = "dbrepo_database_visibility")
- @Operation(summary = "Update database visibility", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Update database visibility",
+ description = "Updates the database with id on the visibility. Only the database owner can perform this operation. Requires role `modify-database-visibility`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
description = "Visibility modified successfully",
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = DatabaseDto.class))}),
+ @ApiResponse(responseCode = "400",
+ description = "The visibility payload is malformed",
+ content = {@Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = ApiErrorDto.class))}),
@ApiResponse(responseCode = "403",
description = "Visibility modification is not permitted",
content = {@Content(
@@ -299,13 +310,20 @@ public class DatabaseEndpoint {
@Transactional
@PreAuthorize("hasAuthority('modify-database-owner')")
@Observed(name = "dbrepo_database_transfer")
- @Operation(summary = "Update database owner", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Update database owner",
+ description = "Updates the database with id on the owner. Only the database owner can perform this operation. Requires role `modify-database-owner`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
description = "Transfer of ownership was successful",
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = DatabaseDto.class))}),
+ @ApiResponse(responseCode = "400",
+ description = "Owner payload is malformed",
+ content = {@Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = ApiErrorDto.class))}),
@ApiResponse(responseCode = "404",
description = "Database or user could not be found",
content = {@Content(
@@ -330,7 +348,7 @@ public class DatabaseEndpoint {
public ResponseEntity<DatabaseDto> transfer(@NotNull @PathVariable("databaseId") Long databaseId,
@Valid @RequestBody DatabaseTransferDto data,
@NotNull Principal principal) throws NotAllowedException,
- ServiceException, ServiceConnectionException, DatabaseNotFoundException, UserNotFoundException,
+ DataServiceException, DataServiceConnectionException, DatabaseNotFoundException, UserNotFoundException,
SearchServiceException, SearchServiceConnectionException {
log.debug("endpoint transfer database, databaseId={}, transferDto.id={}", databaseId, data.getId());
final Database database = databaseService.findById(databaseId);
@@ -349,7 +367,9 @@ public class DatabaseEndpoint {
@Transactional
@PreAuthorize("hasAuthority('modify-database-image')")
@Observed(name = "dbrepo_database_image")
- @Operation(summary = "Update database image", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Update database preview image",
+ description = "Updates the database with id on the preview image. Only the database owner can perform this operation. Requires role `modify-database-image`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
description = "Modify of image was successful",
@@ -407,7 +427,9 @@ public class DatabaseEndpoint {
@GetMapping("/{databaseId}")
@Transactional(readOnly = true)
@Observed(name = "dbrepo_database_find")
- @Operation(summary = "Find some database", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Find database",
+ description = "Finds a database with id.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Database found successfully",
@@ -431,8 +453,8 @@ public class DatabaseEndpoint {
schema = @Schema(implementation = ApiErrorDto.class))}),
})
public ResponseEntity<DatabaseDto> findById(@NotNull @PathVariable("databaseId") Long databaseId,
- Principal principal) throws ServiceException,
- ServiceConnectionException, DatabaseNotFoundException, ExchangeNotFoundException {
+ Principal principal) throws DataServiceException,
+ DataServiceConnectionException, DatabaseNotFoundException, ExchangeNotFoundException {
log.debug("endpoint find database, databaseId={}", databaseId);
final Database database = databaseService.findById(databaseId);
final DatabaseDto dto = databaseMapper.customDatabaseToDatabaseDto(database);
@@ -446,16 +468,10 @@ public class DatabaseEndpoint {
log.debug("found {} database accesses", accesses.size());
}
final HttpHeaders headers = new HttpHeaders();
- if (principal != null) {
- /* extra effort only when having access */
- final ExchangeDto exchange = brokerService.findExchange(rabbitConfig.getExchangeName());
- dto.setExchangeType(exchange.getType());
- final Authentication authentication = (Authentication) principal;
- if (authentication.isAuthenticated() && authentication.getAuthorities().stream().anyMatch(a -> a.getAuthority().equals("admin"))) {
- headers.set("X-Username", database.getContainer().getPrivilegedUsername());
- headers.set("X-Password", database.getContainer().getPrivilegedPassword());
- headers.set("Access-Control-Expose-Headers", "X-Username X-Password");
- }
+ if (UserUtil.isSystem(principal)) {
+ headers.set("X-Username", database.getContainer().getPrivilegedUsername());
+ headers.set("X-Password", database.getContainer().getPrivilegedPassword());
+ headers.set("Access-Control-Expose-Headers", "X-Username X-Password");
}
return ResponseEntity.status(HttpStatus.OK)
.headers(headers)
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/IdentifierEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/IdentifierEndpoint.java
index c1bf7128400980ce12379ab521407b05dac390fa..831e9cd28d7148b0eaec5b44c3cb4f3059726461 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/IdentifierEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/IdentifierEndpoint.java
@@ -1,6 +1,7 @@
package at.tuwien.endpoints;
import at.tuwien.api.database.query.QueryDto;
+import at.tuwien.api.database.table.columns.concepts.ConceptDto;
import at.tuwien.api.error.ApiErrorDto;
import at.tuwien.api.identifier.*;
import at.tuwien.api.identifier.ld.LdDatasetDto;
@@ -22,6 +23,7 @@ import at.tuwien.utils.UserUtil;
import at.tuwien.validation.EndpointValidator;
import io.micrometer.observation.annotation.Observed;
import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -86,13 +88,16 @@ public class IdentifierEndpoint {
@GetMapping(produces = {MediaType.APPLICATION_JSON_VALUE, "application/ld+json"})
@Transactional(readOnly = true)
@Observed(name = "dbrepo_identifier_list")
- @Operation(summary = "Find all identifiers")
+ @Operation(summary = "List identifiers",
+ description = "Lists all identifiers known to the metadata database")
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Found identifiers successfully",
content = {
- @Content(mediaType = "application/json", schema = @Schema(implementation = IdentifierDto[].class)),
- @Content(mediaType = "application/ld+json", schema = @Schema(implementation = LdDatasetDto[].class))
+ @Content(mediaType = "application/json",
+ array = @ArraySchema(schema = @Schema(implementation = ConceptDto.class))),
+ @Content(mediaType = "application/ld+json",
+ array = @ArraySchema(schema = @Schema(implementation = LdDatasetDto.class)))
}),
@ApiResponse(responseCode = "406",
description = "Identifier could not be exported, the requested style is not known",
@@ -104,7 +109,8 @@ public class IdentifierEndpoint {
@Valid @RequestParam(value = "qid", required = false) Long qid,
@Valid @RequestParam(value = "vid", required = false) Long vid,
@Valid @RequestParam(value = "tid", required = false) Long tid,
- @RequestHeader(HttpHeaders.ACCEPT) String accept) throws FormatNotAvailableException {
+ @RequestHeader(HttpHeaders.ACCEPT) String accept)
+ throws FormatNotAvailableException {
log.debug("endpoint find identifiers, dbid={}, qid={}, vid={}, tid={}, accept={}", dbid, qid, vid, tid, accept);
final List<Identifier> identifiers = identifierService.findAll()
.stream()
@@ -141,7 +147,8 @@ public class IdentifierEndpoint {
"text/bibliography; style=ieee", "text/bibliography; style=bibtex"})
@Transactional(readOnly = true)
@Observed(name = "dbrepo_identifier_find")
- @Operation(summary = "Find some identifier")
+ @Operation(summary = "Find identifier",
+ description = "Finds an identifier with id. The response format depends on the HTTP `Accept` header set on the request.")
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Found identifier successfully",
@@ -198,7 +205,7 @@ public class IdentifierEndpoint {
})
public ResponseEntity<?> find(@Valid @PathVariable("identifierId") Long identifierId,
@RequestHeader(HttpHeaders.ACCEPT) String accept) throws IdentifierNotFoundException,
- ServiceException, ServiceConnectionException, MalformedException, FormatNotAvailableException,
+ DataServiceException, DataServiceConnectionException, MalformedException, FormatNotAvailableException,
QueryNotFoundException {
log.debug("endpoint find identifier, identifierId={}, accept={}", identifierId, accept);
final Identifier identifier = identifierService.find(identifierId);
@@ -265,7 +272,9 @@ public class IdentifierEndpoint {
@Transactional
@Observed(name = "dbrepo_identifier_delete")
@PreAuthorize("hasAuthority('delete-identifier')")
- @Operation(summary = "Delete some identifier", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Delete identifier",
+ description = "Deletes an identifier with id. Requires role `delete-identifier`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
description = "Deleted identifier"),
@@ -290,9 +299,10 @@ public class IdentifierEndpoint {
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
})
- public ResponseEntity<?> delete(@NotNull @PathVariable("identifierId") Long identifierId)
- throws IdentifierNotFoundException, NotAllowedException, ServiceException, ServiceConnectionException,
- DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException {
+ public ResponseEntity<Void> delete(@NotNull @PathVariable("identifierId") Long identifierId)
+ throws IdentifierNotFoundException, NotAllowedException, DataServiceException,
+ DataServiceConnectionException, DatabaseNotFoundException, SearchServiceException,
+ SearchServiceConnectionException {
log.debug("endpoint delete identifier, identifierId={}", identifierId);
final Identifier identifier = identifierService.find(identifierId);
if (identifier.getStatus().equals(IdentifierStatusType.PUBLISHED)) {
@@ -300,7 +310,6 @@ public class IdentifierEndpoint {
throw new NotAllowedException("Failed to delete identifier: already published");
}
identifierService.delete(identifier);
- log.info("Deleted identifier with pid: {}", identifierId);
return ResponseEntity.accepted()
.build();
}
@@ -309,7 +318,9 @@ public class IdentifierEndpoint {
@Transactional
@Observed(name = "dbrepo_identifier_publish")
@PreAuthorize("hasAuthority('publish-identifier')")
- @Operation(summary = "Publish identifier", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Publish identifier",
+ description = "Publishes an identifier with id. A published identifier cannot be changed anymore. Requires role `publish-identifier`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
description = "Published identifier",
@@ -331,11 +342,6 @@ public class IdentifierEndpoint {
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
- @ApiResponse(responseCode = "405",
- description = "Creating identifier not permitted",
- content = {@Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ApiErrorDto.class))}),
@ApiResponse(responseCode = "502",
description = "Connection to search service failed",
content = {@Content(
@@ -349,9 +355,9 @@ public class IdentifierEndpoint {
})
public ResponseEntity<IdentifierDto> publish(@Valid @PathVariable("identifierId") Long identifierId)
throws SearchServiceException, DatabaseNotFoundException, SearchServiceConnectionException,
- MalformedException, ServiceConnectionException, IdentifierNotFoundException {
+ MalformedException, DataServiceConnectionException, IdentifierNotFoundException, ExternalServiceException {
log.debug("endpoint publish identifier, identifierId={}", identifierId);
- final Identifier identifier = identifierService.find(identifierId);
+ identifierService.find(identifierId);
return ResponseEntity.status(HttpStatus.CREATED)
.body(metadataMapper.identifierToIdentifierDto(identifierService.publish(identifierId)));
}
@@ -360,7 +366,9 @@ public class IdentifierEndpoint {
@Transactional(rollbackFor = {Exception.class})
@Observed(name = "dbrepo_identifier_save")
@PreAuthorize("hasAuthority('create-identifier') or hasAuthority('create-foreign-identifier')")
- @Operation(summary = "Save identifier", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Save identifier",
+ description = "Saves an identifier with id as a draft identifier. Identifiers can only be created for objects the user has at least *READ* access in the associated database (requires role `create-identifier`) or for any object in any database (requires role `create-foreign-identifier`).",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
description = "Saved identifier",
@@ -382,11 +390,6 @@ public class IdentifierEndpoint {
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
- @ApiResponse(responseCode = "405",
- description = "Creating identifier not permitted",
- content = {@Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ApiErrorDto.class))}),
@ApiResponse(responseCode = "502",
description = "Connection to search service failed",
content = {@Content(
@@ -401,9 +404,10 @@ public class IdentifierEndpoint {
public ResponseEntity<IdentifierDto> save(@NotNull @PathVariable("identifierId") Long identifierId,
@NotNull @Valid @RequestBody IdentifierSaveDto data,
@NotNull Principal principal) throws UserNotFoundException,
- DatabaseNotFoundException, MalformedException, NotAllowedException, ServiceException,
- ServiceConnectionException, SearchServiceException, QueryNotFoundException,
- SearchServiceConnectionException, IdentifierNotFoundException, ViewNotFoundException, TableNotFoundException {
+ DatabaseNotFoundException, MalformedException, NotAllowedException, DataServiceException,
+ DataServiceConnectionException, SearchServiceException, QueryNotFoundException,
+ SearchServiceConnectionException, IdentifierNotFoundException, ViewNotFoundException,
+ TableNotFoundException, ExternalServiceException {
log.debug("endpoint save identifier, identifierId={}, data.id={}, principal.name={}", identifierId,
data.getId(), principal.getName());
final Database database = databaseService.findById(data.getDatabaseId());
@@ -485,7 +489,9 @@ public class IdentifierEndpoint {
@Transactional(rollbackFor = {Exception.class})
@Observed(name = "dbrepo_identifier_create")
@PreAuthorize("hasAuthority('create-identifier') or hasAuthority('create-foreign-identifier')")
- @Operation(summary = "Draft identifier", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Create identifier",
+ description = "Create an identifier with id to create a draft identifier. Identifiers can only be created for objects the user has at least *READ* access in the associated database (requires role `create-identifier`) or for any object in any database (requires role `create-foreign-identifier`).",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "201",
description = "Drafted identifier",
@@ -507,11 +513,6 @@ public class IdentifierEndpoint {
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
- @ApiResponse(responseCode = "405",
- description = "Creating identifier not permitted",
- content = {@Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ApiErrorDto.class))}),
@ApiResponse(responseCode = "502",
description = "Connection to search service failed",
content = {@Content(
@@ -525,17 +526,16 @@ public class IdentifierEndpoint {
})
public ResponseEntity<IdentifierDto> create(@NotNull @Valid @RequestBody IdentifierCreateDto data,
@NotNull Principal principal) throws DatabaseNotFoundException,
- UserNotFoundException, NotAllowedException, MalformedException, ServiceConnectionException,
- SearchServiceException, ServiceException, QueryNotFoundException, SearchServiceConnectionException,
- IdentifierNotFoundException, ViewNotFoundException {
+ UserNotFoundException, NotAllowedException, MalformedException, DataServiceConnectionException,
+ SearchServiceException, DataServiceException, QueryNotFoundException, SearchServiceConnectionException,
+ IdentifierNotFoundException, ViewNotFoundException, ExternalServiceException {
log.debug("endpoint create identifier, data.databaseId={}", data.getDatabaseId());
final Database database = databaseService.findById(data.getDatabaseId());
final User user = userService.findByUsername(principal.getName());
/* check access */
- DatabaseAccess access = null;
try {
- access = accessService.find(database, user);
- log.trace("found access: {}", access);
+ final DatabaseAccess access = accessService.find(database, user);
+ log.trace("found access: {}", access.getType());
} catch (AccessNotFoundException e) {
if (!UserUtil.hasRole(principal, "create-foreign-identifier")) {
log.error("Failed to create identifier: insufficient role");
@@ -549,7 +549,8 @@ public class IdentifierEndpoint {
@GetMapping("/retrieve")
@Observed(name = "dbrepo_identifier_retrieve")
- @Operation(summary = "Retrieve metadata from identifier")
+ @Operation(summary = "Retrieve PID metadata",
+ description = "Retrieves Persistent Identifier (PID) metadata from external endpoints. Supported PIDs are: ORCID, ROR, DOI.")
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Retrieved metadata from identifier",
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ImageEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ImageEndpoint.java
index d295cc7a11d669dbd149dd0a9ac784dd3d432cb8..088dc2981b94671d2b895754f411b75856eaafb3 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ImageEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ImageEndpoint.java
@@ -52,13 +52,14 @@ public class ImageEndpoint {
@GetMapping
@Transactional(readOnly = true)
@Observed(name = "dbrepo_image_findall")
- @Operation(summary = "Find all images")
+ @Operation(summary = "List images",
+ description = "Lists all container images known to the metadata database.")
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "List images",
content = {@Content(
mediaType = "application/json",
- array = @ArraySchema(schema = @Schema(implementation = ContainerImage.class)))}),
+ array = @ArraySchema(schema = @Schema(implementation = ImageBriefDto.class)))}),
})
public ResponseEntity<List<ImageBriefDto>> findAll() {
log.debug("endpoint find all images");
@@ -66,14 +67,16 @@ public class ImageEndpoint {
return ResponseEntity.ok()
.body(containers.stream()
.map(metadataMapper::containerImageToImageBriefDto)
- .collect(Collectors.toList()));
+ .toList());
}
@PostMapping
@Transactional
@Observed(name = "dbrepo_image_create")
@PreAuthorize("hasAuthority('create-image')")
- @Operation(summary = "Create image", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Create image",
+ description = "Creates a container image in the metadata database. Requires role `create-image`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "201",
description = "Created image",
@@ -109,7 +112,8 @@ public class ImageEndpoint {
@GetMapping("/{imageId}")
@Transactional(readOnly = true)
@Observed(name = "dbrepo_image_find")
- @Operation(summary = "Find some image")
+ @Operation(summary = "Find image",
+ description = "Finds a container image in the metadata database.")
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Found image",
@@ -135,7 +139,9 @@ public class ImageEndpoint {
@Transactional
@Observed(name = "dbrepo_image_update")
@PreAuthorize("hasAuthority('modify-image')")
- @Operation(summary = "Update some image", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Update image",
+ description = "Updates container image in the metadata database. Requires role `modify-image`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
description = "Updated image successfully",
@@ -164,7 +170,9 @@ public class ImageEndpoint {
@Transactional
@Observed(name = "dbrepo_image_delete")
@PreAuthorize("hasAuthority('delete-image')")
- @Operation(summary = "Delete some image", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Delete image",
+ description = "Deletes a container image in the metadata database. Requires role `delete-image`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
description = "Deleted image successfully",
@@ -175,7 +183,7 @@ public class ImageEndpoint {
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
})
- public ResponseEntity<?> delete(@NotNull @PathVariable("imageId") Long imageId) throws ImageNotFoundException {
+ public ResponseEntity<Void> delete(@NotNull @PathVariable("imageId") Long imageId) throws ImageNotFoundException {
log.debug("endpoint delete image, id={}", imageId);
final ContainerImage image = imageService.find(imageId);
imageService.delete(image);
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/LicenseEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/LicenseEndpoint.java
index e2b47905c9196431e0545e37c05b86b151a880b7..75998b03a5c239661a9f7b3022263a00cd0bff4d 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/LicenseEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/LicenseEndpoint.java
@@ -41,21 +41,21 @@ public class LicenseEndpoint {
@GetMapping
@Transactional(readOnly = true)
@Observed(name = "dbrepo_license_findall")
- @Operation(summary = "Get all licenses")
+ @Operation(summary = "List licenses",
+ description = "Lists licenses known to the metadata database.")
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "List of licenses",
content = {@Content(
mediaType = "application/json",
- array = @ArraySchema(schema = @Schema(implementation = LicenseDto[].class)))}),
+ array = @ArraySchema(schema = @Schema(implementation = LicenseDto.class)))}),
})
public ResponseEntity<List<LicenseDto>> list() {
log.debug("endpoint list licenses");
final List<LicenseDto> licenses = licenseService.findAll()
.stream()
.map(metadataMapper::licenseToLicenseDto)
- .collect(Collectors.toList());
- log.trace("list licenses resulted in licenses {}", licenses);
+ .toList();
return ResponseEntity.status(HttpStatus.OK)
.body(licenses);
}
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/MessageEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/MessageEndpoint.java
index 62677967b01d666ee998f7c9d30fe1019b997fe6..0a1cddf5dfddbb4559cc4b608952da94b58cb901 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/MessageEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/MessageEndpoint.java
@@ -45,7 +45,8 @@ public class MessageEndpoint {
@GetMapping
@Observed(name = "dbrepo_maintenance_findall")
- @Operation(summary = "Find maintenance messages")
+ @Operation(summary = "List messages",
+ description = "Lists messages known to the metadata database. Messages can be filtered be filtered with the optional `active` parameter. If set to *true*, only active messages (that is, messages whose end time has not been reached) will be returned. Otherwise only inactive messages are returned. If not set, active and inactive messages are returned.")
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "List messages",
@@ -53,10 +54,10 @@ public class MessageEndpoint {
mediaType = "application/json",
array = @ArraySchema(schema = @Schema(implementation = BannerMessageDto.class)))}),
})
- public ResponseEntity<List<BannerMessageDto>> list(@RequestParam(required = false) String filter) {
- log.debug("endpoint list active maintenance messages");
+ public ResponseEntity<List<BannerMessageDto>> list(@RequestParam(required = false) Boolean active) {
+ log.debug("endpoint list messages, active={}", active);
List<BannerMessageDto> dtos;
- if (filter.equals("active")) {
+ if (active != null && active) {
dtos = bannerMessageService.getActive()
.stream()
.map(metadataMapper::bannerMessageToBannerMessageDto)
@@ -67,13 +68,14 @@ public class MessageEndpoint {
.map(metadataMapper::bannerMessageToBannerMessageDto)
.toList();
}
- log.trace("list maintenance messages results in dtos {}", dtos);
+ log.info("List messages resulted in {} message(s)", dtos.size());
return ResponseEntity.ok(dtos);
}
@GetMapping("/message/{messageId}")
@Observed(name = "dbrepo_maintenance_find")
- @Operation(summary = "Find one maintenance message")
+ @Operation(summary = "Find message",
+ description = "Finds a message with id in the metadata database.")
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Get messages",
@@ -88,16 +90,17 @@ public class MessageEndpoint {
})
public ResponseEntity<BannerMessageDto> find(@NotNull @PathVariable("messageId") Long messageId)
throws MessageNotFoundException {
- log.debug("endpoint find one maintenance messages");
+ log.debug("endpoint find one maintenance message, messageId={}", messageId);
final BannerMessageDto dto = metadataMapper.bannerMessageToBannerMessageDto(bannerMessageService.find(messageId));
- log.trace("find one maintenance message results in dto {}", dto);
return ResponseEntity.ok(dto);
}
@PostMapping
@Observed(name = "dbrepo_maintenance_create")
- @Operation(summary = "Create maintenance message", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@PreAuthorize("hasAuthority('create-maintenance-message')")
+ @Operation(summary = "Create message",
+ description = "Creates a message in the metadata database. Requires role `create-maintenance-message`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "201",
description = "Created message",
@@ -115,8 +118,10 @@ public class MessageEndpoint {
@PutMapping("/{messageId}")
@Observed(name = "dbrepo_maintenance_update")
- @Operation(summary = "Update maintenance message", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@PreAuthorize("hasAuthority('update-maintenance-message')")
+ @Operation(summary = "Update message",
+ description = "Updates a message with id. Requires role `update-maintenance-message`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
description = "Updated message",
@@ -142,8 +147,10 @@ public class MessageEndpoint {
@DeleteMapping("/{messageId}")
@Observed(name = "dbrepo_maintenance_delete")
- @Operation(summary = "Delete maintenance message", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@PreAuthorize("hasAuthority('delete-maintenance-message')")
+ @Operation(summary = "Delete message",
+ description = "Deletes a message with id. Requires role `delete-maintenance-message`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
description = "Deleted message",
@@ -154,7 +161,8 @@ public class MessageEndpoint {
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
})
- public ResponseEntity<?> delete(@NotNull @PathVariable("messageId") Long messageId) throws MessageNotFoundException {
+ public ResponseEntity<Void> delete(@NotNull @PathVariable("messageId") Long messageId)
+ throws MessageNotFoundException {
log.debug("endpoint delete maintenance message, messageId={}", messageId);
final BannerMessage message = bannerMessageService.find(messageId);
bannerMessageService.delete(message);
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/MetadataEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/MetadataEndpoint.java
index 18bf1c3e62b0302cb3fda314570cb00adfb2d040..886db20df0d917f36e13e7f36c669259a0b5c4d5 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/MetadataEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/MetadataEndpoint.java
@@ -5,7 +5,6 @@ import at.tuwien.oaipmh.OaiErrorType;
import at.tuwien.oaipmh.OaiListIdentifiersParameters;
import at.tuwien.oaipmh.OaiRecordParameters;
import at.tuwien.service.MetadataService;
-import at.tuwien.utils.XmlUtil;
import io.micrometer.observation.annotation.Observed;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -44,7 +43,7 @@ public class MetadataEndpoint {
@ExampleObject(value = "ListMetadataFormats"),
})
@Observed(name = "dbrepo_oai_identify")
- @Operation(summary = "Identify the repository")
+ @Operation(summary = "Identify repository")
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "List containers",
@@ -57,7 +56,7 @@ public class MetadataEndpoint {
@GetMapping(params = "verb=Identify", produces = MediaType.TEXT_XML_VALUE)
@Observed(name = "dbrepo_oai_identify")
- @Operation(summary = "Identify the repository")
+ @Operation(summary = "Identify repository")
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "List containers",
@@ -67,22 +66,22 @@ public class MetadataEndpoint {
log.debug("endpoint identify repository, verb=Identify");
final String xml = metadataService.identify();
log.trace("identify repository resulted in xml {}", xml);
- return ResponseEntity.ok(XmlUtil.pretty(xml));
+ return ResponseEntity.ok(xml);
}
@GetMapping(params = "verb=ListIdentifiers", produces = MediaType.TEXT_XML_VALUE)
@Observed(name = "dbrepo_oai_identifiers_list")
- @Operation(summary = "List the identifiers")
+ @Operation(summary = "List identifiers")
public ResponseEntity<String> listIdentifiers(OaiListIdentifiersParameters parameters) {
log.debug("endpoint list identifiers, verb=ListIdentifiers, parameters={}", parameters);
final String xml = metadataService.listIdentifiers(parameters);
log.trace("list identifiers resulted in xml {}", xml);
- return ResponseEntity.ok(XmlUtil.pretty(xml));
+ return ResponseEntity.ok(xml);
}
@GetMapping(params = "verb=GetRecord", produces = MediaType.TEXT_XML_VALUE)
@Observed(name = "dbrepo_oai_record_get")
- @Operation(summary = "Get the record")
+ @Operation(summary = "Get record")
public ResponseEntity<String> getRecord(OaiRecordParameters parameters) {
log.debug("endpoint get record, verb=GetRecord, parameters={}", parameters);
final List<String> supportedMetadataFormats = List.of("oai_dc", "oai_datacite");
@@ -90,39 +89,39 @@ public class MetadataEndpoint {
log.trace("metadataPrefix does not match supported list: {}", supportedMetadataFormats);
log.error("Failed to get record: Format {} is not supported", parameters.getMetadataPrefix());
return ResponseEntity.status(HttpStatus.BAD_REQUEST)
- .body(XmlUtil.pretty(metadataService.error(OaiErrorType.CANNOT_DISSEMINATE_FORMAT)));
+ .body(metadataService.error(OaiErrorType.CANNOT_DISSEMINATE_FORMAT));
}
log.trace("metadata prefix {} is supported", parameters.getMetadataPrefix());
final List<String> supportedIdentifierPrefixes = List.of("doi", "oai");
if (parameters.getIdentifier() == null) {
log.error("Failed to get record: Identifier is empty");
return ResponseEntity.status(HttpStatus.BAD_REQUEST)
- .body(XmlUtil.pretty(metadataService.error(OaiErrorType.NO_RECORDS_MATCH)));
+ .body(metadataService.error(OaiErrorType.NO_RECORDS_MATCH));
} else if (supportedIdentifierPrefixes.stream().noneMatch(identifierPrefix -> parameters.getIdentifier().startsWith(identifierPrefix))
|| parameters.getIdentifier().indexOf(':') > 3) {
log.error("Failed to get record: Identifier does not match supported prefixes {}", supportedIdentifierPrefixes);
return ResponseEntity.status(HttpStatus.BAD_REQUEST)
- .body(XmlUtil.pretty(metadataService.error(OaiErrorType.NO_RECORDS_MATCH)));
+ .body(metadataService.error(OaiErrorType.NO_RECORDS_MATCH));
}
log.trace("identifier prefix of {} is supported", parameters.getIdentifier());
try {
final String xml = metadataService.getRecord(parameters);
log.trace("get record resulted in xml {}", xml);
- return ResponseEntity.ok(XmlUtil.pretty(xml));
+ return ResponseEntity.ok(xml);
} catch (IdentifierNotFoundException e) {
return ResponseEntity.status(HttpStatus.NOT_FOUND)
- .body(XmlUtil.pretty(metadataService.error(OaiErrorType.ID_DOES_NOT_EXIST)));
+ .body(metadataService.error(OaiErrorType.ID_DOES_NOT_EXIST));
}
}
@GetMapping(params = "verb=ListMetadataFormats", produces = MediaType.TEXT_XML_VALUE)
@Observed(name = "dbrepo_oai_metadataformats_list")
- @Operation(summary = "List the metadata formats")
+ @Operation(summary = "List metadata formats")
public ResponseEntity<String> listMetadataFormats() {
log.debug("endpoint list metadata formats, verb=ListMetadataFormats");
final String xml = metadataService.listMetadataFormats();
log.trace("list metadata formats resulted in xml {}", xml);
- return ResponseEntity.ok(XmlUtil.pretty(xml));
+ return ResponseEntity.ok(xml);
}
}
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/OntologyEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/OntologyEndpoint.java
index 8d626db323ee120704f099059ab4e057e8418525..cd17c7ac0b15d014769683dadc660a426986cd9e 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/OntologyEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/OntologyEndpoint.java
@@ -39,7 +39,7 @@ public class OntologyEndpoint {
private final OntologyService ontologyService;
@Autowired
- public OntologyEndpoint(EntityService entityService, MetadataMapper metadataMapper,
+ public OntologyEndpoint(EntityService entityService, MetadataMapper metadataMapper,
OntologyService ontologyService) {
this.entityService = entityService;
this.metadataMapper = metadataMapper;
@@ -48,13 +48,14 @@ public class OntologyEndpoint {
@GetMapping
@Observed(name = "dbrepo_ontologies_findall")
- @Operation(summary = "List all ontologies")
+ @Operation(summary = "List ontologies",
+ description = "Lists all ontologies known to the metadata database.")
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
- description = "List all ontologies",
+ description = "List ontologies",
content = {@Content(
mediaType = "application/json",
- array = @ArraySchema(schema = @Schema(implementation = OntologyDto.class)))}),
+ array = @ArraySchema(schema = @Schema(implementation = OntologyBriefDto.class)))}),
})
public ResponseEntity<List<OntologyBriefDto>> findAll() {
log.debug("endpoint find all ontologies");
@@ -62,13 +63,13 @@ public class OntologyEndpoint {
.stream()
.map(metadataMapper::ontologyToOntologyBriefDto)
.toList();
- log.trace("create ontology resulted in dtos {}", dtos);
return ResponseEntity.ok(dtos);
}
@GetMapping("/{ontologyId}")
@Observed(name = "dbrepo_ontologies_find")
- @Operation(summary = "Find one ontology")
+ @Operation(summary = "Find ontology",
+ description = "Finds an ontology with id in the metadata database.")
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Find one ontology",
@@ -85,14 +86,15 @@ public class OntologyEndpoint {
throws OntologyNotFoundException {
log.debug("endpoint find all ontologies, ontologyId={}", ontologyId);
final OntologyDto dto = metadataMapper.ontologyToOntologyDto(ontologyService.find(ontologyId));
- log.trace("create ontology resulted in dto {}", dto);
return ResponseEntity.ok(dto);
}
@PostMapping
@PreAuthorize("hasAuthority('create-ontology')")
@Observed(name = "dbrepo_ontologies_create")
- @Operation(summary = "Register a new ontology", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Create ontology",
+ description = "Creates an ontology in the metadata database. Requires role `create-ontology`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "201",
description = "Registered ontology successfully",
@@ -104,7 +106,6 @@ public class OntologyEndpoint {
@NotNull Principal principal) {
log.debug("endpoint create ontology, data={}", data);
final OntologyDto dto = metadataMapper.ontologyToOntologyDto(ontologyService.create(data, principal));
- log.trace("create ontology resulted in dto {}", dto);
return ResponseEntity.status(HttpStatus.CREATED)
.body(dto);
}
@@ -112,7 +113,9 @@ public class OntologyEndpoint {
@PutMapping("/{ontologyId}")
@PreAuthorize("hasAuthority('update-ontology')")
@Observed(name = "dbrepo_ontologies_update")
- @Operation(summary = "Update an ontology", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Update ontology",
+ description = "Updates an ontology with id. Requires role `update-ontology`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
description = "Updated ontology successfully",
@@ -131,7 +134,6 @@ public class OntologyEndpoint {
log.debug("endpoint update ontology, data={}", data);
final Ontology ontology = ontologyService.find(ontologyId);
final OntologyDto dto = metadataMapper.ontologyToOntologyDto(ontologyService.update(ontology, data));
- log.trace("update ontology resulted in dto {}", dto);
return ResponseEntity.accepted()
.body(dto);
}
@@ -139,7 +141,9 @@ public class OntologyEndpoint {
@DeleteMapping("/{ontologyId}")
@PreAuthorize("hasAuthority('delete-ontology')")
@Observed(name = "dbrepo_ontologies_delete")
- @Operation(summary = "Delete an ontology", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Delete ontology",
+ description = "Deletes an ontology with given id. Requires role `delete-ontology`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
description = "Deleted ontology successfully",
@@ -151,7 +155,7 @@ public class OntologyEndpoint {
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
})
- public ResponseEntity<?> delete(@NotNull @PathVariable("ontologyId") Long ontologyId)
+ public ResponseEntity<Void> delete(@NotNull @PathVariable("ontologyId") Long ontologyId)
throws OntologyNotFoundException {
log.debug("endpoint delete ontology, ontologyId={}", ontologyId);
final Ontology ontology = ontologyService.find(ontologyId);
@@ -163,7 +167,9 @@ public class OntologyEndpoint {
@GetMapping("/{ontologyId}/entity")
@PreAuthorize("hasAuthority('execute-semantic-query')")
@Observed(name = "dbrepo_ontologies_entities_find")
- @Operation(summary = "Find entities", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Find entities",
+ description = "Finds semantic entities by label or uri in an ontology with id. Requires role `execute-semantic-query`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Found entities",
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
index c87b4039c1425c6b15a7665c8def80125fa46be6..4fb8240b1d00f00f39a233cd3492e0b06940314a 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
@@ -1,6 +1,5 @@
package at.tuwien.endpoints;
-import at.tuwien.api.amqp.QueueDto;
import at.tuwien.api.database.table.TableBriefDto;
import at.tuwien.api.database.table.TableCreateDto;
import at.tuwien.api.database.table.TableDto;
@@ -11,7 +10,6 @@ import at.tuwien.api.database.table.columns.concepts.ColumnSemanticsUpdateDto;
import at.tuwien.api.error.ApiErrorDto;
import at.tuwien.api.semantics.EntityDto;
import at.tuwien.api.semantics.TableColumnEntityDto;
-import at.tuwien.config.RabbitConfig;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.table.Table;
import at.tuwien.entities.database.table.columns.TableColumn;
@@ -37,7 +35,6 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.core.Authentication;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -53,22 +50,18 @@ public class TableEndpoint {
private final UserService userService;
private final TableService tableService;
- private final RabbitConfig rabbitMqConfig;
private final EntityService entityService;
- private final BrokerService messageQueueService;
private final MetadataMapper metadataMapper;
private final DatabaseService databaseService;
private final EndpointValidator endpointValidator;
@Autowired
- public TableEndpoint(UserService userService, TableService tableService, RabbitConfig rabbitMqConfig,
- EntityService entityService, BrokerService messageQueueService, MetadataMapper metadataMapper,
- DatabaseService databaseService, EndpointValidator endpointValidator) {
+ public TableEndpoint(UserService userService, TableService tableService, EntityService entityService,
+ MetadataMapper metadataMapper, DatabaseService databaseService,
+ EndpointValidator endpointValidator) {
this.userService = userService;
this.tableService = tableService;
- this.rabbitMqConfig = rabbitMqConfig;
this.entityService = entityService;
- this.messageQueueService = messageQueueService;
this.metadataMapper = metadataMapper;
this.databaseService = databaseService;
this.endpointValidator = endpointValidator;
@@ -77,7 +70,9 @@ public class TableEndpoint {
@GetMapping
@Transactional(readOnly = true)
@Observed(name = "dbrepo_tables_findall")
- @Operation(summary = "List all tables", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "List tables",
+ description = "Lists all tables known to the metadata database.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "List tables",
@@ -114,13 +109,15 @@ public class TableEndpoint {
@Transactional(readOnly = true)
@PreAuthorize("hasAuthority('table-semantic-analyse')")
@Observed(name = "dbrepo_semantic_table_analyse")
- @Operation(summary = "Suggest table semantics", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Suggest semantics",
+ description = "Suggests semantic concepts for a table. Requires role `table-semantic-analyse`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Suggested table semantics successfully",
content = {@Content(
mediaType = "application/json",
- array = @ArraySchema(schema = @Schema(implementation = TableColumnEntityDto.class)))}),
+ array = @ArraySchema(schema = @Schema(implementation = EntityDto.class)))}),
@ApiResponse(responseCode = "400",
description = "Failed to parse statistic in search service",
content = {@Content(
@@ -148,16 +145,17 @@ public class TableEndpoint {
log.debug("endpoint analyse table semantics, databaseId={}, tableId={}", databaseId, tableId);
final Table table = tableService.findById(databaseId, tableId);
final List<EntityDto> dtos = entityService.suggestByTable(table);
- log.trace("analyse table semantics resulted in dtos {}", dtos);
return ResponseEntity.ok()
.body(dtos);
}
@PutMapping("/{tableId}")
@Transactional
- @PreAuthorize("hasAuthority('update-table-statistic') or hasAuthority('admin')")
+ @PreAuthorize("hasAuthority('update-table-statistic')")
@Observed(name = "dbrepo_statistic_table_update")
- @Operation(summary = "Update table statistics", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Update statistics",
+ description = "Updates basic statistical properties (min, max, mean, median, std.dev) for numerical columns in a table with id. Requires role `update-table-statistic`",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
description = "Updated table statistics successfully"),
@@ -185,7 +183,7 @@ public class TableEndpoint {
public ResponseEntity<Void> updateStatistic(@NotNull @PathVariable("databaseId") Long databaseId,
@NotNull @PathVariable("tableId") Long tableId)
throws TableNotFoundException, DatabaseNotFoundException, SearchServiceException,
- SearchServiceConnectionException, MalformedException, ServiceException, ServiceConnectionException {
+ SearchServiceConnectionException, MalformedException, DataServiceException, DataServiceConnectionException {
log.debug("endpoint update table statistics, databaseId={}, tableId={}", databaseId, tableId);
final Table table = tableService.findById(databaseId, tableId);
tableService.updateStatistics(table);
@@ -197,7 +195,9 @@ public class TableEndpoint {
@Transactional
@PreAuthorize("hasAuthority('modify-table-column-semantics') or hasAuthority('modify-foreign-table-column-semantics')")
@Observed(name = "dbrepo_semantics_column_save")
- @Operation(summary = "Update a table column semantic mapping", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Update semantics",
+ description = "Updates column semantics of a table column with id. Only the table owner with at least *READ* access to the associated database can update the column semantics (requires role `modify-table-column-semantics`) or foreign table columns if role `modify-foreign-table-column-semantics`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
description = "Updated column semantics successfully",
@@ -235,7 +235,7 @@ public class TableEndpoint {
@NotNull @PathVariable("columnId") Long columnId,
@NotNull @Valid @RequestBody ColumnSemanticsUpdateDto updateDto,
@NotNull Principal principal) throws NotAllowedException,
- MalformedException, ServiceException, ServiceConnectionException, UserNotFoundException,
+ MalformedException, DataServiceException, DataServiceConnectionException, UserNotFoundException,
TableNotFoundException, DatabaseNotFoundException, AccessNotFoundException, SearchServiceException,
SearchServiceConnectionException, OntologyNotFoundException, SemanticEntityNotFoundException {
log.debug("endpoint update table, databaseId={}, tableId={}, columnId={}", databaseId, tableId, columnId);
@@ -258,7 +258,9 @@ public class TableEndpoint {
@Transactional(readOnly = true)
@PreAuthorize("hasAuthority('table-semantic-analyse')")
@Observed(name = "dbrepo_semantic_column_analyse")
- @Operation(summary = "Suggest table column semantics", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Suggest semantics",
+ description = "Suggests column semantics. Requires role `table-semantic-analyse`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Suggested table column semantics successfully",
@@ -289,16 +291,17 @@ public class TableEndpoint {
final Table table = tableService.findById(databaseId, tableId);
TableColumn column = tableService.findColumnById(table, columnId);
final List<TableColumnEntityDto> dtos = entityService.suggestByColumn(column);
- log.trace("analyse table semantics resulted in dtos {}", dtos);
return ResponseEntity.ok()
.body(dtos);
}
@PostMapping
- @Transactional(rollbackFor = {ServiceConnectionException.class, DatabaseNotFoundException.class, ServiceException.class})
+ @Transactional(rollbackFor = {Exception.class})
@PreAuthorize("hasAuthority('create-table')")
@Observed(name = "dbrepo_table_create")
- @Operation(summary = "Create a table", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Create table",
+ description = "Creates a table in the database with id. Requires role `create-table`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "201",
description = "Created a new table",
@@ -339,7 +342,7 @@ public class TableEndpoint {
public ResponseEntity<TableDto> create(@NotNull @PathVariable("databaseId") Long databaseId,
@NotNull @Valid @RequestBody TableCreateDto data,
@NotNull Principal principal) throws NotAllowedException, MalformedException,
- ServiceException, ServiceConnectionException, DatabaseNotFoundException, UserNotFoundException,
+ DataServiceException, DataServiceConnectionException, DatabaseNotFoundException, UserNotFoundException,
AccessNotFoundException, TableNotFoundException, TableExistsException, SearchServiceException,
SearchServiceConnectionException, OntologyNotFoundException, SemanticEntityNotFoundException {
log.debug("endpoint create table, databaseId={}, data.name={}", databaseId, data.getName());
@@ -357,7 +360,7 @@ public class TableEndpoint {
}
final Table table = tableService.createTable(database, data, principal);
final TableDto dto = metadataMapper.customTableToTableDto(table);
- log.debug("create table resulted in table.id={}", dto.getId());
+ log.info("Created table with id {}", dto.getId());
return ResponseEntity.status(HttpStatus.CREATED)
.body(dto);
}
@@ -365,7 +368,9 @@ public class TableEndpoint {
@GetMapping("/{tableId}")
@Transactional(readOnly = true)
@Observed(name = "dbrepo_tables_find")
- @Operation(summary = "Get information about table", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Find table",
+ description = "Finds a table with id.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Find table successfully",
@@ -383,42 +388,35 @@ public class TableEndpoint {
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
@ApiResponse(responseCode = "502",
- description = "Connection to search service failed",
+ description = "Failed to establish connection with broker service",
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
@ApiResponse(responseCode = "503",
- description = "Failed to save in search service",
+ description = "Failed to obtain queue information from broker service",
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
})
public ResponseEntity<TableDto> findById(@NotNull @PathVariable("databaseId") Long databaseId,
@NotNull @PathVariable("tableId") Long tableId,
- Principal principal) throws ServiceException,
- ServiceConnectionException, TableNotFoundException, DatabaseNotFoundException, QueueNotFoundException {
+ Principal principal) throws DataServiceException,
+ DataServiceConnectionException, TableNotFoundException, DatabaseNotFoundException, QueueNotFoundException {
log.debug("endpoint find table, databaseId={}, tableId={}", databaseId, tableId);
final Table table = tableService.findById(databaseId, tableId);
final TableDto dto = metadataMapper.customTableToTableDto(table);
final HttpHeaders headers = new HttpHeaders();
- if (principal != null) {
- /* extra effort only when logged-in */
- final QueueDto queue = messageQueueService.findQueue(rabbitMqConfig.getQueueName());
- dto.setQueueType(queue.getType());
- final Authentication authentication = (Authentication) principal;
- if (authentication.isAuthenticated() && authentication.getAuthorities().stream().anyMatch(a -> a.getAuthority().equals("admin"))) {
- headers.set("X-Username", table.getDatabase().getContainer().getPrivilegedUsername());
- headers.set("X-Password", table.getDatabase().getContainer().getPrivilegedPassword());
- headers.set("X-Host", table.getDatabase().getContainer().getHost());
- headers.set("X-Port", "" + table.getDatabase().getContainer().getPort());
- headers.set("X-Type", table.getDatabase().getContainer().getImage().getJdbcMethod());
- headers.set("X-Database", table.getDatabase().getInternalName());
- headers.set("X-Sidecar-Host", table.getDatabase().getContainer().getSidecarHost());
- headers.set("X-Sidecar-Port", "" + table.getDatabase().getContainer().getSidecarPort());
- headers.set("Access-Control-Expose-Headers", "X-Username X-Password X-Host X-Port X-Type X-Database X-Sidecar-Host X-Sidecar-Port");
- }
+ if (UserUtil.isSystem(principal)) {
+ headers.set("X-Username", table.getDatabase().getContainer().getPrivilegedUsername());
+ headers.set("X-Password", table.getDatabase().getContainer().getPrivilegedPassword());
+ headers.set("X-Host", table.getDatabase().getContainer().getHost());
+ headers.set("X-Port", "" + table.getDatabase().getContainer().getPort());
+ headers.set("X-Type", table.getDatabase().getContainer().getImage().getJdbcMethod());
+ headers.set("X-Database", table.getDatabase().getInternalName());
+ headers.set("X-Sidecar-Host", table.getDatabase().getContainer().getSidecarHost());
+ headers.set("X-Sidecar-Port", "" + table.getDatabase().getContainer().getSidecarPort());
+ headers.set("Access-Control-Expose-Headers", "X-Username X-Password X-Host X-Port X-Type X-Database X-Sidecar-Host X-Sidecar-Port");
}
- log.trace("find table resulted in table {}", dto);
return ResponseEntity.status(HttpStatus.OK)
.headers(headers)
.body(dto);
@@ -428,11 +426,12 @@ public class TableEndpoint {
@Transactional
@PreAuthorize("hasAuthority('delete-table') or hasAuthority('delete-foreign-table')")
@Observed(name = "dbrepo_table_delete")
- @Operation(summary = "Delete a table", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Delete table",
+ description = "Deletes a table with id. Only the owner of a table can perform this action (requires role `delete-table`) or anyone can delete a table (requires role `delete-foreign-table`).",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
- description = "Delete table successfully",
- content = {@Content}),
+ description = "Delete table successfully"),
@ApiResponse(responseCode = "400",
description = "Delete table query resulted in an invalid query statement",
content = {@Content(
@@ -459,10 +458,10 @@ public class TableEndpoint {
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
})
- public ResponseEntity<?> delete(@NotNull @PathVariable("databaseId") Long databaseId,
- @NotNull @PathVariable("tableId") Long tableId,
- @NotNull Principal principal) throws NotAllowedException,
- ServiceException, ServiceConnectionException, TableNotFoundException, DatabaseNotFoundException,
+ public ResponseEntity<Void> delete(@NotNull @PathVariable("databaseId") Long databaseId,
+ @NotNull @PathVariable("tableId") Long tableId,
+ @NotNull Principal principal) throws NotAllowedException,
+ DataServiceException, DataServiceConnectionException, TableNotFoundException, DatabaseNotFoundException,
SearchServiceException, SearchServiceConnectionException {
log.debug("endpoint delete table, databaseId={}, tableId={}", databaseId, tableId);
final Table table = tableService.findById(databaseId, tableId);
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UnitEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UnitEndpoint.java
index 71dfa78ceff621861c1191e84790032dc6924a13..c992f151b5a32bafaf62a85a1a930ffbe7d0bdbe 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UnitEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UnitEndpoint.java
@@ -36,7 +36,8 @@ public class UnitEndpoint {
@GetMapping
@Transactional(readOnly = true)
@Observed(name = "dbrepo_semantic_units_findall")
- @Operation(summary = "List semantic units")
+ @Operation(summary = "List units",
+ description = "Lists units known to the metadata database.")
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Find all semantic units",
@@ -50,7 +51,6 @@ public class UnitEndpoint {
.stream()
.map(metadataMapper::tableColumnUnitToUnitDto)
.toList();
- log.trace("Find all units resulted in dtos {}", dtos);
return ResponseEntity.ok()
.body(dtos);
}
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java
index fb9ddc0096db6a279011b2d8f0677493c12a22af..4be54d5edd1ed39168b97a00177d87d09a7a87ee 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java
@@ -59,7 +59,8 @@ public class UserEndpoint {
@GetMapping
@Transactional(readOnly = true)
@Observed(name = "dbrepo_users_list")
- @Operation(summary = "Find all users")
+ @Operation(summary = "List users",
+ description = "Lists users known to the metadata database.")
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "List users",
@@ -73,26 +74,31 @@ public class UserEndpoint {
.stream()
.map(userMapper::userToUserBriefDto)
.toList();
- log.trace("find all users resulted in users {}", users);
return ResponseEntity.ok(users);
}
@PostMapping
- @Transactional(rollbackFor = {ServiceException.class, ServiceConnectionException.class})
+ @Transactional(rollbackFor = {Exception.class})
@PreAuthorize("!isAuthenticated()")
@Observed(name = "dbrepo_user_create")
- @Operation(summary = "Create user")
+ @Operation(summary = "Create user",
+ description = "Creates a user in the auth service and metadata database. Requires that no credentials are sent in the request.")
@ApiResponses(value = {
@ApiResponse(responseCode = "201",
description = "Created user",
content = {@Content(
mediaType = "application/json",
- schema = @Schema(implementation = UserBriefDto.class))}),
+ schema = @Schema(implementation = UserDto.class))}),
@ApiResponse(responseCode = "400",
description = "Parameters are not well-formed (likely email)",
content = {@Content(mediaType = "application/json")}),
+ @ApiResponse(responseCode = "403",
+ description = "Internal authentication to the auth service is invalid",
+ content = {@Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = ApiErrorDto.class))}),
@ApiResponse(responseCode = "404",
- description = "default role not found",
+ description = "Default role not found",
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
@@ -117,30 +123,33 @@ public class UserEndpoint {
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
})
- public ResponseEntity<UserBriefDto> create(@NotNull @Valid @RequestBody SignupRequestDto data)
- throws UserExistsException, EmailExistsException, ServiceException, ServiceConnectionException,
- UserNotFoundException {
- log.debug("endpoint create a user, data.username={}", data.getUsername());
+ public ResponseEntity<UserDto> create(@NotNull @Valid @RequestBody SignupRequestDto data)
+ throws UserExistsException, EmailExistsException, AuthServiceException, AuthServiceConnectionException,
+ UserNotFoundException, CredentialsInvalidException {
+ log.debug("endpoint create user, data.username={}", data.getUsername());
userService.validateUsernameNotExists(data.getUsername());
userService.validateEmailNotExists(data.getEmail());
- authenticationService.create(data);
- final at.tuwien.api.keycloak.UserDto keycloakUserDto = authenticationService.findByUsername(data.getUsername());
- final User user = userService.create(data, keycloakUserDto.getId());
- final UserBriefDto dto = userMapper.userToUserBriefDto(user);
- log.trace("create user resulted in dto {}", dto);
+ final User user = userService.create(data, authenticationService.create(data).getAttributes().getLdapId()[0]);
+ log.info("Created user with id: {}", user.getId());
return ResponseEntity.status(HttpStatus.CREATED)
- .body(dto);
+ .body(userMapper.userToUserDto(user));
}
@PostMapping("/token")
@Observed(name = "dbrepo_user_token")
- @Operation(summary = "Obtain user token")
+ @Operation(summary = "Create token",
+ description = "Creates a user token via the auth service.")
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
description = "Obtained user token",
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = TokenDto.class))}),
+ @ApiResponse(responseCode = "400",
+ description = "Invalid login request",
+ content = {@Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = ApiErrorDto.class))}),
@ApiResponse(responseCode = "403",
description = "Not allowed to get token",
content = {@Content(
@@ -168,7 +177,7 @@ public class UserEndpoint {
schema = @Schema(implementation = ApiErrorDto.class))}),
})
public ResponseEntity<TokenDto> getToken(@NotNull @Valid @RequestBody LoginRequestDto data)
- throws ServiceException, ServiceConnectionException, UserNotFoundException, CredentialsInvalidException,
+ throws AuthServiceException, AuthServiceConnectionException, UserNotFoundException, CredentialsInvalidException,
AccountNotSetupException {
log.debug("endpoint get token, data.username={}", data.getUsername());
/* check */
@@ -177,14 +186,19 @@ public class UserEndpoint {
userService.findByUsername(data.getUsername());
} catch (UserNotFoundException e) {
/* need to sync */
- log.debug("User with username {} does not exist in metadata database yet", data.getUsername());
+ log.warn("User with username {} does not exist in metadata database yet", data.getUsername());
final SignupRequestDto request = SignupRequestDto.builder()
.username(data.getUsername())
.email("noreply@example.com")
.password(data.getPassword())
.build();
- userService.create(request, authenticationService.findByUsername(data.getUsername()).getId());
- log.info("Fetched user information from auth service and stored it into metadata database");
+ final at.tuwien.api.keycloak.UserDto user = authenticationService.findByUsername(data.getUsername());
+ if (user.getAttributes().getLdapId().length != 1) {
+ log.error("Failed to map ldap id for user with username: {}", data.getUsername());
+ throw new UserNotFoundException("Failed to map ldap id");
+ }
+ userService.create(request, user.getAttributes().getLdapId()[0]);
+ log.info("Patched missing user information for user with username: {}", data.getUsername());
}
return ResponseEntity.accepted()
.body(token);
@@ -192,18 +206,24 @@ public class UserEndpoint {
@PutMapping("/token")
@Observed(name = "dbrepo_user_refresh_token")
- @Operation(summary = "Refresh user token")
+ @Operation(summary = "Refresh token",
+ description = "Refreshes user token by refresh token.")
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
description = "Refreshed user token",
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = TokenDto.class))}),
- @ApiResponse(responseCode = "403",
+ @ApiResponse(responseCode = "400",
description = "Invalid refresh token",
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
+ @ApiResponse(responseCode = "403",
+ description = "Not allowed",
+ content = {@Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = ApiErrorDto.class))}),
@ApiResponse(responseCode = "502",
description = "Connection to auth service failed",
content = {@Content(
@@ -211,7 +231,7 @@ public class UserEndpoint {
schema = @Schema(implementation = ApiErrorDto.class))}),
})
public ResponseEntity<TokenDto> refreshToken(@NotNull @Valid @RequestBody RefreshTokenRequestDto data)
- throws ServiceConnectionException, CredentialsInvalidException {
+ throws AuthServiceConnectionException, CredentialsInvalidException {
log.debug("endpoint refresh token");
/* check */
final TokenDto token = authenticationService.refreshToken(data.getRefreshToken());
@@ -223,7 +243,9 @@ public class UserEndpoint {
@Transactional(readOnly = true)
@PreAuthorize("isAuthenticated()")
@Observed(name = "dbrepo_user_find")
- @Operation(summary = "Get a user info", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Get user",
+ description = "Gets user with id from the metadata database. Requires authentication.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Found user",
@@ -244,11 +266,11 @@ public class UserEndpoint {
public ResponseEntity<UserDto> find(@NotNull @PathVariable("userId") UUID userId,
@NotNull Principal principal) throws NotAllowedException,
UserNotFoundException {
- log.debug("endpoint find a user, userId={}", userId);
+ log.debug("endpoint find a user, userId={}, principal.name={}", userId, principal.getName());
/* check */
final User user = userService.findById(userId);
if (!user.equals(principal)) {
- if (!UserUtil.hasRole(principal, "admin")) {
+ if (!UserUtil.hasRole(principal, "find-foreign-user")) {
log.error("Failed to find user: foreign user");
throw new NotAllowedException("Failed to find user: foreign user");
}
@@ -262,7 +284,9 @@ public class UserEndpoint {
@Transactional
@PreAuthorize("hasAuthority('modify-user-information')")
@Observed(name = "dbrepo_user_modify")
- @Operation(summary = "Modify user information", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Update user",
+ description = "Updates user with id. Requires role `modify-user-information`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
description = "Modified user information",
@@ -302,16 +326,20 @@ public class UserEndpoint {
}
@PutMapping("/{userId}/password")
- @Transactional
+ @Transactional(rollbackFor = {Exception.class})
@PreAuthorize("isAuthenticated()")
@Observed(name = "dbrepo_user_password_modify")
- @Operation(summary = "Modify user password", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Update user password",
+ description = "Updates password of user with id. Requires authentication.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
- description = "Modified user password",
+ description = "Modified user password"),
+ @ApiResponse(responseCode = "400",
+ description = "Invalid password payload",
content = {@Content(
mediaType = "application/json",
- schema = @Schema(implementation = UserDto.class))}),
+ schema = @Schema(implementation = ApiErrorDto.class))}),
@ApiResponse(responseCode = "403",
description = "Not allowed to change foreign user password",
content = {@Content(
@@ -333,22 +361,22 @@ public class UserEndpoint {
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
})
- public ResponseEntity<?> password(@NotNull @PathVariable("userId") UUID userId,
- @NotNull @Valid @RequestBody UserPasswordDto data,
- @NotNull Principal principal) throws NotAllowedException, ServiceException,
- ServiceConnectionException, UserNotFoundException, DatabaseNotFoundException {
+ public ResponseEntity<Void> password(@NotNull @PathVariable("userId") UUID userId,
+ @NotNull @Valid @RequestBody UserPasswordDto data,
+ @NotNull Principal principal) throws NotAllowedException, AuthServiceException,
+ AuthServiceConnectionException, UserNotFoundException, DatabaseNotFoundException, DataServiceException,
+ DataServiceConnectionException, CredentialsInvalidException {
log.debug("endpoint modify a user password, userId={}, data.password=(hidden)", userId);
- User user = userService.findById(userId);
+ final User user = userService.findById(userId);
if (!user.equals(principal)) {
log.error("Failed to modify user password: not current user");
throw new NotAllowedException("Failed to modify user password: not current user");
}
- user = userService.findByUsername(principal.getName());
- userService.updatePassword(user, data);
authenticationService.updatePassword(user, data);
for (Database database : databaseService.findAllAccess(userId)) {
databaseService.updatePassword(database, user);
}
+ userService.updatePassword(user, data);
return ResponseEntity.accepted()
.build();
}
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java
index 701e3172fb648af3edc459001c197609c7410633..79981ee6d1fdcaaa5344915f7a0f3d3c43514926 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java
@@ -12,6 +12,7 @@ import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.DatabaseService;
import at.tuwien.service.UserService;
import at.tuwien.service.ViewService;
+import at.tuwien.utils.UserUtil;
import io.micrometer.observation.annotation.Observed;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.ArraySchema;
@@ -28,7 +29,6 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.core.Authentication;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -48,7 +48,7 @@ public class ViewEndpoint {
private final DatabaseService databaseService;
@Autowired
- public ViewEndpoint(UserService userService, ViewService viewService, MetadataMapper metadataMapper,
+ public ViewEndpoint(UserService userService, ViewService viewService, MetadataMapper metadataMapper,
DatabaseService databaseService) {
this.userService = userService;
this.viewService = viewService;
@@ -59,7 +59,9 @@ public class ViewEndpoint {
@GetMapping
@Transactional(readOnly = true)
@Observed(name = "dbrepo_views_findall")
- @Operation(summary = "Find all views", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "List views",
+ description = "Lists views known to the metadata database.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Find views successfully",
@@ -90,7 +92,9 @@ public class ViewEndpoint {
@Transactional
@PreAuthorize("hasAuthority('create-database-view')")
@Observed(name = "dbrepo_view_create")
- @Operation(summary = "Create a view", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Create view",
+ description = "Creates a view. Requires role `create-database-view`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "201",
description = "Create view successfully",
@@ -102,11 +106,6 @@ public class ViewEndpoint {
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
- @ApiResponse(responseCode = "401",
- description = "Credentials missing",
- content = {@Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ApiErrorDto.class))}),
@ApiResponse(responseCode = "403",
description = "Credentials missing",
content = {@Content(
@@ -117,11 +116,6 @@ public class ViewEndpoint {
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
- @ApiResponse(responseCode = "405",
- description = "Create view is not permitted",
- content = {@Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ApiErrorDto.class))}),
@ApiResponse(responseCode = "423",
description = "Create view resulted in an invalid query statement",
content = {@Content(
@@ -141,7 +135,7 @@ public class ViewEndpoint {
public ResponseEntity<ViewBriefDto> create(@NotNull @PathVariable("databaseId") Long databaseId,
@NotNull @Valid @RequestBody ViewCreateDto data,
@NotNull Principal principal) throws NotAllowedException,
- MalformedException, ServiceException, ServiceConnectionException, DatabaseNotFoundException,
+ MalformedException, DataServiceException, DataServiceConnectionException, DatabaseNotFoundException,
UserNotFoundException, SearchServiceException, SearchServiceConnectionException {
log.debug("endpoint create view, databaseId={}, data={}", databaseId, data);
final Database database = databaseService.findById(databaseId);
@@ -161,7 +155,9 @@ public class ViewEndpoint {
@GetMapping("/{viewId}")
@Transactional(readOnly = true)
@Observed(name = "dbrepo_view_find")
- @Operation(summary = "Find one view", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Get view",
+ description = "Gets a view with id in the metadata database.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Find view successfully",
@@ -187,17 +183,14 @@ public class ViewEndpoint {
final Database database = databaseService.findById(databaseId);
final View view = viewService.findById(database, viewId);
final HttpHeaders headers = new HttpHeaders();
- if (principal != null) {
- final Authentication authentication = (Authentication) principal;
- if (authentication.isAuthenticated() && authentication.getAuthorities().stream().anyMatch(a -> a.getAuthority().equals("admin"))) {
- headers.set("X-Username", view.getDatabase().getContainer().getPrivilegedUsername());
- headers.set("X-Password", view.getDatabase().getContainer().getPrivilegedPassword());
- headers.set("X-Host", view.getDatabase().getContainer().getHost());
- headers.set("X-Port", "" + view.getDatabase().getContainer().getPort());
- headers.set("X-Type", view.getDatabase().getContainer().getImage().getJdbcMethod());
- headers.set("X-Database", view.getDatabase().getInternalName());
- headers.set("Access-Control-Expose-Headers", "X-Username X-Password X-Host X-Port X-Type X-Database");
- }
+ if (UserUtil.isSystem(principal)) {
+ headers.set("X-Username", view.getDatabase().getContainer().getPrivilegedUsername());
+ headers.set("X-Password", view.getDatabase().getContainer().getPrivilegedPassword());
+ headers.set("X-Host", view.getDatabase().getContainer().getHost());
+ headers.set("X-Port", "" + view.getDatabase().getContainer().getPort());
+ headers.set("X-Type", view.getDatabase().getContainer().getImage().getJdbcMethod());
+ headers.set("X-Database", view.getDatabase().getInternalName());
+ headers.set("Access-Control-Expose-Headers", "X-Username X-Password X-Host X-Port X-Type X-Database");
}
return ResponseEntity.status(HttpStatus.OK)
.headers(headers)
@@ -208,11 +201,12 @@ public class ViewEndpoint {
@Transactional
@PreAuthorize("hasAuthority('delete-database-view')")
@Observed(name = "dbrepo_view_delete")
- @Operation(summary = "Delete one view", security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
+ @Operation(summary = "Delete view",
+ description = "Deletes a view with id. Requires role `delete-database-view`.",
+ security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
@ApiResponses(value = {
@ApiResponse(responseCode = "202",
- description = "Delete view successfully",
- content = {@Content}),
+ description = "Delete view successfully"),
@ApiResponse(responseCode = "400",
description = "Delete view query is malformed",
content = {@Content(
@@ -228,11 +222,6 @@ public class ViewEndpoint {
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
- @ApiResponse(responseCode = "405",
- description = "Delete view is not permitted",
- content = {@Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ApiErrorDto.class))}),
@ApiResponse(responseCode = "423",
description = "Delete view resulted in an invalid query statement",
content = {@Content(
@@ -249,10 +238,10 @@ public class ViewEndpoint {
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
})
- public ResponseEntity<?> delete(@NotNull @PathVariable("databaseId") Long databaseId,
- @NotNull @PathVariable("viewId") Long viewId,
- @NotNull Principal principal) throws NotAllowedException, ServiceException,
- ServiceConnectionException, DatabaseNotFoundException, ViewNotFoundException, SearchServiceException,
+ public ResponseEntity<View> delete(@NotNull @PathVariable("databaseId") Long databaseId,
+ @NotNull @PathVariable("viewId") Long viewId,
+ @NotNull Principal principal) throws NotAllowedException, DataServiceException,
+ DataServiceConnectionException, DatabaseNotFoundException, ViewNotFoundException, SearchServiceException,
SearchServiceConnectionException {
log.debug("endpoint delete view, databaseId={}, viewId={}", databaseId, viewId);
final Database database = databaseService.findById(databaseId);
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
index bca87e510e1d849c371f76d79f39b7471d9413d2..f6764895556ac07fe0321ae3e4a580f17e873d54 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
@@ -10,7 +10,6 @@ import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.context.request.WebRequest;
import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
@Log4j2
@@ -31,6 +30,34 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
+ @Hidden
+ @ResponseStatus(code = HttpStatus.BAD_GATEWAY)
+ @ExceptionHandler(AuthServiceConnectionException.class)
+ public ResponseEntity<ApiErrorDto> handle(AuthServiceConnectionException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE)
+ @ExceptionHandler(AuthServiceException.class)
+ public ResponseEntity<ApiErrorDto> handle(AuthServiceException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.BAD_GATEWAY)
+ @ExceptionHandler(BrokerServiceConnectionException.class)
+ public ResponseEntity<ApiErrorDto> handle(BrokerServiceConnectionException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE)
+ @ExceptionHandler(BrokerServiceException.class)
+ public ResponseEntity<ApiErrorDto> handle(BrokerServiceException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
@Hidden
@ResponseStatus(code = HttpStatus.NOT_FOUND)
@ExceptionHandler(ConceptNotFoundException.class)
@@ -59,6 +86,13 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
+ @Hidden
+ @ResponseStatus(code = HttpStatus.EXPECTATION_FAILED)
+ @ExceptionHandler(DatabaseMalformedException.class)
+ public ResponseEntity<ApiErrorDto> handle(DatabaseMalformedException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
@Hidden
@ResponseStatus(code = HttpStatus.NOT_FOUND)
@ExceptionHandler(DatabaseNotFoundException.class)
@@ -66,6 +100,13 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
+ @Hidden
+ @ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE)
+ @ExceptionHandler(DatabaseUnavailableException.class)
+ public ResponseEntity<ApiErrorDto> handle(DatabaseUnavailableException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
@Hidden
@ResponseStatus(code = HttpStatus.NOT_FOUND)
@ExceptionHandler(DoiNotFoundException.class)
@@ -87,30 +128,37 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
+ @Hidden
+ @ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE)
+ @ExceptionHandler(ExternalServiceException.class)
+ public ResponseEntity<ApiErrorDto> handle(ExternalServiceException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
@Hidden
@ResponseStatus(code = HttpStatus.BAD_REQUEST)
- @ExceptionHandler({FilterBadRequestException.class})
+ @ExceptionHandler(FilterBadRequestException.class)
public ResponseEntity<ApiErrorDto> handle(FilterBadRequestException e) {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
@Hidden
@ResponseStatus(code = HttpStatus.NOT_ACCEPTABLE)
- @ExceptionHandler({FormatNotAvailableException.class})
+ @ExceptionHandler(FormatNotAvailableException.class)
public ResponseEntity<ApiErrorDto> handle(FormatNotAvailableException e) {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
@Hidden
@ResponseStatus(code = HttpStatus.NOT_FOUND)
- @ExceptionHandler({IdentifierNotFoundException.class})
+ @ExceptionHandler(IdentifierNotFoundException.class)
public ResponseEntity<ApiErrorDto> handle(IdentifierNotFoundException e) {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
@Hidden
@ResponseStatus(code = HttpStatus.NOT_FOUND)
- @ExceptionHandler({IdentifierNotSupportedException.class})
+ @ExceptionHandler(IdentifierNotSupportedException.class)
public ResponseEntity<ApiErrorDto> handle(IdentifierNotSupportedException e) {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
@@ -145,18 +193,32 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
@Hidden
@ResponseStatus(code = HttpStatus.BAD_REQUEST)
- @ExceptionHandler({MalformedException.class})
+ @ExceptionHandler(MalformedException.class)
public ResponseEntity<ApiErrorDto> handle(MalformedException e) {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
@Hidden
@ResponseStatus(code = HttpStatus.NOT_FOUND)
- @ExceptionHandler({MessageNotFoundException.class})
+ @ExceptionHandler(MessageNotFoundException.class)
public ResponseEntity<ApiErrorDto> handle(MessageNotFoundException e) {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
+ @Hidden
+ @ResponseStatus(code = HttpStatus.BAD_GATEWAY)
+ @ExceptionHandler(MetadataServiceConnectionException.class)
+ public ResponseEntity<ApiErrorDto> handle(MetadataServiceConnectionException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE)
+ @ExceptionHandler(MetadataServiceException.class)
+ public ResponseEntity<ApiErrorDto> handle(MetadataServiceException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
@Hidden
@ResponseStatus(code = HttpStatus.FORBIDDEN)
@ExceptionHandler(NotAllowedException.class)
@@ -180,11 +242,18 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
@Hidden
@ResponseStatus(code = HttpStatus.BAD_REQUEST)
- @ExceptionHandler({PaginationException.class})
+ @ExceptionHandler(PaginationException.class)
public ResponseEntity<ApiErrorDto> handle(PaginationException e) {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
+ @Hidden
+ @ResponseStatus(code = HttpStatus.BAD_REQUEST)
+ @ExceptionHandler(QueryMalformedException.class)
+ public ResponseEntity<ApiErrorDto> handle(QueryMalformedException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
@Hidden
@ResponseStatus(code = HttpStatus.NOT_FOUND)
@ExceptionHandler(QueryNotFoundException.class)
@@ -192,52 +261,108 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
+ @Hidden
+ @ResponseStatus(code = HttpStatus.NOT_IMPLEMENTED)
+ @ExceptionHandler(QueryNotSupportedException.class)
+ public ResponseEntity<ApiErrorDto> handle(QueryNotSupportedException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
@Hidden
@ResponseStatus(code = HttpStatus.NOT_FOUND)
- @ExceptionHandler({QueueNotFoundException.class})
+ @ExceptionHandler(QueueNotFoundException.class)
public ResponseEntity<ApiErrorDto> handle(QueueNotFoundException e) {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
+ @Hidden
+ @ResponseStatus(code = HttpStatus.EXPECTATION_FAILED)
+ @ExceptionHandler(QueryStoreCreateException.class)
+ public ResponseEntity<ApiErrorDto> handle(QueryStoreCreateException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.BAD_REQUEST)
+ @ExceptionHandler(QueryStoreGCException.class)
+ public ResponseEntity<ApiErrorDto> handle(QueryStoreGCException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.EXPECTATION_FAILED)
+ @ExceptionHandler(QueryStoreInsertException.class)
+ public ResponseEntity<ApiErrorDto> handle(QueryStoreInsertException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.EXPECTATION_FAILED)
+ @ExceptionHandler(QueryStorePersistException.class)
+ public ResponseEntity<ApiErrorDto> handle(QueryStorePersistException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE)
+ @ExceptionHandler(RemoteUnavailableException.class)
+ public ResponseEntity<ApiErrorDto> handle(RemoteUnavailableException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
@Hidden
@ResponseStatus(code = HttpStatus.NOT_FOUND)
- @ExceptionHandler({RorNotFoundException.class})
+ @ExceptionHandler(RorNotFoundException.class)
public ResponseEntity<ApiErrorDto> handle(RorNotFoundException e) {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
@Hidden
@ResponseStatus(code = HttpStatus.BAD_GATEWAY)
- @ExceptionHandler({SearchServiceConnectionException.class})
+ @ExceptionHandler(SearchServiceConnectionException.class)
public ResponseEntity<ApiErrorDto> handle(SearchServiceConnectionException e) {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
@Hidden
@ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE)
- @ExceptionHandler({SearchServiceException.class})
+ @ExceptionHandler(SearchServiceException.class)
public ResponseEntity<ApiErrorDto> handle(SearchServiceException e) {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
@Hidden
@ResponseStatus(code = HttpStatus.NOT_FOUND)
- @ExceptionHandler({SemanticEntityNotFoundException.class})
+ @ExceptionHandler(SemanticEntityNotFoundException.class)
public ResponseEntity<ApiErrorDto> handle(SemanticEntityNotFoundException e) {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
@Hidden
@ResponseStatus(code = HttpStatus.BAD_GATEWAY)
- @ExceptionHandler({ServiceConnectionException.class})
- public ResponseEntity<ApiErrorDto> handle(ServiceConnectionException e) {
+ @ExceptionHandler(DataServiceConnectionException.class)
+ public ResponseEntity<ApiErrorDto> handle(DataServiceConnectionException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE)
+ @ExceptionHandler(DataServiceException.class)
+ public ResponseEntity<ApiErrorDto> handle(DataServiceException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE)
+ @ExceptionHandler(SidecarExportException.class)
+ public ResponseEntity<ApiErrorDto> handle(SidecarExportException e) {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
@Hidden
@ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE)
- @ExceptionHandler({ServiceException.class})
- public ResponseEntity<ApiErrorDto> handle(ServiceException e) {
+ @ExceptionHandler(SidecarImportException.class)
+ public ResponseEntity<ApiErrorDto> handle(SidecarImportException e) {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
@@ -269,23 +394,37 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
+ @Hidden
+ @ResponseStatus(code = HttpStatus.BAD_REQUEST)
+ @ExceptionHandler(TableMalformedException.class)
+ public ResponseEntity<ApiErrorDto> handle(TableMalformedException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
+ @Hidden
+ @ResponseStatus(code = HttpStatus.CONFLICT)
+ @ExceptionHandler(TableSchemaException.class)
+ public ResponseEntity<ApiErrorDto> handle(TableSchemaException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
@Hidden
@ResponseStatus(code = HttpStatus.NOT_FOUND)
- @ExceptionHandler({TableNotFoundException.class})
+ @ExceptionHandler(TableNotFoundException.class)
public ResponseEntity<ApiErrorDto> handle(TableNotFoundException e) {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
@Hidden
@ResponseStatus(code = HttpStatus.NOT_FOUND)
- @ExceptionHandler({UnitNotFoundException.class})
+ @ExceptionHandler(UnitNotFoundException.class)
public ResponseEntity<ApiErrorDto> handle(UnitNotFoundException e) {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
@Hidden
@ResponseStatus(code = HttpStatus.EXPECTATION_FAILED)
- @ExceptionHandler({UriMalformedException.class})
+ @ExceptionHandler(UriMalformedException.class)
public ResponseEntity<ApiErrorDto> handle(UriMalformedException e) {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
@@ -304,6 +443,13 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
+ @Hidden
+ @ResponseStatus(code = HttpStatus.BAD_REQUEST)
+ @ExceptionHandler(ViewMalformedException.class)
+ public ResponseEntity<ApiErrorDto> handle(ViewMalformedException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
@Hidden
@ResponseStatus(code = HttpStatus.NOT_FOUND)
@ExceptionHandler(ViewNotFoundException.class)
@@ -311,6 +457,13 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
return generic_handle(e.getClass(), e.getLocalizedMessage());
}
+ @Hidden
+ @ResponseStatus(code = HttpStatus.CONFLICT)
+ @ExceptionHandler(ViewSchemaException.class)
+ public ResponseEntity<ApiErrorDto> handle(ViewSchemaException e) {
+ return generic_handle(e.getClass(), e.getLocalizedMessage());
+ }
+
private ResponseEntity<ApiErrorDto> generic_handle(Class<?> exceptionClass, String message) {
final HttpHeaders headers = new HttpHeaders();
headers.set("Content-Type", "application/problem+json");
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java
index ab3f80b8021e0004eaf2cab0b17e4f8b62736863..7f05bf84a58ad90788476850fed0765394f80ae2 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java
@@ -255,7 +255,7 @@ public class EndpointValidator {
throw new NotAllowedException("Access not allowed: database with id " + database.getId() + " is not public and no authorization provided");
}
final User user = User.builder()
- .id(UserUtil.getId(principal))
+ .username(principal.getName())
.build();
final DatabaseAccess access = accessService.find(database, user);
log.trace("found access {}", access);
diff --git a/dbrepo-metadata-service/rest-service/src/main/resources/application-local.yml b/dbrepo-metadata-service/rest-service/src/main/resources/application-local.yml
index 87987f76bc609a2bdcf430510b611cb2d5b8059e..e2c9df6a59d8454661ca42b72617f2b67d6c1492 100644
--- a/dbrepo-metadata-service/rest-service/src/main/resources/application-local.yml
+++ b/dbrepo-metadata-service/rest-service/src/main/resources/application-local.yml
@@ -10,7 +10,7 @@ spring:
open-in-view: false
properties:
hibernate:
- default_schema: fda
+ default_schema: dbrepo
jdbc:
time_zone: UTC
format_sql: false
@@ -19,8 +19,8 @@ spring:
rabbitmq:
host: localhost
virtual-host: dbrepo
- username: fda
- password: fda
+ username: admin
+ password: admin
port: 5672
management:
endpoints:
@@ -58,9 +58,8 @@ dbrepo:
s3:
accessKeyId: seaweedfsadmin
secretAccessKey: seaweedfsadmin
- importBucket: dbrepo-upload
- exportBucket: dbrepo-download
- admin:
+ bucket: dbrepo
+ system:
username: admin
password: admin
endpoints:
@@ -70,13 +69,15 @@ dbrepo:
brokerService: http://localhost/admin/broker
authService: http://localhost/api/auth
storageService: http://localhost/api/storage
+ rorService: https://api.ror.org
+ crossRefService: http://data.crossref.org
pid:
base: http://localhost/pid/
jwt:
public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB
keycloak:
- username: fda
- password: fda
+ username: admin
+ password: admin
client: dbrepo-client
clientSecret: MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG
website: http://localhost
diff --git a/dbrepo-metadata-service/rest-service/src/main/resources/application.yml b/dbrepo-metadata-service/rest-service/src/main/resources/application.yml
index ca7cec2ea5045c077bc58c4817546aff8d0d1f75..13e207a8bdd4101e7e74b592ade00b7787fcce4b 100644
--- a/dbrepo-metadata-service/rest-service/src/main/resources/application.yml
+++ b/dbrepo-metadata-service/rest-service/src/main/resources/application.yml
@@ -3,17 +3,17 @@ application:
version: '@project.version@'
spring:
datasource:
- url: "jdbc:mariadb://${METADATA_HOST:metadata-db}:3306/${METADATA_DB:dbrepo}${METADATA_JDBC_EXTRA_ARGS}"
+ url: "jdbc:mariadb://${METADATA_HOST:metadata-db}:${METADATA_PORT:3306}/${METADATA_DB:dbrepo}${METADATA_JDBC_EXTRA_ARGS}"
driver-class-name: org.mariadb.jdbc.Driver
username: "${METADATA_USERNAME:root}"
- password: "${METADATA_PASSWORD:dbrepo}"
+ password: "${METADATA_DB_PASSWORD:dbrepo}"
jpa:
show-sql: false
database-platform: org.hibernate.dialect.MariaDBDialect
open-in-view: false
properties:
hibernate:
- default_schema: "${METADATA_DB:fda}"
+ default_schema: "${METADATA_DB:dbrepo}"
jdbc:
time_zone: UTC
application:
@@ -21,8 +21,8 @@ spring:
rabbitmq:
host: "${BROKER_HOST:broker-service}"
virtual-host: "${BROKER_VIRTUALHOST:dbrepo}"
- username: "${BROKER_USERNAME:fda}"
- password: "${BROKER_PASSWORD:fda}"
+ username: "${BROKER_USERNAME:admin}"
+ password: "${BROKER_PASSWORD:admin}"
port: ${BROKER_PORT:5672}
main:
banner-mode: off
@@ -60,25 +60,26 @@ dbrepo:
s3:
accessKeyId: "${S3_ACCESS_KEY_ID:seaweedfsadmin}"
secretAccessKey: "${S3_SECRET_ACCESS_KEY:seaweedfsadmin}"
- importBucket: "${S3_IMPORT_BUCKET:dbrepo-upload}"
- exportBucket: "${S3_EXPORT_BUCKET:dbrepo-download}"
- admin:
- username: "${ADMIN_USERNAME:admin}"
- password: "${ADMIN_PASSWORD:admin}"
+ bucket: "${S3_BUCKET:dbrepo}"
+ system:
+ username: "${SYSTEM_USERNAME:admin}"
+ password: "${SYSTEM_PASSWORD:admin}"
endpoints:
- searchService: "${SEARCH_SERVICE_ENDPOINT:http://gateway-service}"
- analyseService: "${ANALYSE_SERVICE_ENDPOINT:http://gateway-service}"
+ analyseService: "${ANALYSE_SERVICE_ENDPOINT:http://analyse-service:8080}"
+ searchService: "${SEARCH_SERVICE_ENDPOINT:http://search-service:8080}"
dataService: "${DATA_SERVICE_ENDPOINT:http://data-service:8080}"
- brokerService: "${BROKER_SERVICE_ENDPOINT:http://gateway-service/admin/broker}"
- authService: "${AUTH_SERVICE_ENDPOINT:http://gateway-service/api/auth}"
- storageService: "${S3_ENDPOINT:http://gateway-service/api/storage}"
+ brokerService: "${BROKER_SERVICE_ENDPOINT:http://broker-service:15672}"
+ authService: "${AUTH_SERVICE_ENDPOINT:http://auth-service:8080}"
+ storageService: "${S3_ENDPOINT:http://storage-service:9000}"
+ rorService: "${ROR_ENDPOINT:https://api.ror.org}"
+ crossRefService: "${CROSSREF_ENDPOINT:http://data.crossref.org}"
pid:
- base: "${PID_BASE:http://localhost/pid/}"
+ base: "${BASE_URL:http://localhost}/pid/"
jwt:
public_key: "${JWT_PUBKEY:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB}"
keycloak:
- username: "${AUTH_SERVICE_ADMIN:fda}"
- password: "${AUTH_SERVICE_ADMIN_PASSWORD:fda}"
+ username: "${AUTH_SERVICE_ADMIN:admin}"
+ password: "${AUTH_SERVICE_ADMIN_PASSWORD:admin}"
client: "${AUTH_SERVICE_CLIENT:dbrepo-client}"
clientSecret: "${AUTH_SERVICE_CLIENT_SECRET:MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}"
website: "${BASE_URL:http://localhost}"
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/config/RabbitConfig.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/config/RabbitConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..f8a83baf85c36852073f120f182f1819280dec67
--- /dev/null
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/config/RabbitConfig.java
@@ -0,0 +1,41 @@
+package at.tuwien.config;
+
+import at.tuwien.test.BaseTest;
+import lombok.Getter;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.http.client.support.BasicAuthenticationInterceptor;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.DefaultUriBuilderFactory;
+
+@Getter
+@Log4j2
+@Configuration
+public class RabbitConfig extends BaseTest {
+
+ @Value("${dbrepo.exchangeName}")
+ private String exchangeName;
+
+ @Value("${dbrepo.queueName}")
+ private String queueName;
+
+ @Value("${spring.rabbitmq.virtual-host}")
+ private String virtualHost;
+
+ @Value("${dbrepo.endpoints.brokerService}")
+ private String brokerEndpoint;
+
+ @Bean
+ @Primary
+ public RestTemplate brokerRestTemplate() {
+ final RestTemplate restTemplate = new RestTemplate();
+ restTemplate.setUriTemplateHandler(new DefaultUriBuilderFactory(brokerEndpoint));
+ restTemplate.getInterceptors()
+ .add(new BasicAuthenticationInterceptor(USER_1_USERNAME, USER_1_PASSWORD));
+ return restTemplate;
+ }
+
+}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/converters/IdentifierTypeConverterUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/converters/IdentifierTypeConverterUnitTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..7215e5db918f226e6a826fce66e4e129ca4f0c5f
--- /dev/null
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/converters/IdentifierTypeConverterUnitTest.java
@@ -0,0 +1,41 @@
+package at.tuwien.converters;
+
+import at.tuwien.api.identifier.IdentifierTypeDto;
+import at.tuwien.test.AbstractUnitTest;
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@Log4j2
+@SpringBootTest
+public class IdentifierTypeConverterUnitTest extends AbstractUnitTest {
+
+ @Autowired
+ private IdentifierTypeConverter identifierTypeConverter;
+
+ @BeforeEach
+ public void beforeEach() {
+ genesis();
+ }
+
+ @Test
+ public void identifierTypeConverter_succeeds() {
+
+ /* test */
+ final IdentifierTypeDto response = identifierTypeConverter.convert(IdentifierTypeDto.DATABASE.getName());
+ assertEquals(IdentifierTypeDto.DATABASE, response);
+ }
+
+ @Test
+ public void identifierTypeConverter_fails() {
+
+ /* test */
+ assertThrows(IllegalArgumentException.class, () -> {
+ identifierTypeConverter.convert("i_do_not_exist");
+ });
+ }
+}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/AccessEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/AccessEndpointUnitTest.java
index 0444a766901a3a33ed9cde1b19b874a42fa6ec87..69d817afb763fa47b878b71fb315bb8dbb02f750 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/AccessEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/AccessEndpointUnitTest.java
@@ -73,14 +73,13 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"create-database-access"})
- public void create_succeeds() throws ServiceException, ServiceConnectionException, NotAllowedException,
+ public void create_succeeds() throws DataServiceException, DataServiceConnectionException, NotAllowedException,
DatabaseNotFoundException, UserNotFoundException, AccessNotFoundException, SearchServiceException,
SearchServiceConnectionException {
/* mock */
- doNothing()
- .when(accessService)
- .create(eq(DATABASE_1), eq(USER_2), any(AccessTypeDto.class));
+ when(accessService.create(eq(DATABASE_1), eq(USER_2), any(AccessTypeDto.class)))
+ .thenReturn(DATABASE_1_USER_1_READ_ACCESS);
/* test */
generic_create(USER_2_PRINCIPAL, USER_2_ID, USER_2_USERNAME, USER_2);
@@ -116,12 +115,12 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithMockUser(username = USER_1_USERNAME, authorities = {"admin"})
+ @WithMockUser(username = USER_1_USERNAME, authorities = {"check-foreign-database-access"})
public void find_hasRoleHasAccessForeign_succeeds() throws UserNotFoundException, NotAllowedException,
DatabaseNotFoundException, AccessNotFoundException {
/* test */
- generic_find(DATABASE_1_ID, DATABASE_1, DATABASE_1_USER_1_READ_ACCESS, USER_LOCAL_ADMIN_PRINCIPAL, USER_1_ID, USER_1);
+ generic_find(DATABASE_1_ID, DATABASE_1, DATABASE_1_USER_1_READ_ACCESS, USER_1_PRINCIPAL, USER_1_ID, USER_1);
}
@Test
@@ -156,7 +155,7 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"update-database-access"})
- public void update_succeeds() throws NotAllowedException, ServiceException, ServiceConnectionException,
+ public void update_succeeds() throws NotAllowedException, DataServiceException, DataServiceConnectionException,
AccessNotFoundException, DatabaseNotFoundException, UserNotFoundException, SearchServiceException,
SearchServiceConnectionException {
@@ -191,7 +190,7 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"delete-database-access"})
- public void revoke_succeeds() throws NotAllowedException, ServiceException, ServiceConnectionException,
+ public void revoke_succeeds() throws NotAllowedException, DataServiceException, DataServiceConnectionException,
UserNotFoundException, DatabaseNotFoundException, AccessNotFoundException, SearchServiceException,
SearchServiceConnectionException {
@@ -209,7 +208,7 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
/* ################################################################################################### */
protected void generic_create(Principal principal, UUID userId, String username, User user)
- throws NotAllowedException, ServiceException, ServiceConnectionException, UserNotFoundException,
+ throws NotAllowedException, DataServiceException, DataServiceConnectionException, UserNotFoundException,
DatabaseNotFoundException, AccessNotFoundException, SearchServiceException,
SearchServiceConnectionException {
@@ -270,7 +269,7 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
}
protected void generic_update(DatabaseAccess access, String otherUsername, User otherUser, Principal principal,
- User user) throws NotAllowedException, ServiceException, ServiceConnectionException,
+ User user) throws NotAllowedException, DataServiceException, DataServiceConnectionException,
AccessNotFoundException, UserNotFoundException, DatabaseNotFoundException, SearchServiceException,
SearchServiceConnectionException {
@@ -308,8 +307,8 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
assertNull(response.getBody());
}
- protected void generic_revoke(Principal principal, User user) throws ServiceConnectionException,
- NotAllowedException, ServiceException, UserNotFoundException, DatabaseNotFoundException,
+ protected void generic_revoke(Principal principal, User user) throws DataServiceConnectionException,
+ NotAllowedException, DataServiceException, UserNotFoundException, DatabaseNotFoundException,
AccessNotFoundException, SearchServiceException, SearchServiceConnectionException {
/* mock */
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ContainerEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ContainerEndpointUnitTest.java
index 12963466607554c95920fce5fa187071bd56eea0..7706e185bd3721fdddec7daed15ce8df628b0bad 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ContainerEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ContainerEndpointUnitTest.java
@@ -42,7 +42,7 @@ public class ContainerEndpointUnitTest extends AbstractUnitTest {
public void findById_anonymous_succeeds() throws ContainerNotFoundException {
/* test */
- findById_generic(CONTAINER_1_ID, CONTAINER_1, null, false);
+ findById_generic(CONTAINER_1_ID, CONTAINER_1, null);
}
@Test
@@ -50,7 +50,7 @@ public class ContainerEndpointUnitTest extends AbstractUnitTest {
public void findById_hasRole_succeeds() throws ContainerNotFoundException {
/* test */
- findById_generic(CONTAINER_1_ID, CONTAINER_1, USER_1_PRINCIPAL, false);
+ findById_generic(CONTAINER_1_ID, CONTAINER_1, USER_1_PRINCIPAL);
}
@Test
@@ -58,15 +58,7 @@ public class ContainerEndpointUnitTest extends AbstractUnitTest {
public void findById_noRole_succeeds() throws ContainerNotFoundException {
/* test */
- findById_generic(CONTAINER_1_ID, CONTAINER_1, USER_4_PRINCIPAL, false);
- }
-
- @Test
- @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"admin"})
- public void findById_admin_succeeds() throws ContainerNotFoundException {
-
- /* test */
- findById_generic(CONTAINER_1_ID, CONTAINER_1, USER_LOCAL_ADMIN_PRINCIPAL, true);
+ findById_generic(CONTAINER_1_ID, CONTAINER_1, USER_4_PRINCIPAL);
}
@Test
@@ -173,7 +165,7 @@ public class ContainerEndpointUnitTest extends AbstractUnitTest {
/* ## GENERIC TEST CASES ## */
/* ################################################################################################### */
- public void findById_generic(Long containerId, Container container, Principal principal, Boolean isAdmin)
+ public void findById_generic(Long containerId, Container container, Principal principal)
throws ContainerNotFoundException {
/* mock */
@@ -184,15 +176,6 @@ public class ContainerEndpointUnitTest extends AbstractUnitTest {
final ResponseEntity<ContainerDto> response = containerEndpoint.findById(containerId, principal);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertNotNull(response.getBody());
- if (isAdmin) {
- assertNotNull(response.getHeaders());
- final List<String> xUsername = response.getHeaders().get("X-Username");
- assertNotNull(xUsername);
- assertEquals(CONTAINER_1_PRIVILEGED_USERNAME, xUsername.get(0));
- final List<String> xPassword = response.getHeaders().get("X-Password");
- assertNotNull(xPassword);
- assertEquals(CONTAINER_1_PRIVILEGED_PASSWORD, xPassword.get(0));
- }
}
public void delete_generic(Long containerId, Container container) throws ContainerNotFoundException {
@@ -239,7 +222,7 @@ public class ContainerEndpointUnitTest extends AbstractUnitTest {
.thenReturn(CONTAINER_1);
/* test */
- final ResponseEntity<ContainerBriefDto> response = containerEndpoint.create(data);
+ final ResponseEntity<ContainerDto> response = containerEndpoint.create(data);
assertEquals(HttpStatus.CREATED, response.getStatusCode());
assertNotNull(response.getBody());
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java
index 08233dfd4478321c77b5662d02f7dd4d6bc053b2..02ba52ecaa930f1747ee55f80cff2ea36379ffc1 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java
@@ -94,9 +94,10 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"create-database"})
- public void create_succeeds() throws ServiceException, ServiceConnectionException, UserNotFoundException,
+ public void create_succeeds() throws DataServiceException, DataServiceConnectionException, UserNotFoundException,
DatabaseNotFoundException, ContainerNotFoundException, SearchServiceException,
- SearchServiceConnectionException {
+ SearchServiceConnectionException, AuthServiceException, AuthServiceConnectionException,
+ CredentialsInvalidException, BrokerServiceException, BrokerServiceConnectionException {
final DatabaseCreateDto request = DatabaseCreateDto.builder()
.cid(CONTAINER_1_ID)
.name(DATABASE_1_NAME)
@@ -184,8 +185,9 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"modify-database-visibility"})
- public void visibility_hasRole_succeeds() throws NotAllowedException, ServiceException, ServiceConnectionException,
- UserNotFoundException, DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException {
+ public void visibility_hasRole_succeeds() throws NotAllowedException, UserNotFoundException,
+ DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException, AuthServiceException,
+ AuthServiceConnectionException, CredentialsInvalidException {
final DatabaseModifyVisibilityDto request = DatabaseModifyVisibilityDto.builder()
.isPublic(true)
.build();
@@ -300,9 +302,10 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"modify-database-owner"})
- public void transfer_hasRole_succeeds() throws ServiceConnectionException, ServiceException,
+ public void transfer_hasRole_succeeds() throws DataServiceConnectionException, DataServiceException,
NotAllowedException, UserNotFoundException, DatabaseNotFoundException, SearchServiceException,
- SearchServiceConnectionException {
+ SearchServiceConnectionException, AuthServiceException, AuthServiceConnectionException,
+ CredentialsInvalidException {
final DatabaseTransferDto request = DatabaseTransferDto.builder()
.id(USER_4_ID)
.build();
@@ -342,7 +345,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void findById_anonymous_succeeds() throws ServiceException, ServiceConnectionException,
+ public void findById_anonymous_succeeds() throws DataServiceException, DataServiceConnectionException,
DatabaseNotFoundException, ExchangeNotFoundException {
/* test */
@@ -361,7 +364,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"find-database"})
- public void findById_hasRole_succeeds() throws ServiceException, ServiceConnectionException,
+ public void findById_hasRole_succeeds() throws DataServiceException, DataServiceConnectionException,
DatabaseNotFoundException, ExchangeNotFoundException {
/* pre-condition */
@@ -373,7 +376,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"find-database"})
- public void findById_hasRoleForeign_succeeds() throws ServiceException, ServiceConnectionException,
+ public void findById_hasRoleForeign_succeeds() throws DataServiceException, DataServiceConnectionException,
DatabaseNotFoundException, ExchangeNotFoundException {
/* pre-condition */
@@ -385,7 +388,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"find-database"})
- public void findById_ownerSeesAccessRights_succeeds() throws ServiceException, ServiceConnectionException,
+ public void findById_ownerSeesAccessRights_succeeds() throws DataServiceException, DataServiceConnectionException,
DatabaseNotFoundException, ExchangeNotFoundException {
/* mock */
@@ -427,9 +430,10 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
assertEquals(databases.size(), body.size());
}
- public void create_generic(DatabaseCreateDto data, Principal principal, User user) throws ServiceException,
- ServiceConnectionException, UserNotFoundException, DatabaseNotFoundException, ContainerNotFoundException,
- SearchServiceException, SearchServiceConnectionException {
+ public void create_generic(DatabaseCreateDto data, Principal principal, User user) throws DataServiceException,
+ DataServiceConnectionException, UserNotFoundException, DatabaseNotFoundException,
+ ContainerNotFoundException, SearchServiceException, SearchServiceConnectionException,
+ BrokerServiceException, BrokerServiceConnectionException {
/* mock */
doNothing()
@@ -465,21 +469,17 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
}
public DatabaseDto findById_generic(Long databaseId, Database database, Principal principal)
- throws ServiceException, ServiceConnectionException, DatabaseNotFoundException, ExchangeNotFoundException {
+ throws DataServiceConnectionException, DatabaseNotFoundException, ExchangeNotFoundException,
+ DataServiceException {
/* mock */
if (database != null) {
when(databaseService.findById(databaseId))
.thenReturn(database);
- when(messageQueueService.findExchange(EXCHANGE_DBREPO_NAME))
- .thenReturn(EXCHANGE_DBREPO_DTO);
} else {
doThrow(DatabaseNotFoundException.class)
.when(databaseService)
.findById(databaseId);
- doThrow(ExchangeNotFoundException.class)
- .when(messageQueueService)
- .findExchange(EXCHANGE_DBREPO_NAME);
}
/* test */
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/IdentifierEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/IdentifierEndpointUnitTest.java
index 7a83d2558f92c93eee618a05ec427d11bb4d1b3a..af98f87e571bac44fd2e422848cbfc8e37262ffd 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/IdentifierEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/IdentifierEndpointUnitTest.java
@@ -78,8 +78,9 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void find_json0_succeeds() throws IOException, MalformedException, ServiceException,
- ServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException, FormatNotAvailableException {
+ public void find_json0_succeeds() throws IOException, MalformedException, DataServiceException,
+ DataServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException,
+ FormatNotAvailableException {
final String accept = "application/json";
final IdentifierDto compare = objectMapper.readValue(FileUtils.readFileToString(new File("src/test/resources/json/metadata0.json"), StandardCharsets.UTF_8), IdentifierDto.class);
@@ -109,8 +110,9 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void find_json1_succeeds() throws IOException, MalformedException, ServiceException,
- ServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException, FormatNotAvailableException {
+ public void find_json1_succeeds() throws IOException, MalformedException, DataServiceException,
+ DataServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException,
+ FormatNotAvailableException {
final String accept = "application/json";
final IdentifierDto compare = objectMapper.readValue(FileUtils.readFileToString(new File("src/test/resources/json/metadata1.json"), StandardCharsets.UTF_8), IdentifierDto.class);
@@ -160,8 +162,9 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void find_csv_succeeds() throws IOException, MalformedException, ServiceException,
- ServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException, FormatNotAvailableException {
+ public void find_csv_succeeds() throws IOException, MalformedException, DataServiceException,
+ DataServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException,
+ FormatNotAvailableException {
final String accept = "text/csv";
final InputStreamResource compare = new InputStreamResource(FileUtils.openInputStream(new File("src/test/resources/csv/keyboard.csv")));
final InputStreamResource mock = new InputStreamResource(FileUtils.openInputStream(new File("src/test/resources/csv/keyboard.csv")));
@@ -182,7 +185,9 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@Disabled("not testable with xml")
- public void find_xml0_succeeds() throws IOException, MalformedException, ServiceException, ServiceConnectionException, IdentifierNotFoundException, QueryNotFoundException, FormatNotAvailableException {
+ public void find_xml0_succeeds() throws IOException, MalformedException, DataServiceException,
+ DataServiceConnectionException, IdentifierNotFoundException, QueryNotFoundException,
+ FormatNotAvailableException {
final String accept = "text/xml";
final InputStreamResource compare = new InputStreamResource(FileUtils.openInputStream(new File("src/test/resources/xml/metadata0.xml")));
@@ -200,8 +205,9 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@Disabled("not testable with xml")
- public void find_xml1_succeeds() throws IOException, MalformedException, ServiceException,
- ServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException, FormatNotAvailableException {
+ public void find_xml1_succeeds() throws IOException, MalformedException, DataServiceException,
+ DataServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException,
+ FormatNotAvailableException {
final String accept = "text/xml";
final InputStreamResource compare = new InputStreamResource(FileUtils.openInputStream(new File("src/test/resources/xml/metadata1.xml")));
@@ -220,8 +226,9 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void find_bibliography_succeeds() throws IOException, MalformedException, ServiceException,
- ServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException, FormatNotAvailableException {
+ public void find_bibliography_succeeds() throws IOException, MalformedException, DataServiceException,
+ DataServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException,
+ FormatNotAvailableException {
final String accept = "text/bibliography";
final String compare = FileUtils.readFileToString(new File("src/test/resources/bibliography/style_apa1.txt"),
StandardCharsets.UTF_8);
@@ -242,8 +249,9 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void find_bibliographyApa0_succeeds() throws IOException, MalformedException, ServiceException,
- ServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException, FormatNotAvailableException {
+ public void find_bibliographyApa0_succeeds() throws IOException, MalformedException, DataServiceException,
+ DataServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException,
+ FormatNotAvailableException {
final String accept = "text/bibliography; style=apa";
final String compare = FileUtils.readFileToString(new File("src/test/resources/bibliography/style_apa0.txt"),
StandardCharsets.UTF_8);
@@ -264,8 +272,9 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void find_bibliographyApa1_succeeds() throws IOException, MalformedException, ServiceException,
- ServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException, FormatNotAvailableException {
+ public void find_bibliographyApa1_succeeds() throws IOException, MalformedException, DataServiceException,
+ DataServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException,
+ FormatNotAvailableException {
final String accept = "text/bibliography; style=apa";
final String compare = FileUtils.readFileToString(new File("src/test/resources/bibliography/style_apa1.txt"),
StandardCharsets.UTF_8);
@@ -286,8 +295,9 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void find_bibliographyApa2_succeeds() throws IOException, MalformedException, ServiceException,
- ServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException, FormatNotAvailableException {
+ public void find_bibliographyApa2_succeeds() throws IOException, MalformedException, DataServiceException,
+ DataServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException,
+ FormatNotAvailableException {
final String accept = "text/bibliography; style=apa";
final String compare = FileUtils.readFileToString(new File("src/test/resources/bibliography/style_apa2.txt"),
StandardCharsets.UTF_8);
@@ -308,8 +318,9 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void find_bibliographyApa3_succeeds() throws IOException, MalformedException, ServiceException,
- ServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException, FormatNotAvailableException {
+ public void find_bibliographyApa3_succeeds() throws IOException, MalformedException, DataServiceException,
+ DataServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException,
+ FormatNotAvailableException {
final String accept = "text/bibliography; style=apa";
final String compare = FileUtils.readFileToString(new File("src/test/resources/bibliography/style_apa3.txt"),
StandardCharsets.UTF_8);
@@ -330,8 +341,9 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void find_bibliographyApa4_succeeds() throws IOException, MalformedException, ServiceException,
- ServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException, FormatNotAvailableException {
+ public void find_bibliographyApa4_succeeds() throws IOException, MalformedException, DataServiceException,
+ DataServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException,
+ FormatNotAvailableException {
final String accept = "text/bibliography; style=apa";
final String compare = FileUtils.readFileToString(new File("src/test/resources/bibliography/style_apa4.txt"),
StandardCharsets.UTF_8);
@@ -352,8 +364,9 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void find_bibliographyIeee0_succeeds() throws IOException, MalformedException, ServiceException,
- ServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException, FormatNotAvailableException {
+ public void find_bibliographyIeee0_succeeds() throws IOException, MalformedException, DataServiceException,
+ DataServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException,
+ FormatNotAvailableException {
final String accept = "text/bibliography; style=ieee";
final String compare = FileUtils.readFileToString(new File("src/test/resources/bibliography/style_ieee0.txt"),
StandardCharsets.UTF_8);
@@ -374,8 +387,9 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void find_bibliographyIeee1_succeeds() throws IOException, MalformedException, ServiceException,
- ServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException, FormatNotAvailableException {
+ public void find_bibliographyIeee1_succeeds() throws IOException, MalformedException, DataServiceException,
+ DataServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException,
+ FormatNotAvailableException {
final String accept = "text/bibliography; style=ieee";
final String compare = FileUtils.readFileToString(new File("src/test/resources/bibliography/style_ieee1.txt"),
StandardCharsets.UTF_8);
@@ -396,8 +410,9 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void find_bibliographyIeee2_succeeds() throws IOException, MalformedException, ServiceException,
- ServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException, FormatNotAvailableException {
+ public void find_bibliographyIeee2_succeeds() throws IOException, MalformedException, DataServiceException,
+ DataServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException,
+ FormatNotAvailableException {
final String accept = "text/bibliography; style=ieee";
final String compare = FileUtils.readFileToString(new File("src/test/resources/bibliography/style_ieee2.txt"),
StandardCharsets.UTF_8);
@@ -418,8 +433,9 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void find_bibliographyIeee3_succeeds() throws IOException, MalformedException, ServiceException,
- ServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException, FormatNotAvailableException {
+ public void find_bibliographyIeee3_succeeds() throws IOException, MalformedException, DataServiceException,
+ DataServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException,
+ FormatNotAvailableException {
final String accept = "text/bibliography; style=ieee";
final String compare = FileUtils.readFileToString(new File("src/test/resources/bibliography/style_ieee3.txt"),
StandardCharsets.UTF_8);
@@ -440,8 +456,9 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void find_bibliographyBibtex0_succeeds() throws IOException, MalformedException, ServiceException,
- ServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException, FormatNotAvailableException {
+ public void find_bibliographyBibtex0_succeeds() throws IOException, MalformedException, DataServiceException,
+ DataServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException,
+ FormatNotAvailableException {
final String accept = "text/bibliography; style=bibtex";
final String compare = FileUtils.readFileToString(new File("src/test/resources/bibliography/style_bibtex0.txt"),
StandardCharsets.UTF_8);
@@ -462,8 +479,9 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void find_bibliographyBibtex1_succeeds() throws MalformedException, IOException, ServiceException,
- ServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException, FormatNotAvailableException {
+ public void find_bibliographyBibtex1_succeeds() throws MalformedException, IOException, DataServiceException,
+ DataServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException,
+ FormatNotAvailableException {
final String accept = "text/bibliography; style=bibtex";
final String compare = FileUtils.readFileToString(new File("src/test/resources/bibliography/style_bibtex1.txt"),
StandardCharsets.UTF_8);
@@ -484,8 +502,9 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void find_bibliographyBibtex2_succeeds() throws MalformedException, ServiceException, IOException,
- ServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException, FormatNotAvailableException {
+ public void find_bibliographyBibtex2_succeeds() throws MalformedException, DataServiceException, IOException,
+ DataServiceConnectionException, QueryNotFoundException, IdentifierNotFoundException,
+ FormatNotAvailableException {
final String accept = "text/bibliography; style=bibtex";
final String compare = FileUtils.readFileToString(new File("src/test/resources/bibliography/style_bibtex2.txt"),
StandardCharsets.UTF_8);
@@ -506,8 +525,8 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void find_bibliographyBibtex3_succeeds() throws MalformedException, ServiceException,
- ServiceConnectionException, IOException, QueryNotFoundException, IdentifierNotFoundException,
+ public void find_bibliographyBibtex3_succeeds() throws MalformedException, DataServiceException,
+ DataServiceConnectionException, IOException, QueryNotFoundException, IdentifierNotFoundException,
FormatNotAvailableException {
final String accept = "text/bibliography; style=bibtex";
final String compare = FileUtils.readFileToString(new File("src/test/resources/bibliography/style_bibtex3.txt"),
@@ -545,9 +564,9 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_2_USERNAME, authorities = {"delete-identifier"})
- public void delete_hasRole_succeeds() throws NotAllowedException, ServiceException, ServiceConnectionException,
- DatabaseNotFoundException, IdentifierNotFoundException, SearchServiceException,
- SearchServiceConnectionException {
+ public void delete_hasRole_succeeds() throws NotAllowedException, DataServiceException,
+ DataServiceConnectionException, DatabaseNotFoundException, IdentifierNotFoundException,
+ SearchServiceException, SearchServiceConnectionException {
/* test */
this.generic_delete();
@@ -555,7 +574,7 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void find_json_succeeds() throws MalformedException, ServiceException, ServiceConnectionException,
+ public void find_json_succeeds() throws MalformedException, DataServiceException, DataServiceConnectionException,
FormatNotAvailableException, QueryNotFoundException, IdentifierNotFoundException {
final String accept = "application/json";
@@ -582,7 +601,7 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void find_xml_succeeds() throws MalformedException, ServiceException, ServiceConnectionException,
+ public void find_xml_succeeds() throws MalformedException, DataServiceException, DataServiceConnectionException,
IOException, QueryNotFoundException, IdentifierNotFoundException, FormatNotAvailableException {
final InputStreamResource resource = new InputStreamResource(FileUtils.openInputStream(
new File("src/test/resources/xml/datacite-example-dataset-v4.xml")));
@@ -598,8 +617,9 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void find_httpRedirect_succeeds() throws MalformedException, ServiceException, ServiceConnectionException,
- FormatNotAvailableException, QueryNotFoundException, IdentifierNotFoundException {
+ public void find_httpRedirect_succeeds() throws MalformedException, DataServiceException,
+ DataServiceConnectionException, FormatNotAvailableException, QueryNotFoundException,
+ IdentifierNotFoundException {
/* test */
final ResponseEntity<?> response = generic_find(null, null);
@@ -611,10 +631,10 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"create-identifier"})
- public void save_hasRoleDatabase_succeeds() throws MalformedException, NotAllowedException, ServiceException,
- ServiceConnectionException, UserNotFoundException, DatabaseNotFoundException, AccessNotFoundException,
+ public void save_hasRoleDatabase_succeeds() throws MalformedException, NotAllowedException, DataServiceException,
+ DataServiceConnectionException, UserNotFoundException, DatabaseNotFoundException, AccessNotFoundException,
QueryNotFoundException, IdentifierNotFoundException, ViewNotFoundException, SearchServiceException,
- SearchServiceConnectionException, TableNotFoundException {
+ SearchServiceConnectionException, TableNotFoundException, ExternalServiceException {
/* test */
generic_save(DATABASE_1_ID, DATABASE_1, DATABASE_1_USER_1_READ_ACCESS, IDENTIFIER_1, IDENTIFIER_1_SAVE_DTO, USER_1_PRINCIPAL, USER_1);
@@ -633,9 +653,9 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_2_USERNAME, authorities = {"create-identifier"})
public void save_hasRoleReadAccessQuery_succeeds() throws MalformedException, NotAllowedException,
- ServiceException, ServiceConnectionException, UserNotFoundException, DatabaseNotFoundException,
+ DataServiceException, DataServiceConnectionException, UserNotFoundException, DatabaseNotFoundException,
AccessNotFoundException, QueryNotFoundException, IdentifierNotFoundException, ViewNotFoundException,
- SearchServiceException, SearchServiceConnectionException, TableNotFoundException {
+ SearchServiceException, SearchServiceConnectionException, TableNotFoundException, ExternalServiceException {
/* mock */
when(dataServiceGateway.findQuery(DATABASE_2_ID, IDENTIFIER_5_QUERY_ID))
@@ -798,10 +818,10 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
protected void generic_save(Long databaseId, Database database, DatabaseAccess access, Identifier identifier,
IdentifierSaveDto data, Principal principal, User user) throws MalformedException,
- NotAllowedException, ServiceException, ServiceConnectionException, UserNotFoundException,
+ NotAllowedException, DataServiceException, DataServiceConnectionException, UserNotFoundException,
DatabaseNotFoundException, AccessNotFoundException, QueryNotFoundException,
IdentifierNotFoundException, ViewNotFoundException, SearchServiceException,
- SearchServiceConnectionException, TableNotFoundException {
+ SearchServiceConnectionException, TableNotFoundException, ExternalServiceException {
/* mock */
if (access != null) {
@@ -842,7 +862,7 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
}
protected ResponseEntity<?> generic_find(String accept, InputStreamResource resource)
- throws MalformedException, ServiceException, ServiceConnectionException, FormatNotAvailableException,
+ throws MalformedException, DataServiceException, DataServiceConnectionException, FormatNotAvailableException,
QueryNotFoundException, IdentifierNotFoundException {
/* mock */
@@ -863,7 +883,7 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
return IOUtils.toString(inputStream, StandardCharsets.UTF_8);
}
- protected void generic_delete() throws NotAllowedException, ServiceException, ServiceConnectionException,
+ protected void generic_delete() throws NotAllowedException, DataServiceException, DataServiceConnectionException,
DatabaseNotFoundException, IdentifierNotFoundException, SearchServiceException,
SearchServiceConnectionException {
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MaintenanceEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MessageEndpointUnitTest.java
similarity index 91%
rename from dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MaintenanceEndpointUnitTest.java
rename to dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MessageEndpointUnitTest.java
index b05e32e92e3ec0c1747ee4293d54fedee2d8d635..cea67bc5103de5eeac619f24d0f15c7042d9b115 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MaintenanceEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MessageEndpointUnitTest.java
@@ -27,13 +27,13 @@ import static org.mockito.Mockito.*;
@Log4j2
@SpringBootTest
@ExtendWith(SpringExtension.class)
-public class MaintenanceEndpointUnitTest extends AbstractUnitTest {
+public class MessageEndpointUnitTest extends AbstractUnitTest {
@MockBean
private BannerMessageService bannerMessageService;
@Autowired
- private MessageEndpoint maintenanceEndpoint;
+ private MessageEndpoint messageEndpoint;
@Test
@WithAnonymousUser
@@ -198,7 +198,7 @@ public class MaintenanceEndpointUnitTest extends AbstractUnitTest {
.thenReturn(List.of(BANNER_MESSAGE_1, BANNER_MESSAGE_2));
/* test */
- final ResponseEntity<List<BannerMessageDto>> response = maintenanceEndpoint.list("");
+ final ResponseEntity<List<BannerMessageDto>> response = messageEndpoint.list(null);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertNotNull(response.getBody());
}
@@ -216,7 +216,7 @@ public class MaintenanceEndpointUnitTest extends AbstractUnitTest {
}
/* test */
- final ResponseEntity<BannerMessageDto> response = maintenanceEndpoint.find(messageId);
+ final ResponseEntity<BannerMessageDto> response = messageEndpoint.find(messageId);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertNotNull(response.getBody());
}
@@ -228,7 +228,7 @@ public class MaintenanceEndpointUnitTest extends AbstractUnitTest {
.thenReturn(message);
/* test */
- final ResponseEntity<BannerMessageDto> response = maintenanceEndpoint.create(data);
+ final ResponseEntity<BannerMessageDto> response = messageEndpoint.create(data);
assertEquals(HttpStatus.CREATED, response.getStatusCode());
assertNotNull(response.getBody());
}
@@ -243,7 +243,7 @@ public class MaintenanceEndpointUnitTest extends AbstractUnitTest {
.thenReturn(message);
/* test */
- final ResponseEntity<BannerMessageDto> response = maintenanceEndpoint.update(messageId, data);
+ final ResponseEntity<BannerMessageDto> response = messageEndpoint.update(messageId, data);
assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
assertNotNull(response.getBody());
}
@@ -264,7 +264,7 @@ public class MaintenanceEndpointUnitTest extends AbstractUnitTest {
.delete(message);
/* test */
- final ResponseEntity<?> response = maintenanceEndpoint.delete(messageId);
+ final ResponseEntity<?> response = messageEndpoint.delete(messageId);
assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
assertNull(response.getBody());
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java
index e5e5097edeedebed520ce7156af79b6e3f88bd3b..154ebda86c3a32554c2c83a3330846ebdee8f939 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java
@@ -348,7 +348,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void findById_publicAnonymous_succeeds() throws ServiceException, ServiceConnectionException,
+ public void findById_publicAnonymous_succeeds() throws DataServiceException, DataServiceConnectionException,
TableNotFoundException, DatabaseNotFoundException, AccessNotFoundException, QueueNotFoundException {
/* test */
@@ -367,7 +367,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = "find-table")
- public void findById_publicHasRoleDatabaseNotFound_succeeds() throws ServiceException, ServiceConnectionException,
+ public void findById_publicHasRoleDatabaseNotFound_succeeds() throws DataServiceException, DataServiceConnectionException,
TableNotFoundException, DatabaseNotFoundException, AccessNotFoundException, QueueNotFoundException {
/* test */
@@ -376,7 +376,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = "find-table")
- public void findById_publicHasRole_succeeds() throws ServiceException, ServiceConnectionException,
+ public void findById_publicHasRole_succeeds() throws DataServiceException, DataServiceConnectionException,
TableNotFoundException, DatabaseNotFoundException, AccessNotFoundException, QueueNotFoundException {
/* test */
@@ -388,7 +388,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_4_USERNAME)
- public void findById_publicNoRole_succeeds() throws ServiceException, ServiceConnectionException,
+ public void findById_publicNoRole_succeeds() throws DataServiceException, DataServiceConnectionException,
TableNotFoundException, DatabaseNotFoundException, AccessNotFoundException, QueueNotFoundException {
/* test */
@@ -497,8 +497,8 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"modify-table-column-semantics"})
- public void update_publicHasRoleHasOwnWriteAccess_succeeds() throws MalformedException, ServiceException,
- NotAllowedException, ServiceConnectionException, UserNotFoundException, TableNotFoundException,
+ public void update_publicHasRoleHasOwnWriteAccess_succeeds() throws MalformedException, DataServiceException,
+ NotAllowedException, DataServiceConnectionException, UserNotFoundException, TableNotFoundException,
DatabaseNotFoundException, AccessNotFoundException, SearchServiceException,
SearchServiceConnectionException, OntologyNotFoundException, SemanticEntityNotFoundException {
final ColumnSemanticsUpdateDto request = ColumnSemanticsUpdateDto.builder()
@@ -540,8 +540,8 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_2_USERNAME, authorities = {"modify-table-column-semantics"})
- public void update_publicHasRoleForeignHasAllWriteAccess_succeeds() throws MalformedException, ServiceException,
- NotAllowedException, ServiceConnectionException, UserNotFoundException, TableNotFoundException,
+ public void update_publicHasRoleForeignHasAllWriteAccess_succeeds() throws MalformedException, DataServiceException,
+ NotAllowedException, DataServiceConnectionException, UserNotFoundException, TableNotFoundException,
DatabaseNotFoundException, AccessNotFoundException, SearchServiceException,
SearchServiceConnectionException, OntologyNotFoundException, SemanticEntityNotFoundException {
final ColumnSemanticsUpdateDto request = ColumnSemanticsUpdateDto.builder()
@@ -601,8 +601,8 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"modify-table-column-semantics"})
- public void update_privateHasRoleHasOwnWriteAccess_succeeds() throws MalformedException, ServiceException,
- NotAllowedException, ServiceConnectionException, UserNotFoundException, TableNotFoundException,
+ public void update_privateHasRoleHasOwnWriteAccess_succeeds() throws MalformedException, DataServiceException,
+ NotAllowedException, DataServiceConnectionException, UserNotFoundException, TableNotFoundException,
DatabaseNotFoundException, AccessNotFoundException, SearchServiceException,
SearchServiceConnectionException, OntologyNotFoundException, SemanticEntityNotFoundException {
final ColumnSemanticsUpdateDto request = ColumnSemanticsUpdateDto.builder()
@@ -644,8 +644,8 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_2_USERNAME, authorities = {"modify-table-column-semantics"})
- public void update_privateHasRoleForeignHasAllWriteAccess_succeeds() throws MalformedException, ServiceException,
- NotAllowedException, ServiceConnectionException, UserNotFoundException, TableNotFoundException,
+ public void update_privateHasRoleForeignHasAllWriteAccess_succeeds() throws MalformedException, DataServiceException,
+ NotAllowedException, DataServiceConnectionException, UserNotFoundException, TableNotFoundException,
DatabaseNotFoundException, AccessNotFoundException, SearchServiceException,
SearchServiceConnectionException, OntologyNotFoundException, SemanticEntityNotFoundException {
final ColumnSemanticsUpdateDto request = ColumnSemanticsUpdateDto.builder()
@@ -731,7 +731,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void findById_privateAnonymous_succeeds() throws ServiceException, ServiceConnectionException,
+ public void findById_privateAnonymous_succeeds() throws DataServiceException, DataServiceConnectionException,
TableNotFoundException, DatabaseNotFoundException, AccessNotFoundException, QueueNotFoundException {
/* test */
@@ -750,7 +750,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = "find-table")
- public void findById_privateHasRoleDatabaseNotFound_succeeds() throws ServiceException, ServiceConnectionException,
+ public void findById_privateHasRoleDatabaseNotFound_succeeds() throws DataServiceException, DataServiceConnectionException,
TableNotFoundException, DatabaseNotFoundException, AccessNotFoundException, QueueNotFoundException {
/* test */
@@ -759,7 +759,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = "find-table")
- public void findById_privateHasRole_succeeds() throws ServiceException, ServiceConnectionException,
+ public void findById_privateHasRole_succeeds() throws DataServiceException, DataServiceConnectionException,
TableNotFoundException, DatabaseNotFoundException, AccessNotFoundException, QueueNotFoundException {
/* test */
final ResponseEntity<TableDto> response = generic_findById(DATABASE_1_ID, DATABASE_1, TABLE_1_ID, TABLE_1,
@@ -771,7 +771,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_4_USERNAME)
- public void findById_privateNoRole_succeeds() throws ServiceException, ServiceConnectionException,
+ public void findById_privateNoRole_succeeds() throws DataServiceException, DataServiceConnectionException,
TableNotFoundException, DatabaseNotFoundException, AccessNotFoundException, QueueNotFoundException {
/* test */
@@ -790,7 +790,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"delete-table"})
- public void delete_succeeds() throws NotAllowedException, ServiceException, ServiceConnectionException,
+ public void delete_succeeds() throws NotAllowedException, DataServiceException, DataServiceConnectionException,
TableNotFoundException, DatabaseNotFoundException, SearchServiceException,
SearchServiceConnectionException {
@@ -810,9 +810,9 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_2_USERNAME, authorities = {"delete-foreign-table"})
- public void delete_foreign_succeeds() throws NotAllowedException, ServiceException, ServiceConnectionException,
+ public void delete_foreign_succeeds() throws NotAllowedException, DataServiceConnectionException,
TableNotFoundException, DatabaseNotFoundException, SearchServiceException,
- SearchServiceConnectionException {
+ SearchServiceConnectionException, DataServiceException {
/* test */
generic_delete(USER_2_PRINCIPAL, TABLE_1);
@@ -895,9 +895,10 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
protected ResponseEntity<TableDto> generic_create(Long databaseId, Database database, TableCreateDto data,
Principal principal, User user, DatabaseAccess access)
- throws MalformedException, NotAllowedException, ServiceException, ServiceConnectionException,
+ throws MalformedException, NotAllowedException, DataServiceException, DataServiceConnectionException,
UserNotFoundException, DatabaseNotFoundException, AccessNotFoundException, TableNotFoundException,
- TableExistsException, SearchServiceException, SearchServiceConnectionException, OntologyNotFoundException, SemanticEntityNotFoundException {
+ TableExistsException, SearchServiceException, SearchServiceConnectionException, OntologyNotFoundException,
+ SemanticEntityNotFoundException {
/* mock */
if (principal != null) {
@@ -927,8 +928,8 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
protected ResponseEntity<TableDto> generic_findById(Long databaseId, Database database, Long tableId,
Table table, Principal principal, User user,
- DatabaseAccess access) throws ServiceException,
- ServiceConnectionException, TableNotFoundException, DatabaseNotFoundException, AccessNotFoundException,
+ DatabaseAccess access) throws DataServiceException,
+ DataServiceConnectionException, TableNotFoundException, DatabaseNotFoundException, AccessNotFoundException,
QueueNotFoundException {
/* mock */
@@ -958,15 +959,13 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
.when(accessService)
.find(database, user);
}
- when(messageQueueService.findQueue("dbrepo"))
- .thenReturn(QUEUE_DTO);
/* test */
return tableEndpoint.findById(databaseId, tableId, principal);
}
protected ResponseEntity<?> generic_delete(Principal principal, Table table) throws NotAllowedException,
- ServiceException, ServiceConnectionException, TableNotFoundException, DatabaseNotFoundException,
+ DataServiceException, DataServiceConnectionException, TableNotFoundException, DatabaseNotFoundException,
SearchServiceException, SearchServiceConnectionException {
/* mock */
@@ -980,7 +979,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
protected ResponseEntity<ColumnDto> generic_update(Long databaseId, Database database, Long tableId, Table table,
Long columnId, TableColumn column, Principal principal,
User user, ColumnSemanticsUpdateDto data, DatabaseAccess access)
- throws ServiceException, ServiceConnectionException, MalformedException, NotAllowedException,
+ throws DataServiceException, DataServiceConnectionException, MalformedException, NotAllowedException,
UserNotFoundException, TableNotFoundException, DatabaseNotFoundException, AccessNotFoundException,
SearchServiceException, SearchServiceConnectionException, OntologyNotFoundException,
SemanticEntityNotFoundException {
@@ -992,7 +991,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
when(tableService.update(column, data))
.thenReturn(column);
} else {
- doThrow(ServiceException.class)
+ doThrow(DataServiceException.class)
.when(tableService)
.update(column, data);
doThrow(TableNotFoundException.class)
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UserEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UserEndpointUnitTest.java
index b7db83d3214695a263797670ae9cbfcc1801fac0..f5e413e0e9de10192bca89d4fe823db02924712d 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UserEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UserEndpointUnitTest.java
@@ -61,8 +61,8 @@ public class UserEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void create_anonymous_succeeds() throws UserExistsException, ServiceException, ServiceConnectionException,
- EmailExistsException, UserNotFoundException {
+ public void create_anonymous_succeeds() throws UserExistsException, EmailExistsException, UserNotFoundException,
+ AuthServiceException, AuthServiceConnectionException, CredentialsInvalidException {
final SignupRequestDto request = SignupRequestDto.builder()
.email(USER_1_EMAIL)
.username(USER_1_USERNAME)
@@ -100,8 +100,7 @@ public class UserEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME)
- public void find_self_succeeds() throws NotAllowedException, UserNotFoundException, ServiceException,
- ServiceConnectionException {
+ public void find_self_succeeds() throws NotAllowedException, UserNotFoundException{
/* test */
find_generic(USER_1_ID, USER_1, USER_1_PRINCIPAL);
@@ -177,8 +176,7 @@ public class UserEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"modify-user-information"})
- public void modify_succeeds() throws ServiceException, NotAllowedException,
- ServiceConnectionException, UserNotFoundException, DatabaseNotFoundException {
+ public void modify_succeeds() throws NotAllowedException, UserNotFoundException, DatabaseNotFoundException {
final UserUpdateDto request = UserUpdateDto.builder()
.firstname(USER_1_FIRSTNAME)
.lastname(USER_1_LASTNAME)
@@ -218,8 +216,9 @@ public class UserEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME)
- public void password_succeeds() throws NotAllowedException, ServiceException, ServiceConnectionException,
- UserNotFoundException, DatabaseNotFoundException {
+ public void password_succeeds() throws NotAllowedException, DataServiceException, DataServiceConnectionException,
+ UserNotFoundException, DatabaseNotFoundException, AuthServiceException, AuthServiceConnectionException,
+ CredentialsInvalidException {
final UserPasswordDto request = UserPasswordDto.builder()
.password(USER_1_PASSWORD)
.build();
@@ -247,26 +246,26 @@ public class UserEndpointUnitTest extends AbstractUnitTest {
}
protected void create_generic(SignupRequestDto data, User user, at.tuwien.api.keycloak.UserDto userDto, UUID id)
- throws UserExistsException, ServiceException, ServiceConnectionException, EmailExistsException, UserNotFoundException {
+ throws UserExistsException, EmailExistsException, UserNotFoundException, AuthServiceException,
+ AuthServiceConnectionException, CredentialsInvalidException {
/* mock */
- when(userService.create(data, id))
+ when(userService.create(eq(data), any(UUID.class)))
.thenReturn(user);
when(authenticationService.findByUsername(data.getUsername()))
.thenReturn(userDto);
- doNothing()
- .when(authenticationService)
- .create(any(SignupRequestDto.class));
+ when(authenticationService.create(data))
+ .thenReturn(userDto);
/* test */
- final ResponseEntity<UserBriefDto> response = userEndpoint.create(data);
+ final ResponseEntity<UserDto> response = userEndpoint.create(data);
assertEquals(HttpStatus.CREATED, response.getStatusCode());
- final UserBriefDto body = response.getBody();
+ final UserDto body = response.getBody();
assertNotNull(body);
}
protected void find_generic(UUID id, User user, Principal principal) throws NotAllowedException,
- UserNotFoundException, ServiceException, ServiceConnectionException {
+ UserNotFoundException{
/* mock */
if (user != null) {
@@ -286,8 +285,7 @@ public class UserEndpointUnitTest extends AbstractUnitTest {
}
protected void modify_generic(UUID userId, User user, Principal principal, UserUpdateDto data)
- throws ServiceException, NotAllowedException, ServiceConnectionException, UserNotFoundException,
- DatabaseNotFoundException {
+ throws NotAllowedException, UserNotFoundException, DatabaseNotFoundException {
/* mock */
if (user != null) {
when(userService.findById(userId))
@@ -304,7 +302,8 @@ public class UserEndpointUnitTest extends AbstractUnitTest {
}
protected void password_generic(Principal principal, UserPasswordDto data) throws NotAllowedException,
- ServiceException, ServiceConnectionException, UserNotFoundException, DatabaseNotFoundException {
+ DataServiceException, DataServiceConnectionException, UserNotFoundException, DatabaseNotFoundException,
+ AuthServiceException, AuthServiceConnectionException, CredentialsInvalidException {
/* mock */
when(userService.findById(USER_1_ID))
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ViewEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ViewEndpointUnitTest.java
index 724d43ca16a94d354c0f5a72a0bbcb3996eb2733..74e418f42b1ca4fc4cbceec451f645ec05c1223d 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ViewEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ViewEndpointUnitTest.java
@@ -196,8 +196,8 @@ public class ViewEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_3_USERNAME, authorities = {"delete-database-view"})
- public void delete_publicOwner_succeeds() throws NotAllowedException, ServiceException,
- ServiceConnectionException, ViewNotFoundException, DatabaseNotFoundException, AccessNotFoundException,
+ public void delete_publicOwner_succeeds() throws NotAllowedException, DataServiceException,
+ DataServiceConnectionException, ViewNotFoundException, DatabaseNotFoundException, AccessNotFoundException,
SearchServiceException, SearchServiceConnectionException {
/* test */
@@ -352,7 +352,7 @@ public class ViewEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"delete-database-view"})
- public void delete_privateOwner_succeeds() throws NotAllowedException, ServiceException, ServiceConnectionException,
+ public void delete_privateOwner_succeeds() throws NotAllowedException, DataServiceException, DataServiceConnectionException,
DatabaseNotFoundException, AccessNotFoundException, ViewNotFoundException, SearchServiceException,
SearchServiceConnectionException {
@@ -401,8 +401,8 @@ public class ViewEndpointUnitTest extends AbstractUnitTest {
}
protected void create_generic(Long databaseId, Database database, Principal principal, UUID userId, User user,
- DatabaseAccess access) throws MalformedException, ServiceException,
- ServiceConnectionException, NotAllowedException, UserNotFoundException, DatabaseNotFoundException,
+ DatabaseAccess access) throws MalformedException, DataServiceException,
+ DataServiceConnectionException, NotAllowedException, UserNotFoundException, DatabaseNotFoundException,
AccessNotFoundException, SearchServiceException, SearchServiceConnectionException {
final ViewCreateDto request = ViewCreateDto.builder()
.name(VIEW_1_NAME)
@@ -469,7 +469,7 @@ public class ViewEndpointUnitTest extends AbstractUnitTest {
protected void delete_generic(Long databaseId, Database database, Long viewId, View view, Principal principal,
UUID userId, User user, DatabaseAccess access) throws NotAllowedException,
- ServiceException, ServiceConnectionException, DatabaseNotFoundException, AccessNotFoundException,
+ DataServiceException, DataServiceConnectionException, DatabaseNotFoundException, AccessNotFoundException,
ViewNotFoundException, SearchServiceException, SearchServiceConnectionException {
/* mock */
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayUnitTest.java
index 976a14ccbdad131029de0c99fa2cc3a06021301f..a812bd5de49af37c5eca041a2fb36653d243dafc 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayUnitTest.java
@@ -1,8 +1,6 @@
package at.tuwien.gateway;
import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.api.amqp.ExchangeDto;
-import at.tuwien.api.amqp.QueueDto;
import at.tuwien.exception.*;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
@@ -16,6 +14,7 @@ import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate;
@@ -35,7 +34,8 @@ public class BrokerServiceGatewayUnitTest extends AbstractUnitTest {
private BrokerServiceGateway brokerServiceGateway;
@Test
- public void grantTopicPermission_exchangeNoRightsBefore_succeeds() throws ServiceException, ServiceConnectionException {
+ public void grantTopicPermission_exchangeNoRightsBefore_succeeds() throws BrokerServiceException,
+ BrokerServiceConnectionException {
final ResponseEntity<Void> mock = ResponseEntity.status(HttpStatus.CREATED)
.build();
@@ -48,7 +48,8 @@ public class BrokerServiceGatewayUnitTest extends AbstractUnitTest {
}
@Test
- public void grantTopicPermission_exchangeRightsSame_succeeds() throws ServiceException, ServiceConnectionException {
+ public void grantTopicPermission_exchangeRightsSame_succeeds() throws BrokerServiceException,
+ BrokerServiceConnectionException {
final ResponseEntity<Void> mock = ResponseEntity.status(HttpStatus.NO_CONTENT)
.build();
@@ -70,13 +71,14 @@ public class BrokerServiceGatewayUnitTest extends AbstractUnitTest {
.thenReturn(mock);
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(BrokerServiceException.class, () -> {
brokerServiceGateway.grantTopicPermission(USER_1_USERNAME, VIRTUAL_HOST_EXCHANGE_UPDATE_DTO);
});
}
@Test
- public void grantVirtualHostPermission_virtualHostNoRightsBefore_succeeds() throws ServiceConnectionException, ServiceException {
+ public void grantVirtualHostPermission_virtualHostNoRightsBefore_succeeds() throws BrokerServiceException,
+ BrokerServiceConnectionException {
final ResponseEntity<Void> mock = ResponseEntity.status(HttpStatus.CREATED)
.build();
@@ -89,7 +91,8 @@ public class BrokerServiceGatewayUnitTest extends AbstractUnitTest {
}
@Test
- public void grantVirtualHostPermission_virtualHostRightsSame_succeeds() throws ServiceConnectionException, ServiceException {
+ public void grantVirtualHostPermission_virtualHostRightsSame_succeeds() throws BrokerServiceException,
+ BrokerServiceConnectionException {
final ResponseEntity<Void> mock = ResponseEntity.status(HttpStatus.NO_CONTENT)
.build();
@@ -111,7 +114,7 @@ public class BrokerServiceGatewayUnitTest extends AbstractUnitTest {
.thenReturn(mock);
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(BrokerServiceException.class, () -> {
brokerServiceGateway.grantVirtualHostPermission(USER_1_USERNAME, VIRTUAL_HOST_GRANT_DTO);
});
}
@@ -125,111 +128,56 @@ public class BrokerServiceGatewayUnitTest extends AbstractUnitTest {
.exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(BrokerServiceException.class, () -> {
brokerServiceGateway.grantVirtualHostPermission(USER_1_USERNAME, VIRTUAL_HOST_GRANT_DTO);
});
}
@Test
- public void grantTopicPermission_unexpected2_fails() {
+ public void grantVirtualHostPermission_connection_fails() {
/* mock */
- doThrow(RestClientException.class)
+ doThrow(HttpServerErrorException.class)
.when(restTemplate)
.exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
/* test */
- assertThrows(ServiceException.class, () -> {
- brokerServiceGateway.grantTopicPermission(USER_1_USERNAME, VIRTUAL_HOST_EXCHANGE_UPDATE_DTO);
- });
- }
-
- @Test
- public void findQueue_fails() {
- final ResponseEntity<QueueDto> mock = ResponseEntity.status(HttpStatus.NO_CONTENT)
- .build();
-
- /* mock */
- when(restTemplate.exchange(anyString(), eq(HttpMethod.GET), any(HttpEntity.class), eq(QueueDto.class)))
- .thenReturn(mock);
-
- /* test */
- assertThrows(ServiceException.class, () -> {
- brokerServiceGateway.findQueue("dbrepo");
+ assertThrows(BrokerServiceConnectionException.class, () -> {
+ brokerServiceGateway.grantVirtualHostPermission(USER_1_USERNAME, VIRTUAL_HOST_GRANT_DTO);
});
}
@Test
- public void findQueue_unexpected_fails() {
+ public void grantTopicPermission_unexpected2_fails() {
/* mock */
doThrow(RestClientException.class)
.when(restTemplate)
- .exchange(anyString(), eq(HttpMethod.GET), any(HttpEntity.class), eq(QueueDto.class));
-
- /* test */
- assertThrows(ServiceException.class, () -> {
- brokerServiceGateway.findQueue("dbrepo");
- });
- }
-
- @Test
- public void findQueue_succeeds() throws ServiceConnectionException, ServiceException, QueueNotFoundException {
- final ResponseEntity<QueueDto> mock = ResponseEntity.status(HttpStatus.OK)
- .build();
-
- /* mock */
- when(restTemplate.exchange(anyString(), eq(HttpMethod.GET), any(HttpEntity.class), eq(QueueDto.class)))
- .thenReturn(mock);
-
- /* test */
- brokerServiceGateway.findQueue("dbrepo");
- }
-
- @Test
- public void findExchange_fails() {
- final ResponseEntity<ExchangeDto> mock = ResponseEntity.status(HttpStatus.NO_CONTENT)
- .build();
-
- /* mock */
- when(restTemplate.exchange(anyString(), eq(HttpMethod.GET), any(HttpEntity.class), eq(ExchangeDto.class)))
- .thenReturn(mock);
+ .exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
/* test */
- assertThrows(ServiceException.class, () -> {
- brokerServiceGateway.findExchange("dbrepo");
+ assertThrows(BrokerServiceException.class, () -> {
+ brokerServiceGateway.grantTopicPermission(USER_1_USERNAME, VIRTUAL_HOST_EXCHANGE_UPDATE_DTO);
});
}
@Test
- public void findExchange_succeeds() throws ServiceConnectionException, ServiceException, ExchangeNotFoundException {
- final ResponseEntity<ExchangeDto> mock = ResponseEntity.status(HttpStatus.OK)
- .build();
-
- /* mock */
- when(restTemplate.exchange(anyString(), eq(HttpMethod.GET), any(HttpEntity.class), eq(ExchangeDto.class)))
- .thenReturn(mock);
-
- /* test */
- brokerServiceGateway.findExchange("dbrepo");
- }
-
- @Test
- public void findExchange_unexpected_fails() {
+ public void grantTopicPermission_connection_fails() {
/* mock */
- doThrow(RestClientException.class)
+ doThrow(HttpServerErrorException.class)
.when(restTemplate)
- .exchange(anyString(), eq(HttpMethod.GET), any(HttpEntity.class), eq(ExchangeDto.class));
+ .exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
/* test */
- assertThrows(ServiceException.class, () -> {
- brokerServiceGateway.findExchange("dbrepo");
+ assertThrows(BrokerServiceConnectionException.class, () -> {
+ brokerServiceGateway.grantTopicPermission(USER_1_USERNAME, VIRTUAL_HOST_EXCHANGE_UPDATE_DTO);
});
}
@Test
- public void grantExchangePermission_succeeds() throws ServiceConnectionException, ServiceException {
+ public void grantExchangePermission_succeeds() throws BrokerServiceException,
+ BrokerServiceConnectionException {
final ResponseEntity<Void> mock = ResponseEntity.status(HttpStatus.CREATED)
.build();
@@ -242,7 +190,8 @@ public class BrokerServiceGatewayUnitTest extends AbstractUnitTest {
}
@Test
- public void grantExchangePermission_exists_succeeds() throws ServiceConnectionException, ServiceException {
+ public void grantExchangePermission_exists_succeeds() throws BrokerServiceException,
+ BrokerServiceConnectionException {
final ResponseEntity<Void> mock = ResponseEntity.status(HttpStatus.NO_CONTENT)
.build();
@@ -264,7 +213,21 @@ public class BrokerServiceGatewayUnitTest extends AbstractUnitTest {
.thenReturn(mock);
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(BrokerServiceException.class, () -> {
+ brokerServiceGateway.grantExchangePermission(USER_1_USERNAME, USER_1_RABBITMQ_GRANT_TOPIC_DTO);
+ });
+ }
+
+ @Test
+ public void grantExchangePermission_connection_fails() {
+
+ /* mock */
+ doThrow(HttpServerErrorException.class)
+ .when(restTemplate)
+ .exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(BrokerServiceConnectionException.class, () -> {
brokerServiceGateway.grantExchangePermission(USER_1_USERNAME, USER_1_RABBITMQ_GRANT_TOPIC_DTO);
});
}
@@ -278,7 +241,7 @@ public class BrokerServiceGatewayUnitTest extends AbstractUnitTest {
.exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(BrokerServiceException.class, () -> {
brokerServiceGateway.grantExchangePermission(USER_1_USERNAME, USER_1_RABBITMQ_GRANT_TOPIC_DTO);
});
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/CrossrefGatewayUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/CrossrefGatewayUnitTest.java
index 8d056ad48daab05a38308e047bb167df13e94f9c..881f29ed04b9559884fa26ace511a0627984c963 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/CrossrefGatewayUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/CrossrefGatewayUnitTest.java
@@ -15,9 +15,11 @@ import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.client.ResourceAccessException;
import org.springframework.web.client.RestTemplate;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.*;
@Log4j2
@@ -26,7 +28,6 @@ import static org.mockito.Mockito.*;
public class CrossrefGatewayUnitTest extends AbstractUnitTest {
@MockBean
- @Qualifier("keycloakRestTemplate")
private RestTemplate restTemplate;
@Autowired
@@ -45,15 +46,17 @@ public class CrossrefGatewayUnitTest extends AbstractUnitTest {
}
@Test
- public void findById_fails() throws DoiNotFoundException {
+ public void findById_fails() {
/* mock */
- doThrow(ResourceAccessException.class)
+ doThrow(HttpServerErrorException.class)
.when(restTemplate)
.exchange(anyString(), eq(HttpMethod.GET), any(HttpEntity.class), eq(CrossrefDto.class));
/* test */
- crossrefGateway.findById("501100004729");
+ assertThrows(DoiNotFoundException.class, () -> {
+ crossrefGateway.findById("501100004729");
+ });
}
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/DataServiceGatewayUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/DataServiceGatewayUnitTest.java
index d8369bb6dabf926d0435320c360872b4724ca53e..8183ea90808ea6c7e48e1530ea2a88a62a34df9b 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/DataServiceGatewayUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/DataServiceGatewayUnitTest.java
@@ -1,16 +1,1119 @@
package at.tuwien.gateway;
+import at.tuwien.ExportResourceDto;
+import at.tuwien.api.database.AccessTypeDto;
+import at.tuwien.api.database.DatabaseDto;
+import at.tuwien.api.database.ViewDto;
+import at.tuwien.api.database.query.QueryDto;
+import at.tuwien.api.database.table.TableDto;
+import at.tuwien.api.database.table.TableStatisticDto;
+import at.tuwien.exception.*;
import at.tuwien.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.HttpServerErrorException;
+import org.springframework.web.client.RestTemplate;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.when;
@Log4j2
@SpringBootTest
@ExtendWith(SpringExtension.class)
public class DataServiceGatewayUnitTest extends AbstractUnitTest {
- // TODO check mapping of databaseService too!!
+ @MockBean
+ @Qualifier("dataServiceRestTemplate")
+ private RestTemplate dataServiceRestTemplate;
+
+ @Autowired
+ private DataServiceGateway dataServiceGateway;
+
+ @Test
+ public void createAccess_succeeds() throws DataServiceException, DataServiceConnectionException, DatabaseNotFoundException {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.CREATED)
+ .build());
+
+ /* test */
+ dataServiceGateway.createAccess(DATABASE_1_ID, USER_1_ID, AccessTypeDto.READ);
+ }
+
+ @Test
+ public void createAccess_connection_fails() {
+
+ /* mock */
+ doThrow(HttpServerErrorException.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(DataServiceConnectionException.class, () -> {
+ dataServiceGateway.createAccess(DATABASE_1_ID, USER_1_ID, AccessTypeDto.READ);
+ });
+ }
+
+ @Test
+ public void createAccess_notFound_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.NotFound.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(DatabaseNotFoundException.class, () -> {
+ dataServiceGateway.createAccess(DATABASE_1_ID, USER_1_ID, AccessTypeDto.READ);
+ });
+ }
+
+ @Test
+ public void createAccess_unexpected_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.BadRequest.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.createAccess(DATABASE_1_ID, USER_1_ID, AccessTypeDto.READ);
+ });
+ }
+
+ @Test
+ public void createAccess_responseCode_fails() {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.NO_CONTENT)
+ .build());
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.createAccess(DATABASE_1_ID, USER_1_ID, AccessTypeDto.READ);
+ });
+ }
+
+ @Test
+ public void updateAccess_succeeds() throws DataServiceException, DataServiceConnectionException, AccessNotFoundException {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.ACCEPTED)
+ .build());
+
+ /* test */
+ dataServiceGateway.updateAccess(DATABASE_1_ID, USER_1_ID, AccessTypeDto.READ);
+ }
+
+ @Test
+ public void updateAccess_connection_fails() {
+
+ /* mock */
+ doThrow(HttpServerErrorException.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(DataServiceConnectionException.class, () -> {
+ dataServiceGateway.updateAccess(DATABASE_1_ID, USER_1_ID, AccessTypeDto.READ);
+ });
+ }
+
+ @Test
+ public void updateAccess_notFound_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.NotFound.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(AccessNotFoundException.class, () -> {
+ dataServiceGateway.updateAccess(DATABASE_1_ID, USER_1_ID, AccessTypeDto.READ);
+ });
+ }
+
+ @Test
+ public void updateAccess_unexpected_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.BadRequest.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.updateAccess(DATABASE_1_ID, USER_1_ID, AccessTypeDto.READ);
+ });
+ }
+
+ @Test
+ public void updateAccess_responseCode_fails() {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.NO_CONTENT)
+ .build());
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.updateAccess(DATABASE_1_ID, USER_1_ID, AccessTypeDto.READ);
+ });
+ }
+
+ @Test
+ public void deleteAccess_succeeds() throws DataServiceException, DataServiceConnectionException, AccessNotFoundException {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.DELETE), eq(HttpEntity.EMPTY), eq(Void.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.ACCEPTED)
+ .build());
+
+ /* test */
+ dataServiceGateway.deleteAccess(DATABASE_1_ID, USER_1_ID);
+ }
+
+ @Test
+ public void deleteAccess_connection_fails() {
+
+ /* mock */
+ doThrow(HttpServerErrorException.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.DELETE), eq(HttpEntity.EMPTY), eq(Void.class));
+
+ /* test */
+ assertThrows(DataServiceConnectionException.class, () -> {
+ dataServiceGateway.deleteAccess(DATABASE_1_ID, USER_1_ID);
+ });
+ }
+
+ @Test
+ public void deleteAccess_notFound_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.NotFound.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.DELETE), eq(HttpEntity.EMPTY), eq(Void.class));
+
+ /* test */
+ assertThrows(AccessNotFoundException.class, () -> {
+ dataServiceGateway.deleteAccess(DATABASE_1_ID, USER_1_ID);
+ });
+ }
+
+ @Test
+ public void deleteAccess_unauthorized_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.Unauthorized.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.DELETE), eq(HttpEntity.EMPTY), eq(Void.class));
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.deleteAccess(DATABASE_1_ID, USER_1_ID);
+ });
+ }
+
+ @Test
+ public void deleteAccess_responseCode_fails() {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.DELETE), eq(HttpEntity.EMPTY), eq(Void.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.NO_CONTENT)
+ .build());
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.deleteAccess(DATABASE_1_ID, USER_1_ID);
+ });
+ }
+
+ @Test
+ public void createDatabase_succeeds() throws DataServiceException, DataServiceConnectionException,
+ DatabaseNotFoundException {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(DatabaseDto.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.CREATED)
+ .body(DATABASE_1_DTO));
+
+ /* test */
+ dataServiceGateway.createDatabase(DATABASE_1_CREATE_INTERNAL);
+ }
+
+ @Test
+ public void createDatabase_connection_fails() {
+
+ /* mock */
+ doThrow(HttpServerErrorException.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(DatabaseDto.class));
+
+ /* test */
+ assertThrows(DataServiceConnectionException.class, () -> {
+ dataServiceGateway.createDatabase(DATABASE_1_CREATE_INTERNAL);
+ });
+ }
+
+ @Test
+ public void createDatabase_unauthorized_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.Unauthorized.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(DatabaseDto.class));
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.createDatabase(DATABASE_1_CREATE_INTERNAL);
+ });
+ }
+
+ @Test
+ public void createDatabase_unexpected_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.BadRequest.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(DatabaseDto.class));
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.createDatabase(DATABASE_1_CREATE_INTERNAL);
+ });
+ }
+
+ @Test
+ public void createDatabase_responseCode_fails() {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(DatabaseDto.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.NO_CONTENT)
+ .build());
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.createDatabase(DATABASE_1_CREATE_INTERNAL);
+ });
+ }
+
+ @Test
+ public void updateDatabase_succeeds() throws DataServiceException, DataServiceConnectionException,
+ DatabaseNotFoundException {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.ACCEPTED)
+ .build());
+
+ /* test */
+ dataServiceGateway.updateDatabase(DATABASE_1_ID, USER_1_UPDATE_PASSWORD_DTO);
+ }
+
+ @Test
+ public void updateDatabase_connection_fails() {
+
+ /* mock */
+ doThrow(HttpServerErrorException.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(DataServiceConnectionException.class, () -> {
+ dataServiceGateway.updateDatabase(DATABASE_1_ID, USER_1_UPDATE_PASSWORD_DTO);
+ });
+ }
+
+ @Test
+ public void updateDatabase_unauthorized_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.Unauthorized.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.updateDatabase(DATABASE_1_ID, USER_1_UPDATE_PASSWORD_DTO);
+ });
+ }
+
+ @Test
+ public void updateDatabase_notFound_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.NotFound.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(DatabaseNotFoundException.class, () -> {
+ dataServiceGateway.updateDatabase(DATABASE_1_ID, USER_1_UPDATE_PASSWORD_DTO);
+ });
+ }
+
+ @Test
+ public void updateDatabase_unexpected_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.BadRequest.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.updateDatabase(DATABASE_1_ID, USER_1_UPDATE_PASSWORD_DTO);
+ });
+ }
+
+ @Test
+ public void updateDatabase_responseCode_fails() {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.NO_CONTENT)
+ .build());
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.updateDatabase(DATABASE_1_ID, USER_1_UPDATE_PASSWORD_DTO);
+ });
+ }
+
+ @Test
+ public void createTable_succeeds() throws DataServiceException, DataServiceConnectionException,
+ DatabaseNotFoundException, TableExistsException {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.CREATED)
+ .build());
+
+ /* test */
+ dataServiceGateway.createTable(DATABASE_1_ID, TABLE_1_CREATE_DTO);
+ }
+
+ @Test
+ public void createTable_connection_fails() {
+
+ /* mock */
+ doThrow(HttpServerErrorException.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(DataServiceConnectionException.class, () -> {
+ dataServiceGateway.createTable(DATABASE_1_ID, TABLE_1_CREATE_DTO);
+ });
+ }
+
+ @Test
+ public void createTable_unauthorized_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.Unauthorized.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.createTable(DATABASE_1_ID, TABLE_1_CREATE_DTO);
+ });
+ }
+
+ @Test
+ public void createTable_notFound_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.NotFound.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(DatabaseNotFoundException.class, () -> {
+ dataServiceGateway.createTable(DATABASE_1_ID, TABLE_1_CREATE_DTO);
+ });
+ }
+
+ @Test
+ public void createTable_exists_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.Conflict.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(TableExistsException.class, () -> {
+ dataServiceGateway.createTable(DATABASE_1_ID, TABLE_1_CREATE_DTO);
+ });
+ }
+
+ @Test
+ public void createTable_unexpected_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.BadRequest.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.createTable(DATABASE_1_ID, TABLE_1_CREATE_DTO);
+ });
+ }
+
+ @Test
+ public void createTable_responseCode_fails() {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.NO_CONTENT)
+ .build());
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.createTable(DATABASE_1_ID, TABLE_1_CREATE_DTO);
+ });
+ }
+
+ @Test
+ public void deleteTable_succeeds() throws DataServiceException, DataServiceConnectionException,
+ TableNotFoundException {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.DELETE), any(HttpEntity.class), eq(Void.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.ACCEPTED)
+ .build());
+
+ /* test */
+ dataServiceGateway.deleteTable(DATABASE_1_ID, TABLE_1_ID);
+ }
+
+ @Test
+ public void deleteTable_connection_fails() {
+
+ /* mock */
+ doThrow(HttpServerErrorException.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.DELETE), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(DataServiceConnectionException.class, () -> {
+ dataServiceGateway.deleteTable(DATABASE_1_ID, TABLE_1_ID);
+ });
+ }
+
+ @Test
+ public void deleteTable_unauthorized_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.Unauthorized.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.DELETE), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.deleteTable(DATABASE_1_ID, TABLE_1_ID);
+ });
+ }
+
+ @Test
+ public void deleteTable_unexpected_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.NotFound.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.DELETE), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(TableNotFoundException.class, () -> {
+ dataServiceGateway.deleteTable(DATABASE_1_ID, TABLE_1_ID);
+ });
+ }
+
+ @Test
+ public void deleteTable_responseCode_fails() {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.DELETE), any(HttpEntity.class), eq(Void.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.NO_CONTENT)
+ .build());
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.deleteTable(DATABASE_1_ID, TABLE_1_ID);
+ });
+ }
+
+ @Test
+ public void createView_succeeds() throws DataServiceException, DataServiceConnectionException {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(ViewDto.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.CREATED)
+ .body(VIEW_1_DTO));
+
+ /* test */
+ dataServiceGateway.createView(DATABASE_1_ID, VIEW_1_CREATE_DTO);
+ }
+
+ @Test
+ public void createView_connection_fails() {
+
+ /* mock */
+ doThrow(HttpServerErrorException.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(ViewDto.class));
+
+ /* test */
+ assertThrows(DataServiceConnectionException.class, () -> {
+ dataServiceGateway.createView(DATABASE_1_ID, VIEW_1_CREATE_DTO);
+ });
+ }
+
+ @Test
+ public void createView_unauthorized_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.Unauthorized.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(ViewDto.class));
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.createView(DATABASE_1_ID, VIEW_1_CREATE_DTO);
+ });
+ }
+
+ @Test
+ public void createView_unexpected_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.BadRequest.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(ViewDto.class));
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.createView(DATABASE_1_ID, VIEW_1_CREATE_DTO);
+ });
+ }
+
+ @Test
+ public void createView_responseCode_fails() {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(ViewDto.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.NO_CONTENT)
+ .build());
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.createView(DATABASE_1_ID, VIEW_1_CREATE_DTO);
+ });
+ }
+
+ @Test
+ public void createView_emptyBody_fails() {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(ViewDto.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.CREATED)
+ .build());
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.createView(DATABASE_1_ID, VIEW_1_CREATE_DTO);
+ });
+ }
+
+ @Test
+ public void deleteView_succeeds() throws DataServiceException, DataServiceConnectionException,
+ ViewNotFoundException {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.DELETE), eq(HttpEntity.EMPTY), eq(Void.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.ACCEPTED)
+ .build());
+
+ /* test */
+ dataServiceGateway.deleteView(DATABASE_1_ID, VIEW_1_ID);
+ }
+
+ @Test
+ public void deleteView_connection_fails() {
+
+ /* mock */
+ doThrow(HttpServerErrorException.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.DELETE), eq(HttpEntity.EMPTY), eq(Void.class));
+
+ /* test */
+ assertThrows(DataServiceConnectionException.class, () -> {
+ dataServiceGateway.deleteView(DATABASE_1_ID, VIEW_1_ID);
+ });
+ }
+
+ @Test
+ public void deleteView_unauthorized_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.Unauthorized.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.DELETE), eq(HttpEntity.EMPTY), eq(Void.class));
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.deleteView(DATABASE_1_ID, VIEW_1_ID);
+ });
+ }
+
+ @Test
+ public void deleteView_notFound_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.NotFound.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.DELETE), eq(HttpEntity.EMPTY), eq(Void.class));
+
+ /* test */
+ assertThrows(ViewNotFoundException.class, () -> {
+ dataServiceGateway.deleteView(DATABASE_1_ID, VIEW_1_ID);
+ });
+ }
+
+ @Test
+ public void deleteView_responseCode_fails() {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.DELETE), eq(HttpEntity.EMPTY), eq(Void.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.NO_CONTENT)
+ .build());
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.deleteView(DATABASE_1_ID, VIEW_1_ID);
+ });
+ }
+
+ @Test
+ public void findQuery_succeeds() throws DataServiceException, DataServiceConnectionException,
+ QueryNotFoundException {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(QueryDto.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.OK)
+ .body(QUERY_1_DTO));
+
+ /* test */
+ dataServiceGateway.findQuery(DATABASE_1_ID, QUERY_1_ID);
+ }
+
+ @Test
+ public void findQuery_connection_fails() {
+
+ /* mock */
+ doThrow(HttpServerErrorException.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(QueryDto.class));
+
+ /* test */
+ assertThrows(DataServiceConnectionException.class, () -> {
+ dataServiceGateway.findQuery(DATABASE_1_ID, QUERY_1_ID);
+ });
+ }
+
+ @Test
+ public void findQuery_unauthorized_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.Unauthorized.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(QueryDto.class));
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.findQuery(DATABASE_1_ID, QUERY_1_ID);
+ });
+ }
+
+ @Test
+ public void findQuery_notFound_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.NotFound.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(QueryDto.class));
+
+ /* test */
+ assertThrows(QueryNotFoundException.class, () -> {
+ dataServiceGateway.findQuery(DATABASE_1_ID, QUERY_1_ID);
+ });
+ }
+
+ @Test
+ public void findQuery_notAcceptable_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.NotAcceptable.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(QueryDto.class));
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.findQuery(DATABASE_1_ID, QUERY_1_ID);
+ });
+ }
+
+ @Test
+ public void findQuery_responseCode_fails() {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(QueryDto.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.NO_CONTENT)
+ .build());
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.findQuery(DATABASE_1_ID, QUERY_1_ID);
+ });
+ }
+
+ @Test
+ public void exportQuery_succeeds() throws DataServiceException, DataServiceConnectionException,
+ QueryNotFoundException {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(ExportResourceDto.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.OK)
+ .build());
+
+ /* test */
+ dataServiceGateway.exportQuery(DATABASE_1_ID, QUERY_1_ID);
+ }
+
+ @Test
+ public void exportQuery_connection_fails() {
+
+ /* mock */
+ doThrow(HttpServerErrorException.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(ExportResourceDto.class));
+
+ /* test */
+ assertThrows(DataServiceConnectionException.class, () -> {
+ dataServiceGateway.exportQuery(DATABASE_1_ID, QUERY_1_ID);
+ });
+ }
+
+ @Test
+ public void exportQuery_unauthorized_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.Unauthorized.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(ExportResourceDto.class));
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.exportQuery(DATABASE_1_ID, QUERY_1_ID);
+ });
+ }
+
+ @Test
+ public void exportQuery_notFound_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.NotFound.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(ExportResourceDto.class));
+
+ /* test */
+ assertThrows(QueryNotFoundException.class, () -> {
+ dataServiceGateway.exportQuery(DATABASE_1_ID, QUERY_1_ID);
+ });
+ }
+
+ @Test
+ public void exportQuery_responseCode_fails() {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(ExportResourceDto.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.NO_CONTENT)
+ .build());
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.exportQuery(DATABASE_1_ID, QUERY_1_ID);
+ });
+ }
+
+ @Test
+ public void getTableSchemas_succeeds() throws DataServiceException, DataServiceConnectionException, TableNotFoundException {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(TableDto[].class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.OK)
+ .body(new TableDto[]{}));
+
+ /* test */
+ dataServiceGateway.getTableSchemas(DATABASE_1_ID);
+ }
+
+ @Test
+ public void getTableSchemas_connection_fails() {
+
+ /* mock */
+ doThrow(HttpServerErrorException.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(TableDto[].class));
+
+ /* test */
+ assertThrows(DataServiceConnectionException.class, () -> {
+ dataServiceGateway.getTableSchemas(DATABASE_1_ID);
+ });
+ }
+
+ @Test
+ public void getTableSchemas_unauthorized_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.Unauthorized.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(TableDto[].class));
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.getTableSchemas(DATABASE_1_ID);
+ });
+ }
+
+ @Test
+ public void getTableSchemas_notFound_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.NotFound.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(TableDto[].class));
+
+ /* test */
+ assertThrows(TableNotFoundException.class, () -> {
+ dataServiceGateway.getTableSchemas(DATABASE_1_ID);
+ });
+ }
+
+ @Test
+ public void getTableSchemas_responseCode_fails() {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(TableDto[].class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.NO_CONTENT)
+ .build());
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.getTableSchemas(DATABASE_1_ID);
+ });
+ }
+
+ @Test
+ public void getTableSchemas_emptyBody_fails() {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(TableDto[].class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.OK)
+ .build());
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.getTableSchemas(DATABASE_1_ID);
+ });
+ }
+
+ @Test
+ public void getViewSchemas_succeeds() throws DataServiceException, DataServiceConnectionException,
+ ViewNotFoundException {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(ViewDto[].class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.OK)
+ .body(new ViewDto[]{}));
+
+ /* test */
+ dataServiceGateway.getViewSchemas(DATABASE_1_ID);
+ }
+
+ @Test
+ public void getViewSchemas_connection_fails() {
+
+ /* mock */
+ doThrow(HttpServerErrorException.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(ViewDto[].class));
+
+ /* test */
+ assertThrows(DataServiceConnectionException.class, () -> {
+ dataServiceGateway.getViewSchemas(DATABASE_1_ID);
+ });
+ }
+
+ @Test
+ public void getViewSchemas_unauthorized_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.Unauthorized.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(ViewDto[].class));
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.getViewSchemas(DATABASE_1_ID);
+ });
+ }
+
+ @Test
+ public void getViewSchemas_notFound_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.NotFound.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(ViewDto[].class));
+
+ /* test */
+ assertThrows(ViewNotFoundException.class, () -> {
+ dataServiceGateway.getViewSchemas(DATABASE_1_ID);
+ });
+ }
+
+ @Test
+ public void getViewSchemas_responseCode_fails() {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(ViewDto[].class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.NO_CONTENT)
+ .build());
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.getViewSchemas(DATABASE_1_ID);
+ });
+ }
+
+ @Test
+ public void getViewSchemas_emptyBody_fails() {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(ViewDto[].class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.OK)
+ .build());
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.getViewSchemas(DATABASE_1_ID);
+ });
+ }
+
+ @Test
+ public void getTableStatistics_succeeds() throws DataServiceException, DataServiceConnectionException,
+ TableNotFoundException {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(TableStatisticDto.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.OK)
+ .body(TABLE_8_STATISTIC_DTO));
+
+ /* test */
+ dataServiceGateway.getTableStatistics(DATABASE_3_ID, TABLE_8_ID);
+ }
+
+ @Test
+ public void getTableStatistics_connection_fails() {
+
+ /* mock */
+ doThrow(HttpServerErrorException.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(TableStatisticDto.class));
+
+ /* test */
+ assertThrows(DataServiceConnectionException.class, () -> {
+ dataServiceGateway.getTableStatistics(DATABASE_3_ID, TABLE_8_ID);
+ });
+ }
+
+ @Test
+ public void getTableStatistics_unauthorized_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.Unauthorized.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(TableStatisticDto.class));
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.getTableStatistics(DATABASE_3_ID, TABLE_8_ID);
+ });
+ }
+
+ @Test
+ public void getTableStatistics_notFound_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.NotFound.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(TableStatisticDto.class));
+
+ /* test */
+ assertThrows(TableNotFoundException.class, () -> {
+ dataServiceGateway.getTableStatistics(DATABASE_3_ID, TABLE_8_ID);
+ });
+ }
+
+ @Test
+ public void getTableStatistics_responseCode_fails() {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(TableStatisticDto.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.NO_CONTENT)
+ .build());
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.getTableStatistics(DATABASE_3_ID, TABLE_8_ID);
+ });
+ }
+
+ @Test
+ public void getTableStatistics_emptyBody_fails() {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(TableStatisticDto.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.OK)
+ .build());
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.getTableStatistics(DATABASE_3_ID, TABLE_8_ID);
+ });
+ }
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/KeycloakGatewayUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/KeycloakGatewayUnitTest.java
index ce85aa2d8f9387e8e9f046216a77d0a54a29998a..bb3bcbb094ad1e9a2510abe20b9649ee73e6e975 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/KeycloakGatewayUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/KeycloakGatewayUnitTest.java
@@ -16,12 +16,11 @@ import org.springframework.http.*;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.HttpServerErrorException;
-import org.springframework.web.client.ResourceAccessException;
import org.springframework.web.client.RestTemplate;
import java.nio.charset.Charset;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
@Log4j2
@@ -31,348 +30,459 @@ public class KeycloakGatewayUnitTest extends AbstractUnitTest {
@MockBean
@Qualifier("keycloakRestTemplate")
+ private RestTemplate keycloakRestTemplate;
+
+ @MockBean
+ @Qualifier("restTemplate")
private RestTemplate restTemplate;
@Autowired
private KeycloakGatewayImpl keycloakGateway;
@Test
- public void obtainToken_succeeds() throws ServiceException, ServiceConnectionException {
+ public void createUser_succeeds() throws UserExistsException, EmailExistsException, AuthServiceException,
+ AuthServiceConnectionException {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
.thenReturn(ResponseEntity.status(HttpStatus.OK)
.body(TOKEN_DTO));
+ when(keycloakRestTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.CREATED)
+ .build());
/* test */
- keycloakGateway.obtainToken();
+ keycloakGateway.createUser(USER_1_KEYCLOAK_SIGNUP_REQUEST);
}
@Test
- public void obtainToken_noAccess_fails() {
+ public void createUser_fails() {
/* mock */
- doThrow(ResourceAccessException.class)
- .when(restTemplate)
- .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class));
+ when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.OK)
+ .body(TOKEN_DTO));
+ when(keycloakRestTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.NO_CONTENT)
+ .build());
/* test */
- assertThrows(ServiceConnectionException.class, () -> {
- keycloakGateway.obtainToken();
+ assertThrows(AuthServiceException.class, () -> {
+ keycloakGateway.createUser(USER_1_KEYCLOAK_SIGNUP_REQUEST);
});
}
@Test
- public void obtainToken_fails() {
+ public void createUser_sameUsername_fails() {
/* mock */
- doThrow(HttpServerErrorException.BadGateway.create(HttpStatus.BAD_GATEWAY, "", new HttpHeaders(), new byte[]{}, Charset.defaultCharset()))
- .when(restTemplate)
- .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class));
+ when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.OK)
+ .body(TOKEN_DTO));
+ doThrow(HttpClientErrorException.Conflict.class)
+ .when(keycloakRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class));
/* test */
- assertThrows(ServiceConnectionException.class, () -> {
- keycloakGateway.obtainToken();
+ assertThrows(UserExistsException.class, () -> {
+ keycloakGateway.createUser(USER_1_KEYCLOAK_SIGNUP_REQUEST);
});
}
@Test
- public void createUser_succeeds() throws UserExistsException, ServiceException, ServiceConnectionException, EmailExistsException {
+ public void createUser_connection_fails() {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
.thenReturn(ResponseEntity.status(HttpStatus.OK)
.body(TOKEN_DTO));
- when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class)))
- .thenReturn(ResponseEntity.status(HttpStatus.CREATED)
+ doThrow(HttpServerErrorException.class)
+ .when(keycloakRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(AuthServiceConnectionException.class, () -> {
+ keycloakGateway.createUser(USER_1_KEYCLOAK_SIGNUP_REQUEST);
+ });
+ }
+
+ @Test
+ public void deleteUser_fails() {
+
+ /* mock */
+ when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.OK)
+ .body(TOKEN_DTO));
+ when(keycloakRestTemplate.exchange(anyString(), eq(HttpMethod.DELETE), any(HttpEntity.class), eq(Void.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.OK)
.build());
/* test */
- keycloakGateway.createUser(USER_1_KEYCLOAK_SIGNUP_REQUEST);
+ assertThrows(AuthServiceException.class, () -> {
+ keycloakGateway.deleteUser(USER_1_ID);
+ });
}
@Test
- public void createUser_fails() {
+ public void deleteUser_succeeds() throws UserNotFoundException, AuthServiceException,
+ AuthServiceConnectionException {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
.thenReturn(ResponseEntity.status(HttpStatus.OK)
.body(TOKEN_DTO));
- when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class)))
+ when(keycloakRestTemplate.exchange(anyString(), eq(HttpMethod.DELETE), any(HttpEntity.class), eq(Void.class)))
.thenReturn(ResponseEntity.status(HttpStatus.NO_CONTENT)
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
- keycloakGateway.createUser(USER_1_KEYCLOAK_SIGNUP_REQUEST);
- });
+ keycloakGateway.deleteUser(USER_1_ID);
}
@Test
- public void createUser_sameEMail_fails() {
+ public void deleteUser_notFound_fails() {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
.thenReturn(ResponseEntity.status(HttpStatus.OK)
.body(TOKEN_DTO));
- doThrow(HttpClientErrorException.Conflict.create(HttpStatus.CONFLICT, "same email", new HttpHeaders(), new byte[]{}, null))
- .when(restTemplate)
- .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class));
+ doThrow(HttpClientErrorException.NotFound.class)
+ .when(keycloakRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.DELETE), any(HttpEntity.class), eq(Void.class));
/* test */
- assertThrows(EmailExistsException.class, () -> {
- keycloakGateway.createUser(USER_1_KEYCLOAK_SIGNUP_REQUEST);
+ assertThrows(UserNotFoundException.class, () -> {
+ keycloakGateway.deleteUser(USER_1_ID);
});
}
@Test
- public void createUser_sameUsername_fails() {
+ public void deleteUser_unexpected_fails() {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
.thenReturn(ResponseEntity.status(HttpStatus.OK)
.body(TOKEN_DTO));
- doThrow(HttpClientErrorException.Conflict.create(HttpStatus.CONFLICT, "same username", new HttpHeaders(), new byte[]{}, null))
- .when(restTemplate)
- .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class));
+ doThrow(HttpClientErrorException.Conflict.class)
+ .when(keycloakRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.DELETE), any(HttpEntity.class), eq(Void.class));
/* test */
- assertThrows(UserExistsException.class, () -> {
- keycloakGateway.createUser(USER_1_KEYCLOAK_SIGNUP_REQUEST);
+ assertThrows(AuthServiceException.class, () -> {
+ keycloakGateway.deleteUser(USER_1_ID);
});
}
@Test
- public void createUser_unexpected_fails() {
+ public void deleteUser_connection_fails() {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
.thenReturn(ResponseEntity.status(HttpStatus.OK)
.body(TOKEN_DTO));
- doThrow(ResourceAccessException.class)
- .when(restTemplate)
- .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class));
+ doThrow(HttpServerErrorException.class)
+ .when(keycloakRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.DELETE), any(HttpEntity.class), eq(Void.class));
/* test */
- assertThrows(ServiceConnectionException.class, () -> {
- keycloakGateway.createUser(USER_1_KEYCLOAK_SIGNUP_REQUEST);
+ assertThrows(AuthServiceConnectionException.class, () -> {
+ keycloakGateway.deleteUser(USER_1_ID);
});
}
@Test
- public void createUser_unexpected2_fails() {
+ public void updateUserCredentials_succeeds() throws AuthServiceException, AuthServiceConnectionException,
+ UserNotFoundException {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
.thenReturn(ResponseEntity.status(HttpStatus.OK)
.body(TOKEN_DTO));
- doThrow(HttpServerErrorException.BadGateway.create(HttpStatus.BAD_GATEWAY, "", new HttpHeaders(), new byte[]{}, Charset.defaultCharset()))
- .when(restTemplate)
- .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class));
+ when(keycloakRestTemplate.exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.NO_CONTENT)
+ .build());
/* test */
- assertThrows(ServiceConnectionException.class, () -> {
- keycloakGateway.createUser(USER_1_KEYCLOAK_SIGNUP_REQUEST);
- });
+ keycloakGateway.updateUserCredentials(USER_1_ID, USER_1_PASSWORD_DTO);
}
@Test
- public void deleteUser_fails() {
+ public void updateUserCredentials_fails() {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
.thenReturn(ResponseEntity.status(HttpStatus.OK)
.body(TOKEN_DTO));
- when(restTemplate.exchange(anyString(), eq(HttpMethod.DELETE), any(HttpEntity.class), eq(Void.class)))
+ when(keycloakRestTemplate.exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class)))
.thenReturn(ResponseEntity.status(HttpStatus.OK)
.build());
/* test */
- assertThrows(ServiceException.class, () -> {
- keycloakGateway.deleteUser(USER_1_ID);
+ assertThrows(AuthServiceException.class, () -> {
+ keycloakGateway.updateUserCredentials(USER_1_ID, USER_1_PASSWORD_DTO);
});
}
@Test
- public void deleteUser_succeeds() throws ServiceException, ServiceConnectionException, UserNotFoundException {
+ public void updateUserCredentials_connection_fails() {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
.thenReturn(ResponseEntity.status(HttpStatus.OK)
.body(TOKEN_DTO));
- when(restTemplate.exchange(anyString(), eq(HttpMethod.DELETE), any(HttpEntity.class), eq(Void.class)))
- .thenReturn(ResponseEntity.status(HttpStatus.NO_CONTENT)
- .build());
+ doThrow(HttpServerErrorException.class)
+ .when(keycloakRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
/* test */
- keycloakGateway.deleteUser(USER_1_ID);
+ assertThrows(AuthServiceConnectionException.class, () -> {
+ keycloakGateway.updateUserCredentials(USER_1_ID, USER_1_PASSWORD_DTO);
+ });
}
@Test
- public void deleteUser_unexpected_fails() {
+ public void updateUserCredentials_unexpected_fails() {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
.thenReturn(ResponseEntity.status(HttpStatus.OK)
.body(TOKEN_DTO));
- doThrow(ResourceAccessException.class)
- .when(restTemplate)
- .exchange(anyString(), eq(HttpMethod.DELETE), any(HttpEntity.class), eq(Void.class));
+ doThrow(HttpClientErrorException.Conflict.class)
+ .when(keycloakRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
/* test */
- assertThrows(ServiceConnectionException.class, () -> {
- keycloakGateway.deleteUser(USER_1_ID);
+ assertThrows(AuthServiceException.class, () -> {
+ keycloakGateway.updateUserCredentials(USER_1_ID, USER_1_PASSWORD_DTO);
});
}
@Test
- public void deleteUser_notFound_fails() {
+ public void findByUsername_notFound_fails() {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
.thenReturn(ResponseEntity.status(HttpStatus.OK)
.body(TOKEN_DTO));
- doThrow(HttpClientErrorException.NotFound.create(HttpStatus.NOT_FOUND, "", new HttpHeaders(), new byte[]{}, Charset.defaultCharset()))
- .when(restTemplate)
- .exchange(anyString(), eq(HttpMethod.DELETE), any(HttpEntity.class), eq(Void.class));
+ when(keycloakRestTemplate.exchange(anyString(), eq(HttpMethod.GET), any(HttpEntity.class), eq(UserDto[].class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.OK)
+ .body(new UserDto[]{}));
/* test */
assertThrows(UserNotFoundException.class, () -> {
- keycloakGateway.deleteUser(USER_1_ID);
+ keycloakGateway.findByUsername(USER_1_USERNAME);
});
}
@Test
- public void deleteUser_unexpected2_fails() {
+ public void findByUsername_connection_fails() {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
.thenReturn(ResponseEntity.status(HttpStatus.OK)
.body(TOKEN_DTO));
- doThrow(HttpServerErrorException.BadGateway.create(HttpStatus.BAD_GATEWAY, "", new HttpHeaders(), new byte[]{}, Charset.defaultCharset()))
- .when(restTemplate)
- .exchange(anyString(), eq(HttpMethod.DELETE), any(HttpEntity.class), eq(Void.class));
+ doThrow(HttpServerErrorException.class)
+ .when(keycloakRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.GET), any(HttpEntity.class), eq(UserDto[].class));
/* test */
- assertThrows(ServiceException.class, () -> {
- keycloakGateway.deleteUser(USER_1_ID);
+ assertThrows(AuthServiceConnectionException.class, () -> {
+ keycloakGateway.findByUsername(USER_1_USERNAME);
});
}
@Test
- public void updateUserCredentials_succeeds() throws ServiceException, ServiceConnectionException {
+ public void findByUsername_unexpected_fails() {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
.thenReturn(ResponseEntity.status(HttpStatus.OK)
.body(TOKEN_DTO));
- when(restTemplate.exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class)))
- .thenReturn(ResponseEntity.status(HttpStatus.NO_CONTENT)
- .build());
+ doThrow(HttpClientErrorException.Conflict.class)
+ .when(keycloakRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.GET), any(HttpEntity.class), eq(UserDto[].class));
/* test */
- keycloakGateway.updateUserCredentials(USER_1_ID, USER_1_PASSWORD_DTO);
+ assertThrows(AuthServiceException.class, () -> {
+ keycloakGateway.findByUsername(USER_1_USERNAME);
+ });
}
@Test
- public void updateUserCredentials_fails() {
+ public void findById_succeeds() throws UserNotFoundException, AuthServiceException, AuthServiceConnectionException {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
.thenReturn(ResponseEntity.status(HttpStatus.OK)
.body(TOKEN_DTO));
- when(restTemplate.exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class)))
+ when(keycloakRestTemplate.exchange(anyString(), eq(HttpMethod.GET), any(HttpEntity.class), eq(UserDto.class)))
.thenReturn(ResponseEntity.status(HttpStatus.OK)
- .build());
+ .body(USER_1_KEYCLOAK_DTO));
/* test */
- assertThrows(ServiceException.class, () -> {
- keycloakGateway.updateUserCredentials(USER_1_ID, USER_1_PASSWORD_DTO);
- });
+ final UserDto response = keycloakGateway.findById(USER_1_ID);
+ assertEquals(USER_1_ID, response.getId());
}
@Test
- public void updateUserCredentials_unexpected_fails() {
+ public void findById_notFound_fails() {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
.thenReturn(ResponseEntity.status(HttpStatus.OK)
.body(TOKEN_DTO));
- doThrow(ResourceAccessException.class)
- .when(restTemplate)
- .exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
+ doThrow(HttpClientErrorException.NotFound.class)
+ .when(keycloakRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.GET), any(HttpEntity.class), eq(UserDto.class));
/* test */
- assertThrows(ServiceConnectionException.class, () -> {
- keycloakGateway.updateUserCredentials(USER_1_ID, USER_1_PASSWORD_DTO);
+ assertThrows(UserNotFoundException.class, () -> {
+ keycloakGateway.findById(USER_1_ID);
});
}
@Test
- public void updateUserCredentials_unexpected2_fails() {
+ public void findById_connection_fails() {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
.thenReturn(ResponseEntity.status(HttpStatus.OK)
.body(TOKEN_DTO));
- doThrow(HttpServerErrorException.BadGateway.create(HttpStatus.BAD_GATEWAY, "", new HttpHeaders(), new byte[]{}, Charset.defaultCharset()))
- .when(restTemplate)
- .exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
+ doThrow(HttpServerErrorException.class)
+ .when(keycloakRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.GET), any(HttpEntity.class), eq(UserDto.class));
/* test */
- assertThrows(ServiceException.class, () -> {
- keycloakGateway.updateUserCredentials(USER_1_ID, USER_1_PASSWORD_DTO);
+ assertThrows(AuthServiceConnectionException.class, () -> {
+ keycloakGateway.findById(USER_1_ID);
});
}
@Test
- public void findByUsername_notFound_fails() {
+ public void findById_unexpected_fails() {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
.thenReturn(ResponseEntity.status(HttpStatus.OK)
.body(TOKEN_DTO));
- when(restTemplate.exchange(anyString(), eq(HttpMethod.GET), any(HttpEntity.class), eq(UserDto[].class)))
- .thenReturn(ResponseEntity.status(HttpStatus.OK)
- .body(new UserDto[]{}));
+ doThrow(HttpClientErrorException.Conflict.class)
+ .when(keycloakRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.GET), any(HttpEntity.class), eq(UserDto.class));
/* test */
- assertThrows(UserNotFoundException.class, () -> {
- keycloakGateway.findByUsername(USER_1_USERNAME);
+ assertThrows(AuthServiceException.class, () -> {
+ keycloakGateway.findById(USER_1_ID);
});
}
@Test
- public void findByUsername_remote_fails() {
+ public void refreshUserToken_succeeds() throws AuthServiceConnectionException, CredentialsInvalidException {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
.thenReturn(ResponseEntity.status(HttpStatus.OK)
.body(TOKEN_DTO));
- doThrow(ResourceAccessException.class)
+
+ /* test */
+ final TokenDto response = keycloakGateway.refreshUserToken(TOKEN_DTO.getRefreshToken());
+ assertNotNull(response.getAccessToken());
+ }
+
+ @Test
+ public void refreshUserToken_connection_fails() {
+
+ /* mock */
+ doThrow(HttpServerErrorException.class)
.when(restTemplate)
- .exchange(anyString(), eq(HttpMethod.GET), any(HttpEntity.class), eq(UserDto[].class));
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class));
/* test */
- assertThrows(ServiceConnectionException.class, () -> {
- keycloakGateway.findByUsername(USER_1_USERNAME);
+ assertThrows(AuthServiceConnectionException.class, () -> {
+ keycloakGateway.refreshUserToken(TOKEN_DTO.getRefreshToken());
});
}
@Test
- public void findByUsername_unexpected_fails() {
+ public void refreshUserToken_unauthorized_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.Unauthorized.class)
+ .when(restTemplate)
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class));
+
+ /* test */
+ assertThrows(CredentialsInvalidException.class, () -> {
+ keycloakGateway.refreshUserToken(TOKEN_DTO.getRefreshToken());
+ });
+ }
+
+ @Test
+ public void refreshUserToken_badRequest_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.BadRequest.class)
+ .when(restTemplate)
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class));
+
+ /* test */
+ assertThrows(CredentialsInvalidException.class, () -> {
+ keycloakGateway.refreshUserToken(TOKEN_DTO.getRefreshToken());
+ });
+ }
+
+ @Test
+ public void refreshUserToken_badRequestInactiveSession_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.BadRequest.create(HttpStatus.BAD_REQUEST, "Session not active", new HttpHeaders(), new byte[]{}, Charset.defaultCharset()))
+ .when(restTemplate)
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class));
+
+ /* test */
+ assertThrows(CredentialsInvalidException.class, () -> {
+ keycloakGateway.refreshUserToken(TOKEN_DTO.getRefreshToken());
+ });
+ }
+
+ @Test
+ public void obtainUserToken_succeeds() throws AuthServiceConnectionException,
+ AccountNotSetupException, CredentialsInvalidException {
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class)))
.thenReturn(ResponseEntity.status(HttpStatus.OK)
.body(TOKEN_DTO));
- doThrow(HttpServerErrorException.BadGateway.create(HttpStatus.BAD_GATEWAY, "", new HttpHeaders(), new byte[]{}, Charset.defaultCharset()))
+
+ /* test */
+ final TokenDto response = keycloakGateway.obtainUserToken(USER_1_USERNAME, USER_1_PASSWORD);
+ assertNotNull(response.getAccessToken());
+ }
+
+ @Test
+ public void obtainUserToken_connection_fails() {
+
+ /* mock */
+ doThrow(HttpServerErrorException.class)
.when(restTemplate)
- .exchange(anyString(), eq(HttpMethod.GET), any(HttpEntity.class), eq(UserDto[].class));
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class));
/* test */
- assertThrows(ServiceException.class, () -> {
- keycloakGateway.findByUsername(USER_1_USERNAME);
+ assertThrows(AuthServiceConnectionException.class, () -> {
+ keycloakGateway.obtainUserToken(USER_1_USERNAME, USER_1_PASSWORD);
+ });
+ }
+
+ @Test
+ public void obtainUserToken_unauthorized_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.Unauthorized.class)
+ .when(restTemplate)
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(TokenDto.class));
+
+ /* test */
+ assertThrows(CredentialsInvalidException.class, () -> {
+ keycloakGateway.obtainUserToken(USER_1_USERNAME, USER_1_PASSWORD);
});
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/OrcidGatewayUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/OrcidGatewayUnitTest.java
index 4572711ed228bf6007d79ced93100663e05e2b07..bcd27107bc0189614b4086e0b333fa16cf16cb84 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/OrcidGatewayUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/OrcidGatewayUnitTest.java
@@ -15,9 +15,11 @@ import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.client.ResourceAccessException;
import org.springframework.web.client.RestTemplate;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.*;
@Log4j2
@@ -26,7 +28,6 @@ import static org.mockito.Mockito.*;
public class OrcidGatewayUnitTest extends AbstractUnitTest {
@MockBean
- @Qualifier("keycloakRestTemplate")
private RestTemplate restTemplate;
@Autowired
@@ -45,15 +46,17 @@ public class OrcidGatewayUnitTest extends AbstractUnitTest {
}
@Test
- public void findByUrl_fails() throws OrcidNotFoundException {
+ public void findByUrl_fails() {
/* mock */
- doThrow(ResourceAccessException.class)
+ doThrow(HttpServerErrorException.class)
.when(restTemplate)
.exchange(anyString(), eq(HttpMethod.GET), any(HttpEntity.class), eq(OrcidDto.class));
/* test */
- orcidGateway.findByUrl(USER_1_ORCID_URL);
+ assertThrows(OrcidNotFoundException.class, () -> {
+ orcidGateway.findByUrl(USER_1_ORCID_URL);
+ });
}
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/RorGatewayUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/RorGatewayUnitTest.java
index 384cd290b36e6696bd14c4a6d74cb88838729d5c..ff9d4f741c18b2dfcd94dca91c344912fddd2167 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/RorGatewayUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/RorGatewayUnitTest.java
@@ -7,14 +7,14 @@ import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.http.*;
import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.springframework.web.client.ResourceAccessException;
+import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.client.RestTemplate;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.*;
@Log4j2
@@ -23,7 +23,6 @@ import static org.mockito.Mockito.*;
public class RorGatewayUnitTest extends AbstractUnitTest {
@MockBean
- @Qualifier("keycloakRestTemplate")
private RestTemplate restTemplate;
@Autowired
@@ -42,15 +41,17 @@ public class RorGatewayUnitTest extends AbstractUnitTest {
}
@Test
- public void findById_fails() throws RorNotFoundException {
+ public void findById_fails() {
/* mock */
- doThrow(ResourceAccessException.class)
+ doThrow(HttpServerErrorException.class)
.when(restTemplate)
.exchange(anyString(), eq(HttpMethod.GET), any(HttpEntity.class), eq(RorDto.class));
/* test */
- rorGateway.findById("04d836q62");
+ assertThrows(RorNotFoundException.class, () -> {
+ rorGateway.findById("04d836q62");
+ });
}
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/SearchServiceGatewayUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/SearchServiceGatewayUnitTest.java
index b4b205d4f49ceee118774909ea8f568a23deff3b..aa1c9d4f056f61680aeb341f2cebafdbe262a2b5 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/SearchServiceGatewayUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/SearchServiceGatewayUnitTest.java
@@ -135,6 +135,20 @@ public class SearchServiceGatewayUnitTest extends AbstractUnitTest {
});
}
+ @Test
+ public void delete_unauthorized_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.Unauthorized.class)
+ .when(restTemplate)
+ .exchange(anyString(), eq(HttpMethod.DELETE), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(SearchServiceException.class, () -> {
+ searchServiceGateway.delete(DATABASE_1_ID);
+ });
+ }
+
@Test
public void delete_unexpectedResponse_fails() {
final ResponseEntity<Void> mock = ResponseEntity.status(HttpStatus.OK)
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/MetadataMapperUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/MetadataMapperUnitTest.java
index c357020a684be7b90120ef6dc0fad68a42dcd098..8a72f2cabbe0f4eda33ff77ef125eed2c842e12d 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/MetadataMapperUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/MetadataMapperUnitTest.java
@@ -15,9 +15,7 @@ import at.tuwien.api.user.UserBriefDto;
import at.tuwien.api.user.UserDto;
import at.tuwien.entities.container.Container;
import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.table.Table;
-import at.tuwien.entities.identifier.Identifier;
-import at.tuwien.entities.identifier.IdentifierType;
+import at.tuwien.entities.identifier.*;
import at.tuwien.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
@@ -104,12 +102,42 @@ public class MetadataMapperUnitTest extends AbstractUnitTest {
/* test */
final Identifier response = metadataMapper.identifierCreateDtoToIdentifier(IDENTIFIER_1_CREATE_DTO);
- assertNull(response.getDatabase());
- assertNull(response.getViewId());
- assertNull(response.getQueryId());
- assertNull(response.getTableId());
- assertNull(response.getDoi());
- assertEquals(IDENTIFIER_1_TYPE, response.getType());
+ assertNotNull(response.getTitles());
+ final List<IdentifierTitle> titles = response.getTitles();
+ assertEquals(2, titles.size());
+ final IdentifierTitle title0 = titles.get(0);
+ assertEquals(IDENTIFIER_1_TITLE_1_TITLE, title0.getTitle());
+ assertEquals(IDENTIFIER_1_TITLE_1_LANG, title0.getLanguage());
+ assertEquals(IDENTIFIER_1_TITLE_1_TYPE, title0.getTitleType());
+ final IdentifierTitle title1 = titles.get(1);
+ assertEquals(IDENTIFIER_1_TITLE_2_TITLE, title1.getTitle());
+ assertEquals(IDENTIFIER_1_TITLE_2_LANG, title1.getLanguage());
+ assertEquals(IDENTIFIER_1_TITLE_2_TYPE, title1.getTitleType());
+ assertNotNull(response.getDescriptions());
+ assertEquals(1, response.getDescriptions().size());
+ final List<IdentifierDescription> descriptions = response.getDescriptions();
+ final IdentifierDescription description0 = descriptions.get(0);
+ assertNull(description0.getId());
+ assertEquals(IDENTIFIER_1_DESCRIPTION_1_DESCRIPTION, description0.getDescription());
+ assertEquals(IDENTIFIER_1_DESCRIPTION_1_LANG, description0.getLanguage());
+ assertEquals(IDENTIFIER_1_DESCRIPTION_1_TYPE, description0.getDescriptionType());
+ assertNotNull(response.getCreators());
+ assertEquals(1, response.getCreators().size());
+ final Creator creator0 = response.getCreators().get(0);
+ assertNotNull(creator0);
+ assertNull(creator0.getId());
+ assertEquals(IDENTIFIER_1_CREATOR_1_FIRSTNAME, creator0.getFirstname());
+ assertEquals(IDENTIFIER_1_CREATOR_1_LASTNAME, creator0.getLastname());
+ assertEquals(IDENTIFIER_1_CREATOR_1_NAME, creator0.getCreatorName());
+ assertEquals(IDENTIFIER_1_CREATOR_1_ORCID, creator0.getNameIdentifier());
+ assertEquals(IDENTIFIER_1_CREATOR_1_IDENTIFIER_SCHEME_TYPE, creator0.getNameIdentifierScheme());
+ assertEquals(IDENTIFIER_1_CREATOR_1_AFFILIATION, creator0.getAffiliation());
+ assertEquals(IDENTIFIER_1_CREATOR_1_AFFILIATION_IDENTIFIER, creator0.getAffiliationIdentifier());
+ assertEquals(IDENTIFIER_1_CREATOR_1_AFFILIATION_IDENTIFIER_SCHEME, creator0.getAffiliationIdentifierScheme());
+ assertEquals(IDENTIFIER_1_CREATOR_1_AFFILIATION_IDENTIFIER_SCHEME_URI, creator0.getAffiliationIdentifierSchemeUri());
+ assertNotNull(response.getFunders());
+ assertEquals(1, response.getFunders().size());
+ assertNull(response.getRelatedIdentifiers()); /* mapstruct strategy for empty values is to set null */
}
@Test
@@ -154,6 +182,8 @@ public class MetadataMapperUnitTest extends AbstractUnitTest {
@Test
public void customDatabaseToDatabaseDto_succeeds() {
+ final Database debug = DATABASE_1;
+
/* test */
final DatabaseDto response = metadataMapper.customDatabaseToDatabaseDto(DATABASE_1);
assertEquals(DATABASE_1_ID, response.getId());
@@ -193,7 +223,9 @@ public class MetadataMapperUnitTest extends AbstractUnitTest {
assertEquals(TABLE_1_DESCRIPTION, table0.getDescription());
assertEquals(DATABASE_1_ID, table0.getTdbid());
assertEquals(USER_1_ID, table0.getCreatedBy());
+ assertNotNull(table0.getOwner());
assertEquals(USER_1_ID, table0.getOwner().getId());
+ assertNotNull(table0.getCreator());
assertEquals(USER_1_ID, table0.getCreator().getId());
assertEquals(TABLE_1_AVG_ROW_LENGTH, table0.getAvgRowLength());
assertEquals(TABLE_1_NUM_ROWS, table0.getNumRows());
@@ -244,7 +276,9 @@ public class MetadataMapperUnitTest extends AbstractUnitTest {
assertEquals(TABLE_2_DESCRIPTION, table1.getDescription());
assertEquals(DATABASE_1_ID, table1.getTdbid());
assertEquals(USER_2_ID, table1.getCreatedBy());
+ assertNotNull(table1.getOwner());
assertEquals(USER_2_ID, table1.getOwner().getId());
+ assertNotNull(table1.getCreator());
assertEquals(USER_2_ID, table1.getCreator().getId());
assertEquals(TABLE_2_AVG_ROW_LENGTH, table1.getAvgRowLength());
assertEquals(TABLE_2_NUM_ROWS, table1.getNumRows());
@@ -316,7 +350,9 @@ public class MetadataMapperUnitTest extends AbstractUnitTest {
assertEquals(TABLE_3_DESCRIPTION, table2.getDescription());
assertEquals(DATABASE_1_ID, table2.getTdbid());
assertEquals(USER_3_ID, table2.getCreatedBy());
+ assertNotNull(table2.getOwner());
assertEquals(USER_3_ID, table2.getOwner().getId());
+ assertNotNull(table2.getCreator());
assertEquals(USER_3_ID, table2.getCreator().getId());
assertEquals(TABLE_3_AVG_ROW_LENGTH, table2.getAvgRowLength());
assertEquals(TABLE_3_NUM_ROWS, table2.getNumRows());
@@ -359,7 +395,9 @@ public class MetadataMapperUnitTest extends AbstractUnitTest {
assertEquals(TABLE_4_DESCRIPTION, table3.getDescription());
assertEquals(DATABASE_1_ID, table3.getTdbid());
assertEquals(USER_1_ID, table3.getCreatedBy());
+ assertNotNull(table3.getOwner());
assertEquals(USER_1_ID, table3.getOwner().getId());
+ assertNotNull(table3.getCreator());
assertEquals(USER_1_ID, table3.getCreator().getId());
assertEquals(TABLE_4_AVG_ROW_LENGTH, table3.getAvgRowLength());
assertEquals(TABLE_4_NUM_ROWS, table3.getNumRows());
@@ -398,10 +436,10 @@ public class MetadataMapperUnitTest extends AbstractUnitTest {
public static Stream<Arguments> nameToInternalName_parameters() {
return Stream.of(
- Arguments.arguments("dash_minus", "OE/NO-027", "oeno-027"),
- Arguments.arguments("percent", "OE%NO-027", "oeno-027"),
- Arguments.arguments("umlaut", "OE/NÖ-027", "oeno-027"),
- Arguments.arguments("dot", "OE.NO-027", "oeno-027")
+ Arguments.arguments("dash_minus", "OE/NO-027", "oe_no_027"),
+ Arguments.arguments("percent", "OE%NO-027", "oe_no_027"),
+ Arguments.arguments("umlaut", "OE/NÖ-027", "oe_no__027"),
+ Arguments.arguments("dot", "OE.NO-027", "oe_no_027")
);
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/AuthenticationPrivilegedIntegrationMvcTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/AuthenticationPrivilegedIntegrationMvcTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..5b2e607ec1ba9c6fe33055d4533042da4e88b2f9
--- /dev/null
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/AuthenticationPrivilegedIntegrationMvcTest.java
@@ -0,0 +1,293 @@
+package at.tuwien.mvc;
+
+import at.tuwien.exception.AuthServiceConnectionException;
+import at.tuwien.exception.AuthServiceException;
+import at.tuwien.exception.CredentialsInvalidException;
+import at.tuwien.gateway.KeycloakGateway;
+import at.tuwien.repository.ContainerRepository;
+import at.tuwien.repository.DatabaseRepository;
+import at.tuwien.repository.LicenseRepository;
+import at.tuwien.repository.UserRepository;
+import at.tuwien.test.AbstractUnitTest;
+import at.tuwien.utils.KeycloakUtils;
+import dasniko.testcontainers.keycloak.KeycloakContainer;
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.servlet.MockMvc;
+import org.testcontainers.images.PullPolicy;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import java.util.List;
+
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@Log4j2
+@ExtendWith(SpringExtension.class)
+@AutoConfigureMockMvc
+@Testcontainers
+@SpringBootTest
+public class AuthenticationPrivilegedIntegrationMvcTest extends AbstractUnitTest {
+
+ @Autowired
+ private MockMvc mockMvc;
+
+ @Autowired
+ private KeycloakUtils keycloakUtils;
+
+ @Autowired
+ private KeycloakGateway keycloakGateway;
+
+ @Autowired
+ private UserRepository userRepository;
+
+ @Autowired
+ private LicenseRepository licenseRepository;
+
+ @Autowired
+ private ContainerRepository containerRepository;
+
+ @Autowired
+ private DatabaseRepository databaseRepository;
+
+ @Container
+ private static KeycloakContainer keycloakContainer = new KeycloakContainer("quay.io/keycloak/keycloak:24.0")
+ .withImagePullPolicy(PullPolicy.alwaysPull())
+ .withAdminUsername("admin")
+ .withAdminPassword("admin")
+ .withRealmImportFile("./init/dbrepo-realm.json")
+ .withEnv("KC_HOSTNAME_STRICT_HTTPS", "false");
+
+ @DynamicPropertySource
+ static void keycloakProperties(DynamicPropertyRegistry registry) {
+ registry.add("dbrepo.endpoints.authService", () -> "http://localhost:" + keycloakContainer.getMappedPort(8080));
+ }
+
+ @BeforeEach
+ public void beforeEach() throws AuthServiceException, AuthServiceConnectionException, CredentialsInvalidException {
+ genesis();
+ /* metadata database */
+ licenseRepository.save(LICENSE_1);
+ containerRepository.save(CONTAINER_1);
+ userRepository.saveAll(List.of(USER_1, USER_2, USER_3, USER_4));
+ databaseRepository.save(DATABASE_1);
+ /* keycloak */
+ keycloakUtils.deleteUser(USER_1_USERNAME);
+ }
+
+ @Test
+ public void findById_database_basicUser_fails() throws Exception {
+
+ /* mock */
+ keycloakGateway.createUser(USER_1_KEYCLOAK_SIGNUP_REQUEST);
+
+ /* test */
+ this.mockMvc.perform(get("/api/database/1").with(httpBasic(USER_1_USERNAME, USER_1_PASSWORD)))
+ .andDo(print())
+ .andExpect(header().doesNotExist("X-Username"))
+ .andExpect(header().doesNotExist("X-Password"))
+ .andExpect(header().doesNotExist("Access-Control-Expose-Headers"))
+ .andExpect(status().isOk());
+ }
+
+ @Test
+ public void findById_database_basicAdmin_succeeds() throws Exception {
+
+ /* mock */
+ keycloakGateway.createUser(USER_1_KEYCLOAK_SYSTEM_SIGNUP_REQUEST);
+
+ /* test */
+ this.mockMvc.perform(get("/api/database/1").with(httpBasic(USER_1_USERNAME, USER_1_PASSWORD)))
+ .andDo(print())
+ .andExpect(header().string("X-Username", CONTAINER_1_PRIVILEGED_USERNAME))
+ .andExpect(header().string("X-Password", CONTAINER_1_PRIVILEGED_PASSWORD))
+ .andExpect(header().string("Access-Control-Expose-Headers", "X-Username X-Password"))
+ .andExpect(status().isOk());
+ }
+
+ @Test
+ @WithMockUser(username = "admin", authorities = {"system"})
+ public void findById_database_bearerAdmin_succeeds() throws Exception {
+
+ /* test */
+ this.mockMvc.perform(get("/api/database/1"))
+ .andDo(print())
+ .andExpect(header().string("X-Username", CONTAINER_1_PRIVILEGED_USERNAME))
+ .andExpect(header().string("X-Password", CONTAINER_1_PRIVILEGED_PASSWORD))
+ .andExpect(header().string("Access-Control-Expose-Headers", "X-Username X-Password"))
+ .andExpect(status().isOk());
+ }
+
+ @Test
+ public void findById_table_basicUser_fails() throws Exception {
+
+ /* mock */
+ keycloakGateway.createUser(USER_1_KEYCLOAK_SIGNUP_REQUEST);
+
+ /* test */
+ this.mockMvc.perform(get("/api/database/1/table/1").with(httpBasic(USER_1_USERNAME, USER_1_PASSWORD)))
+ .andDo(print())
+ .andExpect(header().doesNotExist("X-Username"))
+ .andExpect(header().doesNotExist("X-Password"))
+ .andExpect(header().doesNotExist("X-Host"))
+ .andExpect(header().doesNotExist("X-Port"))
+ .andExpect(header().doesNotExist("X-Type"))
+ .andExpect(header().doesNotExist("X-Database"))
+ .andExpect(header().doesNotExist("X-Sidecar-Host"))
+ .andExpect(header().doesNotExist("X-Sidecar-Port"))
+ .andExpect(header().doesNotExist("Access-Control-Expose-Headers"))
+ .andExpect(status().isOk());
+ }
+
+ @Test
+ public void findById_table_basicAdmin_succeeds() throws Exception {
+
+ /* mock */
+ keycloakGateway.createUser(USER_1_KEYCLOAK_SYSTEM_SIGNUP_REQUEST);
+
+ /* test */
+ this.mockMvc.perform(get("/api/database/1/table/1").with(httpBasic(USER_1_USERNAME, USER_1_PASSWORD)))
+ .andDo(print())
+ .andExpect(header().string("X-Username", CONTAINER_1_PRIVILEGED_USERNAME))
+ .andExpect(header().string("X-Password", CONTAINER_1_PRIVILEGED_PASSWORD))
+ .andExpect(header().string("X-Host", CONTAINER_1_HOST))
+ .andExpect(header().string("X-Port", "" + CONTAINER_1_PORT))
+ .andExpect(header().string("X-Type", IMAGE_1_JDBC))
+ .andExpect(header().string("X-Database", DATABASE_1_INTERNALNAME))
+ .andExpect(header().string("X-Sidecar-Host", CONTAINER_1_SIDECAR_HOST))
+ .andExpect(header().string("X-Sidecar-Port", "" + CONTAINER_1_SIDECAR_PORT))
+ .andExpect(header().string("Access-Control-Expose-Headers", "X-Username X-Password X-Host X-Port X-Type X-Database X-Sidecar-Host X-Sidecar-Port"))
+ .andExpect(status().isOk());
+ }
+
+ @Test
+ @WithMockUser(username = "admin", authorities = {"system"})
+ public void findById_table_bearerAdmin_succeeds() throws Exception {
+
+ /* test */
+ this.mockMvc.perform(get("/api/database/1/table/1"))
+ .andDo(print())
+ .andExpect(header().string("X-Username", CONTAINER_1_PRIVILEGED_USERNAME))
+ .andExpect(header().string("X-Password", CONTAINER_1_PRIVILEGED_PASSWORD))
+ .andExpect(header().string("X-Host", CONTAINER_1_HOST))
+ .andExpect(header().string("X-Port", "" + CONTAINER_1_PORT))
+ .andExpect(header().string("X-Type", IMAGE_1_JDBC))
+ .andExpect(header().string("X-Database", DATABASE_1_INTERNALNAME))
+ .andExpect(header().string("X-Sidecar-Host", CONTAINER_1_SIDECAR_HOST))
+ .andExpect(header().string("X-Sidecar-Port", "" + CONTAINER_1_SIDECAR_PORT))
+ .andExpect(header().string("Access-Control-Expose-Headers", "X-Username X-Password X-Host X-Port X-Type X-Database X-Sidecar-Host X-Sidecar-Port"))
+ .andExpect(status().isOk());
+ }
+
+ @Test
+ public void findById_view_basicUser_fails() throws Exception {
+
+ /* mock */
+ keycloakGateway.createUser(USER_1_KEYCLOAK_SIGNUP_REQUEST);
+
+ /* test */
+ this.mockMvc.perform(get("/api/database/1/view/1").with(httpBasic(USER_1_USERNAME, USER_1_PASSWORD)))
+ .andDo(print())
+ .andExpect(header().doesNotExist("X-Username"))
+ .andExpect(header().doesNotExist("X-Password"))
+ .andExpect(header().doesNotExist("X-Host"))
+ .andExpect(header().doesNotExist("X-Port"))
+ .andExpect(header().doesNotExist("X-Type"))
+ .andExpect(header().doesNotExist("X-Database"))
+ .andExpect(header().doesNotExist("Access-Control-Expose-Headers"))
+ .andExpect(status().isOk());
+ }
+
+ @Test
+ public void findById_view_basicAdmin_succeeds() throws Exception {
+
+ /* mock */
+ keycloakGateway.createUser(USER_1_KEYCLOAK_SYSTEM_SIGNUP_REQUEST);
+
+ /* test */
+ this.mockMvc.perform(get("/api/database/1/view/1").with(httpBasic(USER_1_USERNAME, USER_1_PASSWORD)))
+ .andDo(print())
+ .andExpect(header().string("X-Username", CONTAINER_1_PRIVILEGED_USERNAME))
+ .andExpect(header().string("X-Password", CONTAINER_1_PRIVILEGED_PASSWORD))
+ .andExpect(header().string("X-Host", CONTAINER_1_HOST))
+ .andExpect(header().string("X-Port", "" + CONTAINER_1_PORT))
+ .andExpect(header().string("X-Type", IMAGE_1_JDBC))
+ .andExpect(header().string("X-Database", DATABASE_1_INTERNALNAME))
+ .andExpect(header().string("Access-Control-Expose-Headers", "X-Username X-Password X-Host X-Port X-Type X-Database"))
+ .andExpect(status().isOk());
+ }
+
+ @Test
+ @WithMockUser(username = "admin", authorities = {"system"})
+ public void findById_view_bearerAdmin_succeeds() throws Exception {
+
+ /* test */
+ this.mockMvc.perform(get("/api/database/1/view/1"))
+ .andDo(print())
+ .andExpect(header().string("X-Username", CONTAINER_1_PRIVILEGED_USERNAME))
+ .andExpect(header().string("X-Password", CONTAINER_1_PRIVILEGED_PASSWORD))
+ .andExpect(header().string("X-Host", CONTAINER_1_HOST))
+ .andExpect(header().string("X-Port", "" + CONTAINER_1_PORT))
+ .andExpect(header().string("X-Type", IMAGE_1_JDBC))
+ .andExpect(header().string("X-Database", DATABASE_1_INTERNALNAME))
+ .andExpect(header().string("Access-Control-Expose-Headers", "X-Username X-Password X-Host X-Port X-Type X-Database"))
+ .andExpect(status().isOk());
+ }
+
+ @Test
+ public void findById_container_basicUser_fails() throws Exception {
+
+ /* mock */
+ keycloakGateway.createUser(USER_1_KEYCLOAK_SIGNUP_REQUEST);
+
+ /* test */
+ this.mockMvc.perform(get("/api/container/1").with(httpBasic(USER_1_USERNAME, USER_1_PASSWORD)))
+ .andDo(print())
+ .andExpect(header().doesNotExist("X-Username"))
+ .andExpect(header().doesNotExist("X-Password"))
+ .andExpect(header().doesNotExist("Access-Control-Expose-Headers"))
+ .andExpect(status().isOk());
+ }
+
+ @Test
+ public void findById_container_basicAdmin_succeeds() throws Exception {
+
+ /* mock */
+ keycloakGateway.createUser(USER_1_KEYCLOAK_SYSTEM_SIGNUP_REQUEST);
+
+ /* test */
+ this.mockMvc.perform(get("/api/container/1").with(httpBasic(USER_1_USERNAME, USER_1_PASSWORD)))
+ .andDo(print())
+ .andExpect(header().string("X-Username", CONTAINER_1_PRIVILEGED_USERNAME))
+ .andExpect(header().string("X-Password", CONTAINER_1_PRIVILEGED_PASSWORD))
+ .andExpect(header().string("Access-Control-Expose-Headers", "X-Username X-Password"))
+ .andExpect(status().isOk());
+ }
+
+ @Test
+ @WithMockUser(username = "admin", authorities = {"system"})
+ public void findById_container_bearerAdmin_succeeds() throws Exception {
+
+ /* test */
+ this.mockMvc.perform(get("/api/container/1"))
+ .andDo(print())
+ .andExpect(header().string("X-Username", CONTAINER_1_PRIVILEGED_USERNAME))
+ .andExpect(header().string("X-Password", CONTAINER_1_PRIVILEGED_PASSWORD))
+ .andExpect(header().string("Access-Control-Expose-Headers", "X-Username X-Password"))
+ .andExpect(status().isOk());
+ }
+
+}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/MetadataEndpointMvcTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/MetadataEndpointMvcTest.java
index b38aee91d5e1fe7a136b83e5e6bd9f0fcb9ec286..9c79f01d66c07e36b22d1ab112464b7d3943a693 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/MetadataEndpointMvcTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/MetadataEndpointMvcTest.java
@@ -1,8 +1,8 @@
package at.tuwien.mvc;
+import at.tuwien.repository.IdentifierRepository;
import at.tuwien.test.AbstractUnitTest;
import at.tuwien.config.MetadataConfig;
-import at.tuwien.repository.*;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java
index 44b924f39613f1dbf0dfe951164d6210a6c3d51d..d3f75d70602ffb2dad2a6b2adc8797eb7636135c 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java
@@ -15,7 +15,6 @@ import io.micrometer.observation.tck.TestObservationRegistry;
import io.swagger.v3.oas.annotations.Operation;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -36,8 +35,6 @@ import org.springframework.test.web.servlet.MockMvc;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Method;
-import java.math.BigDecimal;
-import java.nio.charset.Charset;
import java.util.*;
import static io.micrometer.observation.tck.TestObservationRegistryAssert.assertThat;
@@ -352,7 +349,7 @@ public class PrometheusEndpointMvcTest extends AbstractUnitTest {
/* mock */
try {
- messageEndpoint.list("");
+ messageEndpoint.list(null);
} catch (Exception e) {
/* ignore */
}
@@ -503,7 +500,7 @@ public class PrometheusEndpointMvcTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"create-table", "delete-table",
- "modify-table-column-semantics", "modify-foreign-table-column-semantics", "admin",
+ "modify-table-column-semantics", "modify-foreign-table-column-semantics", "update-table-statistic",
"table-semantic-analyse"})
public void prometheusTableEndpoint_succeeds() {
final ColumnSemanticsUpdateDto request = ColumnSemanticsUpdateDto.builder()
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AccessServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AccessServiceUnitTest.java
index 8750e7d1dba5875ecc24e71dca3e9398a7cfccdc..fa939b0cb1795b08257b743ddb239bd075871cf0 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AccessServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AccessServiceUnitTest.java
@@ -25,8 +25,6 @@ import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.client.RestTemplate;
-import java.util.LinkedList;
-import java.util.List;
import java.util.Optional;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -75,7 +73,7 @@ public class AccessServiceUnitTest extends AbstractUnitTest {
}
@Test
- public void create_succeeds() throws ServiceException, ServiceConnectionException,
+ public void create_succeeds() throws DataServiceException, DataServiceConnectionException,
DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException {
/* mock */
@@ -101,7 +99,7 @@ public class AccessServiceUnitTest extends AbstractUnitTest {
.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class));
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(DataServiceException.class, () -> {
accessService.create(DATABASE_1, USER_1, AccessTypeDto.WRITE_ALL);
});
}
@@ -115,7 +113,7 @@ public class AccessServiceUnitTest extends AbstractUnitTest {
.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class));
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(DataServiceException.class, () -> {
accessService.create(DATABASE_1, USER_1, AccessTypeDto.WRITE_ALL);
});
}
@@ -143,7 +141,7 @@ public class AccessServiceUnitTest extends AbstractUnitTest {
.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(Void.class));
/* test */
- assertThrows(ServiceConnectionException.class, () -> {
+ assertThrows(DataServiceConnectionException.class, () -> {
accessService.create(DATABASE_1, USER_1, AccessTypeDto.WRITE_ALL);
});
}
@@ -225,7 +223,7 @@ public class AccessServiceUnitTest extends AbstractUnitTest {
}
@Test
- public void update_succeeds() throws ServiceException, ServiceConnectionException, AccessNotFoundException,
+ public void update_succeeds() throws DataServiceException, DataServiceConnectionException, AccessNotFoundException,
DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException {
/* mock */
@@ -251,7 +249,7 @@ public class AccessServiceUnitTest extends AbstractUnitTest {
.exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(DataServiceException.class, () -> {
accessService.update(DATABASE_1, USER_1, AccessTypeDto.WRITE_ALL);
});
}
@@ -265,7 +263,7 @@ public class AccessServiceUnitTest extends AbstractUnitTest {
.exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(DataServiceException.class, () -> {
accessService.update(DATABASE_1, USER_1, AccessTypeDto.WRITE_ALL);
});
}
@@ -293,7 +291,7 @@ public class AccessServiceUnitTest extends AbstractUnitTest {
.exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
/* test */
- assertThrows(ServiceConnectionException.class, () -> {
+ assertThrows(DataServiceConnectionException.class, () -> {
accessService.update(DATABASE_1, USER_1, AccessTypeDto.WRITE_ALL);
});
}
@@ -375,7 +373,7 @@ public class AccessServiceUnitTest extends AbstractUnitTest {
}
@Test
- public void delete_succeeds() throws ServiceException, ServiceConnectionException, AccessNotFoundException,
+ public void delete_succeeds() throws DataServiceException, DataServiceConnectionException, AccessNotFoundException,
DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException {
/* mock */
@@ -403,7 +401,7 @@ public class AccessServiceUnitTest extends AbstractUnitTest {
.exchange(anyString(), eq(HttpMethod.DELETE), any(HttpEntity.class), eq(Void.class));
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(DataServiceException.class, () -> {
accessService.delete(DATABASE_1, USER_1);
});
}
@@ -431,7 +429,7 @@ public class AccessServiceUnitTest extends AbstractUnitTest {
.exchange(anyString(), eq(HttpMethod.DELETE), any(HttpEntity.class), eq(Void.class));
/* test */
- assertThrows(ServiceConnectionException.class, () -> {
+ assertThrows(DataServiceConnectionException.class, () -> {
accessService.delete(DATABASE_1, USER_1);
});
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AuthenticationServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AuthenticationServiceIntegrationTest.java
index b9f4eb27afce9810be1f1716ed1c5a6abea46ab8..4125529155b135dae929fa7192db073e20dc9f55 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AuthenticationServiceIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AuthenticationServiceIntegrationTest.java
@@ -32,10 +32,10 @@ public class AuthenticationServiceIntegrationTest extends AbstractUnitTest {
private KeycloakGateway keycloakGateway;
@Container
- private static KeycloakContainer keycloakContainer = new KeycloakContainer("quay.io/keycloak/keycloak:21.0")
+ private static KeycloakContainer keycloakContainer = new KeycloakContainer("quay.io/keycloak/keycloak:24.0")
.withImagePullPolicy(PullPolicy.alwaysPull())
- .withAdminUsername("fda")
- .withAdminPassword("fda")
+ .withAdminUsername("admin")
+ .withAdminPassword("admin")
.withRealmImportFile("./init/dbrepo-realm.json")
.withEnv("KC_HOSTNAME_STRICT_HTTPS", "false");
@@ -45,8 +45,8 @@ public class AuthenticationServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void delete_succeeds() throws EmailExistsException, UserExistsException, ServiceException,
- ServiceConnectionException, UserNotFoundException {
+ public void delete_succeeds() throws EmailExistsException, UserExistsException, UserNotFoundException,
+ AuthServiceException, AuthServiceConnectionException, CredentialsInvalidException {
/* mock */
try {
@@ -57,6 +57,7 @@ public class AuthenticationServiceIntegrationTest extends AbstractUnitTest {
keycloakGateway.createUser(USER_1_KEYCLOAK_SIGNUP_REQUEST);
final User request = User.builder()
.id(keycloakGateway.findByUsername(USER_1_USERNAME).getId())
+ .username(USER_1_USERNAME)
.build();
/* test */
@@ -64,8 +65,9 @@ public class AuthenticationServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void create_succeeds() throws EmailExistsException, UserExistsException, ServiceException,
- ServiceConnectionException {
+ public void create_succeeds() throws EmailExistsException, UserExistsException,
+ DataServiceConnectionException, AuthServiceException, AuthServiceConnectionException,
+ CredentialsInvalidException {
/* mock */
try {
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/BrokerServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/BrokerServiceIntegrationTest.java
index a340e293452b135d8d37b8bd212ea3ee425cbd60..c9a2ad62b61d324934236c885bf6be2aca586e9e 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/BrokerServiceIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/BrokerServiceIntegrationTest.java
@@ -1,15 +1,13 @@
package at.tuwien.service;
import at.tuwien.config.RabbitConfig;
+import at.tuwien.exception.*;
import at.tuwien.test.AbstractUnitTest;
import at.tuwien.api.amqp.GrantExchangePermissionsDto;
import at.tuwien.api.amqp.TopicPermissionDto;
import at.tuwien.api.amqp.VirtualHostPermissionDto;
import at.tuwien.entities.database.DatabaseAccess;
import at.tuwien.entities.user.User;
-import at.tuwien.exception.ServiceConnectionException;
-import at.tuwien.exception.ServiceException;
-import at.tuwien.repository.*;
import at.tuwien.utils.AmqpUtils;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
@@ -44,9 +42,6 @@ public class BrokerServiceIntegrationTest extends AbstractUnitTest {
@Autowired
private BrokerService brokerService;
- @Autowired
- private AmqpUtils amqpUtils;
-
@Container
private static final RabbitMQContainer rabbitContainer = new RabbitMQContainer("rabbitmq:3-management")
.withUser(USER_1_USERNAME, USER_1_PASSWORD, Set.of("administrator"))
@@ -55,10 +50,6 @@ public class BrokerServiceIntegrationTest extends AbstractUnitTest {
@DynamicPropertySource
static void rabbitProperties(DynamicPropertyRegistry registry) {
registry.add("dbrepo.endpoints.brokerService", rabbitContainer::getHttpUrl);
- registry.add("spring.rabbitmq.host", rabbitContainer::getHost);
- registry.add("spring.rabbitmq.port", rabbitContainer::getAmqpPort);
- registry.add("spring.rabbitmq.username", rabbitContainer::getAdminUsername);
- registry.add("spring.rabbitmq.password", rabbitContainer::getAdminPassword);
}
@BeforeEach
@@ -67,7 +58,7 @@ public class BrokerServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void updatePermissions_empty_succeeds() throws ServiceException, ServiceConnectionException {
+ public void updatePermissions_empty_succeeds() throws BrokerServiceException, BrokerServiceConnectionException {
/* test */
final VirtualHostPermissionDto permissions = setVirtualHostPermissions_generic();
@@ -79,7 +70,7 @@ public class BrokerServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void updatePermissions_writeAll_succeeds() throws ServiceException, ServiceConnectionException {
+ public void updatePermissions_writeAll_succeeds() throws BrokerServiceException, BrokerServiceConnectionException {
/* test */
final VirtualHostPermissionDto permissions = setVirtualHostPermissions_generic();
@@ -91,7 +82,7 @@ public class BrokerServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void updatePermissions_writeOwn_succeeds() throws ServiceException, ServiceConnectionException {
+ public void updatePermissions_writeOwn_succeeds() throws BrokerServiceException, BrokerServiceConnectionException {
/* test */
final VirtualHostPermissionDto permissions = setVirtualHostPermissions_generic();
@@ -103,7 +94,7 @@ public class BrokerServiceIntegrationTest extends AbstractUnitTest {
}
@Test
- public void updatePermissions_read_succeeds() throws ServiceException, ServiceConnectionException {
+ public void updatePermissions_read_succeeds() throws BrokerServiceException, BrokerServiceConnectionException {
/* test */
final VirtualHostPermissionDto permissions = setVirtualHostPermissions_generic();
@@ -116,7 +107,8 @@ public class BrokerServiceIntegrationTest extends AbstractUnitTest {
@Test
@Transactional(readOnly = true)
- public void setTopicExchangePermissions_empty_succeeds() throws ServiceException, ServiceConnectionException {
+ public void setTopicExchangePermissions_empty_succeeds() throws BrokerServiceException,
+ BrokerServiceConnectionException {
/* test */
final TopicPermissionDto permissions = setTopicExchangePermissions_generic(List.of());
@@ -129,7 +121,8 @@ public class BrokerServiceIntegrationTest extends AbstractUnitTest {
@Test
@Transactional(readOnly = true)
- public void setTopicExchangePermissions_writeAll_succeeds() throws ServiceException, ServiceConnectionException {
+ public void setTopicExchangePermissions_writeAll_succeeds() throws BrokerServiceException,
+ BrokerServiceConnectionException {
/* test */
final TopicPermissionDto permissions = setTopicExchangePermissions_generic(List.of(DATABASE_1_USER_1_WRITE_ALL_ACCESS));
@@ -142,7 +135,8 @@ public class BrokerServiceIntegrationTest extends AbstractUnitTest {
@Test
@Transactional(readOnly = true)
- public void setTopicExchangePermissions_writeOwn_succeeds() throws ServiceException, ServiceConnectionException {
+ public void setTopicExchangePermissions_writeOwn_succeeds() throws BrokerServiceException,
+ BrokerServiceConnectionException {
/* test */
final TopicPermissionDto permissions = setTopicExchangePermissions_generic(List.of(DATABASE_1_USER_1_WRITE_OWN_ACCESS));
@@ -155,7 +149,8 @@ public class BrokerServiceIntegrationTest extends AbstractUnitTest {
@Test
@Transactional(readOnly = true)
- public void setTopicExchangePermissions_read_succeeds() throws ServiceException, ServiceConnectionException {
+ public void setTopicExchangePermissions_read_succeeds() throws BrokerServiceException,
+ BrokerServiceConnectionException {
/* test */
final TopicPermissionDto permissions = setTopicExchangePermissions_generic(List.of(DATABASE_1_USER_1_READ_ACCESS));
@@ -170,8 +165,9 @@ public class BrokerServiceIntegrationTest extends AbstractUnitTest {
/* ## GENERIC TEST CASES ## */
/* ################################################################################################### */
- protected VirtualHostPermissionDto setVirtualHostPermissions_generic() throws ServiceException,
- ServiceConnectionException {
+ protected VirtualHostPermissionDto setVirtualHostPermissions_generic() throws BrokerServiceException,
+ BrokerServiceConnectionException {
+ final AmqpUtils amqpUtils = new AmqpUtils(rabbitContainer.getHttpUrl());
/* mock */
amqpUtils.setVirtualHostPermissions(REALM_DBREPO_NAME, USER_1_USERNAME, USER_1_RABBITMQ_GRANT_DTO);
@@ -183,13 +179,14 @@ public class BrokerServiceIntegrationTest extends AbstractUnitTest {
@Transactional(readOnly = true)
protected TopicPermissionDto setTopicExchangePermissions_generic(List<DatabaseAccess> accesses)
- throws ServiceException, ServiceConnectionException {
+ throws BrokerServiceException, BrokerServiceConnectionException {
+ final AmqpUtils amqpUtils = new AmqpUtils(rabbitContainer.getHttpUrl());
final GrantExchangePermissionsDto request = GrantExchangePermissionsDto.builder()
.exchange(rabbitConfig.getExchangeName())
.read("")
.write("")
.build();
- final User user1 = User.builder()
+ final User user = User.builder()
.id(USER_1_ID)
.username(USER_1_USERNAME)
.accesses(accesses)
@@ -200,7 +197,7 @@ public class BrokerServiceIntegrationTest extends AbstractUnitTest {
amqpUtils.setTopicPermissions(REALM_DBREPO_NAME, USER_1_USERNAME, request);
/* test */
- brokerService.setTopicExchangePermissions(user1);
+ brokerService.setTopicExchangePermissions(user);
return amqpUtils.getTopicPermissions(USER_1_USERNAME);
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ConceptServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ConceptServiceUnitTest.java
index d0323941dfbd61bd9460082e6d7f0c21a3e2ecf6..7cec5e624187fcb5c5285fc4fc0b4787b6a4e9a0 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ConceptServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ConceptServiceUnitTest.java
@@ -1,11 +1,12 @@
package at.tuwien.service;
import at.tuwien.exception.ConceptNotFoundException;
+import at.tuwien.repository.ConceptRepository;
import at.tuwien.test.AbstractUnitTest;
import at.tuwien.entities.database.table.columns.TableColumnConcept;
-import at.tuwien.repository.*;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServicePersistenceTest.java
index f28cc0b9b105f81feee49aabd9647af2cdf9624f..0c0cf075c4d83645a7df6bae035cbae4d458ad1e 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServicePersistenceTest.java
@@ -1,7 +1,14 @@
package at.tuwien.service;
+import at.tuwien.api.identifier.BibliographyTypeDto;
+import at.tuwien.entities.identifier.Creator;
import at.tuwien.entities.identifier.Identifier;
-import at.tuwien.repository.*;
+import at.tuwien.entities.identifier.IdentifierStatusType;
+import at.tuwien.entities.identifier.NameIdentifierSchemeType;
+import at.tuwien.repository.ContainerRepository;
+import at.tuwien.repository.DatabaseRepository;
+import at.tuwien.repository.LicenseRepository;
+import at.tuwien.repository.UserRepository;
import at.tuwien.test.AbstractUnitTest;
import at.tuwien.api.datacite.DataCiteBody;
import at.tuwien.api.datacite.doi.DataCiteDoi;
@@ -9,7 +16,6 @@ import at.tuwien.entities.database.Database;
import at.tuwien.exception.*;
import at.tuwien.gateway.SearchServiceGateway;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +23,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.core.io.InputStreamResource;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -36,7 +43,7 @@ import static org.mockito.Mockito.when;
@ExtendWith(SpringExtension.class)
@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
-@SpringBootTest(properties = "spring.profiles.active:local,doi")
+@SpringBootTest(properties = "spring.profiles.active:local,junit,doi")
public class DataCiteIdentifierServicePersistenceTest extends AbstractUnitTest {
@MockBean
@@ -69,16 +76,62 @@ public class DataCiteIdentifierServicePersistenceTest extends AbstractUnitTest {
genesis();
/* metadata database */
licenseRepository.save(LICENSE_1);
- containerRepository.save(CONTAINER_1);
- userRepository.saveAll(List.of(USER_1, USER_2, USER_3, USER_4));
- databaseRepository.save(DATABASE_1);
+ containerRepository.saveAll(List.of(CONTAINER_1, CONTAINER_2, CONTAINER_3, CONTAINER_4));
+ userRepository.saveAll(List.of(USER_1, USER_2, USER_3, USER_4, USER_5));
+ databaseRepository.saveAll(List.of(DATABASE_1, DATABASE_2, DATABASE_3, DATABASE_4));
}
@Test
- @Disabled
- public void save_database_succeeds() throws ServiceException, ServiceConnectionException,
+ public void findAll_succeeds() {
+
+ /* test */
+ final List<Identifier> response = dataCiteIdentifierService.findAll(null, null, null, null, null);
+ assertEquals(7, response.size());
+ for (Long id : List.of(IDENTIFIER_1_ID, IDENTIFIER_2_ID, IDENTIFIER_3_ID, IDENTIFIER_4_ID, IDENTIFIER_5_ID, IDENTIFIER_6_ID, IDENTIFIER_7_ID)) {
+ assertTrue(response.stream().map(Identifier::getId).toList().contains(id));
+ }
+ }
+
+ @Test
+ public void findAll_databaseId_succeeds() {
+
+ /* test */
+ final List<Identifier> response = dataCiteIdentifierService.findAll(null, DATABASE_1_ID, null, null, null);
+ assertEquals(4, response.size());
+ assertTrue(response.stream().map(Identifier::getId).toList().contains(IDENTIFIER_1_ID));
+ assertTrue(response.stream().map(Identifier::getId).toList().contains(IDENTIFIER_2_ID));
+ assertTrue(response.stream().map(Identifier::getId).toList().contains(IDENTIFIER_3_ID));
+ assertTrue(response.stream().map(Identifier::getId).toList().contains(IDENTIFIER_4_ID));
+ }
+
+ @Test
+ public void findAll_queryId_succeeds() {
+
+ /* test */
+ final List<Identifier> response = dataCiteIdentifierService.findAll(null, null, QUERY_1_ID, null, null);
+ assertEquals(1, response.size());
+ }
+
+ @Test
+ public void findAll_empty_succeeds() {
+
+ /* test */
+ final List<Identifier> response = dataCiteIdentifierService.findAll(null, DATABASE_2_ID, QUERY_1_ID, null, null);
+ assertEquals(0, response.size());
+ }
+
+ @Test
+ public void find_succeeds() throws IdentifierNotFoundException {
+
+ /* test */
+ final Identifier response = dataCiteIdentifierService.find(IDENTIFIER_1_ID);
+ assertEquals(IDENTIFIER_1, response);
+ }
+
+ @Test
+ public void save_database_succeeds() throws DataServiceException, DataServiceConnectionException,
DatabaseNotFoundException, MalformedException, IdentifierNotFoundException, ViewNotFoundException,
- QueryNotFoundException, SearchServiceException, SearchServiceConnectionException {
+ QueryNotFoundException, SearchServiceException, SearchServiceConnectionException, ExternalServiceException {
final ResponseEntity<DataCiteBody<DataCiteDoi>> mock = ResponseEntity.status(HttpStatus.CREATED)
.body(IDENTIFIER_1_DATA_CITE);
@@ -93,7 +146,6 @@ public class DataCiteIdentifierServicePersistenceTest extends AbstractUnitTest {
}
@Test
- @Disabled
public void save_invalidMetadata_fails() throws DatabaseNotFoundException, SearchServiceException,
SearchServiceConnectionException {
@@ -111,7 +163,6 @@ public class DataCiteIdentifierServicePersistenceTest extends AbstractUnitTest {
}
@Test
- @Disabled
public void save_restClientException_fails() throws DatabaseNotFoundException, SearchServiceException,
SearchServiceConnectionException {
@@ -123,16 +174,16 @@ public class DataCiteIdentifierServicePersistenceTest extends AbstractUnitTest {
.thenReturn(DATABASE_1_DTO);
/* test */
- assertThrows(ServiceConnectionException.class, () -> {
+ assertThrows(DataServiceConnectionException.class, () -> {
dataCiteIdentifierService.save(DATABASE_1, USER_1, IDENTIFIER_1_SAVE_DTO);
});
}
@Test
- @Disabled
- public void create_succeeds() throws SearchServiceException, MalformedException, ServiceException,
- QueryNotFoundException, ServiceConnectionException, DatabaseNotFoundException,
- SearchServiceConnectionException, IdentifierNotFoundException, ViewNotFoundException {
+ public void create_succeeds() throws SearchServiceException, MalformedException, DataServiceException,
+ QueryNotFoundException, DataServiceConnectionException, DatabaseNotFoundException,
+ SearchServiceConnectionException, IdentifierNotFoundException, ViewNotFoundException,
+ ExternalServiceException {
final ResponseEntity<DataCiteBody<DataCiteDoi>> mock = ResponseEntity.status(HttpStatus.CREATED)
.body(IDENTIFIER_1_DATA_CITE);
@@ -146,10 +197,10 @@ public class DataCiteIdentifierServicePersistenceTest extends AbstractUnitTest {
}
@Test
- @Disabled
- public void create_hasDoi_succeeds() throws SearchServiceException, MalformedException, ServiceException,
- QueryNotFoundException, ServiceConnectionException, DatabaseNotFoundException,
- SearchServiceConnectionException, IdentifierNotFoundException, ViewNotFoundException {
+ public void create_hasDoi_succeeds() throws SearchServiceException, MalformedException, DataServiceException,
+ QueryNotFoundException, DataServiceConnectionException, DatabaseNotFoundException,
+ SearchServiceConnectionException, IdentifierNotFoundException, ViewNotFoundException,
+ ExternalServiceException {
final ResponseEntity<DataCiteBody<DataCiteDoi>> mock = ResponseEntity.status(HttpStatus.CREATED)
.body(IDENTIFIER_1_DATA_CITE);
@@ -162,4 +213,128 @@ public class DataCiteIdentifierServicePersistenceTest extends AbstractUnitTest {
assertEquals(IDENTIFIER_1_DOI_NOT_NULL, response.getDoi());
}
+ @Test
+ public void publish_succeeds() throws MalformedException, DataServiceConnectionException, SearchServiceException,
+ DatabaseNotFoundException, SearchServiceConnectionException, IdentifierNotFoundException,
+ ExternalServiceException {
+ final ResponseEntity<DataCiteBody<DataCiteDoi>> mock = ResponseEntity.status(HttpStatus.CREATED)
+ .body(IDENTIFIER_7_DATA_CITE);
+
+ /* mock */
+ when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(dataCiteBodyParameterizedTypeReference)))
+ .thenReturn(mock);
+
+ /* test */
+ final Identifier response = dataCiteIdentifierService.publish(IDENTIFIER_7_ID);
+ assertEquals(IDENTIFIER_7_ID, response.getId());
+ assertEquals(IdentifierStatusType.PUBLISHED, response.getStatus());
+ }
+
+ @Test
+ public void exportMetadata_succeeds() {
+
+ /* test */
+ final InputStreamResource response = dataCiteIdentifierService.exportMetadata(IDENTIFIER_1);
+ assertNotNull(response);
+ }
+
+ @Test
+ public void exportBibliography_apa_succeeds() throws MalformedException {
+
+ /* test */
+ final String response = dataCiteIdentifierService.exportBibliography(IDENTIFIER_1, BibliographyTypeDto.APA);
+ assertTrue(response.contains(IDENTIFIER_1_TITLE_1.getTitle()));
+ assertTrue(response.contains("" + IDENTIFIER_1_PUBLICATION_YEAR));
+ assertTrue(response.contains(IDENTIFIER_1_CREATOR_1.getLastname()));
+ }
+
+ @Test
+ public void exportBibliography_apaMixedPersonAndOrg_succeeds() throws MalformedException {
+ final Creator org = Creator.builder()
+ .id(CREATOR_2_ID)
+ .creatorName("Institute of Science and Technology Austria")
+ .nameIdentifier("https://ror.org/03gnh5541")
+ .nameIdentifierScheme(NameIdentifierSchemeType.ROR)
+ .build();
+ final Identifier identifier = IDENTIFIER_1.toBuilder()
+ .creators(List.of(IDENTIFIER_1_CREATOR_1, org))
+ .build();
+
+ /* test */
+ final String response = dataCiteIdentifierService.exportBibliography(identifier, BibliographyTypeDto.APA);
+ final String title = IDENTIFIER_1_CREATOR_1.getFirstname().charAt(0) + "., " + IDENTIFIER_1_CREATOR_1.getLastname() + " & Institute of Science and Technology Austria";
+ assertTrue(response.contains(title), "expected title not found: " + title);
+ assertTrue(response.contains("" + IDENTIFIER_1_PUBLICATION_YEAR), "expected publication year not found: " + IDENTIFIER_1_PUBLICATION_YEAR);
+ }
+
+ @Test
+ public void exportBibliography_bibtex_succeeds() throws MalformedException {
+
+ /* test */
+ final String response = dataCiteIdentifierService.exportBibliography(IDENTIFIER_1, BibliographyTypeDto.BIBTEX);
+ assertTrue(response.contains(IDENTIFIER_1_TITLE_1.getTitle()));
+ assertTrue(response.contains("" + IDENTIFIER_1_PUBLICATION_YEAR));
+ assertTrue(response.contains(IDENTIFIER_1_CREATOR_1.getLastname()));
+ }
+
+ @Test
+ public void exportBibliography_bibtexMixedPersonAndOrg_succeeds() throws MalformedException {
+ final Creator org = Creator.builder()
+ .id(CREATOR_2_ID)
+ .creatorName("Institute of Science and Technology Austria")
+ .nameIdentifier("https://ror.org/03gnh5541")
+ .nameIdentifierScheme(NameIdentifierSchemeType.ROR)
+ .build();
+ final Identifier identifier = IDENTIFIER_1.toBuilder()
+ .creators(List.of(IDENTIFIER_1_CREATOR_1, org))
+ .build();
+
+ /* test */
+ final String response = dataCiteIdentifierService.exportBibliography(identifier, BibliographyTypeDto.BIBTEX);
+ final String title = IDENTIFIER_5_CREATOR_1.getLastname() + ", " + IDENTIFIER_1_CREATOR_1.getFirstname() + " and Institute of Science and Technology Austria";
+ assertTrue(response.contains(title), "expected title not found: " + title);
+ assertTrue(response.contains("" + IDENTIFIER_1_PUBLICATION_YEAR), "expected publication year not found: " + IDENTIFIER_1_PUBLICATION_YEAR);
+ }
+
+ @Test
+ public void exportBibliography_ieee_succeeds() throws MalformedException {
+
+ /* test */
+ final String response = dataCiteIdentifierService.exportBibliography(IDENTIFIER_1, BibliographyTypeDto.IEEE);
+ assertTrue(response.contains(IDENTIFIER_1_TITLE_1.getTitle()));
+ assertTrue(response.contains("" + IDENTIFIER_1_PUBLICATION_YEAR));
+ assertTrue(response.contains(IDENTIFIER_1_CREATOR_1.getLastname()));
+ }
+
+ @Test
+ public void exportBibliography_ieeeMixedPersonAndOrg_succeeds() throws MalformedException {
+ final Creator org = Creator.builder()
+ .id(CREATOR_2_ID)
+ .creatorName("Institute of Science and Technology Austria")
+ .nameIdentifier("https://ror.org/03gnh5541")
+ .nameIdentifierScheme(NameIdentifierSchemeType.ROR)
+ .build();
+ final Identifier identifier = IDENTIFIER_1.toBuilder()
+ .creators(List.of(IDENTIFIER_1_CREATOR_1, org))
+ .build();
+
+ /* test */
+ final String response = dataCiteIdentifierService.exportBibliography(identifier, BibliographyTypeDto.IEEE);
+ final String title = IDENTIFIER_1_CREATOR_1.getFirstname().charAt(0) + ". " + IDENTIFIER_1_CREATOR_1.getLastname() + ", Institute of Science and Technology Austria";
+ assertTrue(response.contains(title), "expected title not found: " + title);
+ assertTrue(response.contains("" + IDENTIFIER_1_PUBLICATION_YEAR), "expected publication year not found: " + IDENTIFIER_1_PUBLICATION_YEAR);
+ }
+
+ @Test
+ public void delete_succeeds() throws DataServiceException, DataServiceConnectionException, DatabaseNotFoundException,
+ IdentifierNotFoundException, SearchServiceException, SearchServiceConnectionException {
+
+ /* mock */
+ when(searchServiceGateway.update(any(Database.class)))
+ .thenReturn(DATABASE_1_DTO);
+
+ /* test */
+ dataCiteIdentifierService.delete(IDENTIFIER_1);
+ }
+
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServicePersistenceTest.java
index 1d6d1c30e45f04b20f10985ec7ea67e2c8c88a4a..283450cc256197b1add589295304bd69fbe89dab 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServicePersistenceTest.java
@@ -2,40 +2,31 @@ package at.tuwien.service;
import at.tuwien.entities.database.Database;
import at.tuwien.exception.*;
-import at.tuwien.gateway.DataServiceGateway;
-import at.tuwien.gateway.SearchServiceGateway;
-import at.tuwien.repository.*;
+import at.tuwien.repository.ContainerRepository;
+import at.tuwien.repository.DatabaseRepository;
+import at.tuwien.repository.LicenseRepository;
+import at.tuwien.repository.UserRepository;
import at.tuwien.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
@Log4j2
@SpringBootTest
-@Disabled("CI/CD")
@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
@ExtendWith(SpringExtension.class)
public class DatabaseServicePersistenceTest extends AbstractUnitTest {
- @MockBean
- private DataServiceGateway dataServiceGateway;
-
- @MockBean
- private SearchServiceGateway searchServiceGateway;
-
@Autowired
private DatabaseService databaseService;
@@ -56,12 +47,13 @@ public class DatabaseServicePersistenceTest extends AbstractUnitTest {
genesis();
/* metadata database */
licenseRepository.save(LICENSE_1);
- containerRepository.save(CONTAINER_1);
- userRepository.saveAll(List.of(USER_1, USER_2, USER_3));
- databaseRepository.save(DATABASE_1);
+ containerRepository.saveAll(List.of(CONTAINER_1, CONTAINER_2, CONTAINER_3, CONTAINER_4));
+ userRepository.saveAll(List.of(USER_1, USER_2, USER_3, USER_4, USER_5));
+ databaseRepository.saveAll(List.of(DATABASE_1, DATABASE_2, DATABASE_3, DATABASE_4));
}
@Test
+ @Transactional
public void findById_succeeds() throws DatabaseNotFoundException {
/* test */
@@ -103,19 +95,45 @@ public class DatabaseServicePersistenceTest extends AbstractUnitTest {
}
@Test
- public void updateTableMetadata_succeeds() throws SearchServiceException, MalformedException, ServiceException,
- QueryNotFoundException, DatabaseNotFoundException, ServiceConnectionException,
- SearchServiceConnectionException {
-
- /* mock */
- when(dataServiceGateway.getTableSchemas(DATABASE_1_ID))
- .thenReturn(List.of(TABLE_5_DTO));
- when(searchServiceGateway.update(any(Database.class)))
- .thenReturn(DATABASE_1_DTO); /* ignored */
+ @Transactional
+ public void findByInternalName_succeeds() throws DatabaseNotFoundException {
/* test */
- final Database response = databaseService.updateTableMetadata(DATABASE_1);
- log.debug("");
+ final Database response = databaseService.findByInternalName(DATABASE_1_INTERNALNAME);
+ assertEquals(DATABASE_1_ID, response.getId());
+ assertEquals(CONTAINER_1_ID, response.getCid());
+ /* container */
+ assertNotNull(response.getContainer());
+ assertEquals(CONTAINER_1_ID, response.getContainer().getId());
+ assertEquals(CONTAINER_1_NAME, response.getContainer().getName());
+ assertEquals(CONTAINER_1_INTERNALNAME, response.getContainer().getInternalName());
+ assertEquals(CONTAINER_1_HOST, response.getContainer().getHost());
+ assertEquals(CONTAINER_1_PORT, response.getContainer().getPort());
+ assertEquals(CONTAINER_1_UI_HOST, response.getContainer().getUiHost());
+ assertEquals(CONTAINER_1_UI_PORT, response.getContainer().getUiPort());
+ assertEquals(CONTAINER_1_UI_ADDITIONAL_FLAGS, response.getContainer().getUiAdditionalFlags());
+ assertEquals(CONTAINER_1_SIDECAR_HOST, response.getContainer().getSidecarHost());
+ assertEquals(CONTAINER_1_SIDECAR_PORT, response.getContainer().getSidecarPort());
+ assertEquals(CONTAINER_1_PRIVILEGED_USERNAME, response.getContainer().getPrivilegedUsername());
+ assertEquals(CONTAINER_1_PRIVILEGED_PASSWORD, response.getContainer().getPrivilegedPassword());
+ assertNotNull(response.getContainer().getImage());
+ assertEquals(IMAGE_1_NAME, response.getContainer().getImage().getName());
+ assertEquals(IMAGE_1_VERSION, response.getContainer().getImage().getVersion());
+ assertEquals(IMAGE_1_DIALECT, response.getContainer().getImage().getDialect());
+ assertEquals(IMAGE_1_JDBC, response.getContainer().getImage().getJdbcMethod());
+ assertEquals(IMAGE_1_DRIVER, response.getContainer().getImage().getDriverClass());
+ assertEquals(IMAGE_1_REGISTRY, response.getContainer().getImage().getRegistry());
+ assertEquals(IMAGE_1_PORT, response.getContainer().getImage().getDefaultPort());
+ assertNotNull(response.getContainer().getImage().getDateFormats());
+ assertEquals(4, response.getContainer().getImage().getDateFormats().size());
+ /* creator */
+ assertNotNull(response.getCreator());
+ assertEquals(USER_1_ID, response.getCreator().getId());
+ assertEquals(USER_1_USERNAME, response.getCreator().getUsername());
+ assertEquals(USER_1_EMAIL, response.getCreator().getEmail());
+ assertEquals(USER_1_THEME, response.getCreator().getTheme());
+ assertEquals(USER_1_LANGUAGE, response.getCreator().getLanguage());
+ assertNotNull(response.getCreator().getAccesses());
}
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
index 6c6357aaf63aeed98a6649f68c47bb63ae62946d..ea58ae16e4ac35931bb5f713b197bacdc37b6958 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
@@ -11,7 +11,6 @@ import at.tuwien.gateway.DataServiceGateway;
import at.tuwien.gateway.SearchServiceGateway;
import at.tuwien.repository.ContainerRepository;
import at.tuwien.repository.DatabaseRepository;
-import at.tuwien.service.impl.DatabaseServiceImpl;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -162,33 +161,35 @@ public class DatabaseServiceUnitTest extends AbstractUnitTest {
}
@Test
- public void create_dataServiceError_fails() throws ServiceException, ServiceConnectionException {
+ public void create_dataServiceError_fails() throws DataServiceException, DataServiceConnectionException,
+ DatabaseNotFoundException {
/* mock */
when(containerRepository.findById(DATABASE_1.getCid()))
.thenReturn(Optional.of(CONTAINER_1));
- doThrow(ServiceException.class)
+ doThrow(DataServiceException.class)
.when(dataServiceGateway)
.createDatabase(any(CreateDatabaseDto.class));
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(DataServiceException.class, () -> {
generic_create(DATABASE_1_CREATE, DATABASE_1);
});
}
@Test
- public void create_dataServiceConnection_fails() throws ServiceException, ServiceConnectionException {
+ public void create_dataServiceConnection_fails() throws DataServiceException, DataServiceConnectionException,
+ DatabaseNotFoundException {
/* mock */
when(containerRepository.findById(DATABASE_1.getCid()))
.thenReturn(Optional.of(CONTAINER_1));
- doThrow(ServiceConnectionException.class)
+ doThrow(DataServiceConnectionException.class)
.when(dataServiceGateway)
.createDatabase(any(CreateDatabaseDto.class));
/* test */
- assertThrows(ServiceConnectionException.class, () -> {
+ assertThrows(DataServiceConnectionException.class, () -> {
generic_create(DATABASE_1_CREATE, DATABASE_1);
});
}
@@ -303,8 +304,8 @@ public class DatabaseServiceUnitTest extends AbstractUnitTest {
/* ## GENERIC TEST CASES ## */
/* ################################################################################################### */
- protected Database generic_create(DatabaseCreateDto createDto, Database database) throws ServiceException,
- ServiceConnectionException, UserNotFoundException, DatabaseNotFoundException,
+ protected Database generic_create(DatabaseCreateDto createDto, Database database) throws DataServiceException,
+ DataServiceConnectionException, UserNotFoundException, DatabaseNotFoundException,
ContainerNotFoundException, SearchServiceException, SearchServiceConnectionException {
/* mock */
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServicePersistenceTest.java
index efba7075d9d94e558e4b595a79d6558d8f886755..6b3ff624b0e5ebf47757824f645e4a120e43b243 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServicePersistenceTest.java
@@ -1,7 +1,10 @@
package at.tuwien.service;
import at.tuwien.entities.database.License;
-import at.tuwien.repository.*;
+import at.tuwien.repository.ContainerRepository;
+import at.tuwien.repository.DatabaseRepository;
+import at.tuwien.repository.LicenseRepository;
+import at.tuwien.repository.UserRepository;
import at.tuwien.test.AbstractUnitTest;
import at.tuwien.api.database.query.QueryDto;
import at.tuwien.api.identifier.BibliographyTypeDto;
@@ -36,7 +39,6 @@ import static org.mockito.Mockito.when;
@Log4j2
@SpringBootTest
-@Disabled("keep failing on CI but works locally")
@ExtendWith(SpringExtension.class)
@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
public class IdentifierServicePersistenceTest extends AbstractUnitTest {
@@ -151,9 +153,9 @@ public class IdentifierServicePersistenceTest extends AbstractUnitTest {
}
@Test
- public void save_database_succeeds() throws ServiceException, ServiceConnectionException, MalformedException,
- DatabaseNotFoundException, IdentifierNotFoundException, ViewNotFoundException, QueryNotFoundException,
- SearchServiceException, SearchServiceConnectionException {
+ public void save_database_succeeds() throws DataServiceException, DataServiceConnectionException,
+ MalformedException, DatabaseNotFoundException, IdentifierNotFoundException, ViewNotFoundException,
+ QueryNotFoundException, SearchServiceException, SearchServiceConnectionException, ExternalServiceException {
/* mock */
when(restTemplate.exchange(anyString(), any(HttpMethod.class), any(HttpEntity.class), eq(QueryDto.class)))
@@ -165,9 +167,9 @@ public class IdentifierServicePersistenceTest extends AbstractUnitTest {
}
@Test
- public void save_existsSubset_succeeds() throws ServiceException, ServiceConnectionException, MalformedException,
- DatabaseNotFoundException, IdentifierNotFoundException, ViewNotFoundException, QueryNotFoundException,
- SearchServiceException, SearchServiceConnectionException {
+ public void save_existsSubset_succeeds() throws DataServiceException, DataServiceConnectionException,
+ MalformedException, DatabaseNotFoundException, IdentifierNotFoundException, ViewNotFoundException,
+ QueryNotFoundException, SearchServiceException, SearchServiceConnectionException, ExternalServiceException {
/* mock */
when(dataServiceGateway.findQuery(IDENTIFIER_5_DATABASE_ID, IDENTIFIER_5_QUERY_ID))
@@ -180,9 +182,10 @@ public class IdentifierServicePersistenceTest extends AbstractUnitTest {
}
@Test
- public void save_existsDatabase_succeeds() throws MalformedException, ServiceException,
- ServiceConnectionException, DatabaseNotFoundException, IdentifierNotFoundException, ViewNotFoundException,
- QueryNotFoundException, SearchServiceException, SearchServiceConnectionException {
+ public void save_existsDatabase_succeeds() throws MalformedException, DataServiceException,
+ DataServiceConnectionException, DatabaseNotFoundException, IdentifierNotFoundException,
+ ViewNotFoundException, QueryNotFoundException, SearchServiceException, SearchServiceConnectionException,
+ ExternalServiceException {
/* test */
identifierService.save(DATABASE_1, USER_1, IDENTIFIER_1_SAVE_DTO);
@@ -276,8 +279,9 @@ public class IdentifierServicePersistenceTest extends AbstractUnitTest {
}
@Test
- public void delete_succeeds() throws ServiceException, ServiceConnectionException, DatabaseNotFoundException,
- IdentifierNotFoundException, SearchServiceException, SearchServiceConnectionException {
+ public void delete_succeeds() throws DataServiceException, DataServiceConnectionException,
+ DatabaseNotFoundException, IdentifierNotFoundException, SearchServiceException,
+ SearchServiceConnectionException {
/* mock */
when(searchServiceGateway.update(any(Database.class)))
@@ -297,9 +301,9 @@ public class IdentifierServicePersistenceTest extends AbstractUnitTest {
@Test
@Transactional
- public void save_subsetRelatedIdentifiers_succeeds() throws ServiceException, ServiceConnectionException,
+ public void save_subsetRelatedIdentifiers_succeeds() throws DataServiceException, DataServiceConnectionException,
MalformedException, DatabaseNotFoundException, IdentifierNotFoundException, ViewNotFoundException,
- QueryNotFoundException, SearchServiceException, SearchServiceConnectionException {
+ QueryNotFoundException, SearchServiceException, SearchServiceConnectionException, ExternalServiceException {
/* mock */
when(dataServiceGateway.findQuery(IDENTIFIER_5_DATABASE_ID, IDENTIFIER_5_QUERY_ID))
@@ -336,9 +340,9 @@ public class IdentifierServicePersistenceTest extends AbstractUnitTest {
}
@Test
- public void save_succeeds() throws MalformedException, ServiceException, ServiceConnectionException,
+ public void save_succeeds() throws MalformedException, DataServiceException, DataServiceConnectionException,
DatabaseNotFoundException, IdentifierNotFoundException, ViewNotFoundException, QueryNotFoundException,
- SearchServiceException, SearchServiceConnectionException {
+ SearchServiceException, SearchServiceConnectionException, ExternalServiceException {
/* test */
final Identifier response = identifierService.save(DATABASE_1, USER_1, IDENTIFIER_1_SAVE_DTO);
@@ -381,9 +385,10 @@ public class IdentifierServicePersistenceTest extends AbstractUnitTest {
}
@Test
- public void save_repeatedRemoveChildren_succeeds() throws MalformedException, ServiceException, ServiceConnectionException,
- DatabaseNotFoundException, IdentifierNotFoundException, ViewNotFoundException, QueryNotFoundException,
- SearchServiceException, SearchServiceConnectionException {
+ public void save_repeatedRemoveChildren_succeeds() throws MalformedException, DataServiceException,
+ DataServiceConnectionException, DatabaseNotFoundException, IdentifierNotFoundException,
+ ViewNotFoundException, QueryNotFoundException, SearchServiceException, SearchServiceConnectionException,
+ ExternalServiceException {
/* test */
final Identifier response = identifierService.save(DATABASE_1, USER_1, IDENTIFIER_1_SAVE_MODIFY_DTO);
@@ -410,9 +415,9 @@ public class IdentifierServicePersistenceTest extends AbstractUnitTest {
}
@Test
- public void save_noRelatedTitleDescription_succeeds() throws ServiceException, ServiceConnectionException,
+ public void save_noRelatedTitleDescription_succeeds() throws DataServiceException, DataServiceConnectionException,
MalformedException, DatabaseNotFoundException, IdentifierNotFoundException, ViewNotFoundException,
- QueryNotFoundException, SearchServiceException, SearchServiceConnectionException {
+ QueryNotFoundException, SearchServiceException, SearchServiceConnectionException, ExternalServiceException {
/* test */
final Identifier response = identifierService.save(DATABASE_4, USER_4, IDENTIFIER_7_SAVE_DTO);
@@ -427,9 +432,10 @@ public class IdentifierServicePersistenceTest extends AbstractUnitTest {
}
@Test
- public void save_subsetHasDatabaseIdentifier_succeeds() throws ServiceException, ServiceConnectionException,
+ public void save_subsetHasDatabaseIdentifier_succeeds() throws DataServiceException, DataServiceConnectionException,
DatabaseNotFoundException, QueryNotFoundException, SearchServiceException, ViewNotFoundException,
- SearchServiceConnectionException, MalformedException, IdentifierNotFoundException {
+ SearchServiceConnectionException, MalformedException, IdentifierNotFoundException,
+ ExternalServiceException {
/* mock */
when(dataServiceGateway.findQuery(IDENTIFIER_2_DATABASE_ID, IDENTIFIER_2_QUERY_ID))
@@ -446,9 +452,10 @@ public class IdentifierServicePersistenceTest extends AbstractUnitTest {
}
@Test
- public void save_viewIdentifier_succeeds() throws SearchServiceException, MalformedException, ServiceException,
- QueryNotFoundException, ServiceConnectionException, DatabaseNotFoundException,
- SearchServiceConnectionException, IdentifierNotFoundException, ViewNotFoundException {
+ public void save_viewIdentifier_succeeds() throws SearchServiceException, MalformedException, DataServiceException,
+ QueryNotFoundException, DataServiceConnectionException, DatabaseNotFoundException,
+ SearchServiceConnectionException, IdentifierNotFoundException, ViewNotFoundException,
+ ExternalServiceException {
/* test */
final Identifier response = identifierService.save(DATABASE_1, USER_1, IDENTIFIER_3_SAVE_DTO);
@@ -462,9 +469,9 @@ public class IdentifierServicePersistenceTest extends AbstractUnitTest {
}
@Test
- public void create_succeeds() throws MalformedException, ServiceConnectionException, SearchServiceException,
- ServiceException, QueryNotFoundException, DatabaseNotFoundException, SearchServiceConnectionException,
- IdentifierNotFoundException, ViewNotFoundException {
+ public void create_succeeds() throws MalformedException, DataServiceConnectionException, SearchServiceException,
+ DataServiceException, QueryNotFoundException, DatabaseNotFoundException, SearchServiceConnectionException,
+ IdentifierNotFoundException, ViewNotFoundException, ExternalServiceException {
/* test */
final Identifier response = identifierService.create(DATABASE_1, USER_1, IDENTIFIER_1_CREATE_DTO);
@@ -472,9 +479,10 @@ public class IdentifierServicePersistenceTest extends AbstractUnitTest {
}
@Test
- public void create_hasDoi_succeeds() throws SearchServiceException, MalformedException, ServiceException,
- QueryNotFoundException, ServiceConnectionException, DatabaseNotFoundException,
- SearchServiceConnectionException, IdentifierNotFoundException, ViewNotFoundException {
+ public void create_hasDoi_succeeds() throws SearchServiceException, MalformedException, DataServiceException,
+ QueryNotFoundException, DataServiceConnectionException, DatabaseNotFoundException,
+ SearchServiceConnectionException, IdentifierNotFoundException, ViewNotFoundException,
+ ExternalServiceException {
/* test */
final Identifier response = identifierService.create(DATABASE_1, USER_1, IDENTIFIER_1_CREATE_WITH_DOI_DTO);
@@ -483,8 +491,9 @@ public class IdentifierServicePersistenceTest extends AbstractUnitTest {
}
@Test
- public void publish_succeeds() throws MalformedException, ServiceConnectionException, SearchServiceException,
- DatabaseNotFoundException, SearchServiceConnectionException, IdentifierNotFoundException {
+ public void publish_succeeds() throws MalformedException, DataServiceConnectionException, SearchServiceException,
+ DatabaseNotFoundException, SearchServiceConnectionException, IdentifierNotFoundException,
+ ExternalServiceException {
/* test */
final Identifier response = identifierService.publish(IDENTIFIER_7_ID);
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/StorageServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/StorageServiceIntegrationTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..5ef5f9742bbfdcc8c5ab21360ca926fd61261244
--- /dev/null
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/StorageServiceIntegrationTest.java
@@ -0,0 +1,139 @@
+package at.tuwien.service;
+
+import at.tuwien.config.S3Config;
+import at.tuwien.exception.*;
+import at.tuwien.test.AbstractUnitTest;
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.testcontainers.containers.MinIOContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+
+import java.io.File;
+import java.io.InputStream;
+import java.sql.SQLException;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+@Log4j2
+@Testcontainers
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
+@SpringBootTest
+@ExtendWith(SpringExtension.class)
+public class StorageServiceIntegrationTest extends AbstractUnitTest {
+
+ @Autowired
+ private StorageService storageService;
+
+ @Autowired
+ private S3Client s3Client;
+
+ @Autowired
+ private S3Config s3Config;
+
+ @Container
+ private static final MinIOContainer minIOContainer = new MinIOContainer("minio/minio:RELEASE.2024-06-06T09-36-42Z");
+
+ @DynamicPropertySource
+ static void dynamicProperties(DynamicPropertyRegistry registry) {
+ registry.add("dbrepo.endpoints.storageService", minIOContainer::getS3URL);
+ }
+
+ @BeforeEach
+ public void beforeEach() throws SQLException {
+ genesis();
+ /* s3 */
+ if (s3Client.listBuckets().buckets().stream().noneMatch(b -> b.name().equals(s3Config.getS3Bucket()))) {
+ s3Client.createBucket(CreateBucketRequest.builder()
+ .bucket(s3Config.getS3Bucket())
+ .build());
+ }
+ if (s3Client.listBuckets().buckets().stream().noneMatch(b -> b.name().equals(s3Config.getS3Bucket()))) {
+ s3Client.createBucket(CreateBucketRequest.builder()
+ .bucket(s3Config.getS3Bucket())
+ .build());
+ }
+ }
+
+ @Test
+ public void getObject_succeeds() throws StorageUnavailableException, StorageNotFoundException {
+ final String key = "s3key";
+
+ /* mock */
+ log.trace("mock object with key {} to bucket {}", key, s3Config.getS3Bucket());
+ s3Client.putObject(PutObjectRequest.builder()
+ .key(key)
+ .bucket(s3Config.getS3Bucket())
+ .build(), RequestBody.fromFile(new File("src/test/resources/csv/keyboard.csv")));
+
+ /* test */
+ final InputStream response = storageService.getObject(s3Config.getS3Bucket(), key);
+ assertNotNull(response);
+ }
+
+ @Test
+ public void getObject_notFound_fails() {
+
+ /* test */
+ assertThrows(StorageNotFoundException.class, () -> {
+ storageService.getObject(s3Config.getS3Bucket(), "i_do_not_exist");
+ });
+ }
+
+ @Test
+ public void getObject_bucketNotFound_fails() {
+
+ /* test */
+ assertThrows(StorageUnavailableException.class, () -> {
+ storageService.getObject("i_do_not_exist", "i_do_neither");
+ });
+ }
+
+ @Test
+ public void getBytes_succeeds() throws StorageUnavailableException, StorageNotFoundException {
+ final String key = "s3key";
+
+ /* mock */
+ log.trace("mock object with key {} to bucket {}", key, s3Config.getS3Bucket());
+ s3Client.putObject(PutObjectRequest.builder()
+ .key(key)
+ .bucket(s3Config.getS3Bucket())
+ .build(), RequestBody.fromFile(new File("src/test/resources/csv/keyboard.csv")));
+
+ /* test */
+ final byte[] response = storageService.getBytes(key);
+ assertNotNull(response);
+ }
+
+ @Test
+ public void getBytes_notExists_fails() {
+
+ /* test */
+ assertThrows(StorageNotFoundException.class, () -> {
+ storageService.getBytes("i_do_not_exist");
+ });
+ }
+
+ @Test
+ public void getBytes_bucketNotExists_fails() {
+
+ /* test */
+ assertThrows(StorageUnavailableException.class, () -> {
+ storageService.getBytes("i_do_not_exist", "i_do_neither");
+ });
+ }
+
+}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServicePersistenceTest.java
index 24536a9ca56a9686e13905a46d7326d4863fa6c7..e66d35d8ea0d8b0f9aff850cf4baf880e4240c12 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServicePersistenceTest.java
@@ -14,11 +14,13 @@ import at.tuwien.entities.database.table.constraints.unique.Unique;
import at.tuwien.exception.*;
import at.tuwien.gateway.DataServiceGateway;
import at.tuwien.gateway.SearchServiceGateway;
-import at.tuwien.repository.*;
+import at.tuwien.repository.ContainerRepository;
+import at.tuwien.repository.DatabaseRepository;
+import at.tuwien.repository.LicenseRepository;
+import at.tuwien.repository.UserRepository;
import at.tuwien.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +34,6 @@ import java.util.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.*;
@Log4j2
@@ -77,7 +78,7 @@ public class TableServicePersistenceTest extends AbstractUnitTest {
@Test
@Transactional
- public void create_succeeds() throws MalformedException, ServiceException, ServiceConnectionException,
+ public void create_succeeds() throws MalformedException, DataServiceException, DataServiceConnectionException,
UserNotFoundException, TableNotFoundException, DatabaseNotFoundException, TableExistsException, SearchServiceException, SearchServiceConnectionException, OntologyNotFoundException, SemanticEntityNotFoundException {
final TableCreateDto request = TableCreateDto.builder()
.name("New Table")
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
index c16a4191f90cdf1a3228bad5879a40f375abe409..59419f9bad37d26687342c51da6155463d674e87 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
@@ -8,11 +8,9 @@ import at.tuwien.api.database.table.constraints.foreign.ForeignKeyCreateDto;
import at.tuwien.entities.database.table.columns.TableColumnType;
import at.tuwien.entities.database.table.constraints.Constraints;
import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.api.database.table.columns.concepts.ColumnSemanticsUpdateDto;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.table.Table;
import at.tuwien.entities.database.table.columns.TableColumn;
-import at.tuwien.entities.database.table.columns.TableColumnConcept;
import at.tuwien.exception.*;
import at.tuwien.gateway.DataServiceGateway;
import at.tuwien.gateway.SearchServiceGateway;
@@ -117,9 +115,9 @@ public class TableServiceUnitTest extends AbstractUnitTest {
}
@Test
- public void createTable_succeeds() throws ServiceException, ServiceConnectionException, UserNotFoundException,
- TableNotFoundException, DatabaseNotFoundException, TableExistsException, SearchServiceException,
- SearchServiceConnectionException, MalformedException, OntologyNotFoundException,
+ public void createTable_succeeds() throws DataServiceException, DataServiceConnectionException,
+ UserNotFoundException, TableNotFoundException, DatabaseNotFoundException, TableExistsException,
+ SearchServiceException, SearchServiceConnectionException, MalformedException, OntologyNotFoundException,
SemanticEntityNotFoundException {
/* mock */
@@ -139,10 +137,10 @@ public class TableServiceUnitTest extends AbstractUnitTest {
}
@Test
- public void createTable_nonStandardColumnNames_succeeds() throws ServiceException, ServiceConnectionException,
- UserNotFoundException, TableNotFoundException, DatabaseNotFoundException, TableExistsException,
- SearchServiceException, SearchServiceConnectionException, MalformedException, OntologyNotFoundException,
- SemanticEntityNotFoundException {
+ public void createTable_nonStandardColumnNames_succeeds() throws DataServiceException,
+ DataServiceConnectionException, UserNotFoundException, TableNotFoundException, DatabaseNotFoundException,
+ TableExistsException, SearchServiceException, SearchServiceConnectionException, MalformedException,
+ OntologyNotFoundException, SemanticEntityNotFoundException {
final TableCreateDto request = TableCreateDto.builder()
.name("New Table")
.description("A wonderful table")
@@ -174,35 +172,27 @@ public class TableServiceUnitTest extends AbstractUnitTest {
final Table response = tableService.createTable(DATABASE_1, request, USER_1_PRINCIPAL);
assertEquals("New Table", response.getName());
assertEquals("new_table", response.getInternalName());
- assertEquals(2, response.getColumns().size());
+ assertEquals(1, response.getColumns().size());
/* columns */
final TableColumn column0 = response.getColumns().get(0);
- assertEquals("id", column0.getName());
- assertEquals("id", column0.getInternalName());
- assertEquals(TableColumnType.BIGINT, column0.getColumnType());
- assertFalse(column0.getIsNullAllowed());
- assertTrue(column0.getAutoGenerated());
- final TableColumn column1 = response.getColumns().get(1);
- assertEquals("I Am Späshül", column1.getName());
- assertEquals("i_am_spashul", column1.getInternalName());
- assertEquals(TableColumnType.TEXT, column1.getColumnType());
- assertTrue(column1.getIsNullAllowed());
- assertFalse(column1.getAutoGenerated());
+ assertEquals("I Am Späshül", column0.getName());
+ assertEquals("i_am_spa_shu_l", column0.getInternalName());
+ assertEquals(TableColumnType.TEXT, column0.getColumnType());
+ assertTrue(column0.getIsNullAllowed());
+ assertFalse(column0.getAutoGenerated());
/* constraints */
final Constraints constraints = response.getConstraints();
- assertEquals(1, constraints.getPrimaryKey().size());
- assertEquals(column0.getName(), constraints.getPrimaryKey().get(0).getColumn().getName());
- assertEquals(column0.getInternalName(), constraints.getPrimaryKey().get(0).getColumn().getInternalName());
+ assertEquals(0, constraints.getPrimaryKey().size());
assertEquals(1, constraints.getUniques().get(0).getColumns().size());
assertNotNull(constraints.getUniques().get(0).getName());
- assertEquals(column1.getName(), constraints.getUniques().get(0).getColumns().get(0).getName());
- assertEquals(column1.getInternalName(), constraints.getUniques().get(0).getColumns().get(0).getInternalName());
+ assertEquals(column0.getName(), constraints.getUniques().get(0).getColumns().get(0).getName());
+ assertEquals(column0.getInternalName(), constraints.getUniques().get(0).getColumns().get(0).getInternalName());
assertEquals(0, constraints.getChecks().size());
assertEquals(0, constraints.getForeignKeys().size());
}
@Test
- public void createTable_dateFormatNotFound_fails() throws ServiceException, ServiceConnectionException,
+ public void createTable_dateFormatNotFound_fails() throws DataServiceException, DataServiceConnectionException,
UserNotFoundException, DatabaseNotFoundException, TableExistsException, SearchServiceException,
SearchServiceConnectionException {
final TableCreateDto request = TableCreateDto.builder()
@@ -240,7 +230,7 @@ public class TableServiceUnitTest extends AbstractUnitTest {
}
@Test
- public void create_succeeds() throws MalformedException, ServiceException, ServiceConnectionException,
+ public void create_succeeds() throws MalformedException, DataServiceException, DataServiceConnectionException,
UserNotFoundException, TableNotFoundException, DatabaseNotFoundException, TableExistsException,
SearchServiceException, SearchServiceConnectionException, OntologyNotFoundException,
SemanticEntityNotFoundException {
@@ -262,31 +252,7 @@ public class TableServiceUnitTest extends AbstractUnitTest {
}
@Test
- @Transactional
- public void update_succeeds() throws ServiceException, ServiceConnectionException, DatabaseNotFoundException,
- SearchServiceException, SearchServiceConnectionException, MalformedException, OntologyNotFoundException,
- SemanticEntityNotFoundException {
- final ColumnSemanticsUpdateDto request = ColumnSemanticsUpdateDto.builder()
- .conceptUri(CONCEPT_1_URI)
- .build();
-
- /* mock */
- when(ontologyService.find(anyString()))
- .thenReturn(ONTOLOGY_2);
- when(ontologyService.findAll())
- .thenReturn(List.of(ONTOLOGY_1, ONTOLOGY_2, ONTOLOGY_3, ONTOLOGY_4, ONTOLOGY_5));
- when(searchServiceGateway.update(any(Database.class)))
- .thenReturn(DATABASE_1_DTO);
-
- /* test */
- final TableColumn response = tableService.update(TABLE_1_COLUMNS.get(0), request);
- assertNotNull(response.getConcept());
- final TableColumnConcept concept = response.getConcept();
- assertEquals(CONCEPT_1_URI, concept.getUri());
- }
-
- @Test
- public void create_dataServiceError_fails() throws ServiceException, ServiceConnectionException,
+ public void create_dataServiceError_fails() throws DataServiceException, DataServiceConnectionException,
UserNotFoundException, DatabaseNotFoundException, TableExistsException, SearchServiceException,
SearchServiceConnectionException {
@@ -295,14 +261,14 @@ public class TableServiceUnitTest extends AbstractUnitTest {
.thenReturn(USER_1);
when(databaseRepository.save(any(Database.class)))
.thenReturn(DATABASE_1);
- doThrow(ServiceException.class)
+ doThrow(DataServiceException.class)
.when(dataServiceGateway)
.createTable(DATABASE_1_ID, TABLE_5_CREATE_DTO);
when(searchServiceGateway.update(any(Database.class)))
.thenReturn(DATABASE_1_DTO);
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(DataServiceException.class, () -> {
tableService.createTable(DATABASE_1, TABLE_5_CREATE_DTO, USER_1_PRINCIPAL);
});
}
@@ -388,8 +354,9 @@ public class TableServiceUnitTest extends AbstractUnitTest {
@Test
@Transactional
- public void delete_succeeds() throws ServiceException, ServiceConnectionException, DatabaseNotFoundException,
- TableNotFoundException, SearchServiceException, SearchServiceConnectionException {
+ public void delete_succeeds() throws DataServiceException, DataServiceConnectionException,
+ DatabaseNotFoundException, TableNotFoundException, SearchServiceException,
+ SearchServiceConnectionException {
/* mock */
doNothing()
@@ -404,7 +371,7 @@ public class TableServiceUnitTest extends AbstractUnitTest {
@Test
@Transactional
- public void delete_hasIdentifier_succeeds() throws ServiceException, ServiceConnectionException,
+ public void delete_hasIdentifier_succeeds() throws DataServiceException, DataServiceConnectionException,
DatabaseNotFoundException, TableNotFoundException, SearchServiceException, SearchServiceConnectionException {
/* mock */
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UnitServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UnitServiceUnitTest.java
index 4b78ae76b43c1bc634a2194657e7c62905936e66..67b396c66015ca66f392fbd424c0c94daa717a69 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UnitServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UnitServiceUnitTest.java
@@ -1,9 +1,9 @@
package at.tuwien.service;
+import at.tuwien.repository.UnitRepository;
import at.tuwien.test.AbstractUnitTest;
import at.tuwien.entities.database.table.columns.TableColumnUnit;
import at.tuwien.exception.UnitNotFoundException;
-import at.tuwien.repository.*;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServicePersistenceTest.java
index 64e305febd96b44f293a7dd2ac7b6662d651cfc3..09a372a6eb3ca23bb0539b8a1be4a648a1bff9a1 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServicePersistenceTest.java
@@ -17,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.testcontainers.junit.jupiter.Testcontainers;
import java.util.List;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
index ddf44b890beb6292c5456f04c967215bfd915fbc..5becb9225a42db3ab451dc054663e811e7c71629 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
@@ -72,7 +72,8 @@ public class UserServiceUnitTest extends AbstractUnitTest {
@Test
public void create_succeeds() throws UserNotFoundException, UserExistsException, EmailExistsException,
- ServiceException, ServiceConnectionException {
+ DataServiceException, DataServiceConnectionException, AuthServiceException, AuthServiceConnectionException,
+ CredentialsInvalidException {
/* mock */
when(userRepository.findById(USER_1_ID))
@@ -107,7 +108,8 @@ public class UserServiceUnitTest extends AbstractUnitTest {
}
@Test
- public void updatePassword_succeeds() throws ServiceException, ServiceConnectionException {
+ public void updatePassword_succeeds() throws AuthServiceException, AuthServiceConnectionException,
+ UserNotFoundException {
/* mock */
doNothing()
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java
index fc83d3a650b5642bbe0e8cdc252e95ef59c9dcf5..e23320017c54592662f42b24c3eb7039a3f1a540 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java
@@ -79,7 +79,7 @@ public class ViewServicePersistenceTest extends AbstractUnitTest {
}
@Test
- public void delete_succeeds() throws SearchServiceException, ServiceException, ServiceConnectionException,
+ public void delete_succeeds() throws SearchServiceException, DataServiceException, DataServiceConnectionException,
DatabaseNotFoundException, SearchServiceConnectionException, ViewNotFoundException {
/* mock */
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceUnitTest.java
index da345658ef9897deba1486fc4b9d009823c3e459..cd9fe03c655d33b014239af4f05f0f0ae9b6d1e9 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceUnitTest.java
@@ -1,5 +1,6 @@
package at.tuwien.service;
+import at.tuwien.repository.DatabaseRepository;
import at.tuwien.test.AbstractUnitTest;
import at.tuwien.api.database.ViewCreateDto;
import at.tuwien.entities.database.Database;
@@ -7,7 +8,6 @@ import at.tuwien.entities.database.View;
import at.tuwien.exception.*;
import at.tuwien.gateway.DataServiceGateway;
import at.tuwien.gateway.SearchServiceGateway;
-import at.tuwien.repository.*;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -48,7 +48,7 @@ public class ViewServiceUnitTest extends AbstractUnitTest {
}
@Test
- public void create_succeeds() throws MalformedException, ServiceException, ServiceConnectionException,
+ public void create_succeeds() throws MalformedException, DataServiceException, DataServiceConnectionException,
DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException {
final ViewCreateDto request = ViewCreateDto.builder()
.name(VIEW_1_NAME)
@@ -107,8 +107,8 @@ public class ViewServiceUnitTest extends AbstractUnitTest {
}
@Test
- public void delete_succeeds() throws ServiceException, ServiceConnectionException, DatabaseNotFoundException,
- ViewNotFoundException, SearchServiceException, SearchServiceConnectionException {
+ public void delete_succeeds() throws DataServiceException, DataServiceConnectionException,
+ DatabaseNotFoundException, ViewNotFoundException, SearchServiceException, SearchServiceConnectionException {
/* mock */
doNothing()
@@ -124,37 +124,37 @@ public class ViewServiceUnitTest extends AbstractUnitTest {
}
@Test
- public void delete_dataServiceException_fails() throws ServiceException, ServiceConnectionException,
+ public void delete_dataServiceException_fails() throws DataServiceException, DataServiceConnectionException,
ViewNotFoundException {
/* mock */
- doThrow(ServiceException.class)
+ doThrow(DataServiceException.class)
.when(dataServiceGateway)
.deleteView(DATABASE_1_ID, VIEW_1_ID);
/* test */
- assertThrows(ServiceException.class, () -> {
+ assertThrows(DataServiceException.class, () -> {
viewService.delete(VIEW_1);
});
}
@Test
- public void delete_dataServiceConnection_fails() throws ServiceException, ServiceConnectionException,
+ public void delete_dataServiceConnection_fails() throws DataServiceException, DataServiceConnectionException,
ViewNotFoundException {
/* mock */
- doThrow(ServiceConnectionException.class)
+ doThrow(DataServiceConnectionException.class)
.when(dataServiceGateway)
.deleteView(DATABASE_1_ID, VIEW_1_ID);
/* test */
- assertThrows(ServiceConnectionException.class, () -> {
+ assertThrows(DataServiceConnectionException.class, () -> {
viewService.delete(VIEW_1);
});
}
@Test
- public void delete_searchServiceError_fails() throws ServiceException, ServiceConnectionException,
+ public void delete_searchServiceError_fails() throws DataServiceException, DataServiceConnectionException,
ViewNotFoundException, DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException {
/* mock */
@@ -174,7 +174,7 @@ public class ViewServiceUnitTest extends AbstractUnitTest {
}
@Test
- public void delete_searchServiceConnection_fails() throws ServiceException, ServiceConnectionException,
+ public void delete_searchServiceConnection_fails() throws DataServiceException, DataServiceConnectionException,
DatabaseNotFoundException, ViewNotFoundException, SearchServiceException, SearchServiceConnectionException {
/* mock */
@@ -194,7 +194,7 @@ public class ViewServiceUnitTest extends AbstractUnitTest {
}
@Test
- public void delete_searchServiceNotFound_fails() throws ServiceException, ServiceConnectionException,
+ public void delete_searchServiceNotFound_fails() throws DataServiceException, DataServiceConnectionException,
ViewNotFoundException, DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException {
/* mock */
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/utils/AmqpUtils.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/utils/AmqpUtils.java
index a0588a6e1b118f206e8fb17c3507dcdb4efacaad..df86598714d65600e0dc79b5f6a3048fb3df16b5 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/utils/AmqpUtils.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/utils/AmqpUtils.java
@@ -1,18 +1,22 @@
package at.tuwien.utils;
import at.tuwien.api.amqp.*;
+import at.tuwien.test.BaseTest;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.codec.binary.Base64;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
+import org.springframework.http.client.support.BasicAuthenticationInterceptor;
import org.springframework.stereotype.Service;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.DefaultUriBuilderFactory;
import java.nio.charset.Charset;
import java.util.Arrays;
@@ -20,13 +24,17 @@ import java.util.List;
import java.util.stream.Collectors;
@Log4j2
-@Service
-public class AmqpUtils {
+public class AmqpUtils extends BaseTest {
+
+ private static final String BASIC_AUTH = new String(Base64.encodeBase64((USER_1_USERNAME + ":" + USER_1_PASSWORD).getBytes(Charset.defaultCharset())));
private final RestTemplate restTemplate;
- @Autowired
- public AmqpUtils(@Qualifier("brokerRestTemplate") RestTemplate restTemplate) {
+ public AmqpUtils(String endpoint) {
+ final RestTemplate restTemplate = new RestTemplate();
+ restTemplate.setUriTemplateHandler(new DefaultUriBuilderFactory(endpoint));
+ restTemplate.getInterceptors()
+ .add(new BasicAuthenticationInterceptor(USER_1_USERNAME, USER_1_PASSWORD));
this.restTemplate = restTemplate;
}
@@ -97,10 +105,10 @@ public class AmqpUtils {
public void setVirtualHostPermissions(String vhost, String username, GrantVirtualHostPermissionsDto data) {
final String url = "/api/permissions/" + vhost + "/" + username;
- log.debug("set virtual host permissions: {}", url);
log.trace("body: {}", data);
final MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
- headers.add("Authentication", "Basic " + new String(Base64.encodeBase64("guest:guest".getBytes(Charset.defaultCharset()))));
+ headers.add("Authentication", "Basic " + BASIC_AUTH);
+ log.trace("set virtual host permissions: {}", url);
final ResponseEntity<Void> response = restTemplate.exchange(url, HttpMethod.PUT, new HttpEntity<>(data, headers), Void.class);
if (!response.getStatusCode().equals(HttpStatus.CREATED) && !response.getStatusCode().equals(HttpStatus.NO_CONTENT)) {
log.error("Failed to set virtual host permissions: {}", response.getStatusCode());
@@ -113,7 +121,7 @@ public class AmqpUtils {
log.debug("set topic permissions: {}", url);
log.trace("body: {}", data);
final MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
- headers.add("Authentication", "Basic " + new String(Base64.encodeBase64("guest:guest".getBytes(Charset.defaultCharset()))));
+ headers.add("Authentication", "Basic " + BASIC_AUTH);
final ResponseEntity<Void> response = restTemplate.exchange(url, HttpMethod.PUT, new HttpEntity<>(data, headers), Void.class);
if (!response.getStatusCode().equals(HttpStatus.CREATED) && !response.getStatusCode().equals(HttpStatus.NO_CONTENT)) {
log.error("Failed to set topic permissions: {}", response.getStatusCode());
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/config/H2Utils.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/utils/H2Utils.java
similarity index 97%
rename from dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/config/H2Utils.java
rename to dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/utils/H2Utils.java
index 033d1ba280c7224f447ec99ded6850dbd38a38e9..7c80d5274a386031276fdb48eab6eaa3e2989024 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/config/H2Utils.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/utils/H2Utils.java
@@ -1,4 +1,4 @@
-package at.tuwien.config;
+package at.tuwien.utils;
import jakarta.persistence.EntityManager;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/utils/KeycloakUtils.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/utils/KeycloakUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..49694e6fd1dc49eb0f4bc8df35f1b6cd4965bf5e
--- /dev/null
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/utils/KeycloakUtils.java
@@ -0,0 +1,40 @@
+package at.tuwien.utils;
+
+import at.tuwien.api.keycloak.RoleRepresentationDto;
+import at.tuwien.exception.*;
+import at.tuwien.gateway.KeycloakGateway;
+import at.tuwien.gateway.impl.KeycloakGatewayImpl;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.*;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.HttpServerErrorException;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.List;
+import java.util.UUID;
+
+@Log4j2
+@Component
+public class KeycloakUtils {
+
+ final static UUID realmId = UUID.fromString("82c39861-d877-4667-a0f3-4daa2ee230e0");
+
+ private final KeycloakGateway keycloakGateway;
+
+ @Autowired
+ public KeycloakUtils(KeycloakGateway keycloakGateway) {
+ this.keycloakGateway = keycloakGateway;
+ }
+
+ public void deleteUser(String username) throws AuthServiceException, AuthServiceConnectionException,
+ CredentialsInvalidException {
+ try {
+ final UUID userId = keycloakGateway.findByUsername(username).getId();
+ keycloakGateway.deleteUser(userId);
+ } catch (UserNotFoundException e) {
+ /* ignore */
+ }
+ }
+}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/validator/EndpointValidatorUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/validator/EndpointValidatorUnitTest.java
index 1e5aa8227a077254112f2a9c4ec86d759d269bc7..f6cf4e887d4d25f2dfc201ae6d4d014f3b8c1547 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/validator/EndpointValidatorUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/validator/EndpointValidatorUnitTest.java
@@ -30,8 +30,7 @@ import java.util.List;
import java.util.stream.Stream;
import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.when;
@@ -173,7 +172,7 @@ public class EndpointValidatorUnitTest extends AbstractUnitTest {
DatabaseNotFoundException, AccessNotFoundException {
/* mock */
- when(databaseService.findById(DATABASE_3_ID))
+ when(databaseService.findById(anyLong()))
.thenReturn(DATABASE_3);
/* test */
@@ -181,11 +180,11 @@ public class EndpointValidatorUnitTest extends AbstractUnitTest {
}
@Test
- @Disabled("keep failing on CI but works locally")
+ @Disabled
public void validateOnlyAccessOrPublic_privateAnonymous_fails() throws DatabaseNotFoundException {
/* mock */
- when(databaseService.findById(DATABASE_1_ID))
+ when(databaseService.findById(anyLong()))
.thenReturn(DATABASE_1);
/* test */
@@ -195,7 +194,7 @@ public class EndpointValidatorUnitTest extends AbstractUnitTest {
}
@Test
- @Disabled("keep failing on CI but works locally")
+ @Disabled
public void validateOnlyAccessOrPublic_privateNoAccess_fails() throws DatabaseNotFoundException,
AccessNotFoundException {
@@ -204,7 +203,7 @@ public class EndpointValidatorUnitTest extends AbstractUnitTest {
.thenReturn(DATABASE_1);
doThrow(AccessNotFoundException.class)
.when(accessService)
- .find(eq(DATABASE_1), any(User.class));
+ .find(any(Database.class), any(User.class));
/* test */
assertThrows(AccessNotFoundException.class, () -> {
@@ -402,11 +401,11 @@ public class EndpointValidatorUnitTest extends AbstractUnitTest {
}
@Test
- @Disabled("keep failing on CI but works locally")
+ @Disabled
public void validateOnlyPrivateHasRole_privatePrincipalMissing_fails() throws DatabaseNotFoundException {
/* mock */
- when(databaseService.findById(DATABASE_1_ID))
+ when(databaseService.findById(anyLong()))
.thenReturn(DATABASE_1);
/* test */
@@ -416,11 +415,11 @@ public class EndpointValidatorUnitTest extends AbstractUnitTest {
}
@Test
- @Disabled("keep failing on CI but works locally")
+ @Disabled
public void validateOnlyPrivateHasRole_privateRoleMissing_fails() throws DatabaseNotFoundException {
/* mock */
- when(databaseService.findById(DATABASE_1_ID))
+ when(databaseService.findById(anyLong()))
.thenReturn(DATABASE_1);
/* test */
diff --git a/dbrepo-metadata-service/rest-service/src/test/resources/application.properties b/dbrepo-metadata-service/rest-service/src/test/resources/application.properties
index ef2acba64ace030e362d2a73aabd3e768c6e9551..0929175cf79929776a59fd6d27075ae6df998de6 100644
--- a/dbrepo-metadata-service/rest-service/src/test/resources/application.properties
+++ b/dbrepo-metadata-service/rest-service/src/test/resources/application.properties
@@ -5,7 +5,7 @@ spring.profiles.active=local,junit
spring.cloud.discovery.enabled=false
# internal datasource
-spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE;INIT=CREATE SCHEMA IF NOT EXISTS FDA;NON_KEYWORDS=value
+spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE;INIT=CREATE SCHEMA IF NOT EXISTS DBREPO;NON_KEYWORDS=value
spring.datasource.driverClassName=org.h2.Driver
spring.datasource.username=sa
spring.datasource.password=password
@@ -17,9 +17,17 @@ spring.jpa.hibernate.ddl-auto=create
# logging
logging.level.root=error
logging.level.at.tuwien.=trace
+logging.level.org.testcontainers.=info
+logging.level.tc.=info
+logging.level.com.github.dockerjava.=warn
+logging.level.com.github.dockerjava.zerodep.shaded.org.apache.hc.client5.http.wire.=off
# datacite
dbrepo.datacite.url: https://api.test.datacite.org
dbrepo.datacite.prefix: 10.12345
dbrepo.datacite.username: test-user
dbrepo.datacite.password: test-password
+
+# s3
+dbrepo.s3.accessKeyId=minioadmin
+dbrepo.s3.secretAccessKey=minioadmin
diff --git a/dbrepo-metadata-service/rest-service/src/test/resources/init/dbrepo-realm.json b/dbrepo-metadata-service/rest-service/src/test/resources/init/dbrepo-realm.json
index 639d73ea15fdba309347312286e71a7f0706268e..588053e15fa6d5872c4cb83da42d71859b5f7a64 100644
--- a/dbrepo-metadata-service/rest-service/src/test/resources/init/dbrepo-realm.json
+++ b/dbrepo-metadata-service/rest-service/src/test/resources/init/dbrepo-realm.json
@@ -1,1525 +1,2822 @@
-{
- "id": "4ef53018-8322-40ed-a44a-a7c5292a07be",
- "realm": "dbrepo",
- "displayName": "",
- "displayNameHtml": "",
- "notBefore": 0,
- "defaultSignatureAlgorithm": "RS256",
- "revokeRefreshToken": false,
- "refreshTokenMaxReuse": 0,
- "accessTokenLifespan": 300,
- "accessTokenLifespanForImplicitFlow": 900,
- "ssoSessionIdleTimeout": 1800,
- "ssoSessionMaxLifespan": 36000,
- "ssoSessionIdleTimeoutRememberMe": 0,
- "ssoSessionMaxLifespanRememberMe": 0,
- "offlineSessionIdleTimeout": 2592000,
- "offlineSessionMaxLifespanEnabled": false,
- "offlineSessionMaxLifespan": 5184000,
- "clientSessionIdleTimeout": 0,
- "clientSessionMaxLifespan": 0,
- "clientOfflineSessionIdleTimeout": 0,
- "clientOfflineSessionMaxLifespan": 0,
- "accessCodeLifespan": 60,
- "accessCodeLifespanUserAction": 300,
- "accessCodeLifespanLogin": 1800,
- "actionTokenGeneratedByAdminLifespan": 43200,
- "actionTokenGeneratedByUserLifespan": 300,
- "oauth2DeviceCodeLifespan": 600,
- "oauth2DevicePollingInterval": 5,
- "enabled": true,
- "sslRequired": "none",
- "registrationAllowed": false,
- "registrationEmailAsUsername": false,
- "rememberMe": false,
- "verifyEmail": false,
- "loginWithEmailAllowed": true,
- "duplicateEmailsAllowed": false,
- "resetPasswordAllowed": false,
- "editUsernameAllowed": false,
- "bruteForceProtected": false,
- "permanentLockout": false,
- "maxFailureWaitSeconds": 900,
- "minimumQuickLoginWaitSeconds": 60,
- "waitIncrementSeconds": 60,
- "quickLoginCheckMilliSeconds": 1000,
- "maxDeltaTimeSeconds": 43200,
- "failureFactor": 30,
- "defaultRole": {
- "id": "7a02acbe-09aa-4af7-8e79-fbb0cf5fd0d6",
- "name": "default-roles-dbrepo",
- "description": "${role_default-roles}",
- "composite": true,
- "clientRole": false,
- "containerId": "4ef53018-8322-40ed-a44a-a7c5292a07be"
- },
- "requiredCredentials": [
- "password"
- ],
- "otpPolicyType": "totp",
- "otpPolicyAlgorithm": "HmacSHA1",
- "otpPolicyInitialCounter": 0,
- "otpPolicyDigits": 6,
- "otpPolicyLookAheadWindow": 1,
- "otpPolicyPeriod": 30,
- "otpPolicyCodeReusable": false,
- "otpSupportedApplications": [
- "totpAppGoogleName",
- "totpAppMicrosoftAuthenticatorName",
- "totpAppFreeOTPName"
- ],
- "webAuthnPolicyRpEntityName": "keycloak",
- "webAuthnPolicySignatureAlgorithms": [
- "ES256"
- ],
- "webAuthnPolicyRpId": "",
- "webAuthnPolicyAttestationConveyancePreference": "not specified",
- "webAuthnPolicyAuthenticatorAttachment": "not specified",
- "webAuthnPolicyRequireResidentKey": "not specified",
- "webAuthnPolicyUserVerificationRequirement": "not specified",
- "webAuthnPolicyCreateTimeout": 0,
- "webAuthnPolicyAvoidSameAuthenticatorRegister": false,
- "webAuthnPolicyAcceptableAaguids": [],
- "webAuthnPolicyPasswordlessRpEntityName": "keycloak",
- "webAuthnPolicyPasswordlessSignatureAlgorithms": [
- "ES256"
- ],
- "webAuthnPolicyPasswordlessRpId": "",
- "webAuthnPolicyPasswordlessAttestationConveyancePreference": "not specified",
- "webAuthnPolicyPasswordlessAuthenticatorAttachment": "not specified",
- "webAuthnPolicyPasswordlessRequireResidentKey": "not specified",
- "webAuthnPolicyPasswordlessUserVerificationRequirement": "not specified",
- "webAuthnPolicyPasswordlessCreateTimeout": 0,
- "webAuthnPolicyPasswordlessAvoidSameAuthenticatorRegister": false,
- "webAuthnPolicyPasswordlessAcceptableAaguids": [],
- "scopeMappings": [
- {
- "clientScope": "offline_access",
- "roles": [
- "offline_access"
- ]
- }
- ],
- "clientScopes": [
- {
- "id": "4410371f-2840-458a-a496-375bd500f5fc",
- "name": "email",
- "description": "OpenID Connect built-in scope: email",
- "protocol": "openid-connect",
- "attributes": {
- "include.in.token.scope": "true",
- "display.on.consent.screen": "true",
- "consent.screen.text": "${emailScopeConsentText}"
- },
- "protocolMappers": [
- {
- "id": "7001651a-7ded-4a0f-9cb7-816b058af730",
- "name": "email",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-property-mapper",
- "consentRequired": false,
- "config": {
- "userinfo.token.claim": "true",
- "user.attribute": "email",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "email",
- "jsonType.label": "String"
- }
- },
- {
- "id": "25e4ad82-8b9b-463d-8b35-02fae44ec64c",
- "name": "email verified",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-property-mapper",
- "consentRequired": false,
- "config": {
- "userinfo.token.claim": "true",
- "user.attribute": "emailVerified",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "email_verified",
- "jsonType.label": "boolean"
- }
- }
- ]
- },
- {
- "id": "ebe0a886-5df1-48f3-9f00-a45d686b0b02",
- "name": "address",
- "description": "OpenID Connect built-in scope: address",
- "protocol": "openid-connect",
- "attributes": {
- "include.in.token.scope": "true",
- "display.on.consent.screen": "true",
- "consent.screen.text": "${addressScopeConsentText}"
- },
- "protocolMappers": [
- {
- "id": "866be669-9799-45ad-abdd-23f5d1c82293",
- "name": "address",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-address-mapper",
- "consentRequired": false,
- "config": {
- "user.attribute.formatted": "formatted",
- "user.attribute.country": "country",
- "user.attribute.postal_code": "postal_code",
- "userinfo.token.claim": "true",
- "user.attribute.street": "street",
- "id.token.claim": "true",
- "user.attribute.region": "region",
- "access.token.claim": "true",
- "user.attribute.locality": "locality"
- }
- }
- ]
- },
- {
- "id": "be0f3000-0106-4edd-a8f5-0618e3a3f7fe",
- "name": "microprofile-jwt",
- "description": "Microprofile - JWT built-in scope",
- "protocol": "openid-connect",
- "attributes": {
- "include.in.token.scope": "true",
- "display.on.consent.screen": "false"
- },
- "protocolMappers": [
- {
- "id": "093f222d-cee9-495a-81b7-ddae4b730ab2",
- "name": "groups",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-realm-role-mapper",
- "consentRequired": false,
- "config": {
- "multivalued": "true",
- "user.attribute": "foo",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "groups",
- "jsonType.label": "String"
- }
- },
- {
- "id": "2e21b9f5-c428-4a5b-9dd8-8a80bc6d9795",
- "name": "upn",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-property-mapper",
- "consentRequired": false,
- "config": {
- "userinfo.token.claim": "true",
- "user.attribute": "username",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "upn",
- "jsonType.label": "String"
- }
- }
- ]
- },
- {
- "id": "2a95813e-053d-4c20-9f2b-f7e1ad1798f5",
- "name": "role_list",
- "description": "SAML role list",
- "protocol": "saml",
- "attributes": {
- "consent.screen.text": "${samlRoleListScopeConsentText}",
- "display.on.consent.screen": "true"
- },
- "protocolMappers": [
- {
- "id": "9c8a5628-af2a-4ba4-9cad-a8ae58c8526a",
- "name": "role list",
- "protocol": "saml",
- "protocolMapper": "saml-role-list-mapper",
- "consentRequired": false,
- "config": {
- "single": "false",
- "attribute.nameformat": "Basic",
- "attribute.name": "Role"
- }
- }
- ]
- },
- {
- "id": "c6375bbe-9820-4781-8828-99020210f5bd",
- "name": "roles",
- "description": "OpenID Connect scope for add user roles to the access token",
- "protocol": "openid-connect",
- "attributes": {
- "include.in.token.scope": "false",
- "display.on.consent.screen": "true",
- "consent.screen.text": "${rolesScopeConsentText}"
- },
- "protocolMappers": [
- {
- "id": "a1db2464-4e12-4696-914d-d252263e4470",
- "name": "audience resolve",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-audience-resolve-mapper",
- "consentRequired": false,
- "config": {}
- },
- {
- "id": "c5513105-d577-4ba0-bff8-f96e9272f6fd",
- "name": "client roles",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-client-role-mapper",
- "consentRequired": false,
- "config": {
- "user.attribute": "foo",
- "access.token.claim": "true",
- "claim.name": "resource_access.${client_id}.roles",
- "jsonType.label": "String",
- "multivalued": "true"
- }
- },
- {
- "id": "66901106-8ea3-4712-8bdf-bc67da4a9d2d",
- "name": "realm roles",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-realm-role-mapper",
- "consentRequired": false,
- "config": {
- "user.attribute": "foo",
- "access.token.claim": "true",
- "claim.name": "realm_access.roles",
- "jsonType.label": "String",
- "multivalued": "true"
- }
- }
- ]
- },
- {
- "id": "f0ea8ba1-794d-4b89-9ad3-b7f390c5241e",
- "name": "phone",
- "description": "OpenID Connect built-in scope: phone",
- "protocol": "openid-connect",
- "attributes": {
- "include.in.token.scope": "true",
- "display.on.consent.screen": "true",
- "consent.screen.text": "${phoneScopeConsentText}"
- },
- "protocolMappers": [
- {
- "id": "b3789148-8427-4af8-bc03-4dd3fae4b312",
- "name": "phone number",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "userinfo.token.claim": "true",
- "user.attribute": "phoneNumber",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "phone_number",
- "jsonType.label": "String"
- }
- },
- {
- "id": "552ac5e8-6e04-47d5-8ddf-89230ca31b43",
- "name": "phone number verified",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "userinfo.token.claim": "true",
- "user.attribute": "phoneNumberVerified",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "phone_number_verified",
- "jsonType.label": "boolean"
- }
- }
- ]
- },
- {
- "id": "8ff9a2f3-582c-4cda-8ea8-d08850f8a394",
- "name": "web-origins",
- "description": "OpenID Connect scope for add allowed web origins to the access token",
- "protocol": "openid-connect",
- "attributes": {
- "include.in.token.scope": "false",
- "display.on.consent.screen": "false",
- "consent.screen.text": ""
- },
- "protocolMappers": [
- {
- "id": "52af8bfd-44b1-4b69-bfd5-bc92cf1629aa",
- "name": "allowed web origins",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-allowed-origins-mapper",
- "consentRequired": false,
- "config": {}
- }
- ]
- },
- {
- "id": "b3ebaf28-e467-4c70-b993-d7b8459dfb5a",
- "name": "profile",
- "description": "OpenID Connect built-in scope: profile",
- "protocol": "openid-connect",
- "attributes": {
- "include.in.token.scope": "true",
- "display.on.consent.screen": "true",
- "consent.screen.text": "${profileScopeConsentText}"
- },
- "protocolMappers": [
- {
- "id": "1025302a-104e-42e8-acf8-83579c21bfbb",
- "name": "family name",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-property-mapper",
- "consentRequired": false,
- "config": {
- "userinfo.token.claim": "true",
- "user.attribute": "lastName",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "family_name",
- "jsonType.label": "String"
- }
- },
- {
- "id": "70a9942e-85c1-4f15-9605-6408e0087b74",
- "name": "given name",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-property-mapper",
- "consentRequired": false,
- "config": {
- "userinfo.token.claim": "true",
- "user.attribute": "firstName",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "given_name",
- "jsonType.label": "String"
- }
- },
- {
- "id": "1e36c899-c472-427e-a024-c12a64d6084c",
- "name": "website",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "userinfo.token.claim": "true",
- "user.attribute": "website",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "website",
- "jsonType.label": "String"
- }
- },
- {
- "id": "b5e54114-79cb-488d-9e60-6a804ca3b22a",
- "name": "profile",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "userinfo.token.claim": "true",
- "user.attribute": "profile",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "profile",
- "jsonType.label": "String"
- }
- },
- {
- "id": "3e9406b9-a0ae-48d2-98b9-66ab7360b2a2",
- "name": "gender",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "userinfo.token.claim": "true",
- "user.attribute": "gender",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "gender",
- "jsonType.label": "String"
- }
- },
- {
- "id": "aec55dcc-59e7-4ea7-9eb5-55954d983fd0",
- "name": "locale",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "userinfo.token.claim": "true",
- "user.attribute": "locale",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "locale",
- "jsonType.label": "String"
- }
- },
- {
- "id": "11fd80da-8760-4fa6-9d1b-32da9df170bd",
- "name": "picture",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "userinfo.token.claim": "true",
- "user.attribute": "picture",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "picture",
- "jsonType.label": "String"
- }
- },
- {
- "id": "90f93a66-27d0-4890-846b-79d99e02ad76",
- "name": "updated at",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "userinfo.token.claim": "true",
- "user.attribute": "updatedAt",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "updated_at",
- "jsonType.label": "long"
- }
- },
- {
- "id": "6c8aa1f6-3aa2-4e48-9f9c-44cffe71e7d2",
- "name": "username",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-property-mapper",
- "consentRequired": false,
- "config": {
- "userinfo.token.claim": "true",
- "user.attribute": "username",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "preferred_username",
- "jsonType.label": "String"
- }
- },
- {
- "id": "a861da8e-87e7-4b5d-92fa-4ca61671c77f",
- "name": "birthdate",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "userinfo.token.claim": "true",
- "user.attribute": "birthdate",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "birthdate",
- "jsonType.label": "String"
- }
- },
- {
- "id": "ae301563-61a7-413b-87a0-036e1af942bb",
- "name": "middle name",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "userinfo.token.claim": "true",
- "user.attribute": "middleName",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "middle_name",
- "jsonType.label": "String"
- }
- },
- {
- "id": "c39e0763-48a9-4f69-84f4-4e334365f99b",
- "name": "full name",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-full-name-mapper",
- "consentRequired": false,
- "config": {
- "id.token.claim": "true",
- "access.token.claim": "true",
- "userinfo.token.claim": "true"
- }
- },
- {
- "id": "a54ae213-5854-4f77-8646-5cc7767fb914",
- "name": "nickname",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "userinfo.token.claim": "true",
- "user.attribute": "nickname",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "nickname",
- "jsonType.label": "String"
- }
- },
- {
- "id": "41824638-4a2f-4259-90fe-431a32371256",
- "name": "zoneinfo",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "userinfo.token.claim": "true",
- "user.attribute": "zoneinfo",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "zoneinfo",
- "jsonType.label": "String"
- }
- }
- ]
- },
- {
- "id": "4c7c18fe-2aff-4df3-aeff-4dca9de93a79",
- "name": "offline_access",
- "description": "OpenID Connect built-in scope: offline_access",
- "protocol": "openid-connect",
- "attributes": {
- "consent.screen.text": "${offlineAccessScopeConsentText}",
- "display.on.consent.screen": "true"
- }
- },
- {
- "id": "30b249b2-c788-47ef-a8c7-daa0e3713b7c",
- "name": "acr",
- "description": "OpenID Connect scope for add acr (authentication context class reference) to the token",
- "protocol": "openid-connect",
- "attributes": {
- "include.in.token.scope": "false",
- "display.on.consent.screen": "false"
- },
- "protocolMappers": [
- {
- "id": "50cf075c-fdc9-43f4-ab85-1e32cafbbb26",
- "name": "acr loa level",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-acr-mapper",
- "consentRequired": false,
- "config": {
- "id.token.claim": "true",
- "access.token.claim": "true"
- }
- }
- ]
- }
- ],
- "defaultDefaultClientScopes": [
- "role_list",
- "profile",
- "email",
- "roles",
- "web-origins",
- "acr"
- ],
- "defaultOptionalClientScopes": [
- "offline_access",
- "address",
- "phone",
- "microprofile-jwt"
- ],
- "browserSecurityHeaders": {
- "contentSecurityPolicyReportOnly": "",
- "xContentTypeOptions": "nosniff",
- "xRobotsTag": "none",
- "xFrameOptions": "SAMEORIGIN",
- "contentSecurityPolicy": "frame-src 'self'; frame-ancestors 'self'; object-src 'none';",
- "xXSSProtection": "1; mode=block",
- "strictTransportSecurity": "max-age=31536000; includeSubDomains"
- },
- "smtpServer": {},
- "eventsEnabled": false,
- "eventsListeners": [
- "jboss-logging"
- ],
- "enabledEventTypes": [],
- "adminEventsEnabled": false,
- "adminEventsDetailsEnabled": false,
- "identityProviders": [],
- "identityProviderMappers": [],
- "components": {
- "org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy": [
- {
- "id": "4489b316-ab01-42cf-a224-f853a310c7c5",
- "name": "Allowed Protocol Mapper Types",
- "providerId": "allowed-protocol-mappers",
- "subType": "authenticated",
- "subComponents": {},
- "config": {
- "allowed-protocol-mapper-types": [
- "oidc-address-mapper",
- "saml-user-property-mapper",
- "oidc-usermodel-property-mapper",
- "oidc-usermodel-attribute-mapper",
- "saml-user-attribute-mapper",
- "oidc-sha256-pairwise-sub-mapper",
- "oidc-full-name-mapper",
- "saml-role-list-mapper"
- ]
- }
- },
- {
- "id": "d355f2ac-bd0d-4c5c-8e2d-52f14f332354",
- "name": "Allowed Protocol Mapper Types",
- "providerId": "allowed-protocol-mappers",
- "subType": "anonymous",
- "subComponents": {},
- "config": {
- "allowed-protocol-mapper-types": [
- "oidc-full-name-mapper",
- "oidc-usermodel-attribute-mapper",
- "oidc-address-mapper",
- "oidc-sha256-pairwise-sub-mapper",
- "saml-role-list-mapper",
- "saml-user-property-mapper",
- "saml-user-attribute-mapper",
- "oidc-usermodel-property-mapper"
- ]
- }
- },
- {
- "id": "cefbb851-d3bd-4b6d-b582-7fc4fa51d9b6",
- "name": "Allowed Client Scopes",
- "providerId": "allowed-client-templates",
- "subType": "anonymous",
- "subComponents": {},
- "config": {
- "allow-default-scopes": [
- "true"
- ]
- }
- },
- {
- "id": "b7fe23c6-f82b-4920-8062-3d9fa6fb838f",
- "name": "Full Scope Disabled",
- "providerId": "scope",
- "subType": "anonymous",
- "subComponents": {},
- "config": {}
- },
- {
- "id": "8332b5b7-5643-4c9f-afdb-4bda506bac55",
- "name": "Allowed Client Scopes",
- "providerId": "allowed-client-templates",
- "subType": "authenticated",
- "subComponents": {},
- "config": {
- "allow-default-scopes": [
- "true"
- ]
- }
- },
- {
- "id": "bb595923-ec43-4cbc-be3c-6d65c250956d",
- "name": "Consent Required",
- "providerId": "consent-required",
- "subType": "anonymous",
- "subComponents": {},
- "config": {}
- },
- {
- "id": "4d9901ea-7d1e-484a-a5de-abb36d8a5cc8",
- "name": "Trusted Hosts",
- "providerId": "trusted-hosts",
- "subType": "anonymous",
- "subComponents": {},
- "config": {
- "host-sending-registration-request-must-match": [
- "true"
- ],
- "client-uris-must-match": [
- "true"
- ]
- }
- },
- {
- "id": "44bd2392-250b-4b4a-9772-7478fbd68f67",
- "name": "Max Clients Limit",
- "providerId": "max-clients",
- "subType": "anonymous",
- "subComponents": {},
- "config": {
- "max-clients": [
- "200"
- ]
- }
- }
- ],
- "org.keycloak.userprofile.UserProfileProvider": [
- {
- "id": "0ffb33e9-2f5b-4e54-b188-19b3da816f0f",
- "providerId": "declarative-user-profile",
- "subComponents": {},
- "config": {}
- }
- ],
- "org.keycloak.keys.KeyProvider": [
- {
- "id": "d80cf13c-e402-49e5-b347-0175bdcac7b6",
- "name": "rsa-generated",
- "providerId": "rsa-generated",
- "subComponents": {},
- "config": {
- "priority": [
- "100"
- ]
- }
- },
- {
- "id": "03442c52-879c-4b3d-89c4-db02a0ad3c52",
- "name": "aes-generated",
- "providerId": "aes-generated",
- "subComponents": {},
- "config": {
- "priority": [
- "100"
- ]
- }
- },
- {
- "id": "30ce0596-cbce-4633-a422-15873bc363bf",
- "name": "hmac-generated",
- "providerId": "hmac-generated",
- "subComponents": {},
- "config": {
- "priority": [
- "100"
- ],
- "algorithm": [
- "HS256"
- ]
- }
- },
- {
- "id": "012d037c-b22a-48f2-a80a-927424d75f00",
- "name": "rsa-enc-generated",
- "providerId": "rsa-enc-generated",
- "subComponents": {},
- "config": {
- "priority": [
- "100"
- ],
- "algorithm": [
- "RSA-OAEP"
- ]
- }
- }
- ]
- },
- "internationalizationEnabled": false,
- "supportedLocales": [],
- "authenticationFlows": [
- {
- "id": "865c209a-a080-4162-9b49-795345294601",
- "alias": "Account verification options",
- "description": "Method with which to verity the existing account",
- "providerId": "basic-flow",
- "topLevel": false,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "idp-email-verification",
- "authenticatorFlow": false,
- "requirement": "ALTERNATIVE",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticatorFlow": true,
- "requirement": "ALTERNATIVE",
- "priority": 20,
- "autheticatorFlow": true,
- "flowAlias": "Verify Existing Account by Re-authentication",
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "85fc1de2-5b82-40ec-bda0-91a4fec38584",
- "alias": "Authentication Options",
- "description": "Authentication options.",
- "providerId": "basic-flow",
- "topLevel": false,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "basic-auth",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "basic-auth-otp",
- "authenticatorFlow": false,
- "requirement": "DISABLED",
- "priority": 20,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "auth-spnego",
- "authenticatorFlow": false,
- "requirement": "DISABLED",
- "priority": 30,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "2476a340-9459-4541-9e61-226f06ec66c4",
- "alias": "Browser - Conditional OTP",
- "description": "Flow to determine if the OTP is required for the authentication",
- "providerId": "basic-flow",
- "topLevel": false,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "conditional-user-configured",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "auth-otp-form",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 20,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "2e424297-19dd-4c09-a06a-876ef5183ca6",
- "alias": "Direct Grant - Conditional OTP",
- "description": "Flow to determine if the OTP is required for the authentication",
- "providerId": "basic-flow",
- "topLevel": false,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "conditional-user-configured",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "direct-grant-validate-otp",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 20,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "3966485f-3455-47d2-86a2-d990b41c7953",
- "alias": "First broker login - Conditional OTP",
- "description": "Flow to determine if the OTP is required for the authentication",
- "providerId": "basic-flow",
- "topLevel": false,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "conditional-user-configured",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "auth-otp-form",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 20,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "29098fa4-d254-44cb-a6c5-63b36b8bfdc1",
- "alias": "Handle Existing Account",
- "description": "Handle what to do if there is existing account with same email/username like authenticated identity provider",
- "providerId": "basic-flow",
- "topLevel": false,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "idp-confirm-link",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticatorFlow": true,
- "requirement": "REQUIRED",
- "priority": 20,
- "autheticatorFlow": true,
- "flowAlias": "Account verification options",
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "03569e80-3083-4147-ad49-445466c191d8",
- "alias": "Reset - Conditional OTP",
- "description": "Flow to determine if the OTP should be reset or not. Set to REQUIRED to force.",
- "providerId": "basic-flow",
- "topLevel": false,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "conditional-user-configured",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "reset-otp",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 20,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "7e660682-5eb3-4527-a5fa-53fc14a0f2f5",
- "alias": "User creation or linking",
- "description": "Flow for the existing/non-existing user alternatives",
- "providerId": "basic-flow",
- "topLevel": false,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticatorConfig": "create unique user config",
- "authenticator": "idp-create-user-if-unique",
- "authenticatorFlow": false,
- "requirement": "ALTERNATIVE",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticatorFlow": true,
- "requirement": "ALTERNATIVE",
- "priority": 20,
- "autheticatorFlow": true,
- "flowAlias": "Handle Existing Account",
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "4deed0f8-02f9-4581-9a91-05bc58fbffba",
- "alias": "Verify Existing Account by Re-authentication",
- "description": "Reauthentication of existing account",
- "providerId": "basic-flow",
- "topLevel": false,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "idp-username-password-form",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticatorFlow": true,
- "requirement": "CONDITIONAL",
- "priority": 20,
- "autheticatorFlow": true,
- "flowAlias": "First broker login - Conditional OTP",
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "3c101100-d2dc-4e0d-beea-7bb41ee08849",
- "alias": "browser",
- "description": "browser based authentication",
- "providerId": "basic-flow",
- "topLevel": true,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "auth-cookie",
- "authenticatorFlow": false,
- "requirement": "ALTERNATIVE",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "auth-spnego",
- "authenticatorFlow": false,
- "requirement": "DISABLED",
- "priority": 20,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "identity-provider-redirector",
- "authenticatorFlow": false,
- "requirement": "ALTERNATIVE",
- "priority": 25,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticatorFlow": true,
- "requirement": "ALTERNATIVE",
- "priority": 30,
- "autheticatorFlow": true,
- "flowAlias": "forms",
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "f38f76db-5399-4231-82e0-bf31cf748d14",
- "alias": "clients",
- "description": "Base authentication for clients",
- "providerId": "client-flow",
- "topLevel": true,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "client-secret",
- "authenticatorFlow": false,
- "requirement": "ALTERNATIVE",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "client-jwt",
- "authenticatorFlow": false,
- "requirement": "ALTERNATIVE",
- "priority": 20,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "client-secret-jwt",
- "authenticatorFlow": false,
- "requirement": "ALTERNATIVE",
- "priority": 30,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "client-x509",
- "authenticatorFlow": false,
- "requirement": "ALTERNATIVE",
- "priority": 40,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "ed29eed7-d490-4985-be20-2444da957182",
- "alias": "direct grant",
- "description": "OpenID Connect Resource Owner Grant",
- "providerId": "basic-flow",
- "topLevel": true,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "direct-grant-validate-username",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "direct-grant-validate-password",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 20,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticatorFlow": true,
- "requirement": "CONDITIONAL",
- "priority": 30,
- "autheticatorFlow": true,
- "flowAlias": "Direct Grant - Conditional OTP",
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "e41f4bae-aad9-4821-8597-514e6dc5796c",
- "alias": "docker auth",
- "description": "Used by Docker clients to authenticate against the IDP",
- "providerId": "basic-flow",
- "topLevel": true,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "docker-http-basic-authenticator",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "3149ebc7-481d-43bd-9d09-9e66bd9b2b7f",
- "alias": "first broker login",
- "description": "Actions taken after first broker login with identity provider account, which is not yet linked to any Keycloak account",
- "providerId": "basic-flow",
- "topLevel": true,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticatorConfig": "review profile config",
- "authenticator": "idp-review-profile",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticatorFlow": true,
- "requirement": "REQUIRED",
- "priority": 20,
- "autheticatorFlow": true,
- "flowAlias": "User creation or linking",
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "7aaab1d1-5357-4e71-8553-52d5613acf7d",
- "alias": "forms",
- "description": "Username, password, otp and other auth forms.",
- "providerId": "basic-flow",
- "topLevel": false,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "auth-username-password-form",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticatorFlow": true,
- "requirement": "CONDITIONAL",
- "priority": 20,
- "autheticatorFlow": true,
- "flowAlias": "Browser - Conditional OTP",
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "c2ffc5bb-568a-4648-bc13-8e7d6a4a53b4",
- "alias": "http challenge",
- "description": "An authentication flow based on challenge-response HTTP Authentication Schemes",
- "providerId": "basic-flow",
- "topLevel": true,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "no-cookie-redirect",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticatorFlow": true,
- "requirement": "REQUIRED",
- "priority": 20,
- "autheticatorFlow": true,
- "flowAlias": "Authentication Options",
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "c6b78806-13ee-4010-b282-a6e527dda66c",
- "alias": "registration",
- "description": "registration flow",
- "providerId": "basic-flow",
- "topLevel": true,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "registration-page-form",
- "authenticatorFlow": true,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": true,
- "flowAlias": "registration form",
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "b5f00ead-4f6f-4454-a925-154c1e9c2cc5",
- "alias": "registration form",
- "description": "registration form",
- "providerId": "form-flow",
- "topLevel": false,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "registration-user-creation",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 20,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "registration-profile-action",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 40,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "registration-password-action",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 50,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "registration-recaptcha-action",
- "authenticatorFlow": false,
- "requirement": "DISABLED",
- "priority": 60,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "f8370f63-f996-4039-9fbf-86e87da675dd",
- "alias": "reset credentials",
- "description": "Reset credentials for a user if they forgot their password or something",
- "providerId": "basic-flow",
- "topLevel": true,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "reset-credentials-choose-user",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "reset-credential-email",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 20,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "reset-password",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 30,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticatorFlow": true,
- "requirement": "CONDITIONAL",
- "priority": 40,
- "autheticatorFlow": true,
- "flowAlias": "Reset - Conditional OTP",
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "7f156260-804d-4848-9ea0-347281aea644",
- "alias": "saml ecp",
- "description": "SAML ECP Profile Authentication Flow",
- "providerId": "basic-flow",
- "topLevel": true,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "http-basic-authenticator",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- }
- ]
- }
- ],
- "authenticatorConfig": [
- {
- "id": "17f2c0cc-8dd8-4774-adcc-cd294cdadac8",
- "alias": "create unique user config",
- "config": {
- "require.password.update.after.registration": "false"
- }
- },
- {
- "id": "d5be3f6c-d096-4232-88e8-b0f46e608cff",
- "alias": "review profile config",
- "config": {
- "update.profile.on.first.login": "missing"
- }
- }
- ],
- "requiredActions": [
- {
- "alias": "CONFIGURE_TOTP",
- "name": "Configure OTP",
- "providerId": "CONFIGURE_TOTP",
- "enabled": true,
- "defaultAction": false,
- "priority": 10,
- "config": {}
- },
- {
- "alias": "TERMS_AND_CONDITIONS",
- "name": "Terms and Conditions",
- "providerId": "TERMS_AND_CONDITIONS",
- "enabled": false,
- "defaultAction": false,
- "priority": 20,
- "config": {}
- },
- {
- "alias": "UPDATE_PASSWORD",
- "name": "Update Password",
- "providerId": "UPDATE_PASSWORD",
- "enabled": true,
- "defaultAction": false,
- "priority": 30,
- "config": {}
- },
- {
- "alias": "UPDATE_PROFILE",
- "name": "Update Profile",
- "providerId": "UPDATE_PROFILE",
- "enabled": true,
- "defaultAction": false,
- "priority": 40,
- "config": {}
- },
- {
- "alias": "VERIFY_EMAIL",
- "name": "Verify Email",
- "providerId": "VERIFY_EMAIL",
- "enabled": true,
- "defaultAction": false,
- "priority": 50,
- "config": {}
- },
- {
- "alias": "delete_account",
- "name": "Delete Account",
- "providerId": "delete_account",
- "enabled": false,
- "defaultAction": false,
- "priority": 60,
- "config": {}
- },
- {
- "alias": "webauthn-register",
- "name": "Webauthn Register",
- "providerId": "webauthn-register",
- "enabled": true,
- "defaultAction": false,
- "priority": 70,
- "config": {}
- },
- {
- "alias": "webauthn-register-passwordless",
- "name": "Webauthn Register Passwordless",
- "providerId": "webauthn-register-passwordless",
- "enabled": true,
- "defaultAction": false,
- "priority": 80,
- "config": {}
- },
- {
- "alias": "update_user_locale",
- "name": "Update User Locale",
- "providerId": "update_user_locale",
- "enabled": true,
- "defaultAction": false,
- "priority": 1000,
- "config": {}
- }
- ],
- "browserFlow": "browser",
- "registrationFlow": "registration",
- "directGrantFlow": "direct grant",
- "resetCredentialsFlow": "reset credentials",
- "clientAuthenticationFlow": "clients",
- "dockerAuthenticationFlow": "docker auth",
- "attributes": {
- "cibaBackchannelTokenDeliveryMode": "poll",
- "cibaAuthRequestedUserHint": "login_hint",
- "oauth2DevicePollingInterval": "5",
- "clientOfflineSessionMaxLifespan": "0",
- "clientSessionIdleTimeout": "0",
- "clientOfflineSessionIdleTimeout": "0",
- "cibaInterval": "5",
- "realmReusableOtpCode": "false",
- "cibaExpiresIn": "120",
- "oauth2DeviceCodeLifespan": "600",
- "parRequestUriLifespan": "60",
- "clientSessionMaxLifespan": "0",
- "frontendUrl": "",
- "acr.loa.map": "{}"
- },
- "keycloakVersion": "21.0.2",
- "userManagedAccessAllowed": false,
- "clientProfiles": {
- "profiles": []
- },
- "clientPolicies": {
- "policies": []
- }
+{
+ "id" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "realm" : "dbrepo",
+ "notBefore" : 0,
+ "defaultSignatureAlgorithm" : "RS256",
+ "revokeRefreshToken" : false,
+ "refreshTokenMaxReuse" : 1,
+ "accessTokenLifespan" : 900,
+ "accessTokenLifespanForImplicitFlow" : 900,
+ "ssoSessionIdleTimeout" : 864000,
+ "ssoSessionMaxLifespan" : 2592000,
+ "ssoSessionIdleTimeoutRememberMe" : 0,
+ "ssoSessionMaxLifespanRememberMe" : 0,
+ "offlineSessionIdleTimeout" : 2592000,
+ "offlineSessionMaxLifespanEnabled" : false,
+ "offlineSessionMaxLifespan" : 5184000,
+ "clientSessionIdleTimeout" : 0,
+ "clientSessionMaxLifespan" : 0,
+ "clientOfflineSessionIdleTimeout" : 0,
+ "clientOfflineSessionMaxLifespan" : 0,
+ "accessCodeLifespan" : 60,
+ "accessCodeLifespanUserAction" : 300,
+ "accessCodeLifespanLogin" : 1800,
+ "actionTokenGeneratedByAdminLifespan" : 43200,
+ "actionTokenGeneratedByUserLifespan" : 1800,
+ "oauth2DeviceCodeLifespan" : 600,
+ "oauth2DevicePollingInterval" : 5,
+ "enabled" : true,
+ "sslRequired" : "none",
+ "registrationAllowed" : false,
+ "registrationEmailAsUsername" : false,
+ "rememberMe" : false,
+ "verifyEmail" : true,
+ "loginWithEmailAllowed" : false,
+ "duplicateEmailsAllowed" : false,
+ "resetPasswordAllowed" : false,
+ "editUsernameAllowed" : false,
+ "bruteForceProtected" : false,
+ "permanentLockout" : false,
+ "maxFailureWaitSeconds" : 900,
+ "minimumQuickLoginWaitSeconds" : 60,
+ "waitIncrementSeconds" : 60,
+ "quickLoginCheckMilliSeconds" : 1000,
+ "maxDeltaTimeSeconds" : 43200,
+ "failureFactor" : 30,
+ "roles" : {
+ "realm" : [ {
+ "id" : "48f38342-1e3f-427a-995d-c436eaee65cb",
+ "name" : "default-user-handling",
+ "description" : "${default-user-handling}",
+ "composite" : true,
+ "composites" : {
+ "realm" : [ "modify-user-theme", "modify-user-information" ]
+ },
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "9bb4a8dc-28e0-4645-b62f-cc94425f0cb0",
+ "name" : "default-maintenance-handling",
+ "description" : "${default-maintenance-handling}",
+ "composite" : true,
+ "composites" : {
+ "realm" : [ "create-maintenance-message", "find-maintenance-message", "update-maintenance-message", "delete-maintenance-message", "list-maintenance-messages" ]
+ },
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "7ee1c424-11b0-46a9-b0ed-725e9b7fc40c",
+ "name" : "default-system-roles",
+ "description" : "${default-system-roles}",
+ "composite" : true,
+ "composites" : {
+ "realm" : [ "delete-database-view", "update-semantic-unit", "export-query-data", "default-data-steward-roles", "execute-query", "default-user-handling", "delete-table-data", "find-query", "list-database-views", "persist-query", "update-search-index", "delete-database-access", "view-table-history", "create-ontology", "update-ontology", "modify-user-theme", "default-system-roles", "create-semantic-concept", "default-container-handling", "create-container", "create-table", "default-broker-handling", "default-maintenance-handling", "execute-semantic-query", "uma_authorization", "table-semantic-analyse", "list-containers", "check-database-access", "escalated-query-handling", "delete-identifier", "modify-database-owner", "list-tables", "export-table-data", "create-database-access", "delete-container", "re-execute-query", "create-semantic-unit", "escalated-identifier-handling", "system", "update-table-statistic", "escalated-semantics-handling", "default-database-handling", "delete-ontology", "find-database", "find-database-view", "update-semantic-concept", "find-user", "import-database-data", "publish-identifier", "default-roles-dbrepo", "find-foreign-user", "create-database", "create-maintenance-message", "find-maintenance-message", "escalated-container-handling", "default-researcher-roles", "default-identifier-handling", "escalated-user-handling", "modify-user-information", "create-database-view", "update-maintenance-message", "delete-foreign-table", "offline_access", "modify-foreign-table-column-semantics", "delete-maintenance-message", "find-container", "insert-table-data", "modify-identifier-metadata", "modify-database-image", "escalated-broker-handling", "modify-table-column-semantics", "escalated-database-handling", "default-semantics-handling", "update-database-access", "default-query-handling", "find-table", "list-queries", "default-developer-roles", "create-identifier", "escalated-table-handling", "find-identifier", "view-database-view-data", "view-table-data", "list-licenses", "default-table-handling", "list-identifiers", "create-foreign-identifier", "list-databases", "list-ontologies", "modify-database-visibility", "list-maintenance-messages", "delete-table" ]
+ },
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "143ba359-5fa2-451e-8296-43ecf20bb251",
+ "name" : "update-semantic-concept",
+ "description" : "${update-semantic-concept}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "5136d7a3-e3f0-4585-bacd-15cb8a56095c",
+ "name" : "escalated-container-handling",
+ "description" : "${escalated-container-handling}",
+ "composite" : true,
+ "composites" : {
+ "realm" : [ "create-container", "delete-container" ]
+ },
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "b0bc8649-7d84-4dd3-84f0-7f174425babe",
+ "name" : "list-tables",
+ "description" : "${list-tables}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "bfd85d9c-2772-4660-a8f0-cdc0cd8252b3",
+ "name" : "default-database-handling",
+ "description" : "${default-database-handling}",
+ "composite" : true,
+ "composites" : {
+ "realm" : [ "modify-database-image", "modify-database-owner", "update-database-access", "create-database", "list-databases", "create-database-access", "find-database", "modify-database-visibility", "import-database-data", "delete-database-access", "check-database-access" ]
+ },
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "74648f9a-777e-4ef9-b97b-4c5d749d862f",
+ "name" : "update-search-index",
+ "description" : "${update-search-index}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "22492b64-c633-48a0-9678-b28669f2885b",
+ "name" : "execute-semantic-query",
+ "description" : "${execute-semantic-query}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "4ed919fa-edc5-44e5-9411-607786e4a86d",
+ "name" : "view-table-history",
+ "description" : "${view-table-history}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "d89a2881-b642-4abb-b990-196e71372f6b",
+ "name" : "default-table-handling",
+ "description" : "${default-table-handling}",
+ "composite" : true,
+ "composites" : {
+ "realm" : [ "modify-table-column-semantics", "list-tables", "update-table-statistic", "find-table", "create-table", "delete-table" ]
+ },
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "b0d66d3d-59b4-4aae-aa66-e3d5a49f28e3",
+ "name" : "view-database-view-data",
+ "description" : "${view-database-view-data}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "f5ea431a-9b2c-4195-bcb4-9511f38e4b44",
+ "name" : "create-database-view",
+ "description" : "${create-database-view}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "a5ffc20e-8b11-498c-9f3b-b5740aec24c7",
+ "name" : "default-semantics-handling",
+ "description" : "${default-semantics-handling}",
+ "composite" : true,
+ "composites" : {
+ "realm" : [ "create-semantic-unit", "create-semantic-concept", "execute-semantic-query", "table-semantic-analyse" ]
+ },
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "fe4a01f3-6590-4df6-9ade-5a9c1fae4736",
+ "name" : "create-semantic-unit",
+ "description" : "${create-semantic-unit}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "0e12eedf-545d-4d32-ac4d-2821dcb118b8",
+ "name" : "update-table-statistic",
+ "description" : "${update-table-statistic}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "e63e61a2-d852-4ad3-bfb5-92d9ceafef6a",
+ "name" : "escalated-user-handling",
+ "description" : "${escalated-user-handling}",
+ "composite" : true,
+ "composites" : {
+ "realm" : [ "find-user" ]
+ },
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "be4e1aba-e276-4241-b6ea-01dce6c52f8b",
+ "name" : "find-container",
+ "description" : "${find-container}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "3a801b48-f3c2-4bc6-aa25-c7a91d5b32a7",
+ "name" : "default-researcher-roles",
+ "description" : "${default-researcher-roles}",
+ "composite" : true,
+ "composites" : {
+ "realm" : [ "default-table-handling", "default-semantics-handling", "default-container-handling", "default-query-handling", "default-user-handling", "default-database-handling", "default-broker-handling", "default-identifier-handling" ]
+ },
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "3d8104fb-8307-40f0-b4b2-c3e518957110",
+ "name" : "view-table-data",
+ "description" : "${view-table-data}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "fe71b907-7020-44ab-9964-da2b87264582",
+ "name" : "create-database",
+ "description" : "${create-database}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "e51b63c2-48dd-4bd6-95fb-d257d21b26ba",
+ "name" : "import-database-data",
+ "description" : "${import-database-data}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "1f0a9b13-c2b8-474c-bc08-59dbd71835a6",
+ "name" : "modify-database-image",
+ "description" : "${modify-database-image}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "a7ad038c-5c06-42fc-951c-15ac09d4df66",
+ "name" : "modify-database-owner",
+ "description" : "${modify-database-owner}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "c12c1f4e-186f-4153-a795-26e79fb623d6",
+ "name" : "create-ontology",
+ "description" : "${create-ontology}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "b60a5694-4099-4f7d-a7e9-4c433e0eb9c9",
+ "name" : "update-semantic-unit",
+ "description" : "${update-semantic-unit}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "e9854bbb-4580-4757-b1ae-305934173249",
+ "name" : "create-database-access",
+ "description" : "${create-database-access}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "50c604c1-7c6e-43f3-9c43-2398f5eff66e",
+ "name" : "list-databases",
+ "description" : "${list-databases}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "535f1484-4514-4d24-8d97-e3f6c11a426b",
+ "name" : "create-container",
+ "description" : "${create-container}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "f4116230-8642-4bb7-bbc8-db9c5c07b558",
+ "name" : "create-maintenance-message",
+ "description" : "${create-maintenance-message}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "973f0999-cc70-4b28-9f43-979c470bea8e",
+ "name" : "default-data-steward-roles",
+ "description" : "${default-data-steward-roles}",
+ "composite" : true,
+ "composites" : {
+ "realm" : [ "escalated-identifier-handling", "default-semantics-handling", "escalated-semantics-handling", "default-user-handling" ]
+ },
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "e1383fb7-d54c-4732-9146-93030eb2ca50",
+ "name" : "escalated-query-handling",
+ "description" : "${escalated-query-handling}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "993b5c69-9eb2-42af-ac28-b4a46c6b61f2",
+ "name" : "find-user",
+ "description" : "${find-user}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "e4cfdc4d-2373-477b-a8df-161db99aba00",
+ "name" : "create-foreign-identifier",
+ "description" : "${create-foreign-identifier}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "6a5872a5-2b51-415d-ae2d-25a6db4a35df",
+ "name" : "escalated-semantics-handling",
+ "description" : "${escalated-semantics-handling}",
+ "composite" : true,
+ "composites" : {
+ "realm" : [ "update-semantic-unit", "create-ontology", "update-ontology", "list-ontologies", "delete-ontology", "modify-foreign-table-column-semantics", "update-semantic-concept" ]
+ },
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "09147c48-273b-450b-8b11-7ef9b9245244",
+ "name" : "export-table-data",
+ "description" : "${export-table-data}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "d14af590-60a8-4d75-b864-40ee0165bd7f",
+ "name" : "delete-database-access",
+ "description" : "${delete-database-access}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "be051d45-cd74-4b13-8a45-f2d3351bd995",
+ "name" : "table-semantic-analyse",
+ "description" : "${table-semantic-analyse}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "272a79a7-e282-4261-8f7d-5d5d1364243a",
+ "name" : "update-maintenance-message",
+ "description" : "${update-maintenance-message}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "64c16bfb-2015-48ad-a23f-637ff24419cb",
+ "name" : "default-query-handling",
+ "description" : "${default-query-handling}",
+ "composite" : true,
+ "composites" : {
+ "realm" : [ "delete-database-view", "export-query-data", "execute-query", "delete-table-data", "export-table-data", "list-queries", "find-query", "list-database-views", "persist-query", "view-database-view-data", "view-table-data", "re-execute-query", "view-table-history", "create-database-view", "find-database-view", "insert-table-data" ]
+ },
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "c047d521-cec3-4444-86c4-aef098489b7b",
+ "name" : "delete-maintenance-message",
+ "description" : "${delete-maintenance-message}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "88f82262-be80-4d18-9fb4-5529da031f33",
+ "name" : "system",
+ "description" : "${system}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "e14ab76b-1c24-484d-ae2d-478b8457edea",
+ "name" : "list-licenses",
+ "description" : "${list-licenses}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "d4f29937-3ca0-41e9-9786-2b7b921b6cdd",
+ "name" : "modify-foreign-table-column-semantics",
+ "description" : "${modify-foreign-table-column-semantics}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "8eda9f5c-938c-4915-bed5-6a81a1de15a8",
+ "name" : "list-database-views",
+ "description" : "${list-database-views}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "b372f8f7-d203-4293-b991-ad93fb505917",
+ "name" : "escalated-database-handling",
+ "description" : "${escalated-database-handling}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "abd2d9ee-ebc4-4d0a-839e-6b588a6d442a",
+ "name" : "default-roles-dbrepo",
+ "description" : "${role_default-roles}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "3293799a-82b9-4f47-8f25-1aad2e0222fd",
+ "name" : "find-identifier",
+ "description" : "${find-identifier}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "aaa3f804-38a0-4474-b8e9-f1020c4b3f62",
+ "name" : "list-queries",
+ "description" : "${list-queries}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "76e38f7b-99bf-4d12-8d74-1c7d8812f443",
+ "name" : "update-ontology",
+ "description" : "${update-ontology}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "11f7973e-d1eb-42cb-a35d-c59dfc122775",
+ "name" : "modify-user-theme",
+ "description" : "${modify-user-theme}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "f392bfcb-0be5-4fad-9ce4-8ac6396f176d",
+ "name" : "export-query-data",
+ "description" : "${export-query-data}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "da493b7e-fb9b-43ca-82a5-e274ad2e6b39",
+ "name" : "find-query",
+ "description" : "${find-query}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "a4d4a788-ebcf-4d32-baed-4a85616ca037",
+ "name" : "escalated-identifier-handling",
+ "description" : "${escalated-identifier-handling}",
+ "composite" : true,
+ "composites" : {
+ "realm" : [ "create-foreign-identifier", "modify-identifier-metadata" ]
+ },
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "ea38d69d-17b8-4c65-95e8-1c3501b83618",
+ "name" : "default-container-handling",
+ "description" : "${default-container-handling}",
+ "composite" : true,
+ "composites" : {
+ "realm" : [ "find-container", "list-containers" ]
+ },
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "8b8813e0-af07-4d04-a8c1-e3f37192bace",
+ "name" : "publish-identifier",
+ "description" : "${publish-identifier}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "47f5eee7-9821-4bf8-b434-0da1f81c3e5a",
+ "name" : "default-broker-handling",
+ "description" : "${default-broker-handling}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "71874bde-64a5-4a69-8685-d8998303a80c",
+ "name" : "delete-table-data",
+ "description" : "${delete-table-data}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "7c0306fc-3b03-4c64-87d1-9a34f2073977",
+ "name" : "modify-table-column-semantics",
+ "description" : "${modify-table-column-semantics}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "cd0ee04c-4a5e-4035-a11b-f6a1165f7829",
+ "name" : "delete-container",
+ "description" : "${delete-container}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "67ee39c0-d601-4a67-a0fe-c4f0021d557e",
+ "name" : "list-containers",
+ "description" : "${list-containers}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "795c7bb8-3502-414a-a97b-2ba1cfd6a79c",
+ "name" : "persist-query",
+ "description" : "${persist-query}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "d05e7698-ddf5-4f20-9027-771afb2cc3c7",
+ "name" : "list-identifiers",
+ "description" : "${list-identifiers}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "e4bfaf36-9a5d-43e0-9fa3-0f4ea7bad8d0",
+ "name" : "default-developer-roles",
+ "description" : "${default-developer-roles}",
+ "composite" : true,
+ "composites" : {
+ "realm" : [ "escalated-query-handling", "escalated-broker-handling", "default-table-handling", "escalated-database-handling", "default-container-handling", "default-query-handling", "default-user-handling", "default-database-handling", "default-maintenance-handling", "escalated-container-handling", "escalated-table-handling", "default-identifier-handling" ]
+ },
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "e2cb054e-ea41-4ab0-881b-e6f576f7424e",
+ "name" : "create-semantic-concept",
+ "description" : "${create-semantic-concept}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "feb612cc-96a6-4ed2-aaa5-01f39b25beb5",
+ "name" : "insert-table-data",
+ "description" : "${insert-table-data}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "a0942e33-441b-4343-9f02-4353d03f7bbb",
+ "name" : "find-database",
+ "description" : "${find-database}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "6a0bb740-4448-49be-aee8-6dd183325be5",
+ "name" : "delete-foreign-table",
+ "description" : "${delete-foreign-table}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "7f3652c7-3073-4566-ab63-25385495ebc3",
+ "name" : "modify-database-visibility",
+ "description" : "${modify-database-visibility}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "4a5df51d-f14d-41a2-ad70-6521df5a5b4f",
+ "name" : "offline_access",
+ "description" : "${role_offline-access}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "fd41c4c3-d2f8-4f49-84c7-dba84e9a5575",
+ "name" : "execute-query",
+ "description" : "${execute-query}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "2963c2bb-b129-4224-b98f-c8eeab8e72d1",
+ "name" : "create-table",
+ "description" : "${create-table}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "0c487c93-448f-4a82-8b9f-ebd8a0904bf8",
+ "name" : "find-foreign-user",
+ "description" : "${find-foreign-user}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "cf9735a9-fb70-4cc5-b5f4-75afc4e5654b",
+ "name" : "modify-identifier-metadata",
+ "description" : "${modify-identifier-metadata}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "64c2b8f2-1527-4928-81ea-b2651512d028",
+ "name" : "delete-ontology",
+ "description" : "${delete-ontology}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "d6e38368-b40f-423b-82e4-e8aa595237c9",
+ "name" : "find-maintenance-message",
+ "description" : "${find-maintenance-message}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "fd1cc463-3e67-49d9-81b8-2cd90c1daa9c",
+ "name" : "check-database-access",
+ "description" : "${check-database-access}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "74013867-e426-46cc-ab98-2f4a9225ad1e",
+ "name" : "find-table",
+ "description" : "${find-table}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "a2cc60df-d280-46c5-a539-92e2aa249b4a",
+ "name" : "modify-user-information",
+ "description" : "${modify-user-information}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "c367241f-b5b5-491f-84d5-07fe1bef3877",
+ "name" : "default-identifier-handling",
+ "description" : "${default-identifier-handling}",
+ "composite" : true,
+ "composites" : {
+ "realm" : [ "delete-identifier", "list-identifiers", "create-identifier", "find-identifier", "publish-identifier" ]
+ },
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "ba1ad8f2-39aa-487d-987f-645e8a459559",
+ "name" : "delete-table",
+ "description" : "${delete-table}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "09f7bdb0-296f-46c8-a3a3-8f9254fb17e4",
+ "name" : "list-maintenance-messages",
+ "description" : "${list-maintenance-messages}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "fe3bc45c-61c2-4ece-bcaf-d410dc7de501",
+ "name" : "update-database-access",
+ "description" : "${update-database-access}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "f43e86ed-76de-4ca8-9b5e-c292c9359bfe",
+ "name" : "escalated-broker-handling",
+ "description" : "${escalated-broker-handling}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "916b1e65-f60c-42cd-96e4-5c98ffc1ba3c",
+ "name" : "uma_authorization",
+ "description" : "${role_uma_authorization}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "d1afa3ed-bf4f-469a-a061-ad7325fb8d9e",
+ "name" : "delete-database-view",
+ "description" : "${delete-database-view}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "6f044bad-6651-4408-bffa-20c2d8f92eee",
+ "name" : "create-identifier",
+ "description" : "${create-identifier}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "be91195a-e30a-4d15-a8da-0aca0a68782f",
+ "name" : "escalated-table-handling",
+ "description" : "${escalated-table-handling}",
+ "composite" : true,
+ "composites" : {
+ "realm" : [ "delete-foreign-table" ]
+ },
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "98bee7d6-d78c-4e7f-b6a3-3705968b248c",
+ "name" : "list-ontologies",
+ "description" : "${list-ontologies}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "15720c6b-027d-4d53-a0ff-0124bfab7c4c",
+ "name" : "re-execute-query",
+ "description" : "${re-execute-query}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "a9b5181a-8135-41d3-9862-ef80af42211d",
+ "name" : "delete-identifier",
+ "description" : "${delete-identifier}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ }, {
+ "id" : "469c2e63-cda6-48d4-ab8f-eb59a2c69798",
+ "name" : "find-database-view",
+ "description" : "${find-database-view}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
+ } ],
+ "client" : {
+ "realm-management" : [ {
+ "id" : "4628f654-f8f3-483b-8f92-2a7fc5930b14",
+ "name" : "query-realms",
+ "description" : "${role_query-realms}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "cfffd5d0-aa19-4057-8ca0-f2c51ca0e930",
+ "attributes" : { }
+ }, {
+ "id" : "95c2cc47-12f5-4d73-8b74-67e270c45ade",
+ "name" : "manage-authorization",
+ "description" : "${role_manage-authorization}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "cfffd5d0-aa19-4057-8ca0-f2c51ca0e930",
+ "attributes" : { }
+ }, {
+ "id" : "824791f3-c345-42f8-b103-b7e6d7e40114",
+ "name" : "manage-identity-providers",
+ "description" : "${role_manage-identity-providers}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "cfffd5d0-aa19-4057-8ca0-f2c51ca0e930",
+ "attributes" : { }
+ }, {
+ "id" : "1f840202-b7e2-4195-bac9-64e64dad2037",
+ "name" : "view-identity-providers",
+ "description" : "${role_view-identity-providers}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "cfffd5d0-aa19-4057-8ca0-f2c51ca0e930",
+ "attributes" : { }
+ }, {
+ "id" : "3c32c096-bb13-44c9-a080-d756a48a9ea3",
+ "name" : "query-clients",
+ "description" : "${role_query-clients}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "cfffd5d0-aa19-4057-8ca0-f2c51ca0e930",
+ "attributes" : { }
+ }, {
+ "id" : "e4b85a68-7f31-4fcf-89a2-f10d7df358e9",
+ "name" : "view-authorization",
+ "description" : "${role_view-authorization}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "cfffd5d0-aa19-4057-8ca0-f2c51ca0e930",
+ "attributes" : { }
+ }, {
+ "id" : "7d317752-ae56-46f2-a2ce-67c64d1b35f6",
+ "name" : "view-users",
+ "description" : "${role_view-users}",
+ "composite" : true,
+ "composites" : {
+ "client" : {
+ "realm-management" : [ "query-users", "query-groups" ]
+ }
+ },
+ "clientRole" : true,
+ "containerId" : "cfffd5d0-aa19-4057-8ca0-f2c51ca0e930",
+ "attributes" : { }
+ }, {
+ "id" : "28824208-976e-4622-b4d7-3d18efbb46fa",
+ "name" : "realm-admin",
+ "description" : "${role_realm-admin}",
+ "composite" : true,
+ "composites" : {
+ "client" : {
+ "realm-management" : [ "query-realms", "view-identity-providers", "manage-identity-providers", "manage-authorization", "query-clients", "view-authorization", "view-users", "manage-users", "view-realm", "query-users", "view-clients", "query-groups", "create-client", "manage-clients", "manage-events", "impersonation", "view-events", "manage-realm" ]
+ }
+ },
+ "clientRole" : true,
+ "containerId" : "cfffd5d0-aa19-4057-8ca0-f2c51ca0e930",
+ "attributes" : { }
+ }, {
+ "id" : "57e846a2-930d-4621-819d-c35086507146",
+ "name" : "manage-users",
+ "description" : "${role_manage-users}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "cfffd5d0-aa19-4057-8ca0-f2c51ca0e930",
+ "attributes" : { }
+ }, {
+ "id" : "7fad9cde-bf96-475a-9174-14a87da51f95",
+ "name" : "view-realm",
+ "description" : "${role_view-realm}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "cfffd5d0-aa19-4057-8ca0-f2c51ca0e930",
+ "attributes" : { }
+ }, {
+ "id" : "bbcac294-d78a-4ea1-a4bf-0384266d2fe1",
+ "name" : "query-users",
+ "description" : "${role_query-users}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "cfffd5d0-aa19-4057-8ca0-f2c51ca0e930",
+ "attributes" : { }
+ }, {
+ "id" : "480e1437-ab9e-47de-b47a-edc6b6e285de",
+ "name" : "view-clients",
+ "description" : "${role_view-clients}",
+ "composite" : true,
+ "composites" : {
+ "client" : {
+ "realm-management" : [ "query-clients" ]
+ }
+ },
+ "clientRole" : true,
+ "containerId" : "cfffd5d0-aa19-4057-8ca0-f2c51ca0e930",
+ "attributes" : { }
+ }, {
+ "id" : "b9a9a8f5-f91e-4e73-9e88-1cdf42bd49f9",
+ "name" : "create-client",
+ "description" : "${role_create-client}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "cfffd5d0-aa19-4057-8ca0-f2c51ca0e930",
+ "attributes" : { }
+ }, {
+ "id" : "4d1397fb-247c-436f-b26f-124cd89afb08",
+ "name" : "query-groups",
+ "description" : "${role_query-groups}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "cfffd5d0-aa19-4057-8ca0-f2c51ca0e930",
+ "attributes" : { }
+ }, {
+ "id" : "e31f522b-b283-4ae1-b875-52afcd98b1d2",
+ "name" : "impersonation",
+ "description" : "${role_impersonation}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "cfffd5d0-aa19-4057-8ca0-f2c51ca0e930",
+ "attributes" : { }
+ }, {
+ "id" : "51822d02-fa28-4a49-89da-bc534719d8a8",
+ "name" : "manage-clients",
+ "description" : "${role_manage-clients}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "cfffd5d0-aa19-4057-8ca0-f2c51ca0e930",
+ "attributes" : { }
+ }, {
+ "id" : "b2743ce5-0ce8-4157-ae00-f693560f0b39",
+ "name" : "manage-events",
+ "description" : "${role_manage-events}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "cfffd5d0-aa19-4057-8ca0-f2c51ca0e930",
+ "attributes" : { }
+ }, {
+ "id" : "7ea3d7e0-9bf4-438a-b773-243daf622aaa",
+ "name" : "view-events",
+ "description" : "${role_view-events}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "cfffd5d0-aa19-4057-8ca0-f2c51ca0e930",
+ "attributes" : { }
+ }, {
+ "id" : "fb73f6f5-0ed5-41d0-852c-0eb3b195b15a",
+ "name" : "manage-realm",
+ "description" : "${role_manage-realm}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "cfffd5d0-aa19-4057-8ca0-f2c51ca0e930",
+ "attributes" : { }
+ } ],
+ "security-admin-console" : [ ],
+ "dbrepo-client" : [ ],
+ "admin-cli" : [ ],
+ "rabbitmq-client" : [ ],
+ "account-console" : [ ],
+ "broker" : [ {
+ "id" : "de0cfd5e-c2fe-4082-ac39-e3b092139a0f",
+ "name" : "read-token",
+ "description" : "${role_read-token}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "88694c91-753d-4c44-9740-ec9ac06bba45",
+ "attributes" : { }
+ } ],
+ "account" : [ {
+ "id" : "acd78c04-eefc-4344-a5b4-3fc83d848936",
+ "name" : "delete-account",
+ "description" : "${role_delete-account}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "e767a4a6-79e9-4e08-82b7-1076e1a09142",
+ "attributes" : { }
+ }, {
+ "id" : "939be844-8c49-45b3-9ca1-4b10a454b346",
+ "name" : "view-profile",
+ "description" : "${role_view-profile}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "e767a4a6-79e9-4e08-82b7-1076e1a09142",
+ "attributes" : { }
+ }, {
+ "id" : "e52fdf00-3e73-4c17-bc1c-643493710a6b",
+ "name" : "view-applications",
+ "description" : "${role_view-applications}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "e767a4a6-79e9-4e08-82b7-1076e1a09142",
+ "attributes" : { }
+ }, {
+ "id" : "b02a822e-a708-420a-bddc-1a315033fd7c",
+ "name" : "view-consent",
+ "description" : "${role_view-consent}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "e767a4a6-79e9-4e08-82b7-1076e1a09142",
+ "attributes" : { }
+ }, {
+ "id" : "c590e5f5-2cbf-4151-b1dc-96c454f1f654",
+ "name" : "view-groups",
+ "description" : "${role_view-groups}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "e767a4a6-79e9-4e08-82b7-1076e1a09142",
+ "attributes" : { }
+ }, {
+ "id" : "15974151-6c13-426b-8cc3-7683dd1311e1",
+ "name" : "manage-account-links",
+ "description" : "${role_manage-account-links}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "e767a4a6-79e9-4e08-82b7-1076e1a09142",
+ "attributes" : { }
+ }, {
+ "id" : "c12d8d94-c2df-498e-bbe4-2f934a83ae92",
+ "name" : "manage-consent",
+ "description" : "${role_manage-consent}",
+ "composite" : true,
+ "composites" : {
+ "client" : {
+ "account" : [ "view-consent" ]
+ }
+ },
+ "clientRole" : true,
+ "containerId" : "e767a4a6-79e9-4e08-82b7-1076e1a09142",
+ "attributes" : { }
+ }, {
+ "id" : "55f85811-bded-4d6b-8f7b-45844b963875",
+ "name" : "manage-account",
+ "description" : "${role_manage-account}",
+ "composite" : true,
+ "composites" : {
+ "client" : {
+ "account" : [ "manage-account-links" ]
+ }
+ },
+ "clientRole" : true,
+ "containerId" : "e767a4a6-79e9-4e08-82b7-1076e1a09142",
+ "attributes" : { }
+ } ]
+ }
+ },
+ "groups" : [ {
+ "id" : "f2ce17fe-7b15-47a4-bbf8-86f415298fa9",
+ "name" : "data-stewards",
+ "path" : "/data-stewards",
+ "attributes" : { },
+ "realmRoles" : [ "default-data-steward-roles" ],
+ "clientRoles" : { },
+ "subGroups" : [ ]
+ }, {
+ "id" : "124d9888-0b6e-46aa-8225-077dcedaf16e",
+ "name" : "developers",
+ "path" : "/developers",
+ "attributes" : { },
+ "realmRoles" : [ "default-developer-roles" ],
+ "clientRoles" : { },
+ "subGroups" : [ ]
+ }, {
+ "id" : "f467c38e-9041-4faa-ae0b-39cec65ff4db",
+ "name" : "researchers",
+ "path" : "/researchers",
+ "attributes" : { },
+ "realmRoles" : [ "default-researcher-roles" ],
+ "clientRoles" : { },
+ "subGroups" : [ ]
+ }, {
+ "id" : "2b9f94b4-d434-4a98-8eab-25678cfee983",
+ "name" : "system",
+ "path" : "/system",
+ "attributes" : { },
+ "realmRoles" : [ "default-system-roles" ],
+ "clientRoles" : { },
+ "subGroups" : [ ]
+ } ],
+ "defaultRole" : {
+ "id" : "abd2d9ee-ebc4-4d0a-839e-6b588a6d442a",
+ "name" : "default-roles-dbrepo",
+ "description" : "${role_default-roles}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0"
+ },
+ "defaultGroups" : [ "/researchers" ],
+ "requiredCredentials" : [ "password" ],
+ "otpPolicyType" : "totp",
+ "otpPolicyAlgorithm" : "HmacSHA1",
+ "otpPolicyInitialCounter" : 0,
+ "otpPolicyDigits" : 6,
+ "otpPolicyLookAheadWindow" : 1,
+ "otpPolicyPeriod" : 30,
+ "otpPolicyCodeReusable" : false,
+ "otpSupportedApplications" : [ "totpAppGoogleName", "totpAppFreeOTPName", "totpAppMicrosoftAuthenticatorName" ],
+ "webAuthnPolicyRpEntityName" : "keycloak",
+ "webAuthnPolicySignatureAlgorithms" : [ "ES256" ],
+ "webAuthnPolicyRpId" : "",
+ "webAuthnPolicyAttestationConveyancePreference" : "not specified",
+ "webAuthnPolicyAuthenticatorAttachment" : "not specified",
+ "webAuthnPolicyRequireResidentKey" : "not specified",
+ "webAuthnPolicyUserVerificationRequirement" : "not specified",
+ "webAuthnPolicyCreateTimeout" : 0,
+ "webAuthnPolicyAvoidSameAuthenticatorRegister" : false,
+ "webAuthnPolicyAcceptableAaguids" : [ ],
+ "webAuthnPolicyPasswordlessRpEntityName" : "keycloak",
+ "webAuthnPolicyPasswordlessSignatureAlgorithms" : [ "ES256" ],
+ "webAuthnPolicyPasswordlessRpId" : "",
+ "webAuthnPolicyPasswordlessAttestationConveyancePreference" : "not specified",
+ "webAuthnPolicyPasswordlessAuthenticatorAttachment" : "not specified",
+ "webAuthnPolicyPasswordlessRequireResidentKey" : "not specified",
+ "webAuthnPolicyPasswordlessUserVerificationRequirement" : "not specified",
+ "webAuthnPolicyPasswordlessCreateTimeout" : 0,
+ "webAuthnPolicyPasswordlessAvoidSameAuthenticatorRegister" : false,
+ "webAuthnPolicyPasswordlessAcceptableAaguids" : [ ],
+ "scopeMappings" : [ {
+ "clientScope" : "rabbitmq.tag:administrator",
+ "roles" : [ "escalated-broker-handling" ]
+ }, {
+ "clientScope" : "rabbitmq.tag:management",
+ "roles" : [ "default-broker-handling" ]
+ } ],
+ "clientScopeMappings" : {
+ "account" : [ {
+ "client" : "account-console",
+ "roles" : [ "manage-account", "view-groups" ]
+ } ]
+ },
+ "clients" : [ {
+ "id" : "e767a4a6-79e9-4e08-82b7-1076e1a09142",
+ "clientId" : "account",
+ "name" : "${client_account}",
+ "rootUrl" : "${authBaseUrl}",
+ "baseUrl" : "/realms/dbrepo/account/",
+ "surrogateAuthRequired" : false,
+ "enabled" : true,
+ "alwaysDisplayInConsole" : false,
+ "clientAuthenticatorType" : "client-secret",
+ "redirectUris" : [ "/realms/dbrepo/account/*" ],
+ "webOrigins" : [ ],
+ "notBefore" : 0,
+ "bearerOnly" : false,
+ "consentRequired" : false,
+ "standardFlowEnabled" : true,
+ "implicitFlowEnabled" : false,
+ "directAccessGrantsEnabled" : false,
+ "serviceAccountsEnabled" : false,
+ "publicClient" : true,
+ "frontchannelLogout" : false,
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "post.logout.redirect.uris" : "+"
+ },
+ "authenticationFlowBindingOverrides" : { },
+ "fullScopeAllowed" : false,
+ "nodeReRegistrationTimeout" : 0,
+ "defaultClientScopes" : [ "web-origins", "acr", "profile", "roles", "email" ],
+ "optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
+ }, {
+ "id" : "d3c4a04e-39ce-4549-a34a-11e25774cd96",
+ "clientId" : "account-console",
+ "name" : "${client_account-console}",
+ "rootUrl" : "${authBaseUrl}",
+ "baseUrl" : "/realms/dbrepo/account/",
+ "surrogateAuthRequired" : false,
+ "enabled" : true,
+ "alwaysDisplayInConsole" : false,
+ "clientAuthenticatorType" : "client-secret",
+ "redirectUris" : [ "/realms/dbrepo/account/*" ],
+ "webOrigins" : [ ],
+ "notBefore" : 0,
+ "bearerOnly" : false,
+ "consentRequired" : false,
+ "standardFlowEnabled" : true,
+ "implicitFlowEnabled" : false,
+ "directAccessGrantsEnabled" : false,
+ "serviceAccountsEnabled" : false,
+ "publicClient" : true,
+ "frontchannelLogout" : false,
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "post.logout.redirect.uris" : "+",
+ "pkce.code.challenge.method" : "S256"
+ },
+ "authenticationFlowBindingOverrides" : { },
+ "fullScopeAllowed" : false,
+ "nodeReRegistrationTimeout" : 0,
+ "protocolMappers" : [ {
+ "id" : "22d90d9c-9881-474c-8dfd-a62c808a9f1c",
+ "name" : "audience resolve",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-audience-resolve-mapper",
+ "consentRequired" : false,
+ "config" : { }
+ } ],
+ "defaultClientScopes" : [ "web-origins", "acr", "profile", "roles", "email" ],
+ "optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
+ }, {
+ "id" : "81ef0f59-a5ca-4be4-a1d1-0c32edf1cfd6",
+ "clientId" : "admin-cli",
+ "name" : "${client_admin-cli}",
+ "surrogateAuthRequired" : false,
+ "enabled" : true,
+ "alwaysDisplayInConsole" : false,
+ "clientAuthenticatorType" : "client-secret",
+ "redirectUris" : [ ],
+ "webOrigins" : [ ],
+ "notBefore" : 0,
+ "bearerOnly" : false,
+ "consentRequired" : false,
+ "standardFlowEnabled" : false,
+ "implicitFlowEnabled" : false,
+ "directAccessGrantsEnabled" : true,
+ "serviceAccountsEnabled" : false,
+ "publicClient" : true,
+ "frontchannelLogout" : false,
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "post.logout.redirect.uris" : "+"
+ },
+ "authenticationFlowBindingOverrides" : { },
+ "fullScopeAllowed" : false,
+ "nodeReRegistrationTimeout" : 0,
+ "defaultClientScopes" : [ "web-origins", "acr", "profile", "roles", "email" ],
+ "optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
+ }, {
+ "id" : "88694c91-753d-4c44-9740-ec9ac06bba45",
+ "clientId" : "broker",
+ "name" : "${client_broker}",
+ "surrogateAuthRequired" : false,
+ "enabled" : true,
+ "alwaysDisplayInConsole" : false,
+ "clientAuthenticatorType" : "client-secret",
+ "redirectUris" : [ ],
+ "webOrigins" : [ ],
+ "notBefore" : 0,
+ "bearerOnly" : true,
+ "consentRequired" : false,
+ "standardFlowEnabled" : true,
+ "implicitFlowEnabled" : false,
+ "directAccessGrantsEnabled" : false,
+ "serviceAccountsEnabled" : false,
+ "publicClient" : false,
+ "frontchannelLogout" : false,
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "post.logout.redirect.uris" : "+"
+ },
+ "authenticationFlowBindingOverrides" : { },
+ "fullScopeAllowed" : false,
+ "nodeReRegistrationTimeout" : 0,
+ "defaultClientScopes" : [ "web-origins", "acr", "profile", "roles", "email" ],
+ "optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
+ }, {
+ "id" : "6b7ef364-4132-4831-b4e2-b6e9e9dc63ee",
+ "clientId" : "dbrepo-client",
+ "name" : "${dbrepo-client}",
+ "description" : "",
+ "rootUrl" : "",
+ "adminUrl" : "",
+ "baseUrl" : "",
+ "surrogateAuthRequired" : false,
+ "enabled" : true,
+ "alwaysDisplayInConsole" : true,
+ "clientAuthenticatorType" : "client-secret",
+ "secret" : "MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG",
+ "redirectUris" : [ "*" ],
+ "webOrigins" : [ "*" ],
+ "notBefore" : 0,
+ "bearerOnly" : false,
+ "consentRequired" : false,
+ "standardFlowEnabled" : true,
+ "implicitFlowEnabled" : false,
+ "directAccessGrantsEnabled" : true,
+ "serviceAccountsEnabled" : false,
+ "publicClient" : false,
+ "frontchannelLogout" : true,
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "oidc.ciba.grant.enabled" : "false",
+ "client.secret.creation.time" : "1680085365",
+ "backchannel.logout.session.required" : "true",
+ "post.logout.redirect.uris" : "*",
+ "oauth2.device.authorization.grant.enabled" : "false",
+ "backchannel.logout.revoke.offline.tokens" : "false"
+ },
+ "authenticationFlowBindingOverrides" : { },
+ "fullScopeAllowed" : true,
+ "nodeReRegistrationTimeout" : -1,
+ "protocolMappers" : [ {
+ "id" : "da0b27c1-ae2e-4baa-bf78-db233e15c78d",
+ "name" : "preferred_username",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-property-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "user.attribute" : "username",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "preferred_username",
+ "userinfo.token.claim" : "true"
+ }
+ }, {
+ "id" : "7c94de93-f60f-487b-b4b7-1891c67f74cc",
+ "name" : "aud",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-hardcoded-claim-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "claim.value" : "dbrepo",
+ "userinfo.token.claim" : "true",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "aud",
+ "access.tokenResponse.claim" : "false"
+ }
+ }, {
+ "id" : "030a1cd9-53d1-4a62-a375-94d50a2dc6fc",
+ "name" : "uid",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "aggregate.attrs" : "false",
+ "multivalued" : "false",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "LDAP_ID",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "uid"
+ }
+ } ],
+ "defaultClientScopes" : [ "roles", "attributes" ],
+ "optionalClientScopes" : [ "rabbitmq.read:*/*", "web-origins", "acr", "rabbitmq.write:*/*", "address", "phone", "offline_access", "profile", "microprofile-jwt", "email", "rabbitmq.configure:*/*" ]
+ }, {
+ "id" : "25741f6b-4867-4138-8238-6345c6ba8702",
+ "clientId" : "rabbitmq-client",
+ "name" : "${rabbitmq-client}",
+ "description" : "",
+ "rootUrl" : "",
+ "adminUrl" : "",
+ "baseUrl" : "",
+ "surrogateAuthRequired" : false,
+ "enabled" : true,
+ "alwaysDisplayInConsole" : false,
+ "clientAuthenticatorType" : "client-secret",
+ "secret" : "JEC2FexxrX4N65fLeDGukAl6R3Lc9y0u",
+ "redirectUris" : [ "*" ],
+ "webOrigins" : [ ],
+ "notBefore" : 0,
+ "bearerOnly" : false,
+ "consentRequired" : false,
+ "standardFlowEnabled" : true,
+ "implicitFlowEnabled" : false,
+ "directAccessGrantsEnabled" : true,
+ "serviceAccountsEnabled" : false,
+ "publicClient" : false,
+ "frontchannelLogout" : true,
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "oidc.ciba.grant.enabled" : "false",
+ "client.secret.creation.time" : "1680000860",
+ "backchannel.logout.session.required" : "true",
+ "post.logout.redirect.uris" : "*",
+ "oauth2.device.authorization.grant.enabled" : "false",
+ "backchannel.logout.revoke.offline.tokens" : "false"
+ },
+ "authenticationFlowBindingOverrides" : { },
+ "fullScopeAllowed" : false,
+ "nodeReRegistrationTimeout" : -1,
+ "protocolMappers" : [ {
+ "id" : "01a937ed-f0e8-4137-80f3-3be3c447f7fb",
+ "name" : "username",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-property-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "userinfo.token.claim" : "false",
+ "user.attribute" : "username",
+ "id.token.claim" : "false",
+ "access.token.claim" : "true",
+ "claim.name" : "client_id",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "f1afc22d-f595-403b-ba2e-6ab19d98205e",
+ "name" : "Audience",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-hardcoded-claim-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "claim.value" : "rabbitmq",
+ "userinfo.token.claim" : "false",
+ "id.token.claim" : "false",
+ "access.token.claim" : "true",
+ "claim.name" : "aud",
+ "access.tokenResponse.claim" : "false"
+ }
+ } ],
+ "defaultClientScopes" : [ "web-origins", "acr", "rabbitmq.tag:management" ],
+ "optionalClientScopes" : [ "rabbitmq.read:*/*", "rabbitmq.write:*/*", "address", "phone", "offline_access", "profile", "roles", "microprofile-jwt", "email", "rabbitmq.configure:*/*" ]
+ }, {
+ "id" : "cfffd5d0-aa19-4057-8ca0-f2c51ca0e930",
+ "clientId" : "realm-management",
+ "name" : "${client_realm-management}",
+ "surrogateAuthRequired" : false,
+ "enabled" : true,
+ "alwaysDisplayInConsole" : false,
+ "clientAuthenticatorType" : "client-secret",
+ "redirectUris" : [ ],
+ "webOrigins" : [ ],
+ "notBefore" : 0,
+ "bearerOnly" : true,
+ "consentRequired" : false,
+ "standardFlowEnabled" : true,
+ "implicitFlowEnabled" : false,
+ "directAccessGrantsEnabled" : false,
+ "serviceAccountsEnabled" : false,
+ "publicClient" : false,
+ "frontchannelLogout" : false,
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "post.logout.redirect.uris" : "+"
+ },
+ "authenticationFlowBindingOverrides" : { },
+ "fullScopeAllowed" : false,
+ "nodeReRegistrationTimeout" : 0,
+ "defaultClientScopes" : [ "web-origins", "acr", "profile", "roles", "email" ],
+ "optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
+ }, {
+ "id" : "f205c451-9524-4380-acc3-947f7ecb6b7c",
+ "clientId" : "security-admin-console",
+ "name" : "${client_security-admin-console}",
+ "rootUrl" : "${authAdminUrl}",
+ "baseUrl" : "/admin/dbrepo/console/",
+ "surrogateAuthRequired" : false,
+ "enabled" : true,
+ "alwaysDisplayInConsole" : false,
+ "clientAuthenticatorType" : "client-secret",
+ "redirectUris" : [ "/admin/dbrepo/console/*" ],
+ "webOrigins" : [ "+" ],
+ "notBefore" : 0,
+ "bearerOnly" : false,
+ "consentRequired" : false,
+ "standardFlowEnabled" : true,
+ "implicitFlowEnabled" : false,
+ "directAccessGrantsEnabled" : false,
+ "serviceAccountsEnabled" : false,
+ "publicClient" : true,
+ "frontchannelLogout" : false,
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "post.logout.redirect.uris" : "+",
+ "pkce.code.challenge.method" : "S256"
+ },
+ "authenticationFlowBindingOverrides" : { },
+ "fullScopeAllowed" : false,
+ "nodeReRegistrationTimeout" : 0,
+ "protocolMappers" : [ {
+ "id" : "c4d54410-3f22-4259-9571-94da2c43b752",
+ "name" : "locale",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "locale",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "locale",
+ "jsonType.label" : "String"
+ }
+ } ],
+ "defaultClientScopes" : [ "web-origins", "acr", "profile", "roles", "email" ],
+ "optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
+ } ],
+ "clientScopes" : [ {
+ "id" : "69f4ecf0-4165-49ab-bf0d-38409b15b706",
+ "name" : "rabbitmq.tag:administrator",
+ "description" : "administrator",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "include.in.token.scope" : "true",
+ "display.on.consent.screen" : "true",
+ "gui.order" : "",
+ "consent.screen.text" : ""
+ }
+ }, {
+ "id" : "7f6e9b44-e2eb-417d-b0fe-db820c9a6564",
+ "name" : "email",
+ "description" : "OpenID Connect built-in scope: email",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "include.in.token.scope" : "true",
+ "display.on.consent.screen" : "true",
+ "consent.screen.text" : "${emailScopeConsentText}"
+ },
+ "protocolMappers" : [ {
+ "id" : "782819fe-ba5d-4ddb-9f95-cabb69d79c8d",
+ "name" : "email verified",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-property-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "emailVerified",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "email_verified",
+ "jsonType.label" : "boolean"
+ }
+ }, {
+ "id" : "ca613fc8-bbf2-4240-8b33-a1874f1559f3",
+ "name" : "email",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-property-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "email",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "email",
+ "jsonType.label" : "String"
+ }
+ } ]
+ }, {
+ "id" : "b9da268f-6745-49dc-a764-3c54e385accc",
+ "name" : "profile",
+ "description" : "OpenID Connect built-in scope: profile",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "include.in.token.scope" : "true",
+ "display.on.consent.screen" : "true",
+ "consent.screen.text" : "${profileScopeConsentText}"
+ },
+ "protocolMappers" : [ {
+ "id" : "84f0487a-1d7d-470c-9b8e-5835294ae235",
+ "name" : "username",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-property-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "username",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "preferred_username",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "bbdcdb36-3ec0-443d-b1af-9993d40f0567",
+ "name" : "gender",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "gender",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "gender",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "9faa870b-5491-4ce9-b27d-c9ce07d6a95e",
+ "name" : "birthdate",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "birthdate",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "birthdate",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "f0e3c012-9523-4076-83ae-e466e2d08220",
+ "name" : "full name",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-full-name-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "userinfo.token.claim" : "true"
+ }
+ }, {
+ "id" : "f757d8ec-e181-429c-9287-9ad0600b061f",
+ "name" : "profile",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "profile",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "profile",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "18cfbf4b-0a8e-45c7-a832-c0f72c92f3f3",
+ "name" : "updated at",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "updatedAt",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "updated_at",
+ "jsonType.label" : "long"
+ }
+ }, {
+ "id" : "841ea785-26ab-429a-a420-09ce3948924d",
+ "name" : "family name",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-property-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "lastName",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "family_name",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "bfba13ff-f952-4e89-bbb1-a693fdebfae8",
+ "name" : "website",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "website",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "website",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "475f071d-5149-4379-b928-76482f5f519c",
+ "name" : "zoneinfo",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "zoneinfo",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "zoneinfo",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "b8bebfed-b5e9-4604-a0ee-9817f7d439ac",
+ "name" : "middle name",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "middleName",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "middle_name",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "445232c8-6830-476c-a6f1-8bbef167595a",
+ "name" : "picture",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "picture",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "picture",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "65f2e474-6ede-4872-86e4-e49504dd0f2a",
+ "name" : "locale",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "locale",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "locale",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "16cd5a27-ccf3-453c-ae1e-8621813ab73c",
+ "name" : "given name",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-property-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "firstName",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "given_name",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "f9efedfc-3388-457c-b10a-1dff4525ff9b",
+ "name" : "nickname",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "nickname",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "nickname",
+ "jsonType.label" : "String"
+ }
+ } ]
+ }, {
+ "id" : "627fa054-08eb-4206-af71-9e838e984b8b",
+ "name" : "microprofile-jwt",
+ "description" : "Microprofile - JWT built-in scope",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "include.in.token.scope" : "true",
+ "display.on.consent.screen" : "false"
+ },
+ "protocolMappers" : [ {
+ "id" : "e6cc53e5-5d7e-468e-88c8-0737dd3dc759",
+ "name" : "groups",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-realm-role-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "multivalued" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "foo",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "groups",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "83b4444c-10fc-44e8-a0c0-0c1da1f9bba3",
+ "name" : "upn",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-property-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "username",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "upn",
+ "jsonType.label" : "String"
+ }
+ } ]
+ }, {
+ "id" : "4122ff9e-ad3c-4142-afc6-9aefdecfc86d",
+ "name" : "role_list",
+ "description" : "SAML role list",
+ "protocol" : "saml",
+ "attributes" : {
+ "consent.screen.text" : "${samlRoleListScopeConsentText}",
+ "display.on.consent.screen" : "true"
+ },
+ "protocolMappers" : [ {
+ "id" : "bb0747fa-c008-4af3-93be-e7739650ebd5",
+ "name" : "role list",
+ "protocol" : "saml",
+ "protocolMapper" : "saml-role-list-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "single" : "false",
+ "attribute.nameformat" : "Basic",
+ "attribute.name" : "Role"
+ }
+ } ]
+ }, {
+ "id" : "2e76447d-fbe7-4fa7-a16c-54a381b960ae",
+ "name" : "rabbitmq.configure:*/*",
+ "description" : "",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "include.in.token.scope" : "true",
+ "display.on.consent.screen" : "false",
+ "gui.order" : "",
+ "consent.screen.text" : ""
+ }
+ }, {
+ "id" : "52aad832-c6c4-49df-8a04-6ad4a406fdfa",
+ "name" : "phone",
+ "description" : "OpenID Connect built-in scope: phone",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "include.in.token.scope" : "true",
+ "display.on.consent.screen" : "true",
+ "consent.screen.text" : "${phoneScopeConsentText}"
+ },
+ "protocolMappers" : [ {
+ "id" : "dae802fb-9138-408a-b80e-a40eb0f56814",
+ "name" : "phone number",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "phoneNumber",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "phone_number",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "feb06a8d-b0eb-4911-8464-368d93f566fa",
+ "name" : "phone number verified",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "phoneNumberVerified",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "phone_number_verified",
+ "jsonType.label" : "boolean"
+ }
+ } ]
+ }, {
+ "id" : "f64d64e8-57ce-4eb2-b99e-9f02fdbd99f9",
+ "name" : "web-origins",
+ "description" : "OpenID Connect scope for add allowed web origins to the access token",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "include.in.token.scope" : "false",
+ "display.on.consent.screen" : "false",
+ "consent.screen.text" : ""
+ },
+ "protocolMappers" : [ {
+ "id" : "c6411e3b-6478-453d-b530-5fe175a4d786",
+ "name" : "allowed web origins",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-allowed-origins-mapper",
+ "consentRequired" : false,
+ "config" : { }
+ } ]
+ }, {
+ "id" : "55341d34-0086-4173-ae61-d9b175b179d8",
+ "name" : "acr",
+ "description" : "OpenID Connect scope for add acr (authentication context class reference) to the token",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "include.in.token.scope" : "false",
+ "display.on.consent.screen" : "false"
+ },
+ "protocolMappers" : [ {
+ "id" : "58ea3217-0fff-4207-9d08-919f5493b629",
+ "name" : "acr loa level",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-acr-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "userinfo.token.claim" : "true"
+ }
+ } ]
+ }, {
+ "id" : "a02c2c38-923c-46ec-9899-321412b388e5",
+ "name" : "attributes",
+ "description" : "User Attributes",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "include.in.token.scope" : "false",
+ "display.on.consent.screen" : "false",
+ "gui.order" : "",
+ "consent.screen.text" : ""
+ },
+ "protocolMappers" : [ {
+ "id" : "78c461c1-f3f9-4d10-8835-097f13bdcd60",
+ "name" : "Theme",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "aggregate.attrs" : "false",
+ "multivalued" : "false",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "theme_dark",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "attributes.theme_dark"
+ }
+ } ]
+ }, {
+ "id" : "06062e22-89c0-4e1d-a25b-2483903b02d5",
+ "name" : "rabbitmq.write:*/*",
+ "description" : "",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "include.in.token.scope" : "true",
+ "display.on.consent.screen" : "false",
+ "gui.order" : "",
+ "consent.screen.text" : ""
+ }
+ }, {
+ "id" : "db63e03b-7918-492f-997b-f2dda98f3b39",
+ "name" : "rabbitmq.tag:management",
+ "description" : "management",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "include.in.token.scope" : "true",
+ "display.on.consent.screen" : "true",
+ "gui.order" : "",
+ "consent.screen.text" : ""
+ }
+ }, {
+ "id" : "210cc792-6c07-45a6-a77e-827cdf3b41ba",
+ "name" : "offline_access",
+ "description" : "OpenID Connect built-in scope: offline_access",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "consent.screen.text" : "${offlineAccessScopeConsentText}",
+ "display.on.consent.screen" : "true"
+ }
+ }, {
+ "id" : "425abf4a-2ee2-431d-aa92-e373a36fe556",
+ "name" : "address",
+ "description" : "OpenID Connect built-in scope: address",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "include.in.token.scope" : "true",
+ "display.on.consent.screen" : "true",
+ "consent.screen.text" : "${addressScopeConsentText}"
+ },
+ "protocolMappers" : [ {
+ "id" : "8d4ffe4d-1d01-4ca1-8ff4-44eacca61b30",
+ "name" : "address",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-address-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "user.attribute.formatted" : "formatted",
+ "user.attribute.country" : "country",
+ "user.attribute.postal_code" : "postal_code",
+ "userinfo.token.claim" : "true",
+ "user.attribute.street" : "street",
+ "id.token.claim" : "true",
+ "user.attribute.region" : "region",
+ "access.token.claim" : "true",
+ "user.attribute.locality" : "locality"
+ }
+ } ]
+ }, {
+ "id" : "c96f0b73-ea79-4b46-93ef-d1092297f855",
+ "name" : "rabbitmq.read:*/*",
+ "description" : "",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "include.in.token.scope" : "true",
+ "display.on.consent.screen" : "false",
+ "gui.order" : "",
+ "consent.screen.text" : ""
+ }
+ }, {
+ "id" : "37f61543-dad7-4a82-8e10-77acdd1eefdc",
+ "name" : "roles",
+ "description" : "OpenID Connect scope for add user roles to the access token",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "include.in.token.scope" : "false",
+ "display.on.consent.screen" : "true",
+ "consent.screen.text" : "${rolesScopeConsentText}"
+ },
+ "protocolMappers" : [ {
+ "id" : "3b6b6914-8ad1-4a71-88ec-444f754aaacb",
+ "name" : "audience resolve",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-audience-resolve-mapper",
+ "consentRequired" : false,
+ "config" : { }
+ }, {
+ "id" : "2defedf5-9af3-4531-822c-a879dedcd29d",
+ "name" : "realm roles",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-realm-role-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "user.attribute" : "foo",
+ "access.token.claim" : "true",
+ "claim.name" : "realm_access.roles",
+ "jsonType.label" : "String",
+ "multivalued" : "true"
+ }
+ }, {
+ "id" : "a7bd6723-e58e-47f7-95c0-2925ce99283d",
+ "name" : "client roles",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-client-role-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "user.attribute" : "foo",
+ "access.token.claim" : "true",
+ "claim.name" : "resource_access.${client_id}.roles",
+ "jsonType.label" : "String",
+ "multivalued" : "true"
+ }
+ } ]
+ } ],
+ "defaultDefaultClientScopes" : [ "rabbitmq.tag:administrator", "rabbitmq.tag:management" ],
+ "defaultOptionalClientScopes" : [ "rabbitmq.write:*/*", "offline_access", "rabbitmq.configure:*/*", "roles", "role_list", "address", "phone", "acr", "microprofile-jwt", "email", "attributes", "profile", "rabbitmq.read:*/*", "web-origins" ],
+ "browserSecurityHeaders" : {
+ "contentSecurityPolicyReportOnly" : "",
+ "xContentTypeOptions" : "nosniff",
+ "xRobotsTag" : "none",
+ "xFrameOptions" : "SAMEORIGIN",
+ "contentSecurityPolicy" : "frame-src 'self'; frame-ancestors 'self'; object-src 'none';",
+ "xXSSProtection" : "1; mode=block",
+ "strictTransportSecurity" : "max-age=31536000; includeSubDomains"
+ },
+ "smtpServer" : { },
+ "eventsEnabled" : false,
+ "eventsListeners" : [ "jboss-logging" ],
+ "enabledEventTypes" : [ "SEND_RESET_PASSWORD", "UPDATE_CONSENT_ERROR", "GRANT_CONSENT", "VERIFY_PROFILE_ERROR", "REMOVE_TOTP", "REVOKE_GRANT", "UPDATE_TOTP", "LOGIN_ERROR", "CLIENT_LOGIN", "RESET_PASSWORD_ERROR", "IMPERSONATE_ERROR", "CODE_TO_TOKEN_ERROR", "CUSTOM_REQUIRED_ACTION", "OAUTH2_DEVICE_CODE_TO_TOKEN_ERROR", "RESTART_AUTHENTICATION", "IMPERSONATE", "UPDATE_PROFILE_ERROR", "LOGIN", "OAUTH2_DEVICE_VERIFY_USER_CODE", "UPDATE_PASSWORD_ERROR", "CLIENT_INITIATED_ACCOUNT_LINKING", "TOKEN_EXCHANGE", "AUTHREQID_TO_TOKEN", "LOGOUT", "REGISTER", "DELETE_ACCOUNT_ERROR", "CLIENT_REGISTER", "IDENTITY_PROVIDER_LINK_ACCOUNT", "DELETE_ACCOUNT", "UPDATE_PASSWORD", "CLIENT_DELETE", "FEDERATED_IDENTITY_LINK_ERROR", "IDENTITY_PROVIDER_FIRST_LOGIN", "CLIENT_DELETE_ERROR", "VERIFY_EMAIL", "CLIENT_LOGIN_ERROR", "RESTART_AUTHENTICATION_ERROR", "EXECUTE_ACTIONS", "REMOVE_FEDERATED_IDENTITY_ERROR", "TOKEN_EXCHANGE_ERROR", "PERMISSION_TOKEN", "SEND_IDENTITY_PROVIDER_LINK_ERROR", "EXECUTE_ACTION_TOKEN_ERROR", "SEND_VERIFY_EMAIL", "OAUTH2_DEVICE_AUTH", "EXECUTE_ACTIONS_ERROR", "REMOVE_FEDERATED_IDENTITY", "OAUTH2_DEVICE_CODE_TO_TOKEN", "IDENTITY_PROVIDER_POST_LOGIN", "IDENTITY_PROVIDER_LINK_ACCOUNT_ERROR", "OAUTH2_DEVICE_VERIFY_USER_CODE_ERROR", "UPDATE_EMAIL", "REGISTER_ERROR", "REVOKE_GRANT_ERROR", "EXECUTE_ACTION_TOKEN", "LOGOUT_ERROR", "UPDATE_EMAIL_ERROR", "CLIENT_UPDATE_ERROR", "AUTHREQID_TO_TOKEN_ERROR", "UPDATE_PROFILE", "CLIENT_REGISTER_ERROR", "FEDERATED_IDENTITY_LINK", "SEND_IDENTITY_PROVIDER_LINK", "SEND_VERIFY_EMAIL_ERROR", "RESET_PASSWORD", "CLIENT_INITIATED_ACCOUNT_LINKING_ERROR", "OAUTH2_DEVICE_AUTH_ERROR", "UPDATE_CONSENT", "REMOVE_TOTP_ERROR", "VERIFY_EMAIL_ERROR", "SEND_RESET_PASSWORD_ERROR", "CLIENT_UPDATE", "CUSTOM_REQUIRED_ACTION_ERROR", "IDENTITY_PROVIDER_POST_LOGIN_ERROR", "UPDATE_TOTP_ERROR", "CODE_TO_TOKEN", "VERIFY_PROFILE", "GRANT_CONSENT_ERROR", "IDENTITY_PROVIDER_FIRST_LOGIN_ERROR" ],
+ "adminEventsEnabled" : false,
+ "adminEventsDetailsEnabled" : false,
+ "identityProviders" : [ ],
+ "identityProviderMappers" : [ ],
+ "components" : {
+ "org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy" : [ {
+ "id" : "4d3f9f14-f5d2-4b0c-8ea7-e6d078aa2191",
+ "name" : "Max Clients Limit",
+ "providerId" : "max-clients",
+ "subType" : "anonymous",
+ "subComponents" : { },
+ "config" : {
+ "max-clients" : [ "200" ]
+ }
+ }, {
+ "id" : "f35bce67-1e75-408b-b065-52183368d4fd",
+ "name" : "Allowed Client Scopes",
+ "providerId" : "allowed-client-templates",
+ "subType" : "anonymous",
+ "subComponents" : { },
+ "config" : {
+ "allow-default-scopes" : [ "true" ]
+ }
+ }, {
+ "id" : "1849e52a-b8c9-44a8-af3d-ee19376a1ed1",
+ "name" : "Trusted Hosts",
+ "providerId" : "trusted-hosts",
+ "subType" : "anonymous",
+ "subComponents" : { },
+ "config" : {
+ "host-sending-registration-request-must-match" : [ "true" ],
+ "client-uris-must-match" : [ "true" ]
+ }
+ }, {
+ "id" : "f565cb47-3bcf-4078-8f94-eb4179c375b8",
+ "name" : "Full Scope Disabled",
+ "providerId" : "scope",
+ "subType" : "anonymous",
+ "subComponents" : { },
+ "config" : { }
+ }, {
+ "id" : "0efa669d-1017-4b4a-82e1-c2eaf72de2c9",
+ "name" : "Allowed Client Scopes",
+ "providerId" : "allowed-client-templates",
+ "subType" : "authenticated",
+ "subComponents" : { },
+ "config" : {
+ "allow-default-scopes" : [ "true" ]
+ }
+ }, {
+ "id" : "528fb423-d66e-472e-9120-1f03ba9e0f18",
+ "name" : "Consent Required",
+ "providerId" : "consent-required",
+ "subType" : "anonymous",
+ "subComponents" : { },
+ "config" : { }
+ }, {
+ "id" : "104ec5a9-025b-4c44-8ac0-82d22887ca3e",
+ "name" : "Allowed Protocol Mapper Types",
+ "providerId" : "allowed-protocol-mappers",
+ "subType" : "authenticated",
+ "subComponents" : { },
+ "config" : {
+ "allowed-protocol-mapper-types" : [ "oidc-address-mapper", "saml-user-property-mapper", "saml-role-list-mapper", "oidc-usermodel-property-mapper", "oidc-usermodel-attribute-mapper", "saml-user-attribute-mapper", "oidc-sha256-pairwise-sub-mapper", "oidc-full-name-mapper" ]
+ }
+ }, {
+ "id" : "3ab11d74-5e76-408a-b85a-26bf8950f979",
+ "name" : "Allowed Protocol Mapper Types",
+ "providerId" : "allowed-protocol-mappers",
+ "subType" : "anonymous",
+ "subComponents" : { },
+ "config" : {
+ "allowed-protocol-mapper-types" : [ "oidc-full-name-mapper", "oidc-sha256-pairwise-sub-mapper", "oidc-usermodel-attribute-mapper", "saml-role-list-mapper", "oidc-address-mapper", "oidc-usermodel-property-mapper", "saml-user-property-mapper", "saml-user-attribute-mapper" ]
+ }
+ } ],
+ "org.keycloak.keys.KeyProvider" : [ {
+ "id" : "28ca0b6d-b2e2-4785-b04b-2391e6344e30",
+ "name" : "aes-generated",
+ "providerId" : "aes-generated",
+ "subComponents" : { },
+ "config" : {
+ "kid" : [ "6dc4834f-a1de-4cfe-a29d-e84ac8e9b1a8" ],
+ "secret" : [ "HpuzG_jWYKwypLeoPEMC4A" ],
+ "priority" : [ "100" ]
+ }
+ }, {
+ "id" : "bd7945cf-6d35-4e03-9c3a-197f2dc76973",
+ "name" : "hmac-generated",
+ "providerId" : "hmac-generated",
+ "subComponents" : { },
+ "config" : {
+ "kid" : [ "c8500166-5cc4-4085-ad0f-853c3b0b0233" ],
+ "secret" : [ "TI3xg__G2Qy8C47DracpYir2X4ItQZSrhgr5KSlwRNISDbBqZ-ky3OcAyokSXMcpweSOaCPvbivpvzJNklUBvw" ],
+ "priority" : [ "100" ],
+ "algorithm" : [ "HS256" ]
+ }
+ }, {
+ "id" : "2f53ccf3-37b0-4d34-83e7-ed497499ee51",
+ "name" : "rsa-enc-generated",
+ "providerId" : "rsa-enc-generated",
+ "subComponents" : { },
+ "config" : {
+ "privateKey" : [ "MIIEowIBAAKCAQEA3b1tNLfcjFLUw9UShVDNf+ZD8sQqb4YBaIXcSJTX/zDQUPiCp176BBGI3s4VplDArnOW+LumozmKogeoHEnGEIDW8ovgK5uMU9tSA2p0qqGBUMOdR8YATTIfCJe7qGiiuGa3WZy3sQLM70SuRzx02YU8gvUcvl2Js4KyqAziOUX/w3Wa59H9jjGNUXYyqaPWJp73eHzbVYWySzyLG22mVlcUtBx5siL5T2/Xu0p9z4l7/bapwwmOVi1ZrcHjbEAwdGEiSMGI/uWqAF+r1BRpmJLR7HNXcL3eK4/56VYLaiwSejfyYeRFMITEn/UxGYhcXZ5xMUUCG0TxjBhLYpTBuwIDAQABAoIBAA4dwebcxkrH99Poa8+WkiE7JgaS9sahx9OBI2xwJANoIU2TpzGuNLQZ76uLgB+rPWZTD9Xm5a1iJjwOyQ9/937TzPCk91D0tpgcusRikb8jx/6TGB9acL4kBjYUVCCHr3BA2G75MKKGtJ2OMvAbCQSosZj+r2VDwYFEPUkV2jheE5JHSBkwyIRrus3JCwu8gu5fyCg9z8ljcxJxI5HIsi4v8Z21aCw/cLj7h5cMt44wCjQz4rOfYNBEFeHDtlfR1QtWKgjm4ZHHJbKrzf9b2kQXclziceEbSM0tYbROEXKi+s0Zc+z3HEG89vv0vfN400clmzzIAijKY6gg3pPRWdECgYEA+lnWYbSlXDMNYx6RBXm1RnlMUYIm4oy4/9ljgnoGJ6WCn3SjFkgaDtiKfGIG1BSB85r04pAPANgcWHf5tWDnq0ARvBVG0BX2bKd++7B3D4d3CRYKCwm88SslJXv9dfHVhq4+zViFPiUWwT20A72jCuUCvL88y5fh/YBecfdh+jECgYEA4r5RD0NB9dMaeg5/jk/GEHIo4Z9KLc6FrSoOFo2xFkPOy1sgDpDOiNtypuWvniO7k7Ose3DS3hlfTMsKzIW/CgQJ20+Y4cvBWDaOsRxfjj7w3d+jH5OSJdKKSzTrgLKc9ZhlRzVXy0J0hipIA6HG5kdVdLXmh85ITmf1CbJhE6sCgYBjPVeBNbXTHZ2x6/z62aslO5IoQVqetb/kE82hfDOSZcao5Ph9Lam+ttH2ynkAevykj4mBgi+gWwqpey2uW7KaLPSaxShj9kDQA3mP1fzsV/u0y1rB02Nlin/YIxVvOqU1FT9p8SwoXVVu1sHUNck62VtDbN9xqUx5S/ikXrclEQKBgQCoTssOwEcK+Vty9KYcdfy4onTUHZBLdjxl8Iyqkxy7QTQUYRznkvesQPDXEDGO+kk3dyx2KKZt9Hl4IFNww2quPZcvcuMx4DQxjbXXpA8OIIxcta95NepLJwA+mRai3nKCH1A2TlNP7pFeMa5o+8IPly3Ix2lKr4Wepa4PN5i1pwKBgCZ1QP6XAOERl9NznNmU0rXVcvYNP4PIIfQWfvGsldZ4QKkmjjAGiS0/oYqdWs+UDRZyCRChaVjDXO9fk0PEG5OGKAj9nyiYCT/M8xtJ3UeP5ffZZvJ/vnye3QdDIo1e38ZzsWwJHmLYw7fRqY9W5Vxo0Vsy22U3CJY70KTxVdTy" ],
+ "keyUse" : [ "ENC" ],
+ "certificate" : [ "MIICmzCCAYMCBgGG3GWycDANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZkYnJlcG8wHhcNMjMwMzEzMTkxMzE3WhcNMzMwMzEzMTkxNDU3WjARMQ8wDQYDVQQDDAZkYnJlcG8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDdvW00t9yMUtTD1RKFUM1/5kPyxCpvhgFohdxIlNf/MNBQ+IKnXvoEEYjezhWmUMCuc5b4u6ajOYqiB6gcScYQgNbyi+Arm4xT21IDanSqoYFQw51HxgBNMh8Il7uoaKK4ZrdZnLexAszvRK5HPHTZhTyC9Ry+XYmzgrKoDOI5Rf/DdZrn0f2OMY1RdjKpo9Ymnvd4fNtVhbJLPIsbbaZWVxS0HHmyIvlPb9e7Sn3PiXv9tqnDCY5WLVmtweNsQDB0YSJIwYj+5aoAX6vUFGmYktHsc1dwvd4rj/npVgtqLBJ6N/Jh5EUwhMSf9TEZiFxdnnExRQIbRPGMGEtilMG7AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAK3kQ1VkQrzvSWvmXmazmNoA1ZiPzRDs1XhGUWxgsxzgPylr3dGBuqQbKvgnLUBQLSqlJHpI4fZflHswu1qrvVZYtekPcGef4WhcKAu2i1RwxrKa6RJQ1tRbrLuVYCzPv5p/DWgltWVn88aoLnqQn0SK/0PB/o4a4Cm7Kq2ZzCr1dACBr06LvOHsc7249OySmbG4HH+pLK6jVURhZ9VaObqAHe2FJBVVoIzURbdiRRURqumrIvbnpeaU1aFyg6ED5wTnXvmMPmVPt9F79mcB33bASO5wyu00X8t1hyN2Show2l2vxLACGUzVkTQt15s7uDLKE7qLmKSR3EuSGXWv3wA=" ],
+ "priority" : [ "100" ],
+ "algorithm" : [ "RSA-OAEP" ]
+ }
+ }, {
+ "id" : "2293ff99-3c6d-46d1-8635-5e679d5b134a",
+ "name" : "rsa-generated",
+ "providerId" : "rsa-generated",
+ "subComponents" : { },
+ "config" : {
+ "privateKey" : [ "MIIEpAIBAAKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQABAoIBADNcMt6hAHub4JTAYS6Mra0EPRBO2XhWmACBrv3+8ETClXd5475KPLDewgRVtlmtbwU8G8awUXESQgPS9lfiqvQhPreA3cHlm6oP2WMKOEtakr2s8I+frsTBLCo0Ini9RaSzjoVVgS0zofyhASKi+T970MafSj5P3XNb8YBFdXgoYDiA7FXLH6a/+m7LScL+wGcFMAAeYESxZbMQLfH3v8L+4EcTraiwjLG17ZdlF3dpybMyUSse6ZQ/PdlyvBuzzLXhN6Ce2gd9ATfS+YWTzo7Yf+GU+ex5bIpVOfHqtuM/hyq7YGKENClsXwNZIAoFnvGCbvECAfgyapVrD30IfykCgYEA0rgsSZ82pxT40NxwgBD1g9lbNVBKXphRB/3S078qusUzJjT7AldEj4imGPhAbI7bI8gAeWJsp1XJWkjM8ktaVrh+NQl7p8e9OPh0pQF/5Bdg8ajbjXESpjnaU66pVYRQy/d+jNli/YRAHX5RUfsBl+6W4+WSVMGmKBiqJsur+ecCgYEAz1YVXClcmUnyZem5B+2E9noIzjF6ROE+jIb6rawM85P3Xd0lXtECQavtxw+Qk7I32qOwrxl1UpK2foVel3pazi+4OpMfmqtYGenRP1Zk1cZwrDo0cIemTDGjj3kJ8tYn12CGolFQpJZgK6OHzvG0tOxI5VZgjIViWNPe1PGWXtUCgYEAxXGNDe8BZs1f11S2lUlOw5yGug3hoYFXbAWJ5p7Ziuf8ZXB/QlJDC7se54a11wKEk6Jzz0lKRgE8CjzszJuOqnN0zn10QGIIC7nCklo1W6QMUmPGVWH994N976tZP6gbjQL6sT+AYcvpx7j0ubxYYeRNvnz+ACzzY964kGGHY0ECgYEAumlwPPNnMN7+VEjGNm2D7UMdJZ3wi3tkjF5ThdA5uMohTsAk+FG80KSu3RmOaGyEsUwY7+VYyYvlDm4E9PZqLBVVczyR3rMNPAcwPd0EPfvzk7WlLkOX7ct3fehaXH3VRlyfz9KCSeh1wOZ/lT1VtpD2nVOC7PSDzs92+kfXZZ0CgYAnrD1y4skgXkdwolZ3unn3EFyGm2d+X5aMTHwQPdWxqoNIAl/9wdghlzihwnPhhsxq1WzlxuC3V2IMrNPtRx70Mi+FbSmR5m4Xx5RptgMtMlwno+L40PzNJgMjHGjt0wcx3Vel8wuohDtnqMyS7P5nG1/TQx0Cyzwn7QOXlNpgbQ==" ],
+ "keyUse" : [ "SIG" ],
+ "certificate" : [ "MIICmzCCAYMCBgGG3GWyBTANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZkYnJlcG8wHhcNMjMwMzEzMTkxMzE3WhcNMzMwMzEzMTkxNDU3WjARMQ8wDQYDVQQDDAZkYnJlcG8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqqcdDYFZZb28M0tEJzEP77FmD/Xqioyj9zWX6VwUSOMAgmMmn8eqs9hT9T0a+q4YTo9tUW1PNbUpwprA5b4Uk04DcIajxDVMUR/PjcHytmkqwVskq9AZW/Vngdoo+8tSbuIybwe/3Vwt266hbHpDcM97a+DXcYooRl7tQWCEX7RP27wQrMD9epDQ6IgKayZg9vC9/03dsIqwH9jXQRiZlFvwiEKhX2aY7lPGBaCK414JO00K/Z49iov9TRa/IYVbSt5qwgrx6DcqsBSPwOnI6A85UGfeUEZ/7coVJiL7RvBlsllapsL9eWTbQajVh94k9Ei3sibEPbtH+U2OAM78zAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAASnN1Cuif1sdfEK2kWAURSXGJCohCROLWdKFjaeHPRaEfpbFJsgxW0Yj3nwX5O3bUlOWoTyENwnXSsXMQsqnNi+At32CKaKO8+AkhAbgQL9F0B+KeJwmYv3cUj5N/LYkJjBvZBzUZ4Ugu5dcxH0k7AktLAIwimkyEnxTNolOA3UyrGGpREr8MCKWVr10RFuOpF/0CsJNNwbHXzalO9D756EUcRWZ9VSg6QVNso0YYRKTnILWDn9hcTRnqGy3SHo3anFTqQZ+BB57YbgFWy6udC0LYRB3zdp6zNti87eu/VEymiDY/mmo1AB8Tm0b6vxFz4AKcL3ax5qS6YnZ9efSzk=" ],
+ "priority" : [ "100" ]
+ }
+ } ]
+ },
+ "internationalizationEnabled" : false,
+ "supportedLocales" : [ ],
+ "authenticationFlows" : [ {
+ "id" : "88e5d526-2298-413c-a904-133ad839d47f",
+ "alias" : "Account verification options",
+ "description" : "Method with which to verity the existing account",
+ "providerId" : "basic-flow",
+ "topLevel" : false,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "idp-email-verification",
+ "authenticatorFlow" : false,
+ "requirement" : "ALTERNATIVE",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticatorFlow" : true,
+ "requirement" : "ALTERNATIVE",
+ "priority" : 20,
+ "autheticatorFlow" : true,
+ "flowAlias" : "Verify Existing Account by Re-authentication",
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "bc0b483f-4a3f-4c15-bf65-b26f5320e6c9",
+ "alias" : "Authentication Options",
+ "description" : "Authentication options.",
+ "providerId" : "basic-flow",
+ "topLevel" : false,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "basic-auth",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "basic-auth-otp",
+ "authenticatorFlow" : false,
+ "requirement" : "DISABLED",
+ "priority" : 20,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "auth-spnego",
+ "authenticatorFlow" : false,
+ "requirement" : "DISABLED",
+ "priority" : 30,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "a690c715-fbae-4c20-b680-bd4010718761",
+ "alias" : "Browser - Conditional OTP",
+ "description" : "Flow to determine if the OTP is required for the authentication",
+ "providerId" : "basic-flow",
+ "topLevel" : false,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "conditional-user-configured",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "auth-otp-form",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 20,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "ad6d407e-c73e-4439-baf3-d7c99c6cb6ad",
+ "alias" : "Direct Grant - Conditional OTP",
+ "description" : "Flow to determine if the OTP is required for the authentication",
+ "providerId" : "basic-flow",
+ "topLevel" : false,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "conditional-user-configured",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "direct-grant-validate-otp",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 20,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "e5d03405-e10a-408a-adb2-41dbb4f24515",
+ "alias" : "First broker login - Conditional OTP",
+ "description" : "Flow to determine if the OTP is required for the authentication",
+ "providerId" : "basic-flow",
+ "topLevel" : false,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "conditional-user-configured",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "auth-otp-form",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 20,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "96b93843-62d0-44f1-84dd-21cc5f95f523",
+ "alias" : "Handle Existing Account",
+ "description" : "Handle what to do if there is existing account with same email/username like authenticated identity provider",
+ "providerId" : "basic-flow",
+ "topLevel" : false,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "idp-confirm-link",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticatorFlow" : true,
+ "requirement" : "REQUIRED",
+ "priority" : 20,
+ "autheticatorFlow" : true,
+ "flowAlias" : "Account verification options",
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "088f4051-36ab-4952-a4f2-4ba53c408083",
+ "alias" : "Reset - Conditional OTP",
+ "description" : "Flow to determine if the OTP should be reset or not. Set to REQUIRED to force.",
+ "providerId" : "basic-flow",
+ "topLevel" : false,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "conditional-user-configured",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "reset-otp",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 20,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "05f37bb2-779d-4e3f-ad1b-f6eb33bb3de4",
+ "alias" : "User creation or linking",
+ "description" : "Flow for the existing/non-existing user alternatives",
+ "providerId" : "basic-flow",
+ "topLevel" : false,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticatorConfig" : "create unique user config",
+ "authenticator" : "idp-create-user-if-unique",
+ "authenticatorFlow" : false,
+ "requirement" : "ALTERNATIVE",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticatorFlow" : true,
+ "requirement" : "ALTERNATIVE",
+ "priority" : 20,
+ "autheticatorFlow" : true,
+ "flowAlias" : "Handle Existing Account",
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "300a5647-7d2c-4348-9f1f-51504bfda1c4",
+ "alias" : "Verify Existing Account by Re-authentication",
+ "description" : "Reauthentication of existing account",
+ "providerId" : "basic-flow",
+ "topLevel" : false,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "idp-username-password-form",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticatorFlow" : true,
+ "requirement" : "CONDITIONAL",
+ "priority" : 20,
+ "autheticatorFlow" : true,
+ "flowAlias" : "First broker login - Conditional OTP",
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "26afc672-314b-4ad9-9711-7aaeafd7c00c",
+ "alias" : "browser",
+ "description" : "browser based authentication",
+ "providerId" : "basic-flow",
+ "topLevel" : true,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "auth-cookie",
+ "authenticatorFlow" : false,
+ "requirement" : "ALTERNATIVE",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "auth-spnego",
+ "authenticatorFlow" : false,
+ "requirement" : "DISABLED",
+ "priority" : 20,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "identity-provider-redirector",
+ "authenticatorFlow" : false,
+ "requirement" : "ALTERNATIVE",
+ "priority" : 25,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticatorFlow" : true,
+ "requirement" : "ALTERNATIVE",
+ "priority" : 30,
+ "autheticatorFlow" : true,
+ "flowAlias" : "forms",
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "9b301f6c-eda7-4da0-ba09-1a6454ff910d",
+ "alias" : "clients",
+ "description" : "Base authentication for clients",
+ "providerId" : "client-flow",
+ "topLevel" : true,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "client-secret",
+ "authenticatorFlow" : false,
+ "requirement" : "ALTERNATIVE",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "client-jwt",
+ "authenticatorFlow" : false,
+ "requirement" : "ALTERNATIVE",
+ "priority" : 20,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "client-secret-jwt",
+ "authenticatorFlow" : false,
+ "requirement" : "ALTERNATIVE",
+ "priority" : 30,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "client-x509",
+ "authenticatorFlow" : false,
+ "requirement" : "ALTERNATIVE",
+ "priority" : 40,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "6e54f1be-dbad-4b6d-8eee-8e048d413c63",
+ "alias" : "direct grant",
+ "description" : "OpenID Connect Resource Owner Grant",
+ "providerId" : "basic-flow",
+ "topLevel" : true,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "direct-grant-validate-username",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "direct-grant-validate-password",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 20,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticatorFlow" : true,
+ "requirement" : "CONDITIONAL",
+ "priority" : 30,
+ "autheticatorFlow" : true,
+ "flowAlias" : "Direct Grant - Conditional OTP",
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "31da4b94-03c4-4d79-9ac3-5df1445c0781",
+ "alias" : "docker auth",
+ "description" : "Used by Docker clients to authenticate against the IDP",
+ "providerId" : "basic-flow",
+ "topLevel" : true,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "docker-http-basic-authenticator",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "2e16651d-681f-4d9b-9dd4-9acdb465cd43",
+ "alias" : "first broker login",
+ "description" : "Actions taken after first broker login with identity provider account, which is not yet linked to any Keycloak account",
+ "providerId" : "basic-flow",
+ "topLevel" : true,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticatorConfig" : "review profile config",
+ "authenticator" : "idp-review-profile",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticatorFlow" : true,
+ "requirement" : "REQUIRED",
+ "priority" : 20,
+ "autheticatorFlow" : true,
+ "flowAlias" : "User creation or linking",
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "da109a26-fefa-48a4-ae8e-1d49627c2db8",
+ "alias" : "forms",
+ "description" : "Username, password, otp and other auth forms.",
+ "providerId" : "basic-flow",
+ "topLevel" : false,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "auth-username-password-form",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticatorFlow" : true,
+ "requirement" : "CONDITIONAL",
+ "priority" : 20,
+ "autheticatorFlow" : true,
+ "flowAlias" : "Browser - Conditional OTP",
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "b8f1f963-6813-4875-bae8-ce48a813763b",
+ "alias" : "http challenge",
+ "description" : "An authentication flow based on challenge-response HTTP Authentication Schemes",
+ "providerId" : "basic-flow",
+ "topLevel" : true,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "no-cookie-redirect",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticatorFlow" : true,
+ "requirement" : "REQUIRED",
+ "priority" : 20,
+ "autheticatorFlow" : true,
+ "flowAlias" : "Authentication Options",
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "4c983c77-241f-41c5-8b8a-e2cd6fc08914",
+ "alias" : "registration",
+ "description" : "registration flow",
+ "providerId" : "basic-flow",
+ "topLevel" : true,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "registration-page-form",
+ "authenticatorFlow" : true,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : true,
+ "flowAlias" : "registration form",
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "d62c8dd6-633c-408a-aa99-43071510efb4",
+ "alias" : "registration form",
+ "description" : "registration form",
+ "providerId" : "form-flow",
+ "topLevel" : false,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "registration-user-creation",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 20,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "registration-profile-action",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 40,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "registration-password-action",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 50,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "registration-recaptcha-action",
+ "authenticatorFlow" : false,
+ "requirement" : "DISABLED",
+ "priority" : 60,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "c8ca5be7-e76d-4e16-b5ca-3ced99d92dbb",
+ "alias" : "reset credentials",
+ "description" : "Reset credentials for a user if they forgot their password or something",
+ "providerId" : "basic-flow",
+ "topLevel" : true,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "reset-credentials-choose-user",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "reset-credential-email",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 20,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "reset-password",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 30,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticatorFlow" : true,
+ "requirement" : "CONDITIONAL",
+ "priority" : 40,
+ "autheticatorFlow" : true,
+ "flowAlias" : "Reset - Conditional OTP",
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "389c1c37-e8af-4610-a507-e1257f55b954",
+ "alias" : "saml ecp",
+ "description" : "SAML ECP Profile Authentication Flow",
+ "providerId" : "basic-flow",
+ "topLevel" : true,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "http-basic-authenticator",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ } ]
+ } ],
+ "authenticatorConfig" : [ {
+ "id" : "d66ca9d0-1645-4c84-abfe-c0a696f17de4",
+ "alias" : "create unique user config",
+ "config" : {
+ "require.password.update.after.registration" : "false"
+ }
+ }, {
+ "id" : "061cc6b8-90be-4423-9bf9-974ead709b5d",
+ "alias" : "review profile config",
+ "config" : {
+ "update.profile.on.first.login" : "missing"
+ }
+ } ],
+ "requiredActions" : [ {
+ "alias" : "CONFIGURE_TOTP",
+ "name" : "Configure OTP",
+ "providerId" : "CONFIGURE_TOTP",
+ "enabled" : true,
+ "defaultAction" : false,
+ "priority" : 10,
+ "config" : { }
+ }, {
+ "alias" : "TERMS_AND_CONDITIONS",
+ "name" : "Terms and Conditions",
+ "providerId" : "TERMS_AND_CONDITIONS",
+ "enabled" : false,
+ "defaultAction" : false,
+ "priority" : 20,
+ "config" : { }
+ }, {
+ "alias" : "UPDATE_PASSWORD",
+ "name" : "Update Password",
+ "providerId" : "UPDATE_PASSWORD",
+ "enabled" : false,
+ "defaultAction" : false,
+ "priority" : 30,
+ "config" : { }
+ }, {
+ "alias" : "UPDATE_PROFILE",
+ "name" : "Update Profile",
+ "providerId" : "UPDATE_PROFILE",
+ "enabled" : true,
+ "defaultAction" : false,
+ "priority" : 40,
+ "config" : { }
+ }, {
+ "alias" : "VERIFY_EMAIL",
+ "name" : "Verify Email",
+ "providerId" : "VERIFY_EMAIL",
+ "enabled" : false,
+ "defaultAction" : false,
+ "priority" : 50,
+ "config" : { }
+ }, {
+ "alias" : "delete_account",
+ "name" : "Delete Account",
+ "providerId" : "delete_account",
+ "enabled" : false,
+ "defaultAction" : false,
+ "priority" : 60,
+ "config" : { }
+ }, {
+ "alias" : "webauthn-register",
+ "name" : "Webauthn Register",
+ "providerId" : "webauthn-register",
+ "enabled" : true,
+ "defaultAction" : false,
+ "priority" : 70,
+ "config" : { }
+ }, {
+ "alias" : "webauthn-register-passwordless",
+ "name" : "Webauthn Register Passwordless",
+ "providerId" : "webauthn-register-passwordless",
+ "enabled" : true,
+ "defaultAction" : false,
+ "priority" : 80,
+ "config" : { }
+ }, {
+ "alias" : "update_user_locale",
+ "name" : "Update User Locale",
+ "providerId" : "update_user_locale",
+ "enabled" : true,
+ "defaultAction" : false,
+ "priority" : 1000,
+ "config" : { }
+ } ],
+ "browserFlow" : "browser",
+ "registrationFlow" : "registration",
+ "directGrantFlow" : "direct grant",
+ "resetCredentialsFlow" : "reset credentials",
+ "clientAuthenticationFlow" : "clients",
+ "dockerAuthenticationFlow" : "docker auth",
+ "attributes" : {
+ "cibaBackchannelTokenDeliveryMode" : "poll",
+ "cibaAuthRequestedUserHint" : "login_hint",
+ "clientOfflineSessionMaxLifespan" : "0",
+ "oauth2DevicePollingInterval" : "5",
+ "clientSessionIdleTimeout" : "0",
+ "actionTokenGeneratedByUserLifespan-execute-actions" : "",
+ "actionTokenGeneratedByUserLifespan-verify-email" : "",
+ "clientOfflineSessionIdleTimeout" : "0",
+ "actionTokenGeneratedByUserLifespan-reset-credentials" : "",
+ "cibaInterval" : "5",
+ "realmReusableOtpCode" : "false",
+ "cibaExpiresIn" : "120",
+ "oauth2DeviceCodeLifespan" : "600",
+ "actionTokenGeneratedByUserLifespan-idp-verify-account-via-email" : "",
+ "parRequestUriLifespan" : "60",
+ "clientSessionMaxLifespan" : "0",
+ "shortVerificationUri" : ""
+ },
+ "keycloakVersion" : "21.0.2",
+ "userManagedAccessAllowed" : false,
+ "clientProfiles" : {
+ "profiles" : [ ]
+ },
+ "clientPolicies" : {
+ "policies" : [ ]
+ }
}
\ No newline at end of file
diff --git a/dbrepo-metadata-service/services/pom.xml b/dbrepo-metadata-service/services/pom.xml
index a66dfb7c87ea86057a39fdba40902bb784457e11..bf2105f98da2ff1644bd94493f54f1b5929ea9ce 100644
--- a/dbrepo-metadata-service/services/pom.xml
+++ b/dbrepo-metadata-service/services/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
- <version>1.4.4</version>
+ <version>1.4.5</version>
</parent>
<artifactId>dbrepo-metadata-service-services</artifactId>
<name>dbrepo-metadata-service-services</name>
- <version>1.4.4</version>
+ <version>1.4.5</version>
<dependencies>
<dependency>
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java
index 46ec0e6a24bdd2bc2a9a88f8fad4815467ebff08..35e55797ebffb688f801bfcf64163d3a4a630049 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java
@@ -74,8 +74,8 @@ public class AuthTokenFilter extends OncePerRequestFilter {
final DecodedJWT jwt = verifier.verify(token);
final RealmAccessDto realmAccess = jwt.getClaim("realm_access").as(RealmAccessDto.class);
return UserDetailsDto.builder()
- .id(jwt.getSubject())
- .username(jwt.getClaim("client_id").asString())
+ .id(jwt.getClaim("uid").asString())
+ .username(jwt.getClaim("preferred_username").asString())
.authorities(Arrays.stream(realmAccess.getRoles()).map(SimpleGrantedAuthority::new).collect(Collectors.toList()))
.build();
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/auth/BasicAuthenticationProvider.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/auth/BasicAuthenticationProvider.java
index 918c02013af97a75f7d954706ec68a1a3e301a8b..80fdd15f1daff7625508eb8d46d9b54332a5150f 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/auth/BasicAuthenticationProvider.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/auth/BasicAuthenticationProvider.java
@@ -1,8 +1,6 @@
package at.tuwien.auth;
import at.tuwien.api.keycloak.TokenDto;
-import at.tuwien.api.user.UserDetailsDto;
-import at.tuwien.config.GatewayConfig;
import at.tuwien.exception.*;
import at.tuwien.gateway.KeycloakGateway;
import jakarta.servlet.ServletException;
@@ -13,45 +11,30 @@ import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.stereotype.Component;
-import java.util.List;
-
@Log4j2
@Component
public class BasicAuthenticationProvider implements AuthenticationManager {
- private final GatewayConfig gatewayConfig;
private final AuthTokenFilter authTokenFilter;
private final KeycloakGateway keycloakGateway;
@Autowired
- public BasicAuthenticationProvider(GatewayConfig gatewayConfig, AuthTokenFilter authTokenFilter,
- KeycloakGateway keycloakGateway) {
- this.gatewayConfig = gatewayConfig;
+ public BasicAuthenticationProvider(AuthTokenFilter authTokenFilter, KeycloakGateway keycloakGateway) {
this.authTokenFilter = authTokenFilter;
this.keycloakGateway = keycloakGateway;
}
@Override
public Authentication authenticate(Authentication auth) throws AuthenticationException {
- if (auth.getName().equals(gatewayConfig.getAdminUsername())
- && auth.getCredentials().toString().equals(gatewayConfig.getAdminPassword())) {
- log.trace("current user is {}: skip authentication", gatewayConfig.getAdminUsername());
- final UserDetails userDetails = UserDetailsDto.builder()
- .username(auth.getName())
- .authorities(List.of(new SimpleGrantedAuthority("admin")))
- .build();
- return new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
- }
- log.trace("current user is {}: begin authentication", auth.getName());
try {
final TokenDto tokenDto = keycloakGateway.obtainUserToken(auth.getName(), auth.getCredentials().toString());
final UserDetails userDetails = authTokenFilter.verifyJwt(tokenDto.getAccessToken());
return new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
- } catch (ServletException | ServiceConnectionException | CredentialsInvalidException | AccountNotSetupException e) {
+ } catch (ServletException | CredentialsInvalidException | AccountNotSetupException |
+ AuthServiceConnectionException e) {
throw new BadCredentialsException("Failed to authenticate with authentication service", e);
}
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/auth/InternalRequestInterceptor.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/auth/InternalRequestInterceptor.java
new file mode 100644
index 0000000000000000000000000000000000000000..835b7245d1ef2ca017375990dd77c20693f3ef6f
--- /dev/null
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/auth/InternalRequestInterceptor.java
@@ -0,0 +1,47 @@
+package at.tuwien.auth;
+
+import at.tuwien.api.keycloak.TokenDto;
+import at.tuwien.config.GatewayConfig;
+import at.tuwien.exception.AccountNotSetupException;
+import at.tuwien.exception.AuthServiceConnectionException;
+import at.tuwien.exception.CredentialsInvalidException;
+import at.tuwien.gateway.KeycloakGateway;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpRequest;
+import org.springframework.http.MediaType;
+import org.springframework.http.client.ClientHttpRequestExecution;
+import org.springframework.http.client.ClientHttpRequestInterceptor;
+import org.springframework.http.client.ClientHttpResponse;
+
+import java.io.IOException;
+import java.util.List;
+
+@Log4j2
+public class InternalRequestInterceptor implements ClientHttpRequestInterceptor {
+
+ private final GatewayConfig gatewayConfig;
+ private final KeycloakGateway keycloakGateway;
+
+ public InternalRequestInterceptor(GatewayConfig gatewayConfig, KeycloakGateway keycloakGateway) {
+ this.gatewayConfig = gatewayConfig;
+ this.keycloakGateway = keycloakGateway;
+ }
+
+ @Override
+ public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
+ throws IOException {
+ final HttpHeaders headers = request.getHeaders();
+ headers.setAccept(List.of(MediaType.APPLICATION_JSON));
+ try {
+ final TokenDto token = keycloakGateway.obtainUserToken(gatewayConfig.getSystemUsername(),
+ gatewayConfig.getSystemPassword());
+ headers.setBearerAuth(token.getAccessToken());
+ log.trace("set bearer token for internal user: {}", gatewayConfig.getSystemUsername());
+ return execution.execute(request, body);
+ } catch (AuthServiceConnectionException | CredentialsInvalidException | AccountNotSetupException e) {
+ log.error("Failed to obtain token for internal user: {}", gatewayConfig.getSystemUsername());
+ throw new IOException("Failed to obtain token for internal user", e);
+ }
+ }
+}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/GatewayConfig.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/GatewayConfig.java
index c64fc52282af3dc8fb3f6bc075ad080e5f162f0c..0bcace730e7753b1dd21d2e1d4a91f47bda6b9f3 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/GatewayConfig.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/GatewayConfig.java
@@ -1,24 +1,15 @@
package at.tuwien.config;
+import at.tuwien.auth.InternalRequestInterceptor;
+import at.tuwien.gateway.KeycloakGateway;
import lombok.Getter;
import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpRequest;
-import org.springframework.http.MediaType;
-import org.springframework.http.client.ClientHttpRequestExecution;
-import org.springframework.http.client.ClientHttpRequestInterceptor;
-import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.http.client.support.BasicAuthenticationInterceptor;
+import org.springframework.context.annotation.*;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.DefaultUriBuilderFactory;
-import java.io.IOException;
-import java.util.List;
-
@Log4j2
@Getter
@Configuration
@@ -36,31 +27,38 @@ public class GatewayConfig {
@Value("${dbrepo.endpoints.searchService}")
private String searchEndpoint;
+ @Value("${dbrepo.endpoints.rorService}")
+ private String rorEndpoint;
+
+ @Value("${dbrepo.endpoints.crossRefService}")
+ private String crossRefEndpoint;
+
@Value("${spring.rabbitmq.username}")
private String brokerUsername;
@Value("${spring.rabbitmq.password}")
private String brokerPassword;
- @Value("${dbrepo.admin.username}")
- private String adminUsername;
+ @Value("${dbrepo.system.username}")
+ private String systemUsername;
- @Value("${dbrepo.admin.password}")
- private String adminPassword;
+ @Value("${dbrepo.system.password}")
+ private String systemPassword;
- @Primary
- public RestTemplate restTemplate() {
- return new RestTemplate();
+ private final KeycloakGateway keycloakGateway;
+
+ @Autowired
+ public GatewayConfig(KeycloakGateway keycloakGateway) {
+ this.keycloakGateway = keycloakGateway;
}
+ @Profile("!junit")
@Bean("brokerRestTemplate")
public RestTemplate brokerRestTemplate() {
final RestTemplate restTemplate = new RestTemplate();
restTemplate.setUriTemplateHandler(new DefaultUriBuilderFactory(brokerEndpoint));
- log.debug("add basic authentication for broker service: username={}, password=(hidden)", brokerUsername);
restTemplate.getInterceptors()
- .addAll(List.of(new BasicAuthenticationInterceptor(brokerUsername, brokerPassword),
- clientHttpRequestInterceptor()));
+ .add(new InternalRequestInterceptor(this, keycloakGateway));
return restTemplate;
}
@@ -68,10 +66,8 @@ public class GatewayConfig {
public RestTemplate dataServiceRestTemplate() {
final RestTemplate restTemplate = new RestTemplate();
restTemplate.setUriTemplateHandler(new DefaultUriBuilderFactory(dataEndpoint));
- log.debug("add basic authentication for data service: username={}, password=(hidden)", adminUsername);
restTemplate.getInterceptors()
- .addAll(List.of(new BasicAuthenticationInterceptor(adminUsername, adminPassword),
- clientHttpRequestInterceptor()));
+ .add(new InternalRequestInterceptor(this, keycloakGateway));
return restTemplate;
}
@@ -79,10 +75,8 @@ public class GatewayConfig {
public RestTemplate analyseServiceRestTemplate() {
final RestTemplate restTemplate = new RestTemplate();
restTemplate.setUriTemplateHandler(new DefaultUriBuilderFactory(analyseEndpoint));
- log.debug("add basic authentication for analyse service: username={}, password=(hidden)", adminUsername);
restTemplate.getInterceptors()
- .addAll(List.of(new BasicAuthenticationInterceptor(adminUsername, adminPassword),
- clientHttpRequestInterceptor()));
+ .add(new InternalRequestInterceptor(this, keycloakGateway));
return restTemplate;
}
@@ -90,20 +84,9 @@ public class GatewayConfig {
public RestTemplate searchServiceRestTemplate() {
final RestTemplate restTemplate = new RestTemplate();
restTemplate.setUriTemplateHandler(new DefaultUriBuilderFactory(searchEndpoint));
- log.debug("add basic authentication for search service: username={}, password=(hidden)", adminUsername);
restTemplate.getInterceptors()
- .addAll(List.of(new BasicAuthenticationInterceptor(adminUsername, adminPassword),
- clientHttpRequestInterceptor()));
+ .add(new InternalRequestInterceptor(this, keycloakGateway));
return restTemplate;
}
- @Bean
- public ClientHttpRequestInterceptor clientHttpRequestInterceptor() {
- return (request, body, execution) -> {
- final HttpHeaders headers = request.getHeaders();
- headers.setAccept(List.of(MediaType.APPLICATION_JSON));
- return execution.execute(request, body);
- };
- }
-
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/JacksonConfig.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/JacksonConfig.java
index a451032e9de8d40f04724e44e85eb928dfba2653..61e7f2b180f15497b08c93ad8e474dc6a7722336 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/JacksonConfig.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/JacksonConfig.java
@@ -25,7 +25,6 @@ public class JacksonConfig {
objectMapper.registerModule(new Hibernate6Module()); /* lazy load mapping on REST endpoints */
objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
objectMapper.setTimeZone(TimeZone.getTimeZone("UTC"));
- log.debug("current time is {}", objectMapper.writeValueAsString(new Date()));
return objectMapper;
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/KeycloakConfig.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/KeycloakConfig.java
index 4d258d496aa6ebe825ac2d84a1f00a1b4f9c0298..a24bbf41b8168b6e5c9ffef70c1b7bbbd6f5c674 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/KeycloakConfig.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/KeycloakConfig.java
@@ -2,16 +2,12 @@ package at.tuwien.config;
import at.tuwien.interceptor.KeycloakInterceptor;
import lombok.Getter;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.http.client.ClientHttpRequestInterceptor;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.DefaultUriBuilderFactory;
-import java.util.List;
-
@Getter
@Configuration
public class KeycloakConfig {
@@ -31,11 +27,9 @@ public class KeycloakConfig {
@Value("${dbrepo.keycloak.clientSecret}")
private String keycloakClientSecret;
- private final ClientHttpRequestInterceptor clientHttpRequestInterceptor;
-
- @Autowired
- public KeycloakConfig(ClientHttpRequestInterceptor clientHttpRequestInterceptor) {
- this.clientHttpRequestInterceptor = clientHttpRequestInterceptor;
+ @Bean
+ public RestTemplate restTemplate() {
+ return new RestTemplate();
}
@Bean("keycloakRestTemplate")
@@ -43,8 +37,7 @@ public class KeycloakConfig {
final RestTemplate restTemplate = new RestTemplate();
restTemplate.setUriTemplateHandler(new DefaultUriBuilderFactory(keycloakEndpoint));
restTemplate.getInterceptors()
- .addAll(List.of(new KeycloakInterceptor(keycloakUsername, keycloakPassword, keycloakEndpoint),
- clientHttpRequestInterceptor));
+ .add(new KeycloakInterceptor(restTemplate(), keycloakUsername, keycloakPassword, keycloakEndpoint));
return restTemplate;
}
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/RabbitConfig.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/RabbitConfig.java
index bef02350067f207e03aed94dfc0e06939c6b6c83..0ed5001dd434d400a792bd3700b902d43b435de0 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/RabbitConfig.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/RabbitConfig.java
@@ -19,4 +19,7 @@ public class RabbitConfig {
@Value("${spring.rabbitmq.virtual-host}")
private String virtualHost;
+ @Value("${dbrepo.endpoints.brokerService}")
+ private String brokerEndpoint;
+
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/S3Config.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/S3Config.java
index 763505b933dd62259b95745e2059dea0c3edc9c6..6c82c29e25711de3e3a47ebcc9f86a359d31f6be 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/S3Config.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/S3Config.java
@@ -27,11 +27,8 @@ public class S3Config {
@Value("${dbrepo.s3.secretAccessKey}")
private String s3SecretAccessKey;
- @Value("${dbrepo.s3.importBucket}")
- private String s3ImportBucket;
-
- @Value("${dbrepo.s3.exportBucket}")
- private String s3ExportBucket;
+ @Value("${dbrepo.s3.bucket}")
+ private String s3Bucket;
@Bean
public S3Client s3client() {
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java
index 810e335c7461a26f953694330d709f9299062469..ae15c9df2d3406a09ec6aeafbfebf571a0325a78 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java
@@ -43,8 +43,8 @@ public class WebSecurityConfig {
}
@Bean
- public SecurityFilterChain filterChain(HttpSecurity http, KeycloakGateway keycloakGateway,
- GatewayConfig gatewayConfig) throws Exception {
+ public SecurityFilterChain filterChain(HttpSecurity http, KeycloakGateway keycloakGateway)
+ throws Exception {
final OrRequestMatcher internalEndpoints = new OrRequestMatcher(
new AntPathRequestMatcher("/actuator/**", "GET"),
new AntPathRequestMatcher("/v3/api-docs.yaml"),
@@ -88,8 +88,8 @@ public class WebSecurityConfig {
http.addFilterBefore(authTokenFilter(),
UsernamePasswordAuthenticationFilter.class
);
- http.addFilterBefore(new BasicAuthenticationFilter(new BasicAuthenticationProvider(gatewayConfig,
- authTokenFilter(), keycloakGateway)),
+ http.addFilterBefore(new BasicAuthenticationFilter(new BasicAuthenticationProvider(authTokenFilter(),
+ keycloakGateway)),
UsernamePasswordAuthenticationFilter.class
);
return http.build();
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/BrokerServiceGateway.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/BrokerServiceGateway.java
index 5ed71fc43584e4b7f84c97d9c6e7d42a6f99d2d1..42e8912d0c1c716309ead8d8ddfc3829f3206709 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/BrokerServiceGateway.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/BrokerServiceGateway.java
@@ -10,38 +10,31 @@ public interface BrokerServiceGateway {
* Create topic exchange permissions at the broker service.
*
* @param data The topic exchange permissions.
+ * @throws BrokerServiceConnectionException
+ * @throws BrokerServiceException
*/
- void grantExchangePermission(String username, GrantExchangePermissionsDto data) throws ServiceConnectionException, ServiceException;
+ void grantExchangePermission(String username, GrantExchangePermissionsDto data)
+ throws BrokerServiceConnectionException, BrokerServiceException;
/**
* Grants a user permission at a virtual host in the queue service.
*
* @param username The username of the user.
* @param data The grant data.
+ * @throws BrokerServiceConnectionException
+ * @throws BrokerServiceException
*/
- void grantTopicPermission(String username, ExchangeUpdatePermissionsDto data) throws ServiceConnectionException, ServiceException;
+ void grantTopicPermission(String username, ExchangeUpdatePermissionsDto data)
+ throws BrokerServiceConnectionException, BrokerServiceException;
/**
* Grants a user permission at a virtual host in the queue service.
*
* @param username The username of the user.
* @param data The grant data.
+ * @throws BrokerServiceConnectionException
+ * @throws BrokerServiceException
*/
- void grantVirtualHostPermission(String username, GrantVirtualHostPermissionsDto data) throws ServiceConnectionException, ServiceException;
-
- /**
- * Finds queue information from the broker service by name.
- *
- * @param name The queue name.
- * @return The queue, if successful.
- */
- QueueDto findQueue(String name) throws ServiceConnectionException, ServiceException, QueueNotFoundException;
-
- /**
- * Finds exchange information from the broker service by name.
- *
- * @param name The exchange name.
- * @return The queue, if successful.
- */
- ExchangeDto findExchange(String name) throws ServiceException, ServiceConnectionException, ExchangeNotFoundException;
+ void grantVirtualHostPermission(String username, GrantVirtualHostPermissionsDto data)
+ throws BrokerServiceConnectionException, BrokerServiceException;
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/DataServiceGateway.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/DataServiceGateway.java
index 9edb9f388da8ef481f2ec1b18522f8bc4695b954..91fb96e5f93ca5f4fd17c120d2f8f00703f3a3e3 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/DataServiceGateway.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/DataServiceGateway.java
@@ -17,31 +17,163 @@ import java.util.List;
import java.util.UUID;
public interface DataServiceGateway {
- void createAccess(Long databaseId, UUID userId, AccessTypeDto access) throws ServiceConnectionException, ServiceException, DatabaseNotFoundException;
- void updateAccess(Long databaseId, UUID userId, AccessTypeDto access) throws ServiceConnectionException, ServiceException, AccessNotFoundException;
-
- void deleteAccess(Long databaseId, UUID userId) throws ServiceConnectionException, ServiceException, AccessNotFoundException;
-
- DatabaseDto createDatabase(CreateDatabaseDto data) throws ServiceConnectionException, ServiceException;
-
- void updateDatabase(Long databaseId, UpdateUserPasswordDto data) throws ServiceConnectionException, ServiceException, DatabaseNotFoundException;
-
- void createTable(Long databaseId, TableCreateDto data) throws ServiceConnectionException, ServiceException, DatabaseNotFoundException, TableExistsException;
-
- void deleteTable(Long databaseId, Long tableId) throws ServiceConnectionException, ServiceException, TableNotFoundException;
-
- ViewDto createView(Long databaseId, ViewCreateDto data) throws ServiceConnectionException, ServiceException;
-
- void deleteView(Long databaseId, Long viewId) throws ServiceConnectionException, ServiceException, ViewNotFoundException;
-
- QueryDto findQuery(Long databaseId, Long queryId) throws ServiceConnectionException, ServiceException, QueryNotFoundException;
-
- ExportResourceDto exportQuery(Long databaseId, Long queryId) throws ServiceConnectionException, ServiceException, QueryNotFoundException;
-
- List<TableDto> getTableSchemas(Long databaseId) throws ServiceConnectionException, ServiceException, QueryNotFoundException;
-
- List<ViewDto> getViewSchemas(Long databaseId) throws ServiceConnectionException, ServiceException, QueryNotFoundException;
-
- TableStatisticDto getTableStatistics(Long databaseId, Long tableId) throws ServiceConnectionException, ServiceException, TableNotFoundException;
+ /**
+ * Create r/w access for a given user to a given database.
+ * @param databaseId The database id.
+ * @param userId The user id.
+ * @param access The access.
+ * @throws DataServiceConnectionException The connection to the data service could not be established.
+ * @throws DataServiceException The data service responded unexpectedly.
+ * @throws DatabaseNotFoundException Some of the privileged parameters of the given database were not provided by the metadata service.
+ */
+ void createAccess(Long databaseId, UUID userId, AccessTypeDto access) throws DataServiceConnectionException,
+ DataServiceException, DatabaseNotFoundException;
+
+ /**
+ * Update r/w access for a given user to a given database.
+ * @param databaseId The database id.
+ * @param userId The user id.
+ * @param access The access.
+ * @throws DataServiceConnectionException The connection to the data service could not be established.
+ * @throws DataServiceException The data service responded unexpectedly.
+ * @throws AccessNotFoundException Some of the privileged parameters of the given database were not provided by the metadata service.
+ */
+ void updateAccess(Long databaseId, UUID userId, AccessTypeDto access) throws DataServiceConnectionException,
+ DataServiceException, AccessNotFoundException;
+
+ /**
+ * Deletes access for a given user to a given database.
+ * @param databaseId The database id.
+ * @param userId The user id.
+ * @throws DataServiceConnectionException The connection to the data service could not be established.
+ * @throws DataServiceException The data service responded unexpectedly.
+ * @throws AccessNotFoundException Some of the privileged parameters of the given database were not provided by the metadata service.
+ */
+ void deleteAccess(Long databaseId, UUID userId) throws DataServiceConnectionException, DataServiceException,
+ AccessNotFoundException;
+
+ /**
+ * Creates a database in the data service.
+ * @param data The data.
+ * @return The created database, if successful.
+ * @throws DataServiceConnectionException The connection to the data service could not be established.
+ * @throws DataServiceException The data service responded unexpectedly.
+ * @throws DatabaseNotFoundException Some of the privileged parameters of the given database were not provided by the metadata service.
+ */
+ DatabaseDto createDatabase(CreateDatabaseDto data) throws DataServiceConnectionException, DataServiceException,
+ DatabaseNotFoundException;
+
+ /**
+ * Updates the user password in the given database in the data service.
+ * @param databaseId The database id.
+ * @param data The user password.
+ * @throws DataServiceConnectionException The connection to the data service could not be established.
+ * @throws DataServiceException The data service responded unexpectedly.
+ * @throws DatabaseNotFoundException Some of the privileged parameters of the given database were not provided by the metadata service.
+ */
+ void updateDatabase(Long databaseId, UpdateUserPasswordDto data) throws DataServiceConnectionException,
+ DataServiceException, DatabaseNotFoundException;
+
+ /**
+ * Creates a table in a given database.
+ * @param databaseId The database id.
+ * @param data The table data.
+ * @throws DataServiceConnectionException The connection to the data service could not be established.
+ * @throws DataServiceException The data service responded unexpectedly.
+ * @throws DatabaseNotFoundException Some of the privileged parameters of the given database were not provided by the metadata service.
+ * @throws TableExistsException A table with this internal name exists already in the database.
+ */
+ void createTable(Long databaseId, TableCreateDto data) throws DataServiceConnectionException, DataServiceException,
+ DatabaseNotFoundException, TableExistsException;
+
+ /**
+ * Deletes a given table in a given database.
+ * @param databaseId The database id.
+ * @param tableId The table id.
+ * @throws DataServiceConnectionException The connection to the data service could not be established.
+ * @throws DataServiceException The data service responded unexpectedly.
+ * @throws TableNotFoundException The given table was not found in the database.
+ */
+ void deleteTable(Long databaseId, Long tableId) throws DataServiceConnectionException, DataServiceException,
+ TableNotFoundException;
+
+ /**
+ * Creates a view in the given database.
+ * @param databaseId The database id.
+ * @param data The view data.
+ * @return The created view, if successful.
+ * @throws DataServiceConnectionException The connection to the data service could not be established.
+ * @throws DataServiceException The data service responded unexpectedly.
+ */
+ ViewDto createView(Long databaseId, ViewCreateDto data) throws DataServiceConnectionException, DataServiceException;
+
+ /**
+ * Deletes a given view in the given database.
+ * @param databaseId The database id.
+ * @param viewId The view id.
+ * @throws DataServiceConnectionException The connection to the data service could not be established.
+ * @throws DataServiceException The data service responded unexpectedly.
+ * @throws ViewNotFoundException The given view was not found in the database.
+ */
+ void deleteView(Long databaseId, Long viewId) throws DataServiceConnectionException, DataServiceException,
+ ViewNotFoundException;
+
+ /**
+ * Finds a given query in a given database.
+ * @param databaseId The database id.
+ * @param queryId The query id.
+ * @return The query, if successful.
+ * @throws DataServiceConnectionException The connection to the data service could not be established.
+ * @throws DataServiceException The data service responded unexpectedly.
+ * @throws QueryNotFoundException The given query was not found in the query store.
+ */
+ QueryDto findQuery(Long databaseId, Long queryId) throws DataServiceConnectionException, DataServiceException,
+ QueryNotFoundException;
+
+ /**
+ * Exports a given query.
+ * @param databaseId The database id.
+ * @param queryId The query id.
+ * @return The exported resource, if successful.
+ * @throws DataServiceConnectionException The connection to the data service could not be established.
+ * @throws DataServiceException The data service responded unexpectedly.
+ * @throws QueryNotFoundException The given query was not found in the query store.
+ */
+ ExportResourceDto exportQuery(Long databaseId, Long queryId) throws DataServiceConnectionException,
+ DataServiceException, QueryNotFoundException;
+
+ /**
+ * Obtain table schemas from a given database.
+ * @param databaseId The database id.
+ * @return The list of tables, if successful.
+ * @throws DataServiceConnectionException The connection to the data service could not be established.
+ * @throws DataServiceException The data service responded unexpectedly.
+ * @throws TableNotFoundException The table was not found in the database.
+ */
+ List<TableDto> getTableSchemas(Long databaseId) throws DataServiceConnectionException, DataServiceException,
+ TableNotFoundException;
+
+ /**
+ * Obtain view schemas from a given database.
+ * @param databaseId The database id.
+ * @return The list of tables, if successful.
+ * @throws DataServiceConnectionException The connection to the data service could not be established.
+ * @throws DataServiceException The data service responded unexpectedly.
+ * @throws ViewNotFoundException The table was not found in the database.
+ */
+ List<ViewDto> getViewSchemas(Long databaseId) throws DataServiceConnectionException, DataServiceException,
+ ViewNotFoundException;
+
+ /**
+ * Obtain table statistics for a given table in a given database.
+ * @param databaseId The database id.
+ * @param tableId The table id.
+ * @return The statistic, if successful.
+ * @throws DataServiceConnectionException The connection to the data service could not be established.
+ * @throws DataServiceException The data service responded unexpectedly.
+ * @throws TableNotFoundException The table was not found in the database.
+ */
+ TableStatisticDto getTableStatistics(Long databaseId, Long tableId) throws DataServiceConnectionException,
+ DataServiceException, TableNotFoundException;
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
index b3352869ddd36645eca77a5f8f6de4570065f4b0..94ea986f78727a6fdc927b4e7ebb25ca6f0616bd 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
@@ -10,10 +10,10 @@ import java.util.UUID;
public interface KeycloakGateway {
- TokenDto obtainUserToken(String username, String password) throws ServiceConnectionException,
+ TokenDto obtainUserToken(String username, String password) throws AuthServiceConnectionException,
CredentialsInvalidException, AccountNotSetupException;
- TokenDto refreshUserToken(String refreshToken) throws ServiceConnectionException,
+ TokenDto refreshUserToken(String refreshToken) throws AuthServiceConnectionException,
CredentialsInvalidException;
/**
@@ -23,14 +23,15 @@ public interface KeycloakGateway {
* @throws UserExistsException The user already exists at the Authentication Service.
* @throws EmailExistsException The user email already exists in the metadata database.
*/
- void createUser(UserCreateDto data) throws ServiceException, ServiceConnectionException, EmailExistsException, UserExistsException;
+ void createUser(UserCreateDto data) throws AuthServiceException, AuthServiceConnectionException,
+ EmailExistsException, UserExistsException;
/**
* Deletes a user at the Authentication Service with given user id.
*
* @param id The user id.
*/
- void deleteUser(UUID id) throws ServiceException, ServiceConnectionException, UserNotFoundException;
+ void deleteUser(UUID id) throws AuthServiceException, AuthServiceConnectionException, UserNotFoundException;
/**
* Update the credentials for a given user.
@@ -38,7 +39,8 @@ public interface KeycloakGateway {
* @param id The user id.
* @param password The user credential.
*/
- void updateUserCredentials(UUID id, UserPasswordDto password) throws ServiceException, ServiceConnectionException;
+ void updateUserCredentials(UUID id, UserPasswordDto password) throws AuthServiceException,
+ AuthServiceConnectionException, UserNotFoundException;
/**
* Finds a user in the metadata database by given username.
@@ -46,8 +48,8 @@ public interface KeycloakGateway {
* @param username The user username.
* @return The updated user.
*/
- UserDto findByUsername(String username) throws ServiceException, ServiceConnectionException, UserNotFoundException;
-
- UserDto findById(UUID id) throws ServiceException, ServiceConnectionException,
+ UserDto findByUsername(String username) throws AuthServiceException, AuthServiceConnectionException,
UserNotFoundException;
+
+ UserDto findById(UUID id) throws AuthServiceException, AuthServiceConnectionException, UserNotFoundException;
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/OrcidGateway.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/OrcidGateway.java
index b949ddbaddb6bb6dfaba0b31f304a89266224cad..2cd5f142e6638f087265d6f605aa271fd518c51b 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/OrcidGateway.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/OrcidGateway.java
@@ -7,5 +7,11 @@ import org.springframework.stereotype.Service;
@Service
public interface OrcidGateway {
+ /**
+ * Finds metadata from given ORCID url.
+ * @param url The ORCID url.
+ * @return The metadata, if successful.
+ * @throws OrcidNotFoundException The metadata does not exist to the given ORCID.
+ */
OrcidDto findByUrl(String url) throws OrcidNotFoundException;
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/ApiTemplateInterceptorImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/ApiTemplateInterceptorImpl.java
index 27517359c2a3c25e3ee057b1890b82ac805ad863..8a2bf70637a25822c526da93ac89467660dd02e0 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/ApiTemplateInterceptorImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/ApiTemplateInterceptorImpl.java
@@ -2,12 +2,14 @@ package at.tuwien.gateway.impl;
import at.tuwien.gateway.ApiTemplateInterceptor;
import org.springframework.http.HttpRequest;
+import org.springframework.http.MediaType;
import org.springframework.http.client.ClientHttpRequestExecution;
import org.springframework.http.client.ClientHttpRequestInterceptor;
import org.springframework.http.client.ClientHttpResponse;
import org.springframework.stereotype.Service;
import java.io.IOException;
+import java.util.List;
@Service
public class ApiTemplateInterceptorImpl implements ApiTemplateInterceptor, ClientHttpRequestInterceptor {
@@ -15,8 +17,8 @@ public class ApiTemplateInterceptorImpl implements ApiTemplateInterceptor, Clien
@Override
public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
throws IOException {
- request.getHeaders().set("Content-Type", "application/json");
- request.getHeaders().set("Accept", "application/json");
+ request.getHeaders().setAccept(List.of(MediaType.APPLICATION_JSON));
+ request.getHeaders().setContentType(MediaType.APPLICATION_JSON);
return execution.execute(request, body);
}
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/BrokerServiceGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/BrokerServiceGatewayImpl.java
index b86780f5c43401f7a206be3125f54d593ac641ac..307c166febb3634a08991c7b5d571bcf7bf072e1 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/BrokerServiceGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/BrokerServiceGatewayImpl.java
@@ -10,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.http.*;
import org.springframework.stereotype.Service;
-import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.client.ResourceAccessException;
import org.springframework.web.client.RestTemplate;
@@ -31,110 +30,65 @@ public class BrokerServiceGatewayImpl implements BrokerServiceGateway {
@Override
public void grantTopicPermission(String username, ExchangeUpdatePermissionsDto data)
- throws ServiceConnectionException, ServiceException {
- final String url = "/api/topic-permissions/" + rabbitConfig.getVirtualHost() + "/" + username;
+ throws BrokerServiceConnectionException, BrokerServiceException {
+ final String path = "/api/topic-permissions/" + rabbitConfig.getVirtualHost() + "/" + username;
+ log.trace("grant topic permission at endpoint {} with path {}", rabbitConfig.getBrokerEndpoint(), path);
final ResponseEntity<Void> response;
try {
- response = restTemplate.exchange(url, HttpMethod.PUT, new HttpEntity<>(data), Void.class);
- } catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable e) {
+ response = restTemplate.exchange(path, HttpMethod.PUT, new HttpEntity<>(data), Void.class);
+ } catch (HttpServerErrorException e) {
log.error("Failed to grant topic permissions: {}", e.getMessage());
- throw new ServiceConnectionException("Failed to grant topic permissions: " + e.getMessage());
+ throw new BrokerServiceConnectionException("Failed to grant topic permissions: " + e.getMessage());
} catch (Exception e) {
log.error("Failed to grant topic permissions: unexpected response: {}", e.getMessage());
- throw new ServiceException("Failed to grant topic permissions: unexpected response: " + e.getMessage(), e);
+ throw new BrokerServiceException("Failed to grant topic permissions: unexpected response: " + e.getMessage(), e);
}
if (!response.getStatusCode().equals(HttpStatus.CREATED) && !response.getStatusCode().equals(HttpStatus.NO_CONTENT)) {
log.error("Failed to grant topic permissions: unexpected status: {}", response.getStatusCode().value());
- throw new ServiceException("Failed to grant topic permissions: unexpected status: " + response.getStatusCode().value());
+ throw new BrokerServiceException("Failed to grant topic permissions: unexpected status: " + response.getStatusCode().value());
}
}
@Override
- public void grantVirtualHostPermission(String username, GrantVirtualHostPermissionsDto data) throws ServiceConnectionException, ServiceException {
- final String url = "/api/permissions/" + rabbitConfig.getVirtualHost() + "/" + username;
+ public void grantVirtualHostPermission(String username, GrantVirtualHostPermissionsDto data)
+ throws BrokerServiceConnectionException, BrokerServiceException {
+ final String path = "/api/permissions/" + rabbitConfig.getVirtualHost() + "/" + username;
+ log.trace("grant virtual host permission at endpoint {} with path {}", rabbitConfig.getBrokerEndpoint(), path);
final ResponseEntity<Void> response;
try {
- response = restTemplate.exchange(url, HttpMethod.PUT, new HttpEntity<>(data), Void.class);
- } catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable e) {
+ response = restTemplate.exchange(path, HttpMethod.PUT, new HttpEntity<>(data), Void.class);
+ } catch (HttpServerErrorException e) {
log.error("Failed to grant virtual host permissions: {}", e.getMessage());
- throw new ServiceConnectionException("Failed to grant virtual host permissions: " + e.getMessage());
+ throw new BrokerServiceConnectionException("Failed to grant virtual host permissions: " + e.getMessage());
} catch (Exception e) {
log.error("Failed to grant virtual host permissions: unexpected response: {}", e.getMessage());
- throw new ServiceException("Failed to grant virtual host permissions: unexpected response: " + e.getMessage(), e);
+ throw new BrokerServiceException("Failed to grant virtual host permissions: unexpected response: " + e.getMessage(), e);
}
if (!response.getStatusCode().equals(HttpStatus.CREATED) && !response.getStatusCode().equals(HttpStatus.NO_CONTENT)) {
log.error("Failed to grant virtual host permissions: unexpected status: {}", response.getStatusCode().value());
- throw new ServiceException("Failed to grant virtual host permissions: unexpected status: " + response.getStatusCode().value());
+ throw new BrokerServiceException("Failed to grant virtual host permissions: unexpected status: " + response.getStatusCode().value());
}
}
@Override
- public void grantExchangePermission(String username, GrantExchangePermissionsDto data) throws ServiceConnectionException, ServiceException {
- final String url = "/api/topic-permissions/" + rabbitConfig.getVirtualHost() + "/" + username;
+ public void grantExchangePermission(String username, GrantExchangePermissionsDto data)
+ throws BrokerServiceConnectionException, BrokerServiceException {
+ final String path = "/api/topic-permissions/" + rabbitConfig.getVirtualHost() + "/" + username;
+ log.trace("grant exchange permission at endpoint {} with path {}", rabbitConfig.getBrokerEndpoint(), path);
final ResponseEntity<Void> response;
try {
- response = restTemplate.exchange(url, HttpMethod.PUT, new HttpEntity<>(data), Void.class);
- } catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable e) {
+ response = restTemplate.exchange(path, HttpMethod.PUT, new HttpEntity<>(data), Void.class);
+ } catch (HttpServerErrorException e) {
log.error("Failed to grant exchange permissions: {}", e.getMessage());
- throw new ServiceConnectionException("Failed to grant exchange permissions: " + e.getMessage());
+ throw new BrokerServiceConnectionException("Failed to grant exchange permissions: " + e.getMessage());
} catch (Exception e) {
log.error("Failed to grant exchange permissions: unexpected response: {}", e.getMessage());
- throw new ServiceException("Failed to grant exchange permissions: unexpected response: " + e.getMessage(), e);
+ throw new BrokerServiceException("Failed to grant exchange permissions: unexpected response: " + e.getMessage(), e);
}
if (!response.getStatusCode().equals(HttpStatus.CREATED) && !response.getStatusCode().equals(HttpStatus.NO_CONTENT)) {
log.error("Failed to grant exchange permissions: unexpected status: {}", response.getStatusCode().value());
- throw new ServiceException("Failed to grant exchange permissions: unexpected status: " + response.getStatusCode().value());
+ throw new BrokerServiceException("Failed to grant exchange permissions: unexpected status: " + response.getStatusCode().value());
}
}
- @Override
- public QueueDto findQueue(String name) throws ServiceConnectionException, ServiceException, QueueNotFoundException {
- final String url = "/api/queues/" + rabbitConfig.getVirtualHost() + "/" + name;
- final HttpHeaders headers = new HttpHeaders();
- headers.set("Accept", "application/json");
- final ResponseEntity<QueueDto> response;
- try {
- response = restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(null, headers), QueueDto.class);
- } catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable e) {
- log.error("Failed to find queue: {}", e.getMessage());
- throw new ServiceConnectionException("Failed to find queue: " + e.getMessage());
- } catch (HttpClientErrorException.NotFound e) {
- log.error("Failed to find queue: not found: {}", e.getMessage());
- throw new QueueNotFoundException("Failed to find queue: not found: " + e.getMessage(), e);
- } catch (Exception e) {
- log.error("Failed to find queue: unexpected response: {}", e.getMessage());
- throw new ServiceException("Failed to find queue: unexpected response: " + e.getMessage(), e);
- }
- if (!response.getStatusCode().equals(HttpStatus.OK)) {
- log.error("Failed to find queue: unexpected status: {}", response.getStatusCode().value());
- throw new ServiceException("Failed to find queue: unexpected status: " + response.getStatusCode().value());
- }
- return response.getBody();
- }
-
- @Override
- public ExchangeDto findExchange(String name) throws ServiceException, ServiceConnectionException, ExchangeNotFoundException {
- final String url = "/api/exchanges/" + rabbitConfig.getVirtualHost() + "/" + name;
- final HttpHeaders headers = new HttpHeaders();
- headers.set("Accept", "application/json");
- final ResponseEntity<ExchangeDto> response;
- try {
- response = restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(null, headers), ExchangeDto.class);
- } catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable e) {
- log.error("Failed to find exchange: {}", e.getMessage());
- throw new ServiceConnectionException("Failed to find exchange: " + e.getMessage());
- } catch (HttpClientErrorException.NotFound e) {
- log.error("Failed to find exchange: not found: {}", e.getMessage());
- throw new ExchangeNotFoundException("Failed to find exchange: not found: " + e.getMessage(), e);
- } catch (Exception e) {
- log.error("Failed to find exchange: unexpected response: {}", e.getMessage());
- throw new ServiceException("Failed to find exchange: unexpected response: " + e.getMessage(), e);
- }
- if (!response.getStatusCode().equals(HttpStatus.OK)) {
- log.error("Failed to find exchange: unexpected status: {}", response.getStatusCode().value());
- throw new ServiceException("Failed to find exchange: unexpected status: " + response.getStatusCode().value());
- }
- return response.getBody();
- }
-
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/CrossrefGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/CrossrefGatewayImpl.java
index 7c5d4b19f553c26201a1f6653465fc66454e7e54..542d9c981d82f6b8a300808ed94ca40034c95851 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/CrossrefGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/CrossrefGatewayImpl.java
@@ -1,9 +1,11 @@
package at.tuwien.gateway.impl;
import at.tuwien.api.crossref.CrossrefDto;
+import at.tuwien.config.GatewayConfig;
import at.tuwien.exception.DoiNotFoundException;
import at.tuwien.gateway.CrossrefGateway;
import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -18,23 +20,24 @@ import org.springframework.web.client.RestTemplate;
public class CrossrefGatewayImpl implements CrossrefGateway {
private final RestTemplate restTemplate;
+ private final GatewayConfig gatewayConfig;
- public CrossrefGatewayImpl() {
- this.restTemplate = new RestTemplate();
+ @Autowired
+ public CrossrefGatewayImpl(RestTemplate restTemplate, GatewayConfig gatewayConfig) {
+ this.restTemplate = restTemplate;
+ this.gatewayConfig = gatewayConfig;
}
@Override
public CrossrefDto findById(String id) throws DoiNotFoundException {
- final HttpHeaders headers = new HttpHeaders();
- headers.set("Accept", "application/json");
- final String url = "http://data.crossref.org/fundingdata/funder/" + id;
+ final String path = "/fundingdata/funder/" + id;
+ log.trace("find crossref metadata by id from endpoint {} with path {}", gatewayConfig.getCrossRefEndpoint(), path);
final ResponseEntity<CrossrefDto> response;
try {
- log.trace("find crossref doi from url {}", url);
- response = restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(null, headers), CrossrefDto.class);
- } catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable e) {
- log.error("Failed to retrieve CrossRef metadata from URL {}: {}", url, e.getMessage());
- throw new DoiNotFoundException("Failed to retrieve CrossRef metadata from URL " + url + ": " + e.getMessage());
+ response = restTemplate.exchange(gatewayConfig.getCrossRefEndpoint() + path, HttpMethod.GET, HttpEntity.EMPTY, CrossrefDto.class);
+ } catch (HttpServerErrorException e) {
+ log.error("Failed to retrieve crossref metadata: {}", e.getMessage());
+ throw new DoiNotFoundException("Failed to retrieve crossref metadata: " + e.getMessage());
}
return response.getBody();
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/DataServiceGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/DataServiceGatewayImpl.java
index 6c09d6d50067be958efc69cfbc28fa866cfec803..886911d9f4a770fe8c620d7cc882cd7b4da05c55 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/DataServiceGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/DataServiceGatewayImpl.java
@@ -8,6 +8,7 @@ import at.tuwien.api.database.table.TableCreateDto;
import at.tuwien.api.database.table.TableDto;
import at.tuwien.api.database.table.TableStatisticDto;
import at.tuwien.api.user.internal.UpdateUserPasswordDto;
+import at.tuwien.config.GatewayConfig;
import at.tuwien.exception.*;
import at.tuwien.gateway.DataServiceGateway;
import lombok.extern.log4j.Log4j2;
@@ -27,135 +28,148 @@ import java.util.UUID;
public class DataServiceGatewayImpl implements DataServiceGateway {
private final RestTemplate restTemplate;
+ private final GatewayConfig gatewayConfig;
- public DataServiceGatewayImpl(@Qualifier("dataServiceRestTemplate") RestTemplate restTemplate) {
+ public DataServiceGatewayImpl(@Qualifier("dataServiceRestTemplate") RestTemplate restTemplate,
+ GatewayConfig gatewayConfig) {
this.restTemplate = restTemplate;
+ this.gatewayConfig = gatewayConfig;
}
@Override
public void createAccess(Long databaseId, UUID userId, AccessTypeDto access)
- throws ServiceConnectionException, ServiceException, DatabaseNotFoundException {
+ throws DataServiceConnectionException, DataServiceException, DatabaseNotFoundException {
final ResponseEntity<Void> response;
- final String url = "/api/database/" + databaseId + "/access/" + userId;
+ final String path = "/api/database/" + databaseId + "/access/" + userId;
+ log.trace("create access at endpoint {} with path {}", gatewayConfig.getDataEndpoint(), path);
try {
- response = restTemplate.exchange(url, HttpMethod.POST,
+ response = restTemplate.exchange(path, HttpMethod.POST,
new HttpEntity<>(UpdateDatabaseAccessDto.builder().type(access).build()), Void.class);
} catch (HttpServerErrorException e) {
log.error("Failed to create access: {}", e.getMessage());
- throw new ServiceConnectionException("Failed to create access: " + e.getMessage(), e);
+ throw new DataServiceConnectionException("Failed to create access: " + e.getMessage(), e);
} catch (HttpClientErrorException.NotFound e) {
log.error("Failed to create access: not found: {}", e.getMessage());
throw new DatabaseNotFoundException("Failed to create access: not found: " + e.getMessage(), e);
} catch (HttpClientErrorException.BadRequest | HttpClientErrorException.Unauthorized e) {
log.error("Failed to create access: {}", e.getMessage());
- throw new ServiceException("Failed to create access: " + e.getMessage(), e);
+ throw new DataServiceException("Failed to create access: " + e.getMessage(), e);
}
if (!response.getStatusCode().equals(HttpStatus.CREATED)) {
log.error("Failed to create access: wrong http code: {}", response.getStatusCode());
- throw new ServiceException("Failed to create access: wrong http code: " + response.getStatusCode());
+ throw new DataServiceException("Failed to create access: wrong http code: " + response.getStatusCode());
}
}
@Override
public void updateAccess(Long databaseId, UUID userId, AccessTypeDto access)
- throws ServiceConnectionException, ServiceException, AccessNotFoundException {
+ throws DataServiceConnectionException, DataServiceException, AccessNotFoundException {
final ResponseEntity<Void> response;
- final String url = "/api/database/" + databaseId + "/access/" + userId;
+ final String path = "/api/database/" + databaseId + "/access/" + userId;
+ log.trace("update access at endpoint {} with path {}", gatewayConfig.getDataEndpoint(), path);
try {
- response = restTemplate.exchange(url, HttpMethod.PUT,
+ response = restTemplate.exchange(path, HttpMethod.PUT,
new HttpEntity<>(UpdateDatabaseAccessDto.builder().type(access).build()), Void.class);
} catch (HttpServerErrorException e) {
log.error("Failed to update access: {}", e.getMessage());
- throw new ServiceConnectionException("Failed to update access: " + e.getMessage(), e);
+ throw new DataServiceConnectionException("Failed to update access: " + e.getMessage(), e);
} catch (HttpClientErrorException.NotFound e) {
log.error("Failed to update access: not found: {}", e.getMessage());
throw new AccessNotFoundException("Failed to update access: not found: " + e.getMessage(), e);
} catch (HttpClientErrorException.BadRequest | HttpClientErrorException.Unauthorized e) {
log.error("Failed to update access: {}", e.getMessage());
- throw new ServiceException("Failed to update access: " + e.getMessage(), e);
+ throw new DataServiceException("Failed to update access: " + e.getMessage(), e);
}
if (!response.getStatusCode().equals(HttpStatus.ACCEPTED)) {
log.error("Failed to update access: wrong http code: {}", response.getStatusCode());
- throw new ServiceException("Failed to update access: wrong http code: " + response.getStatusCode());
+ throw new DataServiceException("Failed to update access: wrong http code: " + response.getStatusCode());
}
}
@Override
- public void deleteAccess(Long databaseId, UUID userId) throws ServiceConnectionException, ServiceException,
+ public void deleteAccess(Long databaseId, UUID userId) throws DataServiceConnectionException, DataServiceException,
AccessNotFoundException {
final ResponseEntity<Void> response;
- final String url = "/api/database/" + databaseId + "/access/" + userId;
+ final String path = "/api/database/" + databaseId + "/access/" + userId;
+ log.trace("delete access at endpoint {} with path {}", gatewayConfig.getDataEndpoint(), path);
try {
- response = restTemplate.exchange(url, HttpMethod.DELETE, HttpEntity.EMPTY, Void.class);
+ response = restTemplate.exchange(path, HttpMethod.DELETE, HttpEntity.EMPTY, Void.class);
} catch (HttpServerErrorException e) {
log.error("Failed to delete access: {}", e.getMessage());
- throw new ServiceConnectionException("Failed to delete access: " + e.getMessage(), e);
+ throw new DataServiceConnectionException("Failed to delete access: " + e.getMessage(), e);
} catch (HttpClientErrorException.NotFound e) {
log.error("Failed to delete access: not found: {}", e.getMessage());
throw new AccessNotFoundException("Failed to delete access: not found: " + e.getMessage(), e);
} catch (HttpClientErrorException.Unauthorized e) {
log.error("Failed to delete access: {}", e.getMessage());
- throw new ServiceException("Failed to delete access: " + e.getMessage(), e);
+ throw new DataServiceException("Failed to delete access: " + e.getMessage(), e);
}
if (!response.getStatusCode().equals(HttpStatus.ACCEPTED)) {
log.error("Failed to delete access: wrong http code: {}", response.getStatusCode());
- throw new ServiceException("Failed to delete access: wrong http code: " + response.getStatusCode());
+ throw new DataServiceException("Failed to delete access: wrong http code: " + response.getStatusCode());
}
}
@Override
- public DatabaseDto createDatabase(CreateDatabaseDto data) throws ServiceConnectionException, ServiceException {
+ public DatabaseDto createDatabase(CreateDatabaseDto data) throws DataServiceConnectionException,
+ DataServiceException, DatabaseNotFoundException {
final ResponseEntity<DatabaseDto> response;
- final String url = "/api/database";
+ final String path = "/api/database";
+ log.trace("create database at endpoint {} with path {}", gatewayConfig.getDataEndpoint(), path);
try {
- response = restTemplate.exchange(url, HttpMethod.POST, new HttpEntity<>(data), DatabaseDto.class);
+ response = restTemplate.exchange(path, HttpMethod.POST, new HttpEntity<>(data), DatabaseDto.class);
} catch (HttpServerErrorException e) {
log.error("Failed to create database: {}", e.getMessage());
- throw new ServiceConnectionException("Failed to create database: " + e.getMessage(), e);
+ throw new DataServiceConnectionException("Failed to create database: " + e.getMessage(), e);
} catch (HttpClientErrorException.BadRequest | HttpClientErrorException.Unauthorized e) {
- log.error("Failed to create database: {}", e.getMessage());
- throw new ServiceException("Failed to create database: " + e.getMessage(), e);
+ log.error("Failed to create database: malformed: {}", e.getMessage());
+ throw new DataServiceException("Failed to create database: malformed: " + e.getMessage(), e);
+ } catch (HttpClientErrorException.NotFound e) {
+ log.error("Failed to create database: not found: {}", e.getMessage());
+ throw new DatabaseNotFoundException("Failed to create database: not found: " + e.getMessage(), e);
}
if (!response.getStatusCode().equals(HttpStatus.CREATED)) {
log.error("Failed to create database: wrong http code: {}", response.getStatusCode());
- throw new ServiceException("Failed to create database: wrong http code: " + response.getStatusCode());
+ throw new DataServiceException("Failed to create database: wrong http code: " + response.getStatusCode());
}
return response.getBody();
}
@Override
- public void updateDatabase(Long databaseId, UpdateUserPasswordDto data) throws ServiceConnectionException,
- ServiceException, DatabaseNotFoundException {
+ public void updateDatabase(Long databaseId, UpdateUserPasswordDto data) throws DataServiceConnectionException,
+ DataServiceException, DatabaseNotFoundException {
final ResponseEntity<Void> response;
- final String url = "/api/database/" + databaseId;
+ final String path = "/api/database/" + databaseId;
+ log.trace("update database at endpoint {} with path {}", gatewayConfig.getDataEndpoint(), path);
try {
- response = restTemplate.exchange(url, HttpMethod.PUT, new HttpEntity<>(data), Void.class);
+ response = restTemplate.exchange(path, HttpMethod.PUT, new HttpEntity<>(data), Void.class);
} catch (HttpServerErrorException e) {
log.error("Failed to update user password in database: {}", e.getMessage());
- throw new ServiceConnectionException("Failed to update user password in database: " + e.getMessage(), e);
+ throw new DataServiceConnectionException("Failed to update user password in database: " + e.getMessage(), e);
} catch (HttpClientErrorException.NotFound e) {
log.error("Failed to update user password in database: not found: {}", e.getMessage());
throw new DatabaseNotFoundException("Failed to update user password in database: not found: " + e.getMessage(), e);
} catch (HttpClientErrorException.BadRequest | HttpClientErrorException.Unauthorized e) {
log.error("Failed to update user password in database: {}", e.getMessage());
- throw new ServiceException("Failed to update user password in database: " + e.getMessage(), e);
+ throw new DataServiceException("Failed to update user password in database: " + e.getMessage(), e);
}
if (!response.getStatusCode().equals(HttpStatus.ACCEPTED)) {
log.error("Failed to update user password in database: wrong http code: {}", response.getStatusCode());
- throw new ServiceException("Failed to update user password in database: wrong http code: " + response.getStatusCode());
+ throw new DataServiceException("Failed to update user password in database: wrong http code: " + response.getStatusCode());
}
}
@Override
- public void createTable(Long databaseId, TableCreateDto data) throws ServiceConnectionException, ServiceException,
+ public void createTable(Long databaseId, TableCreateDto data) throws DataServiceConnectionException, DataServiceException,
DatabaseNotFoundException, TableExistsException {
final ResponseEntity<Void> response;
- final String url = "/api/database/" + databaseId + "/table";
+ final String path = "/api/database/" + databaseId + "/table";
+ log.trace("create table at endpoint {} with path {}", gatewayConfig.getDataEndpoint(), path);
try {
- response = restTemplate.exchange(url, HttpMethod.POST, new HttpEntity<>(data), Void.class);
+ response = restTemplate.exchange(path, HttpMethod.POST, new HttpEntity<>(data), Void.class);
} catch (HttpServerErrorException e) {
log.error("Failed to create table: {}", e.getMessage());
- throw new ServiceConnectionException("Failed to create table: " + e.getMessage(), e);
+ throw new DataServiceConnectionException("Failed to create table: " + e.getMessage(), e);
} catch (HttpClientErrorException.NotFound e) {
log.error("Failed to create table: not found: {}", e.getMessage());
throw new DatabaseNotFoundException("Failed to create table: not found: " + e.getMessage(), e);
@@ -164,158 +178,162 @@ public class DataServiceGatewayImpl implements DataServiceGateway {
throw new TableExistsException("Failed to create table: already exists", e);
} catch (HttpClientErrorException.BadRequest | HttpClientErrorException.Unauthorized e) {
log.error("Failed to create table: {}", e.getMessage());
- throw new ServiceException("Failed to create table: " + e.getMessage(), e);
+ throw new DataServiceException("Failed to create table: " + e.getMessage(), e);
}
if (!response.getStatusCode().equals(HttpStatus.CREATED)) {
log.error("Failed to create table: wrong http code: {}", response.getStatusCode());
- throw new ServiceException("Failed to create table: wrong http code: " + response.getStatusCode());
+ throw new DataServiceException("Failed to create table: wrong http code: " + response.getStatusCode());
}
}
@Override
- public void deleteTable(Long databaseId, Long tableId) throws ServiceConnectionException, ServiceException,
+ public void deleteTable(Long databaseId, Long tableId) throws DataServiceConnectionException, DataServiceException,
TableNotFoundException {
final ResponseEntity<Void> response;
- final String url = "/api/database/" + databaseId + "/table/" + tableId;
+ final String path = "/api/database/" + databaseId + "/table/" + tableId;
+ log.trace("delete table at endpoint {} with path {}", gatewayConfig.getDataEndpoint(), path);
try {
- response = restTemplate.exchange(url, HttpMethod.DELETE, HttpEntity.EMPTY, Void.class);
+ response = restTemplate.exchange(path, HttpMethod.DELETE, HttpEntity.EMPTY, Void.class);
} catch (HttpServerErrorException e) {
log.error("Failed to delete table: {}", e.getMessage());
- throw new ServiceConnectionException("Failed to delete table: " + e.getMessage(), e);
+ throw new DataServiceConnectionException("Failed to delete table: " + e.getMessage(), e);
} catch (HttpClientErrorException.NotFound e) {
log.error("Failed to delete table: not found: {}", e.getMessage());
throw new TableNotFoundException("Failed to delete table: not found: " + e.getMessage(), e);
} catch (HttpClientErrorException.Unauthorized e) {
log.error("Failed to delete table: {}", e.getMessage());
- throw new ServiceException("Failed to delete table: " + e.getMessage(), e);
+ throw new DataServiceException("Failed to delete table: " + e.getMessage(), e);
}
if (!response.getStatusCode().equals(HttpStatus.ACCEPTED)) {
log.error("Failed to delete table: wrong http code: {}", response.getStatusCode());
- throw new ServiceException("Failed to delete table: wrong http code: " + response.getStatusCode());
+ throw new DataServiceException("Failed to delete table: wrong http code: " + response.getStatusCode());
}
}
@Override
- public ViewDto createView(Long databaseId, ViewCreateDto data) throws ServiceConnectionException, ServiceException {
+ public ViewDto createView(Long databaseId, ViewCreateDto data) throws DataServiceConnectionException, DataServiceException {
final ResponseEntity<ViewDto> response;
- final String url = "/api/database/" + databaseId + "/view";
+ final String path = "/api/database/" + databaseId + "/view";
+ log.trace("delete table at endpoint {} with path {}", gatewayConfig.getDataEndpoint(), path);
try {
- response = restTemplate.exchange(url, HttpMethod.POST, new HttpEntity<>(data), ViewDto.class);
+ response = restTemplate.exchange(path, HttpMethod.POST, new HttpEntity<>(data), ViewDto.class);
} catch (HttpServerErrorException e) {
log.error("Failed to create view: {}", e.getMessage());
- throw new ServiceConnectionException("Failed to create view: " + e.getMessage(), e);
+ throw new DataServiceConnectionException("Failed to create view: " + e.getMessage(), e);
} catch (HttpClientErrorException.BadRequest | HttpClientErrorException.Unauthorized e) {
log.error("Failed to create view: {}", e.getMessage());
- throw new ServiceException("Failed to create view: " + e.getMessage(), e);
+ throw new DataServiceException("Failed to create view: " + e.getMessage(), e);
}
if (!response.getStatusCode().equals(HttpStatus.CREATED)) {
log.error("Failed to create view: wrong http code: {}", response.getStatusCode());
- throw new ServiceException("Failed to create view: wrong http code: " + response.getStatusCode());
+ throw new DataServiceException("Failed to create view: wrong http code: " + response.getStatusCode());
}
if (response.getBody() == null) {
log.error("Failed to create view: empty body: {}", response.getStatusCode());
- throw new ServiceException("Failed to create view: empty body: " + response.getStatusCode());
+ throw new DataServiceException("Failed to create view: empty body: " + response.getStatusCode());
}
return response.getBody();
}
@Override
- public void deleteView(Long databaseId, Long viewId) throws ServiceConnectionException, ServiceException,
+ public void deleteView(Long databaseId, Long viewId) throws DataServiceConnectionException, DataServiceException,
ViewNotFoundException {
final ResponseEntity<Void> response;
- final String url = "/api/database/" + databaseId + "/view/" + viewId;
+ final String path = "/api/database/" + databaseId + "/view/" + viewId;
+ log.trace("delete view at endpoint {} with path {}", gatewayConfig.getDataEndpoint(), path);
try {
- response = restTemplate.exchange(url, HttpMethod.DELETE, HttpEntity.EMPTY, Void.class);
+ response = restTemplate.exchange(path, HttpMethod.DELETE, HttpEntity.EMPTY, Void.class);
} catch (HttpServerErrorException e) {
log.error("Failed to delete view: {}", e.getMessage());
- throw new ServiceConnectionException("Failed to delete view: " + e.getMessage(), e);
+ throw new DataServiceConnectionException("Failed to delete view: " + e.getMessage(), e);
} catch (HttpClientErrorException.NotFound e) {
log.error("Failed to delete view: not found: {}", e.getMessage());
throw new ViewNotFoundException("Failed to delete view: not found: " + e.getMessage(), e);
} catch (HttpClientErrorException.Unauthorized e) {
log.error("Failed to delete view: {}", e.getMessage());
- throw new ServiceException("Failed to delete view: " + e.getMessage(), e);
+ throw new DataServiceException("Failed to delete view: " + e.getMessage(), e);
}
if (!response.getStatusCode().equals(HttpStatus.ACCEPTED)) {
log.error("Failed to delete view: wrong http code: {}", response.getStatusCode());
- throw new ServiceException("Failed to delete view: wrong http code: " + response.getStatusCode());
+ throw new DataServiceException("Failed to delete view: wrong http code: " + response.getStatusCode());
}
}
@Override
- public QueryDto findQuery(Long databaseId, Long queryId) throws ServiceConnectionException, ServiceException,
+ public QueryDto findQuery(Long databaseId, Long queryId) throws DataServiceConnectionException, DataServiceException,
QueryNotFoundException {
final ResponseEntity<QueryDto> response;
- final String url = "/api/database/" + databaseId + "/subset/" + queryId;
+ final String path = "/api/database/" + databaseId + "/subset/" + queryId;
try {
- response = restTemplate.exchange(url, HttpMethod.GET, HttpEntity.EMPTY, QueryDto.class);
+ response = restTemplate.exchange(path, HttpMethod.GET, HttpEntity.EMPTY, QueryDto.class);
} catch (HttpServerErrorException e) {
log.error("Failed to find query: {}", e.getMessage());
- throw new ServiceConnectionException("Failed to find query", e);
+ throw new DataServiceConnectionException("Failed to find query", e);
} catch (HttpClientErrorException.NotFound e) {
log.error("Failed to find query: not found: {}", e.getMessage());
throw new QueryNotFoundException("Failed to find query: not found", e);
} catch (HttpClientErrorException.Unauthorized e) {
log.error("Failed to find query: unauthorized: {}", e.getMessage());
- throw new ServiceException("Failed to find query: unauthorized", e);
+ throw new DataServiceException("Failed to find query: unauthorized", e);
} catch (HttpClientErrorException.NotAcceptable e) {
log.error("Failed to find query: format not acccepted: {}", e.getMessage());
- throw new ServiceException("Failed to find query: format not accepted", e);
+ throw new DataServiceException("Failed to find query: format not accepted", e);
}
if (!response.getStatusCode().equals(HttpStatus.OK)) {
log.error("Failed to find query: wrong http code: {}", response.getStatusCode());
- throw new ServiceException("Failed to find query: wrong http code: " + response.getStatusCode());
+ throw new DataServiceException("Failed to find query: wrong http code: " + response.getStatusCode());
}
return response.getBody();
}
@Override
- public ExportResourceDto exportQuery(Long databaseId, Long queryId) throws ServiceConnectionException,
- ServiceException, QueryNotFoundException {
+ public ExportResourceDto exportQuery(Long databaseId, Long queryId) throws DataServiceConnectionException,
+ DataServiceException, QueryNotFoundException {
final ResponseEntity<ExportResourceDto> response;
- final String url = "/api/database/" + databaseId + "/subset/" + queryId;
+ final String path = "/api/database/" + databaseId + "/subset/" + queryId;
try {
- response = restTemplate.exchange(url, HttpMethod.GET, HttpEntity.EMPTY, ExportResourceDto.class);
+ response = restTemplate.exchange(path, HttpMethod.GET, HttpEntity.EMPTY, ExportResourceDto.class);
} catch (HttpServerErrorException e) {
log.error("Failed to export query: {}", e.getMessage());
- throw new ServiceConnectionException("Failed to export query: " + e.getMessage(), e);
+ throw new DataServiceConnectionException("Failed to export query: " + e.getMessage(), e);
} catch (HttpClientErrorException.NotFound e) {
log.error("Failed to export query: not found: {}", e.getMessage());
throw new QueryNotFoundException("Failed to export query: not found: " + e.getMessage(), e);
} catch (HttpClientErrorException.Unauthorized e) {
log.error("Failed to export query: {}", e.getMessage());
- throw new ServiceException("Failed to export query: " + e.getMessage(), e);
+ throw new DataServiceException("Failed to export query: " + e.getMessage(), e);
}
if (!response.getStatusCode().equals(HttpStatus.OK)) {
log.error("Failed to export query: wrong http code: {}", response.getStatusCode());
- throw new ServiceException("Failed to export query: wrong http code: " + response.getStatusCode());
+ throw new DataServiceException("Failed to export query: wrong http code: " + response.getStatusCode());
}
return response.getBody();
}
@Override
- public List<TableDto> getTableSchemas(Long databaseId) throws ServiceConnectionException, ServiceException, QueryNotFoundException {
+ public List<TableDto> getTableSchemas(Long databaseId) throws DataServiceConnectionException, DataServiceException,
+ TableNotFoundException {
final ResponseEntity<TableDto[]> response;
- final String url = "/api/database/" + databaseId + "/table";
+ final String path = "/api/database/" + databaseId + "/table";
try {
- response = restTemplate.exchange(url, HttpMethod.GET, HttpEntity.EMPTY, TableDto[].class);
+ response = restTemplate.exchange(path, HttpMethod.GET, HttpEntity.EMPTY, TableDto[].class);
} catch (HttpServerErrorException e) {
log.error("Failed to get table schemas: {}", e.getMessage());
- throw new ServiceConnectionException("Failed to get table schemas: " + e.getMessage(), e);
+ throw new DataServiceConnectionException("Failed to get table schemas: " + e.getMessage(), e);
} catch (HttpClientErrorException.NotFound e) {
log.error("Failed to get table schemas: not found: {}", e.getMessage());
- throw new QueryNotFoundException("Failed to get table schemas: not found: " + e.getMessage(), e);
+ throw new TableNotFoundException("Failed to get table schemas: not found: " + e.getMessage(), e);
} catch (HttpClientErrorException.Unauthorized e) {
log.error("Failed to get table schemas: {}", e.getMessage());
- throw new ServiceException("Failed to get table schemas: " + e.getMessage(), e);
+ throw new DataServiceException("Failed to get table schemas: " + e.getMessage(), e);
}
if (!response.getStatusCode().equals(HttpStatus.OK)) {
log.error("Failed to get table schemas: wrong http code: {}", response.getStatusCode());
- throw new ServiceException("Failed to get table schemas: wrong http code: " + response.getStatusCode());
+ throw new DataServiceException("Failed to get table schemas: wrong http code: " + response.getStatusCode());
}
if (response.getBody() == null) {
log.error("Failed to get table schemas: empty body: {}", response.getStatusCode());
- throw new ServiceException("Failed to get table schemas: empty body: " + response.getStatusCode());
+ throw new DataServiceException("Failed to get table schemas: empty body: " + response.getStatusCode());
}
final List<TableDto> tables = Arrays.asList(response.getBody());
log.debug("found {} table(s) in data service", tables.size());
@@ -323,28 +341,30 @@ public class DataServiceGatewayImpl implements DataServiceGateway {
}
@Override
- public List<ViewDto> getViewSchemas(Long databaseId) throws ServiceConnectionException, ServiceException, QueryNotFoundException {
+ public List<ViewDto> getViewSchemas(Long databaseId) throws DataServiceConnectionException, DataServiceException,
+ ViewNotFoundException {
final ResponseEntity<ViewDto[]> response;
- final String url = "/api/database/" + databaseId + "/view";
+ final String path = "/api/database/" + databaseId + "/view";
+ log.trace("get view schemas at endpoint {} with path {}", gatewayConfig.getDataEndpoint(), path);
try {
- response = restTemplate.exchange(url, HttpMethod.GET, HttpEntity.EMPTY, ViewDto[].class);
+ response = restTemplate.exchange(path, HttpMethod.GET, HttpEntity.EMPTY, ViewDto[].class);
} catch (HttpServerErrorException e) {
log.error("Failed to get view schemas: {}", e.getMessage());
- throw new ServiceConnectionException("Failed to get view schemas: " + e.getMessage(), e);
+ throw new DataServiceConnectionException("Failed to get view schemas: " + e.getMessage(), e);
} catch (HttpClientErrorException.NotFound e) {
log.error("Failed to get view schemas: not found: {}", e.getMessage());
- throw new QueryNotFoundException("Failed to get view schemas: not found: " + e.getMessage(), e);
+ throw new ViewNotFoundException("Failed to get view schemas: not found: " + e.getMessage(), e);
} catch (HttpClientErrorException.Unauthorized e) {
log.error("Failed to get view schemas: {}", e.getMessage());
- throw new ServiceException("Failed to get view schemas: " + e.getMessage(), e);
+ throw new DataServiceException("Failed to get view schemas: " + e.getMessage(), e);
}
if (!response.getStatusCode().equals(HttpStatus.OK)) {
log.error("Failed to get view schemas: wrong http code: {}", response.getStatusCode());
- throw new ServiceException("Failed to get view schemas: wrong http code: " + response.getStatusCode());
+ throw new DataServiceException("Failed to get view schemas: wrong http code: " + response.getStatusCode());
}
if (response.getBody() == null) {
log.error("Failed to get view schemas: empty body: {}", response.getStatusCode());
- throw new ServiceException("Failed to get view schemas: empty body: " + response.getStatusCode());
+ throw new DataServiceException("Failed to get view schemas: empty body: " + response.getStatusCode());
}
final List<ViewDto> views = Arrays.asList(response.getBody());
log.debug("found {} view(s) in data service", views.size());
@@ -352,28 +372,29 @@ public class DataServiceGatewayImpl implements DataServiceGateway {
}
@Override
- public TableStatisticDto getTableStatistics(Long databaseId, Long tableId) throws ServiceConnectionException, ServiceException, TableNotFoundException {
+ public TableStatisticDto getTableStatistics(Long databaseId, Long tableId) throws DataServiceConnectionException, DataServiceException, TableNotFoundException {
final ResponseEntity<TableStatisticDto> response;
- final String url = "/api/database/" + databaseId + "/table/" + tableId + "/statistic";
+ final String path = "/api/database/" + databaseId + "/table/" + tableId + "/statistic";
+ log.trace("get table statistics at endpoint {} with path {}", gatewayConfig.getDataEndpoint(), path);
try {
- response = restTemplate.exchange(url, HttpMethod.GET, HttpEntity.EMPTY, TableStatisticDto.class);
+ response = restTemplate.exchange(path, HttpMethod.GET, HttpEntity.EMPTY, TableStatisticDto.class);
} catch (HttpServerErrorException e) {
log.error("Failed to analyse table statistic: {}", e.getMessage());
- throw new ServiceConnectionException("Failed to analyse table statistic: " + e.getMessage(), e);
+ throw new DataServiceConnectionException("Failed to analyse table statistic: " + e.getMessage(), e);
} catch (HttpClientErrorException.NotFound e) {
log.error("Failed to analyse table statistic: not found: {}", e.getMessage());
throw new TableNotFoundException("Failed to analyse table statistic: not found: " + e.getMessage(), e);
} catch (HttpClientErrorException.Unauthorized e) {
log.error("Failed to analyse table statistic: {}", e.getMessage());
- throw new ServiceException("Failed to analyse table statistic: " + e.getMessage(), e);
+ throw new DataServiceException("Failed to analyse table statistic: " + e.getMessage(), e);
}
if (!response.getStatusCode().equals(HttpStatus.OK)) {
log.error("Failed to analyse table statistic: wrong http code: {}", response.getStatusCode());
- throw new ServiceException("Failed to analyse table statistic: wrong http code: " + response.getStatusCode());
+ throw new DataServiceException("Failed to analyse table statistic: wrong http code: " + response.getStatusCode());
}
if (response.getBody() == null) {
log.error("Failed to analyse table statistic: empty body: {}", response.getStatusCode());
- throw new ServiceException("Failed to analyse table statistic: empty body: " + response.getStatusCode());
+ throw new DataServiceException("Failed to analyse table statistic: empty body: " + response.getStatusCode());
}
return response.getBody();
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java
index 1ad9cc46c0bbf9aee9273cc722f266843c951f2c..bce9d6e264b5283864c4e0ce4d2a157bd3d7dab4 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java
@@ -15,8 +15,8 @@ import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.HttpServerErrorException;
-import org.springframework.web.client.ResourceAccessException;
import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.DefaultUriBuilderFactory;
import java.util.UUID;
@@ -25,42 +25,22 @@ import java.util.UUID;
public class KeycloakGatewayImpl implements KeycloakGateway {
private final RestTemplate restTemplate;
+ private final RestTemplate keycloakRestTemplate;
private final KeycloakConfig keycloakConfig;
private final MetadataMapper metadataMapper;
- public KeycloakGatewayImpl(@Qualifier("keycloakRestTemplate") RestTemplate restTemplate,
+ public KeycloakGatewayImpl(@Qualifier("restTemplate") RestTemplate restTemplate,
+ @Qualifier("keycloakRestTemplate") RestTemplate keycloakRestTemplate,
KeycloakConfig keycloakConfig, MetadataMapper metadataMapper) {
+ restTemplate.setUriTemplateHandler(new DefaultUriBuilderFactory(keycloakConfig.getKeycloakEndpoint()));
this.restTemplate = restTemplate;
+ this.keycloakRestTemplate = keycloakRestTemplate;
this.keycloakConfig = keycloakConfig;
this.metadataMapper = metadataMapper;
}
- public TokenDto obtainToken() throws ServiceConnectionException, ServiceException {
- final HttpHeaders headers = new HttpHeaders();
- headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
- final MultiValueMap<String, String> payload = new LinkedMultiValueMap<>();
- payload.add("username", keycloakConfig.getKeycloakUsername());
- payload.add("password", keycloakConfig.getKeycloakPassword());
- payload.add("grant_type", "password");
- payload.add("client_id", "admin-cli");
- final String url = keycloakConfig.getKeycloakEndpoint() + "/realms/master/protocol/openid-connect/token";
- log.debug("request admin token from url {}", url);
- final ResponseEntity<TokenDto> response;
- try {
- response = restTemplate.exchange(url, HttpMethod.POST, new HttpEntity<>(payload, headers), TokenDto.class);
- } catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable |
- HttpServerErrorException.BadGateway e) {
- log.error("Failed to obtain admin token: {}", e.getMessage());
- throw new ServiceConnectionException("Service unavailable", e);
- } catch (HttpClientErrorException.BadRequest e) {
- log.error("Failed to obtain admin token: remote host answered unexpected: {}", e.getMessage(), e);
- throw new ServiceException("Authentication service answered unexpected: " + e.getMessage(), e);
- }
- return response.getBody();
- }
-
@Override
- public TokenDto obtainUserToken(String username, String password) throws ServiceConnectionException,
+ public TokenDto obtainUserToken(String username, String password) throws AuthServiceConnectionException,
CredentialsInvalidException, AccountNotSetupException {
final HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
@@ -71,15 +51,14 @@ public class KeycloakGatewayImpl implements KeycloakGateway {
payload.add("scope", "openid roles");
payload.add("client_id", keycloakConfig.getKeycloakClient());
payload.add("client_secret", keycloakConfig.getKeycloakClientSecret());
- final String url = keycloakConfig.getKeycloakEndpoint() + "/realms/dbrepo/protocol/openid-connect/token";
- log.trace("request user token from url: {}", url);
+ final String path = "/realms/dbrepo/protocol/openid-connect/token";
+ log.trace("obtain user token at endpoint {} with path {}", keycloakConfig.getKeycloakEndpoint(), path);
final ResponseEntity<TokenDto> response;
try {
- response = new RestTemplate()
- .exchange(url, HttpMethod.POST, new HttpEntity<>(payload, headers), TokenDto.class);
- } catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable e) {
+ response = restTemplate.exchange(path, HttpMethod.POST, new HttpEntity<>(payload, headers), TokenDto.class);
+ } catch (HttpServerErrorException e) {
log.error("Failed to obtain user token: {}", e.getMessage());
- throw new ServiceConnectionException("Service unavailable", e);
+ throw new AuthServiceConnectionException("Service unavailable", e);
} catch (HttpClientErrorException.BadRequest e) {
final KeycloakErrorDto error = e.getResponseBodyAs(KeycloakErrorDto.class);
if (error != null && error.getError().equals("invalid_grant")) {
@@ -87,7 +66,7 @@ public class KeycloakGatewayImpl implements KeycloakGateway {
throw new AccountNotSetupException(error.getErrorDescription());
}
log.error("Failed to obtain user token: bad request");
- throw new CredentialsInvalidException("Failed to obtain user token: bad request");
+ throw new CredentialsInvalidException("Bad request", e);
} catch (HttpClientErrorException.Unauthorized e) {
log.error("Failed to obtain user token: invalid credentials");
throw new CredentialsInvalidException("Invalid credentials", e);
@@ -96,7 +75,7 @@ public class KeycloakGatewayImpl implements KeycloakGateway {
}
@Override
- public TokenDto refreshUserToken(String refreshToken) throws ServiceConnectionException,
+ public TokenDto refreshUserToken(String refreshToken) throws AuthServiceConnectionException,
CredentialsInvalidException {
final HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
@@ -105,130 +84,121 @@ public class KeycloakGatewayImpl implements KeycloakGateway {
payload.add("grant_type", "refresh_token");
payload.add("client_id", keycloakConfig.getKeycloakClient());
payload.add("client_secret", keycloakConfig.getKeycloakClientSecret());
- final String url = keycloakConfig.getKeycloakEndpoint() + "/realms/dbrepo/protocol/openid-connect/token";
- log.trace("request user token from url: {}", url);
+ final String path = "/realms/dbrepo/protocol/openid-connect/token";
+ log.trace("refresh user token at endpoint {} with path {}", keycloakConfig.getKeycloakEndpoint(), path);
final ResponseEntity<TokenDto> response;
try {
- response = new RestTemplate()
- .exchange(url, HttpMethod.POST, new HttpEntity<>(payload, headers), TokenDto.class);
- } catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable e) {
+ response = restTemplate.exchange(path, HttpMethod.POST, new HttpEntity<>(payload, headers), TokenDto.class);
+ } catch (HttpServerErrorException e) {
log.error("Failed to refresh user token: {}", e.getMessage());
- throw new ServiceConnectionException("Service unavailable", e);
+ throw new AuthServiceConnectionException("Service unavailable", e);
} catch (HttpClientErrorException.Unauthorized e) {
log.error("Failed to refresh user token: invalid credentials");
throw new CredentialsInvalidException("Invalid credentials", e);
} catch (HttpClientErrorException.BadRequest e) {
- if (e.getMessage().contains("Session not active")) {
+ if (e.getMessage() != null && e.getMessage().contains("Session not active")) {
log.error("Failed to refresh user token: inactive session", e);
- throw new CredentialsInvalidException("Failed to refresh user token: inactive session", e);
+ throw new CredentialsInvalidException("Inactive session", e);
}
- log.error("Failed to refresh user token: remote host answered unexpected: {}", e.getMessage(), e);
- throw new CredentialsInvalidException("Authentication service answered unexpected: " + e.getMessage(), e);
+ log.error("Failed to refresh user token: unexpected response: {}", e.getMessage(), e);
+ throw new CredentialsInvalidException("Unexpected response: " + e.getMessage(), e);
}
return response.getBody();
}
@Override
- public void createUser(UserCreateDto data) throws ServiceException, ServiceConnectionException,
+ public void createUser(UserCreateDto data) throws AuthServiceException, AuthServiceConnectionException,
EmailExistsException, UserExistsException {
- /* obtain admin token */
- final HttpHeaders headers = new HttpHeaders();
- headers.set("Authorization", "Bearer " + obtainToken().getAccessToken());
- final String url = keycloakConfig.getKeycloakEndpoint() + "/admin/realms/dbrepo/users";
- log.debug("create user at url {}", url);
+ final String path = "/admin/realms/dbrepo/users";
+ log.trace("create user at endpoint {} with path {}", keycloakConfig.getKeycloakEndpoint(), path);
final ResponseEntity<Void> response;
try {
- response = restTemplate.exchange(url, HttpMethod.POST, new HttpEntity<>(data, headers), Void.class);
- } catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable |
- HttpServerErrorException.BadGateway e) {
+ response = keycloakRestTemplate.exchange(path, HttpMethod.POST, new HttpEntity<>(data), Void.class);
+ } catch (HttpServerErrorException e) {
log.error("Failed to create user: {}", e.getMessage());
- throw new ServiceConnectionException("Service unavailable");
+ throw new AuthServiceConnectionException("Service unavailable", e);
} catch (HttpClientErrorException.Conflict e) {
- if (e.getMessage().contains("same email")) {
- log.error("Failed to create user: email exists: {}", e.getMessage());
- throw new EmailExistsException("E-Mail exists");
- } else {
- log.error("Failed to create user: user exists: {}", e.getMessage());
- throw new UserExistsException("User exists");
+ if (e.getResponseBodyAsByteArray() != null && e.getResponseBodyAsByteArray().length > 0) {
+ final KeycloakErrorDto error = e.getResponseBodyAs(KeycloakErrorDto.class);
+ if (error != null && error.getErrorMessage().contains("same email")) {
+ log.error("Failed to create user: email exists: {}", e.getMessage());
+ throw new EmailExistsException("E-Mail exists", e);
+ }
}
+ log.error("Failed to create user: user exists: {}", e.getMessage());
+ throw new UserExistsException("User exists", e);
}
if (!response.getStatusCode().equals(HttpStatus.CREATED)) {
log.error("Failed to create user: unexpected status: {}", response.getStatusCode().value());
- throw new ServiceException("Failed to create user: unexpected status: " + response.getStatusCode().value());
+ throw new AuthServiceException("Unexpected status: " + response.getStatusCode().value());
}
log.debug("Created user {} at auth service", data.getUsername());
}
@Override
- public void deleteUser(UUID id) throws ServiceException, ServiceConnectionException, UserNotFoundException {
- /* obtain admin token */
- final HttpHeaders headers = new HttpHeaders();
- headers.set("Authorization", "Bearer " + obtainToken().getAccessToken());
- final String url = keycloakConfig.getKeycloakEndpoint() + "/admin/realms/dbrepo/users/" + id;
- log.debug("delete user at url {}", url);
+ public void deleteUser(UUID id) throws AuthServiceException, AuthServiceConnectionException, UserNotFoundException {
+ final String path = "/admin/realms/dbrepo/users/" + id;
+ log.trace("delete user at endpoint {} with path {}", keycloakConfig.getKeycloakEndpoint(), path);
final ResponseEntity<Void> response;
try {
- response = restTemplate.exchange(url, HttpMethod.DELETE, new HttpEntity<>(null, headers), Void.class);
- } catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable e) {
+ response = keycloakRestTemplate.exchange(path, HttpMethod.DELETE, HttpEntity.EMPTY, Void.class);
+ } catch (HttpServerErrorException e) {
log.error("Failed to delete user: {}", e.getMessage());
- throw new ServiceConnectionException("Service unavailable");
+ throw new AuthServiceConnectionException("Service unavailable", e);
} catch (HttpClientErrorException.NotFound e) {
log.error("Failed to delete user: user not found: {}", e.getMessage());
- throw new UserNotFoundException("User not found");
+ throw new UserNotFoundException("User not found", e);
} catch (Exception e) {
log.error("Failed to delete user: unexpected response: {}", e.getMessage());
- throw new ServiceException("Unexpected result", e);
+ throw new AuthServiceException("Unexpected result", e);
}
if (!response.getStatusCode().equals(HttpStatus.NO_CONTENT)) {
log.error("Failed to delete user: unexpected response");
- throw new ServiceException("Unexpected result");
+ throw new AuthServiceException("Unexpected result");
}
log.info("Deleted user {} at auth service", id);
}
@Override
- public void updateUserCredentials(UUID id, UserPasswordDto data) throws ServiceException,
- ServiceConnectionException {
- /* obtain admin token */
- final HttpHeaders headers = new HttpHeaders();
- headers.set("Authorization", "Bearer " + obtainToken().getAccessToken());
+ public void updateUserCredentials(UUID id, UserPasswordDto data) throws AuthServiceException,
+ AuthServiceConnectionException, UserNotFoundException {
final UpdateCredentialsDto payload = metadataMapper.passwordToUpdateCredentialsDto(data.getPassword());
- final String url = keycloakConfig.getKeycloakEndpoint() + "/admin/realms/dbrepo/users/" + id;
- log.debug("update user credentials at url {}", url);
+ final String path = "/admin/realms/dbrepo/users/" + id;
+ log.trace("update user credentials at endpoint {} with path {}", keycloakConfig.getKeycloakEndpoint(), path);
final ResponseEntity<Void> response;
try {
- response = restTemplate.exchange(url, HttpMethod.PUT, new HttpEntity<>(payload, headers), Void.class);
- } catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable e) {
+ response = keycloakRestTemplate.exchange(path, HttpMethod.PUT, new HttpEntity<>(payload), Void.class);
+ } catch (HttpServerErrorException e) {
log.error("Failed to update user credentials: {}", e.getMessage());
- throw new ServiceConnectionException("Failed to update user credentials: " + e.getMessage());
+ throw new AuthServiceConnectionException("Service unavailable", e);
+ } catch (HttpClientErrorException.NotFound e) {
+ log.error("Failed to update user credentials: user not found: {}", e.getMessage());
+ throw new UserNotFoundException("User not found", e);
} catch (Exception e) {
log.error("Failed to update user: unexpected response: {}", e.getMessage());
- throw new ServiceException("Unexpected result", e);
+ throw new AuthServiceException("Unexpected result", e);
}
if (!response.getStatusCode().equals(HttpStatus.NO_CONTENT)) {
log.error("Failed to update user: unexpected status: {}", response.getStatusCode().value());
- throw new ServiceException("Failed to update user: unexpected status: " + response.getStatusCode().value());
+ throw new AuthServiceException("Unexpected status: " + response.getStatusCode().value());
}
log.info("Updated user {} password at auth service", id);
}
@Override
- public UserDto findByUsername(String username) throws ServiceException, ServiceConnectionException,
+ public UserDto findByUsername(String username) throws AuthServiceException, AuthServiceConnectionException,
UserNotFoundException {
- /* obtain admin token */
- final HttpHeaders headers = new HttpHeaders();
- headers.set("Authorization", "Bearer " + obtainToken().getAccessToken());
- final String url = keycloakConfig.getKeycloakEndpoint() + "/admin/realms/dbrepo/users/?username=" + username;
- log.debug("find user from url {}", url);
+ final String path = "/admin/realms/dbrepo/users/?username=" + username;
+ log.trace("find user by username at endpoint {} with path {}", keycloakConfig.getKeycloakEndpoint(), path);
final ResponseEntity<UserDto[]> response;
try {
- response = restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(null, headers), UserDto[].class);
- } catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable e) {
+ response = keycloakRestTemplate.exchange(path, HttpMethod.GET, HttpEntity.EMPTY, UserDto[].class);
+ } catch (HttpServerErrorException e) {
log.error("Failed to find user: {}", e.getMessage());
- throw new ServiceConnectionException("Failed to find user: " + e.getMessage());
+ throw new AuthServiceConnectionException("Service unavailable", e);
} catch (Exception e) {
log.error("Failed to find user: unexpected response: {}", e.getMessage());
- throw new ServiceException("Unexpected result", e);
+ throw new AuthServiceException("Unexpected result", e);
}
final UserDto[] body = response.getBody();
if (body == null || body.length != 1) {
@@ -239,25 +209,22 @@ public class KeycloakGatewayImpl implements KeycloakGateway {
}
@Override
- public UserDto findById(UUID id) throws ServiceException, ServiceConnectionException,
+ public UserDto findById(UUID id) throws AuthServiceException, AuthServiceConnectionException,
UserNotFoundException {
- /* obtain admin token */
- final HttpHeaders headers = new HttpHeaders();
- headers.set("Authorization", "Bearer " + obtainToken().getAccessToken());
- final String url = keycloakConfig.getKeycloakEndpoint() + "/admin/realms/dbrepo/users/" + id;
- log.debug("find user from url {}", url);
+ final String path = "/admin/realms/dbrepo/users/" + id;
+ log.trace("find user by id at endpoint {} with path {}", keycloakConfig.getKeycloakEndpoint(), path);
final ResponseEntity<UserDto> response;
try {
- response = restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(null, headers), UserDto.class);
- } catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable e) {
+ response = keycloakRestTemplate.exchange(path, HttpMethod.GET, HttpEntity.EMPTY, UserDto.class);
+ } catch (HttpServerErrorException e) {
log.error("Failed to find user: {}", e.getMessage());
- throw new ServiceConnectionException("Service unavailable");
+ throw new AuthServiceConnectionException("Service unavailable", e);
} catch (HttpClientErrorException.NotFound e) {
log.error("Failed to find user: not found: {}", e.getMessage());
throw new UserNotFoundException("User not found");
} catch (Exception e) {
log.error("Failed to find user: unexpected response: {}", e.getMessage());
- throw new ServiceException("Unexpected result", e);
+ throw new AuthServiceException("Unexpected result", e);
}
return response.getBody();
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/OrcidGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/OrcidGatewayImpl.java
index debbe4d66c288fe5546364b1b3067718217ce894..7634e421fe2cda96ebaaa13d029282d682c5d240 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/OrcidGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/OrcidGatewayImpl.java
@@ -4,6 +4,7 @@ import at.tuwien.api.orcid.OrcidDto;
import at.tuwien.exception.OrcidNotFoundException;
import at.tuwien.gateway.OrcidGateway;
import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -19,21 +20,20 @@ public class OrcidGatewayImpl implements OrcidGateway {
private final RestTemplate restTemplate;
- public OrcidGatewayImpl() {
- this.restTemplate = new RestTemplate();
+ @Autowired
+ public OrcidGatewayImpl(RestTemplate restTemplate) {
+ this.restTemplate = restTemplate;
}
@Override
public OrcidDto findByUrl(String url) throws OrcidNotFoundException {
- final HttpHeaders headers = new HttpHeaders();
- headers.set("Accept", "application/json");
+ log.trace("find orcid by url at endpoint {}", url);
final ResponseEntity<OrcidDto> response;
try {
- log.debug("find orcid from url {}", url);
- response = restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(null, headers), OrcidDto.class);
- } catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable e) {
- log.error("Failed to retrieve ORCID metadata from URL {}: {}", url, e.getMessage());
- throw new OrcidNotFoundException("Failed to retrieve ORCID metadata from URL " + url + ": " + e.getMessage());
+ response = restTemplate.exchange(url, HttpMethod.GET, HttpEntity.EMPTY, OrcidDto.class);
+ } catch (HttpServerErrorException e) {
+ log.error("Failed to retrieve orcid metadata: {}", e.getMessage());
+ throw new OrcidNotFoundException("Failed to retrieve orcid metadata: " + e.getMessage());
}
return response.getBody();
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/RorGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/RorGatewayImpl.java
index 6eeb74c3c072f684834f90228dd755bfcb959c09..37ed982f9e4489431e9e86b7fb5c5ec61fed57ec 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/RorGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/RorGatewayImpl.java
@@ -1,9 +1,11 @@
package at.tuwien.gateway.impl;
import at.tuwien.api.ror.RorDto;
+import at.tuwien.config.GatewayConfig;
import at.tuwien.exception.RorNotFoundException;
import at.tuwien.gateway.RorGateway;
import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -18,23 +20,24 @@ import org.springframework.web.client.RestTemplate;
public class RorGatewayImpl implements RorGateway {
private final RestTemplate restTemplate;
+ private final GatewayConfig gatewayConfig;
- public RorGatewayImpl() {
- this.restTemplate = new RestTemplate();
+ @Autowired
+ public RorGatewayImpl(RestTemplate restTemplate, GatewayConfig gatewayConfig) {
+ this.restTemplate = restTemplate;
+ this.gatewayConfig = gatewayConfig;
}
@Override
public RorDto findById(String id) throws RorNotFoundException {
- final HttpHeaders headers = new HttpHeaders();
- headers.set("Accept", "application/json");
- final String url = "https://api.ror.org/organizations/" + id;
+ final String path = "/organizations/" + id;
+ log.trace("find ror by id at endpoint {} with path {}", gatewayConfig.getRorEndpoint(), path);
final ResponseEntity<RorDto> response;
try {
- log.trace("find ror from url {}", url);
- response = restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(null, headers), RorDto.class);
- } catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable e) {
- log.error("Failed to retrieve ROR metadata from URL {}: {}", url, e.getMessage());
- throw new RorNotFoundException("Failed to retrieve ROR metadata from URL " + url + ": " + e.getMessage(), e);
+ response = restTemplate.exchange(gatewayConfig.getRorEndpoint() + path, HttpMethod.GET, HttpEntity.EMPTY, RorDto.class);
+ } catch (HttpServerErrorException e) {
+ log.error("Failed to retrieve ror metadata: {}", e.getMessage());
+ throw new RorNotFoundException("Failed to retrieve ror metadata: " + e.getMessage(), e);
}
return response.getBody();
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/SearchServiceGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/SearchServiceGatewayImpl.java
index deba8360f21d2ac982c00dd959617f4c49f7059e..d97483beb1cac9e590b43a2cdf409067f8eb4d74 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/SearchServiceGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/SearchServiceGatewayImpl.java
@@ -1,6 +1,7 @@
package at.tuwien.gateway.impl;
import at.tuwien.api.database.DatabaseDto;
+import at.tuwien.config.GatewayConfig;
import at.tuwien.entities.database.Database;
import at.tuwien.exception.*;
import at.tuwien.gateway.SearchServiceGateway;
@@ -20,12 +21,14 @@ import org.springframework.web.client.RestTemplate;
public class SearchServiceGatewayImpl implements SearchServiceGateway {
private final RestTemplate restTemplate;
+ private final GatewayConfig gatewayConfig;
private final MetadataMapper metadataMapper;
@Autowired
public SearchServiceGatewayImpl(@Qualifier("searchServiceRestTemplate") RestTemplate restTemplate,
- MetadataMapper metadataMapper) {
+ GatewayConfig gatewayConfig, MetadataMapper metadataMapper) {
this.restTemplate = restTemplate;
+ this.gatewayConfig = gatewayConfig;
this.metadataMapper = metadataMapper;
}
@@ -35,9 +38,10 @@ public class SearchServiceGatewayImpl implements SearchServiceGateway {
final HttpHeaders headers = new HttpHeaders();
headers.set("Accept", "application/json");
headers.set("Content-Type", "application/json");
- final String url = "/api/search/database/" + database.getId();
+ final String path = "/api/search/database/" + database.getId();
+ log.trace("update database at endpoint {} with path {}", gatewayConfig.getSearchEndpoint(), path);
try {
- response = restTemplate.exchange(url, HttpMethod.PUT, new HttpEntity<>(
+ response = restTemplate.exchange(path, HttpMethod.PUT, new HttpEntity<>(
metadataMapper.customDatabaseToDatabaseDto(database), headers), DatabaseDto.class);
} catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable |
HttpServerErrorException.InternalServerError e) {
@@ -60,9 +64,10 @@ public class SearchServiceGatewayImpl implements SearchServiceGateway {
@Override
public void delete(Long databaseId) throws SearchServiceConnectionException, SearchServiceException, DatabaseNotFoundException {
final ResponseEntity<Void> response;
- final String url = "/api/search/database/" + databaseId;
+ final String path = "/api/search/database/" + databaseId;
+ log.trace("delete database at endpoint {} with path {}", gatewayConfig.getSearchEndpoint(), path);
try {
- response = restTemplate.exchange(url, HttpMethod.DELETE, new HttpEntity<>(null), Void.class);
+ response = restTemplate.exchange(path, HttpMethod.DELETE, new HttpEntity<>(null), Void.class);
} catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable |
HttpServerErrorException.InternalServerError e) {
log.error("Failed to delete database: {}", e.getMessage());
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/interceptor/KeycloakInterceptor.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/interceptor/KeycloakInterceptor.java
index 78fb5adc61fd2420cfc62e72cb4aa4c700c3b82b..f73f8bd0dad15596ffecea3cbe9f4a411efa9b35 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/interceptor/KeycloakInterceptor.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/interceptor/KeycloakInterceptor.java
@@ -11,6 +11,7 @@ import org.springframework.util.MultiValueMap;
import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.client.ResourceAccessException;
import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.DefaultUriBuilderFactory;
import java.io.IOException;
@@ -20,17 +21,20 @@ public class KeycloakInterceptor implements ClientHttpRequestInterceptor {
private final String adminUsername;
private final String adminPassword;
private final String keycloakEndpoint;
+ private final RestTemplate restTemplate;
- public KeycloakInterceptor(String adminUsername, String adminPassword, String keycloakEndpoint) {
+ public KeycloakInterceptor(RestTemplate restTemplate, String adminUsername, String adminPassword,
+ String keycloakEndpoint) {
this.adminUsername = adminUsername;
this.adminPassword = adminPassword;
this.keycloakEndpoint = keycloakEndpoint;
+ this.restTemplate = restTemplate;
}
@Override
public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
throws IOException {
- final RestTemplate restTemplate = new RestTemplate();
+ restTemplate.setUriTemplateHandler(new DefaultUriBuilderFactory(keycloakEndpoint));
final HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
final MultiValueMap<String, String> payload = new LinkedMultiValueMap<>();
@@ -38,10 +42,11 @@ public class KeycloakInterceptor implements ClientHttpRequestInterceptor {
payload.add("password", adminPassword);
payload.add("grant_type", "password");
payload.add("client_id", "admin-cli");
+ final String path = "/realms/master/protocol/openid-connect/token";
+ log.trace("obtain admin token at endpoint {} with path {}", keycloakEndpoint, path);
final ResponseEntity<TokenDto> response;
try {
- response = restTemplate.exchange(keycloakEndpoint + "/realms/master/protocol/openid-connect/token",
- HttpMethod.POST, new HttpEntity<>(payload, headers), TokenDto.class);
+ response = restTemplate.exchange(path, HttpMethod.POST, new HttpEntity<>(payload, headers), TokenDto.class);
} catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable e) {
log.error("Failed to obtain admin token: {}", e.getMessage());
return execution.execute(request, body);
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/AccessService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/AccessService.java
index a013a25ce1dbec7f8b28f5a0e25e1a7f2a136889..c47bb8daa36519ff251202d14a02f38c9212aafe 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/AccessService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/AccessService.java
@@ -5,10 +5,8 @@ import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.DatabaseAccess;
import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
-import org.springframework.transaction.annotation.Transactional;
import java.util.List;
-import java.util.UUID;
public interface AccessService {
@@ -25,7 +23,7 @@ public interface AccessService {
*
* @param database The database.
* @param user The user.
- * @return The database access.
+ * @return The database access, if successful.
* @throws AccessNotFoundException The access was not found in the metadata database.
*/
DatabaseAccess find(Database database, User user) throws AccessNotFoundException;
@@ -36,11 +34,12 @@ public interface AccessService {
* @param database The database.
* @param access The access.
* @param user The user.
- * @throws ServiceException The data service responded with unexpected behavior.
- * @throws ServiceConnectionException The connection with the data service could not be established.
+ * @return The database access, if successful.
+ * @throws DataServiceException The data service responded with unexpected behavior.
+ * @throws DataServiceConnectionException The connection with the data service could not be established.
* @throws DatabaseNotFoundException The database was not found in the metadata/search database.
*/
- void create(Database database, User user, AccessTypeDto access) throws ServiceException, ServiceConnectionException,
+ DatabaseAccess create(Database database, User user, AccessTypeDto access) throws DataServiceException, DataServiceConnectionException,
DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException;
/**
@@ -49,11 +48,11 @@ public interface AccessService {
* @param database The database.
* @param user The user.
* @param access The updated access.
- * @throws ServiceException The data service responded with unexpected behavior.
- * @throws ServiceConnectionException The connection with the data service could not be established.
+ * @throws DataServiceException The data service responded with unexpected behavior.
+ * @throws DataServiceConnectionException The connection with the data service could not be established.
* @throws DatabaseNotFoundException The database was not found in the metadata/search database.
*/
- void update(Database database, User user, AccessTypeDto access) throws ServiceException, ServiceConnectionException,
+ void update(Database database, User user, AccessTypeDto access) throws at.tuwien.exception.DataServiceException, DataServiceConnectionException,
AccessNotFoundException, DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException;
/**
@@ -61,10 +60,10 @@ public interface AccessService {
*
* @param database The database.
* @param user The user.
- * @throws ServiceException The data service responded with unexpected behavior.
- * @throws ServiceConnectionException The connection with the data service could not be established.
+ * @throws DataServiceException The data service responded with unexpected behavior.
+ * @throws DataServiceConnectionException The connection with the data service could not be established.
* @throws DatabaseNotFoundException The database was not found in the search database.
*/
- void delete(Database database, User user) throws AccessNotFoundException, ServiceException,
- ServiceConnectionException, DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException;
+ void delete(Database database, User user) throws AccessNotFoundException, DataServiceException,
+ DataServiceConnectionException, DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException;
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/AuthenticationService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/AuthenticationService.java
index de5fd9772ab44da26b25832c53de20a831abd663..eb378290aaf0cec147292a4528efae7e3928811b 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/AuthenticationService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/AuthenticationService.java
@@ -16,48 +16,50 @@ public interface AuthenticationService {
* Create a user at the Authentication Service with given credentials.
*
* @param data The credentials.
+ * @return The user, if successful.
* @throws UserExistsException The user already exists at the auth database.
- * @throws ServiceException The auth service responded with unexpected behavior.
- * @throws ServiceConnectionException The connection with the auth service could not be established.
+ * @throws AuthServiceException The auth service responded with unexpected behavior.
+ * @throws AuthServiceConnectionException The connection with the auth service could not be established.
* @throws EmailExistsException The user email already exists in the metadata database.
*/
- void create(SignupRequestDto data) throws UserExistsException, ServiceException, ServiceConnectionException,
- EmailExistsException;
+ UserDto create(SignupRequestDto data) throws UserExistsException, AuthServiceException, AuthServiceConnectionException,
+ EmailExistsException, CredentialsInvalidException;
/**
* Deletes a user at the Authentication Service with given user id.
*
* @param user The user.
- * @throws ServiceException The auth service responded with unexpected behavior.
- * @throws ServiceConnectionException The connection with the auth service could not be established.
+ * @throws AuthServiceException The auth service responded with unexpected behavior.
+ * @throws AuthServiceConnectionException The connection with the auth service could not be established.
* @throws UserNotFoundException The user was not found after creation in the auth database.
*/
- void delete(User user) throws ServiceException, ServiceConnectionException, UserNotFoundException;
+ void delete(User user) throws AuthServiceException, AuthServiceConnectionException, UserNotFoundException, CredentialsInvalidException;
/**
* Finds a user with given username.
*
* @param username The username.
* @return The user, if successful.
- * @throws ServiceException The auth service responded with unexpected behavior.
- * @throws ServiceConnectionException The connection with the auth service could not be established.
+ * @throws AuthServiceException The auth service responded with unexpected behavior.
+ * @throws AuthServiceConnectionException The connection with the auth service could not be established.
* @throws UserNotFoundException The user was not found in the auth database.
*/
- UserDto findByUsername(String username) throws ServiceException, ServiceConnectionException, UserNotFoundException;
+ UserDto findByUsername(String username) throws AuthServiceException, AuthServiceConnectionException, UserNotFoundException, CredentialsInvalidException;
- UserDto findById(UUID id) throws ServiceException, ServiceConnectionException, UserNotFoundException;
+ UserDto findById(UUID id) throws AuthServiceException, AuthServiceConnectionException, UserNotFoundException, CredentialsInvalidException;
- TokenDto obtainToken(LoginRequestDto data) throws ServiceConnectionException, CredentialsInvalidException, AccountNotSetupException;
+ TokenDto obtainToken(LoginRequestDto data) throws AuthServiceConnectionException, CredentialsInvalidException, AccountNotSetupException;
- TokenDto refreshToken(String refreshToken) throws ServiceConnectionException, CredentialsInvalidException;
+ TokenDto refreshToken(String refreshToken) throws AuthServiceConnectionException, CredentialsInvalidException;
/**
* Updates the password of a user with given id.
*
* @param user The user.
* @param data The new password.
- * @throws ServiceException The auth service responded with unexpected behavior.
- * @throws ServiceConnectionException The connection with the auth service could not be established.
+ * @throws AuthServiceException The auth service responded with unexpected behavior.
+ * @throws AuthServiceConnectionException The connection with the auth service could not be established.
*/
- void updatePassword(User user, UserPasswordDto data) throws ServiceException, ServiceConnectionException;
+ void updatePassword(User user, UserPasswordDto data) throws AuthServiceException, AuthServiceConnectionException,
+ CredentialsInvalidException, UserNotFoundException;
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/BrokerService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/BrokerService.java
index 6a44fb516f7e7be2bf691aca005c76e96c7080e5..f249f7a2cf128ffd09f4fcbeee4add401609436b 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/BrokerService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/BrokerService.java
@@ -1,7 +1,5 @@
package at.tuwien.service;
-import at.tuwien.api.amqp.ExchangeDto;
-import at.tuwien.api.amqp.QueueDto;
import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
@@ -12,28 +10,12 @@ public interface BrokerService {
*
* @param user The user.
*/
- void setVirtualHostPermissions(User user) throws ServiceException, ServiceConnectionException;
+ void setVirtualHostPermissions(User user) throws BrokerServiceException, BrokerServiceConnectionException;
/**
* Sets topic exchange permissions for a user.
*
* @param user The user.
*/
- void setTopicExchangePermissions(User user) throws ServiceException, ServiceConnectionException;
-
- /**
- * Finds a queue with a given name.
- *
- * @param name The queue name.
- * @return The queue.
- */
- QueueDto findQueue(String name) throws ServiceException, ServiceConnectionException, QueueNotFoundException;
-
- /**
- * Finds an exchange with given name.
- *
- * @param name The name.
- * @return The exchange.
- */
- ExchangeDto findExchange(String name) throws ServiceException, ServiceConnectionException, ExchangeNotFoundException;
+ void setTopicExchangePermissions(User user) throws BrokerServiceException, BrokerServiceConnectionException;
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/DatabaseService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/DatabaseService.java
index 32291c8755e56c2a59409f8e4da79c292e85d8c5..aa25ee1362f825ddf060ce9c90dde9e4c965b6bf 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/DatabaseService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/DatabaseService.java
@@ -2,15 +2,11 @@ package at.tuwien.service;
import at.tuwien.api.database.DatabaseCreateDto;
import at.tuwien.api.database.DatabaseModifyVisibilityDto;
-import at.tuwien.api.database.DatabaseTransferDto;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import java.security.Principal;
import java.util.List;
import java.util.UUID;
@@ -55,21 +51,21 @@ public interface DatabaseService {
* @param user The user.
* @return The database, if successful.
* @throws UserNotFoundException If the container/user was not found in the metadata database.
- * @throws ServiceException If the data service returned non-successfully.
- * @throws ServiceConnectionException If failing to connect to the data service/search service.
+ * @throws DataServiceException If the data service returned non-successfully.
+ * @throws DataServiceConnectionException If failing to connect to the data service/search service.
*/
Database create(DatabaseCreateDto createDto, User user) throws UserNotFoundException, ContainerNotFoundException,
- ServiceException, ServiceConnectionException, DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException;
+ DataServiceException, DataServiceConnectionException, DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException;
/**
* Updates the user's password.
*
* @param database The database.
* @param user The user.
- * @throws ServiceException If the data service returned non-successfully.
- * @throws ServiceConnectionException If failing to connect to the data service.
+ * @throws DataServiceException If the data service returned non-successfully.
+ * @throws DataServiceConnectionException If failing to connect to the data service.
*/
- void updatePassword(Database database, User user) throws ServiceException, ServiceConnectionException, DatabaseNotFoundException;
+ void updatePassword(Database database, User user) throws DataServiceException, DataServiceConnectionException, DatabaseNotFoundException;
/**
* Updates the visibility of the database.
@@ -78,7 +74,7 @@ public interface DatabaseService {
* @param data The visibility
* @return The database, if successful.
* @throws NotFoundException The database was not found in the metadata database.
- * @throws ServiceConnectionException If failing to connect to the search service.
+ * @throws DataServiceConnectionException If failing to connect to the search service.
*/
Database modifyVisibility(Database database, DatabaseModifyVisibilityDto data) throws DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException;
@@ -101,11 +97,11 @@ public interface DatabaseService {
*/
Database modifyImage(Database database, byte[] image) throws DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException;
- Database updateTableMetadata(Database database) throws DatabaseNotFoundException, ServiceException,
+ Database updateTableMetadata(Database database) throws DatabaseNotFoundException, DataServiceException,
SearchServiceException, SearchServiceConnectionException, QueryNotFoundException,
- ServiceConnectionException, MalformedException;
+ DataServiceConnectionException, MalformedException, TableNotFoundException;
- Database updateViewMetadata(Database database) throws DatabaseNotFoundException, ServiceException,
+ Database updateViewMetadata(Database database) throws DatabaseNotFoundException, DataServiceException,
SearchServiceException, SearchServiceConnectionException, QueryNotFoundException,
- ServiceConnectionException;
+ DataServiceConnectionException, ViewNotFoundException;
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/IdentifierService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/IdentifierService.java
index e88f75b52eae40f3280384cbd8a52dbde9331609..4d0228f4108164eb463ccecd926d6a0ea52214c8 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/IdentifierService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/IdentifierService.java
@@ -85,8 +85,20 @@ public interface IdentifierService {
*/
List<Identifier> findAll(IdentifierTypeDto type, Long databaseId, Long queryId, Long viewId, Long tableId);
+ /**
+ * Publishes a draft identifier with DataCite.
+ * @param identifierId The identifier id.
+ * @return The resulting identifier.
+ * @throws SearchServiceException
+ * @throws DatabaseNotFoundException
+ * @throws SearchServiceConnectionException
+ * @throws MalformedException
+ * @throws DataServiceConnectionException
+ * @throws IdentifierNotFoundException
+ */
Identifier publish(Long identifierId) throws SearchServiceException, DatabaseNotFoundException,
- SearchServiceConnectionException, MalformedException, ServiceConnectionException, IdentifierNotFoundException;
+ SearchServiceConnectionException, MalformedException, DataServiceConnectionException,
+ IdentifierNotFoundException, ExternalServiceException;
/**
* Creates a new identifier in the metadata database for a query or database.
@@ -95,10 +107,19 @@ public interface IdentifierService {
* @param user The user.
* @param data The data.
* @return The created identifier from the metadata database if successful.
+ * @throws DataServiceException
+ * @throws DataServiceConnectionException
+ * @throws IdentifierNotFoundException
+ * @throws MalformedException
+ * @throws ViewNotFoundException
+ * @throws DatabaseNotFoundException
+ * @throws QueryNotFoundException
+ * @throws SearchServiceException
+ * @throws SearchServiceConnectionException
*/
- Identifier save(Database database, User user, IdentifierSaveDto data) throws ServiceException,
- ServiceConnectionException, IdentifierNotFoundException, MalformedException, ViewNotFoundException,
- DatabaseNotFoundException, QueryNotFoundException, SearchServiceException, SearchServiceConnectionException;
+ Identifier save(Database database, User user, IdentifierSaveDto data) throws DataServiceException,
+ DataServiceConnectionException, IdentifierNotFoundException, MalformedException, ViewNotFoundException,
+ DatabaseNotFoundException, QueryNotFoundException, SearchServiceException, SearchServiceConnectionException, ExternalServiceException;
/**
* Creates a new identifier in the metadata database for a query or database.
@@ -107,10 +128,19 @@ public interface IdentifierService {
* @param user The user.
* @param data The data.
* @return The created identifier from the metadata database if successful.
+ * @throws DataServiceException
+ * @throws DataServiceConnectionException
+ * @throws IdentifierNotFoundException
+ * @throws MalformedException
+ * @throws ViewNotFoundException
+ * @throws DatabaseNotFoundException
+ * @throws QueryNotFoundException
+ * @throws SearchServiceException
+ * @throws SearchServiceConnectionException
*/
- Identifier create(Database database, User user, IdentifierCreateDto data) throws ServiceException,
- ServiceConnectionException, IdentifierNotFoundException, MalformedException, ViewNotFoundException,
- DatabaseNotFoundException, QueryNotFoundException, SearchServiceException, SearchServiceConnectionException;
+ Identifier create(Database database, User user, IdentifierCreateDto data) throws DataServiceException,
+ DataServiceConnectionException, IdentifierNotFoundException, MalformedException, ViewNotFoundException,
+ DatabaseNotFoundException, QueryNotFoundException, SearchServiceException, SearchServiceConnectionException, ExternalServiceException;
/**
* Export metadata for a identifier
@@ -135,8 +165,12 @@ public interface IdentifierService {
*
* @param identifier The identifier.
* @return The XML resource, if successful.
+ * @throws DataServiceException
+ * @throws DataServiceConnectionException
+ * @throws IdentifierNotFoundException
+ * @throws QueryNotFoundException
*/
- InputStreamResource exportResource(Identifier identifier) throws ServiceException, ServiceConnectionException,
+ InputStreamResource exportResource(Identifier identifier) throws DataServiceException, DataServiceConnectionException,
IdentifierNotFoundException, QueryNotFoundException;
/**
@@ -144,7 +178,13 @@ public interface IdentifierService {
* database, but sets it as deleted.
*
* @param identifier The identifier.
+ * @throws DataServiceException
+ * @throws DataServiceConnectionException
+ * @throws IdentifierNotFoundException
+ * @throws DatabaseNotFoundException
+ * @throws SearchServiceException
+ * @throws SearchServiceConnectionException
*/
- void delete(Identifier identifier) throws ServiceException, ServiceConnectionException, IdentifierNotFoundException,
+ void delete(Identifier identifier) throws DataServiceException, DataServiceConnectionException, IdentifierNotFoundException,
DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException;
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/StorageService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/StorageService.java
index 0bed64884e98872842531fed2b46352615288de1..7cb195ce4ee59c919ff0377ece7636be2d091827 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/StorageService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/StorageService.java
@@ -14,6 +14,7 @@ public interface StorageService {
* @param key The object key.
* @return The input stream, if successful.
* @throws StorageUnavailableException The object failed to be loaded from the Storage Service.
+ * @throws StorageNotFoundException The object could not be found in the Storage Service.
*/
InputStream getObject(String bucket, String key) throws StorageNotFoundException,
StorageUnavailableException;
@@ -24,6 +25,7 @@ public interface StorageService {
* @param key The object key.
* @return The byte array.
* @throws StorageUnavailableException The object failed to be loaded from the Storage Service.
+ * @throws StorageNotFoundException The object could not be found in the Storage Service.
*/
byte[] getBytes(String key) throws StorageUnavailableException, StorageNotFoundException;
@@ -34,6 +36,7 @@ public interface StorageService {
* @param key The object key.
* @return The byte array.
* @throws StorageUnavailableException The object failed to be loaded from the Storage Service.
+ * @throws StorageNotFoundException The object could not be found in the Storage Service.
*/
byte[] getBytes(String bucket, String key) throws StorageNotFoundException, StorageUnavailableException;
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/TableService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/TableService.java
index 0eb228ccd5d0a284b3c94e5735cff525ff86dfe1..e4767219063b8e9ee504a404be0bbfcf806270d9 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/TableService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/TableService.java
@@ -1,17 +1,13 @@
package at.tuwien.service;
import at.tuwien.api.database.table.TableCreateDto;
-import at.tuwien.api.database.table.TableHistoryDto;
-import at.tuwien.api.database.table.TableStatisticDto;
import at.tuwien.api.database.table.columns.concepts.ColumnSemanticsUpdateDto;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.table.Table;
import at.tuwien.entities.database.table.columns.TableColumn;
import at.tuwien.exception.*;
-import org.springframework.transaction.annotation.Transactional;
import java.security.Principal;
-import java.util.List;
public interface TableService {
@@ -43,7 +39,7 @@ public interface TableService {
* @return The created table.
*/
Table createTable(Database database, TableCreateDto createDto, Principal principal)
- throws TableNotFoundException, ServiceException, ServiceConnectionException, UserNotFoundException,
+ throws TableNotFoundException, DataServiceException, DataServiceConnectionException, UserNotFoundException,
DatabaseNotFoundException, TableExistsException, SearchServiceException, SearchServiceConnectionException, MalformedException, OntologyNotFoundException, SemanticEntityNotFoundException;
/**
@@ -51,12 +47,12 @@ public interface TableService {
*
* @param table The table.
*/
- void deleteTable(Table table) throws ServiceException, ServiceConnectionException, DatabaseNotFoundException, TableNotFoundException, SearchServiceException, SearchServiceConnectionException;
+ void deleteTable(Table table) throws DataServiceException, DataServiceConnectionException, DatabaseNotFoundException, TableNotFoundException, SearchServiceException, SearchServiceConnectionException;
- TableColumn update(TableColumn column, ColumnSemanticsUpdateDto updateDto) throws ServiceException,
- ServiceConnectionException, DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException, MalformedException, OntologyNotFoundException, SemanticEntityNotFoundException;
+ TableColumn update(TableColumn column, ColumnSemanticsUpdateDto updateDto) throws DataServiceException,
+ DataServiceConnectionException, DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException, MalformedException, OntologyNotFoundException, SemanticEntityNotFoundException;
TableColumn findColumnById(Table table, Long columnId) throws MalformedException;
- void updateStatistics(Table table) throws SearchServiceException, DatabaseNotFoundException, SearchServiceConnectionException, MalformedException, TableNotFoundException, ServiceException, ServiceConnectionException;
+ void updateStatistics(Table table) throws SearchServiceException, DatabaseNotFoundException, SearchServiceConnectionException, MalformedException, TableNotFoundException, DataServiceException, DataServiceConnectionException;
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ViewService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ViewService.java
index d19a3be73beab67d160e09dc892f2a0c46faaee1..a090ece3cb1182f23e37fcf3ba6821ab6254bd02 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ViewService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ViewService.java
@@ -33,7 +33,7 @@ public interface ViewService {
*
* @param view The view.
*/
- void delete(View view) throws ServiceException, ServiceConnectionException, DatabaseNotFoundException,
+ void delete(View view) throws DataServiceException, DataServiceConnectionException, DatabaseNotFoundException,
ViewNotFoundException, SearchServiceException, SearchServiceConnectionException;
/**
@@ -44,6 +44,6 @@ public interface ViewService {
* @param data The given query.
* @return The view that was created.
*/
- View create(Database database, User user, ViewCreateDto data) throws MalformedException, ServiceException,
- ServiceConnectionException, DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException;
+ View create(Database database, User user, ViewCreateDto data) throws MalformedException, DataServiceException,
+ DataServiceConnectionException, DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException;
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AccessServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AccessServiceImpl.java
index 5de1366e9f21b5fb468b38029fc37b98db0323e7..aaa50251c3dc0dd79e51af1c983bfda07affffaa 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AccessServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AccessServiceImpl.java
@@ -62,29 +62,31 @@ public class AccessServiceImpl implements AccessService {
@Override
@Transactional
- public void create(Database database, User user, AccessTypeDto access) throws ServiceException,
- ServiceConnectionException, DatabaseNotFoundException, SearchServiceException,
+ public DatabaseAccess create(Database database, User user, AccessTypeDto type) throws DataServiceException,
+ DataServiceConnectionException, DatabaseNotFoundException, SearchServiceException,
SearchServiceConnectionException {
/* create in data database */
- dataServiceGateway.createAccess(database.getId(), user.getId(), access);
+ dataServiceGateway.createAccess(database.getId(), user.getId(), type);
/* create in metadata database */
+ final DatabaseAccess access = DatabaseAccess.builder()
+ .hdbid(database.getId())
+ .database(database)
+ .huserid(user.getId())
+ .type(metadataMapper.accessTypeDtoToAccessType(type))
+ .build();
database.getAccesses()
- .add(DatabaseAccess.builder()
- .hdbid(database.getId())
- .database(database)
- .huserid(user.getId())
- .type(metadataMapper.accessTypeDtoToAccessType(access))
- .build());
+ .add(access);
database = databaseRepository.save(database);
/* create in search service */
searchServiceGateway.update(database);
log.info("Created access to database with id {}", database.getId());
+ return access;
}
@Override
@Transactional
- public void update(Database database, User user, AccessTypeDto access) throws ServiceException,
- ServiceConnectionException, AccessNotFoundException, DatabaseNotFoundException, SearchServiceException,
+ public void update(Database database, User user, AccessTypeDto access) throws DataServiceException,
+ DataServiceConnectionException, AccessNotFoundException, DatabaseNotFoundException, SearchServiceException,
SearchServiceConnectionException {
/* update in data database */
dataServiceGateway.updateAccess(database.getId(), user.getId(), access);
@@ -110,8 +112,8 @@ public class AccessServiceImpl implements AccessService {
@Override
@Transactional
- public void delete(Database database, User user) throws AccessNotFoundException, ServiceException,
- ServiceConnectionException, DatabaseNotFoundException, SearchServiceException,
+ public void delete(Database database, User user) throws AccessNotFoundException, DataServiceException,
+ DataServiceConnectionException, DatabaseNotFoundException, SearchServiceException,
SearchServiceConnectionException {
/* delete in data database */
dataServiceGateway.deleteAccess(database.getId(), user.getId());
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AuthenticationServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AuthenticationServiceImpl.java
index 6fa8b250562dd89ade7dcecbe69a1a0d92b9fa66..52aa5048891102ae10494790992076f9375388f5 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AuthenticationServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AuthenticationServiceImpl.java
@@ -30,40 +30,52 @@ public class AuthenticationServiceImpl implements AuthenticationService {
}
@Override
- public void create(SignupRequestDto data) throws UserExistsException, ServiceException, ServiceConnectionException,
- EmailExistsException {
+ public UserDto create(SignupRequestDto data) throws UserExistsException, AuthServiceException,
+ AuthServiceConnectionException, EmailExistsException, CredentialsInvalidException {
keycloakGateway.createUser(metadataMapper.signupRequestDtoToUserCreateDto(data));
+ try {
+ return findByUsername(data.getUsername());
+ } catch (UserNotFoundException e) {
+ throw new AuthServiceException("Failed to find user in auth service", e);
+ }
}
@Override
- public void delete(User user) throws ServiceException, ServiceConnectionException, UserNotFoundException {
- keycloakGateway.deleteUser(user.getId());
+ public void delete(User user) throws AuthServiceException, AuthServiceConnectionException, UserNotFoundException,
+ CredentialsInvalidException {
+ final UserDto keycloakUser = findByUsername(user.getUsername());
+ keycloakGateway.deleteUser(keycloakUser.getId());
}
@Override
- public UserDto findByUsername(String username) throws ServiceException, ServiceConnectionException, UserNotFoundException {
+ public UserDto findByUsername(String username) throws AuthServiceException, AuthServiceConnectionException,
+ UserNotFoundException, CredentialsInvalidException {
return keycloakGateway.findByUsername(username);
}
@Override
- public UserDto findById(UUID id) throws ServiceException, ServiceConnectionException, UserNotFoundException {
+ public UserDto findById(UUID id) throws AuthServiceException, AuthServiceConnectionException, UserNotFoundException,
+ CredentialsInvalidException {
return keycloakGateway.findById(id);
}
@Override
- public TokenDto obtainToken(LoginRequestDto data) throws ServiceConnectionException, CredentialsInvalidException,
- AccountNotSetupException {
+ public TokenDto obtainToken(LoginRequestDto data) throws AuthServiceConnectionException,
+ CredentialsInvalidException, AccountNotSetupException {
return keycloakGateway.obtainUserToken(data.getUsername(), data.getPassword());
}
@Override
- public TokenDto refreshToken(String refreshToken) throws ServiceConnectionException, CredentialsInvalidException {
+ public TokenDto refreshToken(String refreshToken) throws AuthServiceConnectionException,
+ CredentialsInvalidException {
return keycloakGateway.refreshUserToken(refreshToken);
}
@Override
- public void updatePassword(User user, UserPasswordDto data) throws ServiceException, ServiceConnectionException {
- keycloakGateway.updateUserCredentials(user.getId(), data);
+ public void updatePassword(User user, UserPasswordDto data) throws AuthServiceException,
+ AuthServiceConnectionException, CredentialsInvalidException, UserNotFoundException {
+ final UserDto keycloakUser = findByUsername(user.getUsername());
+ keycloakGateway.updateUserCredentials(keycloakUser.getId(), data);
}
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/BrokerServiceRabbitMqImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/BrokerServiceRabbitMqImpl.java
index cc4cef2ce49d22b1b2c6a41a6b911c0536521ff7..2800c96bc9d376e14cb990edb4d8fe5f9cc5d3a3 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/BrokerServiceRabbitMqImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/BrokerServiceRabbitMqImpl.java
@@ -1,12 +1,9 @@
package at.tuwien.service.impl;
-import at.tuwien.api.amqp.ExchangeDto;
import at.tuwien.api.amqp.GrantExchangePermissionsDto;
import at.tuwien.api.amqp.GrantVirtualHostPermissionsDto;
-import at.tuwien.api.amqp.QueueDto;
import at.tuwien.config.RabbitConfig;
import at.tuwien.entities.database.AccessType;
-import at.tuwien.entities.database.table.Table;
import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
import at.tuwien.gateway.BrokerServiceGateway;
@@ -30,7 +27,7 @@ public class BrokerServiceRabbitMqImpl implements BrokerService {
}
@Override
- public void setVirtualHostPermissions(User user) throws ServiceException, ServiceConnectionException {
+ public void setVirtualHostPermissions(User user) throws BrokerServiceException, BrokerServiceConnectionException {
final GrantVirtualHostPermissionsDto permissions = GrantVirtualHostPermissionsDto.builder()
.configure("")
.write(".*")
@@ -42,7 +39,7 @@ public class BrokerServiceRabbitMqImpl implements BrokerService {
@Override
@Transactional(readOnly = true)
- public void setTopicExchangePermissions(User user) throws ServiceException, ServiceConnectionException {
+ public void setTopicExchangePermissions(User user) throws BrokerServiceException, BrokerServiceConnectionException {
final GrantExchangePermissionsDto permissions = GrantExchangePermissionsDto.builder()
.exchange(rabbitConfig.getExchangeName())
.write(userToExchangeWritePermissionString(user))
@@ -94,14 +91,4 @@ public class BrokerServiceRabbitMqImpl implements BrokerService {
return permissions;
}
- @Override
- public QueueDto findQueue(String name) throws ServiceException, ServiceConnectionException, QueueNotFoundException {
- return brokerServiceGateway.findQueue(name);
- }
-
- @Override
- public ExchangeDto findExchange(String name) throws ServiceException, ServiceConnectionException, ExchangeNotFoundException {
- return brokerServiceGateway.findExchange(name);
- }
-
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DataCiteIdentifierServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DataCiteIdentifierServiceImpl.java
index 87f178b1c0d7e0d0bdf4c2be9e883a1a56b26861..ed58148707440f4dc20728fafbbc19ad3fd06594 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DataCiteIdentifierServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DataCiteIdentifierServiceImpl.java
@@ -13,6 +13,7 @@ import at.tuwien.config.DataCiteConfig;
import at.tuwien.config.EndpointConfig;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.identifier.Identifier;
+import at.tuwien.entities.identifier.IdentifierStatusType;
import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
import at.tuwien.mapper.MetadataMapper;
@@ -69,9 +70,10 @@ public class DataCiteIdentifierServiceImpl implements IdentifierService {
@Override
@Transactional
- public Identifier publish(Long identifierId) throws MalformedException, ServiceConnectionException,
- IdentifierNotFoundException {
+ public Identifier publish(Long identifierId) throws MalformedException, DataServiceConnectionException,
+ IdentifierNotFoundException, ExternalServiceException {
final Identifier identifier = find(identifierId);
+ identifier.setStatus(IdentifierStatusType.PUBLISHED);
identifier.setDoi(remoteSave(identifier, DataCiteDoiEvent.PUBLISH));
return identifierRepository.save(identifier);
}
@@ -94,19 +96,20 @@ public class DataCiteIdentifierServiceImpl implements IdentifierService {
@Override
@Transactional(rollbackFor = {Exception.class})
- public Identifier save(Database database, User user, IdentifierSaveDto data) throws ServiceException,
- ServiceConnectionException, MalformedException, DatabaseNotFoundException, IdentifierNotFoundException,
- ViewNotFoundException, QueryNotFoundException, SearchServiceException, SearchServiceConnectionException {
+ public Identifier save(Database database, User user, IdentifierSaveDto data) throws DataServiceException,
+ DataServiceConnectionException, MalformedException, DatabaseNotFoundException, IdentifierNotFoundException,
+ ViewNotFoundException, QueryNotFoundException, SearchServiceException, SearchServiceConnectionException,
+ ExternalServiceException {
data.setDoi(remoteSave(identifierService.save(database, user, data), DataCiteDoiEvent.REGISTER));
return identifierService.save(database, user, data);
}
@Override
@Transactional(rollbackFor = {Exception.class})
- public Identifier create(Database database, User user, IdentifierCreateDto data) throws ServiceException,
- ServiceConnectionException, IdentifierNotFoundException, MalformedException, ViewNotFoundException,
+ public Identifier create(Database database, User user, IdentifierCreateDto data) throws DataServiceException,
+ DataServiceConnectionException, IdentifierNotFoundException, MalformedException, ViewNotFoundException,
DatabaseNotFoundException, QueryNotFoundException, SearchServiceException,
- SearchServiceConnectionException {
+ SearchServiceConnectionException, ExternalServiceException {
data.setDoi(remoteSave(identifierService.create(database, user, data), DataCiteDoiEvent.REGISTER));
return identifierService.create(database, user, data);
}
@@ -118,14 +121,15 @@ public class DataCiteIdentifierServiceImpl implements IdentifierService {
* @param event The PID status event, e.g. publish
* @return The DOI for this PID.
* @throws MalformedException
- * @throws ServiceConnectionException
+ * @throws DataServiceConnectionException
+ * @throws ExternalServiceException
*/
public String remoteSave(Identifier identifier, DataCiteDoiEvent event) throws MalformedException,
- ServiceConnectionException {
+ DataServiceConnectionException, ExternalServiceException {
final HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
headers.setBasicAuth(dataCiteConfig.getUsername(), dataCiteConfig.getPassword());
- HttpEntity<DataCiteBody<DataCiteCreateDoi>> request = new HttpEntity<>(
+ final HttpEntity<DataCiteBody<DataCiteCreateDoi>> request = new HttpEntity<>(
DataCiteBody.<DataCiteCreateDoi>builder()
.data(DataCiteData.<DataCiteCreateDoi>builder()
.type("dois")
@@ -139,11 +143,11 @@ public class DataCiteIdentifierServiceImpl implements IdentifierService {
final String url = dataCiteConfig.getUrl() + "/dois";
log.trace("request doi from url {}", url);
try {
- ResponseEntity<DataCiteBody<DataCiteDoi>> response = restTemplate.exchange(url, HttpMethod.POST,
+ final ResponseEntity<DataCiteBody<DataCiteDoi>> response = restTemplate.exchange(url, HttpMethod.POST,
request, dataCiteBodyParameterizedTypeReference);
if (response.getStatusCode() != HttpStatus.CREATED || response.getBody() == null) {
log.error("Failed to mint doi: {}", response);
- throw new ServiceException("Failed to mint doi: " + response.getBody());
+ throw new ExternalServiceException("Failed to mint doi: " + response.getBody());
}
return response.getBody()
.getData()
@@ -154,9 +158,7 @@ public class DataCiteIdentifierServiceImpl implements IdentifierService {
throw new MalformedException("Failed to mint doi: malformed metadata: " + e.getMessage(), e);
} catch (RestClientException e) {
log.error("Failed to mint doi: {}", e.getMessage());
- throw new ServiceConnectionException("Failed to mint doi: " + e.getMessage(), e);
- } catch (ServiceException e) {
- throw new RuntimeException(e);
+ throw new DataServiceConnectionException("Failed to mint doi: " + e.getMessage(), e);
}
}
@@ -196,14 +198,14 @@ public class DataCiteIdentifierServiceImpl implements IdentifierService {
@Override
@Transactional(readOnly = true)
- public InputStreamResource exportResource(Identifier identifier) throws ServiceException,
- ServiceConnectionException, IdentifierNotFoundException, QueryNotFoundException {
+ public InputStreamResource exportResource(Identifier identifier) throws DataServiceException,
+ DataServiceConnectionException, IdentifierNotFoundException, QueryNotFoundException {
return identifierService.exportResource(identifier);
}
@Override
@Transactional
- public void delete(Identifier identifier) throws ServiceException, ServiceConnectionException,
+ public void delete(Identifier identifier) throws DataServiceException, DataServiceConnectionException,
DatabaseNotFoundException, IdentifierNotFoundException, SearchServiceException,
SearchServiceConnectionException {
identifierService.delete(identifier);
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java
index f42992781c36e438233dd1d376c17d631ac7f584..8c835864db5ed4bf69bd2bd6b29adfe4d409899d 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java
@@ -62,6 +62,7 @@ public class DatabaseServiceImpl implements DatabaseService {
@Override
public Database findByInternalName(String internalName) throws DatabaseNotFoundException {
+ log.trace("find database by internal name: {}", internalName);
final Optional<Database> database = databaseRepository.findByInternalName(internalName);
if (database.isEmpty()) {
log.error("Failed to find database with internal name {} in metadata database", internalName);
@@ -84,7 +85,7 @@ public class DatabaseServiceImpl implements DatabaseService {
@Override
@Transactional
public Database create(DatabaseCreateDto data, User user) throws UserNotFoundException,
- ContainerNotFoundException, ServiceException, ServiceConnectionException, DatabaseNotFoundException,
+ ContainerNotFoundException, DataServiceException, DataServiceConnectionException, DatabaseNotFoundException,
SearchServiceException, SearchServiceConnectionException {
final Container container = containerService.find(data.getCid());
Database database = Database.builder()
@@ -135,7 +136,7 @@ public class DatabaseServiceImpl implements DatabaseService {
@Override
@Transactional(readOnly = true)
- public void updatePassword(Database database, User user) throws ServiceException, ServiceConnectionException,
+ public void updatePassword(Database database, User user) throws DataServiceException, DataServiceConnectionException,
DatabaseNotFoundException {
final List<Database> databases = databaseRepository.findReadAccess(user.getId())
.stream()
@@ -190,10 +191,10 @@ public class DatabaseServiceImpl implements DatabaseService {
}
@Override
- @Transactional(rollbackFor = {SearchServiceException.class, SearchServiceConnectionException.class, DatabaseNotFoundException.class})
- public Database updateTableMetadata(Database database) throws DatabaseNotFoundException, ServiceException,
- SearchServiceException, SearchServiceConnectionException, QueryNotFoundException,
- ServiceConnectionException, MalformedException {
+ @Transactional(rollbackFor = {Exception.class})
+ public Database updateTableMetadata(Database database) throws DatabaseNotFoundException, DataServiceException,
+ SearchServiceException, SearchServiceConnectionException, DataServiceConnectionException,
+ MalformedException, TableNotFoundException {
for (TableDto table : dataServiceGateway.getTableSchemas(database.getId())) {
if (database.getTables().stream().anyMatch(t -> t.getInternalName().equals(table.getInternalName()))) {
log.debug("fetched known table from data service: {}.{}", database.getInternalName(), table.getInternalName());
@@ -296,10 +297,10 @@ public class DatabaseServiceImpl implements DatabaseService {
}
@Override
- @Transactional(rollbackFor = {SearchServiceException.class, SearchServiceConnectionException.class, DatabaseNotFoundException.class})
- public Database updateViewMetadata(Database database) throws DatabaseNotFoundException, ServiceException,
- SearchServiceException, SearchServiceConnectionException, QueryNotFoundException,
- ServiceConnectionException {
+ @Transactional(rollbackFor = {Exception.class})
+ public Database updateViewMetadata(Database database) throws DatabaseNotFoundException, DataServiceException,
+ SearchServiceException, SearchServiceConnectionException, DataServiceConnectionException,
+ ViewNotFoundException {
for (ViewDto view : dataServiceGateway.getViewSchemas(database.getId())) {
if (database.getViews().stream().anyMatch(v -> v.getInternalName().equals(view.getInternalName()))) {
log.debug("fetched known view from data service: {}.{}", database.getInternalName(), view.getInternalName());
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/IdentifierServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/IdentifierServiceImpl.java
index 37215d0787d6532eb03d8bf3ebdd8557f28d83e0..df0f895f5d2d3512444b2d3e10e28e14a70e2c45 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/IdentifierServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/IdentifierServiceImpl.java
@@ -155,7 +155,7 @@ public class IdentifierServiceImpl implements IdentifierService {
@Override
@Transactional
public Identifier save(Database database, User user, IdentifierSaveDto data) throws SearchServiceException,
- ServiceException, QueryNotFoundException, ServiceConnectionException, DatabaseNotFoundException,
+ DataServiceException, QueryNotFoundException, DataServiceConnectionException, DatabaseNotFoundException,
SearchServiceConnectionException, IdentifierNotFoundException, ViewNotFoundException {
final Identifier identifier = find(data.getId());
identifier.setDatabase(database);
@@ -223,7 +223,7 @@ public class IdentifierServiceImpl implements IdentifierService {
@Override
@Transactional
public Identifier create(Database database, User user, IdentifierCreateDto data) throws SearchServiceException,
- ServiceException, QueryNotFoundException, ServiceConnectionException, DatabaseNotFoundException,
+ DataServiceException, QueryNotFoundException, DataServiceConnectionException, DatabaseNotFoundException,
SearchServiceConnectionException, IdentifierNotFoundException, ViewNotFoundException {
final Identifier identifier = metadataMapper.identifierCreateDtoToIdentifier(data);
identifier.setDatabase(database);
@@ -276,9 +276,9 @@ public class IdentifierServiceImpl implements IdentifierService {
}
@Transactional
- public Identifier save(Identifier identifier) throws ServiceException,
- ServiceConnectionException, IdentifierNotFoundException, ViewNotFoundException, DatabaseNotFoundException,
- QueryNotFoundException, SearchServiceException, SearchServiceConnectionException {
+ public Identifier save(Identifier identifier) throws DataServiceException, DataServiceConnectionException,
+ IdentifierNotFoundException, ViewNotFoundException, DatabaseNotFoundException, QueryNotFoundException,
+ SearchServiceException, SearchServiceConnectionException {
/* save identifier */
switch (identifier.getType()) {
case SUBSET -> {
@@ -356,15 +356,15 @@ public class IdentifierServiceImpl implements IdentifierService {
@Override
@Transactional(readOnly = true)
- public InputStreamResource exportResource(Identifier identifier) throws ServiceException,
- ServiceConnectionException, QueryNotFoundException {
+ public InputStreamResource exportResource(Identifier identifier) throws DataServiceException,
+ DataServiceConnectionException, QueryNotFoundException {
final ExportResourceDto exportResource = dataServiceGateway.exportQuery(identifier.getDatabase().getId(), identifier.getQueryId());
return exportResource.getResource();
}
@Override
@Transactional
- public void delete(Identifier identifier) throws ServiceException, ServiceConnectionException,
+ public void delete(Identifier identifier) throws DataServiceException, DataServiceConnectionException,
IdentifierNotFoundException, DatabaseNotFoundException, SearchServiceException,
SearchServiceConnectionException {
/* delete in metadata database */
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/MetadataServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/MetadataServiceImpl.java
index 9dfefd18cca20a2f6c2e90182c112af147930f18..14c621e2f9d10799864d8d85a6f019353ca67b08 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/MetadataServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/MetadataServiceImpl.java
@@ -17,7 +17,6 @@ import at.tuwien.oaipmh.OaiRecordParameters;
import at.tuwien.repository.IdentifierRepository;
import at.tuwien.service.IdentifierService;
import at.tuwien.service.MetadataService;
-import at.tuwien.utils.XmlUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -120,7 +119,7 @@ public class MetadataServiceImpl implements MetadataService {
final StringBuilder builder = new StringBuilder("<ListMetadataFormats>");
builder.append(templateEngine.process("metadata-format.xml", new Context()));
builder.append("</ListMetadataFormats>");
- return XmlUtil.pretty(parseResponse("verb=\"ListMetadataFormats\"", builder.toString()));
+ return parseResponse("verb=\"ListMetadataFormats\"", builder.toString());
}
@Override
@@ -130,7 +129,7 @@ public class MetadataServiceImpl implements MetadataService {
context.setVariable("message", type.getErrorText());
final String body = templateEngine.process("error.xml", context);
log.trace("mapped error {}", type);
- return XmlUtil.pretty(parseResponse(body));
+ return parseResponse(body);
}
private String requestUrl() {
@@ -153,7 +152,7 @@ public class MetadataServiceImpl implements MetadataService {
context.setVariable("request", "<request " + parameterString + ">" + requestUrl() + "</request>");
}
context.setVariable("body", body);
- return XmlUtil.pretty(templateEngine.process("_header.xml", context));
+ return templateEngine.process("_header.xml", context);
}
@Override
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/StorageServiceS3Impl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/StorageServiceS3Impl.java
index 40eab251c9712c30ba960f9d1fbe3b8ca1f72c79..aef3213ccf2cac81ef70ad4a053c803cde16002d 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/StorageServiceS3Impl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/StorageServiceS3Impl.java
@@ -29,6 +29,7 @@ public class StorageServiceS3Impl implements StorageService {
@Override
public InputStream getObject(String bucket, String key) throws StorageNotFoundException,
StorageUnavailableException {
+ log.trace("get object with key {} from bucket {}", key, bucket);
try {
return s3Client.getObject(GetObjectRequest.builder()
.bucket(bucket)
@@ -45,11 +46,13 @@ public class StorageServiceS3Impl implements StorageService {
@Override
public byte[] getBytes(String key) throws StorageNotFoundException, StorageUnavailableException {
- return getBytes(s3Config.getS3ImportBucket(), key);
+ log.trace("get bytes with key {} from bucket {}", key, s3Config.getS3Bucket());
+ return getBytes(s3Config.getS3Bucket(), key);
}
@Override
public byte[] getBytes(String bucket, String key) throws StorageNotFoundException, StorageUnavailableException {
+ log.trace("get bytes with key {} from bucket {}", key, bucket);
try {
return getObject(bucket, key)
.readAllBytes();
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java
index e8fecdf300095d9d936a6bdf1a9269b141952bcd..7ca855974e86b23a5a2ec8abcbc124f97a0e8ab7 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java
@@ -19,7 +19,6 @@ import at.tuwien.exception.*;
import at.tuwien.gateway.DataServiceGateway;
import at.tuwien.gateway.SearchServiceGateway;
import at.tuwien.mapper.MetadataMapper;
-import at.tuwien.mapper.SparqlMapper;
import at.tuwien.repository.DatabaseRepository;
import at.tuwien.service.*;
import lombok.extern.log4j.Log4j2;
@@ -96,28 +95,11 @@ public class TableServiceImpl implements TableService {
@Override
@Transactional
- public Table createTable(Database database, TableCreateDto data, Principal principal) throws ServiceException,
- ServiceConnectionException, UserNotFoundException, TableNotFoundException, DatabaseNotFoundException,
- TableExistsException, SearchServiceException, SearchServiceConnectionException, MalformedException, OntologyNotFoundException, SemanticEntityNotFoundException {
+ public Table createTable(Database database, TableCreateDto data, Principal principal) throws DataServiceException,
+ DataServiceConnectionException, UserNotFoundException, TableNotFoundException, DatabaseNotFoundException,
+ TableExistsException, SearchServiceException, SearchServiceConnectionException, MalformedException,
+ OntologyNotFoundException, SemanticEntityNotFoundException {
final User owner = userService.findByUsername(principal.getName());
- /* check */
- if (data.getConstraints().getPrimaryKey().isEmpty()) {
- final List<ColumnCreateDto> columns = new LinkedList<>();
- columns.add(ColumnCreateDto.builder()
- .name("id")
- .type(ColumnTypeDto.BIGINT)
- .nullAllowed(false)
- .build());
- columns.addAll(data.getColumns());
- data.setNeedSequence(true);
- data.setColumns(columns);
- data.getConstraints()
- .setPrimaryKey(Set.of("id"));
- log.debug("no primary key provided: generate primary key column with sequence");
- } else {
- log.trace("primary key provided: no column with sequence needed");
- data.setNeedSequence(false);
- }
/* map table */
final Table table = Table.builder()
.isVersioned(true)
@@ -144,9 +126,6 @@ public class TableServiceImpl implements TableService {
final TableColumn column = metadataMapper.columnCreateDtoToTableColumn(c, database.getContainer().getImage());
column.setOrdinalPosition(idx[0]++);
column.setTable(table);
- if (data.isNeedSequence() && column.getName().equals("id")) {
- column.setAutoGenerated(true);
- }
if (c.getUnitUri() != null) {
log.trace("column {} has assigned unit uri: {}", column.getInternalName(), c.getUnitUri());
TableColumnUnit unit;
@@ -218,7 +197,7 @@ public class TableServiceImpl implements TableService {
@Override
@Transactional
- public void deleteTable(Table table) throws ServiceException, ServiceConnectionException,
+ public void deleteTable(Table table) throws DataServiceException, DataServiceConnectionException,
DatabaseNotFoundException, TableNotFoundException, SearchServiceException,
SearchServiceConnectionException {
/* delete at data service */
@@ -233,8 +212,8 @@ public class TableServiceImpl implements TableService {
@Override
@Transactional
- public TableColumn update(TableColumn column, ColumnSemanticsUpdateDto data) throws ServiceException,
- ServiceConnectionException, DatabaseNotFoundException, SearchServiceException,
+ public TableColumn update(TableColumn column, ColumnSemanticsUpdateDto data) throws DataServiceException,
+ DataServiceConnectionException, DatabaseNotFoundException, SearchServiceException,
SearchServiceConnectionException, MalformedException, OntologyNotFoundException,
SemanticEntityNotFoundException {
/* assign */
@@ -289,9 +268,12 @@ public class TableServiceImpl implements TableService {
@Transactional
public void updateStatistics(Table table) throws SearchServiceException,
DatabaseNotFoundException, SearchServiceConnectionException, MalformedException, TableNotFoundException,
- ServiceException, ServiceConnectionException {
+ DataServiceException, DataServiceConnectionException {
final TableStatisticDto statistic = dataServiceGateway.getTableStatistics(table.getTdbid(), table.getId());
table.setNumRows(statistic.getRows());
+ table.setDataLength(statistic.getDataLength());
+ table.setAvgRowLength(statistic.getAvgRowLength());
+ table.setMaxDataLength(statistic.getMaxDataLength());
for (Map.Entry<String, ColumnStatisticDto> entry : statistic.getColumns().entrySet()) {
final Optional<TableColumn> optional = table.getColumns().stream().filter(c -> c.getInternalName().equals(entry.getKey())).findFirst();
if (optional.isEmpty()) {
@@ -313,7 +295,8 @@ public class TableServiceImpl implements TableService {
databaseRepository.save(database);
/* update in open search service */
searchServiceGateway.update(database);
- log.info("Updated statistics of table with id: {}", table.getId());
+ log.info("Updated statistics for the table and {} column(s)", table.getColumns().size());
+ log.trace("updated statistics: {}", table);
}
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ViewServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ViewServiceImpl.java
index a91e03284403b63453f129467f6ce7adaf7c0f90..0826d9dcc88e344227f56550b2aebd6f42e3494e 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ViewServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ViewServiceImpl.java
@@ -70,7 +70,7 @@ public class ViewServiceImpl implements ViewService {
@Override
@Transactional
- public void delete(View view) throws ServiceException, ServiceConnectionException, DatabaseNotFoundException,
+ public void delete(View view) throws DataServiceException, DataServiceConnectionException, DatabaseNotFoundException,
ViewNotFoundException, SearchServiceException, SearchServiceConnectionException {
/* delete in data service */
dataServiceGateway.deleteView(view.getDatabase().getId(), view.getId());
@@ -84,8 +84,8 @@ public class ViewServiceImpl implements ViewService {
@Override
@Transactional
- public View create(Database database, User creator, ViewCreateDto data) throws MalformedException, ServiceException,
- ServiceConnectionException, DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException {
+ public View create(Database database, User creator, ViewCreateDto data) throws MalformedException, DataServiceException,
+ DataServiceConnectionException, DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException {
/* create in metadata database */
final View view = View.builder()
.vdbid(database.getId())
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/utils/FileUtil.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/utils/FileUtil.java
deleted file mode 100644
index 6e8b749c5f0a4a6d2720b003d2e5561584f4e9fe..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/utils/FileUtil.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package at.tuwien.utils;
-
-import lombok.extern.log4j.Log4j2;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.LinkedList;
-import java.util.List;
-
-@Log4j2
-public class FileUtil {
-
- /**
- * Loads a resource from the resource path when the application is compiled into a .jar and during runtime.
- *
- * @param resourcePath The path to the resource.
- * @return The text contents of the resource.
- * @throws IOException The resource could not be loaded.
- */
- public static List<String> loadResource(String resourcePath) throws IOException {
- final InputStream inputStream = FileUtil.class.getResourceAsStream(resourcePath);
- if (inputStream == null) {
- log.error("Failed to load query store input stream file {}", resourcePath);
- throw new IOException("Failed to load query store input stream file");
- }
- final BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
- final List<String> lines = new LinkedList<>();
- while(reader.ready()) {
- lines.add(reader.readLine());
- }
- inputStream.close();
- reader.close();
- return lines;
- }
-
-}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/utils/XmlUtil.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/utils/XmlUtil.java
deleted file mode 100644
index 42db2b93797e9a3838d54fb790c05e853e5d738d..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/utils/XmlUtil.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package at.tuwien.utils;
-
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.Writer;
-
-public class XmlUtil {
-
- public static String pretty(String xmlString) {
- return pretty(xmlString, 2, true);
- }
-
- public static String pretty(String xmlString, int indent, boolean ignoreDeclaration) {
- xmlString = xmlString.replaceAll("(?m)^[ \t]*\r?\n", "").replaceAll("> <", "><");
- try {
- final InputSource src = new InputSource(new StringReader(xmlString.trim()));
- final Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(src);
- final TransformerFactory transformerFactory = TransformerFactory.newInstance();
- transformerFactory.setAttribute("indent-number", indent);
- final Transformer transformer = transformerFactory.newTransformer();
- transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
- transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, ignoreDeclaration ? "yes" : "no");
- transformer.setOutputProperty(OutputKeys.INDENT, "np");
- final Writer out = new StringWriter();
- transformer.transform(new DOMSource(document), new StreamResult(out));
- return out.toString()
- .trim();
- } catch (Exception e) {
- throw new RuntimeException("Error occurs when pretty-printing xml:\n" + xmlString, e);
- }
- }
-
-}
diff --git a/dbrepo-metadata-service/test/pom.xml b/dbrepo-metadata-service/test/pom.xml
index 902e9efdda890936801911f8d2a63e7d2a47980b..2c4091eace14d78e0a6323f8960be5ffa6f5cfb0 100644
--- a/dbrepo-metadata-service/test/pom.xml
+++ b/dbrepo-metadata-service/test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
- <version>1.4.4</version>
+ <version>1.4.5</version>
</parent>
<artifactId>dbrepo-metadata-service-test</artifactId>
<name>dbrepo-metadata-service-test</name>
- <version>1.4.4</version>
+ <version>1.4.5</version>
<dependencies>
<dependency>
diff --git a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
index 2d9a2f40a03a60b4650e8fa626d9ef17e7ab9eb4..0341a7a5dfad8f3a218dd195631ff956289b6b15 100644
--- a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
+++ b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
@@ -1,5 +1,6 @@
package at.tuwien.test;
+import at.tuwien.ExportResourceDto;
import at.tuwien.api.amqp.*;
import at.tuwien.api.auth.LoginRequestDto;
import at.tuwien.api.auth.SignupRequestDto;
@@ -75,6 +76,7 @@ import at.tuwien.entities.user.User;
import at.tuwien.test.utils.ArrayUtils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.core.io.InputStreamResource;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -82,6 +84,7 @@ import org.springframework.security.core.userdetails.UserDetails;
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.nio.charset.Charset;
@@ -390,6 +393,7 @@ public abstract class BaseTest {
USER_LOCAL_ADMIN_PASSWORD, USER_LOCAL_ADMIN_DETAILS.getAuthorities());
public final static UUID USER_1_ID = UUID.fromString("cd5bab0d-7799-4069-85fb-c5d738572a0b");
+ public final static UUID USER_1_LDAP_ID = UUID.fromString("8e541e05-f45c-4d40-ba1b-0e62f04ba3f8");
public final static String USER_1_EMAIL = "john.doe@example.com";
public final static String USER_1_USERNAME = "junit1";
public final static String USER_1_PASSWORD = "junit1";
@@ -452,6 +456,14 @@ public abstract class BaseTest {
.credentials(List.of(USER_1_KEYCLOAK_CREDENTIAL_1))
.build();
+ public final static UserCreateDto USER_1_KEYCLOAK_SYSTEM_SIGNUP_REQUEST = UserCreateDto.builder()
+ .username(USER_1_USERNAME)
+ .email(USER_1_EMAIL)
+ .enabled(USER_1_ENABLED)
+ .credentials(List.of(USER_1_KEYCLOAK_CREDENTIAL_1))
+ .groups(List.of("system"))
+ .build();
+
public final static PrivilegedUserDto USER_1_PRIVILEGED_DTO = PrivilegedUserDto.builder()
.id(USER_1_ID)
.username(USER_1_USERNAME)
@@ -505,6 +517,10 @@ public abstract class BaseTest {
.emailVerified(USER_1_VERIFIED)
.notBefore(USER_1_NOT_BEFORE)
.totp(USER_1_TOTP)
+ .attributes(at.tuwien.api.keycloak.UserAttributesDto.builder()
+ .ldapEntryDn(new String[]{"cn=" + USER_1_USERNAME + ",dn=dbrepo,dn=at"})
+ .ldapId(new UUID[]{USER_1_LDAP_ID})
+ .build())
.build();
public final static UserBriefDto USER_1_BRIEF_DTO = UserBriefDto.builder()
@@ -1826,11 +1842,11 @@ public abstract class BaseTest {
.checks(new LinkedHashSet<>())
.primaryKey(new LinkedHashSet<>())
.foreignKeys(new LinkedList<>())
- .uniques(List.of(List.of("id")))
+ .uniques(new LinkedList<>())
.build();
public final static ConstraintsCreateDto TABLE_3_CONSTRAINTS_INVALID_CREATE_DTO = ConstraintsCreateDto.builder()
- .uniques(List.of(List.of("id")))
+ .uniques(new LinkedList<>())
.foreignKeys(List.of(ForeignKeyCreateDto.builder()
.referencedTable("weather_location")
.columns(List.of("fahrzeug"))
@@ -2170,7 +2186,6 @@ public abstract class BaseTest {
.description(TABLE_4_DESCRIPTION)
.columns(TABLE_4_COLUMNS_CREATE_DTO)
.constraints(TABLE_4_CONSTRAINTS_CREATE_DTO)
- .needSequence(false)
.build();
public final static List<ColumnDto> TABLE_4_COLUMNS_DTO = List.of(ColumnDto.builder()
@@ -2602,6 +2617,8 @@ public abstract class BaseTest {
.resultNumber(2L)
.build();
+ public final static String QUERY_7_STATEMENT = "SELECT id, date, a.location, lat, lng FROM weather_aus a JOIN weather_location l on a.location = l.location WHERE date = '2008-12-01'";
+
public final static Long QUERY_4_ID = 4L;
public final static String QUERY_4_STATEMENT = "SELECT `id`, `value` FROM `mfcc`";
public final static String QUERY_4_QUERY_HASH = "df7da3801dfb5c191ff6711d79ce6455f3c09ec8323ce1ff7208ab85387263f5";
@@ -2871,7 +2888,6 @@ public abstract class BaseTest {
.description(TABLE_1_DESCRIPTION)
.columns(TABLE_1_COLUMNS_CREATE_DTO)
.constraints(TABLE_1_CONSTRAINTS_CREATE_DTO)
- .needSequence(true)
.build();
public final static List<TableColumn> TABLE_2_COLUMNS = List.of(TableColumn.builder()
@@ -4138,7 +4154,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(64L)
+ .id(65L)
.ordinalPosition(20)
.table(TABLE_5)
.name("Class Type")
@@ -4369,7 +4385,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(64L)
+ .id(65L)
.ordinalPosition(20)
.tableId(TABLE_5_ID)
.table(TABLE_5_DTO)
@@ -4518,7 +4534,7 @@ public abstract class BaseTest {
.build();
public final static List<TableColumn> TABLE_6_COLUMNS = List.of(TableColumn.builder()
- .id(66L)
+ .id(67L)
.ordinalPosition(0)
.table(TABLE_6)
.name("id")
@@ -4528,7 +4544,7 @@ public abstract class BaseTest {
.autoGenerated(true)
.build(),
TableColumn.builder()
- .id(67L)
+ .id(68L)
.ordinalPosition(1)
.table(TABLE_6)
.name("firstname")
@@ -4538,7 +4554,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(68L)
+ .id(69L)
.ordinalPosition(2)
.table(TABLE_6)
.name("lastname")
@@ -4548,7 +4564,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(69L)
+ .id(70L)
.ordinalPosition(3)
.table(TABLE_6)
.name("birth")
@@ -4558,7 +4574,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(70L)
+ .id(71L)
.ordinalPosition(4)
.table(TABLE_6)
.name("reminder")
@@ -4569,7 +4585,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(71L)
+ .id(72L)
.ordinalPosition(5)
.table(TABLE_6)
.name("ref_id")
@@ -4587,7 +4603,7 @@ public abstract class BaseTest {
.build();
public final static List<ColumnDto> TABLE_6_COLUMNS_DTO = List.of(ColumnDto.builder()
- .id(66L)
+ .id(67L)
.ordinalPosition(0)
.tableId(TABLE_6_ID)
.table(TABLE_6_DTO)
@@ -4598,7 +4614,7 @@ public abstract class BaseTest {
.autoGenerated(true)
.build(),
ColumnDto.builder()
- .id(67L)
+ .id(68L)
.ordinalPosition(1)
.tableId(TABLE_6_ID)
.table(TABLE_6_DTO)
@@ -4609,7 +4625,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(68L)
+ .id(69L)
.ordinalPosition(2)
.tableId(TABLE_6_ID)
.table(TABLE_6_DTO)
@@ -4620,7 +4636,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(69L)
+ .id(70L)
.ordinalPosition(3)
.tableId(TABLE_6_ID)
.table(TABLE_6_DTO)
@@ -4631,7 +4647,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(70L)
+ .id(71L)
.ordinalPosition(4)
.tableId(TABLE_6_ID)
.table(TABLE_6_DTO)
@@ -4643,7 +4659,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(71L)
+ .id(72L)
.ordinalPosition(5)
.tableId(TABLE_6_ID)
.table(TABLE_6_DTO)
@@ -4707,7 +4723,7 @@ public abstract class BaseTest {
.build();
public final static List<TableColumn> TABLE_7_COLUMNS = List.of(TableColumn.builder()
- .id(26L)
+ .id(74L)
.ordinalPosition(0)
.table(TABLE_7)
.name("name_id")
@@ -4717,7 +4733,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(27L)
+ .id(75L)
.ordinalPosition(1)
.table(TABLE_7)
.name("zoo_id")
@@ -4728,7 +4744,7 @@ public abstract class BaseTest {
.build());
public final static List<ColumnDto> TABLE_7_COLUMNS_DTO = List.of(ColumnDto.builder()
- .id(26L)
+ .id(74L)
.ordinalPosition(0)
.tableId(TABLE_7_ID)
.table(TABLE_7_DTO)
@@ -4739,7 +4755,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(27L)
+ .id(75L)
.ordinalPosition(1)
.tableId(TABLE_7_ID)
.table(TABLE_7_DTO)
@@ -4929,13 +4945,13 @@ public abstract class BaseTest {
public final static Long VIEW_2_CONTAINER_ID = CONTAINER_1_ID;
public final static Long VIEW_2_DATABASE_ID = DATABASE_1_ID;
public final static Boolean VIEW_2_PUBLIC = true;
- public final static String VIEW_2_QUERY = "select `date`, `location` as loc, `location`, `rainfall`, `mintemp` from `weather_aus` where `location` = 'Albury'";
+ public final static String VIEW_2_QUERY = "select `date`, `location` as loc, `mintemp`, `rainfall` from `weather_aus` where `location` = 'Albury'";
public final static String VIEW_2_QUERY_HASH = "987fc946772ffb6d85060262dcb5df419692a1f6772ea995e3dedb53c191e984";
public final static List<ViewColumnDto> VIEW_2_COLUMNS_DTO = List.of(
ViewColumnDto.builder()
.id(4L)
- .name("Date")
+ .name("date")
.internalName("date")
.ordinalPosition(1)
.columnType(ColumnTypeDto.DATE)
@@ -4945,8 +4961,9 @@ public abstract class BaseTest {
.build(),
ViewColumnDto.builder()
.id(5L)
- .name("Location")
- .internalName("location")
+ .name("loc")
+ .internalName("loc")
+ .alias("loc")
.ordinalPosition(2)
.columnType(ColumnTypeDto.VARCHAR)
.size(255L)
@@ -4955,7 +4972,7 @@ public abstract class BaseTest {
.build(),
ViewColumnDto.builder()
.id(6L)
- .name("MinTemp")
+ .name("mintemp")
.internalName("mintemp")
.ordinalPosition(3)
.columnType(ColumnTypeDto.DECIMAL)
@@ -4966,11 +4983,12 @@ public abstract class BaseTest {
.build(),
ViewColumnDto.builder()
.id(7L)
- .name("Location")
- .internalName("location")
- .ordinalPosition(2)
- .columnType(ColumnTypeDto.VARCHAR)
- .size(255L)
+ .name("rainfall")
+ .internalName("rainfall")
+ .ordinalPosition(4)
+ .columnType(ColumnTypeDto.DECIMAL)
+ .size(10L)
+ .d(0L)
.isNullAllowed(true)
.autoGenerated(false)
.build()
@@ -5753,6 +5771,7 @@ public abstract class BaseTest {
.build();
public final static IdentifierSaveDescriptionDto IDENTIFIER_1_DESCRIPTION_1_CREATE_DTO = IdentifierSaveDescriptionDto.builder()
+ .id(null)
.description(IDENTIFIER_1_DESCRIPTION_1_DESCRIPTION)
.descriptionType(IDENTIFIER_1_DESCRIPTION_1_TYPE_DTO)
.language(IDENTIFIER_1_DESCRIPTION_1_LANG_DTO)
@@ -5798,6 +5817,7 @@ public abstract class BaseTest {
.build();
public final static CreatorSaveDto IDENTIFIER_1_CREATOR_1_CREATE_DTO = CreatorSaveDto.builder()
+ .id(null)
.firstname(IDENTIFIER_1_CREATOR_1_FIRSTNAME)
.lastname(IDENTIFIER_1_CREATOR_1_LASTNAME)
.creatorName(IDENTIFIER_1_CREATOR_1_NAME)
@@ -5981,6 +6001,7 @@ public abstract class BaseTest {
.publicationMonth(IDENTIFIER_1_PUBLICATION_MONTH)
.publisher(IDENTIFIER_1_PUBLISHER)
.type(IDENTIFIER_1_TYPE_DTO)
+ .doi(IDENTIFIER_1_DOI)
.licenses(List.of(LICENSE_1_DTO))
.creators(List.of(IDENTIFIER_1_CREATOR_1_CREATE_DTO))
.funders(List.of(IDENTIFIER_1_FUNDER_1_CREATE_DTO))
@@ -6107,6 +6128,7 @@ public abstract class BaseTest {
.build();
public final static IdentifierSaveDescriptionDto IDENTIFIER_5_DESCRIPTION_1_CREATE_DTO = IdentifierSaveDescriptionDto.builder()
+ .id(null)
.description(IDENTIFIER_5_DESCRIPTION_1_DESCRIPTION)
.language(IDENTIFIER_5_DESCRIPTION_1_LANG_DTO)
.descriptionType(IDENTIFIER_5_DESCRIPTION_1_TYPE_DTO)
@@ -6366,6 +6388,7 @@ public abstract class BaseTest {
.build();
public final static IdentifierSaveDescriptionDto IDENTIFIER_6_DESCRIPTION_1_CREATE_DTO = IdentifierSaveDescriptionDto.builder()
+ .id(null)
.description(IDENTIFIER_6_DESCRIPTION_1_DESCRIPTION_MODIFY)
.language(IDENTIFIER_6_DESCRIPTION_1_LANG_DTO)
.build();
@@ -6553,6 +6576,15 @@ public abstract class BaseTest {
public final static IdentifierStatusType IDENTIFIER_7_STATUS_TYPE = IdentifierStatusType.DRAFT;
public final static IdentifierStatusTypeDto IDENTIFIER_7_STATUS_TYPE_DTO = IdentifierStatusTypeDto.DRAFT;
+ public final static DataCiteBody<DataCiteDoi> IDENTIFIER_7_DATA_CITE = DataCiteBody.<DataCiteDoi>builder()
+ .data(DataCiteData.<DataCiteDoi>builder()
+ .type("dois")
+ .attributes(DataCiteDoi.builder()
+ .doi(IDENTIFIER_7_DOI)
+ .build())
+ .build())
+ .build();
+
private final static Long IDENTIFIER_7_CREATOR_1_ID = 6L;
public final static Creator IDENTIFIER_7_CREATOR_1 = Creator.builder()
@@ -7814,6 +7846,11 @@ public abstract class BaseTest {
.build())))
.build();
+ public final static ExportResourceDto EXPORT_RESOURCE_DTO = ExportResourceDto.builder()
+ .filename("68b329da9893e34099c7d8ad5cb9c940")
+ .resource(new InputStreamResource(InputStream.nullInputStream()))
+ .build();
+
public static void saveObservedMetrics(Map<String, String> observedMetrics) throws IOException {
final int keySize = observedMetrics.keySet().stream().max(Comparator.comparingInt(String::length)).get().length();
final int valueSize = observedMetrics.values().stream().max(Comparator.comparingInt(String::length)).get().length();
diff --git a/dbrepo-search-db/Dockerfile b/dbrepo-search-db/Dockerfile
index 083994b580500a7aff5d6b2b7c1f26b8f86c8580..022dc438a31cd41b50ef5c931c894bb53bee4b79 100644
--- a/dbrepo-search-db/Dockerfile
+++ b/dbrepo-search-db/Dockerfile
@@ -1,4 +1,4 @@
-FROM opensearchproject/opensearch:2.10.0 as runtime
+FROM opensearchproject/opensearch:2.10.0 AS runtime
USER root
@@ -11,7 +11,7 @@ WORKDIR /usr/share/opensearch
RUN chmod 0700 ./config
COPY --chown=opensearch:opensearch ./opensearch.yml ./config/opensearch.yml
COPY --chown=opensearch:opensearch ./config.yml ./config/opensearch-security/config.yml
-#COPY --chown=opensearch:opensearch ./internal_users.yml ./config/opensearch-security/internal_users.yml
+
RUN chmod 0600 ./config/opensearch.yml
RUN chmod 0600 ./config/opensearch-security/config.yml
diff --git a/dbrepo-search-db/internal_users.yml b/dbrepo-search-db/internal_users.yml
deleted file mode 100644
index e9c81325b1b5cf2ec726ff2cd0cc563a376ada65..0000000000000000000000000000000000000000
--- a/dbrepo-search-db/internal_users.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-# This is the internal user database
-# The hash value is a bcrypt hash and can be generated with plugin/tools/hash.sh
-
-_meta:
- type: "internalusers"
- config_version: 2
-
-admin:
- hash: "$2y$12$d1Gx2n13.EJMLPIB6jQwDeE4p4E6SPvUUH6aKICV1vYOuJIY5Xebq" # admin
- reserved: true
- backend_roles:
- - "admin"
- description: "Default admin user"
\ No newline at end of file
diff --git a/dbrepo-search-service/Dockerfile b/dbrepo-search-service/Dockerfile
index 875a9f28bdce23969ac1687e3a2af6fd8b6d0ccf..35427f81a429f8a61bd724f7bb8141b734d5013f 100644
--- a/dbrepo-search-service/Dockerfile
+++ b/dbrepo-search-service/Dockerfile
@@ -1,5 +1,5 @@
FROM python:3.11-alpine
-MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
+LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
RUN apk add --no-cache curl bash jq
diff --git a/dbrepo-search-service/Pipfile b/dbrepo-search-service/Pipfile
index 3daa275b49f44deced5816e589d71e6d7e6fd7e8..8d6cc6b220d0e6df9219aeca9b7d1ec571c2fde6 100644
--- a/dbrepo-search-service/Pipfile
+++ b/dbrepo-search-service/Pipfile
@@ -18,7 +18,7 @@ jwt = "~=1.3"
testcontainers-opensearch = "*"
pytest = "*"
rdflib = "*"
-dbrepo = {path = "./lib/dbrepo-1.4.4.tar.gz"}
+dbrepo = {path = "./lib/dbrepo-1.4.5.tar.gz"}
gunicorn = "*"
[dev-packages]
diff --git a/dbrepo-search-service/Pipfile.lock b/dbrepo-search-service/Pipfile.lock
index 3388956b20ba3f223fdf3cdeb3eab5f1a5337022..8e2e1abc463a4f98a575e8acfe76194e74bbca74 100644
--- a/dbrepo-search-service/Pipfile.lock
+++ b/dbrepo-search-service/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "ece384cd1606901f3d2575f082692a5d5ce3164b4ba5187fc4b457757d3b0fce"
+ "sha256": "f4b77f12b6e64d95ba5e3df0cce6f3eeb8d9cb8e45a6a17b46088d7077d13595"
},
"pipfile-spec": 6,
"requires": {
@@ -341,10 +341,11 @@
"dbrepo": {
"hashes": [
"sha256:09a10584a44c952a7cf83852123c14bd2917ab009e50698c1f9d8c2690ec4bde",
- "sha256:2bdb48c70b4c99b5044fbfc12aa653c1e9281ca8913a433cc08a1e14cb4bd2ef"
+ "sha256:2bdb48c70b4c99b5044fbfc12aa653c1e9281ca8913a433cc08a1e14cb4bd2ef",
+ "sha256:dccfaec20a3972a578313206678a119db3d6f898604aab4b694aa2ac37a20629"
],
- "path": "./lib/dbrepo-1.4.4.tar.gz",
- "version": "==1.4.4"
+ "path": "./lib/dbrepo-1.4.5.tar.gz",
+ "version": "==1.4.5"
},
"docker": {
"hashes": [
@@ -551,7 +552,7 @@
"sha256:fd096eb7ffef17c456cfa587523c5f92321ae02427ff955bebe9e3c63bc9f0da",
"sha256:fe754d231288e1e64323cfad462fcee8f0288654c10bdf4f603a39ed923bef33"
],
- "markers": "platform_machine == 'aarch64' or (platform_machine == 'ppc64le' or (platform_machine == 'x86_64' or (platform_machine == 'amd64' or (platform_machine == 'AMD64' or (platform_machine == 'win32' or platform_machine == 'WIN32')))))",
+ "markers": "python_version < '3.13' and platform_machine == 'aarch64' or (platform_machine == 'ppc64le' or (platform_machine == 'x86_64' or (platform_machine == 'amd64' or (platform_machine == 'AMD64' or (platform_machine == 'win32' or platform_machine == 'WIN32')))))",
"version": "==3.0.3"
},
"gunicorn": {
@@ -796,45 +797,54 @@
},
"numpy": {
"hashes": [
- "sha256:03a8c78d01d9781b28a6989f6fa1bb2c4f2d51201cf99d3dd875df6fbd96b23b",
- "sha256:08beddf13648eb95f8d867350f6a018a4be2e5ad54c8d8caed89ebca558b2818",
- "sha256:1af303d6b2210eb850fcf03064d364652b7120803a0b872f5211f5234b399f20",
- "sha256:1dda2e7b4ec9dd512f84935c5f126c8bd8b9f2fc001e9f54af255e8c5f16b0e0",
- "sha256:2a02aba9ed12e4ac4eb3ea9421c420301a0c6460d9830d74a9df87efa4912010",
- "sha256:2e4ee3380d6de9c9ec04745830fd9e2eccb3e6cf790d39d7b98ffd19b0dd754a",
- "sha256:3373d5d70a5fe74a2c1bb6d2cfd9609ecf686d47a2d7b1d37a8f3b6bf6003aea",
- "sha256:47711010ad8555514b434df65f7d7b076bb8261df1ca9bb78f53d3b2db02e95c",
- "sha256:4c66707fabe114439db9068ee468c26bbdf909cac0fb58686a42a24de1760c71",
- "sha256:50193e430acfc1346175fcbdaa28ffec49947a06918b7b92130744e81e640110",
- "sha256:52b8b60467cd7dd1e9ed082188b4e6bb35aa5cdd01777621a1658910745b90be",
- "sha256:60dedbb91afcbfdc9bc0b1f3f402804070deed7392c23eb7a7f07fa857868e8a",
- "sha256:62b8e4b1e28009ef2846b4c7852046736bab361f7aeadeb6a5b89ebec3c7055a",
- "sha256:666dbfb6ec68962c033a450943ded891bed2d54e6755e35e5835d63f4f6931d5",
- "sha256:675d61ffbfa78604709862923189bad94014bef562cc35cf61d3a07bba02a7ed",
- "sha256:679b0076f67ecc0138fd2ede3a8fd196dddc2ad3254069bcb9faf9a79b1cebcd",
- "sha256:7349ab0fa0c429c82442a27a9673fc802ffdb7c7775fad780226cb234965e53c",
- "sha256:7ab55401287bfec946ced39700c053796e7cc0e3acbef09993a9ad2adba6ca6e",
- "sha256:7e50d0a0cc3189f9cb0aeb3a6a6af18c16f59f004b866cd2be1c14b36134a4a0",
- "sha256:95a7476c59002f2f6c590b9b7b998306fba6a5aa646b1e22ddfeaf8f78c3a29c",
- "sha256:96ff0b2ad353d8f990b63294c8986f1ec3cb19d749234014f4e7eb0112ceba5a",
- "sha256:9fad7dcb1aac3c7f0584a5a8133e3a43eeb2fe127f47e3632d43d677c66c102b",
- "sha256:9ff0f4f29c51e2803569d7a51c2304de5554655a60c5d776e35b4a41413830d0",
- "sha256:a354325ee03388678242a4d7ebcd08b5c727033fcff3b2f536aea978e15ee9e6",
- "sha256:a4abb4f9001ad2858e7ac189089c42178fcce737e4169dc61321660f1a96c7d2",
- "sha256:ab47dbe5cc8210f55aa58e4805fe224dac469cde56b9f731a4c098b91917159a",
- "sha256:afedb719a9dcfc7eaf2287b839d8198e06dcd4cb5d276a3df279231138e83d30",
- "sha256:b3ce300f3644fb06443ee2222c2201dd3a89ea6040541412b8fa189341847218",
- "sha256:b97fe8060236edf3662adfc2c633f56a08ae30560c56310562cb4f95500022d5",
- "sha256:bfe25acf8b437eb2a8b2d49d443800a5f18508cd811fea3181723922a8a82b07",
- "sha256:cd25bcecc4974d09257ffcd1f098ee778f7834c3ad767fe5db785be9a4aa9cb2",
- "sha256:d209d8969599b27ad20994c8e41936ee0964e6da07478d6c35016bc386b66ad4",
- "sha256:d5241e0a80d808d70546c697135da2c613f30e28251ff8307eb72ba696945764",
- "sha256:edd8b5fe47dab091176d21bb6de568acdd906d1887a4584a15a9a96a1dca06ef",
- "sha256:f870204a840a60da0b12273ef34f7051e98c3b5961b61b0c2c1be6dfd64fbcd3",
- "sha256:ffa75af20b44f8dba823498024771d5ac50620e6915abac414251bd971b4529f"
+ "sha256:04494f6ec467ccb5369d1808570ae55f6ed9b5809d7f035059000a37b8d7e86f",
+ "sha256:0a43f0974d501842866cc83471bdb0116ba0dffdbaac33ec05e6afed5b615238",
+ "sha256:0e50842b2295ba8414c8c1d9d957083d5dfe9e16828b37de883f51fc53c4016f",
+ "sha256:0ec84b9ba0654f3b962802edc91424331f423dcf5d5f926676e0150789cb3d95",
+ "sha256:17067d097ed036636fa79f6a869ac26df7db1ba22039d962422506640314933a",
+ "sha256:1cde1753efe513705a0c6d28f5884e22bdc30438bf0085c5c486cdaff40cd67a",
+ "sha256:1e72728e7501a450288fc8e1f9ebc73d90cfd4671ebbd631f3e7857c39bd16f2",
+ "sha256:2635dbd200c2d6faf2ef9a0d04f0ecc6b13b3cad54f7c67c61155138835515d2",
+ "sha256:2ce46fd0b8a0c947ae047d222f7136fc4d55538741373107574271bc00e20e8f",
+ "sha256:34f003cb88b1ba38cb9a9a4a3161c1604973d7f9d5552c38bc2f04f829536609",
+ "sha256:354f373279768fa5a584bac997de6a6c9bc535c482592d7a813bb0c09be6c76f",
+ "sha256:38ecb5b0582cd125f67a629072fed6f83562d9dd04d7e03256c9829bdec027ad",
+ "sha256:3e8e01233d57639b2e30966c63d36fcea099d17c53bf424d77f088b0f4babd86",
+ "sha256:3f6bed7f840d44c08ebdb73b1825282b801799e325bcbdfa6bc5c370e5aecc65",
+ "sha256:4554eb96f0fd263041baf16cf0881b3f5dafae7a59b1049acb9540c4d57bc8cb",
+ "sha256:46e161722e0f619749d1cd892167039015b2c2817296104487cd03ed4a955995",
+ "sha256:49d9f7d256fbc804391a7f72d4a617302b1afac1112fac19b6c6cec63fe7fe8a",
+ "sha256:4d2f62e55a4cd9c58c1d9a1c9edaedcd857a73cb6fda875bf79093f9d9086f85",
+ "sha256:5f64641b42b2429f56ee08b4f427a4d2daf916ec59686061de751a55aafa22e4",
+ "sha256:63b92c512d9dbcc37f9d81b123dec99fdb318ba38c8059afc78086fe73820275",
+ "sha256:6d7696c615765091cc5093f76fd1fa069870304beaccfd58b5dcc69e55ef49c1",
+ "sha256:79e843d186c8fb1b102bef3e2bc35ef81160ffef3194646a7fdd6a73c6b97196",
+ "sha256:821eedb7165ead9eebdb569986968b541f9908979c2da8a4967ecac4439bae3d",
+ "sha256:84554fc53daa8f6abf8e8a66e076aff6ece62de68523d9f665f32d2fc50fd66e",
+ "sha256:8d83bb187fb647643bd56e1ae43f273c7f4dbcdf94550d7938cfc32566756514",
+ "sha256:903703372d46bce88b6920a0cd86c3ad82dae2dbef157b5fc01b70ea1cfc430f",
+ "sha256:9416a5c2e92ace094e9f0082c5fd473502c91651fb896bc17690d6fc475128d6",
+ "sha256:9a1712c015831da583b21c5bfe15e8684137097969c6d22e8316ba66b5baabe4",
+ "sha256:9c27f0946a3536403efb0e1c28def1ae6730a72cd0d5878db38824855e3afc44",
+ "sha256:a356364941fb0593bb899a1076b92dfa2029f6f5b8ba88a14fd0984aaf76d0df",
+ "sha256:a7039a136017eaa92c1848152827e1424701532ca8e8967fe480fe1569dae581",
+ "sha256:acd3a644e4807e73b4e1867b769fbf1ce8c5d80e7caaef0d90dcdc640dfc9787",
+ "sha256:ad0c86f3455fbd0de6c31a3056eb822fc939f81b1618f10ff3406971893b62a5",
+ "sha256:b4c76e3d4c56f145d41b7b6751255feefae92edbc9a61e1758a98204200f30fc",
+ "sha256:b6f6a8f45d0313db07d6d1d37bd0b112f887e1369758a5419c0370ba915b3871",
+ "sha256:c5a59996dc61835133b56a32ebe4ef3740ea5bc19b3983ac60cc32be5a665d54",
+ "sha256:c73aafd1afca80afecb22718f8700b40ac7cab927b8abab3c3e337d70e10e5a2",
+ "sha256:cee6cc0584f71adefe2c908856ccc98702baf95ff80092e4ca46061538a2ba98",
+ "sha256:cef04d068f5fb0518a77857953193b6bb94809a806bd0a14983a8f12ada060c9",
+ "sha256:cf5d1c9e6837f8af9f92b6bd3e86d513cdc11f60fd62185cc49ec7d1aba34864",
+ "sha256:e61155fae27570692ad1d327e81c6cf27d535a5d7ef97648a17d922224b216de",
+ "sha256:e7f387600d424f91576af20518334df3d97bc76a300a755f9a8d6e4f5cadd289",
+ "sha256:ed08d2703b5972ec736451b818c2eb9da80d66c3e84aed1deeb0c345fefe461b",
+ "sha256:fbd6acc766814ea6443628f4e6751d0da6593dae29c08c0b2606164db026970c",
+ "sha256:feff59f27338135776f6d4e2ec7aeeac5d5f7a08a83e80869121ef8164b74af9"
],
"markers": "python_version == '3.11'",
- "version": "==1.26.4"
+ "version": "==2.0.0"
},
"opensearch-py": {
"hashes": [
@@ -929,11 +939,11 @@
},
"pydantic": {
"hashes": [
- "sha256:c46c76a40bb1296728d7a8b99aa73dd70a48c3510111ff290034f860c99c419e",
- "sha256:ea91b002777bf643bb20dd717c028ec43216b24a6001a280f83877fd2655d0b4"
+ "sha256:0c84efd9548d545f63ac0060c1e4d39bb9b14db8b3c0652338aecc07b5adec52",
+ "sha256:ee8538d41ccb9c0a9ad3e0e5f07bf15ed8015b481ced539a1759d8cc89ae90d0"
],
"markers": "python_version >= '3.8'",
- "version": "==2.7.3"
+ "version": "==2.7.4"
},
"pydantic-core": {
"hashes": [
@@ -1263,58 +1273,58 @@
},
"sqlalchemy": {
"hashes": [
- "sha256:0094c5dc698a5f78d3d1539853e8ecec02516b62b8223c970c86d44e7a80f6c7",
- "sha256:0138c5c16be3600923fa2169532205d18891b28afa817cb49b50e08f62198bb8",
- "sha256:0a089e218654e740a41388893e090d2e2c22c29028c9d1353feb38638820bbeb",
- "sha256:0b3f4c438e37d22b83e640f825ef0f37b95db9aa2d68203f2c9549375d0b2260",
- "sha256:16863e2b132b761891d6c49f0a0f70030e0bcac4fd208117f6b7e053e68668d0",
- "sha256:1f9a727312ff6ad5248a4367358e2cf7e625e98b1028b1d7ab7b806b7d757513",
- "sha256:2383146973a15435e4717f94c7509982770e3e54974c71f76500a0136f22810b",
- "sha256:2753743c2afd061bb95a61a51bbb6a1a11ac1c44292fad898f10c9839a7f75b2",
- "sha256:296230899df0b77dec4eb799bcea6fbe39a43707ce7bb166519c97b583cfcab3",
- "sha256:2a4f4da89c74435f2bc61878cd08f3646b699e7d2eba97144030d1be44e27584",
- "sha256:2b1708916730f4830bc69d6f49d37f7698b5bd7530aca7f04f785f8849e95255",
- "sha256:2ecabd9ccaa6e914e3dbb2aa46b76dede7eadc8cbf1b8083c94d936bcd5ffb49",
- "sha256:311710f9a2ee235f1403537b10c7687214bb1f2b9ebb52702c5aa4a77f0b3af7",
- "sha256:37a4b4fb0dd4d2669070fb05b8b8824afd0af57587393015baee1cf9890242d9",
- "sha256:3a365eda439b7a00732638f11072907c1bc8e351c7665e7e5da91b169af794af",
- "sha256:3b48154678e76445c7ded1896715ce05319f74b1e73cf82d4f8b59b46e9c0ddc",
- "sha256:3b69e934f0f2b677ec111b4d83f92dc1a3210a779f69bf905273192cf4ed433e",
- "sha256:3cb5a646930c5123f8461f6468901573f334c2c63c795b9af350063a736d0134",
- "sha256:408f8b0e2c04677e9c93f40eef3ab22f550fecb3011b187f66a096395ff3d9fd",
- "sha256:40ad017c672c00b9b663fcfcd5f0864a0a97828e2ee7ab0c140dc84058d194cf",
- "sha256:5a79d65395ac5e6b0c2890935bad892eabb911c4aa8e8015067ddb37eea3d56c",
- "sha256:5a8e3b0a7e09e94be7510d1661339d6b52daf202ed2f5b1f9f48ea34ee6f2d57",
- "sha256:69c9db1ce00e59e8dd09d7bae852a9add716efdc070a3e2068377e6ff0d6fdaa",
- "sha256:7108d569d3990c71e26a42f60474b4c02c8586c4681af5fd67e51a044fdea86a",
- "sha256:77d2edb1f54aff37e3318f611637171e8ec71472f1fdc7348b41dcb226f93d90",
- "sha256:7d74336c65705b986d12a7e337ba27ab2b9d819993851b140efdf029248e818e",
- "sha256:8409de825f2c3b62ab15788635ccaec0c881c3f12a8af2b12ae4910a0a9aeef6",
- "sha256:955991a09f0992c68a499791a753523f50f71a6885531568404fa0f231832aa0",
- "sha256:99650e9f4cf3ad0d409fed3eec4f071fadd032e9a5edc7270cd646a26446feeb",
- "sha256:9a5baf9267b752390252889f0c802ea13b52dfee5e369527da229189b8bd592e",
- "sha256:a0ef36b28534f2a5771191be6edb44cc2673c7b2edf6deac6562400288664221",
- "sha256:a1429a4b0f709f19ff3b0cf13675b2b9bfa8a7e79990003207a011c0db880a13",
- "sha256:a7bfc726d167f425d4c16269a9a10fe8630ff6d14b683d588044dcef2d0f6be7",
- "sha256:a943d297126c9230719c27fcbbeab57ecd5d15b0bd6bfd26e91bfcfe64220621",
- "sha256:ae8c62fe2480dd61c532ccafdbce9b29dacc126fe8be0d9a927ca3e699b9491a",
- "sha256:b60203c63e8f984df92035610c5fb76d941254cf5d19751faab7d33b21e5ddc0",
- "sha256:b6bf767d14b77f6a18b6982cbbf29d71bede087edae495d11ab358280f304d8e",
- "sha256:b6c7ec2b1f4969fc19b65b7059ed00497e25f54069407a8701091beb69e591a5",
- "sha256:bba002a9447b291548e8d66fd8c96a6a7ed4f2def0bb155f4f0a1309fd2735d5",
- "sha256:bc0c53579650a891f9b83fa3cecd4e00218e071d0ba00c4890f5be0c34887ed3",
- "sha256:c4f61ada6979223013d9ab83a3ed003ded6959eae37d0d685db2c147e9143797",
- "sha256:c62d401223f468eb4da32627bffc0c78ed516b03bb8a34a58be54d618b74d472",
- "sha256:e42203d8d20dc704604862977b1470a122e4892791fe3ed165f041e4bf447a1b",
- "sha256:edc16a50f5e1b7a06a2dcc1f2205b0b961074c123ed17ebda726f376a5ab0953",
- "sha256:efedba7e13aa9a6c8407c48facfdfa108a5a4128e35f4c68f20c3407e4376aa9",
- "sha256:f1dc3eabd8c0232ee8387fbe03e0a62220a6f089e278b1f0aaf5e2d6210741ad",
- "sha256:f69e4c756ee2686767eb80f94c0125c8b0a0b87ede03eacc5c8ae3b54b99dc46",
- "sha256:f7703c2010355dd28f53deb644a05fc30f796bd8598b43f0ba678878780b6e4c",
- "sha256:fa561138a64f949f3e889eb9ab8c58e1504ab351d6cf55259dc4c248eaa19da6"
+ "sha256:0b0f658414ee4e4b8cbcd4a9bb0fd743c5eeb81fc858ca517217a8013d282c96",
+ "sha256:2196208432deebdfe3b22185d46b08f00ac9d7b01284e168c212919891289396",
+ "sha256:23b9fbb2f5dd9e630db70fbe47d963c7779e9c81830869bd7d137c2dc1ad05fb",
+ "sha256:26a6a9837589c42b16693cf7bf836f5d42218f44d198f9343dd71d3164ceeeac",
+ "sha256:2a21c97efcbb9f255d5c12a96ae14da873233597dfd00a3a0c4ce5b3e5e79704",
+ "sha256:2e2c38c2a4c5c634fe6c3c58a789712719fa1bf9b9d6ff5ebfce9a9e5b89c1ca",
+ "sha256:2fc47dc6185a83c8100b37acda27658fe4dbd33b7d5e7324111f6521008ab4fe",
+ "sha256:2fd17e3bb8058359fa61248c52c7b09a97cf3c820e54207a50af529876451808",
+ "sha256:352b2770097f41bff6029b280c0e03b217c2dcaddc40726f8f53ed58d8a85da4",
+ "sha256:3b74570d99126992d4b0f91fb87c586a574a5872651185de8297c6f90055ae42",
+ "sha256:3cb8a66b167b033ec72c3812ffc8441d4e9f5f78f5e31e54dcd4c90a4ca5bebc",
+ "sha256:3f9faef422cfbb8fd53716cd14ba95e2ef655400235c3dfad1b5f467ba179c8c",
+ "sha256:4b600e9a212ed59355813becbcf282cfda5c93678e15c25a0ef896b354423238",
+ "sha256:501ff052229cb79dd4c49c402f6cb03b5a40ae4771efc8bb2bfac9f6c3d3508f",
+ "sha256:56d51ae825d20d604583f82c9527d285e9e6d14f9a5516463d9705dab20c3740",
+ "sha256:597fec37c382a5442ffd471f66ce12d07d91b281fd474289356b1a0041bdf31d",
+ "sha256:5a48ac4d359f058474fadc2115f78a5cdac9988d4f99eae44917f36aa1476327",
+ "sha256:5b6cf796d9fcc9b37011d3f9936189b3c8074a02a4ed0c0fbbc126772c31a6d4",
+ "sha256:66f63278db425838b3c2b1c596654b31939427016ba030e951b292e32b99553e",
+ "sha256:69f3e3c08867a8e4856e92d7afb618b95cdee18e0bc1647b77599722c9a28911",
+ "sha256:6e2622844551945db81c26a02f27d94145b561f9d4b0c39ce7bfd2fda5776dac",
+ "sha256:6f77c4f042ad493cb8595e2f503c7a4fe44cd7bd59c7582fd6d78d7e7b8ec52c",
+ "sha256:74afabeeff415e35525bf7a4ecdab015f00e06456166a2eba7590e49f8db940e",
+ "sha256:750900a471d39a7eeba57580b11983030517a1f512c2cb287d5ad0fcf3aebd58",
+ "sha256:78fe11dbe37d92667c2c6e74379f75746dc947ee505555a0197cfba9a6d4f1a4",
+ "sha256:79a40771363c5e9f3a77f0e28b3302801db08040928146e6808b5b7a40749c88",
+ "sha256:7bd112be780928c7f493c1a192cd8c5fc2a2a7b52b790bc5a84203fb4381c6be",
+ "sha256:8a41514c1a779e2aa9a19f67aaadeb5cbddf0b2b508843fcd7bafdf4c6864005",
+ "sha256:9f2bee229715b6366f86a95d497c347c22ddffa2c7c96143b59a2aa5cc9eebbc",
+ "sha256:9fea3d0884e82d1e33226935dac990b967bef21315cbcc894605db3441347443",
+ "sha256:afb6dde6c11ea4525318e279cd93c8734b795ac8bb5dda0eedd9ebaca7fa23f1",
+ "sha256:b607489dd4a54de56984a0c7656247504bd5523d9d0ba799aef59d4add009484",
+ "sha256:b6e22630e89f0e8c12332b2b4c282cb01cf4da0d26795b7eae16702a608e7ca1",
+ "sha256:b9c01990d9015df2c6f818aa8f4297d42ee71c9502026bb074e713d496e26b67",
+ "sha256:bd15026f77420eb2b324dcb93551ad9c5f22fab2c150c286ef1dc1160f110203",
+ "sha256:c06fb43a51ccdff3b4006aafee9fcf15f63f23c580675f7734245ceb6b6a9e05",
+ "sha256:c76c81c52e1e08f12f4b6a07af2b96b9b15ea67ccdd40ae17019f1c373faa227",
+ "sha256:ccaf1b0c90435b6e430f5dd30a5aede4764942a695552eb3a4ab74ed63c5b8d3",
+ "sha256:cd1591329333daf94467e699e11015d9c944f44c94d2091f4ac493ced0119449",
+ "sha256:cd5b94d4819c0c89280b7c6109c7b788a576084bf0a480ae17c227b0bc41e109",
+ "sha256:d337bf94052856d1b330d5fcad44582a30c532a2463776e1651bd3294ee7e58b",
+ "sha256:dc251477eae03c20fae8db9c1c23ea2ebc47331bcd73927cdcaecd02af98d3c3",
+ "sha256:dc6d69f8829712a4fd799d2ac8d79bdeff651c2301b081fd5d3fe697bd5b4ab9",
+ "sha256:f2a213c1b699d3f5768a7272de720387ae0122f1becf0901ed6eaa1abd1baf6c",
+ "sha256:f3ad7f221d8a69d32d197e5968d798217a4feebe30144986af71ada8c548e9fa",
+ "sha256:f43e93057cf52a227eda401251c72b6fbe4756f35fa6bfebb5d73b86881e59b0",
+ "sha256:f68470edd70c3ac3b6cd5c2a22a8daf18415203ca1b036aaeb9b0fb6f54e8298",
+ "sha256:fa4b1af3e619b5b0b435e333f3967612db06351217c58bfb50cee5f003db2a5a",
+ "sha256:fc6b14e8602f59c6ba893980bea96571dd0ed83d8ebb9c4479d9ed5425d562e9"
],
"markers": "python_version >= '3.7'",
- "version": "==2.0.30"
+ "version": "==2.0.31"
},
"sqlalchemy-utils": {
"hashes": [
@@ -1372,11 +1382,11 @@
},
"urllib3": {
"hashes": [
- "sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d",
- "sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19"
+ "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472",
+ "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"
],
"markers": "python_version >= '3.10'",
- "version": "==2.2.1"
+ "version": "==2.2.2"
},
"werkzeug": {
"hashes": [
@@ -1562,61 +1572,61 @@
"develop": {
"coverage": {
"hashes": [
- "sha256:015eddc5ccd5364dcb902eaecf9515636806fa1e0d5bef5769d06d0f31b54523",
- "sha256:04aefca5190d1dc7a53a4c1a5a7f8568811306d7a8ee231c42fb69215571944f",
- "sha256:05ac5f60faa0c704c0f7e6a5cbfd6f02101ed05e0aee4d2822637a9e672c998d",
- "sha256:0bbddc54bbacfc09b3edaec644d4ac90c08ee8ed4844b0f86227dcda2d428fcb",
- "sha256:1d2a830ade66d3563bb61d1e3c77c8def97b30ed91e166c67d0632c018f380f0",
- "sha256:239a4e75e09c2b12ea478d28815acf83334d32e722e7433471fbf641c606344c",
- "sha256:244f509f126dc71369393ce5fea17c0592c40ee44e607b6d855e9c4ac57aac98",
- "sha256:25a5caf742c6195e08002d3b6c2dd6947e50efc5fc2c2205f61ecb47592d2d83",
- "sha256:296a7d9bbc598e8744c00f7a6cecf1da9b30ae9ad51c566291ff1314e6cbbed8",
- "sha256:2e079c9ec772fedbade9d7ebc36202a1d9ef7291bc9b3a024ca395c4d52853d7",
- "sha256:33ca90a0eb29225f195e30684ba4a6db05dbef03c2ccd50b9077714c48153cac",
- "sha256:33fc65740267222fc02975c061eb7167185fef4cc8f2770267ee8bf7d6a42f84",
- "sha256:341dd8f61c26337c37988345ca5c8ccabeff33093a26953a1ac72e7d0103c4fb",
- "sha256:34d6d21d8795a97b14d503dcaf74226ae51eb1f2bd41015d3ef332a24d0a17b3",
- "sha256:3538d8fb1ee9bdd2e2692b3b18c22bb1c19ffbefd06880f5ac496e42d7bb3884",
- "sha256:38a3b98dae8a7c9057bd91fbf3415c05e700a5114c5f1b5b0ea5f8f429ba6614",
- "sha256:3d5a67f0da401e105753d474369ab034c7bae51a4c31c77d94030d59e41df5bd",
- "sha256:50084d3516aa263791198913a17354bd1dc627d3c1639209640b9cac3fef5807",
- "sha256:55f689f846661e3f26efa535071775d0483388a1ccfab899df72924805e9e7cd",
- "sha256:5bc5a8c87714b0c67cfeb4c7caa82b2d71e8864d1a46aa990b5588fa953673b8",
- "sha256:62bda40da1e68898186f274f832ef3e759ce929da9a9fd9fcf265956de269dbc",
- "sha256:705f3d7c2b098c40f5b81790a5fedb274113373d4d1a69e65f8b68b0cc26f6db",
- "sha256:75e3f4e86804023e991096b29e147e635f5e2568f77883a1e6eed74512659ab0",
- "sha256:7b2a19e13dfb5c8e145c7a6ea959485ee8e2204699903c88c7d25283584bfc08",
- "sha256:7cec2af81f9e7569280822be68bd57e51b86d42e59ea30d10ebdbb22d2cb7232",
- "sha256:8383a6c8cefba1b7cecc0149415046b6fc38836295bc4c84e820872eb5478b3d",
- "sha256:8c836309931839cca658a78a888dab9676b5c988d0dd34ca247f5f3e679f4e7a",
- "sha256:8e317953bb4c074c06c798a11dbdd2cf9979dbcaa8ccc0fa4701d80042d4ebf1",
- "sha256:923b7b1c717bd0f0f92d862d1ff51d9b2b55dbbd133e05680204465f454bb286",
- "sha256:990fb20b32990b2ce2c5f974c3e738c9358b2735bc05075d50a6f36721b8f303",
- "sha256:9aad68c3f2566dfae84bf46295a79e79d904e1c21ccfc66de88cd446f8686341",
- "sha256:a5812840d1d00eafae6585aba38021f90a705a25b8216ec7f66aebe5b619fb84",
- "sha256:a6519d917abb15e12380406d721e37613e2a67d166f9fb7e5a8ce0375744cd45",
- "sha256:ab0b028165eea880af12f66086694768f2c3139b2c31ad5e032c8edbafca6ffc",
- "sha256:aea7da970f1feccf48be7335f8b2ca64baf9b589d79e05b9397a06696ce1a1ec",
- "sha256:b1196e13c45e327d6cd0b6e471530a1882f1017eb83c6229fc613cd1a11b53cd",
- "sha256:b368e1aee1b9b75757942d44d7598dcd22a9dbb126affcbba82d15917f0cc155",
- "sha256:bde997cac85fcac227b27d4fb2c7608a2c5f6558469b0eb704c5726ae49e1c52",
- "sha256:c4c2872b3c91f9baa836147ca33650dc5c172e9273c808c3c3199c75490e709d",
- "sha256:c59d2ad092dc0551d9f79d9d44d005c945ba95832a6798f98f9216ede3d5f485",
- "sha256:d1da0a2e3b37b745a2b2a678a4c796462cf753aebf94edcc87dcc6b8641eae31",
- "sha256:d8b7339180d00de83e930358223c617cc343dd08e1aa5ec7b06c3a121aec4e1d",
- "sha256:dd4b3355b01273a56b20c219e74e7549e14370b31a4ffe42706a8cda91f19f6d",
- "sha256:e08c470c2eb01977d221fd87495b44867a56d4d594f43739a8028f8646a51e0d",
- "sha256:f5102a92855d518b0996eb197772f5ac2a527c0ec617124ad5242a3af5e25f85",
- "sha256:f542287b1489c7a860d43a7d8883e27ca62ab84ca53c965d11dac1d3a1fab7ce",
- "sha256:f78300789a708ac1f17e134593f577407d52d0417305435b134805c4fb135adb",
- "sha256:f81bc26d609bf0fbc622c7122ba6307993c83c795d2d6f6f6fd8c000a770d974",
- "sha256:f836c174c3a7f639bded48ec913f348c4761cbf49de4a20a956d3431a7c9cb24",
- "sha256:fa21a04112c59ad54f69d80e376f7f9d0f5f9123ab87ecd18fbb9ec3a2beed56",
- "sha256:fcf7d1d6f5da887ca04302db8e0e0cf56ce9a5e05f202720e49b3e8157ddb9a9",
- "sha256:fd27d8b49e574e50caa65196d908f80e4dff64d7e592d0c59788b45aad7e8b35"
+ "sha256:018a12985185038a5b2bcafab04ab833a9a0f2c59995b3cec07e10074c78635f",
+ "sha256:02ff6e898197cc1e9fa375581382b72498eb2e6d5fc0b53f03e496cfee3fac6d",
+ "sha256:042183de01f8b6d531e10c197f7f0315a61e8d805ab29c5f7b51a01d62782747",
+ "sha256:1014fbf665fef86cdfd6cb5b7371496ce35e4d2a00cda501cf9f5b9e6fced69f",
+ "sha256:1137f46adb28e3813dec8c01fefadcb8c614f33576f672962e323b5128d9a68d",
+ "sha256:16852febd96acd953b0d55fc842ce2dac1710f26729b31c80b940b9afcd9896f",
+ "sha256:2174e7c23e0a454ffe12267a10732c273243b4f2d50d07544a91198f05c48f47",
+ "sha256:2214ee920787d85db1b6a0bd9da5f8503ccc8fcd5814d90796c2f2493a2f4d2e",
+ "sha256:3257fdd8e574805f27bb5342b77bc65578e98cbc004a92232106344053f319ba",
+ "sha256:3684bc2ff328f935981847082ba4fdc950d58906a40eafa93510d1b54c08a66c",
+ "sha256:3a6612c99081d8d6134005b1354191e103ec9705d7ba2754e848211ac8cacc6b",
+ "sha256:3d7564cc09dd91b5a6001754a5b3c6ecc4aba6323baf33a12bd751036c998be4",
+ "sha256:44da56a2589b684813f86d07597fdf8a9c6ce77f58976727329272f5a01f99f7",
+ "sha256:5013ed890dc917cef2c9f765c4c6a8ae9df983cd60dbb635df8ed9f4ebc9f555",
+ "sha256:54317c2b806354cbb2dc7ac27e2b93f97096912cc16b18289c5d4e44fc663233",
+ "sha256:56b4eafa21c6c175b3ede004ca12c653a88b6f922494b023aeb1e836df953ace",
+ "sha256:581ea96f92bf71a5ec0974001f900db495488434a6928a2ca7f01eee20c23805",
+ "sha256:5cd64adedf3be66f8ccee418473c2916492d53cbafbfcff851cbec5a8454b136",
+ "sha256:5df54843b88901fdc2f598ac06737f03d71168fd1175728054c8f5a2739ac3e4",
+ "sha256:65e528e2e921ba8fd67d9055e6b9f9e34b21ebd6768ae1c1723f4ea6ace1234d",
+ "sha256:6aae5cce399a0f065da65c7bb1e8abd5c7a3043da9dceb429ebe1b289bc07806",
+ "sha256:6cfb5a4f556bb51aba274588200a46e4dd6b505fb1a5f8c5ae408222eb416f99",
+ "sha256:7076b4b3a5f6d2b5d7f1185fde25b1e54eb66e647a1dfef0e2c2bfaf9b4c88c8",
+ "sha256:73ca8fbc5bc622e54627314c1a6f1dfdd8db69788f3443e752c215f29fa87a0b",
+ "sha256:79b356f3dd5b26f3ad23b35c75dbdaf1f9e2450b6bcefc6d0825ea0aa3f86ca5",
+ "sha256:7a892be37ca35eb5019ec85402c3371b0f7cda5ab5056023a7f13da0961e60da",
+ "sha256:8192794d120167e2a64721d88dbd688584675e86e15d0569599257566dec9bf0",
+ "sha256:820bc841faa502e727a48311948e0461132a9c8baa42f6b2b84a29ced24cc078",
+ "sha256:8f894208794b164e6bd4bba61fc98bf6b06be4d390cf2daacfa6eca0a6d2bb4f",
+ "sha256:a04e990a2a41740b02d6182b498ee9796cf60eefe40cf859b016650147908029",
+ "sha256:a44963520b069e12789d0faea4e9fdb1e410cdc4aab89d94f7f55cbb7fef0353",
+ "sha256:a6bb74ed465d5fb204b2ec41d79bcd28afccf817de721e8a807d5141c3426638",
+ "sha256:ab73b35e8d109bffbda9a3e91c64e29fe26e03e49addf5b43d85fc426dde11f9",
+ "sha256:aea072a941b033813f5e4814541fc265a5c12ed9720daef11ca516aeacd3bd7f",
+ "sha256:b1ccf5e728ccf83acd313c89f07c22d70d6c375a9c6f339233dcf792094bcbf7",
+ "sha256:b385d49609f8e9efc885790a5a0e89f2e3ae042cdf12958b6034cc442de428d3",
+ "sha256:b3d45ff86efb129c599a3b287ae2e44c1e281ae0f9a9bad0edc202179bcc3a2e",
+ "sha256:b4a474f799456e0eb46d78ab07303286a84a3140e9700b9e154cfebc8f527016",
+ "sha256:b95c3a8cb0463ba9f77383d0fa8c9194cf91f64445a63fc26fb2327e1e1eb088",
+ "sha256:c5986ee7ea0795a4095ac4d113cbb3448601efca7f158ec7f7087a6c705304e4",
+ "sha256:cdd31315fc20868c194130de9ee6bfd99755cc9565edff98ecc12585b90be882",
+ "sha256:cef4649ec906ea7ea5e9e796e68b987f83fa9a718514fe147f538cfeda76d7a7",
+ "sha256:d05c16cf4b4c2fc880cb12ba4c9b526e9e5d5bb1d81313d4d732a5b9fe2b9d53",
+ "sha256:d2e344d6adc8ef81c5a233d3a57b3c7d5181f40e79e05e1c143da143ccb6377d",
+ "sha256:d45d3cbd94159c468b9b8c5a556e3f6b81a8d1af2a92b77320e887c3e7a5d080",
+ "sha256:db14f552ac38f10758ad14dd7b983dbab424e731588d300c7db25b6f89e335b5",
+ "sha256:dbc5958cb471e5a5af41b0ddaea96a37e74ed289535e8deca404811f6cb0bc3d",
+ "sha256:ddbd2f9713a79e8e7242d7c51f1929611e991d855f414ca9996c20e44a895f7c",
+ "sha256:e16f3d6b491c48c5ae726308e6ab1e18ee830b4cdd6913f2d7f77354b33f91c8",
+ "sha256:e2afe743289273209c992075a5a4913e8d007d569a406ffed0bd080ea02b0633",
+ "sha256:e564c2cf45d2f44a9da56f4e3a26b2236504a496eb4cb0ca7221cd4cc7a9aca9",
+ "sha256:ed550e7442f278af76d9d65af48069f1fb84c9f745ae249c1a183c1e9d1b025c"
],
"index": "pypi",
- "version": "==7.5.3"
+ "version": "==7.5.4"
},
"iniconfig": {
"hashes": [
diff --git a/dbrepo-search-service/app.py b/dbrepo-search-service/app.py
index 5d3c816ffd35b6e923ffa91644d8c08db7a58723..f8d7856c9b7f7c60cf9769e3ade9f800640f0b9f 100644
--- a/dbrepo-search-service/app.py
+++ b/dbrepo-search-service/app.py
@@ -13,7 +13,6 @@ from flask_httpauth import HTTPTokenAuth, HTTPBasicAuth, MultiAuth
from opensearchpy import TransportError, NotFoundError
from prometheus_flask_exporter import PrometheusMetrics
from pydantic import ValidationError
-from logging.config import dictConfig
from clients.keycloak_client import User, KeycloakClient
from clients.opensearch_client import OpenSearchClient
@@ -21,6 +20,8 @@ from clients.opensearch_client import OpenSearchClient
logging.addLevelName(level=logging.NOTSET, levelName='TRACE')
logging.basicConfig(level=logging.DEBUG)
+from logging.config import dictConfig
+
# logging configuration
dictConfig({
'version': 1,
@@ -164,7 +165,7 @@ template = {
"info": {
"title": "Database Repository Search Service API",
"description": "Service that searches the search database",
- "version": "1.4.4",
+ "version": "1.4.5",
"contact": {
"name": "Prof. Andreas Rauber",
"email": "andreas.rauber@tuwien.ac.at"
@@ -176,7 +177,7 @@ template = {
},
"externalDocs": {
"description": "Sourcecode Documentation",
- "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.4/"
+ "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.5/"
},
"servers": [
{
@@ -191,16 +192,14 @@ template = {
}
swagger = Swagger(app, config=swagger_config, template=template)
-app.config["GATEWAY_ENDPOINT"] = os.getenv("GATEWAY_ENDPOINT", "http://localhost")
+app.config["METADATA_SERVICE_ENDPOINT"] = os.getenv("METADATA_SERVICE_ENDPOINT", "http://metadata-service:8080")
app.config["JWT_ALGORITHM"] = "HS256"
app.config["JWT_PUBKEY"] = '-----BEGIN PUBLIC KEY-----\n' + os.getenv("JWT_PUBKEY",
"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB") + '\n-----END PUBLIC KEY-----'
-app.config["AUTH_SERVICE_ENDPOINT"] = os.getenv("AUTH_SERVICE_ENDPOINT", "http://localhost/api/auth")
+app.config["AUTH_SERVICE_ENDPOINT"] = os.getenv("AUTH_SERVICE_ENDPOINT", "http://auth-service:8080/api/auth")
app.config["AUTH_SERVICE_CLIENT"] = os.getenv("AUTH_SERVICE_CLIENT", "dbrepo-client")
app.config["AUTH_SERVICE_CLIENT_SECRET"] = os.getenv("AUTH_SERVICE_CLIENT_SECRET", "MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG")
-app.config["ADMIN_USERNAME"] = os.getenv('ADMIN_USERNAME', 'admin')
-app.config["ADMIN_PASSWORD"] = os.getenv('ADMIN_PASSWORD', 'admin')
-app.config["OPENSEARCH_HOST"] = os.getenv('OPENSEARCH_HOST', 'localhost')
+app.config["OPENSEARCH_HOST"] = os.getenv('OPENSEARCH_HOST', 'search-db')
app.config["OPENSEARCH_PORT"] = os.getenv('OPENSEARCH_PORT', '9200')
app.config["OPENSEARCH_USERNAME"] = os.getenv('OPENSEARCH_USERNAME', 'admin')
app.config["OPENSEARCH_PASSWORD"] = os.getenv('OPENSEARCH_PASSWORD', 'admin')
@@ -226,8 +225,6 @@ def verify_token(token: str):
def verify_password(username: str, password: str) -> Any:
if username is None or username == "" or password is None or password == "":
return False
- if username == app.config["ADMIN_USERNAME"] and password == app.config["ADMIN_PASSWORD"]:
- return User(username=username, roles=["admin"])
client = KeycloakClient()
try:
return client.verify_jwt(access_token=client.obtain_user_token(username=username, password=password))
@@ -373,7 +370,7 @@ def post_general_search(type):
if t1 is not None and t2 is not None and "unit.uri" in req_body and "concept.uri" in req_body:
response = OpenSearchClient().unit_independent_search(t1, t2, req_body)
else:
- response = OpenSearchClient().general_search(type, t1, t2, req_body)
+ response = OpenSearchClient().general_search(type, req_body)
# filter by type
if type == 'table':
tmp = []
@@ -430,7 +427,7 @@ def post_general_search(type):
@app.route("/api/search/database/<int:database_id>", methods=["PUT"], endpoint="search_put_database")
@metrics.gauge(name='dbrepo_search_update_database',
description='Time needed to update a database in the search database')
-@auth.login_required(role=['admin'])
+@auth.login_required(role=['update-search-index'])
def update_database(database_id: int) -> Database | ApiError:
logging.debug(f"updating database with id: {database_id}")
try:
diff --git a/dbrepo-search-service/clients/opensearch_client.py b/dbrepo-search-service/clients/opensearch_client.py
index 0af31277932407df47a513ee498d4e356ba8364c..3f198ac443784286c4c16912d1e2d946f1fd9080 100644
--- a/dbrepo-search-service/clients/opensearch_client.py
+++ b/dbrepo-search-service/clients/opensearch_client.py
@@ -3,7 +3,6 @@ The opensearch_client.py is used by the different API endpoints in routes.py to
"""
from json import dumps, load
import logging
-import re
from dbrepo.api.dto import Database
from flask import current_app
@@ -12,7 +11,7 @@ from collections.abc import MutableMapping
from opensearchpy import OpenSearch, TransportError, RequestError
from omlib.measure import om
-from omlib.constants import SI, OM_IDS
+from omlib.constants import OM_IDS
from omlib.omconstants import OM
from omlib.unit import Unit
@@ -171,91 +170,38 @@ class OpenSearchClient:
logging.info(f"Found {len(response['hits']['hits'])} result(s)")
return response
- def general_search(self, type=None, t1=None, t2=None, field_value_pairs=None):
+ def general_search(self, type: str = None, field_value_pairs: dict = None):
"""
Main method for searching stuff in the opensearch db
all parameters are optional
:param type: The index to be searched. Optional.
- :param t1: The start range value. Optional.
- :param t2: The end range value. Optional.
:param field_value_pairs: The key-value pair of properties that need to match. Optional.
:return: The object of results and HTTP status code. e.g. { "hits": { "hits": [] } }, 200
"""
musts = []
if field_value_pairs is not None and len(field_value_pairs) > 0:
logging.debug(f'field_value_pairs present: {field_value_pairs}')
- is_range_open_end = False
- is_range_open_begin = False
- is_range_query = False
- if t1 is not None and t2 is None:
- is_range_open_begin = True
- logging.debug(f"query has only start value {t1} present")
- if t1 is None and t2 is not None:
- is_range_open_end = True
- logging.debug(f"query has only end value {t2} present")
- if t1 is not None and t2 is not None:
- is_range_query = True
- logging.debug(f"query has start value {t1} and end value {t2} present")
for key, value in field_value_pairs.items():
if field_value_pairs[key] == None:
logging.debug(f"skip empty key: {key}")
continue
logging.debug(f"processing key: {key}")
- if is_range_open_end and re.match(f"unit\.", key):
- logging.debug(f"omit key={key} because query type=open end range and key is somewhat unit")
- logging.info(f"add match-query for range ),{t2}]")
+ if '.' in key:
+ logging.debug(f'key {key} is nested: use nested query')
musts.append({
- "range": {
- "val_max": {
- "lte": t2
- }
- }
- })
- elif is_range_open_begin and re.match(f"unit\.", key):
- logging.debug(f"omit key={key} because query type=open begin range and key is somewhat unit")
- logging.info(f"add match-query for range [{t1},(")
- musts.append({
- "range": {
- "val_min": {
- "gte": t1
- }
- }
- })
- elif is_range_query and re.match(f"unit\.", key):
- logging.debug(
- f"omit key={key} because query type=full range and key is somewhat unit")
- logging.info(f"add match-query for range [{t1},{t2}]")
- musts.append({
- "range": {
- "val_min": {
- "gte": t1
- }
+ "match": {
+ key: value
}
})
+ else:
+ logging.debug(f'key {key} is flat: use bool query')
musts.append({
- "range": {
- "val_max": {
- "lte": t2
- }
+ "match": {
+ key: {"query": value, "minimum_should_match": "90%"}
}
})
- else:
- if '.' in key:
- logging.debug(f'key {key} is nested: use nested query')
- musts.append({
- "match": {
- key: value
- }
- })
- else:
- logging.debug(f'key {key} is flat: use bool query')
- musts.append({
- "match": {
- key: {"query": value, "minimum_should_match": "90%"}
- }
- })
body = {
"query": {"bool": {"must": musts}}
}
@@ -290,7 +236,7 @@ class OpenSearchClient:
}
}
response = self._instance().search(
- index="column",
+ index="database",
body=dumps(body)
)
unit_uris = [hit["key"] for hit in response["aggregations"]["units"]["buckets"]]
diff --git a/dbrepo-search-service/init/Dockerfile b/dbrepo-search-service/init/Dockerfile
index 01a27175316bbded7802c6178a157388d56ced30..ebde913dbd9e013e9591fa4135e919a78fbbbd26 100644
--- a/dbrepo-search-service/init/Dockerfile
+++ b/dbrepo-search-service/init/Dockerfile
@@ -6,6 +6,8 @@ WORKDIR /home/alpine
COPY Pipfile Pipfile.lock ./
+COPY ./lib ./lib
+
RUN pip install pipenv && \
pipenv install gunicorn && \
pipenv install --system --deploy
diff --git a/dbrepo-search-service/init/Pipfile b/dbrepo-search-service/init/Pipfile
index 8676f227dc6970ce9ceda2633df0d9bc496a1959..517796af748f40cf55f52bac420a000c04c11b23 100644
--- a/dbrepo-search-service/init/Pipfile
+++ b/dbrepo-search-service/init/Pipfile
@@ -9,7 +9,7 @@ opensearch-py = "~=2.2"
python-dotenv = "~=1.0"
testcontainers-opensearch = "*"
pytest = "*"
-dbrepo = "1.4.3rc3"
+dbrepo = {path = "./lib/dbrepo-1.4.4.tar.gz"}
[dev-packages]
coverage = "*"
diff --git a/dbrepo-search-service/init/Pipfile.lock b/dbrepo-search-service/init/Pipfile.lock
index d88be6346de6fafdb47abe238384b2970ddfe546..3053d901cd7867d75f24a1012a84942e21e3ebcd 100644
--- a/dbrepo-search-service/init/Pipfile.lock
+++ b/dbrepo-search-service/init/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "d54312bd3fff7b1b422c47cd63404ce8b48233b17baaaf7278b492989b3a9a77"
+ "sha256": "b12551e0f7592ebabd1eb3ad3efe9e7304c4dcee4fcb065afa88308bff71855d"
},
"pipfile-spec": 6,
"requires": {
@@ -108,11 +108,11 @@
},
"annotated-types": {
"hashes": [
- "sha256:0641064de18ba7a25dee8f96403ebc39113d0cb953a01429249d5c7564666a43",
- "sha256:563339e807e53ffd9c267e99fc6d9ea23eb8443c08f112651963e24e22f84a5d"
+ "sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53",
+ "sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89"
],
"markers": "python_version >= '3.8'",
- "version": "==0.6.0"
+ "version": "==0.7.0"
},
"attrs": {
"hashes": [
@@ -132,11 +132,11 @@
},
"certifi": {
"hashes": [
- "sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f",
- "sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1"
+ "sha256:3cd43f1c6fa7dedc5899d69d3ad0398fd018ad1a17fba83ddaf78aa46c747516",
+ "sha256:ddc6c8ce995e6987e7faf5e3f1b02b302836a0e5d98ece18392cb1a36c72ad56"
],
"markers": "python_version >= '3.6'",
- "version": "==2024.2.2"
+ "version": "==2024.6.2"
},
"charset-normalizer": {
"hashes": [
@@ -244,19 +244,24 @@
},
"dbrepo": {
"hashes": [
- "sha256:012c846399ac031ee9cf6c9f6e17bc209bcae86b121a8cb99cd889e5c5e56ad1",
- "sha256:99a0b512e0a78c67fa919e82e2405b62f3585e1a8f680bc1b7c7108820b32aa8"
+ "sha256:d445f1c5a361eae8f3538a395828a297dd999ab36e5bbca0ad1cca9d093b8030"
],
- "index": "pypi",
- "version": "==1.4.3rc3"
+ "path": "./lib/dbrepo-1.4.4.tar.gz",
+ "version": "==1.4.4"
},
"docker": {
"hashes": [
- "sha256:12ba681f2777a0ad28ffbcc846a69c31b4dfd9752b47eb425a274ee269c5e14b",
- "sha256:323736fb92cd9418fc5e7133bc953e11a9da04f4483f828b527db553f1e7e5a3"
+ "sha256:ad8c70e6e3f8926cb8a92619b832b4ea5299e2831c14284663184e200546fa6c",
+ "sha256:c96b93b7f0a746f9e77d325bcfb87422a3d8bd4f03136ae8a85b37f1898d5fc0"
],
"markers": "python_version >= '3.8'",
- "version": "==7.0.0"
+ "version": "==7.1.0"
+ },
+ "events": {
+ "hashes": [
+ "sha256:a7286af378ba3e46640ac9825156c93bdba7502174dd696090fdfcd4d80a1abd"
+ ],
+ "version": "==0.5"
},
"flask": {
"hashes": [
@@ -545,61 +550,70 @@
},
"numpy": {
"hashes": [
- "sha256:03a8c78d01d9781b28a6989f6fa1bb2c4f2d51201cf99d3dd875df6fbd96b23b",
- "sha256:08beddf13648eb95f8d867350f6a018a4be2e5ad54c8d8caed89ebca558b2818",
- "sha256:1af303d6b2210eb850fcf03064d364652b7120803a0b872f5211f5234b399f20",
- "sha256:1dda2e7b4ec9dd512f84935c5f126c8bd8b9f2fc001e9f54af255e8c5f16b0e0",
- "sha256:2a02aba9ed12e4ac4eb3ea9421c420301a0c6460d9830d74a9df87efa4912010",
- "sha256:2e4ee3380d6de9c9ec04745830fd9e2eccb3e6cf790d39d7b98ffd19b0dd754a",
- "sha256:3373d5d70a5fe74a2c1bb6d2cfd9609ecf686d47a2d7b1d37a8f3b6bf6003aea",
- "sha256:47711010ad8555514b434df65f7d7b076bb8261df1ca9bb78f53d3b2db02e95c",
- "sha256:4c66707fabe114439db9068ee468c26bbdf909cac0fb58686a42a24de1760c71",
- "sha256:50193e430acfc1346175fcbdaa28ffec49947a06918b7b92130744e81e640110",
- "sha256:52b8b60467cd7dd1e9ed082188b4e6bb35aa5cdd01777621a1658910745b90be",
- "sha256:60dedbb91afcbfdc9bc0b1f3f402804070deed7392c23eb7a7f07fa857868e8a",
- "sha256:62b8e4b1e28009ef2846b4c7852046736bab361f7aeadeb6a5b89ebec3c7055a",
- "sha256:666dbfb6ec68962c033a450943ded891bed2d54e6755e35e5835d63f4f6931d5",
- "sha256:675d61ffbfa78604709862923189bad94014bef562cc35cf61d3a07bba02a7ed",
- "sha256:679b0076f67ecc0138fd2ede3a8fd196dddc2ad3254069bcb9faf9a79b1cebcd",
- "sha256:7349ab0fa0c429c82442a27a9673fc802ffdb7c7775fad780226cb234965e53c",
- "sha256:7ab55401287bfec946ced39700c053796e7cc0e3acbef09993a9ad2adba6ca6e",
- "sha256:7e50d0a0cc3189f9cb0aeb3a6a6af18c16f59f004b866cd2be1c14b36134a4a0",
- "sha256:95a7476c59002f2f6c590b9b7b998306fba6a5aa646b1e22ddfeaf8f78c3a29c",
- "sha256:96ff0b2ad353d8f990b63294c8986f1ec3cb19d749234014f4e7eb0112ceba5a",
- "sha256:9fad7dcb1aac3c7f0584a5a8133e3a43eeb2fe127f47e3632d43d677c66c102b",
- "sha256:9ff0f4f29c51e2803569d7a51c2304de5554655a60c5d776e35b4a41413830d0",
- "sha256:a354325ee03388678242a4d7ebcd08b5c727033fcff3b2f536aea978e15ee9e6",
- "sha256:a4abb4f9001ad2858e7ac189089c42178fcce737e4169dc61321660f1a96c7d2",
- "sha256:ab47dbe5cc8210f55aa58e4805fe224dac469cde56b9f731a4c098b91917159a",
- "sha256:afedb719a9dcfc7eaf2287b839d8198e06dcd4cb5d276a3df279231138e83d30",
- "sha256:b3ce300f3644fb06443ee2222c2201dd3a89ea6040541412b8fa189341847218",
- "sha256:b97fe8060236edf3662adfc2c633f56a08ae30560c56310562cb4f95500022d5",
- "sha256:bfe25acf8b437eb2a8b2d49d443800a5f18508cd811fea3181723922a8a82b07",
- "sha256:cd25bcecc4974d09257ffcd1f098ee778f7834c3ad767fe5db785be9a4aa9cb2",
- "sha256:d209d8969599b27ad20994c8e41936ee0964e6da07478d6c35016bc386b66ad4",
- "sha256:d5241e0a80d808d70546c697135da2c613f30e28251ff8307eb72ba696945764",
- "sha256:edd8b5fe47dab091176d21bb6de568acdd906d1887a4584a15a9a96a1dca06ef",
- "sha256:f870204a840a60da0b12273ef34f7051e98c3b5961b61b0c2c1be6dfd64fbcd3",
- "sha256:ffa75af20b44f8dba823498024771d5ac50620e6915abac414251bd971b4529f"
+ "sha256:04494f6ec467ccb5369d1808570ae55f6ed9b5809d7f035059000a37b8d7e86f",
+ "sha256:0a43f0974d501842866cc83471bdb0116ba0dffdbaac33ec05e6afed5b615238",
+ "sha256:0e50842b2295ba8414c8c1d9d957083d5dfe9e16828b37de883f51fc53c4016f",
+ "sha256:0ec84b9ba0654f3b962802edc91424331f423dcf5d5f926676e0150789cb3d95",
+ "sha256:17067d097ed036636fa79f6a869ac26df7db1ba22039d962422506640314933a",
+ "sha256:1cde1753efe513705a0c6d28f5884e22bdc30438bf0085c5c486cdaff40cd67a",
+ "sha256:1e72728e7501a450288fc8e1f9ebc73d90cfd4671ebbd631f3e7857c39bd16f2",
+ "sha256:2635dbd200c2d6faf2ef9a0d04f0ecc6b13b3cad54f7c67c61155138835515d2",
+ "sha256:2ce46fd0b8a0c947ae047d222f7136fc4d55538741373107574271bc00e20e8f",
+ "sha256:34f003cb88b1ba38cb9a9a4a3161c1604973d7f9d5552c38bc2f04f829536609",
+ "sha256:354f373279768fa5a584bac997de6a6c9bc535c482592d7a813bb0c09be6c76f",
+ "sha256:38ecb5b0582cd125f67a629072fed6f83562d9dd04d7e03256c9829bdec027ad",
+ "sha256:3e8e01233d57639b2e30966c63d36fcea099d17c53bf424d77f088b0f4babd86",
+ "sha256:3f6bed7f840d44c08ebdb73b1825282b801799e325bcbdfa6bc5c370e5aecc65",
+ "sha256:4554eb96f0fd263041baf16cf0881b3f5dafae7a59b1049acb9540c4d57bc8cb",
+ "sha256:46e161722e0f619749d1cd892167039015b2c2817296104487cd03ed4a955995",
+ "sha256:49d9f7d256fbc804391a7f72d4a617302b1afac1112fac19b6c6cec63fe7fe8a",
+ "sha256:4d2f62e55a4cd9c58c1d9a1c9edaedcd857a73cb6fda875bf79093f9d9086f85",
+ "sha256:5f64641b42b2429f56ee08b4f427a4d2daf916ec59686061de751a55aafa22e4",
+ "sha256:63b92c512d9dbcc37f9d81b123dec99fdb318ba38c8059afc78086fe73820275",
+ "sha256:6d7696c615765091cc5093f76fd1fa069870304beaccfd58b5dcc69e55ef49c1",
+ "sha256:79e843d186c8fb1b102bef3e2bc35ef81160ffef3194646a7fdd6a73c6b97196",
+ "sha256:821eedb7165ead9eebdb569986968b541f9908979c2da8a4967ecac4439bae3d",
+ "sha256:84554fc53daa8f6abf8e8a66e076aff6ece62de68523d9f665f32d2fc50fd66e",
+ "sha256:8d83bb187fb647643bd56e1ae43f273c7f4dbcdf94550d7938cfc32566756514",
+ "sha256:903703372d46bce88b6920a0cd86c3ad82dae2dbef157b5fc01b70ea1cfc430f",
+ "sha256:9416a5c2e92ace094e9f0082c5fd473502c91651fb896bc17690d6fc475128d6",
+ "sha256:9a1712c015831da583b21c5bfe15e8684137097969c6d22e8316ba66b5baabe4",
+ "sha256:9c27f0946a3536403efb0e1c28def1ae6730a72cd0d5878db38824855e3afc44",
+ "sha256:a356364941fb0593bb899a1076b92dfa2029f6f5b8ba88a14fd0984aaf76d0df",
+ "sha256:a7039a136017eaa92c1848152827e1424701532ca8e8967fe480fe1569dae581",
+ "sha256:acd3a644e4807e73b4e1867b769fbf1ce8c5d80e7caaef0d90dcdc640dfc9787",
+ "sha256:ad0c86f3455fbd0de6c31a3056eb822fc939f81b1618f10ff3406971893b62a5",
+ "sha256:b4c76e3d4c56f145d41b7b6751255feefae92edbc9a61e1758a98204200f30fc",
+ "sha256:b6f6a8f45d0313db07d6d1d37bd0b112f887e1369758a5419c0370ba915b3871",
+ "sha256:c5a59996dc61835133b56a32ebe4ef3740ea5bc19b3983ac60cc32be5a665d54",
+ "sha256:c73aafd1afca80afecb22718f8700b40ac7cab927b8abab3c3e337d70e10e5a2",
+ "sha256:cee6cc0584f71adefe2c908856ccc98702baf95ff80092e4ca46061538a2ba98",
+ "sha256:cef04d068f5fb0518a77857953193b6bb94809a806bd0a14983a8f12ada060c9",
+ "sha256:cf5d1c9e6837f8af9f92b6bd3e86d513cdc11f60fd62185cc49ec7d1aba34864",
+ "sha256:e61155fae27570692ad1d327e81c6cf27d535a5d7ef97648a17d922224b216de",
+ "sha256:e7f387600d424f91576af20518334df3d97bc76a300a755f9a8d6e4f5cadd289",
+ "sha256:ed08d2703b5972ec736451b818c2eb9da80d66c3e84aed1deeb0c345fefe461b",
+ "sha256:fbd6acc766814ea6443628f4e6751d0da6593dae29c08c0b2606164db026970c",
+ "sha256:feff59f27338135776f6d4e2ec7aeeac5d5f7a08a83e80869121ef8164b74af9"
],
"markers": "python_version == '3.11'",
- "version": "==1.26.4"
+ "version": "==2.0.0"
},
"opensearch-py": {
"hashes": [
- "sha256:0dde4ac7158a717d92a8cd81964cb99705a4b80bcf9258ba195b9a9f23f5226d",
- "sha256:cf093a40e272b60663f20417fc1264ac724dcf1e03c1a4542a6b44835b1e6c49"
+ "sha256:0b7c27e8ed84c03c99558406927b6161f186a72502ca6d0325413d8e5523ba96",
+ "sha256:b6e78b685dd4e9c016d7a4299cf1de69e299c88322e3f81c716e6e23fe5683c1"
],
"index": "pypi",
- "version": "==2.5.0"
+ "version": "==2.6.0"
},
"packaging": {
"hashes": [
- "sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5",
- "sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9"
+ "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002",
+ "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124"
],
- "markers": "python_version >= '3.7'",
- "version": "==24.0"
+ "markers": "python_version >= '3.8'",
+ "version": "==24.1"
},
"pandas": {
"hashes": [
@@ -654,104 +668,104 @@
},
"pydantic": {
"hashes": [
- "sha256:e029badca45266732a9a79898a15ae2e8b14840b1eabbb25844be28f0b33f3d5",
- "sha256:e9dbb5eada8abe4d9ae5f46b9939aead650cd2b68f249bb3a8139dbe125803cc"
+ "sha256:0c84efd9548d545f63ac0060c1e4d39bb9b14db8b3c0652338aecc07b5adec52",
+ "sha256:ee8538d41ccb9c0a9ad3e0e5f07bf15ed8015b481ced539a1759d8cc89ae90d0"
],
"markers": "python_version >= '3.8'",
- "version": "==2.7.1"
+ "version": "==2.7.4"
},
"pydantic-core": {
"hashes": [
- "sha256:0098300eebb1c837271d3d1a2cd2911e7c11b396eac9661655ee524a7f10587b",
- "sha256:042473b6280246b1dbf530559246f6842b56119c2926d1e52b631bdc46075f2a",
- "sha256:05b7133a6e6aeb8df37d6f413f7705a37ab4031597f64ab56384c94d98fa0e90",
- "sha256:0680b1f1f11fda801397de52c36ce38ef1c1dc841a0927a94f226dea29c3ae3d",
- "sha256:0d69b4c2f6bb3e130dba60d34c0845ba31b69babdd3f78f7c0c8fae5021a253e",
- "sha256:1404c69d6a676245199767ba4f633cce5f4ad4181f9d0ccb0577e1f66cf4c46d",
- "sha256:182245ff6b0039e82b6bb585ed55a64d7c81c560715d1bad0cbad6dfa07b4027",
- "sha256:1a388a77e629b9ec814c1b1e6b3b595fe521d2cdc625fcca26fbc2d44c816804",
- "sha256:1d90c3265ae107f91a4f279f4d6f6f1d4907ac76c6868b27dc7fb33688cfb347",
- "sha256:20aca1e2298c56ececfd8ed159ae4dde2df0781988c97ef77d5c16ff4bd5b400",
- "sha256:219da3f096d50a157f33645a1cf31c0ad1fe829a92181dd1311022f986e5fbe3",
- "sha256:22057013c8c1e272eb8d0eebc796701167d8377441ec894a8fed1af64a0bf399",
- "sha256:223ee893d77a310a0391dca6df00f70bbc2f36a71a895cecd9a0e762dc37b349",
- "sha256:224c421235f6102e8737032483f43c1a8cfb1d2f45740c44166219599358c2cd",
- "sha256:2334ce8c673ee93a1d6a65bd90327588387ba073c17e61bf19b4fd97d688d63c",
- "sha256:269322dcc3d8bdb69f054681edff86276b2ff972447863cf34c8b860f5188e2e",
- "sha256:2728b01246a3bba6de144f9e3115b532ee44bd6cf39795194fb75491824a1413",
- "sha256:2b8ed04b3582771764538f7ee7001b02e1170223cf9b75dff0bc698fadb00cf3",
- "sha256:2e29d20810dfc3043ee13ac7d9e25105799817683348823f305ab3f349b9386e",
- "sha256:36789b70d613fbac0a25bb07ab3d9dba4d2e38af609c020cf4d888d165ee0bf3",
- "sha256:390193c770399861d8df9670fb0d1874f330c79caaca4642332df7c682bf6b91",
- "sha256:3a6515ebc6e69d85502b4951d89131ca4e036078ea35533bb76327f8424531ce",
- "sha256:3f9a801e7c8f1ef8718da265bba008fa121243dfe37c1cea17840b0944dfd72c",
- "sha256:43f0f463cf89ace478de71a318b1b4f05ebc456a9b9300d027b4b57c1a2064fb",
- "sha256:4456f2dca97c425231d7315737d45239b2b51a50dc2b6f0c2bb181fce6207664",
- "sha256:470b94480bb5ee929f5acba6995251ada5e059a5ef3e0dfc63cca287283ebfa6",
- "sha256:4774f3184d2ef3e14e8693194f661dea5a4d6ca4e3dc8e39786d33a94865cefd",
- "sha256:4b4356d3538c3649337df4074e81b85f0616b79731fe22dd11b99499b2ebbdf3",
- "sha256:553ef617b6836fc7e4df130bb851e32fe357ce36336d897fd6646d6058d980af",
- "sha256:6132dd3bd52838acddca05a72aafb6eab6536aa145e923bb50f45e78b7251043",
- "sha256:6a46e22a707e7ad4484ac9ee9f290f9d501df45954184e23fc29408dfad61350",
- "sha256:6e5c584d357c4e2baf0ff7baf44f4994be121e16a2c88918a5817331fc7599d7",
- "sha256:75250dbc5290e3f1a0f4618db35e51a165186f9034eff158f3d490b3fed9f8a0",
- "sha256:75f7e9488238e920ab6204399ded280dc4c307d034f3924cd7f90a38b1829563",
- "sha256:78363590ef93d5d226ba21a90a03ea89a20738ee5b7da83d771d283fd8a56761",
- "sha256:7ca4ae5a27ad7a4ee5170aebce1574b375de390bc01284f87b18d43a3984df72",
- "sha256:800d60565aec896f25bc3cfa56d2277d52d5182af08162f7954f938c06dc4ee3",
- "sha256:82d5d4d78e4448683cb467897fe24e2b74bb7b973a541ea1dcfec1d3cbce39fb",
- "sha256:852e966fbd035a6468fc0a3496589b45e2208ec7ca95c26470a54daed82a0788",
- "sha256:868649da93e5a3d5eacc2b5b3b9235c98ccdbfd443832f31e075f54419e1b96b",
- "sha256:886eec03591b7cf058467a70a87733b35f44707bd86cf64a615584fd72488b7c",
- "sha256:8b172601454f2d7701121bbec3425dd71efcb787a027edf49724c9cefc14c038",
- "sha256:95b9d5e72481d3780ba3442eac863eae92ae43a5f3adb5b4d0a1de89d42bb250",
- "sha256:98758d627ff397e752bc339272c14c98199c613f922d4a384ddc07526c86a2ec",
- "sha256:997abc4df705d1295a42f95b4eec4950a37ad8ae46d913caeee117b6b198811c",
- "sha256:9b5155ff768083cb1d62f3e143b49a8a3432e6789a3abee8acd005c3c7af1c74",
- "sha256:9e08e867b306f525802df7cd16c44ff5ebbe747ff0ca6cf3fde7f36c05a59a81",
- "sha256:9fdad8e35f278b2c3eb77cbdc5c0a49dada440657bf738d6905ce106dc1de439",
- "sha256:a1874c6dd4113308bd0eb568418e6114b252afe44319ead2b4081e9b9521fe75",
- "sha256:a8309f67285bdfe65c372ea3722b7a5642680f3dba538566340a9d36e920b5f0",
- "sha256:ae0a8a797a5e56c053610fa7be147993fe50960fa43609ff2a9552b0e07013e8",
- "sha256:b14d82cdb934e99dda6d9d60dc84a24379820176cc4a0d123f88df319ae9c150",
- "sha256:b1bd7e47b1558ea872bd16c8502c414f9e90dcf12f1395129d7bb42a09a95438",
- "sha256:b3ef08e20ec49e02d5c6717a91bb5af9b20f1805583cb0adfe9ba2c6b505b5ae",
- "sha256:b89ed9eb7d616ef5714e5590e6cf7f23b02d0d539767d33561e3675d6f9e3857",
- "sha256:c4fcf5cd9c4b655ad666ca332b9a081112cd7a58a8b5a6ca7a3104bc950f2038",
- "sha256:c6fdc8627910eed0c01aed6a390a252fe3ea6d472ee70fdde56273f198938374",
- "sha256:c9bd70772c720142be1020eac55f8143a34ec9f82d75a8e7a07852023e46617f",
- "sha256:ca7b0c1f1c983e064caa85f3792dd2fe3526b3505378874afa84baf662e12241",
- "sha256:cbca948f2d14b09d20268cda7b0367723d79063f26c4ffc523af9042cad95592",
- "sha256:cc1cfd88a64e012b74e94cd00bbe0f9c6df57049c97f02bb07d39e9c852e19a4",
- "sha256:ccdd111c03bfd3666bd2472b674c6899550e09e9f298954cfc896ab92b5b0e6d",
- "sha256:cfeecd1ac6cc1fb2692c3d5110781c965aabd4ec5d32799773ca7b1456ac636b",
- "sha256:d4d938ec0adf5167cb335acb25a4ee69a8107e4984f8fbd2e897021d9e4ca21b",
- "sha256:d7d904828195733c183d20a54230c0df0eb46ec746ea1a666730787353e87182",
- "sha256:d91cb5ea8b11607cc757675051f61b3d93f15eca3cefb3e6c704a5d6e8440f4e",
- "sha256:d9319e499827271b09b4e411905b24a426b8fb69464dfa1696258f53a3334641",
- "sha256:e0e8b1be28239fc64a88a8189d1df7fad8be8c1ae47fcc33e43d4be15f99cc70",
- "sha256:e18609ceaa6eed63753037fc06ebb16041d17d28199ae5aba0052c51449650a9",
- "sha256:e1b395e58b10b73b07b7cf740d728dd4ff9365ac46c18751bf8b3d8cca8f625a",
- "sha256:e23ec367a948b6d812301afc1b13f8094ab7b2c280af66ef450efc357d2ae543",
- "sha256:e25add29b8f3b233ae90ccef2d902d0ae0432eb0d45370fe315d1a5cf231004b",
- "sha256:e6dac87ddb34aaec85f873d737e9d06a3555a1cc1a8e0c44b7f8d5daeb89d86f",
- "sha256:ef26c9e94a8c04a1b2924149a9cb081836913818e55681722d7f29af88fe7b38",
- "sha256:eff2de745698eb46eeb51193a9f41d67d834d50e424aef27df2fcdee1b153845",
- "sha256:f0a21cbaa69900cbe1a2e7cad2aa74ac3cf21b10c3efb0fa0b80305274c0e8a2",
- "sha256:f459a5ce8434614dfd39bbebf1041952ae01da6bed9855008cb33b875cb024c0",
- "sha256:f93a8a2e3938ff656a7c1bc57193b1319960ac015b6e87d76c76bf14fe0244b4",
- "sha256:fb2bd7be70c0fe4dfd32c951bc813d9fe6ebcbfdd15a07527796c8204bd36242"
+ "sha256:01dd777215e2aa86dfd664daed5957704b769e726626393438f9c87690ce78c3",
+ "sha256:0eb2a4f660fcd8e2b1c90ad566db2b98d7f3f4717c64fe0a83e0adb39766d5b8",
+ "sha256:0fbbdc827fe5e42e4d196c746b890b3d72876bdbf160b0eafe9f0334525119c8",
+ "sha256:123c3cec203e3f5ac7b000bd82235f1a3eced8665b63d18be751f115588fea30",
+ "sha256:14601cdb733d741b8958224030e2bfe21a4a881fb3dd6fbb21f071cabd48fa0a",
+ "sha256:18f469a3d2a2fdafe99296a87e8a4c37748b5080a26b806a707f25a902c040a8",
+ "sha256:19894b95aacfa98e7cb093cd7881a0c76f55731efad31073db4521e2b6ff5b7d",
+ "sha256:1b4de2e51bbcb61fdebd0ab86ef28062704f62c82bbf4addc4e37fa4b00b7cbc",
+ "sha256:1d886dc848e60cb7666f771e406acae54ab279b9f1e4143babc9c2258213daa2",
+ "sha256:1f4d26ceb5eb9eed4af91bebeae4b06c3fb28966ca3a8fb765208cf6b51102ab",
+ "sha256:21a5e440dbe315ab9825fcd459b8814bb92b27c974cbc23c3e8baa2b76890077",
+ "sha256:293afe532740370aba8c060882f7d26cfd00c94cae32fd2e212a3a6e3b7bc15e",
+ "sha256:2f5966897e5461f818e136b8451d0551a2e77259eb0f73a837027b47dc95dab9",
+ "sha256:2fd41f6eff4c20778d717af1cc50eca52f5afe7805ee530a4fbd0bae284f16e9",
+ "sha256:2fdf2156aa3d017fddf8aea5adfba9f777db1d6022d392b682d2a8329e087cef",
+ "sha256:3c40d4eaad41f78e3bbda31b89edc46a3f3dc6e171bf0ecf097ff7a0ffff7cb1",
+ "sha256:43d447dd2ae072a0065389092a231283f62d960030ecd27565672bd40746c507",
+ "sha256:44a688331d4a4e2129140a8118479443bd6f1905231138971372fcde37e43528",
+ "sha256:44c7486a4228413c317952e9d89598bcdfb06399735e49e0f8df643e1ccd0558",
+ "sha256:44cd83ab6a51da80fb5adbd9560e26018e2ac7826f9626bc06ca3dc074cd198b",
+ "sha256:46387e38bd641b3ee5ce247563b60c5ca098da9c56c75c157a05eaa0933ed154",
+ "sha256:4701b19f7e3a06ea655513f7938de6f108123bf7c86bbebb1196eb9bd35cf724",
+ "sha256:4748321b5078216070b151d5271ef3e7cc905ab170bbfd27d5c83ee3ec436695",
+ "sha256:4b06beb3b3f1479d32befd1f3079cc47b34fa2da62457cdf6c963393340b56e9",
+ "sha256:4d0dcc59664fcb8974b356fe0a18a672d6d7cf9f54746c05f43275fc48636851",
+ "sha256:4e99bc050fe65c450344421017f98298a97cefc18c53bb2f7b3531eb39bc7805",
+ "sha256:509daade3b8649f80d4e5ff21aa5673e4ebe58590b25fe42fac5f0f52c6f034a",
+ "sha256:51991a89639a912c17bef4b45c87bd83593aee0437d8102556af4885811d59f5",
+ "sha256:53db086f9f6ab2b4061958d9c276d1dbe3690e8dd727d6abf2321d6cce37fa94",
+ "sha256:564d7922e4b13a16b98772441879fcdcbe82ff50daa622d681dd682175ea918c",
+ "sha256:574d92eac874f7f4db0ca653514d823a0d22e2354359d0759e3f6a406db5d55d",
+ "sha256:578e24f761f3b425834f297b9935e1ce2e30f51400964ce4801002435a1b41ef",
+ "sha256:59ff3e89f4eaf14050c8022011862df275b552caef8082e37b542b066ce1ff26",
+ "sha256:5f09baa656c904807e832cf9cce799c6460c450c4ad80803517032da0cd062e2",
+ "sha256:6891a2ae0e8692679c07728819b6e2b822fb30ca7445f67bbf6509b25a96332c",
+ "sha256:6a750aec7bf431517a9fd78cb93c97b9b0c496090fee84a47a0d23668976b4b0",
+ "sha256:6f5c4d41b2771c730ea1c34e458e781b18cc668d194958e0112455fff4e402b2",
+ "sha256:77450e6d20016ec41f43ca4a6c63e9fdde03f0ae3fe90e7c27bdbeaece8b1ed4",
+ "sha256:81b5efb2f126454586d0f40c4d834010979cb80785173d1586df845a632e4e6d",
+ "sha256:823be1deb01793da05ecb0484d6c9e20baebb39bd42b5d72636ae9cf8350dbd2",
+ "sha256:834b5230b5dfc0c1ec37b2fda433b271cbbc0e507560b5d1588e2cc1148cf1ce",
+ "sha256:847a35c4d58721c5dc3dba599878ebbdfd96784f3fb8bb2c356e123bdcd73f34",
+ "sha256:86110d7e1907ab36691f80b33eb2da87d780f4739ae773e5fc83fb272f88825f",
+ "sha256:8951eee36c57cd128f779e641e21eb40bc5073eb28b2d23f33eb0ef14ffb3f5d",
+ "sha256:8a7164fe2005d03c64fd3b85649891cd4953a8de53107940bf272500ba8a788b",
+ "sha256:8b8bab4c97248095ae0c4455b5a1cd1cdd96e4e4769306ab19dda135ea4cdb07",
+ "sha256:90afc12421df2b1b4dcc975f814e21bc1754640d502a2fbcc6d41e77af5ec312",
+ "sha256:938cb21650855054dc54dfd9120a851c974f95450f00683399006aa6e8abb057",
+ "sha256:942ba11e7dfb66dc70f9ae66b33452f51ac7bb90676da39a7345e99ffb55402d",
+ "sha256:972658f4a72d02b8abfa2581d92d59f59897d2e9f7e708fdabe922f9087773af",
+ "sha256:97736815b9cc893b2b7f663628e63f436018b75f44854c8027040e05230eeddb",
+ "sha256:98906207f29bc2c459ff64fa007afd10a8c8ac080f7e4d5beff4c97086a3dabd",
+ "sha256:99457f184ad90235cfe8461c4d70ab7dd2680e28821c29eca00252ba90308c78",
+ "sha256:a0d829524aaefdebccb869eed855e2d04c21d2d7479b6cada7ace5448416597b",
+ "sha256:a2fdd81edd64342c85ac7cf2753ccae0b79bf2dfa063785503cb85a7d3593223",
+ "sha256:a55b5b16c839df1070bc113c1f7f94a0af4433fcfa1b41799ce7606e5c79ce0a",
+ "sha256:a642295cd0c8df1b86fc3dced1d067874c353a188dc8e0f744626d49e9aa51c4",
+ "sha256:ab86ce7c8f9bea87b9d12c7f0af71102acbf5ecbc66c17796cff45dae54ef9a5",
+ "sha256:abc267fa9837245cc28ea6929f19fa335f3dc330a35d2e45509b6566dc18be23",
+ "sha256:ae1d6df168efb88d7d522664693607b80b4080be6750c913eefb77e34c12c71a",
+ "sha256:b2ebef0e0b4454320274f5e83a41844c63438fdc874ea40a8b5b4ecb7693f1c4",
+ "sha256:b48ece5bde2e768197a2d0f6e925f9d7e3e826f0ad2271120f8144a9db18d5c8",
+ "sha256:b7cdf28938ac6b8b49ae5e92f2735056a7ba99c9b110a474473fd71185c1af5d",
+ "sha256:bb4462bd43c2460774914b8525f79b00f8f407c945d50881568f294c1d9b4443",
+ "sha256:bc4ff9805858bd54d1a20efff925ccd89c9d2e7cf4986144b30802bf78091c3e",
+ "sha256:c1322d7dd74713dcc157a2b7898a564ab091ca6c58302d5c7b4c07296e3fd00f",
+ "sha256:c67598100338d5d985db1b3d21f3619ef392e185e71b8d52bceacc4a7771ea7e",
+ "sha256:ca26a1e73c48cfc54c4a76ff78df3727b9d9f4ccc8dbee4ae3f73306a591676d",
+ "sha256:d323a01da91851a4f17bf592faf46149c9169d68430b3146dcba2bb5e5719abc",
+ "sha256:dc1803ac5c32ec324c5261c7209e8f8ce88e83254c4e1aebdc8b0a39f9ddb443",
+ "sha256:e00a3f196329e08e43d99b79b286d60ce46bed10f2280d25a1718399457e06be",
+ "sha256:e85637bc8fe81ddb73fda9e56bab24560bdddfa98aa64f87aaa4e4b6730c23d2",
+ "sha256:e858ac0a25074ba4bce653f9b5d0a85b7456eaddadc0ce82d3878c22489fa4ee",
+ "sha256:eae237477a873ab46e8dd748e515c72c0c804fb380fbe6c85533c7de51f23a8f",
+ "sha256:ebef0dd9bf9b812bf75bda96743f2a6c5734a02092ae7f721c048d156d5fabae",
+ "sha256:ec3beeada09ff865c344ff3bc2f427f5e6c26401cc6113d77e372c3fdac73864",
+ "sha256:f76d0ad001edd426b92233d45c746fd08f467d56100fd8f30e9ace4b005266e4",
+ "sha256:f85d05aa0918283cf29a30b547b4df2fbb56b45b135f9e35b6807cb28bc47951",
+ "sha256:f9899c94762343f2cc2fc64c13e7cae4c3cc65cdfc87dd810a31654c9b7358cc"
],
"markers": "python_version >= '3.8'",
- "version": "==2.18.2"
+ "version": "==2.18.4"
},
"pytest": {
"hashes": [
- "sha256:1733f0620f6cda4095bbf0d9ff8022486e91892245bb9e7d5542c018f612f233",
- "sha256:d507d4482197eac0ba2bae2e9babf0672eb333017bcedaa5fb1a3d42c1174b3f"
+ "sha256:c434598117762e2bd304e526244f67bf66bbd7b5d6cf22138be51ff661980343",
+ "sha256:de4bb8104e201939ccdc688b27a89a7be2079b22e2bd2b07f806b6ba71117977"
],
"index": "pypi",
- "version": "==8.2.0"
+ "version": "==8.2.2"
},
"python-dateutil": {
"hashes": [
@@ -778,11 +792,11 @@
},
"requests": {
"hashes": [
- "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f",
- "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"
+ "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760",
+ "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"
],
- "markers": "python_version >= '3.7'",
- "version": "==2.31.0"
+ "markers": "python_version >= '3.8'",
+ "version": "==2.32.3"
},
"six": {
"hashes": [
@@ -824,11 +838,11 @@
},
"typing-extensions": {
"hashes": [
- "sha256:83f085bd5ca59c80295fc2a82ab5dac679cbe02b9f33f7d83af68e241bea51b0",
- "sha256:c1f94d72897edaf4ce775bb7558d5b79d8126906a14ea5ed1635921406c0387a"
+ "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d",
+ "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"
],
"markers": "python_version >= '3.8'",
- "version": "==4.11.0"
+ "version": "==4.12.2"
},
"tzdata": {
"hashes": [
@@ -840,11 +854,11 @@
},
"urllib3": {
"hashes": [
- "sha256:34b97092d7e0a3a8cf7cd10e386f401b3737364026c45e622aa02903dffe0f07",
- "sha256:f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0"
+ "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472",
+ "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"
],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
- "version": "==1.26.18"
+ "markers": "python_version >= '3.10'",
+ "version": "==2.2.2"
},
"werkzeug": {
"hashes": [
@@ -1030,61 +1044,61 @@
"develop": {
"coverage": {
"hashes": [
- "sha256:0646599e9b139988b63704d704af8e8df7fa4cbc4a1f33df69d97f36cb0a38de",
- "sha256:0cdcbc320b14c3e5877ee79e649677cb7d89ef588852e9583e6b24c2e5072661",
- "sha256:0d0a0f5e06881ecedfe6f3dd2f56dcb057b6dbeb3327fd32d4b12854df36bf26",
- "sha256:1434e088b41594baa71188a17533083eabf5609e8e72f16ce8c186001e6b8c41",
- "sha256:16db7f26000a07efcf6aea00316f6ac57e7d9a96501e990a36f40c965ec7a95d",
- "sha256:1cc0fe9b0b3a8364093c53b0b4c0c2dd4bb23acbec4c9240b5f284095ccf7981",
- "sha256:1fc81d5878cd6274ce971e0a3a18a8803c3fe25457165314271cf78e3aae3aa2",
- "sha256:2ec92012fefebee89a6b9c79bc39051a6cb3891d562b9270ab10ecfdadbc0c34",
- "sha256:39afcd3d4339329c5f58de48a52f6e4e50f6578dd6099961cf22228feb25f38f",
- "sha256:4a7b0ceee8147444347da6a66be737c9d78f3353b0681715b668b72e79203e4a",
- "sha256:4a9ca3f2fae0088c3c71d743d85404cec8df9be818a005ea065495bedc33da35",
- "sha256:4bf0655ab60d754491004a5efd7f9cccefcc1081a74c9ef2da4735d6ee4a6223",
- "sha256:4cc37def103a2725bc672f84bd939a6fe4522310503207aae4d56351644682f1",
- "sha256:4fc84a37bfd98db31beae3c2748811a3fa72bf2007ff7902f68746d9757f3746",
- "sha256:5037f8fcc2a95b1f0e80585bd9d1ec31068a9bcb157d9750a172836e98bc7a90",
- "sha256:54de9ef3a9da981f7af93eafde4ede199e0846cd819eb27c88e2b712aae9708c",
- "sha256:556cf1a7cbc8028cb60e1ff0be806be2eded2daf8129b8811c63e2b9a6c43bca",
- "sha256:57e0204b5b745594e5bc14b9b50006da722827f0b8c776949f1135677e88d0b8",
- "sha256:5a5740d1fb60ddf268a3811bcd353de34eb56dc24e8f52a7f05ee513b2d4f596",
- "sha256:5c3721c2c9e4c4953a41a26c14f4cef64330392a6d2d675c8b1db3b645e31f0e",
- "sha256:5fa567e99765fe98f4e7d7394ce623e794d7cabb170f2ca2ac5a4174437e90dd",
- "sha256:5fd215c0c7d7aab005221608a3c2b46f58c0285a819565887ee0b718c052aa4e",
- "sha256:6175d1a0559986c6ee3f7fccfc4a90ecd12ba0a383dcc2da30c2b9918d67d8a3",
- "sha256:61c4bf1ba021817de12b813338c9be9f0ad5b1e781b9b340a6d29fc13e7c1b5e",
- "sha256:6537e7c10cc47c595828b8a8be04c72144725c383c4702703ff4e42e44577312",
- "sha256:68f962d9b72ce69ea8621f57551b2fa9c70509af757ee3b8105d4f51b92b41a7",
- "sha256:7352b9161b33fd0b643ccd1f21f3a3908daaddf414f1c6cb9d3a2fd618bf2572",
- "sha256:796a79f63eca8814ca3317a1ea443645c9ff0d18b188de470ed7ccd45ae79428",
- "sha256:79afb6197e2f7f60c4824dd4b2d4c2ec5801ceb6ba9ce5d2c3080e5660d51a4f",
- "sha256:7a588d39e0925f6a2bff87154752481273cdb1736270642aeb3635cb9b4cad07",
- "sha256:8748731ad392d736cc9ccac03c9845b13bb07d020a33423fa5b3a36521ac6e4e",
- "sha256:8fe7502616b67b234482c3ce276ff26f39ffe88adca2acf0261df4b8454668b4",
- "sha256:9314d5678dcc665330df5b69c1e726a0e49b27df0461c08ca12674bcc19ef136",
- "sha256:9735317685ba6ec7e3754798c8871c2f49aa5e687cc794a0b1d284b2389d1bd5",
- "sha256:9981706d300c18d8b220995ad22627647be11a4276721c10911e0e9fa44c83e8",
- "sha256:9e78295f4144f9dacfed4f92935fbe1780021247c2fabf73a819b17f0ccfff8d",
- "sha256:b016ea6b959d3b9556cb401c55a37547135a587db0115635a443b2ce8f1c7228",
- "sha256:b6cf3764c030e5338e7f61f95bd21147963cf6aa16e09d2f74f1fa52013c1206",
- "sha256:beccf7b8a10b09c4ae543582c1319c6df47d78fd732f854ac68d518ee1fb97fa",
- "sha256:c0884920835a033b78d1c73b6d3bbcda8161a900f38a488829a83982925f6c2e",
- "sha256:c3e757949f268364b96ca894b4c342b41dc6f8f8b66c37878aacef5930db61be",
- "sha256:ca498687ca46a62ae590253fba634a1fe9836bc56f626852fb2720f334c9e4e5",
- "sha256:d1d0d98d95dd18fe29dc66808e1accf59f037d5716f86a501fc0256455219668",
- "sha256:d21918e9ef11edf36764b93101e2ae8cc82aa5efdc7c5a4e9c6c35a48496d601",
- "sha256:d7fed867ee50edf1a0b4a11e8e5d0895150e572af1cd6d315d557758bfa9c057",
- "sha256:db66fc317a046556a96b453a58eced5024af4582a8dbdc0c23ca4dbc0d5b3146",
- "sha256:dde0070c40ea8bb3641e811c1cfbf18e265d024deff6de52c5950677a8fb1e0f",
- "sha256:df4e745a81c110e7446b1cc8131bf986157770fa405fe90e15e850aaf7619bc8",
- "sha256:e2213def81a50519d7cc56ed643c9e93e0247f5bbe0d1247d15fa520814a7cd7",
- "sha256:ef48e2707fb320c8f139424a596f5b69955a85b178f15af261bab871873bb987",
- "sha256:f152cbf5b88aaeb836127d920dd0f5e7edff5a66f10c079157306c4343d86c19",
- "sha256:fc0b4d8bfeabd25ea75e94632f5b6e047eef8adaed0c2161ada1e922e7f7cece"
+ "sha256:018a12985185038a5b2bcafab04ab833a9a0f2c59995b3cec07e10074c78635f",
+ "sha256:02ff6e898197cc1e9fa375581382b72498eb2e6d5fc0b53f03e496cfee3fac6d",
+ "sha256:042183de01f8b6d531e10c197f7f0315a61e8d805ab29c5f7b51a01d62782747",
+ "sha256:1014fbf665fef86cdfd6cb5b7371496ce35e4d2a00cda501cf9f5b9e6fced69f",
+ "sha256:1137f46adb28e3813dec8c01fefadcb8c614f33576f672962e323b5128d9a68d",
+ "sha256:16852febd96acd953b0d55fc842ce2dac1710f26729b31c80b940b9afcd9896f",
+ "sha256:2174e7c23e0a454ffe12267a10732c273243b4f2d50d07544a91198f05c48f47",
+ "sha256:2214ee920787d85db1b6a0bd9da5f8503ccc8fcd5814d90796c2f2493a2f4d2e",
+ "sha256:3257fdd8e574805f27bb5342b77bc65578e98cbc004a92232106344053f319ba",
+ "sha256:3684bc2ff328f935981847082ba4fdc950d58906a40eafa93510d1b54c08a66c",
+ "sha256:3a6612c99081d8d6134005b1354191e103ec9705d7ba2754e848211ac8cacc6b",
+ "sha256:3d7564cc09dd91b5a6001754a5b3c6ecc4aba6323baf33a12bd751036c998be4",
+ "sha256:44da56a2589b684813f86d07597fdf8a9c6ce77f58976727329272f5a01f99f7",
+ "sha256:5013ed890dc917cef2c9f765c4c6a8ae9df983cd60dbb635df8ed9f4ebc9f555",
+ "sha256:54317c2b806354cbb2dc7ac27e2b93f97096912cc16b18289c5d4e44fc663233",
+ "sha256:56b4eafa21c6c175b3ede004ca12c653a88b6f922494b023aeb1e836df953ace",
+ "sha256:581ea96f92bf71a5ec0974001f900db495488434a6928a2ca7f01eee20c23805",
+ "sha256:5cd64adedf3be66f8ccee418473c2916492d53cbafbfcff851cbec5a8454b136",
+ "sha256:5df54843b88901fdc2f598ac06737f03d71168fd1175728054c8f5a2739ac3e4",
+ "sha256:65e528e2e921ba8fd67d9055e6b9f9e34b21ebd6768ae1c1723f4ea6ace1234d",
+ "sha256:6aae5cce399a0f065da65c7bb1e8abd5c7a3043da9dceb429ebe1b289bc07806",
+ "sha256:6cfb5a4f556bb51aba274588200a46e4dd6b505fb1a5f8c5ae408222eb416f99",
+ "sha256:7076b4b3a5f6d2b5d7f1185fde25b1e54eb66e647a1dfef0e2c2bfaf9b4c88c8",
+ "sha256:73ca8fbc5bc622e54627314c1a6f1dfdd8db69788f3443e752c215f29fa87a0b",
+ "sha256:79b356f3dd5b26f3ad23b35c75dbdaf1f9e2450b6bcefc6d0825ea0aa3f86ca5",
+ "sha256:7a892be37ca35eb5019ec85402c3371b0f7cda5ab5056023a7f13da0961e60da",
+ "sha256:8192794d120167e2a64721d88dbd688584675e86e15d0569599257566dec9bf0",
+ "sha256:820bc841faa502e727a48311948e0461132a9c8baa42f6b2b84a29ced24cc078",
+ "sha256:8f894208794b164e6bd4bba61fc98bf6b06be4d390cf2daacfa6eca0a6d2bb4f",
+ "sha256:a04e990a2a41740b02d6182b498ee9796cf60eefe40cf859b016650147908029",
+ "sha256:a44963520b069e12789d0faea4e9fdb1e410cdc4aab89d94f7f55cbb7fef0353",
+ "sha256:a6bb74ed465d5fb204b2ec41d79bcd28afccf817de721e8a807d5141c3426638",
+ "sha256:ab73b35e8d109bffbda9a3e91c64e29fe26e03e49addf5b43d85fc426dde11f9",
+ "sha256:aea072a941b033813f5e4814541fc265a5c12ed9720daef11ca516aeacd3bd7f",
+ "sha256:b1ccf5e728ccf83acd313c89f07c22d70d6c375a9c6f339233dcf792094bcbf7",
+ "sha256:b385d49609f8e9efc885790a5a0e89f2e3ae042cdf12958b6034cc442de428d3",
+ "sha256:b3d45ff86efb129c599a3b287ae2e44c1e281ae0f9a9bad0edc202179bcc3a2e",
+ "sha256:b4a474f799456e0eb46d78ab07303286a84a3140e9700b9e154cfebc8f527016",
+ "sha256:b95c3a8cb0463ba9f77383d0fa8c9194cf91f64445a63fc26fb2327e1e1eb088",
+ "sha256:c5986ee7ea0795a4095ac4d113cbb3448601efca7f158ec7f7087a6c705304e4",
+ "sha256:cdd31315fc20868c194130de9ee6bfd99755cc9565edff98ecc12585b90be882",
+ "sha256:cef4649ec906ea7ea5e9e796e68b987f83fa9a718514fe147f538cfeda76d7a7",
+ "sha256:d05c16cf4b4c2fc880cb12ba4c9b526e9e5d5bb1d81313d4d732a5b9fe2b9d53",
+ "sha256:d2e344d6adc8ef81c5a233d3a57b3c7d5181f40e79e05e1c143da143ccb6377d",
+ "sha256:d45d3cbd94159c468b9b8c5a556e3f6b81a8d1af2a92b77320e887c3e7a5d080",
+ "sha256:db14f552ac38f10758ad14dd7b983dbab424e731588d300c7db25b6f89e335b5",
+ "sha256:dbc5958cb471e5a5af41b0ddaea96a37e74ed289535e8deca404811f6cb0bc3d",
+ "sha256:ddbd2f9713a79e8e7242d7c51f1929611e991d855f414ca9996c20e44a895f7c",
+ "sha256:e16f3d6b491c48c5ae726308e6ab1e18ee830b4cdd6913f2d7f77354b33f91c8",
+ "sha256:e2afe743289273209c992075a5a4913e8d007d569a406ffed0bd080ea02b0633",
+ "sha256:e564c2cf45d2f44a9da56f4e3a26b2236504a496eb4cb0ca7221cd4cc7a9aca9",
+ "sha256:ed550e7442f278af76d9d65af48069f1fb84c9f745ae249c1a183c1e9d1b025c"
],
"index": "pypi",
- "version": "==7.5.1"
+ "version": "==7.5.4"
},
"iniconfig": {
"hashes": [
@@ -1096,11 +1110,11 @@
},
"packaging": {
"hashes": [
- "sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5",
- "sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9"
+ "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002",
+ "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124"
],
- "markers": "python_version >= '3.7'",
- "version": "==24.0"
+ "markers": "python_version >= '3.8'",
+ "version": "==24.1"
},
"pluggy": {
"hashes": [
@@ -1112,11 +1126,11 @@
},
"pytest": {
"hashes": [
- "sha256:1733f0620f6cda4095bbf0d9ff8022486e91892245bb9e7d5542c018f612f233",
- "sha256:d507d4482197eac0ba2bae2e9babf0672eb333017bcedaa5fb1a3d42c1174b3f"
+ "sha256:c434598117762e2bd304e526244f67bf66bbd7b5d6cf22138be51ff661980343",
+ "sha256:de4bb8104e201939ccdc688b27a89a7be2079b22e2bd2b07f806b6ba71117977"
],
"index": "pypi",
- "version": "==8.2.0"
+ "version": "==8.2.2"
}
}
}
diff --git a/dbrepo-search-service/init/app.py b/dbrepo-search-service/init/app.py
index cf2fb12b33aa5ffec44887f4b87de41723b2472a..fccbd92feaf8f9e3e904ca245e485ff4b8f8aa8e 100644
--- a/dbrepo-search-service/init/app.py
+++ b/dbrepo-search-service/init/app.py
@@ -40,7 +40,7 @@ class App:
"""
The client to communicate with the OpenSearch database.
"""
- gateway_endpoint: str = None
+ metadata_service_endpoint: str = None
search_host: str = None
search_port: int = None
search_username: str = None
@@ -48,11 +48,11 @@ class App:
search_instance: OpenSearch = None
def __init__(self):
- self.gateway_endpoint = os.getenv("GATEWAY_SERVICE_ENDPOINT", "http://localhost")
- self.search_host = os.getenv("OPENSEARCH_HOST", "localhost")
- self.search_port = int(os.getenv("OPENSEARCH_PORT", "9200"))
- self.search_username = os.getenv("OPENSEARCH_USERNAME", "admin")
- self.search_password = os.getenv("OPENSEARCH_PASSWORD", "admin")
+ self.metadata_service_endpoint = os.getenv("METADATA_SERVICE_ENDPOINT")
+ self.search_host = os.getenv("OPENSEARCH_HOST")
+ self.search_port = int(os.getenv("OPENSEARCH_PORT"))
+ self.search_username = os.getenv("OPENSEARCH_USERNAME")
+ self.search_password = os.getenv("OPENSEARCH_PASSWORD")
def _instance(self) -> OpenSearch:
"""
@@ -101,28 +101,30 @@ class App:
return True
def fetch_databases(self) -> List[Database]:
- client = RestClient(endpoint=self.gateway_endpoint)
- databases = client.get_databases()
+ client = RestClient(endpoint=self.metadata_service_endpoint)
+ databases = []
+ for database in client.get_databases():
+ databases.append(client.get_database(database_id=database.id))
logging.debug(f"fetched {len(databases)} database(s)")
return databases
- def save_databases(self, databases: List[Database], index_created: bool, index_updated: bool):
+ def save_databases(self, databases: List[Database]):
logging.debug(
- f"save {len(databases)} database(s), index_created={index_created}, index_updated={index_updated}")
+ f"save {len(databases)} database(s)")
for doc in databases:
doc: Database = doc
- if index_created:
- self._instance().create(index="database", id=doc.id, body=doc.model_dump())
- logging.info(f"Saved database with id {doc.id}")
- elif index_updated:
+ try:
self._instance().delete(index="database", id=doc.id)
- self._instance().create(index="database", id=doc.id, body=doc.model_dump())
- logging.info(f"Updated database with id {doc.id}")
+ logging.debug(f"deleted database with id {doc.id}")
+ except opensearchpy.NotFoundError:
+ logging.warning(f"Database with id {doc.id} does not exist, skip.")
+ self._instance().create(index="database", id=doc.id, body=doc.model_dump())
+ logging.debug(f"created database with id {doc.id}")
if __name__ == "__main__":
app = App()
create = not app.index_exists()
update = app.index_update(is_created=create)
- app.save_databases(databases=app.fetch_databases(), index_created=create, index_updated=update)
+ app.save_databases(databases=app.fetch_databases())
logging.info("Finished. Exiting.")
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.4.4-py3-none-any.whl b/dbrepo-search-service/init/lib/dbrepo-1.4.4-py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..617969c3eb15926d932b7c0180bed51b9ef7052d
Binary files /dev/null and b/dbrepo-search-service/init/lib/dbrepo-1.4.4-py3-none-any.whl differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.4.4.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.4.4.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..9d1d5ae238baba6bc51db4d219a0d09b5aca1c51
Binary files /dev/null and b/dbrepo-search-service/init/lib/dbrepo-1.4.4.tar.gz differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.4.5-py3-none-any.whl b/dbrepo-search-service/init/lib/dbrepo-1.4.5-py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..249fd5dc181271a3069745f5a6ef8a26de398037
Binary files /dev/null and b/dbrepo-search-service/init/lib/dbrepo-1.4.5-py3-none-any.whl differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.4.5.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.4.5.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..2f21496bd2280550f4242bbc0fff4a47116d6ad5
Binary files /dev/null and b/dbrepo-search-service/init/lib/dbrepo-1.4.5.tar.gz differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.4.4-py3-none-any.whl b/dbrepo-search-service/lib/dbrepo-1.4.4-py3-none-any.whl
index 503cfef91315990bbf06027d6de14c8b3184507b..617969c3eb15926d932b7c0180bed51b9ef7052d 100644
Binary files a/dbrepo-search-service/lib/dbrepo-1.4.4-py3-none-any.whl and b/dbrepo-search-service/lib/dbrepo-1.4.4-py3-none-any.whl differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.4.4.tar.gz b/dbrepo-search-service/lib/dbrepo-1.4.4.tar.gz
index 9a90176f0a093b05d89d1cd74cf701cd0730861a..9d1d5ae238baba6bc51db4d219a0d09b5aca1c51 100644
Binary files a/dbrepo-search-service/lib/dbrepo-1.4.4.tar.gz and b/dbrepo-search-service/lib/dbrepo-1.4.4.tar.gz differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.4.5-py3-none-any.whl b/dbrepo-search-service/lib/dbrepo-1.4.5-py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..249fd5dc181271a3069745f5a6ef8a26de398037
Binary files /dev/null and b/dbrepo-search-service/lib/dbrepo-1.4.5-py3-none-any.whl differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.4.5.tar.gz b/dbrepo-search-service/lib/dbrepo-1.4.5.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..2f21496bd2280550f4242bbc0fff4a47116d6ad5
Binary files /dev/null and b/dbrepo-search-service/lib/dbrepo-1.4.5.tar.gz differ
diff --git a/dbrepo-search-service/test/test_opensearch_client.py b/dbrepo-search-service/test/test_opensearch_client.py
index 906aae0ccc0862703abc740622d793ed8388192b..2bab038128fa7dd201dfcca81240f906358e37eb 100644
--- a/dbrepo-search-service/test/test_opensearch_client.py
+++ b/dbrepo-search-service/test/test_opensearch_client.py
@@ -3,49 +3,77 @@ import unittest
import opensearchpy
from dbrepo.api.dto import Database, User, UserAttributes, Container, Image, Table, Column, ColumnType, Constraints, \
- PrimaryKey, TableMinimal, ColumnMinimal
+ PrimaryKey, TableMinimal, ColumnMinimal, Concept, Unit
+
from app import app
from clients.opensearch_client import OpenSearchClient
+req = Database(id=1,
+ name="Test",
+ internal_name="test_tuw1",
+ creator=User(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
+ username="foo",
+ attributes=UserAttributes(theme="dark")),
+ owner=User(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
+ username="foo",
+ attributes=UserAttributes(theme="dark")),
+ contact=User(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
+ username="foo",
+ attributes=UserAttributes(theme="dark")),
+ created=datetime.datetime(2024, 3, 25, 16, tzinfo=datetime.timezone.utc),
+ exchange_name="dbrepo",
+ is_public=True,
+ container=Container(id=1,
+ name="MariaDB",
+ internal_name="mariadb",
+ host="data-db",
+ port="3306",
+ created=datetime.datetime(2024, 3, 1, 10, tzinfo=datetime.timezone.utc),
+ sidecar_host="data-db-sidecar",
+ sidecar_port=3305,
+ image=Image(id=1,
+ registry="docker.io",
+ name="mariadb",
+ version="11.1.3",
+ dialect="org.hibernate.dialect.MariaDBDialect",
+ driver_class="org.mariadb.jdbc.Driver",
+ jdbc_method="mariadb",
+ default_port=3306)),
+ tables=[Table(id=1, database_id=1, name="Data", internal_name="data",
+ creator=User(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
+ username="foo",
+ attributes=UserAttributes(theme="dark")),
+ owner=User(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
+ username="foo",
+ attributes=UserAttributes(theme="dark")),
+ created=datetime.datetime(2024, 3, 1, 10, tzinfo=datetime.timezone.utc),
+ constraints=Constraints(uniques=[], foreign_keys=[], checks=[], primary_key=[]),
+ is_versioned=False,
+ created_by="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
+ queue_name="dbrepo",
+ routing_key="dbrepo.1.1",
+ is_public=True,
+ columns=[Column(id=1, database_id=1, table_id=1, name="ID", internal_name="id",
+ auto_generated=True, column_type=ColumnType.BIGINT, is_public=True,
+ is_null_allowed=False, size=20, d=0,
+ concept=Concept(id=1, uri="http://www.wikidata.org/entity/Q2221906",
+ created=datetime.datetime(2024, 3, 1, 10,
+ tzinfo=datetime.timezone.utc)),
+ unit=Unit(id=1,
+ uri="http://www.ontology-of-units-of-measure.org/resource/om-2/degreeCelsius",
+ created=datetime.datetime(2024, 3, 1, 10,
+ tzinfo=datetime.timezone.utc)),
+ val_min=0,
+ val_max=10)]
+ )])
+
class OpenSearchClientTest(unittest.TestCase):
def test_update_database_succeeds(self):
with app.app_context():
client = OpenSearchClient()
- req = Database(id=1,
- name="Test",
- internal_name="test_tuw1",
- creator=User(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
- username="foo",
- attributes=UserAttributes(theme="dark")),
- owner=User(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
- username="foo",
- attributes=UserAttributes(theme="dark")),
- contact=User(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
- username="foo",
- attributes=UserAttributes(theme="dark")),
- created=datetime.datetime(2024, 3, 25, 16, tzinfo=datetime.timezone.utc),
- exchange_name="dbrepo",
- is_public=True,
- container=Container(id=1,
- name="MariaDB",
- internal_name="mariadb",
- host="data-db",
- port="3306",
- created=datetime.datetime(2024, 3, 1, 10, tzinfo=datetime.timezone.utc),
- sidecar_host="data-db-sidecar",
- sidecar_port=3305,
- image=Image(id=1,
- registry="docker.io",
- name="mariadb",
- version="11.1.3",
- dialect="org.hibernate.dialect.MariaDBDialect",
- driver_class="org.mariadb.jdbc.Driver",
- jdbc_method="mariadb",
- default_port=3306)),
- tables=[])
# mock
client.update_database(database_id=1, data=req)
@@ -132,38 +160,6 @@ class OpenSearchClientTest(unittest.TestCase):
def test_update_database_create_succeeds(self):
with app.app_context():
client = OpenSearchClient()
- req = Database(id=1,
- name="Test",
- internal_name="test_tuw1",
- creator=User(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
- username="foo",
- attributes=UserAttributes(theme="dark")),
- owner=User(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
- username="foo",
- attributes=UserAttributes(theme="dark")),
- contact=User(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
- username="foo",
- attributes=UserAttributes(theme="dark")),
- created=datetime.datetime(2024, 3, 25, 16, tzinfo=datetime.timezone.utc),
- exchange_name="dbrepo",
- is_public=True,
- container=Container(id=1,
- name="MariaDB",
- internal_name="mariadb",
- host="data-db",
- port="3306",
- created=datetime.datetime(2024, 3, 1, 10, tzinfo=datetime.timezone.utc),
- sidecar_host="data-db-sidecar",
- sidecar_port=3305,
- image=Image(id=1,
- registry="docker.io",
- name="mariadb",
- version="11.1.3",
- dialect="org.hibernate.dialect.MariaDBDialect",
- driver_class="org.mariadb.jdbc.Driver",
- jdbc_method="mariadb",
- default_port=3306)),
- tables=[])
# test
database = client.update_database(database_id=1, data=req)
@@ -186,7 +182,18 @@ class OpenSearchClientTest(unittest.TestCase):
# ...
self.assertEqual(1, database.container.image.id)
# ...
- self.assertEqual(0, len(database.tables))
+ self.assertEqual(1, len(database.tables))
+
+ def test_update_database_malformed_fails(self):
+ with app.app_context():
+ app.config['OPENSEARCH_USERNAME'] = 'i_do_not_exist'
+ client = OpenSearchClient()
+
+ # test
+ try:
+ database = client.update_database(database_id=1, data=req)
+ except opensearchpy.exceptions.TransportError:
+ pass
def test_delete_database_fails(self):
with app.app_context():
@@ -201,38 +208,6 @@ class OpenSearchClientTest(unittest.TestCase):
def test_delete_database_succeeds(self):
with app.app_context():
client = OpenSearchClient()
- req = Database(id=1,
- name="Test",
- internal_name="test_tuw1",
- creator=User(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
- username="foo",
- attributes=UserAttributes(theme="dark")),
- owner=User(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
- username="foo",
- attributes=UserAttributes(theme="dark")),
- contact=User(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
- username="foo",
- attributes=UserAttributes(theme="dark")),
- created=datetime.datetime(2024, 3, 25, 16, 0, tzinfo=datetime.timezone.utc),
- exchange_name="dbrepo",
- is_public=True,
- container=Container(id=1,
- name="MariaDB",
- internal_name="mariadb",
- host="data-db",
- port="3306",
- created=datetime.datetime(2024, 3, 1, 10, tzinfo=datetime.timezone.utc),
- sidecar_host="data-db-sidecar",
- sidecar_port=3305,
- image=Image(id=1,
- registry="docker.io",
- name="mariadb",
- version="11.1.3",
- dialect="org.hibernate.dialect.MariaDBDialect",
- driver_class="org.mariadb.jdbc.Driver",
- jdbc_method="mariadb",
- default_port=3306)),
- tables=[])
# mock
client.update_database(database_id=req.id, data=req)
@@ -243,38 +218,6 @@ class OpenSearchClientTest(unittest.TestCase):
def test_find_database_succeeds(self):
with app.app_context():
client = OpenSearchClient()
- req = Database(id=1,
- name="Test",
- internal_name="test_tuw1",
- creator=User(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
- username="foo",
- attributes=UserAttributes(theme="dark")),
- owner=User(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
- username="foo",
- attributes=UserAttributes(theme="dark")),
- contact=User(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
- username="foo",
- attributes=UserAttributes(theme="dark")),
- created=datetime.datetime(2024, 3, 25, 16, tzinfo=datetime.timezone.utc),
- exchange_name="dbrepo",
- is_public=True,
- container=Container(id=1,
- name="MariaDB",
- internal_name="mariadb",
- host="data-db",
- port="3306",
- created=datetime.datetime(2024, 3, 1, 10, tzinfo=datetime.timezone.utc),
- sidecar_host="data-db-sidecar",
- sidecar_port=3305,
- image=Image(id=1,
- registry="docker.io",
- name="mariadb",
- version="11.1.3",
- dialect="org.hibernate.dialect.MariaDBDialect",
- driver_class="org.mariadb.jdbc.Driver",
- jdbc_method="mariadb",
- default_port=3306)),
- tables=[])
# mock
client.update_database(database_id=req.id, data=req)
@@ -286,8 +229,83 @@ class OpenSearchClientTest(unittest.TestCase):
with app.app_context():
client = OpenSearchClient()
+ # mock
+ client.update_database(database_id=1, data=req)
+
# test
try:
client.get_database(database_id=1)
except opensearchpy.exceptions.NotFoundError:
pass
+
+ # def test_query_index_by_term_opensearch_contains_succeeds(self):
+ # with app.app_context():
+ # client = OpenSearchClient()
+ #
+ # # mock
+ # client.update_database(database_id=1, data=req)
+ #
+ # # test
+ # response = client.query_index_by_term_opensearch(term="test", mode="contains")
+ # self.assertEqual(1, len(response))
+ # self.assertEqual(1, response[0]['id'])
+ # self.assertEqual('Test', response[0]['name'])
+
+ # def test_query_index_by_term_opensearch_exact_succeeds(self):
+ # with app.app_context():
+ # client = OpenSearchClient()
+ #
+ # # mock
+ # client.update_database(database_id=1, data=req)
+ #
+ # # test
+ # response = client.query_index_by_term_opensearch(term="test", mode="exact")
+ # self.assertEqual(1, len(response))
+ # self.assertEqual(1, response[0]['id'])
+ # self.assertEqual('Test', response[0]['name'])
+
+ def test_get_fields_for_index_database_succeeds(self):
+ with app.app_context():
+ client = OpenSearchClient()
+
+ # mock
+ client.update_database(database_id=1, data=req)
+
+ # test
+ response = client.get_fields_for_index(type="database")
+ self.assertTrue(len(response) > 0)
+
+ def test_get_fields_for_index_user_succeeds(self):
+ with app.app_context():
+ client = OpenSearchClient()
+
+ # mock
+ client.update_database(database_id=1, data=req)
+
+ # test
+ response = client.get_fields_for_index(type="user")
+ self.assertTrue(len(response) > 0)
+
+ def test_fuzzy_search_succeeds(self):
+ with app.app_context():
+ client = OpenSearchClient()
+
+ # mock
+ client.update_database(database_id=1, data=req)
+
+ # test
+ response = client.fuzzy_search(search_term="test")
+ self.assertTrue(len(response) > 0)
+
+ # def test_general_search_succeeds(self):
+ # with app.app_context():
+ # client = OpenSearchClient()
+ #
+ # # mock
+ # client.update_database(database_id=1, data=req)
+ #
+ # # test
+ # response = client.general_search(type="database", field_value_pairs={"name": "Test",
+ # "id": None})
+ # self.assertTrue(len(response) > 0)
+
diff --git a/dbrepo-storage-service/init/Dockerfile b/dbrepo-storage-service/init/Dockerfile
index 72b080d6ce059260eb16f3a703ec45dd0d77d8c6..4a35534fb2f2261c4d732007cd013a80c3064b0b 100644
--- a/dbrepo-storage-service/init/Dockerfile
+++ b/dbrepo-storage-service/init/Dockerfile
@@ -1,4 +1,4 @@
-FROM chrislusf/seaweedfs:3.59 as runtime
+FROM chrislusf/seaweedfs:3.59 AS runtime
WORKDIR /app
diff --git a/dbrepo-storage-service/init/create-buckets.sh b/dbrepo-storage-service/init/create-buckets.sh
index 28fdb5b5b9f79427b650203989a84c5f06c71210..316a4cf11ee824101e7c23d688387dabf143bff7 100644
--- a/dbrepo-storage-service/init/create-buckets.sh
+++ b/dbrepo-storage-service/init/create-buckets.sh
@@ -1,11 +1,11 @@
#!/bin/bash
+S3_BUCKET=${S3_BUCKET:-dbrepo}
+
function log {
echo "$(date '+%Y-%m-%d %H:%M:%S') $1"
}
-log "SeaweedFS master is set to ${SEAWEEDFS_ENDPOINT}"
-log "Starting to create buckets dbrepo-upload, dbrepo-download"
-echo "s3.bucket.create -name dbrepo-upload" | weed shell -master="${SEAWEEDFS_ENDPOINT}"
-log "Created bucket dbrepo-upload"
-echo "s3.bucket.create -name dbrepo-download" | weed shell -master="${SEAWEEDFS_ENDPOINT}"
-log "Created bucket dbrepo-download"
\ No newline at end of file
+log "SeaweedFS master is set to ${WEED_CLUSTER_SW_MASTER}"
+log "Starting to create bucket ${S3_BUCKET}"
+echo "s3.bucket.create -name ${S3_BUCKET}" | weed shell -master="${WEED_CLUSTER_SW_MASTER}"
+log "Created bucket ${S3_BUCKET}"
diff --git a/dbrepo-ui/Dockerfile b/dbrepo-ui/Dockerfile
index 14f1e57c1ecdbe729040dd929b5842ced137e6b4..33f62cce86a6c5f794db08c0555a8b2ffeb4a935 100644
--- a/dbrepo-ui/Dockerfile
+++ b/dbrepo-ui/Dockerfile
@@ -1,10 +1,8 @@
-FROM oven/bun:1.0.26-alpine as build
-MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
+FROM oven/bun:1.0.26-alpine AS build
WORKDIR /app
COPY ./package.json ./package.json
-COPY ./bun.lockb ./bun.lockb
RUN bun install
@@ -26,8 +24,7 @@ COPY ./nuxt.config.ts ./nuxt.config.ts
RUN bun run build
-FROM oven/bun:1.0.26-alpine as runtime
-MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
+FROM oven/bun:1.0.26-alpine AS runtime
ARG APP_VERSION="latest"
ARG COMMIT=""
@@ -36,7 +33,9 @@ USER 1000
WORKDIR /app
-COPY --from=build --chown=1000:1000 /app/.output /app/.output
+COPY --from=build --chown=1000 /app/.output /app/.output
+
+RUN chmod -R 755 /app/.output
ENV NUXT_PUBLIC_VERSION="${APP_VERSION:-}"
ENV NUXT_PUBLIC_COMMIT="${COMMIT:-}"
diff --git a/dbrepo-ui/bun.lockb b/dbrepo-ui/bun.lockb
index 2ae1649f86a2cfc2d75d6e45a0c9490ad434ae02..34e1f3dd06864bd64d099c2212a7b45cb5140d8f 100755
Binary files a/dbrepo-ui/bun.lockb and b/dbrepo-ui/bun.lockb differ
diff --git a/dbrepo-ui/components/database/DatabaseCreate.vue b/dbrepo-ui/components/database/DatabaseCreate.vue
index f7e2b005974e15afe7aeab285fd006ca5410baf3..275b7198311f6edc62aeefb07311e2d01fea771c 100644
--- a/dbrepo-ui/components/database/DatabaseCreate.vue
+++ b/dbrepo-ui/components/database/DatabaseCreate.vue
@@ -113,9 +113,12 @@ export default {
this.loadingContainers = false
})
.catch(({code}) => {
+ this.loadingContainers = false
const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ return
+ }
toast.error(this.$t(code))
- this.loadingContainers = false
})
},
create () {
@@ -128,9 +131,12 @@ export default {
this.loading = false
})
.catch(({code}) => {
+ this.loading = false
const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ return
+ }
toast.error(this.$t(code))
- this.loading = false
})
},
notEmpty
diff --git a/dbrepo-ui/components/database/DatabaseToolbar.vue b/dbrepo-ui/components/database/DatabaseToolbar.vue
index 3597876609f79e42cd40a1951f729a61fab5663b..5a86bbaa01410fb068533930af6636fc9f20d1d7 100644
--- a/dbrepo-ui/components/database/DatabaseToolbar.vue
+++ b/dbrepo-ui/components/database/DatabaseToolbar.vue
@@ -15,7 +15,7 @@
bottom>
<template v-slot:activator="{ props }">
<v-icon
- class="ml-2"
+ class="mr-2"
size="small"
right
:color="database.is_public ? 'success' : 'chip'"
@@ -33,20 +33,13 @@
color="tertiary"
:variant="buttonVariant"
:text="$t('toolbars.database.dashboard.permanent') + ($vuetify.display.lgAndUp ? ' ' + $t('toolbars.database.dashboard.xl') : '')" />
- <v-btn
- v-if="canImportCsv"
- :prepend-icon="$vuetify.display.lgAndUp ? 'mdi-cloud-upload' : null"
- color="tertiary"
- :variant="buttonVariant"
- :text="$t('toolbars.database.import-csv.permanent') + ($vuetify.display.lgAndUp ? ' ' + $t('toolbars.database.import-csv.xl') : '')"
- :to="`/database/${$route.params.database_id}/table/import`" />
<v-btn
v-if="canCreateSubset"
:prepend-icon="$vuetify.display.lgAndUp ? 'mdi-wrench' : null"
color="secondary"
variant="flat"
:text="($vuetify.display.lgAndUp ? $t('toolbars.database.create-subset.xl') + ' ' : '') + $t('toolbars.database.create-subset.permanent')"
- class="ml-2 white--text"
+ class="mr-2 white--text"
:to="`/database/${$route.params.database_id}/subset/create`" />
<v-btn
v-if="canCreateView"
@@ -54,7 +47,7 @@
color="secondary"
variant="flat"
:text="($vuetify.display.lgAndUp ? $t('toolbars.database.create-view.xl') + ' ' : '') + $t('toolbars.database.create-view.permanent')"
- class="ml-2 white--text"
+ class="mr-2 white--text"
:to="`/database/${$route.params.database_id}/view/create`" />
<v-btn
v-if="canCreateTable"
@@ -62,15 +55,15 @@
color="secondary"
variant="flat"
:text="($vuetify.display.lgAndUp ? $t('toolbars.database.create-table.xl') + ' ' : '') + $t('toolbars.database.create-table.permanent')"
- class="ml-2"
- :to="`/database/${$route.params.database_id}/table/create`" />
+ class="mr-2"
+ :to="`/database/${$route.params.database_id}/table/create/dataset`" />
<v-btn
v-if="canCreateIdentifier"
:prepend-icon="$vuetify.display.lgAndUp ? 'mdi-identifier' : null"
color="primary"
variant="flat"
:text="($vuetify.display.lgAndUp ? $t('toolbars.database.create-pid.xl') + ' ' : '') + $t('toolbars.database.create-pid.permanent')"
- class="ml-2"
+ class="mr-2"
:to="`/database/${$route.params.database_id}/persist`" />
<template v-slot:extension>
<v-tabs
diff --git a/dbrepo-ui/components/dialogs/EditTuple.vue b/dbrepo-ui/components/dialogs/EditTuple.vue
index 3f40a93175b6f3515f9e8b15500ac183cfe95769..589c82b9b7aee5d2678e9ceab8249618878ced3f 100644
--- a/dbrepo-ui/components/dialogs/EditTuple.vue
+++ b/dbrepo-ui/components/dialogs/EditTuple.vue
@@ -169,6 +169,7 @@ export default {
return {
valid: false,
loading: false,
+ oldTuple: null,
error: false,
menu: false,
bools: [
@@ -177,6 +178,9 @@ export default {
]
}
},
+ mounted() {
+ this.oldTuple = Object.assign({}, this.tuple)
+ },
computed: {
title () {
return (this.edit ? this.$t('toolbars.table.data.edit') : this.$t('toolbars.table.data.add')) + ' ' + this.$t('toolbars.table.data.tuple')
@@ -272,10 +276,19 @@ export default {
},
updateTuple () {
const constraints = {}
- this.table.constraints.primary_key
- .forEach((pk) => {
- constraints[pk] = this.tuple[pk]
- })
+ if (this.table.constraints.primary_key.length > 0) {
+ this.table.constraints.primary_key
+ .forEach((pk) => {
+ constraints[pk.column.internal_name] = this.oldTuple[pk.column.internal_name]
+ })
+ console.debug('table has primary key: set update tuple constraints', constraints)
+ } else {
+ this.table.columns
+ .forEach((column) => {
+ constraints[column.internal_name] = this.oldTuple[column.internal_name]
+ })
+ console.debug('table does not have a primary key: set update tuple constraints', constraints)
+ }
const tupleService = useTupleService()
this.loading = true
tupleService.update(this.$route.params.database_id, this.$route.params.table_id, { data: this.tuple, keys: constraints })
diff --git a/dbrepo-ui/components/identifier/Citation.vue b/dbrepo-ui/components/identifier/Citation.vue
index ca5d2da00fcfa2a5d8d64403fdb606896f7a1c4f..8cd96902d48009da22cd761849be1962ba07c248 100644
--- a/dbrepo-ui/components/identifier/Citation.vue
+++ b/dbrepo-ui/components/identifier/Citation.vue
@@ -63,8 +63,11 @@ export default {
identifierService.findOne(this.identifier.id, accept)
.then((citation) => {
this.citation = citation
+ this.loading = false
})
- .finally(() => {
+ .error(({code, message}) => {
+ const toast = useToastInstance()
+ toast.error(this.$t(`${code}: ${message}`))
this.loading = false
})
}
diff --git a/dbrepo-ui/components/identifier/Persist.vue b/dbrepo-ui/components/identifier/Persist.vue
index 3b9321ad3644bcbf9fb55d24cf6725b0dedeb21d..0de61931265d5359c07637d935aa9101a1ebca6a 100644
--- a/dbrepo-ui/components/identifier/Persist.vue
+++ b/dbrepo-ui/components/identifier/Persist.vue
@@ -1362,9 +1362,12 @@ export default {
this.loadingSave = false
})
.catch(({code}) => {
+ this.loadingSave = false
const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ return
+ }
toast.error(this.$t(code))
- this.loadingSave = false
})
.finally(() => {
this.loadingSave = false
@@ -1384,9 +1387,12 @@ export default {
this.loadingSave = false
})
.catch(({code}) => {
+ this.loadingSave = false
const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ return
+ }
toast.error(this.$t(code))
- this.loadingSave = false
})
.finally(() => {
this.loadingSave = false
diff --git a/dbrepo-ui/components/subset/Builder.vue b/dbrepo-ui/components/subset/Builder.vue
index e8e60d6559de7a401ac53e9aa769733045145ea7..7c30fd8f5a488cee4173f710e50e50e0154e9210 100644
--- a/dbrepo-ui/components/subset/Builder.vue
+++ b/dbrepo-ui/components/subset/Builder.vue
@@ -10,10 +10,10 @@
:text="title" />
<v-spacer />
<v-btn
- v-if="user"
:disabled="!canExecute"
color="secondary"
variant="flat"
+ class="mr-2"
:loading="loadingQuery"
:prepend-icon="$vuetify.display.lgAndUp ? 'mdi-run' : null"
:text="$t('navigation.create')"
@@ -52,11 +52,13 @@
clearable
persistent-hint
:variant="inputVariant"
+ required
+ :rules="[
+ v => !!v || $t('validation.required'),
+ v => !validViewName(v) || $t('validation.view.exists')
+ ]"
:label="$t('pages.view.subpages.create.name.label')"
- :hint="$t('pages.view.subpages.create.name.hint')"
- :rules="[v => !!v || $t('validation.required'),
- v => !validViewName(v) || $t('validation.view.exists')]"
- required />
+ :hint="$t('pages.view.subpages.create.name.hint')" />
</v-col>
</v-row>
<v-row
@@ -80,9 +82,11 @@
:variant="inputVariant"
required
clearable
+ :rules="[
+ v => !!v || $t('validation.required')
+ ]"
:label="$t('pages.view.subpages.create.visibility.label')"
- :hint="$t('pages.view.subpages.create.visibility.hint')"
- :rules="[v => !!v || $t('validation.required')]" />
+ :hint="$t('pages.view.subpages.create.visibility.hint')" />
</v-col>
</v-row>
<v-window
@@ -219,21 +223,6 @@
</div>
</div>
</div>
- <v-row
- dense>
- <v-col
- v-text="$t('pages.subset.subpages.create.generated')" />
- </v-row>
- <v-row
- id="query-raw"
- dense>
- <v-col>
- <Raw
- :value="query.formatted"
- disabled
- class="mt-2" />
- </v-col>
- </v-row>
</v-window-item>
<v-window-item
value="1">
@@ -509,9 +498,12 @@ export default {
this.loadingQuery = false
})
.catch(({code}) => {
+ this.loadingQuery = false
const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ return
+ }
toast.error(this.$t(code))
- this.loadingQuery = false
})
},
createView () {
@@ -528,9 +520,12 @@ export default {
this.loadingQuery = false
})
.catch(({code}) => {
+ this.loadingQuery = false
const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ return
+ }
toast.error(this.$t(code))
- this.loadingQuery = false
})
},
buildQuery () {
diff --git a/dbrepo-ui/components/subset/Results.vue b/dbrepo-ui/components/subset/Results.vue
index ed6f7448334ae631d400e354832947e9d095c0fa..95becef12c4f0e5116345f1ade444fb36f350fb3 100644
--- a/dbrepo-ui/components/subset/Results.vue
+++ b/dbrepo-ui/components/subset/Results.vue
@@ -95,9 +95,12 @@ export default {
this.loadingExecute = false
})
.catch(({code}) => {
+ this.loadingExecute = false
const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ return
+ }
toast.error(this.$t(code))
- this.loadingExecute = false
})
.finally(() => {
this.loadingExecute = false
@@ -111,9 +114,12 @@ export default {
this.loadingExecute = false
})
.catch(({code}) => {
+ this.loadingExecute = false
const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ return
+ }
toast.error(this.$t(code))
- this.loadingExecute = false
})
.finally(() => {
this.loadingExecute = false
@@ -133,9 +139,12 @@ export default {
this.loadingCount = false
})
.catch(({code}) => {
+ this.loadingCount = false
const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ return
+ }
toast.error(this.$t(code))
- this.loadingCount = false
})
.finally(() => {
this.loadingCount = false
@@ -148,9 +157,12 @@ export default {
this.loadingCount = false
})
.catch(({code}) => {
+ this.loadingCount = false
const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ return
+ }
toast.error(this.$t(code))
- this.loadingCount = false
})
.finally(() => {
this.loadingCount = false
diff --git a/dbrepo-ui/components/subset/SubsetList.vue b/dbrepo-ui/components/subset/SubsetList.vue
index 94c1bff1e82f0932f86e0aff7ebd3bac9d74a539..21d4e7263eedd942f8abfec1470dd3a13af9d53e 100644
--- a/dbrepo-ui/components/subset/SubsetList.vue
+++ b/dbrepo-ui/components/subset/SubsetList.vue
@@ -81,9 +81,12 @@ export default {
this.queries = queries
})
.catch(({code}) => {
+ this.loadingSubsets = false
const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ return
+ }
toast.error(this.$t(code))
- this.loadingSubsets = false
})
.finally(() => {
this.loadingSubsets = false
diff --git a/dbrepo-ui/components/table/BlobUpload.vue b/dbrepo-ui/components/table/BlobUpload.vue
index d0b1ceb49713e01a19c7b6b80f42bf92bbf47467..4973c6b76eabdf4535426a54c35b766aa632a1f7 100644
--- a/dbrepo-ui/components/table/BlobUpload.vue
+++ b/dbrepo-ui/components/table/BlobUpload.vue
@@ -31,17 +31,20 @@ export default {
if (!this.file || this.file.length === 0) {
return
}
+ console.debug('upload file', this.file)
const uploadService = useUploadService()
- uploadService.create(this.file[0])
+ uploadService.create(this.file)
.then((filename) => {
console.debug('uploaded file', filename)
this.filename = filename
this.value = filename
this.$emit('blob', { column: this.column, s3key: filename })
})
- .catch(({code}) => {
+ .catch((error) => {
+ console.error('Failed to upload dataset', error)
const toast = useToastInstance()
- toast.error(this.$t(code))
+ toast.error(this.$t('error.upload.dataset'))
+ this.loading = false
})
}
}
diff --git a/dbrepo-ui/components/table/TableImport.vue b/dbrepo-ui/components/table/TableImport.vue
index 3688c4d9e3b4603b3be6929c86ec28b115b31af5..22f708175134d40bc50b3c630a3431181c40018a 100644
--- a/dbrepo-ui/components/table/TableImport.vue
+++ b/dbrepo-ui/components/table/TableImport.vue
@@ -2,15 +2,16 @@
<div>
<v-stepper-header>
<v-stepper-item
- :title="$t('pages.table.subpages.import.dataset.title')"
+ :title="$t('pages.table.subpages.import.schema.title')"
:complete="validStep1"
- :value="stepStart"/>
+ :value="1"/>
</v-stepper-header>
<v-stepper-window
direction="vertical">
<v-form
ref="form"
v-model="validStep1"
+ :disabled="disabled"
@submit.prevent="submit">
<v-container>
<v-row dense>
@@ -122,102 +123,149 @@
<v-stepper-item
:title="$t('pages.table.subpages.import.file.title')"
:complete="validStep2"
- :value="stepStart+1"/>
+ :value="2" />
</v-stepper-header>
<v-stepper-window
direction="vertical">
- <v-form
- ref="form"
- v-model="validStep2"
- @submit.prevent="submit">
- <v-container>
- <v-row
- v-if="step > 1 && suggestedAnalyseSeparator && providedSeparator !== analysedSeparator"
- dense>
- <v-col>
- <v-alert
- border="start"
- color="warning">
- {{ $t('pages.table.subpages.import.separator.warn.prefix') }}
- <strong v-text="tableImport.separator"/>
- {{ $t('pages.table.subpages.import.separator.warn.middle') }}
- <strong v-text="suggestedAnalyseSeparator"/>
- {{ $t('pages.table.subpages.import.separator.warn.suffix') }}
- </v-alert>
- </v-col>
- </v-row>
- <v-row
- v-if="step > 1 && suggestedAnalyseLineTerminator && providedTerminator !== analysedTerminator"
- dense>
- <v-col>
- <v-alert
- border="start"
- color="warning">
- {{ $t('pages.table.subpages.import.terminator.warn.prefix') }}
- <strong>{{ JSON.stringify(tableImport.line_termination).replaceAll('"', '') }}</strong>
- {{ $t('pages.table.subpages.import.terminator.warn.middle') }}
- <strong>{{ JSON.stringify(suggestedAnalyseLineTerminator).replaceAll('"', '') }}</strong>
- {{ $t('pages.table.subpages.import.terminator.warn.suffix') }}
- </v-alert>
- </v-col>
- </v-row>
- <v-row
- v-if="!hasCompatibleSchema"
- dense>
- <v-col>
- <v-alert
- border="start"
- color="warning"
- :text="$t('pages.table.subpages.import.dataset.warn')"/>
- </v-col>
- </v-row>
- <v-row>
- <v-col cols="8">
- <v-file-input
- v-model="fileModel"
- accept=".csv,.tsv"
- :show-size="1000"
- counter
- required
- :rules="[
- v => notFile(v) || $t('validation.required'),
- ]"
- :prepend-icon="validStep1 ? 'mdi-database-check-outline' : 'mdi-database-arrow-up-outline'"
- persistent-hint
- :variant="inputVariant"
- :hint="$t('pages.table.subpages.import.file.hint')"
- :label="$t('pages.table.subpages.import.file.label')" />
- </v-col>
- </v-row>
- <v-row>
- <v-col cols="8">
- <v-btn
- :disabled="!isAnalyseAllowed || !validStep1 || !validStep2"
- :loading="loading"
- :variant="buttonVariant"
- color="secondary"
- size="small"
- :text="$t('pages.table.subpages.import.analyse.text')"
- @click="uploadAndAnalyse"/>
- </v-col>
- </v-row>
+ <v-container>
+ <v-row
+ v-if="$route.query.location"
+ dense>
+ <v-col>
+ <p
+ v-text="$t('pages.table.subpages.import.storage.text')" />
+ <v-chip
+ prepend-icon="mdi-cloud-upload"
+ label>
+ {{ $route.query.location }}
+ </v-chip>
+ </v-col>
+ </v-row>
+ <v-form
+ v-if="!$route.query.location"
+ ref="form"
+ v-model="validStep2"
+ :disabled="disabled"
+ @submit.prevent="submit">
+ <v-row
+ v-if="step > 1 && suggestedAnalyseSeparator && providedSeparator !== analysedSeparator"
+ dense>
+ <v-col>
+ <v-alert
+ border="start"
+ color="warning">
+ {{ $t('pages.table.subpages.import.separator.warn.prefix') }}
+ <strong v-text="tableImport.separator"/>
+ {{ $t('pages.table.subpages.import.separator.warn.middle') }}
+ <strong v-text="suggestedAnalyseSeparator"/>
+ {{ $t('pages.table.subpages.import.separator.warn.suffix') }}
+ </v-alert>
+ </v-col>
+ </v-row>
+ <v-row
+ v-if="step > 1 && suggestedAnalyseLineTerminator && providedTerminator !== analysedTerminator"
+ dense>
+ <v-col>
+ <v-alert
+ border="start"
+ color="warning">
+ {{ $t('pages.table.subpages.import.terminator.warn.prefix') }}
+ <strong>{{ JSON.stringify(tableImport.line_termination).replaceAll('"', '') }}</strong>
+ {{ $t('pages.table.subpages.import.terminator.warn.middle') }}
+ <strong>{{ JSON.stringify(suggestedAnalyseLineTerminator).replaceAll('"', '') }}</strong>
+ {{ $t('pages.table.subpages.import.terminator.warn.suffix') }}
+ </v-alert>
+ </v-col>
+ </v-row>
+ <v-row
+ v-if="!hasCompatibleSchema"
+ dense>
+ <v-col
+ md="8">
+ <v-alert
+ border="start"
+ color="warning"
+ :text="$t('pages.table.subpages.import.dataset.warn')"/>
+ </v-col>
+ </v-row>
+ <v-row
+ v-if="!$route.query.location"
+ dense>
+ <v-col cols="8">
+ <v-file-input
+ v-model="file"
+ accept=".csv,.tsv"
+ :show-size="1000"
+ counter
+ required
+ :rules="[
+ v => notFile(v) || $t('validation.required'),
+ ]"
+ :prepend-icon="validStep1 ? 'mdi-database-check-outline' : 'mdi-database-arrow-up-outline'"
+ persistent-hint
+ :variant="inputVariant"
+ :hint="$t('pages.table.subpages.import.file.hint')"
+ :label="$t('pages.table.subpages.import.file.label')" />
+ </v-col>
+ </v-row>
+ <v-row
+ dense>
+ <v-col
+ cols="8">
+ <v-btn
+ :disabled="!isAnalyseAllowed || !validStep1 || !validStep2 || disabled"
+ :loading="loading"
+ :variant="buttonVariant"
+ color="secondary"
+ size="small"
+ :text="$t('pages.table.subpages.import.analyse.text')"
+ @click="uploadAndAnalyse"/>
+ </v-col>
+ </v-row>
+ </v-form>
</v-container>
- </v-form>
</v-stepper-window>
<v-stepper-header
v-if="!create">
<v-stepper-item
- :title="$t('pages.table.subpages.import.summary.title')"
- :value="stepStart+2"/>
+ :title="$t('pages.table.subpages.import.dataset.title')"
+ :complete="validStep3"
+ :value="3" />
</v-stepper-header>
<v-stepper-window
v-if="!create"
direction="vertical">
<v-container>
<v-row
- v-if="rowCount"
dense>
<v-col>
+ <v-btn
+ color="secondary"
+ :disabled="step !== 3 || disabled"
+ size="small"
+ variant="flat"
+ :loading="loadingImport"
+ :text="$t('navigation.import')"
+ @click="importCsv"/>
+ </v-col>
+ </v-row>
+ </v-container>
+ </v-stepper-window>
+ <v-stepper-header
+ v-if="!create">
+ <v-stepper-item
+ :title="$t('pages.table.subpages.import.summary.title')"
+ :value="4"/>
+ </v-stepper-header>
+ <v-stepper-window
+ v-if="!create && step === 4"
+ direction="vertical">
+ <v-container>
+ <v-row
+ v-if="rowCount"
+ dense>
+ <v-col
+ md="8">
<v-alert
border="start"
color="success">
@@ -232,19 +280,11 @@
<v-btn
v-if="rowCount !== null"
color="secondary"
- :disabled="step !== stepStart + 2"
+ :disabled="step !== 4 || disabled"
size="small"
variant="flat"
:text="$t('navigation.data')"
:to="`/database/${$route.params.database_id}/table/${tableId}/data`" />
- <v-btn
- v-else
- color="secondary"
- :disabled="step !== stepStart + 2"
- size="small"
- variant="flat"
- :text="$t('navigation.import')"
- @click="importCsv"/>
</v-col>
</v-row>
</v-container>
@@ -253,7 +293,7 @@
</template>
<script>
-import {isNonNegativeInteger} from '@/utils'
+import { isNonNegativeInteger } from '@/utils'
import { useCacheStore } from '@/stores/cache'
export default {
@@ -263,12 +303,12 @@ export default {
return null
}
},
- stepStart: {
+ create: {
default: () => {
- return 1
+ return false
}
},
- create: {
+ disabled: {
default: () => {
return false
}
@@ -276,12 +316,13 @@ export default {
},
data() {
return {
- step: 1,
+ step: 2,
validStep1: false,
validStep2: false,
- fileModel: null,
- previousFile: null,
+ validStep3: false,
+ file: null,
loading: false,
+ loadingImport: false,
rowCount: null,
suggestedAnalyseSeparator: null,
suggestedAnalyseLineTerminator: null,
@@ -293,7 +334,7 @@ export default {
true_element: null,
null_element: '',
separator: ',',
- line_termination: '\\r\\n',
+ line_termination: '\\n',
skip_lines: 1
},
separators: [
@@ -313,25 +354,29 @@ export default {
cacheStore: useCacheStore()
}
},
- watch: {
- stepStart: {
- handler() {
- this.step = this.stepStart
- }
- }
- },
mounted() {
- this.step = this.stepStart
+ this.setQueryParamSafely('location')
+ this.setQueryParamSafely('quote')
+ this.setQueryParamSafely('false_element')
+ this.setQueryParamSafely('true_element')
+ this.setQueryParamSafely('null_element')
+ this.setQueryParamSafely('separator')
+ this.setQueryParamSafely('line_termination')
+ this.setQueryParamSafely('skip_lines')
+ if (this.$route.query.location) {
+ this.step = 3
+ this.validStep2 = true
+ }
},
computed: {
table() {
return this.cacheStore.getTable
},
isAnalyseAllowed () {
- if (!this.fileModel || this.fileModel.length === 0) {
- return true
+ if (!this.file || this.file.length === 0) {
+ return false
}
- return this.previousFile !== this.fileModel[0]
+ return true
},
hasCompatibleSchema () {
if (this.create) {
@@ -340,11 +385,11 @@ export default {
if (!this.columns || !this.table) {
return false
}
- const schema = this.table.columns.map(c => c.internal_name)
+ const schema = this.table.columns.map(c => c.name)
let pass = true
this.columns.forEach(c => {
if (!schema.includes(c.name)) {
- console.error('Failed to find column with id', c.name, 'in schema')
+ console.error('Failed to find column', c.name, 'in schema')
pass = false
}
})
@@ -396,8 +441,13 @@ export default {
submit() {
this.$refs.form.validate()
},
+ setQueryParamSafely(name) {
+ if (this.$route.query[name]) {
+ this.tableImport[name] = this.$route.query[name]
+ }
+ },
importCsv() {
- this.loading = true
+ this.loadingImport = true
const tableService = useTableService()
tableService.importCsv(this.$route.params.database_id, this.tableId, this.tableImport)
.then(() => {
@@ -408,29 +458,32 @@ export default {
.then((rowCount) => {
this.rowCount = rowCount
})
- this.step = this.stepStart + 2
- this.loading = false
+ this.step = 4
+ this.validStep3 = true
+ this.loadingImport = false
})
- .catch(() => {
+ .catch(({code, message}) => {
const toast = useToastInstance()
- toast.error(this.$t('error.import.dataset'))
- this.loading = false
+ console.error(code, message)
+ toast.error(`${this.$t(code)}: ${message}`)
+ this.loadingImport = false
})
.finally(() => {
- this.loading = false
+ this.loadingImport = false
})
},
uploadAndAnalyse() {
this.loading = true
- this.previousFile = this.fileModel[0]
+ console.debug('upload file', this.file)
const uploadService = useUploadService()
- return uploadService.create(this.previousFile)
+ return uploadService.create(this.file)
.then((s3key) => {
const toast = useToastInstance()
toast.success(this.$t('success.upload.dataset'))
this.analyse(s3key)
})
- .catch(() => {
+ .catch((error) => {
+ console.error('Failed to upload dataset', error)
const toast = useToastInstance()
toast.error(this.$t('error.upload.dataset'))
this.loading = false
@@ -464,16 +517,21 @@ export default {
this.suggestedAnalyseSeparator = separator
this.suggestedAnalyseLineTerminator = line_termination
this.tableImport.location = filename
- this.step = this.stepStart + 2
+ this.step = 3
const toast = useToastInstance()
toast.success(this.$t('success.analyse.dataset'))
this.$emit('analyse', {columns: this.columns, filename, line_termination})
this.loading = false
})
- .catch(({code}) => {
- const toast = useToastInstance()
- toast.error(this.$t(code))
+ .catch(({code, message}) => {
this.loading = false
+ const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ /* fallback default error message */
+ toast.error(this.$t('error.analyse.invalid'))
+ return
+ }
+ toast.error(`${this.$t(code)}: ${message}`)
})
}
}
diff --git a/dbrepo-ui/components/table/TableSchema.vue b/dbrepo-ui/components/table/TableSchema.vue
index 1cc172858c9302b43dd1bbad5ea311fc5898dbd2..51f186dd4a861850c36c4c9443ae73193c172b9d 100644
--- a/dbrepo-ui/components/table/TableSchema.vue
+++ b/dbrepo-ui/components/table/TableSchema.vue
@@ -4,33 +4,24 @@
ref="form"
v-model="valid"
:disabled="disabled">
- <v-row>
- <v-col md="8">
- <v-alert
- v-if="needsSequence"
- class="mb-6"
- border="start"
- :text="$t('validation.schema.primary-key')"
- color="info" />
- </v-col>
- </v-row>
<v-row
v-for="(c, idx) in columns"
:key="`r-${idx}`"
class="column pa-2 ml-1 mr-1 mb-2"
dense>
- <v-col cols="2">
+ <v-col
+ cols="2">
<v-text-field
v-model="c.name"
required
:rules="[v => !!v || $t('validation.required')]"
- :error-messages="needsSequence && c.name.toLowerCase() === 'id' ? [$t('validation.schema.id')] : []"
persistent-hint
:variant="inputVariant"
:label="$t('pages.table.subpages.schema.name.label')"
:hint="$t('pages.table.subpages.schema.name.hint')" />
</v-col>
- <v-col cols="2">
+ <v-col
+ cols="1">
<v-select
v-model="c.type"
:items="columnTypes"
@@ -44,7 +35,9 @@
:hint="$t('pages.table.subpages.schema.type.hint')"
@update:modelValue="setDefaultSizeAndD(c)" />
</v-col>
- <v-col cols="2" :hidden="c.type !== 'set'">
+ <v-col
+ v-if="c.type === 'set'"
+ cols="2">
<v-text-field
v-model="c.sets_values"
required
@@ -57,7 +50,9 @@
:label="$t('pages.table.subpages.schema.set.label')"
@focusout="formatValues(c)" />
</v-col>
- <v-col cols="2" :hidden="c.type !== 'enum'">
+ <v-col
+ v-if="c.type === 'enum'"
+ cols="2">
<v-text-field
v-model="c.enums_values"
required
@@ -66,11 +61,15 @@
:variant="inputVariant"
:counter-value="() => c.enums.length"
:hint="$t('pages.table.subpages.schema.enum.hint')"
- :rules="[v => !!v || $t('validation.required')]"
+ :rules="[
+ v => !!v || $t('validation.required')
+ ]"
:label="$t('pages.table.subpages.schema.enum.label')"
@focusout="formatValues(c)" />
</v-col>
- <v-col cols="1" :hidden="defaultSize(c) === false">
+ <v-col
+ v-if="defaultSize(c) !== false"
+ cols="1">
<v-text-field
v-model.number="c.size"
type="number"
@@ -80,7 +79,9 @@
:error-messages="sizeErrorMessages(c)"
:label="$t('pages.table.subpages.schema.size.label')" />
</v-col>
- <v-col cols="1" :hidden="defaultD(c) === false">
+ <v-col
+ v-if="defaultD(c) !== false"
+ cols="1">
<v-text-field
v-model.number="c.d"
type="number"
@@ -90,50 +91,49 @@
:error-messages="dErrorMessages(c)"
:label="$t('pages.table.subpages.schema.d.label')" />
</v-col>
- <v-col v-if="hasDate(c)" cols="2">
+ <v-col
+ cols="2"
+ v-if="hasDate(c)">
<v-select
v-model="c.dfid"
required
:variant="inputVariant"
+ :disabled="disabled"
:rules="[v => !!v || $t('validation.required')]"
:items="filterDateFormats(c)"
item-title="unix_format"
item-value="id"
:label="$t('pages.table.subpages.schema.fsp.label')" />
</v-col>
- <v-col v-if="shift(c)" :cols="shift(c)" />
- <v-col cols="auto" class="pl-2">
+ <v-col
+ v-if="shift(c)"
+ :cols="shift(c)" />
+ <v-col
+ cols="auto"
+ class="pl-2">
<v-checkbox
v-model="c.primary_key"
+ :disabled="disabled"
:label="$t('pages.table.subpages.schema.primary-key.label')"
@click="setOthers(c)" />
</v-col>
- <v-col cols="auto" class="pl-10">
+ <v-col
+ cols="auto"
+ class="pl-10">
<v-checkbox
v-model="c.null_allowed"
- :disabled="c.primary_key"
+ :disabled="c.primary_key || disabled"
:label="$t('pages.table.subpages.schema.null.label')" />
</v-col>
- <v-col cols="auto" class="pl-10">
+ <v-col
+ cols="auto"
+ class="pl-10">
<v-checkbox
v-model="c.unique"
+ :disabled="disabled"
:hidden="c.primary_key"
:label="$t('pages.table.subpages.schema.unique.label')" />
</v-col>
- <v-col v-if="false" cols="auto" class="pl-10">
- <v-text-field
- v-model="c.foreign_key"
- :variant="inputVariant"
- required
- :label="$t('pages.table.subpages.schema.foreign-key.label')" />
- </v-col>
- <v-col v-if="false" cols="auto" class="pl-10">
- <v-text-field
- v-model="c.references"
- :variant="inputVariant"
- required
- :label="$t('pages.table.subpages.schema.references.label')" />
- </v-col>
<v-col
v-if="canRemove(idx)"
cols="auto"
@@ -160,21 +160,12 @@
</v-row>
<v-row>
<v-col>
- <v-btn
- v-if="back"
- :color="disabled ? '' : 'tertiary'"
- :variant="buttonVariant"
- size="small"
- class="mr-2"
- :disabled="disabled"
- :text="$t('navigation.back')"
- @click="goBack" />
<v-btn
color="secondary"
variant="flat"
size="small"
:loading="loading"
- :disabled="disabled"
+ :disabled="disabled || !valid || this.columns.length === 0"
:text="submitText"
@click="submit" />
</v-col>
@@ -194,12 +185,6 @@ export default {
return []
}
},
- back: {
- type: Boolean,
- default () {
- return false
- }
- },
disabled: {
type: Boolean,
default () {
@@ -262,7 +247,10 @@ export default {
return false
}
let shift = 0
- if (this.hasDate(column) === false && this.columns.filter(c => this.hasDate(c) !== false).length > 0 && this.defaultSize(column) === false && this.columns.filter(c => this.defaultSize(c) !== false).length > 0) {
+ if (this.hasDate(column) === false && this.columns.filter(c => this.hasDate(c) !== false).length > 0) {
+ shift++
+ }
+ if (this.defaultSize(column) === false && this.columns.filter(c => this.defaultSize(c) !== false).length > 0) {
shift++
}
if (this.defaultD(column) === false && this.columns.filter(c => this.defaultD(c) !== false).length > 0) {
@@ -281,9 +269,6 @@ export default {
column.null_allowed = false
column.unique = true
},
- goBack () {
- this.$emit('back', { success: false })
- },
canRemove (idx) {
if (idx > 0) {
return true
diff --git a/dbrepo-ui/components/table/TableToolbar.vue b/dbrepo-ui/components/table/TableToolbar.vue
index d7b3d1596a8e71d02c49b0dc44fc5680d6fa96d5..ef95ad1bd2eee6406925a956a3dda14950070a7d 100644
--- a/dbrepo-ui/components/table/TableToolbar.vue
+++ b/dbrepo-ui/components/table/TableToolbar.vue
@@ -22,7 +22,7 @@
color="tertiary"
:variant="buttonVariant"
:text="$t('toolbars.database.import-csv.permanent') + ($vuetify.display.lgAndUp ? ' ' + $t('toolbars.database.import-csv.xl') : '')"
- class="ml-2"
+ class="mr-2"
:to="`/database/${$route.params.database_id}/table/${$route.params.table_id}/import`" />
<v-btn
v-if="canExecuteQuery"
@@ -30,7 +30,7 @@
color="secondary"
variant="flat"
:text="($vuetify.display.lgAndUp ? $t('toolbars.database.create-subset.xl') + ' ' : '') + $t('toolbars.database.create-subset.permanent')"
- class="ml-2"
+ class="mr-2"
:to="`/database/${$route.params.database_id}/subset/create?tid=${$route.params.table_id}`" />
<v-btn
v-if="canCreateView"
@@ -38,7 +38,7 @@
color="secondary"
variant="flat"
:text="($vuetify.display.lgAndUp ? $t('toolbars.database.create-view.xl') + ' ' : '') + $t('toolbars.database.create-view.permanent')"
- class="ml-2"
+ class="mr-2"
:to="`/database/${$route.params.database_id}/view/create?tid=${$route.params.table_id}`" />
<v-btn
v-if="canDropTable"
@@ -46,7 +46,7 @@
color="error"
variant="flat"
:text="($vuetify.display.lgAndUp ? 'Drop ' : '') + 'Table'"
- class="ml-2"
+ class="mr-2"
@click="dropTableDialog = true" />
<v-btn
v-if="canGetPid"
@@ -54,7 +54,7 @@
color="primary"
variant="flat"
:text="($vuetify.display.lgAndUp ? 'Get ' : '') + 'PID'"
- class="ml-2"
+ class="mr-2"
:to="`/database/${$route.params.database_id}/table/${$route.params.table_id}/persist`" />
<template v-slot:extension>
<v-tabs v-model="tab" color="primary">
diff --git a/dbrepo-ui/components/view/ViewToolbar.vue b/dbrepo-ui/components/view/ViewToolbar.vue
index 21125764983e9f7f79bf8dd6ec5f522a3bff7d49..c107c3c0ef006c2d5456f6db187908e092664c5a 100644
--- a/dbrepo-ui/components/view/ViewToolbar.vue
+++ b/dbrepo-ui/components/view/ViewToolbar.vue
@@ -129,6 +129,9 @@ export default {
})
.catch(({code, message}) => {
const toast = useToastInstance()
+ if (typeof code !== 'string' || typeof message !== 'string') {
+ return
+ }
toast.error(this.$t(code) + ": " + message)
})
.finally(() => {
diff --git a/dbrepo-ui/composables/table-service.ts b/dbrepo-ui/composables/table-service.ts
index 96be0537d07b3990ab638acafc724442ae5f7735..88ab27b39ee93d632d4492ed4a2d2d776cc08e8c 100644
--- a/dbrepo-ui/composables/table-service.ts
+++ b/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 })
diff --git a/dbrepo-ui/composables/upload-service.ts b/dbrepo-ui/composables/upload-service.ts
index 63db245c2dff91e1166ea8f02fe354b50e57589c..bddae2692cf80ad2f116d058010b157740a39360 100644
--- a/dbrepo-ui/composables/upload-service.ts
+++ b/dbrepo-ui/composables/upload-service.ts
@@ -3,8 +3,8 @@ import * as tus from 'tus-js-client'
export const useUploadService = (): any => {
function create (data: File) {
const config = useRuntimeConfig()
+ const endpoint = config.public.upload.client
return new Promise<string>((resolve, reject) => {
- const endpoint = `${config.public.api.client}/api/upload/files`
if (!tus.isSupported) {
console.error('Your browser does not support uploads!')
return
@@ -12,10 +12,6 @@ export const useUploadService = (): any => {
const uploadClient: tus.Upload = new tus.Upload(data, {
endpoint,
retryDelays: [0, 3000, 5000, 10000, 20000],
- metadata: {
- filename: data.name,
- filetype: data.type
- },
onError (error) {
console.error('Failed to upload:', error)
reject(error)
diff --git a/dbrepo-ui/composables/user-service.ts b/dbrepo-ui/composables/user-service.ts
index a8b98916139feabbd288a8dbde3aef7f569fdfdd..4bfedfd9ebdd5216eeb98751b823955828d1cb17 100644
--- a/dbrepo-ui/composables/user-service.ts
+++ b/dbrepo-ui/composables/user-service.ts
@@ -126,7 +126,7 @@ export const useUserService = (): any => {
function tokenToUserId(token: string): string {
const data: Token = jwtDecode<Token>(token)
- return data.sub
+ return data.uid
}
function userInfoToUser(data: UserDto) {
diff --git a/dbrepo-ui/dto/jwt.ts b/dbrepo-ui/dto/jwt.ts
index e9cc8ab00207875895eb65462cada7f5d639ec1b..a47085114e3c80c229e80b43fb27adc94fd9d3d3 100644
--- a/dbrepo-ui/dto/jwt.ts
+++ b/dbrepo-ui/dto/jwt.ts
@@ -11,7 +11,8 @@ interface Token {
realm_access: RealmAccess;
scope: string;
sid: string;
- client_id: string;
+ uid: string;
+ preferred_username: string;
}
interface RealmAccess {
diff --git a/dbrepo-ui/layouts/default.vue b/dbrepo-ui/layouts/default.vue
index 83c667ee08e5cc9923053ac3f217e9c98be27e59..41620761c58257affb380be4be741489c8f77ce8 100644
--- a/dbrepo-ui/layouts/default.vue
+++ b/dbrepo-ui/layouts/default.vue
@@ -177,6 +177,9 @@ export default {
}
},
computed: {
+ token () {
+ return this.userStore.getToken
+ },
user () {
return this.userStore.getUser
},
@@ -272,6 +275,10 @@ export default {
this.$router.push({ path: '/search', query: { q: this.search } })
},
initEnvironment () {
+ if (this.token && !this.user) {
+ console.error('Something went wrong with loading the user: reset user cache')
+ this.userStore.logout()
+ }
if (!this.locale) {
this.userStore.setLocale('en')
}
diff --git a/dbrepo-ui/locales/de-AT.json b/dbrepo-ui/locales/de-AT.json
index 263dbe62fc5ccdbd36d70a549bd8a433122c78ec..4d9e25b36e9a38a3e87c8176ec04751811c63528 100644
--- a/dbrepo-ui/locales/de-AT.json
+++ b/dbrepo-ui/locales/de-AT.json
@@ -30,11 +30,15 @@
"yes": "Ja",
"no": "Nein",
"mine": "(Meine)",
- "loading": "Lade"
+ "loading": "Lade",
+ "view": "Ansicht"
},
"pages": {
"identifier": {
"title": "Kennung",
+ "export": {
+ "text": "Metadatenexport"
+ },
"pid": {
"title": "Persistenter Bezeichner"
},
@@ -273,6 +277,19 @@
"broker": {
"title": "Broker"
},
+ "connection": {
+ "title": "Verbindungsdetails",
+ "secure": "sicher",
+ "insecure": "unsicher",
+ "permissions": {
+ "write": "Sie können in diese Tabelle schreiben",
+ "read": "Sie können den gesamten Inhalt dieser Tabelle lesen"
+ }
+ },
+ "description": {
+ "title": "Beschreibung",
+ "empty": "(Keine Beschreibung)"
+ },
"exchange": {
"title": "Exchange"
},
@@ -282,14 +299,8 @@
"routing-key": {
"title": "Routing-Schlüssel"
},
- "connection": {
- "title": "Verbindungsdetails",
- "secure": "sicher",
- "insecure": "unsicher",
- "permissions": {
- "write": "Sie können in diese Tabelle schreiben",
- "read": "Sie können den gesamten Inhalt dieser Tabelle lesen"
- }
+ "name": {
+ "title": "Interner Name"
},
"protocol": {
"title": "Protokoll",
@@ -301,10 +312,6 @@
"result-rows": {
"title": "Reihen"
},
- "description": {
- "title": "Beschreibung",
- "empty": "(Keine Beschreibung)"
- },
"owner": {
"title": "Eigentümer"
},
@@ -320,9 +327,14 @@
"metadata": {
"title": "Tabellenmetadaten"
},
- "dataset": {
+ "schema": {
"title": "Datensatzstruktur",
- "warn": "Das Datensatzschema stimmt nicht mit dem Zieltabellenschema überein. "
+ "text": "das Tabellenschema manuell."
+ },
+ "dataset": {
+ "title": "Datensatz importieren",
+ "text": "Erstellt ein Tabellenschema aus einem bestimmten CSV-Datensatz. ",
+ "warn": "Das Datensatzschema stimmt (wahrscheinlich) nicht mit dem Schema der Zieltabelle überein. "
},
"name": {
"label": "Name",
@@ -349,12 +361,15 @@
"label": "Zeilen überspringen",
"hint": "Optional. "
},
+ "storage": {
+ "text": "Datensatz vom Speicherdienst"
+ },
"quote": {
"label": "Angebotskodierung",
"hint": "Optional. "
},
"terminator": {
- "label": "Kodierung des Leitungsabschlusses",
+ "label": "Codierung des Leitungsabschlusses",
"hint": "Optional. ",
"warn": {
"prefix": "Wir haben Ihren .csv/.tsv-Datensatz analysiert und festgestellt, dass die von Ihnen angegebene Leitungsabschlusscodierung vorliegt",
@@ -375,7 +390,7 @@
"hint": "Optional. "
},
"file": {
- "title": "Datensatz-Upload",
+ "title": "Datensatzanalyse",
"label": "Datensatzdatei",
"hint": "Erforderlich. "
},
@@ -396,6 +411,12 @@
"information": {
"title": "Information"
},
+ "simple": {
+ "text": "Aus Schema"
+ },
+ "from-csv": {
+ "text": "Von CSV"
+ },
"name": {
"label": "Tabellenname",
"hint": "Erforderlich"
@@ -405,8 +426,7 @@
"hint": ""
},
"summary": {
- "prefix": "Tabelle mit Namen erstellt",
- "suffix": "und importierter Datensatz erfolgreich"
+ "text": "Erstellte Tabelle mit internem Namen:"
}
},
"drop": {
@@ -421,7 +441,7 @@
}
},
"schema": {
- "title": "System Versioniert",
+ "title": "Systemversioniert",
"subtitle": "Tabellenbeschränkungen",
"bullet": "●",
"assign": "Zuordnen",
@@ -447,7 +467,7 @@
"title": "Nullbar"
},
"sequence": {
- "title": "Sequenz"
+ "title": "Reihenfolge"
},
"description": {
"title": "Beschreibung"
@@ -501,7 +521,7 @@
}
},
"semantics": {
- "title": "Semantische Instanz für Tabellenspalte zuweisen",
+ "title": "Weisen Sie der Tabellenspalte eine semantische Instanz zu",
"subtitle": "Semantische Instanzen helfen Maschinen dabei, den richtigen Kontext Ihres Datensatzes zu ermitteln",
"recommended": "Empfohlene semantische Instanzen",
"bullet": "●",
@@ -534,7 +554,7 @@
"hint": "Der Wert ist ein Primärschlüssel"
},
"format": {
- "hint": "Der Wert muss folgendes Format haben"
+ "hint": "Der Wert muss im Format vorliegen"
},
"required": {
"hint": "Erforderlich. "
@@ -561,7 +581,7 @@
"title": "Interner Name"
},
"visibility": {
- "title": "Sichtbarkeit"
+ "title": "Sichtweite"
},
"size": {
"title": "Größe"
@@ -618,7 +638,7 @@
}
},
"tables": {
- "empty": "(keine Tabellen)"
+ "empty": "(keine Tische)"
},
"tuple": {
"create": {
@@ -650,9 +670,9 @@
},
"scheme": {
"title": "Schema",
- "subtitle": "Aktualisiert die Metadaten im Datenbankschema, um systemversionierte Tabellen und Ansichten in der Benutzeroberfläche anzuzeigen",
+ "subtitle": "Aktualisieren Sie die Metadaten im Datenbankschema, um systemversionierte Tabellen und Ansichten in der Benutzeroberfläche anzuzeigen",
"submit": {
- "text": "Aktualisieren"
+ "text": "Aktualisierung"
}
},
"ownership": {
@@ -665,7 +685,7 @@
}
},
"visibility": {
- "title": "Sichtbarkeit",
+ "title": "Sichtweite",
"subtitle": "Private Datenbanken verbergen die Daten, während Metadaten weiterhin sichtbar sind. ",
"visibility": {
"label": "Datenbanksichtbarkeit",
@@ -723,7 +743,7 @@
"title": "Information",
"subtitle": "Allgemeine Benutzermetadaten",
"id": {
- "label": "ID"
+ "label": "AUSWEIS"
},
"username": {
"label": "Nutzername"
@@ -754,13 +774,13 @@
"de": "Deutsch (DE)"
},
"theme": {
- "title": "Theme",
+ "title": "Thema",
"subtitle": "Aktualisieren Sie das Benutzerdesign, wenn Sie angemeldet sind",
"label": "Thema",
"dark": "Dunkel",
"dark-contrast": "Dunkel – hoher Kontrast",
"light": "Licht",
- "light-contrast": "Hell – hoher Kontrast",
+ "light-contrast": "Licht – hoher Kontrast",
"submit": {
"text": "Aktualisieren"
}
@@ -836,25 +856,25 @@
}
},
"view": {
- "title": "Ansicht",
+ "title": "Sicht",
"tabs": {
- "info": "Info",
+ "info": "Die Info",
"data": "Daten"
},
"name": {
"title": "Name"
},
"query": {
- "title": "Abfrage"
+ "title": "Stellungnahme"
},
"creator": {
- "title": "Ersteller"
+ "title": "Schöpfer"
},
"creation": {
- "title": "Erstellt"
+ "title": "Schaffung"
},
"visibility": {
- "title": "Sichtbarkeit"
+ "title": "Sichtweite"
},
"subpages": {
"create": {
@@ -885,7 +905,7 @@
"title": "Sichtweite"
},
"creator": {
- "title": "Ersteller"
+ "title": "Schöpfer"
},
"query": {
"title": "Abfrage"
@@ -904,13 +924,12 @@
"title": "Ergebniszeilen"
},
"tabs": {
- "info": "Info",
+ "info": "Die Info",
"data": "Daten"
},
"subpages": {
"create": {
"title": "Teilmenge erstellen",
- "generated": "Die folgende Abfrage wird ausgeführt (schreibgeschützt)",
"subtitle": "Die folgende Abfrage wird ausgeführt",
"simple": {
"text": "Einfach"
@@ -952,20 +971,20 @@
"search": {
"types": {
"database": "Datenbank",
- "table": "Tabelle",
+ "table": "Tisch",
"column": "Spalte",
"user": "Benutzer",
"identifier": "Kennung",
"concept": "Konzept",
"unit": "Einheit",
- "view": "View"
+ "view": "Sicht"
},
"type": {
"label": "Typ",
"hint": ""
},
"id": {
- "label": "ID",
+ "label": "AUSWEIS",
"hint": ""
},
"name": {
@@ -977,7 +996,7 @@
"hint": ""
},
"publication-range": {
- "hint": "Geben Sie Ihren benutzerdefinierten Veröffentlichungsjahrbereich an"
+ "hint": "Geben Sie Ihren benutzerdefinierten Veröffentlichungsjahresbereich an"
},
"start-year": {
"label": "Startjahr",
@@ -1030,11 +1049,19 @@
}
},
"error": {
+ "auth": {
+ "connection": "Der Authentifizierungsdienst konnte nicht kontaktiert werden",
+ "invalid": "Die Authentifizierung im Authentifizierungsdienst ist fehlgeschlagen"
+ },
+ "analyse": {
+ "invalid": "Der Datensatz konnte nicht analysiert werden",
+ "missing": "Datensatz konnte nicht gefunden werden"
+ },
"access": {
"missing": "Der Zugriff in der Metadatendatenbank konnte nicht gefunden werden"
},
"axios": {
- "connection": "Es konnte keine Verbindung hergestellt werden",
+ "connection": "Kontakt zum Backend fehlgeschlagen",
"timeout": "Zeitüberschreitung der Verbindung"
},
"concept": {
@@ -1045,17 +1072,17 @@
"missing": "Der Container konnte in der Metadatendatenbank nicht gefunden werden"
},
"data": {
+ "connection": "Kontaktaufnahme zum Datendienst fehlgeschlagen",
"invalid": "Die Kommunikation mit dem Datendienst ist fehlgeschlagen",
- "connection": "Es konnte keine Verbindung zum Datendienst hergestellt werden",
"value": "Spaltenwert konnte nicht festgelegt werden",
- "drift": "Die Uhr Ihres Browsers ist nicht mit UTC synchronisiert und scheint um Folgendes eingestellt zu sein"
+ "drift": "Die Uhr Ihres Browsers ist nicht mit UTC synchronisiert und scheint um 16:00 Uhr verschoben zu sein"
},
"database": {
- "connection": "Es konnte keine Verbindung zur Datenbank hergestellt werden",
+ "connection": "Kontakt zur Datenbank konnte nicht hergestellt werden",
+ "create": "Datenbank konnte im Datendienst nicht erstellt werden",
"invalid": "Aktion in der Datenbank konnte nicht ausgeführt werden",
"querystore": "Die Abfrage konnte nicht in den Abfragespeicher eingefügt werden",
- "missing": "Die Datenbank konnte nicht in der Metadatendatenbank gefunden werden",
- "create": "Es konnte keine Verbindung zum Metadatendienst hergestellt werden"
+ "missing": "Die Datenbank konnte nicht in der Metadatendatenbank gefunden werden"
},
"doi": {
"missing": "DOI konnte in der Metadatendatenbank nicht gefunden werden"
@@ -1103,7 +1130,7 @@
"query": {
"missing": "Die Abfrage konnte im Datendienst nicht gefunden werden",
"invalid": "Die Abfrage ist ungültig",
- "type.exists": "Abfrage konnte nicht erstellt werden: kein solcher Spaltentyp",
+ "type.exists": "Abfrage konnte nicht erstellt werden: Kein solcher Spaltentyp",
"type.build": "Abfrage konnte nicht erstellt werden: Derzeit gibt es keine Abfrageerstellungsunterstützung für den Spaltentyp",
"column.exists": "Abfrage konnte nicht erstellt werden: In den Datenspalten fehlt die Spalte mit dem Namen"
},
@@ -1114,9 +1141,9 @@
"persist": "Die Abfrage konnte nicht im Abfragespeicher der Datenbank gespeichert werden"
},
"metadata": {
- "privileged": "Das Abrufen privilegierter Metadaten im Datendienst ist fehlgeschlagen",
- "connection": "Es konnte keine Verbindung zum Metadatendienst hergestellt werden",
- "invalid": "Es konnten keine Authentifizierungsmetadaten im Datendienst abgerufen werden"
+ "connection": "Es konnte kein Kontakt zum Metadatendienst hergestellt werden",
+ "invalid": "Es konnten keine Authentifizierungsmetadaten im Datendienst abgerufen werden",
+ "privileged": "Das Abrufen privilegierter Metadaten im Datendienst ist fehlgeschlagen"
},
"sidecar": {
"export": "Der Datensatz konnte nicht in den Datenbank-Sidecar exportiert werden",
@@ -1161,12 +1188,12 @@
"malformed": "Ungültige Paginierungsanforderung"
},
"table": {
+ "connection": "Kontakt zur Datenbank konnte nicht hergestellt werden",
+ "create": "Tabelle konnte nicht erstellt werden",
"missing": "Die Tabelle konnte in der Metadatendatenbank nicht gefunden werden",
"exists": "Die Tabelle mit diesem Namen existiert bereits",
"invalid": "Die Spalten im Datendienst konnten nicht analysiert werden",
- "malformed": "Eintrag konnte nicht eingefügt werden",
- "create": "Tabelle konnte nicht erstellt werden",
- "connection": "Das Laden der Tabellendaten ist fehlgeschlagen, da die Datenbank nicht erreichbar ist"
+ "malformed": "Eintrag konnte nicht eingefügt werden"
},
"unit": {
"missing": "Die semantische Einheit konnte in der Metadatendatenbank nicht gefunden werden"
@@ -1175,6 +1202,13 @@
"create": "Ansicht konnte nicht erstellt werden",
"missing": "Die Ansicht konnte in der Metadatendatenbank nicht gefunden werden",
"invalid": "Die Ansichtsabfrage konnte den Spalten im Datendienst nicht zugeordnet werden"
+ },
+ "broker": {
+ "connection": "Kontakt zum Broker-Service fehlgeschlagen",
+ "invalid": "Es konnten keine Metadaten im Brokerdienst abgerufen werden"
+ },
+ "external": {
+ "invalid": "Es konnten keine Metadaten vom Datacite-System abgerufen werden"
}
},
"success": {
@@ -1209,10 +1243,6 @@
"created": "Tabelle erfolgreich erstellt",
"semantics": "Semantische Instanz erfolgreich zugewiesen"
},
- "schema": {
- "tables": "Die Metadaten der Datenbanktabellen wurden erfolgreich aktualisiert",
- "views": "Metadaten der Datenbankansichten wurden erfolgreich aktualisiert"
- },
"schema": {
"tables": "Die Metadaten der Datenbanktabellen wurden erfolgreich aktualisiert.",
"views": "Metadaten der Datenbankansichten wurden erfolgreich aktualisiert."
@@ -1229,14 +1259,14 @@
"pid": {
"saved": "Kennung erfolgreich gespeichert",
"created": "Kennung erfolgreich erstellt",
- "published": "Identifikator erfolgreich veröffentlicht",
+ "published": "Erfolgreich veröffentlichte Kennung",
"updated": "Kennung erfolgreich aktualisiert",
"deleted": "Kennung erfolgreich gelöscht"
},
"user": {
"info": "Benutzerinformationen erfolgreich aktualisiert",
"theme": "Benutzerthema erfolgreich aktualisiert",
- "password": "Benutzerkennwort erfolgreich aktualisiert",
+ "password": "Benutzerpasswort erfolgreich aktualisiert",
"login": "Erfolgreich angemeldet"
},
"view": {
@@ -1249,7 +1279,7 @@
},
"toolbars": {
"user": {
- "info": "Info",
+ "info": "Die Info",
"authentication": "Authentifizierung",
"developer": "Entwickler"
},
@@ -1283,30 +1313,30 @@
"xl": "CSV"
},
"dashboard": {
- "permanent": "Visualisiere",
+ "permanent": "Visualisieren",
"xl": "Daten"
},
"create-subset": {
"permanent": "Teilmenge",
- "xl": "Erstelle"
+ "xl": "Erstellen"
},
"create-view": {
- "permanent": "Ansicht",
- "xl": "Erstelle"
+ "permanent": "Sicht",
+ "xl": "Erstellen"
},
"create-table": {
- "permanent": "Tabelle",
- "xl": "Erstelle"
+ "permanent": "Tisch",
+ "xl": "Erstellen"
},
"create-pid": {
"permanent": "PID",
"xl": "Erhalten"
},
"info": {
- "tab": "Info"
+ "tab": "Die Info"
},
"tables": {
- "tab": "Tabellen"
+ "tab": "Tische"
},
"subsets": {
"tab": "Teilmengen"
@@ -1389,14 +1419,11 @@
"integer": "Größer oder gleich Null",
"max-length": "Die maximale Länge beträgt: ",
"day": "Ungültiger Tag",
+ "matching": "Nicht passend!",
"doi": {
"invalid": "Ungültiger DOI. "
},
"month": "Ungültiger Monat",
- "schema": {
- "id": "Die Spalte muss als Primärschlüssel deklariert werden",
- "primary-key": "Wir erstellen eine Spalte mit dem Namen „id“ mit einer automatisch ansteigenden Sequenz, die bei 1 beginnt. Bitte geben Sie eine Spalte mit Primärschlüssel an, wenn Sie dieses Verhalten nicht wünschen"
- },
"uri": {
"pattern": "Ungültiger URI",
"exists": "URI existiert"
@@ -1409,7 +1436,7 @@
"exists": "Der Ansichtsname existiert bereits"
},
"table": {
- "exists": "Tabellenname existiert bereits"
+ "exists": "Der Tabellenname existiert bereits"
},
"prefix": {
"pattern": "Ungültiges Präfixmuster",
diff --git a/dbrepo-ui/locales/en-US.json b/dbrepo-ui/locales/en-US.json
index a14d7292831b1f2e81009be3d39f9051b99c6b8d..935023300e5c1fd86934d6187605ea1c1b3b2078 100644
--- a/dbrepo-ui/locales/en-US.json
+++ b/dbrepo-ui/locales/en-US.json
@@ -19,7 +19,7 @@
"persist": "Persist",
"cancel": "Cancel",
"user": "User",
- "import": "Import",
+ "import": "Import Data",
"delete": "Delete",
"recommend": "Recommend",
"now": "Now",
@@ -30,11 +30,15 @@
"yes": "Yes",
"no": "No",
"mine": "(mine)",
- "loading": "Loading"
+ "loading": "Loading",
+ "view": "View"
},
"pages": {
"identifier": {
"title": "Identifier",
+ "export": {
+ "text": "Metadata Export"
+ },
"pid": {
"title": "Persistent Identifier"
},
@@ -273,6 +277,19 @@
"broker": {
"title": "Broker"
},
+ "connection": {
+ "title": "Connection Details",
+ "secure": "secure",
+ "insecure": "insecure",
+ "permissions": {
+ "write": "You can write to this table",
+ "read": "You can read all contents of this table"
+ }
+ },
+ "description": {
+ "title": "Description",
+ "empty": "(no description)"
+ },
"exchange": {
"title": "Exchange"
},
@@ -282,14 +299,8 @@
"routing-key": {
"title": "Routing Key"
},
- "connection": {
- "title": "Connection Details",
- "secure": "secure",
- "insecure": "insecure",
- "permissions": {
- "write": "You can write to this table",
- "read": "You can read all contents of this table"
- }
+ "name": {
+ "title": "Internal Name"
},
"protocol": {
"title": "Protocol",
@@ -301,10 +312,6 @@
"result-rows": {
"title": "Rows"
},
- "description": {
- "title": "Description",
- "empty": "(no description)"
- },
"owner": {
"title": "Owner"
},
@@ -320,9 +327,14 @@
"metadata": {
"title": "Table Metadata"
},
- "dataset": {
+ "schema": {
"title": "Dataset Structure",
- "warn": "The dataset schema does not match the target table schema. You can still force the import but it is not recommended"
+ "text": "the table schema manually."
+ },
+ "dataset": {
+ "title": "Import Dataset",
+ "text": "Creates a table schema from a given .csv dataset. Alternatively you can create",
+ "warn": "The dataset schema (likely) does not match the target table schema. You can still force the import but it is not recommended"
},
"name": {
"label": "Name",
@@ -349,6 +361,9 @@
"label": "Skip Rows",
"hint": "Optional. Number of rows to skip, e.g. when the first one contains header and no data"
},
+ "storage": {
+ "text": "Dataset from Storage Service"
+ },
"quote": {
"label": "Quote Encoding",
"hint": "Optional. Character that quotes data, e.g. double-quotes \"value\""
@@ -375,7 +390,7 @@
"hint": "Optional. Character sequence that represents boolean false, e.g. 0, false, no"
},
"file": {
- "title": "Dataset Upload",
+ "title": "Dataset Analysis",
"label": "Dataset File",
"hint": "Required. Needs to be in .csv/.tsv file format"
},
@@ -396,6 +411,12 @@
"information": {
"title": "Information"
},
+ "simple": {
+ "text": "From Schema"
+ },
+ "from-csv": {
+ "text": "From CSV"
+ },
"name": {
"label": "Table Name",
"hint": "Required"
@@ -405,8 +426,7 @@
"hint": ""
},
"summary": {
- "prefix": "Created table with name",
- "suffix": "and imported dataset successfully"
+ "text": "Created table with internal name:"
}
},
"drop": {
@@ -910,7 +930,6 @@
"subpages": {
"create": {
"title": "Create Subset",
- "generated": "The following query will be executed (readonly)",
"subtitle": "The following query will be executed",
"simple": {
"text": "Simple"
@@ -1030,11 +1049,19 @@
}
},
"error": {
+ "auth": {
+ "connection": "Failed to contact auth service",
+ "invalid": "Failed to authenticate in auth service"
+ },
+ "analyse": {
+ "invalid": "Failed to analyse dataset",
+ "missing": "Failed to find dataset"
+ },
"access": {
"missing": "Failed to find access in metadata database"
},
"axios": {
- "connection": "Failed to establish connection",
+ "connection": "Failed to contact backend",
"timeout": "Connection timed out"
},
"concept": {
@@ -1045,17 +1072,17 @@
"missing": "Failed to find container in metadata database"
},
"data": {
+ "connection": "Failed to contact data service",
"invalid": "Failed to communicate with data service",
- "connection": "Failed to establish connection to data service",
"value": "Failed to set column value",
"drift": "Your browser clock is not synchronized with UTC and seems to be off by"
},
"database": {
- "connection": "Failed to establis connection to the database",
+ "connection": "Failed to contact database",
+ "create": "Failed to create database in data service",
"invalid": "Failed to perform action in database",
"querystore": "Failed to insert query into query store",
- "missing": "Failed to find database in metadata database",
- "create": "Failed to establish connection with metadata service"
+ "missing": "Failed to find database in metadata database"
},
"doi": {
"missing": "Failed to find DOI in metadata database"
@@ -1114,9 +1141,9 @@
"persist": "Failed to persist query in the database query store"
},
"metadata": {
- "privileged": "Failed to fetch privileged metadata in the data service",
- "connection": "Failed to establish connection to the metadata service",
- "invalid": "Failed to obtain authentication metadata in the data service"
+ "connection": "Failed to contact metadata service",
+ "invalid": "Failed to obtain authentication metadata in the data service",
+ "privileged": "Failed to fetch privileged metadata in the data service"
},
"sidecar": {
"export": "Failed to export dataset to the database sidecar",
@@ -1161,12 +1188,12 @@
"malformed": "Invalid pagination request"
},
"table": {
+ "connection": "Failed to contact database",
+ "create": "Failed to create table",
"missing": "Failed to find table in metadata database",
"exists": "Table with this name exists already",
"invalid": "Failed to parse columns in the data service",
- "malformed": "Failed to insert entry",
- "create": "Failed to create table",
- "connection": "Failed to load table data because database is not reachable"
+ "malformed": "Failed to insert entry"
},
"unit": {
"missing": "Failed to find semantic unit in metadata database"
@@ -1175,6 +1202,13 @@
"create": "Failed to create view",
"missing": "Failed to find view in metadata database",
"invalid": "Failed to map view query to columns in data service"
+ },
+ "broker": {
+ "connection": "Failed to contact broker service",
+ "invalid": "Failed to obtain metadata in the broker service"
+ },
+ "external": {
+ "invalid": "Failed to obtain metadata from the datacite system"
}
},
"success": {
@@ -1209,10 +1243,6 @@
"created": "Successfully created table",
"semantics": "Successfully assigned semantic instance"
},
- "schema": {
- "tables": "Successfully refreshed database tables metadata",
- "views": "Successfully refreshed database views metadata"
- },
"schema": {
"tables": "Successfully refreshed database tables metadata.",
"views": "Successfully refreshed database views metadata."
@@ -1389,14 +1419,11 @@
"integer": "Greater or equal to zero",
"max-length": "Maximum length is: ",
"day": "Invalid day",
+ "matching": "Not matching!",
"doi": {
"invalid": "Invalid DOI. Must start with 10.xyz"
},
"month": "Invalid month",
- "schema": {
- "id": "Column needs to be declared as primary key",
- "primary-key": "We create a column named id with a auto-increasing sequence starting at 1. Please specify a column with primary key if you don't want this behavior"
- },
"uri": {
"pattern": "Invalid URI",
"exists": "URI exists"
diff --git a/dbrepo-ui/nuxt.config.ts b/dbrepo-ui/nuxt.config.ts
index 7dbf4914d2f76a75282017a38c93fb1e0a6607eb..14a6c3034dbb36e756d0fe58c58a88e6d7edd8dc 100644
--- a/dbrepo-ui/nuxt.config.ts
+++ b/dbrepo-ui/nuxt.config.ts
@@ -22,140 +22,149 @@ const routeRules = {
}
export default defineNuxtConfig({
- app: {
- head: {
- charset: 'utf-8',
- viewport: 'width=device-width, initial-scale=1',
- meta: [
- { 'http-equiv': 'Content-Security-Policy', content: 'upgrade-insecure-requests' }
- ],
- htmlAttrs: {
- lang: 'en-US'
- }
- }
- },
- build: {
- transpile: ['vuetify'],
- },
- css: [
- 'vuetify/lib/styles/main.sass',
- '@mdi/font/css/materialdesignicons.min.css',
- '@/assets/globals.css',
- '@/assets/overrides.css',
- ],
- runtimeConfig: {
- public: {
- commit: '',
- title: 'Database Repository',
- logo: '/logo.svg',
- icon: '/favicon.ico',
- touch: '/apple-touch-icon.png',
- version: 'bun-dev',
- broker: {
- host: 'localhost',
- port: {
- '5672': false
- },
- extra: ''
- },
- variant: {
- input: {
- normal: 'underlined',
- contrast: 'outlined',
- },
- button: {
- normal: 'flat',
- contrast: 'outlined',
- },
- list: {
- normal: '',
- contrast: 'flat',
- }
- },
- api: {
- client: 'http://localhost',
- server: 'http://gateway-service',
- },
- database: {
- unsupported: '*,AVG,BIT_AND,BIT_OR,BIT_XOR,COUNT,COUNTDISTINCT,GROUP_CONCAT,JSON_ARRAYAGG,JSON_OBJECTAGG,MAX,MIN,STD,STDDEV,STDDEV_POP,STDDEV_SAMP,SUM,VARIANCE,VAR_POP,VAR_SAMP,--',
- image: {
- width: 400,
- height: 400
- },
- extra: ''
- },
- pid: {
- default: {
- publisher: 'Example University'
- }
- },
- doi: {
- enabled: false,
- endpoint: 'https://doi.org'
- },
- links: {
- rabbitmq: {
- text: 'RabbitMQ Admin',
- href: '/admin/broker/'
- },
- keycloak: {
- text: 'Keycloak Admin',
- href: '/api/auth/'
- }
- },
- keycloak: {
- client: {
- id: 'dbrepo-client',
- secret: 'MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG'
- }
- }
- }
- },
- routeRules,
- devServer: {
- port: 3001
- },
- modules: [
- '@pinia/nuxt',
- '@pinia-plugin-persistedstate/nuxt',
- '@nuxtjs/i18n'
- ],
- pinia: {
- storesDirs: ['./stores/**'],
- },
- piniaPersistedstate: {
- storage: 'localStorage'
- },
- i18n: {
- lazy: false,
- langDir: 'locales',
- strategy: 'no_prefix',
- defaultLocale: 'de',
- locales: [
- {
- 'code': 'en',
- 'file': 'en-US.json',
- 'name': 'English (US)',
- 'iso': 'en-US'
- },
- {
- 'code': 'de',
- 'file': 'de-AT.json',
- 'name': 'German (AT)',
- 'iso': 'de-AT'
- }
- ]
-
- },
- vite: {
- server: {
- proxy
- },
- vue: {
- template: {
- transformAssetUrls,
- },
- },
- },
- devtools: { enabled: true }
-})
+ app: {
+ head: {
+ charset: 'utf-8',
+ viewport: 'width=device-width, initial-scale=1',
+ meta: [
+ { 'http-equiv': 'Content-Security-Policy', content: 'upgrade-insecure-requests' }
+ ],
+ htmlAttrs: {
+ lang: 'en-US'
+ }
+ }
+ },
+
+ build: {
+ transpile: ['vuetify'],
+ },
+
+ css: [
+ 'vuetify/lib/styles/main.sass',
+ '@mdi/font/css/materialdesignicons.min.css',
+ '@/assets/globals.css',
+ '@/assets/overrides.css',
+ ],
+
+ runtimeConfig: {
+ public: {
+ commit: '',
+ title: 'Database Repository',
+ logo: '/logo.svg',
+ icon: '/favicon.ico',
+ touch: '/apple-touch-icon.png',
+ version: 'bun-dev',
+ broker: {
+ host: 'localhost',
+ port: {
+ '5672': false
+ },
+ extra: ''
+ },
+ variant: {
+ input: {
+ normal: 'underlined',
+ contrast: 'outlined',
+ },
+ button: {
+ normal: 'flat',
+ contrast: 'outlined',
+ },
+ list: {
+ normal: '',
+ contrast: 'flat',
+ }
+ },
+ api: {
+ client: 'http://localhost',
+ server: 'http://gateway-service',
+ },
+ upload: {
+ client: 'http://localhost/api/upload/files'
+ },
+ database: {
+ unsupported: '*,AVG,BIT_AND,BIT_OR,BIT_XOR,COUNT,COUNTDISTINCT,GROUP_CONCAT,JSON_ARRAYAGG,JSON_OBJECTAGG,MAX,MIN,STD,STDDEV,STDDEV_POP,STDDEV_SAMP,SUM,VARIANCE,VAR_POP,VAR_SAMP,--',
+ image: {
+ width: 400,
+ height: 400
+ },
+ extra: ''
+ },
+ pid: {
+ default: {
+ publisher: 'Example University'
+ }
+ },
+ doi: {
+ enabled: false,
+ endpoint: 'https://doi.org'
+ },
+ links: {
+ rabbitmq: {
+ text: 'RabbitMQ Admin',
+ href: '/admin/broker/'
+ },
+ keycloak: {
+ text: 'Keycloak Admin',
+ href: '/api/auth/'
+ }
+ }
+ }
+ },
+
+ routeRules,
+
+ devServer: {
+ port: 3001
+ },
+
+ modules: [
+ '@pinia/nuxt',
+ '@pinia-plugin-persistedstate/nuxt',
+ '@nuxtjs/i18n'
+ ],
+
+ pinia: {
+ storesDirs: ['./stores/**'],
+ },
+
+ piniaPersistedstate: {
+ storage: 'localStorage'
+ },
+
+ i18n: {
+ lazy: false,
+ langDir: 'locales',
+ strategy: 'no_prefix',
+ defaultLocale: 'de',
+ locales: [
+ {
+ 'code': 'en',
+ 'file': 'en-US.json',
+ 'name': 'English (US)',
+ 'iso': 'en-US'
+ },
+ {
+ 'code': 'de',
+ 'file': 'de-AT.json',
+ 'name': 'German (AT)',
+ 'iso': 'de-AT'
+ }
+ ]
+
+ },
+
+ vite: {
+ server: {
+ proxy
+ },
+ vue: {
+ template: {
+ transformAssetUrls,
+ },
+ },
+ },
+
+ devtools: { enabled: true },
+ compatibilityDate: '2024-07-24'
+})
\ No newline at end of file
diff --git a/dbrepo-ui/pages/database/[database_id]/settings.vue b/dbrepo-ui/pages/database/[database_id]/settings.vue
index 558f152fef73cdb22eda4c505eb3d7cb3f6ae153..b7cca1b7aa02c4367c064a9033fc37b2416a2c08 100644
--- a/dbrepo-ui/pages/database/[database_id]/settings.vue
+++ b/dbrepo-ui/pages/database/[database_id]/settings.vue
@@ -31,7 +31,7 @@
<v-row dense>
<v-col md="8">
<v-file-input
- v-model="fileModel"
+ v-model="file"
accept="image/*"
:hint="$t('pages.database.subpages.settings.image.hint')"
persistent-hint
@@ -229,7 +229,7 @@ export default {
loadingSchema: false,
validUpload: false,
loadingDeleteImage: false,
- fileModel: null,
+ file: null,
loadingUsers: false,
editAccessDialog: false,
editVisibilityDialog: false,
@@ -366,10 +366,10 @@ export default {
return this.roles.includes('modify-database-image')
},
databaseImage () {
- if (!this.fileModel) {
+ if (!this.file) {
return null
}
- return URL.createObjectURL(this.fileModel[0])
+ return URL.createObjectURL(this.file[0])
},
maxWidth () {
return this.$config.public.database.image.width
@@ -431,8 +431,9 @@ export default {
},
uploadFile () {
this.loadingUpload = true
+ console.debug('upload file', this.file)
const uploadService = useUploadService()
- uploadService.create(this.fileModel[0])
+ uploadService.create(this.file)
.then((s3key) => {
console.debug('uploaded image', s3key)
const toast = useToastInstance()
@@ -440,6 +441,12 @@ export default {
this.modifyImage.key = s3key
this.loadingUpload = false
})
+ .catch((error) => {
+ console.error('Failed to upload dataset', error)
+ const toast = useToastInstance()
+ toast.error(this.$t('error.upload.dataset'))
+ this.loading = false
+ })
.finally(() => {
this.loadingUpload = false
})
@@ -475,9 +482,12 @@ export default {
this.loadingDeleteImage = false
})
.catch(({code}) => {
+ this.loadingDeleteImage = false
const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ return
+ }
toast.error(this.$t(code))
- this.loadingDeleteImage = false
})
.finally(() => {
this.loadingDeleteImage = false
@@ -514,15 +524,21 @@ export default {
this.loadingSchema = false
})
.catch(({code}) => {
+ this.loadingSchema = false
const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ return
+ }
toast.error(this.$t(code))
- this.loadingSchema = false
})
})
.catch(({code}) => {
+ this.loadingSchema = false
const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ return
+ }
toast.error(this.$t(code))
- this.loadingSchema = false
})
},
giveAccess () {
diff --git a/dbrepo-ui/pages/database/[database_id]/table/[table_id]/data.vue b/dbrepo-ui/pages/database/[database_id]/table/[table_id]/data.vue
index 27191e2a606f838a78956854b18352f93c503e9c..2d7195fbcdebf9645fc2362f867c4a946e81c2d1 100644
--- a/dbrepo-ui/pages/database/[database_id]/table/[table_id]/data.vue
+++ b/dbrepo-ui/pages/database/[database_id]/table/[table_id]/data.vue
@@ -356,9 +356,12 @@ export default {
link.click()
})
.catch(({code}) => {
+ this.downloadLoading = false
const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ return
+ }
toast.error(this.$t(code))
- this.downloadLoading = false
})
.finally(() => {
this.downloadLoading = false
@@ -416,6 +419,9 @@ export default {
console.debug('date columns are', this.dateColumns)
} catch ({code}) {
const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ return
+ }
toast.error(this.$t(code))
}
this.loading = false
@@ -449,10 +455,13 @@ export default {
this.loadingData = false
})
.catch(({code, message}) => {
- const toast = useToastInstance()
- toast.error(this.$t(code) + ": " + message)
this.error = true
this.loadingData = false
+ const toast = useToastInstance()
+ if (typeof code !== 'string' || typeof message !== 'string') {
+ return
+ }
+ toast.error(this.$t(code) + ": " + message)
})
},
loadCount () {
@@ -464,9 +473,12 @@ export default {
this.loadingCount = false
})
.catch(({code, message}) => {
+ this.loadingCount = false
const toast = useToastInstance()
+ if (typeof code !== 'string' || typeof message !== 'string') {
+ return
+ }
toast.error(this.$t(code) + ": " + message)
- this.loadingCount = false
})
},
isFileField (column) {
diff --git a/dbrepo-ui/pages/database/[database_id]/table/[table_id]/import.vue b/dbrepo-ui/pages/database/[database_id]/table/[table_id]/import.vue
index 7b29c6ba8e9f22c1568db41b5ab8898a63b0bda6..38c9be5567046b7b7d97b4941aa4f8bb5170daff 100644
--- a/dbrepo-ui/pages/database/[database_id]/table/[table_id]/import.vue
+++ b/dbrepo-ui/pages/database/[database_id]/table/[table_id]/import.vue
@@ -1,5 +1,6 @@
<template>
- <div v-if="canInsertTableData">
+ <div
+ v-if="canInsertTableData">
<v-toolbar flat>
<v-btn
class="mr-2"
@@ -18,8 +19,7 @@
vertical
variant="flat">
<TableImport
- :table-id="$route.params.table_id"
- @analyse="onAnalyse" />
+ :table-id="$route.params.table_id" />
</v-stepper>
</v-card-text>
</v-card>
@@ -94,11 +94,6 @@ export default {
}
return this.roles.includes('insert-table-data')
}
- },
- methods: {
- onAnalyse (event) {
- const { columns } = event
- }
}
}
</script>
diff --git a/dbrepo-ui/pages/database/[database_id]/table/[table_id]/info.vue b/dbrepo-ui/pages/database/[database_id]/table/[table_id]/info.vue
index 47ba1af4337a011f2f160baa574bdeb7087e8615..08b42c0d936c7e034b67e09edbd07203edde12d7 100644
--- a/dbrepo-ui/pages/database/[database_id]/table/[table_id]/info.vue
+++ b/dbrepo-ui/pages/database/[database_id]/table/[table_id]/info.vue
@@ -32,6 +32,10 @@
:title="$t('pages.table.id.title')">
{{ table.id }}
</v-list-item>
+ <v-list-item
+ :title="$t('pages.table.name.title')">
+ {{ table.internal_name }}
+ </v-list-item>
<v-list-item
:title="$t('pages.table.size.title')">
{{ sizeToHumanLabel(table.data_length) }}
@@ -71,7 +75,8 @@
</v-list>
</v-card-text>
</v-card>
- <v-divider />
+ <v-divider
+ v-if="canWrite && canWriteQueues" />
<v-card
v-if="canWrite && canWriteQueues"
variant="flat"
@@ -86,25 +91,11 @@
</v-list-item>
<v-list-item
:title="$t('pages.table.exchange.title')">
- <span>
- <v-badge
- inline
- color="code"
- :content="database.exchange_type">
- <span v-text="database.exchange_name" />
- </v-badge>
- </span>
+ {{ database.exchange_name }}
</v-list-item>
<v-list-item
:title="$t('pages.table.queue.title')">
- <span>
- <v-badge
- inline
- color="code"
- :content="table.queue_type" >
- <span v-text="table.queue_name" />
- </v-badge>
- </span>
+ {{ table.queue_name }}
</v-list-item>
<v-list-item
:title="$t('pages.table.routing-key.title')">
@@ -261,7 +252,7 @@ export default {
return this.userStore.getAccess
},
hasDescription () {
- return this.table && this.table.description !== null
+ return this.table && this.table.description
},
canWriteQueues () {
if (!this.roles) {
@@ -306,7 +297,7 @@ export default {
if (!this.$config.public.broker.port) {
return []
}
- Object.keys(this.$config.public.broker.port).map(key => {
+ return Object.keys(this.$config.public.broker.port).map(key => {
return {
port: key,
secure: this.$config.public.broker.port[key]
@@ -325,7 +316,6 @@ export default {
}
},
methods: {
- sizeToHumanLabel,
amqpString (port) {
if (!this.user) {
return null
diff --git a/dbrepo-ui/pages/database/[database_id]/table/import.vue b/dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue
similarity index 84%
rename from dbrepo-ui/pages/database/[database_id]/table/import.vue
rename to dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue
index 724205c7ba1934dfcbe4c4e3b4a88659e47f77b6..9a68b5786f286b5a8123c71669aac75307c2782f 100644
--- a/dbrepo-ui/pages/database/[database_id]/table/import.vue
+++ b/dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue
@@ -13,6 +13,21 @@
<v-card
variant="flat"
rounded="0">
+ <v-card-text>
+ <v-row>
+ <v-col
+ md="8">
+ <v-alert
+ border="start"
+ color="info">
+ {{ $t('pages.table.subpages.import.dataset.text') }}
+ <NuxtLink
+ :href="`/database/${$route.params.database_id}/table/create/schema`"
+ v-text="$t('pages.table.subpages.import.schema.text')" />
+ </v-alert>
+ </v-col>
+ </v-row>
+ </v-card-text>
<v-card-text>
<v-stepper
vertical
@@ -28,10 +43,11 @@
<v-form
ref="form"
v-model="validStep1"
+ :disabled="step > 4"
@submit.prevent="submit">
<v-container>
<v-row dense>
- <v-col md="8">
+ <v-col md="4">
<v-text-field
v-model="tableCreate.name"
:rules="[
@@ -46,9 +62,7 @@
:hint="$t('pages.table.subpages.import.name.hint')"
:label="$t('pages.table.subpages.import.name.label')"/>
</v-col>
- </v-row>
- <v-row dense>
- <v-col md="8">
+ <v-col md="4">
<v-text-field
v-model="generatedTableName"
:rules="[
@@ -86,8 +100,8 @@
</v-form>
</v-stepper-window>
<TableImport
- :step-start="2"
:create="true"
+ :disabled="!validStep1 || step > 4"
:table="table"
@analyse="onAnalyse"/>
<v-stepper-header>
@@ -103,6 +117,7 @@
<TableSchema
ref="schema"
:back="false"
+ :disabled="step > 4"
:loading="loading"
:submit-text="$t('navigation.continue')"
:columns="tableCreate.columns"
@@ -119,25 +134,33 @@
direction="vertical">
<v-container>
<v-row dense>
- <v-col>
+ <v-col
+ md="8">
<v-alert
border="start"
color="success">
- {{ $t('pages.table.subpages.create.summary.prefix') }}
+ {{ $t('pages.table.subpages.create.summary.text') }}
<strong v-text="table.internal_name"/>
- {{ $t('pages.table.subpages.create.summary.suffix') }}
</v-alert>
</v-col>
</v-row>
<v-row>
<v-col>
+ <v-btn
+ class="mb-1 mr-2"
+ color="tertiary"
+ size="small"
+ variant="flat"
+ :loading="loadingImport"
+ :text="$t('navigation.import')"
+ @click="onImport"/>
<v-btn
class="mb-1"
color="secondary"
size="small"
variant="flat"
:loading="loadingContinue"
- :text="$t('navigation.data')"
+ :text="$t('navigation.view')"
@click="onContinue"/>
</v-col>
</v-row>
@@ -169,6 +192,7 @@ export default {
validStep4: false,
error: false,
loadingContinue: false,
+ loadingImport: false,
fileModel: null,
rowCount: null,
file: {
@@ -306,61 +330,32 @@ export default {
if (!success) {
return
}
- const payload = Object.assign({}, this.tableCreate)
- payload.columns = columns
- payload.constraints = constraints
- this.createTable(payload)
- .then(table => this.import(table))
- },
- createTable(payload) {
+ const schema = Object.assign({}, this.tableCreate)
+ schema.columns = columns
+ schema.constraints = constraints
this.loading = true
const tableService = useTableService()
- return new Promise((resolve, reject) => {
- if (this.table) {
- resolve(this.table)
- return
- }
- tableService.create(this.$route.params.database_id, payload)
+ tableService.create(this.$route.params.database_id, schema)
.then((table) => {
this.table = table
- resolve(table)
- })
- .catch((error) => {
- console.error('Failed to create table', error)
const toast = useToastInstance()
- toast.error(this.$t(error.code))
- this.loading = false
- reject(error)
- })
- .finally(() => {
- this.loading = false
- })
- })
- },
- import(table) {
- this.loading = true
- const tableService = useTableService()
- tableService.importCsv(this.$route.params.database_id, table.id, this.tableImport)
- .then(() => {
+ toast.success(this.$t('success.table.created'))
this.step = 5
- const toast = useToastInstance()
- toast.success(this.$t('success.import.dataset'))
- this.cacheStore.reloadDatabase()
})
- .catch(({code}) => {
- console.error('Failed to import csv')
- const toast = useToastInstance()
- toast.error(this.$t(code))
+ .catch(({code, message}) => {
this.loading = false
+ const toast = useToastInstance()
+ if (typeof code !== 'string' || typeof message !== 'string') {
+ /* fallback */
+ toast.error(`${this.$t('error.table.create')}: ${message}`)
+ return
+ }
+ toast.error(`${this.$t(code)}: ${message}`)
})
.finally(() => {
this.loading = false
})
},
- schemaValidity(event) {
- const {valid} = event
- this.validStep4 = valid
- },
onAnalyse({columns, filename, line_termination}) {
console.debug('analysed', columns)
this.tableCreate.columns = columns
@@ -370,6 +365,10 @@ export default {
this.step = 4
}
},
+ async onImport () {
+ this.loadingImport = true
+ await this.$router.push({ path: `/database/${this.$route.params.database_id}/table/${this.table.id}/import`, query: this.tableImport })
+ },
async onContinue () {
this.loadingContinue = true
await this.$router.push(`/database/${this.$route.params.database_id}/table/${this.table.id}/data`)
diff --git a/dbrepo-ui/pages/database/[database_id]/table/create.vue b/dbrepo-ui/pages/database/[database_id]/table/create/schema.vue
similarity index 92%
rename from dbrepo-ui/pages/database/[database_id]/table/create.vue
rename to dbrepo-ui/pages/database/[database_id]/table/create/schema.vue
index 52af4ad304db37b7884c746447a1f0629fd0fa8e..b60de5df3045d3f51bcbb2c203afdff18be87699 100644
--- a/dbrepo-ui/pages/database/[database_id]/table/create.vue
+++ b/dbrepo-ui/pages/database/[database_id]/table/create/schema.vue
@@ -31,7 +31,7 @@
@submit.prevent="submit">
<v-container>
<v-row dense>
- <v-col md="8">
+ <v-col md="4">
<v-text-field
v-model="tableCreate.name"
:rules="[
@@ -46,9 +46,7 @@
:hint="$t('pages.table.subpages.import.name.hint')"
:label="$t('pages.table.subpages.import.name.label')" />
</v-col>
- </v-row>
- <v-row dense>
- <v-col md="8">
+ <v-col md="4">
<v-text-field
v-model="generatedTableName"
:rules="[
@@ -96,7 +94,7 @@
<v-container>
<TableSchema
submit-text="Create"
- :disabled="!tableCreate.name || table"
+ :disabled="!valid || table"
:columns="tableCreate.columns"
:loading="loading"
@close="schemaClose" />
@@ -109,8 +107,9 @@
:value="3" />
</v-stepper-header>
<v-stepper-window
+ v-if="table"
direction="vertical">
- <v-container v-if="table">
+ <v-container>
<v-row
dense>
<v-col md="8">
@@ -122,6 +121,14 @@
</v-row>
<v-row>
<v-col>
+ <v-btn
+ color="tertiary"
+ class="mr-2"
+ variant="flat"
+ size="small"
+ :loading="loadingImport"
+ :text="$t('navigation.import')"
+ @click="onImport" />
<v-btn
color="secondary"
variant="flat"
@@ -157,6 +164,7 @@ export default {
valid: false,
description: null,
loading: false,
+ loadingImport: false,
loadingContinue: false,
step: 1,
table: null,
@@ -261,9 +269,12 @@ export default {
this.table = table
})
.catch(({code}) => {
+ this.loading = false
const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ return
+ }
toast.error(this.$t(code))
- this.loading = false
})
.finally(() => {
this.loading = false
@@ -276,6 +287,10 @@ export default {
}
this.createTable(columns, constraints)
},
+ async onImport () {
+ this.loadingImport = true
+ await this.$router.push(`/database/${this.$route.params.database_id}/table/${this.table.id}/import`)
+ },
async onContinue () {
this.loadingContinue = true
await this.$router.push(`/database/${this.$route.params.database_id}/table/${this.table.id}/info`)
diff --git a/dbrepo-ui/pages/login.vue b/dbrepo-ui/pages/login.vue
index 38c2ce139e10816a89555d7b25fdf658073f5ded..9a412a0b47c4de9bf642f4a8820f41593ef0f960 100644
--- a/dbrepo-ui/pages/login.vue
+++ b/dbrepo-ui/pages/login.vue
@@ -137,13 +137,19 @@ export default {
})
.catch(({code}) => {
const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ return
+ }
toast.error(this.$t(code))
})
})
.catch(({code}) => {
+ this.loading = false
const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ return
+ }
toast.error(this.$t(code))
- this.loading = false
})
.finally(() => {
this.loading = false
diff --git a/dbrepo-ui/pages/signup.vue b/dbrepo-ui/pages/signup.vue
index 9d84f5c0df8a36b3b56590e42903058895bccb0e..54c00602256c7815d8aff0b255214e66836bc727 100644
--- a/dbrepo-ui/pages/signup.vue
+++ b/dbrepo-ui/pages/signup.vue
@@ -47,7 +47,9 @@
autocomplete="off"
required
name="password"
- :rules="[v => !!v || $t('validation.required')]"
+ :rules="[
+ v => !!v || $t('validation.required')
+ ]"
type="password"
persistent-hint
:label="$t('pages.signup.password.label')"
@@ -61,7 +63,10 @@
autocomplete="off"
required
name="password-confirm"
- :rules="[v => !!v || $t('validation.required'), v => (!!v && v) === createAccount.password || $t('Not matching!')]"
+ :rules="[
+ v => !!v || $t('validation.required')
+ ]"
+ :error-messages="password2 && password2 !== this.createAccount.password ? [this.$t('validation.matching')] : []"
type="password"
persistent-hint
:label="$t('pages.signup.confirm.label')"
@@ -123,9 +128,12 @@ export default {
this.loading = false
})
.catch(({code}) => {
+ this.loading = false
const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ return
+ }
toast.error(this.$t(code))
- this.loading = false
})
.finally(() => {
this.loading = false
@@ -139,9 +147,12 @@ export default {
this.usernames = users.map(u => u.username)
})
.catch(({code}) => {
+ this.loadingUsers = false
const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ return
+ }
toast.error(this.$t(code))
- this.loadingUsers = false
})
.finally(() => {
this.loadingUsers = false
diff --git a/dbrepo-ui/pages/user/authentication.vue b/dbrepo-ui/pages/user/authentication.vue
index a40fef51e5e8f6b690beffa65d605110384f1c7b..4cb3e11a02c34f38cf2a5a197e10c4d33762661f 100644
--- a/dbrepo-ui/pages/user/authentication.vue
+++ b/dbrepo-ui/pages/user/authentication.vue
@@ -112,10 +112,10 @@ export default {
changePassword () {
this.loadingUpdate = true
const userService = useUserService()
- userService.updatePassword(this.user.id, this.password)
+ userService.updatePassword(this.user.id, {'password': this.password})
.then(() => {
const toast = useToastInstance()
- toast.success('success.user.password')
+ toast.success(this.$t('success.user.password'))
this.loadingUpdate = false
})
.catch(() => {
diff --git a/dbrepo-ui/utils/index.ts b/dbrepo-ui/utils/index.ts
index 66dbe9448329faab2b2c18b4801bb59d878d06bb..d940d076ae2b2d4fafac31c6dca8ad833342f64a 100644
--- a/dbrepo-ui/utils/index.ts
+++ b/dbrepo-ui/utils/index.ts
@@ -1,7 +1,6 @@
-import {format} from 'date-fns'
+import { format } from 'date-fns'
import moment from 'moment'
import type {AxiosError} from 'axios'
-import type {Api} from "@vitejs/plugin-vue";
export function notEmpty(str: string) {
@@ -1086,7 +1085,7 @@ export function timestampsToHumanDifference(date1: string, date2: string) {
export function sizeToHumanLabel(num: number) {
let number = Number(num)
if (!number) {
- return '0'
+ return '0 B'
}
if (number < 1000) {
return `${Math.floor(number)} B`
diff --git a/docker-compose.yml b/docker-compose.yml
index 17389cad12cdd606c9c1e91d4c5d4b8fdfabf168..3c78d4d9e9db11765aa5ea47b7f4c781c9ca1743 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.6"
-
volumes:
metadata-db-data:
data-db-data:
@@ -8,26 +6,25 @@ volumes:
upload-service-data:
search-db-data:
storage-service-data:
+ identity-service-data:
services:
dbrepo-metadata-db:
restart: "no"
container_name: dbrepo-metadata-db
hostname: metadata-db
- image: dbrepo-metadata-db:latest
- build:
- context: ./dbrepo-metadata-db
- network: host
+ image: docker.io/bitnami/mariadb:11.1.3-debian-11-r6
volumes:
- metadata-db-data:/bitnami/mariadb
- - ./dbrepo-metadata-db/setup-data.sql:/docker-entrypoint-initdb.d/setup-schema_local.sql
+ - ./dbrepo-metadata-db/1_setup-schema.sql:/docker-entrypoint-initdb.d/1_setup-schema.sql
+ - ./dbrepo-metadata-db/2_setup-data.sql:/docker-entrypoint-initdb.d/2_setup-data.sql
ports:
- "3306:3306"
environment:
MARIADB_DATABASE: "${METADATA_DB:-dbrepo}"
- MARIADB_ROOT_PASSWORD: "${METADATA_PASSWORD:-dbrepo}"
+ MARIADB_ROOT_PASSWORD: "${METADATA_DB_PASSWORD:-dbrepo}"
healthcheck:
- test: mysqladmin ping --user="${METADATA_USERNAME:-root}" --password="${METADATA_PASSWORD:-dbrepo}" --silent
+ test: mysqladmin ping --user=root --password="${METADATA_DB_PASSWORD:-dbrepo}" --silent
interval: 10s
timeout: 5s
retries: 12
@@ -38,17 +35,16 @@ services:
restart: "no"
container_name: dbrepo-data-db
hostname: data-db
- image: docker.io/bitnami/mariadb-galera:11.2.2-debian-11-r0
+ image: docker.io/bitnami/mariadb:11.1.3-debian-11-r6
volumes:
- data-db-data:/bitnami/mariadb
- "${SHARED_VOLUME:-/tmp}:/tmp"
ports:
- "3307:3306"
environment:
- MARIADB_ROOT_PASSWORD: "${USER_DB_PASSWORD:-dbrepo}"
- MARIADB_GALERA_MARIABACKUP_PASSWORD: "${USER_DB_BACKUP_PASSWORD:-dbrepo}"
+ MARIADB_ROOT_PASSWORD: "${DATA_DB_PASSWORD:-dbrepo}"
healthcheck:
- test: mysqladmin ping --user="${USER_DB_USERNAME:-root}" --password="${USER_DB_PASSWORD:-dbrepo}" --silent
+ test: mysqladmin ping --user=root --password="${DATA_DB_PASSWORD:-dbrepo}" --silent
interval: 10s
timeout: 5s
retries: 12
@@ -59,17 +55,17 @@ services:
restart: "no"
container_name: dbrepo-auth-db
hostname: auth-db
- image: docker.io/bitnami/mariadb:11.2.2-debian-11-r0
+ image: docker.io/bitnami/mariadb:11.1.3-debian-11-r6
volumes:
- auth-db-data:/bitnami/mariadb
ports:
- "3308:3306"
environment:
- MARIADB_DATABASE: "${AUTH_DB:-keycloak}"
- MARIADB_ROOT_PASSWORD: "${AUTH_PASSWORD:-dbrepo}"
+ MARIADB_DATABASE: "${AUTH_DB_NAME:-keycloak}"
+ MARIADB_ROOT_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
healthcheck:
- test: mysqladmin ping --user="${AUTH_USERNAME:-root}" --password="${AUTH_PASSWORD:-dbrepo}" --silent
- interval: 10s
+ test: mysqladmin ping --user=root --password="${AUTH_DB_PASSWORD:-dbrepo}" --silent
+ interval: 15s
timeout: 5s
retries: 12
logging:
@@ -87,16 +83,18 @@ services:
network: host
healthcheck:
test: curl -sSL 'http://0.0.0.0:8080/realms/dbrepo' | grep "dbrepo" || exit 1
- interval: 10s
+ interval: 15s
timeout: 5s
retries: 12
environment:
AUTH_DB: "${AUTH_DB:-keycloak}"
- KC_DB_USERNAME: "${AUTH_USERNAME:-root}"
- KC_DB_PASSWORD: "${AUTH_PASSWORD:-dbrepo}"
- KEYCLOAK_ADMIN: "${KEYCLOAK_ADMIN:-fda}"
- KEYCLOAK_ADMIN_PASSWORD: "${KEYCLOAK_ADMIN_PASSWORD:-fda}"
+ KC_DB_USERNAME: root
+ KC_DB_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
+ KEYCLOAK_ADMIN: "${AUTH_SERVICE_ADMIN_USERNAME:-admin}"
+ KEYCLOAK_ADMIN_PASSWORD: "${AUTH_SERVICE_ADMIN_PASSWORD:-admin}"
depends_on:
+ dbrepo-identity-service:
+ condition: service_healthy
dbrepo-auth-db:
condition: service_healthy
logging:
@@ -116,42 +114,43 @@ services:
- "${SHARED_VOLUME:-/tmp}:/tmp"
environment:
ADMIN_EMAIL: "${ADMIN_EMAIL:-noreply@localhost}"
- ADMIN_PASSWORD: "${ADMIN_PASSWORD:-admin}"
- ADMIN_USERNAME: "${ADMIN_USERNAME:-admin}"
- ANALYSE_SERVICE_ENDPOINT: "${ANALYSE_SERVICE_ENDPOINT:-http://gateway-service}"
- AUTH_SERVICE_ADMIN: ${AUTH_SERVICE_ADMIN:-fda}
- AUTH_SERVICE_ADMIN_PASSWORD: ${AUTH_SERVICE_ADMIN_PASSWORD:-fda}
+ ANALYSE_SERVICE_ENDPOINT: "${ANALYSE_SERVICE_ENDPOINT:-http://analyse-service:8080}"
+ AUTH_SERVICE_ADMIN: ${AUTH_SERVICE_ADMIN:-admin}
+ AUTH_SERVICE_ADMIN_PASSWORD: ${AUTH_SERVICE_ADMIN_PASSWORD:-admin}
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
- AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
- AUTH_SERVICE_ENDPOINT: ${AUTH_SERVICE_ENDPOINT:-http://gateway-service/api/auth}
+ AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT_SECRET:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
+ AUTH_SERVICE_ENDPOINT: ${AUTH_SERVICE_ENDPOINT:-http://auth-service:8080}
BASE_URL: "${BASE_URL:-http://localhost}"
BROKER_EXCHANGE_NAME: ${BROKER_EXCHANGE_NAME:-dbrepo}
BROKER_QUEUE_NAME: ${BROKER_QUEUE_NAME:-dbrepo}
BROKER_HOST: "${BROKER_ENDPOINT:-broker-service}"
- BROKER_PASSWORD: ${BROKER_PASSWORD:-fda}
+ BROKER_PASSWORD: ${BROKER_PASSWORD:-admin}
BROKER_PORT: ${BROKER_PORT:-5672}
- BROKER_SERVICE_ENDPOINT: ${BROKER_SERVICE_ENDPOINT:-http://gateway-service/admin/broker}
- BROKER_USERNAME: ${BROKER_USERNAME:-fda}
+ BROKER_SERVICE_ENDPOINT: ${BROKER_SERVICE_ENDPOINT:-http://broker-service:15672}
+ BROKER_USERNAME: ${BROKER_USERNAME:-admin}
BROKER_VIRTUALHOST: "${BROKER_VIRTUALHOST:-dbrepo}"
+ CROSSREF_ENDPOINT: "${CROSSREF_ENDPOINT:-http://data.crossref.org}"
DATA_SERVICE_ENDPOINT: ${DATA_SERVICE_ENDPOINT:-http://data-service:8080}
DELETED_RECORD: "${DELETED_RECORD:-persistent}"
GRANULARITY: "${GRANULARITY:-YYYY-MM-DDThh:mm:ssZ}"
JWT_PUBKEY: "${JWT_PUBKEY:-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB}"
LOG_LEVEL: ${LOG_LEVEL:-info}
METADATA_DB: "${METADATA_DB:-dbrepo}"
+ METADATA_DB_PASSWORD: "${METADATA_DB_PASSWORD:-dbrepo}"
METADATA_HOST: "${METADATA_HOST:-metadata-db}"
METADATA_JDBC_EXTRA_ARGS: "${METADATA_JDBC_EXTRA_ARGS:-}"
- METADATA_USERNAME: "${METADATA_USERNAME:-root}"
- METADATA_PASSWORD: "${METADATA_PASSWORD:-dbrepo}"
- PID_BASE: ${PID_BASE:-http://localhost/pid/}
+ METADATA_PORT: "${METADATA_PORT:-3306}"
+ METADATA_USERNAME: root
REPOSITORY_NAME: "${REPOSITORY_NAME:-Database Repository}"
- SEARCH_SERVICE_ENDPOINT: "${SEARCH_SERVICE_ENDPOINT:-http://gateway-service}"
+ ROR_ENDPOINT: "${ROR_ENDPOINT:-https://api.ror.org}"
+ SEARCH_SERVICE_ENDPOINT: "${SEARCH_SERVICE_ENDPOINT:-http://search-service:8080}"
S3_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-seaweedfsadmin}"
+ S3_BUCKET: "${S3_BUCKET:-dbrepo}"
S3_ENDPOINT: "${S3_ENDPOINT:-http://storage-service:9000}"
- S3_EXPORT_BUCKET: "${S3_EXPORT_BUCKET:-dbrepo-download}"
- S3_IMPORT_BUCKET: "${S3_IMPORT_BUCKET:-dbrepo-upload}"
S3_SECRET_ACCESS_KEY: "${S3_SECRET_ACCESS_KEY:-seaweedfsadmin}"
SPARQL_CONNECTION_TIMEOUT: "${SPARQL_CONNECTION_TIMEOUT:-10000}"
+ SYSTEM_USERNAME: "${SYSTEM_USERNAME:-admin}"
+ SYSTEM_PASSWORD: "${SYSTEM_PASSWORD:-admin}"
healthcheck:
test: curl -sSL localhost:8080/actuator/health/liveness | grep 'UP' || exit 1
interval: 10s
@@ -180,18 +179,16 @@ services:
ports:
- "5000:8080"
environment:
- ADMIN_PASSWORD: "${ADMIN_PASSWORD:-admin}"
- ADMIN_USERNAME: "${ADMIN_USERNAME:-admin}"
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
AUTH_SERVICE_ENDPOINT: ${AUTH_SERVICE_ENDPOINT:-http://auth-service:8080}
- GATEWAY_SERVICE_ENDPOINT: ${GATEWAY_SERVICE_ENDPOINT:-http://gateway-service}
JWT_PUBKEY: "${JWT_PUBKEY:-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB}"
S3_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-seaweedfsadmin}"
+ S3_BUCKET: "${S3_BUCKET:-dbrepo}"
S3_ENDPOINT: "${S3_ENDPOINT:-http://storage-service:9000}"
- S3_EXPORT_BUCKET: "${S3_EXPORT_BUCKET:-dbrepo-download}"
- S3_IMPORT_BUCKET: "${S3_IMPORT_BUCKET:-dbrepo-upload}"
S3_SECRET_ACCESS_KEY: "${S3_SECRET_ACCESS_KEY:-seaweedfsadmin}"
+ SYSTEM_USERNAME: "${SYSTEM_USERNAME:-admin}"
+ SYSTEM_PASSWORD: "${SYSTEM_PASSWORD:-admin}"
volumes:
- "${SHARED_FILESYSTEM:-/tmp}:/tmp"
healthcheck:
@@ -207,15 +204,17 @@ services:
container_name: dbrepo-broker-service
hostname: broker-service
image: docker.io/bitnami/rabbitmq:3.12-debian-12
+ ports:
+ - 15672:15672
+ - 5672:5672
volumes:
- ./dbrepo-broker-service/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf
+ - ./dbrepo-broker-service/advanced.config:/etc/rabbitmq/advanced.config
- ./dbrepo-broker-service/enabled_plugins:/etc/rabbitmq/enabled_plugins
- - ./dbrepo-broker-service/cert.pem:/app/cert.pem
- - ./dbrepo-broker-service/pubkey.pem:/app/pubkey.pem
- ./dbrepo-broker-service/definitions.json:/app/definitions.json
- broker-service-data:/bitnami/rabbitmq/mnesia
depends_on:
- dbrepo-auth-service:
+ dbrepo-identity-service:
condition: service_healthy
healthcheck:
test: rabbitmq-diagnostics -q is_running | grep 'is fully booted and running'
@@ -263,16 +262,15 @@ services:
ports:
- "4000:8080"
environment:
- ADMIN_PASSWORD: "${ADMIN_PASSWORD:-admin}"
- ADMIN_USERNAME: "${ADMIN_USERNAME:-admin}"
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
- AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
+ AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT_SECRET:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
AUTH_SERVICE_ENDPOINT: ${AUTH_SERVICE_ENDPOINT:-http://auth-service:8080}
COLLECTION: ${COLLECTION:-['database','table','column','identifier','unit','concept','user','view']}
+ METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}
OPENSEARCH_HOST: ${OPENSEARCH_HOST:-search-db}
OPENSEARCH_PORT: ${OPENSEARCH_PORT:-9200}
- OPENSEARCH_USERNAME: ${OPENSEARCH_USERNAME:-admin}
- OPENSEARCH_PASSWORD: ${OPENSEARCH_PASSWORD:-admin}
+ OPENSEARCH_USERNAME: ${SEARCH_DB_USERNAME:-admin}
+ OPENSEARCH_PASSWORD: ${SEARCH_DB_PASSWORD:-admin}
LOG_LEVEL: ${LOG_LEVEL:-info}
dbrepo-data-db-sidecar:
@@ -287,10 +285,9 @@ services:
- "3305:8080"
environment:
S3_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-seaweedfsadmin}"
+ S3_BUCKET: "${S3_BUCKET:-dbrepo}"
S3_ENDPOINT: "${S3_ENDPOINT:-http://storage-service:9000}"
- S3_EXPORT_BUCKET: "${S3_EXPORT_BUCKET:-dbrepo-download}"
S3_FILE_PATH: "${S3_FILE_PATH:-/tmp}"
- S3_IMPORT_BUCKET: "${S3_IMPORT_BUCKET:-dbrepo-upload}"
S3_SECRET_ACCESS_KEY: "${S3_SECRET_ACCESS_KEY:-seaweedfsadmin}"
volumes:
- "${SHARED_FILESYSTEM:-/tmp}:/tmp"
@@ -330,7 +327,7 @@ services:
restart: "no"
container_name: dbrepo-gateway-service
hostname: gateway-service
- image: docker.io/nginx:1.25-alpine-slim
+ image: docker.io/nginx:1.27.0-alpine3.19-slim
ports:
- "80:80"
- "443:443"
@@ -368,6 +365,30 @@ services:
logging:
driver: json-file
+ dbrepo-identity-service:
+ restart: "no"
+ container_name: dbrepo-identity-service
+ hostname: identity-service
+ image: bitnami/openldap:2.6.8-debian-12-r1
+ ports:
+ - '1389:1389'
+ - '1636:1636'
+ environment:
+ LDAP_ADMIN_USERNAME: "${IDENTITY_SERVICE_ADMIN_USERNAME:-admin}"
+ LDAP_ADMIN_PASSWORD: "${IDENTITY_SERVICE_ADMIN_PASSWORD:-admin}"
+ LDAP_USERS: "${SYSTEM_USERNAME:-admin}"
+ LDAP_PASSWORDS: "${SYSTEM_PASSWORD:-admin}"
+ LDAP_GROUP: "${ADMIN_GROUP:-system}"
+ LDAP_ROOT: "${IDENTITY_SERVICE_ROOT:-dc=dbrepo,dc=at}"
+ LDAP_ADMIN_DN: "${IDENTITY_SERVICE_ADMIN_DN:-cn=admin,dc=dbrepo,dc=at}"
+ volumes:
+ - identity-service-data:/bitnami/openldap
+ healthcheck:
+ test: "ldapwhoami -H ldap://localhost:1389 -D ${IDENTITY_SERVICE_ADMIN_DN:-cn=admin,dc=dbrepo,dc=at} -w ${IDENTITY_SERVICE_ADMIN_PASSWORD:-admin} || exit 1"
+ interval: 10s
+ timeout: 5s
+ retries: 12
+
dbrepo-search-service-init:
restart: "no"
container_name: dbrepo-search-service-init
@@ -377,12 +398,11 @@ services:
context: ./dbrepo-search-service/init
network: host
environment:
- GATEWAY_SERVICE_ENDPOINT: ${GATEWAY_SERVICE_ENDPOINT:-http://gateway-service}
+ METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}
OPENSEARCH_HOST: ${OPENSEARCH_HOST:-search-db}
OPENSEARCH_PORT: ${OPENSEARCH_PORT:-9200}
- OPENSEARCH_USERNAME: ${OPENSEARCH_USERNAME:-admin}
- OPENSEARCH_PASSWORD: ${OPENSEARCH_PASSWORD:-admin}
- LOG_LEVEL: ${LOG_LEVEL:-info}
+ OPENSEARCH_USERNAME: ${SEARCH_DB_USERNAME:-admin}
+ OPENSEARCH_PASSWORD: ${SEARCH_DB_PASSWORD:-admin}
depends_on:
dbrepo-search-db:
condition: service_healthy
@@ -417,7 +437,8 @@ services:
context: ./dbrepo-storage-service/init
network: host
environment:
- SEAWEEDFS_ENDPOINT: "${STORAGE_SEAWEEDFS_ENDPOINT:-storage-service:9333}"
+ WEED_CLUSTER_SW_MASTER: "${STORAGE_SERVICE_MASTER_ENDPOINT:-storage-service:9333}"
+ S3_BUCKET: "${S3_BUCKET:-dbrepo}"
depends_on:
dbrepo-storage-service:
condition: service_healthy
@@ -430,9 +451,11 @@ services:
hostname: upload-service
image: docker.io/tusproject/tusd:v2.4.0
command:
- - "--base-path=/api/upload/files/"
+ - "-behind-proxy"
+ - "-max-size=2000000000"
+ - "-base-path=/api/upload/files/"
- "-s3-endpoint=${STORAGE_ENDPOINT:-http://storage-service:9000}"
- - "-s3-bucket=dbrepo-upload"
+ - "-s3-bucket=dbrepo"
environment:
AWS_ACCESS_KEY_ID: "${STORAGE_USERNAME:-seaweedfsadmin}"
AWS_SECRET_ACCESS_KEY: "${STORAGE_PASSWORD:-seaweedfsadmin}"
@@ -461,24 +484,22 @@ services:
volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp"
environment:
- ADMIN_PASSWORD: "${ADMIN_PASSWORD:-admin}"
- ADMIN_USERNAME: "${ADMIN_USERNAME:-admin}"
- AUTH_SERVICE_ADMIN: ${AUTH_SERVICE_ADMIN:-fda}
- AUTH_SERVICE_ADMIN_PASSWORD: ${AUTH_SERVICE_ADMIN_PASSWORD:-fda}
+ AUTH_SERVICE_ADMIN: ${AUTH_SERVICE_ADMIN:-admin}
+ AUTH_SERVICE_ADMIN_PASSWORD: ${AUTH_SERVICE_ADMIN_PASSWORD:-admin}
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
AUTH_SERVICE_ENDPOINT: ${AUTH_SERVICE_ENDPOINT:-http://auth-service:8080}
BROKER_EXCHANGE_NAME: ${BROKER_EXCHANGE_NAME:-dbrepo}
BROKER_QUEUE_NAME: ${BROKER_QUEUE_NAME:-dbrepo}
BROKER_HOST: "${BROKER_ENDPOINT:-broker-service}"
- BROKER_PASSWORD: ${BROKER_PASSWORD:-fda}
+ BROKER_PASSWORD: ${SYSTEM_PASSWORD:-admin}
BROKER_PORT: ${BROKER_PORT:-5672}
BROKER_SERVICE_ENDPOINT: ${BROKER_SERVICE_ENDPOINT:-http://gateway-service/admin/broker}
- BROKER_USERNAME: ${BROKER_USERNAME:-fda}
+ BROKER_USERNAME: ${SYSTEM_USERNAME:-admin}
BROKER_VIRTUALHOST: "${BROKER_VIRTUALHOST:-dbrepo}"
CONNECTION_TIMEOUT: ${CONNECTION_TIMEOUT:-60000}
EXCHANGE_NAME: ${EXCHANGE_NAME:-dbrepo}
- METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://gateway-service}
+ METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}
GRANT_DEFAULT_READ: "${GRANT_DEFAULT_READ:-SELECT}"
GRANT_DEFAULT_WRITE: "${GRANT_DEFAULT_WRITE:-SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE}"
JWT_PUBKEY: "${JWT_PUBKEY:-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB}"
@@ -489,11 +510,13 @@ services:
REQUEUE_REJECTED: ${REQUEUE_REJECTED:-false}
ROUTING_KEY: "${ROUTING_KEY:-dbrepo.#}"
S3_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-seaweedfsadmin}"
+ S3_BUCKET: "${S3_BUCKET:-dbrepo}"
S3_ENDPOINT: "${S3_ENDPOINT:-http://storage-service:9000}"
- S3_EXPORT_BUCKET: "${S3_EXPORT_BUCKET:-dbrepo-download}"
S3_FILE_PATH: "${S3_FILE_PATH:-/tmp}"
S3_IMPORT_BUCKET: "${S3_IMPORT_BUCKET:-dbrepo-upload}"
S3_SECRET_ACCESS_KEY: "${S3_SECRET_ACCESS_KEY:-seaweedfsadmin}"
+ SYSTEM_USERNAME: "${SYSTEM_USERNAME:-admin}"
+ SYSTEM_PASSWORD: "${SYSTEM_PASSWORD:-admin}"
healthcheck:
test: curl -sSL localhost:8080/actuator/health/liveness | grep 'UP' || exit 1
interval: 10s
diff --git a/helm/dbrepo/Chart.lock b/helm/dbrepo/Chart.lock
index b814fe8aa9880f1f2e9121f8ea6d9ba20190547a..45878cdfc0597e70b690912b03e500643e617367 100644
--- a/helm/dbrepo/Chart.lock
+++ b/helm/dbrepo/Chart.lock
@@ -1,18 +1,27 @@
dependencies:
- name: opensearch
- repository: https://opensearch-project.github.io/helm-charts/
- version: 2.20.0
+ repository: https://charts.bitnami.com/bitnami
+ version: 1.2.2
- name: keycloak
repository: https://charts.bitnami.com/bitnami
- version: 21.4.1
-- name: mariadb-galera
+ version: 21.6.1
+- name: mariadb
repository: https://charts.bitnami.com/bitnami
- version: 13.2.3
+ version: 14.1.4
- name: mariadb-galera
repository: https://charts.bitnami.com/bitnami
- version: 13.2.3
+ version: 10.1.3
- name: rabbitmq
repository: https://charts.bitnami.com/bitnami
- version: 14.4.2
-digest: sha256:48ab25f294d511fb0fe8ad2c597d63f405bac16bba369299d63844f063c4cc38
-generated: "2024-06-19T16:43:35.154022117+02:00"
+ version: 14.0.0
+- name: seaweedfs
+ repository: https://charts.bitnami.com/bitnami
+ version: 0.4.5
+- name: tusd
+ repository: https://charts.sagikazarmark.dev
+ version: 0.1.2
+- name: openldap-stack-ha
+ repository: https://jp-gouin.github.io/helm-openldap/
+ version: 4.2.5
+digest: sha256:bc81f32931159cbea98f6da5f58ff3425a5cd03183506ab218120be136486468
+generated: "2024-07-12T06:33:37.323435643+02:00"
diff --git a/helm/dbrepo/Chart.yaml b/helm/dbrepo/Chart.yaml
index 24d11613659508394b49c9decffe81c8ebd3733f..7b37d25f8a9009c4f7fea507ccae1745d1c822e6 100644
--- a/helm/dbrepo/Chart.yaml
+++ b/helm/dbrepo/Chart.yaml
@@ -1,11 +1,13 @@
+annotations:
+ licenses: Apache-2.0
apiVersion: v2
name: dbrepo
description: Helm Chart for installing DBRepo
sources:
- https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services
type: application
-version: "1.4.4"
-appVersion: "1.4.4"
+version: "1.4.5"
+appVersion: "1.4.5"
keywords:
- dbrepo
maintainers:
@@ -16,26 +18,36 @@ icon: https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/
dependencies:
- name: opensearch
alias: searchdb
- version: 2.20.0
- repository: https://opensearch-project.github.io/helm-charts/
+ version: 1.2.2
+ repository: https://charts.bitnami.com/bitnami
condition: searchdb.enabled
- name: keycloak
alias: authservice
- version: 21.4.1
+ version: 21.6.1 # app version: 24.0.5
repository: https://charts.bitnami.com/bitnami
condition: authservice.enabled
- - name: mariadb-galera
+ - name: mariadb
alias: datadb
- version: 13.2.3
+ version: 14.1.4 # app version: 11.1.3
repository: https://charts.bitnami.com/bitnami
condition: datadb.enabled
- name: mariadb-galera
alias: metadatadb
- version: 13.2.3
+ version: 10.1.3 # app version: 11.1.3
repository: https://charts.bitnami.com/bitnami
condition: metadatadb.enabled
- name: rabbitmq
alias: brokerservice
- version: 14.4.2
+ version: 14.0.0
repository: https://charts.bitnami.com/bitnami
- condition: brokerservice.enabled
\ No newline at end of file
+ condition: brokerservice.enabled
+ - name: tusd
+ alias: uploadservice
+ version: 0.1.2
+ repository: https://charts.sagikazarmark.dev
+ condition: uploadservice.enabled
+ - name: openldap-stack-ha
+ alias: identityservice
+ version: 4.2.5
+ repository: https://jp-gouin.github.io/helm-openldap/
+ condition: identityservice.enabled
diff --git a/helm/dbrepo/README.md b/helm/dbrepo/README.md
index 01f699d9e1841eef85f4889248eef4c83bf4d49c..294fda6477f278e1cc6bf71e0002ca7cfbfc9916 100644
--- a/helm/dbrepo/README.md
+++ b/helm/dbrepo/README.md
@@ -10,7 +10,7 @@ sample [`values.yaml`](https://gitlab.phaidra.org/fair-data-austria-db-repositor
for your deployment and update the variables, especially `hostname`.
```bash
-helm install my-release "oci://s210.dl.hpc.tuwien.ac.at/dbrepo/helm" --values ./values.yaml --version "1.4.4"
+helm install my-release "oci://registry.datalab.tuwien.ac.at/dbrepo/helm" --values ./values.yaml --version "1.4.4"
```
## Prerequisites
@@ -27,7 +27,7 @@ helm install my-release "oci://s210.dl.hpc.tuwien.ac.at/dbrepo/helm" --values ./
To install the chart with the release name `my-release`:
```bash
-helm install my-release "oci://s210.dl.hpc.tuwien.ac.at/dbrepo/helm" --values ./values.yaml --version "1.4.4"
+helm install my-release "oci://oci://registry.datalab.tuwien.ac.at/dbrepo/helm" --values ./values.yaml --version "1.4.4"
```
The command deploys DBRepo on the Kubernetes cluster in the default configuration. The Parameters section lists the
@@ -45,6 +45,13 @@ The command removes all the Kubernetes components associated with the chart and
## Parameters
+### Global parameters
+
+| Name | Description | Value |
+| ----------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------ |
+| `global.compatibility.openshift.adaptSecurityContext` | Adapt the securityContext sections of the deployment to make them compatible with Openshift restricted-v2 SCC: remove runAsUser, runAsGroup and fsGroup and let the platform use their allowed default IDs. Possible values: auto (apply if the detected running cluster is Openshift), force (perform the adaptation always), disabled (do not perform adaptation) | `auto` |
+| `global.storageClass` | Global StorageClass for Persistent Volume(s) | `""` |
+
### Common parameters
| Name | Description | Value |
@@ -55,27 +62,21 @@ The command removes all the Kubernetes components associated with the chart and
| `strategyType` | The image pull | `RollingUpdate` |
| `clusterDomain` | The cluster domain. | `cluster.local` |
-### Internal Admin User
-
-| Name | Description | Value |
-| ---------------- | ---------------------------- | ------- |
-| `admin.username` | The internal admin username. | `admin` |
-| `admin.password` | The internal admin password. | `admin` |
-
### Metadata Database
-| Name | Description | Value |
-| -------------------------------- | ---------------------------------------------------------------- | ------------- |
-| `metadatadb.enabled` | Enable the Metadata Database. | `true` |
-| `metadatadb.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `false` |
-| `metadatadb.host` | The hostname for the microservices. | `metadata-db` |
-| `metadatadb.rootUser.user` | The root username. | `root` |
-| `metadatadb.rootUser.password` | The root user password. | `dbrepo` |
-| `metadatadb.jdbcExtraArgs` | The extra arguments for JDBC connections in the microservices. | `""` |
-| `metadatadb.db.name` | The database name. | `fda` |
-| `metadatadb.extraInitDbScripts` | Additional init.db scripts that are executed on the first start. | `{}` |
-| `metadatadb.persistence.enabled` | Enable persistent storage. Requires PV-provisioner. | `false` |
-| `metadatadb.replicaCount` | The number of replicas, should be uneven (2n+1). | `3` |
+| Name | Description | Value |
+| ---------------------------------------- | ---------------------------------------------------------------- | ------------- |
+| `metadatadb.enabled` | Enable the Metadata Database. | `true` |
+| `metadatadb.host` | The hostname for the microservices. | `metadata-db` |
+| `metadatadb.rootUser.user` | The root username. | `root` |
+| `metadatadb.rootUser.password` | The root user password. | `dbrepo` |
+| `metadatadb.db.name` | The database name. | `dbrepo` |
+| `metadatadb.galera.mariabackup.user` | The database backup username. | `backup` |
+| `metadatadb.galera.mariabackup.password` | The database backup user password | `backup` |
+| `metadatadb.jdbcExtraArgs` | The extra arguments for JDBC connections in the microservices. | `""` |
+| `metadatadb.initdbScripts` | Additional init.db scripts that are executed on the first start. | `{}` |
+| `metadatadb.replicaCount` | The number of cluster nodes, should be uneven i.e. 2n+1 | `3` |
+| `metadatadb.persistence.enabled` | Enable persistent storage. | `true` |
### Auth Service
@@ -89,33 +90,28 @@ The command removes all the Kubernetes components associated with the chart and
| `authservice.jwt.pubkey` | The JWT public key from the `dbrepo-client`. | `MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB` |
| `authservice.tls.enabled` | Enable TLS/SSL communication. Required for HTTPS. | `true` |
| `authservice.tls.existingSecret` | The secret containing the `tls.crt`, `tls.key` and `ca.crt`. | `ingress-cert` |
-| `authservice.tls.usePem` | Use PEM certificates as input instead of PKS12/JKS stores. | `true` |
| `authservice.metrics.enabled` | Enable the Prometheus metrics export sidecar container. | `false` |
| `authservice.client.id` | The client id for the microservices. | `dbrepo-client` |
| `authservice.client.secret` | The client secret for the microservices. | `MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG` |
### Data Database
-| Name | Description | Value |
-| ---------------------------- | ----------------------------------------------------------- | -------- |
-| `datadb.enabled` | Enable the Data Database. | `true` |
-| `datadb.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `false` |
-| `datadb.rootUser.user` | The root username. | `root` |
-| `datadb.rootUser.password` | The root user password. | `dbrepo` |
-| `datadb.persistence.enabled` | Enable persistent storage. Requires PV-provisioner. | `false` |
-| `datadb.replicaCount` | The number of replicas, should be uneven (2n+1). | `3` |
+| Name | Description | Value |
+| --------------------------------- | ----------------------------------------------------------- | ------------- |
+| `datadb.enabled` | Enable the Data Database. | `true` |
+| `datadb.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `false` |
+| `datadb.auth.rootPassword` | The root user password. | `dbrepo` |
+| `datadb.auth.replicationUser` | The database replication user password | `replication` |
+| `datadb.auth.replicationPassword` | The database replication user password | `replication` |
### Search Database
-| Name | Description | Value |
-| ------------------------------ | --------------------------------------------------- | ----------- |
-| `searchdb.enabled` | Enable the Search Database. | `true` |
-| `searchdb.host` | The hostname for the microservices. | `search-db` |
-| `searchdb.port` | The port for the microservices. | `9200` |
-| `searchdb.username` | The admin username. | `admin` |
-| `searchdb.password` | The admin user password. | `admin` |
-| `searchdb.replicas` | The number of replicas. | `3` |
-| `searchdb.persistence.enabled` | Enable persistent storage. Requires PV-provisioner. | `false` |
+| Name | Description | Value |
+| ---------------------- | ----------------------------------- | ----------- |
+| `searchdb.enabled` | Enable the Data Database. | `true` |
+| `searchdb.host` | The hostname for the microservices. | `search-db` |
+| `searchdb.port` | The port for the microservices. | `9200` |
+| `searchdb.clusterName` | The cluster name. | `search-db` |
### Upload Service
@@ -126,107 +122,219 @@ The command removes all the Kubernetes components associated with the chart and
### Broker Service
-| Name | Description | Value |
-| ----------------------------------- | ------------------------------------------------------------------------------- | ----------------------------- |
-| `brokerservice.enabled` | Enable the Broker Service. | `true` |
-| `brokerservice.endpoint` | The management api endpoint for the microservices. | `http://broker-service:15672` |
-| `brokerservice.host` | The hostname for the microservices. | `broker-service` |
-| `brokerservice.port` | The port for the microservices. | `5672` |
-| `brokerservice.virtualHost` | The default virtual host name. | `dbrepo` |
-| `brokerservice.queueName` | The default queue name. | `dbrepo` |
-| `brokerservice.exchangeName` | The default exchange name. | `dbrepo` |
-| `brokerservice.routingKey` | The default routing key binding from the default queue to the default exchange. | `dbrepo.#` |
-| `brokerservice.connectionTimeout` | The connection timeout in ms. | `60000` |
-| `brokerservice.persistence.enabled` | Enable persistent storage. Requires PV-provisioner. | `false` |
-| `brokerservice.replicaCount` | The number of replicas. | `2` |
+| Name | Description | Value |
+| ----------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------- |
+| `brokerservice.enabled` | Enable the Broker Service. | `true` |
+| `brokerservice.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `true` |
+| `brokerservice.endpoint` | The management api endpoint for the microservices. | `http://broker-service:15672` |
+| `brokerservice.host` | The hostname for the microservices. | `broker-service` |
+| `brokerservice.port` | The port for the microservices. | `5672` |
+| `brokerservice.virtualHost` | The default virtual host name. | `dbrepo` |
+| `brokerservice.queueName` | The default queue name. | `dbrepo` |
+| `brokerservice.exchangeName` | The default exchange name. | `dbrepo` |
+| `brokerservice.routingKey` | The default routing key binding from the default queue to the default exchange. | `dbrepo.#` |
+| `brokerservice.connectionTimeout` | The connection timeout in ms. | `60000` |
+| `brokerservice.ldap.binddn` | The domain name the broker service should bind to. In many cases this is the admin user from `identityservice.global.adminUser`. | `cn=admin,dc=dbrepo,dc=at` |
+| `brokerservice.ldap.bindpw` | The password to bind on the identity service. In many cases this value is equal to `identityservice.global.adminPassword`. | `admin` |
+| `brokerservice.ldap.uidField` | The field containing the user id. | `uid` |
+| `brokerservice.ldap.basedn` | The base domain name containing the users. | `ou=users,dc=dbrepo,dc=at` |
+| `brokerservice.ldap.userDnPattern` | The pattern to determine the user. | `${username}` |
+| `brokerservice.extraPlugins` | The list of plugins to be activated. | `rabbitmq_prometheus rabbitmq_auth_backend_ldap rabbitmq_auth_mechanism_ssl` |
+| `brokerservice.persistence.enabled` | If set to true, a PVC will be created. | `false` |
+| `brokerservice.replicaCount` | The number of replicas. | `1` |
### Analyse Service
-| Name | Description | Value |
-| ----------------------------- | ----------------------------------------------------- | ------------------------------- |
-| `analyseservice.enabled` | Enable the Broker Service. | `true` |
-| `analyseservice.endpoint` | The url of the endpoint. | `http://analyse-service` |
-| `analyseservice.s3.endpoint` | The S3-capable endpoint the microservice connects to. | `http://storageservice-s3:9000` |
-| `analyseservice.replicaCount` | The number of replicas. | `2` |
+| Name | Description | Value |
+| ------------------------------------------------------------------ | ----------------------------------------------------------- | -------------------------------- |
+| `analyseservice.enabled` | Enable the Broker Service. | `true` |
+| `analyseservice.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `false` |
+| `analyseservice.podSecurityContext.enabled` | Enable pods' Security Context | `true` |
+| `analyseservice.podSecurityContext.fsGroupChangePolicy` | Set filesystem group change policy | `Always` |
+| `analyseservice.podSecurityContext.sysctls` | Set kernel settings using the sysctl interface | `[]` |
+| `analyseservice.podSecurityContext.supplementalGroups` | Set filesystem extra groups | `[]` |
+| `analyseservice.podSecurityContext.fsGroup` | Set RabbitMQ pod's Security Context fsGroup | `1001` |
+| `analyseservice.containerSecurityContext.enabled` | Enabled containers' Security Context | `true` |
+| `analyseservice.containerSecurityContext.seLinuxOptions` | Set SELinux options in container | `{}` |
+| `analyseservice.containerSecurityContext.runAsUser` | Set RabbitMQ containers' Security Context runAsUser | `1001` |
+| `analyseservice.containerSecurityContext.runAsGroup` | Set RabbitMQ containers' Security Context runAsGroup | `1001` |
+| `analyseservice.containerSecurityContext.runAsNonRoot` | Set RabbitMQ container's Security Context runAsNonRoot | `true` |
+| `analyseservice.containerSecurityContext.allowPrivilegeEscalation` | Set container's privilege escalation | `false` |
+| `analyseservice.containerSecurityContext.readOnlyRootFilesystem` | Set container's Security Context readOnlyRootFilesystem | `false` |
+| `analyseservice.containerSecurityContext.capabilities.drop` | Set container's Security Context runAsNonRoot | `["ALL"]` |
+| `analyseservice.containerSecurityContext.seccompProfile.type` | Set container's Security Context seccomp profile | `RuntimeDefault` |
+| `analyseservice.endpoint` | The url of the endpoint. | `http://analyse-service` |
+| `analyseservice.s3.endpoint` | The S3-capable endpoint the microservice connects to. | `http://storage-service-s3:8333` |
+| `analyseservice.replicaCount` | The number of replicas. | `2` |
### Metadata Service
-| Name | Description | Value |
-| ------------------------------------------ | --------------------------------------------------------------------- | ------------------------------- |
-| `metadataservice.enabled` | Enable the Metadata Service. | `true` |
-| `metadataservice.endpoint` | The Metadata Service endpoint. | `http://metadata-service` |
-| `metadataservice.admin.email` | The OAI-PMH exposed admin e-mail. | `noreply@example.com` |
-| `metadataservice.deletedRecord` | The OAI-PMH exposed delete policy. | `permanent` |
-| `metadataservice.repositoryName` | The OAI-PMH exposed repository name. | `Database Repository` |
-| `metadataservice.granularity` | The OAI-PMH exposed record granularity. | `YYYY-MM-DDThh:mm:ssZ` |
-| `metadataservice.datacite.enabled` | Enable the DataCite account for minting DOIs. | `false` |
-| `metadataservice.datacite.url` | The DataCite api endpoint url. | `https://api.datacite.org` |
-| `metadataservice.datacite.prefix` | The DataCite prefix. | `""` |
-| `metadataservice.datacite.username` | The DataCite api username. | `""` |
-| `metadataservice.datacite.password` | The DataCite api user password. | `""` |
-| `metadataservice.sparql.connectionTimeout` | The connection timeout for sparql queries fetching remote data in ms. | `10000` |
-| `metadataservice.s3.endpoint` | The S3-capable endpoint the microservice connects to. | `http://storageservice-s3:9000` |
-| `metadataservice.s3.auth.username` | The S3-capable endpoint username (or access key id). | `seaweedfsadmin` |
-| `metadataservice.s3.auth.password` | The S3-capable endpoint user password (or access key secret). | `seaweedfsadmin` |
-| `metadataservice.replicaCount` | The number of replicas. | `2` |
+| Name | Description | Value |
+| ------------------------------------------------------------------- | ---------------------------------------------------------------------------------- | -------------------------------- |
+| `metadataservice.enabled` | Enable the Broker Service. | `true` |
+| `metadataservice.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `false` |
+| `metadataservice.podSecurityContext.enabled` | Enable pods' Security Context | `true` |
+| `metadataservice.podSecurityContext.fsGroupChangePolicy` | Set filesystem group change policy | `Always` |
+| `metadataservice.podSecurityContext.sysctls` | Set kernel settings using the sysctl interface | `[]` |
+| `metadataservice.podSecurityContext.supplementalGroups` | Set filesystem extra groups | `[]` |
+| `metadataservice.podSecurityContext.fsGroup` | Set RabbitMQ pod's Security Context fsGroup | `1001` |
+| `metadataservice.containerSecurityContext.enabled` | Enabled containers' Security Context | `true` |
+| `metadataservice.containerSecurityContext.seLinuxOptions` | Set SELinux options in container | `{}` |
+| `metadataservice.containerSecurityContext.runAsUser` | Set RabbitMQ containers' Security Context runAsUser | `1001` |
+| `metadataservice.containerSecurityContext.runAsGroup` | Set RabbitMQ containers' Security Context runAsGroup | `1001` |
+| `metadataservice.containerSecurityContext.runAsNonRoot` | Set RabbitMQ container's Security Context runAsNonRoot | `true` |
+| `metadataservice.containerSecurityContext.allowPrivilegeEscalation` | Set container's privilege escalation | `false` |
+| `metadataservice.containerSecurityContext.readOnlyRootFilesystem` | Set container's Security Context readOnlyRootFilesystem | `false` |
+| `metadataservice.containerSecurityContext.capabilities.drop` | Set container's Security Context runAsNonRoot | `["ALL"]` |
+| `metadataservice.containerSecurityContext.seccompProfile.type` | Set container's Security Context seccomp profile | `RuntimeDefault` |
+| `metadataservice.endpoint` | The Metadata Service endpoint. | `http://metadata-service` |
+| `metadataservice.crossref.endpoint` | The CrossRef endpoint. | `http://data.crossref.org` |
+| `metadataservice.ror.endpoint` | The ROR endpoint. | `https://api.ror.org` |
+| `metadataservice.admin.email` | The OAI-PMH exposed e-mail for contacting the metadata records responsible person. | `noreply@example.com` |
+| `metadataservice.deletedRecord` | The OAI-PMH exposed delete policy. | `permanent` |
+| `metadataservice.repositoryName` | The OAI-PMH exposed repository name. | `Database Repository` |
+| `metadataservice.granularity` | The OAI-PMH exposed record granularity. | `YYYY-MM-DDThh:mm:ssZ` |
+| `metadataservice.datacite.enabled` | If set to true, the service mints DOIs instead of local PIDs. | `false` |
+| `metadataservice.datacite.url` | The DataCite api endpoint url. | `https://api.datacite.org` |
+| `metadataservice.datacite.prefix` | The DataCite prefix. | `""` |
+| `metadataservice.datacite.username` | The DataCite api username. | `""` |
+| `metadataservice.datacite.password` | The DataCite api user password. | `""` |
+| `metadataservice.sparql.connectionTimeout` | The connection timeout for sparql queries fetching remote data in ms. | `10000` |
+| `metadataservice.s3.endpoint` | The S3-capable endpoint the microservice connects to. | `http://storage-service-s3:8333` |
+| `metadataservice.s3.auth.username` | The S3-capable endpoint username (or access key id). | `seaweedfsadmin` |
+| `metadataservice.s3.auth.password` | The S3-capable endpoint user password (or access key secret). | `seaweedfsadmin` |
+| `metadataservice.replicaCount` | The number of replicas. | `2` |
### Data Service
-| Name | Description | Value |
-| ----------------------------------- | ------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------- |
-| `dataservice.enabled` | Enable the Metadata Service. | `true` |
-| `dataservice.endpoint` | The endpoint for the microservices. | `http://data-service` |
-| `dataservice.grant.read` | The default database permissions for users with read access. | `SELECT` |
-| `dataservice.grant.write` | The default database permissions for users with write access. | `SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE` |
-| `dataservice.default.date` | The default date format id for dates. | `3` |
-| `dataservice.default.time` | The default date format id for times. | `4` |
-| `dataservice.default.timestamp` | The default date format id for timestamps. | `1` |
-| `dataservice.s3.endpoint` | The S3-capable endpoint the microservice connects to. | `http://storageservice-s3:9000` |
-| `dataservice.s3.auth.username` | The S3-capable endpoint username (or access key id). | `seaweedfsadmin` |
-| `dataservice.s3.auth.password` | The S3-capable endpoint user password (or access key secret). | `seaweedfsadmin` |
-| `dataservice.s3.filePath` | The local location to download/upload files from/to S3-capable endpoint. | `/s3` |
-| `dataservice.consumerConcurrentMin` | The minimum broker service consumer number. | `1` |
-| `dataservice.consumerConcurrentMax` | The maximum broker service consumer number. | `5` |
-| `dataservice.requeueRejected` | Enable re-queueing of rejected messages to the broker service. | `false` |
-| `dataservice.replicaCount` | The number of replicas. | `2` |
+| Name | Description | Value |
+| --------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------- |
+| `dataservice.enabled` | Enable the Broker Service. | `true` |
+| `dataservice.endpoint` | Absolute URL to the data service in the form of http://host:port | `http://data-service` |
+| `dataservice.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `false` |
+| `dataservice.podSecurityContext.enabled` | Enable pods' Security Context | `true` |
+| `dataservice.podSecurityContext.fsGroupChangePolicy` | Set filesystem group change policy | `Always` |
+| `dataservice.podSecurityContext.sysctls` | Set kernel settings using the sysctl interface | `[]` |
+| `dataservice.podSecurityContext.supplementalGroups` | Set filesystem extra groups | `[]` |
+| `dataservice.podSecurityContext.fsGroup` | Set RabbitMQ pod's Security Context fsGroup | `1001` |
+| `dataservice.containerSecurityContext.enabled` | Enabled containers' Security Context | `true` |
+| `dataservice.containerSecurityContext.seLinuxOptions` | Set SELinux options in container | `{}` |
+| `dataservice.containerSecurityContext.runAsUser` | Set RabbitMQ containers' Security Context runAsUser | `1001` |
+| `dataservice.containerSecurityContext.runAsGroup` | Set RabbitMQ containers' Security Context runAsGroup | `1001` |
+| `dataservice.containerSecurityContext.runAsNonRoot` | Set RabbitMQ container's Security Context runAsNonRoot | `true` |
+| `dataservice.containerSecurityContext.allowPrivilegeEscalation` | Set container's privilege escalation | `false` |
+| `dataservice.containerSecurityContext.readOnlyRootFilesystem` | Set container's Security Context readOnlyRootFilesystem | `false` |
+| `dataservice.containerSecurityContext.capabilities.drop` | Set container's Security Context runAsNonRoot | `["ALL"]` |
+| `dataservice.containerSecurityContext.seccompProfile.type` | Set container's Security Context seccomp profile | `RuntimeDefault` |
+| `dataservice.grant.read` | The default database permissions for users with read access. | `SELECT` |
+| `dataservice.grant.write` | The default database permissions for users with write access. | `SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE` |
+| `dataservice.default.date` | The default date format id for dates. Default: YYYY-MM-dd (e.g. 2024-06-15). | `3` |
+| `dataservice.default.time` | The default date format id for times. Default: HH:mm:ss (e.g. 14:23:42). | `4` |
+| `dataservice.default.timestamp` | The default date format id for timestamps. Default: YYYY-MM-dd HH:mm:ss (e.g. 2024-06-15 14:23:42). | `1` |
+| `dataservice.rabbitmq.consumerConcurrentMin` | The minimal number of RabbitMQ consumers. | `2` |
+| `dataservice.rabbitmq.consumerConcurrentMax` | The maximal number of RabbitMQ consumers. | `6` |
+| `dataservice.rabbitmq.requeueRejected` | If set to true, rejected tuples will be re-queued. | `false` |
+| `dataservice.rabbitmq.consumer.username` | The username for the consumer to read tuples from the broker service. In many cases this value is equal to `identityservice.users`. | `admin` |
+| `dataservice.rabbitmq.consumer.password` | The user password for the consumer to read tuples from the broker service. In many cases this value is equal to `identityservice.userPasswords`. | `admin` |
+| `dataservice.s3.endpoint` | The S3-capable endpoint the microservice connects to. | `http://storage-service-s3:8333` |
+| `dataservice.s3.bucket` | The S3 bucket name. | `dbrepo` |
+| `dataservice.s3.auth.username` | The S3-capable endpoint username (or access key id). | `seaweedfsadmin` |
+| `dataservice.s3.auth.password` | The S3-capable endpoint user password (or access key secret). | `seaweedfsadmin` |
+| `dataservice.s3.filePath` | The local location to download/upload files from/to S3-capable endpoint. | `/s3` |
+| `dataservice.replicaCount` | The number of replicas. | `2` |
### Search Service
-| Name | Description | Value |
-| ---------------------------- | ----------------------------------- | ----------------------- |
-| `searchservice.enabled` | Enable the Search Service. | `true` |
-| `searchservice.endpoint` | The endpoint for the microservices. | `http://search-service` |
-| `searchservice.replicaCount` | The number of replicas. | `2` |
+| Name | Description | Value |
+| ----------------------------------------------------------------- | ------------------------------------------------------------------ | ----------------------- |
+| `searchservice.enabled` | Enable the Broker Service. | `true` |
+| `searchservice.endpoint` | Absolute URL to the search service in the form of http://host:port | `http://search-service` |
+| `searchservice.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `false` |
+| `searchservice.podSecurityContext.enabled` | Enable pods' Security Context | `true` |
+| `searchservice.podSecurityContext.fsGroupChangePolicy` | Set filesystem group change policy | `Always` |
+| `searchservice.podSecurityContext.sysctls` | Set kernel settings using the sysctl interface | `[]` |
+| `searchservice.podSecurityContext.supplementalGroups` | Set filesystem extra groups | `[]` |
+| `searchservice.podSecurityContext.fsGroup` | Set RabbitMQ pod's Security Context fsGroup | `1001` |
+| `searchservice.containerSecurityContext.enabled` | Enabled containers' Security Context | `true` |
+| `searchservice.containerSecurityContext.seLinuxOptions` | Set SELinux options in container | `{}` |
+| `searchservice.containerSecurityContext.runAsUser` | Set RabbitMQ containers' Security Context runAsUser | `1001` |
+| `searchservice.containerSecurityContext.runAsGroup` | Set RabbitMQ containers' Security Context runAsGroup | `1001` |
+| `searchservice.containerSecurityContext.runAsNonRoot` | Set RabbitMQ container's Security Context runAsNonRoot | `true` |
+| `searchservice.containerSecurityContext.allowPrivilegeEscalation` | Set container's privilege escalation | `false` |
+| `searchservice.containerSecurityContext.readOnlyRootFilesystem` | Set container's Security Context readOnlyRootFilesystem | `true` |
+| `searchservice.containerSecurityContext.capabilities.drop` | Set container's Security Context runAsNonRoot | `["ALL"]` |
+| `searchservice.containerSecurityContext.seccompProfile.type` | Set container's Security Context seccomp profile | `RuntimeDefault` |
+| `searchservice.replicaCount` | The number of replicas. | `2` |
### Storage Service
-| Name | Description | Value |
-| ------------------------ | --------------------------- | ------ |
-| `storageservice.enabled` | Enable the Storage Service. | `true` |
+| Name | Description | Value |
+| --------------------------------------------- | -------------------------------------------------------------------------------------- | ---------------- |
+| `storageservice.enabled` | Enable the Storage Service. | `true` |
+| `storageservice.filer.enabled` | Enable the storage service filer which is required for S3. | `true` |
+| `storageservice.s3.replicaCount` | The number of replicas. | `2` |
+| `storageservice.s3.bucket` | The S3-bucket name. | `dbrepo` |
+| `storageservice.s3.auth.enabled` | Enable the S3 service. | `true` |
+| `storageservice.s3.auth.adminAccessKeyId` | The S3 access key id for the admin user. In some systems this is named `username`. | `seaweedfsadmin` |
+| `storageservice.s3.auth.adminSecretAccessKey` | The S3 secret access key for the admin user. In some systems this is named `password`. | `seaweedfsadmin` |
+
+### Identity Service
+
+| Name | Description | Value |
+| -------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ----------------- |
+| `identityservice.enabled` | Enable the Identity Service. | `true` |
+| `identityservice.global.ldapDomain` | The LDAP domain name in domain "dbrepo.at" form or explicit in "dc=dbrepo,dc=at" form. | `dc=dbrepo,dc=at` |
+| `identityservice.global.adminUser` | The admin username that is used to bind. | `admin` |
+| `identityservice.global.adminPassword` | The admin user password that is used to bind. | `admin` |
+| `identityservice.users` | The admin username for internal authentication. | `admin` |
+| `identityservice.userPasswords` | The admin user password for internal authentication. | `admin` |
+| `identityservice.group` | The group that contains the administrators for the broker service. | `system` |
+| `identityservice.persistence.enabled` | If set to true, a PVC will be created. | `true` |
+| `identityservice.replication.enabled` | If set to true, the pods required a cluster. Needs `replicaCount` to be `3` or higher (of 2n+1). | `false` |
+| `identityservice.replicaCount` | The number of replicas. If `replicaCount` is set to more than 1, requires `replication.enabled` to be `true`. | `1` |
### User Interface
-| Name | Description | Value |
-| --------------------------------- | ---------------------------------------------------------------------------- | ----------------------- |
-| `ui.enabled` | Enable the User Interface. | `true` |
-| `ui.public.api.client` | The endpoint for the client api. | `""` |
-| `ui.public.api.server` | The endpoint for the server api. | `""` |
-| `ui.public.title` | The user interface title. | `Database Repository` |
-| `ui.public.logo` | The user interface logo. | `/logo.svg` |
-| `ui.public.icon` | The user interface icon. | `/favicon.ico` |
-| `ui.public.touch` | The user interface apple touch icon. | `/apple-touch-icon.png` |
-| `ui.public.broker.host` | The displayed broker hostname. | `example.com` |
-| `ui.public.broker.port.5671` | Enable display of the broker 5671 port and mark it as secure (SSL/TLS). | `true` |
-| `ui.public.broker.port.5672` | Enable display of the broker 5672 port and mark it as insecure (no SSL/TLS). | `false` |
-| `ui.public.broker.extra` | Extra metadata displayed. | `""` |
-| `ui.public.database.extra` | Extra metadata displayed. | `128.130.0.0/15` |
-| `ui.public.pid.default.publisher` | The default dataset publisher for persisted identifiers. | `Example University` |
-| `ui.public.doi.enabled` | Enable the display that DOIs are minted. | `false` |
-| `ui.public.doi.endpoint` | The DOI proxy. | `https://doi.org` |
-| `ui.replicaCount` | The number of replicas. | `2` |
+| Name | Description | Value |
+| ------------------------------------------------------ | ---------------------------------------------------------------------------------------------------- | ----------------------- |
+| `ui.enabled` | Enable the Broker Service. | `true` |
+| `ui.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `false` |
+| `ui.podSecurityContext.enabled` | Enable pods' Security Context | `true` |
+| `ui.podSecurityContext.fsGroupChangePolicy` | Set filesystem group change policy | `Always` |
+| `ui.podSecurityContext.sysctls` | Set kernel settings using the sysctl interface | `[]` |
+| `ui.podSecurityContext.supplementalGroups` | Set filesystem extra groups | `[]` |
+| `ui.podSecurityContext.fsGroup` | Set RabbitMQ pod's Security Context fsGroup | `1001` |
+| `ui.containerSecurityContext.enabled` | Enabled containers' Security Context | `true` |
+| `ui.containerSecurityContext.seLinuxOptions` | Set SELinux options in container | `{}` |
+| `ui.containerSecurityContext.runAsUser` | Set RabbitMQ containers' Security Context runAsUser | `1001` |
+| `ui.containerSecurityContext.runAsGroup` | Set RabbitMQ containers' Security Context runAsGroup | `1001` |
+| `ui.containerSecurityContext.runAsNonRoot` | Set RabbitMQ container's Security Context runAsNonRoot | `true` |
+| `ui.containerSecurityContext.allowPrivilegeEscalation` | Set container's privilege escalation | `false` |
+| `ui.containerSecurityContext.readOnlyRootFilesystem` | Set container's Security Context readOnlyRootFilesystem | `false` |
+| `ui.containerSecurityContext.capabilities.drop` | Set container's Security Context runAsNonRoot | `["ALL"]` |
+| `ui.containerSecurityContext.seccompProfile.type` | Set container's Security Context seccomp profile | `RuntimeDefault` |
+| `ui.public.api.client` | The endpoint for the client api. Defaults to the value of `gateway`. | `""` |
+| `ui.public.api.server` | The endpoint for the server api. Defaults to the value of `gateway`. | `""` |
+| `ui.public.upload.client` | The endpoint for the upload client. Defaults to the value of `gateway` and path `/api/upload/files`. | `""` |
+| `ui.public.title` | The user interface title. | `Database Repository` |
+| `ui.public.logo` | The user interface logo. | `/logo.svg` |
+| `ui.public.icon` | The user interface icon. | `/favicon.ico` |
+| `ui.public.touch` | The user interface apple touch icon. | `/apple-touch-icon.png` |
+| `ui.public.broker.host` | The displayed broker hostname. | `example.com` |
+| `ui.public.broker.port.5671` | Enable display of the broker 5671 port and mark it as secure (SSL/TLS). | `true` |
+| `ui.public.broker.port.5672` | Enable display of the broker 5672 port and mark it as insecure (no SSL/TLS). | `false` |
+| `ui.public.broker.extra` | Extra metadata displayed. | `""` |
+| `ui.public.database.extra` | Extra metadata displayed. | `128.130.0.0/15` |
+| `ui.public.pid.default.publisher` | The default dataset publisher for persisted identifiers. | `Example University` |
+| `ui.public.doi.enabled` | Enable the display that DOIs are minted. | `false` |
+| `ui.public.doi.endpoint` | The DOI proxy. | `https://doi.org` |
+| `ui.replicaCount` | The number of replicas. | `2` |
### Ingress
-| Name | Description | Value |
-| ----------------- | ------------------- | ------- |
-| `ingress.enabled` | Enable the ingress. | `false` |
+| Name | Description | Value |
+| ------------------------ | --------------------------------------------------------------------------------------------------------------- | -------------- |
+| `ingress.enabled` | Enable the ingress. | `false` |
+| `ingress.className` | The ingress class name. | `nginx` |
+| `ingress.tls.enabled` | Enable the ingress. | `true` |
+| `ingress.tls.secretName` | The secret holding the SSL/TLS certificate. Needs to have keys `tls.crt` and `tls.key` and optionally `ca.crt`. | `ingress-cert` |
diff --git a/helm/dbrepo/charts/keycloak-21.6.1.tgz b/helm/dbrepo/charts/keycloak-21.6.1.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..6479f5943846dee589d3ec90bbda649a8d7b72fe
Binary files /dev/null and b/helm/dbrepo/charts/keycloak-21.6.1.tgz differ
diff --git a/helm/dbrepo/charts/mariadb-14.1.4.tgz b/helm/dbrepo/charts/mariadb-14.1.4.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..83f470bdcade4fdfc13b0d1f4f46095b877e3bcd
Binary files /dev/null and b/helm/dbrepo/charts/mariadb-14.1.4.tgz differ
diff --git a/helm/dbrepo/charts/mariadb-galera-10.1.3.tgz b/helm/dbrepo/charts/mariadb-galera-10.1.3.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..c906aaf7634b20f0eaf9358b435b01086bdc4f55
Binary files /dev/null and b/helm/dbrepo/charts/mariadb-galera-10.1.3.tgz differ
diff --git a/helm/dbrepo/charts/openldap-stack-ha-4.2.5.tgz b/helm/dbrepo/charts/openldap-stack-ha-4.2.5.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..778db881acbb66e2e7b7061e8f3d931606101311
Binary files /dev/null and b/helm/dbrepo/charts/openldap-stack-ha-4.2.5.tgz differ
diff --git a/helm/dbrepo/charts/opensearch-1.2.2.tgz b/helm/dbrepo/charts/opensearch-1.2.2.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..0393bfc1aa2fa964c68e66af6da6f356ea84e29f
Binary files /dev/null and b/helm/dbrepo/charts/opensearch-1.2.2.tgz differ
diff --git a/helm/dbrepo/charts/seaweedfs-0.4.5.tgz b/helm/dbrepo/charts/seaweedfs-0.4.5.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..7beeabf35c0dbf671f5771d117bbdcc78443dd9e
Binary files /dev/null and b/helm/dbrepo/charts/seaweedfs-0.4.5.tgz differ
diff --git a/helm/dbrepo/hack/generate-rabbitmq-pw.sh b/helm/dbrepo/hack/generate-rabbitmq-pw.sh
new file mode 100755
index 0000000000000000000000000000000000000000..4bccc93d7b0b9dc8a9e8b4116bcd6826f83f3f71
--- /dev/null
+++ b/helm/dbrepo/hack/generate-rabbitmq-pw.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+# https://stackoverflow.com/a/53175209/2634294
+# THIS SCRIPT REQUIRES xxd TO BE INSTALLED:
+# DEBIAN: apt install xxd
+# MACOS: brew install coreutils
+function encode_password()
+{
+ SALT=$(od -A n -t x -N 4 /dev/urandom)
+ PASS=$SALT$(echo -n $1 | xxd -ps | tr -d '\n' | tr -d ' ')
+ PASS=$(echo -n $PASS | xxd -r -p | sha256sum | head -c 128)
+ PASS=$(echo -n $SALT$PASS | xxd -r -p | base64 | tr -d '\n')
+ echo $PASS
+}
+encode_password $1
\ No newline at end of file
diff --git a/helm/dbrepo/templates/_compatibility.tpl b/helm/dbrepo/templates/_compatibility.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..6fc2aa8fa45e3bf7a8cfdb5312515aa2c27a0491
--- /dev/null
+++ b/helm/dbrepo/templates/_compatibility.tpl
@@ -0,0 +1,42 @@
+{{/*
+Copyright Broadcom, Inc. All Rights Reserved.
+SPDX-License-Identifier: APACHE-2.0
+*/}}
+
+{{/* vim: set filetype=mustache: */}}
+
+{{/*
+Return true if the detected platform is Openshift
+Usage:
+{{- include "common.compatibility.isOpenshift" . -}}
+*/}}
+{{- define "common.compatibility.isOpenshift" -}}
+{{- if .Capabilities.APIVersions.Has "security.openshift.io/v1" -}}
+{{- true -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Render a compatible securityContext depending on the platform. By default it is maintained as it is. In other platforms like Openshift we remove default user/group values that do not work out of the box with the restricted-v1 SCC
+Usage:
+{{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.containerSecurityContext "context" $) -}}
+*/}}
+{{- define "common.compatibility.renderSecurityContext" -}}
+{{- $adaptedContext := .secContext -}}
+
+{{- if (((.context.Values.global).compatibility).openshift) -}}
+ {{- if or (eq .context.Values.global.compatibility.openshift.adaptSecurityContext "force") (and (eq .context.Values.global.compatibility.openshift.adaptSecurityContext "auto") (include "common.compatibility.isOpenshift" .context)) -}}
+ {{/* Remove incompatible user/group values that do not work in Openshift out of the box */}}
+ {{- $adaptedContext = omit $adaptedContext "fsGroup" "runAsUser" "runAsGroup" -}}
+ {{- if not .secContext.seLinuxOptions -}}
+ {{/* If it is an empty object, we remove it from the resulting context because it causes validation issues */}}
+ {{- $adaptedContext = omit $adaptedContext "seLinuxOptions" -}}
+ {{- end -}}
+ {{- end -}}
+{{- end -}}
+{{/* Remove fields that are disregarded when running the container in privileged mode */}}
+{{- if $adaptedContext.privileged -}}
+ {{- $adaptedContext = omit $adaptedContext "capabilities" "seLinuxOptions" -}}
+{{- end -}}
+{{- omit $adaptedContext "enabled" | toYaml -}}
+{{- end -}}
\ No newline at end of file
diff --git a/helm/dbrepo/templates/analyse-deployment.yaml b/helm/dbrepo/templates/analyse-deployment.yaml
index ff8fa2ad654948785c9fdae293814548c7aaff16..41f42db8164d3627461d7a0036d554e5e50ec12c 100644
--- a/helm/dbrepo/templates/analyse-deployment.yaml
+++ b/helm/dbrepo/templates/analyse-deployment.yaml
@@ -10,8 +10,8 @@ metadata:
service: analyse-service
spec:
replicas: {{ .Values.analyseservice.replicaCount }}
- strategy:
- type: {{ .Values.strategyType }}
+ strategy:
+ type: {{ .Values.strategyType }}
selector:
matchLabels:
app: analyse-service
@@ -22,21 +22,16 @@ spec:
app: analyse-service
service: analyse-service
spec:
- securityContext:
- runAsNonRoot: true
+ {{- if .Values.analyseservice.podSecurityContext.enabled }}
+ securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.analyseservice.podSecurityContext "context" $) | nindent 8 }}
+ {{- end }}
containers:
- name: analyse-service
image: {{ .Values.analyseservice.image.name }}
imagePullPolicy: {{ .Values.analyseservice.image.pullPolicy | default "IfNotPresent" }}
- securityContext:
- runAsNonRoot: true
- readOnlyRootFilesystem: true
- allowPrivilegeEscalation: false
- seccompProfile:
- type: {{ .Values.analyseservice.profileType | default "RuntimeDefault" }}
- capabilities:
- drop:
- - ALL
+ {{- if .Values.analyseservice.containerSecurityContext.enabled }}
+ securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.analyseservice.containerSecurityContext "context" $) | nindent 12 }}
+ {{- end }}
ports:
- containerPort: 8080
protocol: TCP
@@ -85,6 +80,7 @@ spec:
- "curl -sSL localhost:8080/health | grep 'UP' || exit 1"
initialDelaySeconds: 10
periodSeconds: 30
- resources:
- {{- toYaml .Values.resources | nindent 12 }}
+ {{- if .Values.analyseservice.resources }}
+ resources: {{- toYaml .Values.analyseservice.resources | nindent 12 }}
+ {{- end }}
{{- end }}
diff --git a/helm/dbrepo/templates/analyse-secret.yaml b/helm/dbrepo/templates/analyse-secret.yaml
index 0933844bcb8b7105c5551a7597a5f57525b52108..605d81d8892def1d491efcef3c056934eddec0c1 100644
--- a/helm/dbrepo/templates/analyse-secret.yaml
+++ b/helm/dbrepo/templates/analyse-secret.yaml
@@ -6,8 +6,8 @@ metadata:
name: analyse-service-secret
namespace: {{ .Values.namespace }}
stringData:
- ADMIN_USERNAME: "{{ .Values.admin.username }}"
- ADMIN_PASSWORD: "{{ .Values.admin.password }}"
+ ADMIN_USERNAME: "{{ .Values.identityservice.users }}"
+ ADMIN_PASSWORD: "{{ .Values.identityservice.userPasswords }}"
AUTH_SERVICE_ADMIN: "{{ .Values.authservice.auth.adminUser }}"
AUTH_SERVICE_ADMIN_PASSWORD: "{{ .Values.authservice.auth.adminPassword }}"
AUTH_SERVICE_CLIENT: "{{ .Values.authservice.client.id }}"
@@ -16,4 +16,9 @@ stringData:
GATEWAY_SERVICE_ENDPOINT: "{{ .Values.gateway }}"
JWT_PUBKEY: "{{ .Values.authservice.jwt.pubkey }}"
LOG_LEVEL: "{{ ternary "DEBUG" "INFO" .Values.analyseservice.image.debug }}"
+ S3_ACCESS_KEY_ID: "{{ .Values.storageservice.s3.auth.adminAccessKeyId }}"
+ S3_ENDPOINT: "{{ .Values.analyseservice.s3.endpoint }}"
+ S3_EXPORT_BUCKET: "{{ .Values.storageservice.s3.bucket.export }}"
+ S3_IMPORT_BUCKET: "{{ .Values.storageservice.s3.bucket.import }}"
+ S3_SECRET_ACCESS_KEY: "{{ .Values.storageservice.s3.auth.adminSecretAccessKey }}"
{{- end }}
diff --git a/helm/dbrepo/templates/auth-configmap.yaml b/helm/dbrepo/templates/auth-configmap.yaml
index 0732a8776716c751308d107e5f927c634c86669f..0ef8e90bf95eb5575f2f4fd1628fcf6b8c16e120 100644
--- a/helm/dbrepo/templates/auth-configmap.yaml
+++ b/helm/dbrepo/templates/auth-configmap.yaml
@@ -47,6 +47,7 @@ data:
"editUsernameAllowed" : false,
"bruteForceProtected" : false,
"permanentLockout" : false,
+ "maxTemporaryLockouts" : 0,
"maxFailureWaitSeconds" : 900,
"minimumQuickLoginWaitSeconds" : 60,
"waitIncrementSeconds" : 60,
@@ -76,6 +77,17 @@ data:
"clientRole" : false,
"containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
"attributes" : { }
+ }, {
+ "id" : "7ee1c424-11b0-46a9-b0ed-725e9b7fc40c",
+ "name" : "default-system-roles",
+ "description" : "${default-system-roles}",
+ "composite" : true,
+ "composites" : {
+ "realm" : [ "delete-database-view", "update-semantic-unit", "export-query-data", "check-foreign-database-access", "default-data-steward-roles", "execute-query", "default-user-handling", "delete-table-data", "find-query", "list-database-views", "persist-query", "update-search-index", "delete-database-access", "view-table-history", "create-ontology", "update-ontology", "modify-user-theme", "default-system-roles", "create-semantic-concept", "default-container-handling", "create-container", "create-table", "default-broker-handling", "default-maintenance-handling", "execute-semantic-query", "uma_authorization", "table-semantic-analyse", "list-containers", "check-database-access", "escalated-query-handling", "delete-identifier", "modify-database-owner", "list-tables", "export-table-data", "create-database-access", "delete-container", "re-execute-query", "create-semantic-unit", "escalated-identifier-handling", "system", "update-table-statistic", "escalated-semantics-handling", "default-database-handling", "delete-ontology", "find-database", "find-database-view", "update-semantic-concept", "find-user", "import-database-data", "publish-identifier", "default-roles-dbrepo", "find-foreign-user", "create-database", "create-maintenance-message", "find-maintenance-message", "escalated-container-handling", "default-researcher-roles", "default-identifier-handling", "escalated-user-handling", "modify-user-information", "create-database-view", "update-maintenance-message", "delete-foreign-table", "offline_access", "modify-foreign-table-column-semantics", "delete-maintenance-message", "find-container", "insert-table-data", "modify-identifier-metadata", "modify-database-image", "escalated-broker-handling", "modify-table-column-semantics", "escalated-database-handling", "default-semantics-handling", "update-database-access", "default-query-handling", "find-table", "list-queries", "default-developer-roles", "create-identifier", "escalated-table-handling", "find-identifier", "view-database-view-data", "view-table-data", "list-licenses", "default-table-handling", "list-identifiers", "create-foreign-identifier", "list-databases", "list-ontologies", "modify-database-visibility", "list-maintenance-messages", "delete-table" ]
+ },
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
}, {
"id" : "143ba359-5fa2-451e-8296-43ecf20bb251",
"name" : "update-semantic-concept",
@@ -114,6 +126,14 @@ data:
"clientRole" : false,
"containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
"attributes" : { }
+ }, {
+ "id" : "74648f9a-777e-4ef9-b97b-4c5d749d862f",
+ "name" : "update-search-index",
+ "description" : "${update-search-index}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
}, {
"id" : "22492b64-c633-48a0-9678-b28669f2885b",
"name" : "execute-semantic-query",
@@ -136,7 +156,7 @@ data:
"description" : "${default-table-handling}",
"composite" : true,
"composites" : {
- "realm" : [ "modify-table-column-semantics", "list-tables", "find-table", "create-table", "delete-table" ]
+ "realm" : [ "modify-table-column-semantics", "list-tables", "update-table-statistic", "find-table", "create-table", "delete-table" ]
},
"clientRole" : false,
"containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
@@ -176,6 +196,14 @@ data:
"clientRole" : false,
"containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
"attributes" : { }
+ }, {
+ "id" : "0e12eedf-545d-4d32-ac4d-2821dcb118b8",
+ "name" : "update-table-statistic",
+ "description" : "${update-table-statistic}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
}, {
"id" : "e63e61a2-d852-4ad3-bfb5-92d9ceafef6a",
"name" : "escalated-user-handling",
@@ -383,6 +411,14 @@ data:
"clientRole" : false,
"containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
"attributes" : { }
+ }, {
+ "id" : "b05e9b2b-748d-490b-949b-e78655bf7805",
+ "name" : "check-foreign-database-access",
+ "description" : "${check-foreign-database-access}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
}, {
"id" : "c047d521-cec3-4444-86c4-aef098489b7b",
"name" : "delete-maintenance-message",
@@ -391,6 +427,14 @@ data:
"clientRole" : false,
"containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
"attributes" : { }
+ }, {
+ "id" : "88f82262-be80-4d18-9fb4-5529da031f33",
+ "name" : "system",
+ "description" : "${system}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
}, {
"id" : "e14ab76b-1c24-484d-ae2d-478b8457edea",
"name" : "list-licenses",
@@ -640,6 +684,14 @@ data:
"clientRole" : false,
"containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
"attributes" : { }
+ }, {
+ "id" : "0c487c93-448f-4a82-8b9f-ebd8a0904bf8",
+ "name" : "find-foreign-user",
+ "description" : "${find-foreign-user}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "82c39861-d877-4667-a0f3-4daa2ee230e0",
+ "attributes" : { }
}, {
"id" : "cf9735a9-fb70-4cc5-b5f4-75afc4e5654b",
"name" : "modify-identifier-metadata",
@@ -1063,26 +1115,34 @@ data:
"id" : "f2ce17fe-7b15-47a4-bbf8-86f415298fa9",
"name" : "data-stewards",
"path" : "/data-stewards",
+ "subGroups" : [ ],
"attributes" : { },
"realmRoles" : [ "default-data-steward-roles" ],
- "clientRoles" : { },
- "subGroups" : [ ]
+ "clientRoles" : { }
}, {
"id" : "124d9888-0b6e-46aa-8225-077dcedaf16e",
"name" : "developers",
"path" : "/developers",
+ "subGroups" : [ ],
"attributes" : { },
"realmRoles" : [ "default-developer-roles" ],
- "clientRoles" : { },
- "subGroups" : [ ]
+ "clientRoles" : { }
}, {
"id" : "f467c38e-9041-4faa-ae0b-39cec65ff4db",
"name" : "researchers",
"path" : "/researchers",
+ "subGroups" : [ ],
"attributes" : { },
"realmRoles" : [ "default-researcher-roles" ],
- "clientRoles" : { },
- "subGroups" : [ ]
+ "clientRoles" : { }
+ }, {
+ "id" : "2b9f94b4-d434-4a98-8eab-25678cfee983",
+ "name" : "system",
+ "path" : "/system",
+ "subGroups" : [ ],
+ "attributes" : { },
+ "realmRoles" : [ "default-system-roles" ],
+ "clientRoles" : { }
} ],
"defaultRole" : {
"id" : "abd2d9ee-ebc4-4d0a-839e-6b588a6d442a",
@@ -1101,7 +1161,8 @@ data:
"otpPolicyLookAheadWindow" : 1,
"otpPolicyPeriod" : 30,
"otpPolicyCodeReusable" : false,
- "otpSupportedApplications" : [ "totpAppMicrosoftAuthenticatorName", "totpAppFreeOTPName", "totpAppGoogleName" ],
+ "otpSupportedApplications" : [ "totpAppFreeOTPName", "totpAppGoogleName", "totpAppMicrosoftAuthenticatorName" ],
+ "localizationTexts" : { },
"webAuthnPolicyRpEntityName" : "keycloak",
"webAuthnPolicySignatureAlgorithms" : [ "ES256" ],
"webAuthnPolicyRpId" : "",
@@ -1112,6 +1173,7 @@ data:
"webAuthnPolicyCreateTimeout" : 0,
"webAuthnPolicyAvoidSameAuthenticatorRegister" : false,
"webAuthnPolicyAcceptableAaguids" : [ ],
+ "webAuthnPolicyExtraOrigins" : [ ],
"webAuthnPolicyPasswordlessRpEntityName" : "keycloak",
"webAuthnPolicyPasswordlessSignatureAlgorithms" : [ "ES256" ],
"webAuthnPolicyPasswordlessRpId" : "",
@@ -1122,6 +1184,7 @@ data:
"webAuthnPolicyPasswordlessCreateTimeout" : 0,
"webAuthnPolicyPasswordlessAvoidSameAuthenticatorRegister" : false,
"webAuthnPolicyPasswordlessAcceptableAaguids" : [ ],
+ "webAuthnPolicyPasswordlessExtraOrigins" : [ ],
"scopeMappings" : [ {
"clientScope" : "rabbitmq.tag:administrator",
"roles" : [ "escalated-broker-handling" ]
@@ -1297,60 +1360,46 @@ data:
"fullScopeAllowed" : true,
"nodeReRegistrationTimeout" : -1,
"protocolMappers" : [ {
- "id" : "6a8cae99-294f-4fc2-9561-5a52f3f6a1ba",
- "name" : "Audience",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-hardcoded-claim-mapper",
- "consentRequired" : false,
- "config" : {
- "claim.value" : "spring",
- "userinfo.token.claim" : "false",
- "id.token.claim" : "false",
- "access.token.claim" : "true",
- "claim.name" : "aud",
- "access.tokenResponse.claim" : "false"
- }
- }, {
- "id" : "8ae79e43-b2b7-4bb9-a420-b498690dd8c3",
- "name" : "given name",
+ "id" : "da0b27c1-ae2e-4baa-bf78-db233e15c78d",
+ "name" : "preferred_username",
"protocol" : "openid-connect",
"protocolMapper" : "oidc-usermodel-property-mapper",
"consentRequired" : false,
"config" : {
- "userinfo.token.claim" : "false",
- "user.attribute" : "firstName",
- "id.token.claim" : "false",
+ "user.attribute" : "username",
+ "id.token.claim" : "true",
"access.token.claim" : "true",
- "claim.name" : "user.firstname",
- "jsonType.label" : "String"
+ "claim.name" : "preferred_username",
+ "userinfo.token.claim" : "true"
}
}, {
- "id" : "ef081a47-f023-4056-958c-4194d3878d8c",
- "name" : "username",
+ "id" : "7c94de93-f60f-487b-b4b7-1891c67f74cc",
+ "name" : "aud",
"protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
+ "protocolMapper" : "oidc-hardcoded-claim-mapper",
"consentRequired" : false,
"config" : {
- "userinfo.token.claim" : "false",
- "user.attribute" : "username",
- "id.token.claim" : "false",
+ "claim.value" : "dbrepo",
+ "userinfo.token.claim" : "true",
+ "id.token.claim" : "true",
"access.token.claim" : "true",
- "claim.name" : "client_id",
- "jsonType.label" : "String"
+ "claim.name" : "aud",
+ "access.tokenResponse.claim" : "false"
}
}, {
- "id" : "99e3b48b-86ff-4e5b-8652-fcd2738b0ad1",
- "name" : "family name",
+ "id" : "030a1cd9-53d1-4a62-a375-94d50a2dc6fc",
+ "name" : "uid",
"protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
"consentRequired" : false,
"config" : {
+ "aggregate.attrs" : "false",
+ "multivalued" : "false",
"userinfo.token.claim" : "true",
- "user.attribute" : "lastName",
+ "user.attribute" : "LDAP_ID",
"id.token.claim" : "true",
"access.token.claim" : "true",
- "claim.name" : "user.lastname",
- "jsonType.label" : "String"
+ "claim.name" : "uid"
}
} ],
"defaultClientScopes" : [ "roles", "attributes" ],
@@ -2047,6 +2096,7 @@ data:
"browserSecurityHeaders" : {
"contentSecurityPolicyReportOnly" : "",
"xContentTypeOptions" : "nosniff",
+ "referrerPolicy" : "no-referrer",
"xRobotsTag" : "none",
"xFrameOptions" : "SAMEORIGIN",
"contentSecurityPolicy" : "frame-src 'self'; frame-ancestors 'self'; object-src 'none';",
@@ -2080,23 +2130,6 @@ data:
"config" : {
"allow-default-scopes" : [ "true" ]
}
- }, {
- "id" : "1849e52a-b8c9-44a8-af3d-ee19376a1ed1",
- "name" : "Trusted Hosts",
- "providerId" : "trusted-hosts",
- "subType" : "anonymous",
- "subComponents" : { },
- "config" : {
- "host-sending-registration-request-must-match" : [ "true" ],
- "client-uris-must-match" : [ "true" ]
- }
- }, {
- "id" : "f565cb47-3bcf-4078-8f94-eb4179c375b8",
- "name" : "Full Scope Disabled",
- "providerId" : "scope",
- "subType" : "anonymous",
- "subComponents" : { },
- "config" : { }
}, {
"id" : "0efa669d-1017-4b4a-82e1-c2eaf72de2c9",
"name" : "Allowed Client Scopes",
@@ -2114,25 +2147,193 @@ data:
"subComponents" : { },
"config" : { }
}, {
- "id" : "104ec5a9-025b-4c44-8ac0-82d22887ca3e",
+ "id" : "3ab11d74-5e76-408a-b85a-26bf8950f979",
"name" : "Allowed Protocol Mapper Types",
"providerId" : "allowed-protocol-mappers",
- "subType" : "authenticated",
+ "subType" : "anonymous",
"subComponents" : { },
"config" : {
- "allowed-protocol-mapper-types" : [ "oidc-usermodel-property-mapper", "saml-role-list-mapper", "oidc-usermodel-attribute-mapper", "oidc-full-name-mapper", "saml-user-attribute-mapper", "oidc-address-mapper", "saml-user-property-mapper", "oidc-sha256-pairwise-sub-mapper" ]
+ "allowed-protocol-mapper-types" : [ "oidc-full-name-mapper", "saml-user-attribute-mapper", "saml-user-property-mapper", "saml-role-list-mapper", "oidc-usermodel-attribute-mapper", "oidc-usermodel-property-mapper", "oidc-address-mapper", "oidc-sha256-pairwise-sub-mapper" ]
}
}, {
- "id" : "3ab11d74-5e76-408a-b85a-26bf8950f979",
+ "id" : "1849e52a-b8c9-44a8-af3d-ee19376a1ed1",
+ "name" : "Trusted Hosts",
+ "providerId" : "trusted-hosts",
+ "subType" : "anonymous",
+ "subComponents" : { },
+ "config" : {
+ "host-sending-registration-request-must-match" : [ "true" ],
+ "client-uris-must-match" : [ "true" ]
+ }
+ }, {
+ "id" : "f565cb47-3bcf-4078-8f94-eb4179c375b8",
+ "name" : "Full Scope Disabled",
+ "providerId" : "scope",
+ "subType" : "anonymous",
+ "subComponents" : { },
+ "config" : { }
+ }, {
+ "id" : "104ec5a9-025b-4c44-8ac0-82d22887ca3e",
"name" : "Allowed Protocol Mapper Types",
"providerId" : "allowed-protocol-mappers",
- "subType" : "anonymous",
+ "subType" : "authenticated",
"subComponents" : { },
"config" : {
- "allowed-protocol-mapper-types" : [ "oidc-usermodel-property-mapper", "saml-role-list-mapper", "saml-user-property-mapper", "oidc-full-name-mapper", "oidc-address-mapper", "oidc-usermodel-attribute-mapper", "oidc-sha256-pairwise-sub-mapper", "saml-user-attribute-mapper" ]
+ "allowed-protocol-mapper-types" : [ "saml-user-property-mapper", "oidc-usermodel-property-mapper", "saml-role-list-mapper", "oidc-address-mapper", "saml-user-attribute-mapper", "oidc-full-name-mapper", "oidc-sha256-pairwise-sub-mapper", "oidc-usermodel-attribute-mapper" ]
+ }
+ } ],
+ "org.keycloak.storage.UserStorageProvider" : [ {
+ "id" : "c109d473-5ce1-4032-af7b-02e5442f5c07",
+ "name" : "openldap",
+ "providerId" : "ldap",
+ "subComponents" : {
+ "org.keycloak.storage.ldap.mappers.LDAPStorageMapper" : [ {
+ "id" : "db9963a3-03d1-468e-998c-9f3338fdb493",
+ "name" : "creation date",
+ "providerId" : "user-attribute-ldap-mapper",
+ "subComponents" : { },
+ "config" : {
+ "ldap.attribute" : [ "createTimestamp" ],
+ "is.mandatory.in.ldap" : [ "false" ],
+ "always.read.value.from.ldap" : [ "true" ],
+ "read.only" : [ "true" ],
+ "user.model.attribute" : [ "createTimestamp" ]
+ }
+ }, {
+ "id" : "9d7b9abc-321e-4674-ba36-b104b9990641",
+ "name" : "last name",
+ "providerId" : "user-attribute-ldap-mapper",
+ "subComponents" : { },
+ "config" : {
+ "ldap.attribute" : [ "sn" ],
+ "is.mandatory.in.ldap" : [ "true" ],
+ "always.read.value.from.ldap" : [ "true" ],
+ "read.only" : [ "false" ],
+ "user.model.attribute" : [ "lastName" ]
+ }
+ }, {
+ "id" : "b5b7253b-984e-4aa3-b862-20dbe06e4cf9",
+ "name" : "first name",
+ "providerId" : "user-attribute-ldap-mapper",
+ "subComponents" : { },
+ "config" : {
+ "ldap.attribute" : [ "cn" ],
+ "is.mandatory.in.ldap" : [ "true" ],
+ "read.only" : [ "false" ],
+ "always.read.value.from.ldap" : [ "true" ],
+ "user.model.attribute" : [ "firstName" ]
+ }
+ }, {
+ "id" : "ea383c2f-3bfe-4117-a8fd-f012d6ebbf9e",
+ "name" : "email",
+ "providerId" : "user-attribute-ldap-mapper",
+ "subComponents" : { },
+ "config" : {
+ "ldap.attribute" : [ "mail" ],
+ "is.mandatory.in.ldap" : [ "false" ],
+ "read.only" : [ "false" ],
+ "always.read.value.from.ldap" : [ "false" ],
+ "user.model.attribute" : [ "email" ]
+ }
+ }, {
+ "id" : "5692d060-55b8-4cb1-b68f-0ae123cd9d02",
+ "name" : "system",
+ "providerId" : "group-ldap-mapper",
+ "subComponents" : { },
+ "config" : {
+ "membership.attribute.type" : [ "DN" ],
+ "group.name.ldap.attribute" : [ "cn" ],
+ "preserve.group.inheritance" : [ "false" ],
+ "membership.user.ldap.attribute" : [ "uid" ],
+ "groups.dn" : [ "ou=users,{{ .Values.identityservice.global.ldapDomain }}" ],
+ "mode" : [ "LDAP_ONLY" ],
+ "user.roles.retrieve.strategy" : [ "LOAD_GROUPS_BY_MEMBER_ATTRIBUTE" ],
+ "membership.ldap.attribute" : [ "member" ],
+ "ignore.missing.groups" : [ "false" ],
+ "group.object.classes" : [ "groupOfNames" ],
+ "memberof.ldap.attribute" : [ "memberOf" ],
+ "groups.path" : [ "/" ],
+ "drop.non.existing.groups.during.sync" : [ "false" ]
+ }
+ }, {
+ "id" : "b6ff3285-35af-4e86-8bb4-d94b8e0d70bb",
+ "name" : "modify date",
+ "providerId" : "user-attribute-ldap-mapper",
+ "subComponents" : { },
+ "config" : {
+ "ldap.attribute" : [ "modifyTimestamp" ],
+ "is.mandatory.in.ldap" : [ "false" ],
+ "always.read.value.from.ldap" : [ "true" ],
+ "read.only" : [ "true" ],
+ "user.model.attribute" : [ "modifyTimestamp" ]
+ }
+ }, {
+ "id" : "b5d08699-ba3a-4ffd-bf2e-36d1bcac48d9",
+ "name" : "username",
+ "providerId" : "user-attribute-ldap-mapper",
+ "subComponents" : { },
+ "config" : {
+ "ldap.attribute" : [ "uid" ],
+ "is.mandatory.in.ldap" : [ "true" ],
+ "attribute.force.default" : [ "false" ],
+ "is.binary.attribute" : [ "false" ],
+ "always.read.value.from.ldap" : [ "false" ],
+ "read.only" : [ "false" ],
+ "user.model.attribute" : [ "username" ]
+ }
+ } ]
+ },
+ "config" : {
+ "pagination" : [ "false" ],
+ "fullSyncPeriod" : [ "-1" ],
+ "startTls" : [ "false" ],
+ "usersDn" : [ "ou=users,dc=dbrepo,dc=at" ],
+ "connectionPooling" : [ "true" ],
+ "cachePolicy" : [ "DEFAULT" ],
+ "useKerberosForPasswordAuthentication" : [ "false" ],
+ "importEnabled" : [ "true" ],
+ "enabled" : [ "true" ],
+ "usernameLDAPAttribute" : [ "uid" ],
+ "bindCredential" : [ "{{ .Values.identityservice.global.adminPassword }}" ],
+ "bindDn" : [ "cn={{ .Values.identityservice.global.adminUser }},{{ .Values.identityservice.global.ldapDomain }}" ],
+ "changedSyncPeriod" : [ "-1" ],
+ "lastSync" : [ "1719252666" ],
+ "vendor" : [ "other" ],
+ "uuidLDAPAttribute" : [ "entryUUID" ],
+ "connectionUrl" : [ "ldap://identity-service:389" ],
+ "allowKerberosAuthentication" : [ "false" ],
+ "syncRegistrations" : [ "true" ],
+ "authType" : [ "simple" ],
+ "useTruststoreSpi" : [ "always" ],
+ "usePasswordModifyExtendedOp" : [ "false" ],
+ "trustEmail" : [ "false" ],
+ "userObjectClasses" : [ "inetOrgPerson, organizationalPerson, person" ],
+ "rdnLDAPAttribute" : [ "uid" ],
+ "editMode" : [ "WRITABLE" ],
+ "validatePasswordPolicy" : [ "false" ]
+ }
+ } ],
+ "org.keycloak.userprofile.UserProfileProvider" : [ {
+ "id" : "a407a1d6-a7f6-4a72-ba3a-149de03d5a43",
+ "providerId" : "declarative-user-profile",
+ "subComponents" : { },
+ "config" : {
+ "kc.user.profile.config" : [ "{\"attributes\":[{\"name\":\"username\",\"displayName\":\"${username}\",\"validations\":{\"length\":{\"min\":3,\"max\":255},\"username-prohibited-characters\":{},\"up-username-not-idn-homograph\":{}},\"permissions\":{\"view\":[\"admin\",\"user\"],\"edit\":[\"admin\",\"user\"]},\"multivalued\":false},{\"name\":\"email\",\"displayName\":\"${email}\",\"validations\":{\"email\":{},\"length\":{\"max\":255}},\"required\":{\"roles\":[\"user\"]},\"permissions\":{\"view\":[\"admin\",\"user\"],\"edit\":[\"admin\",\"user\"]},\"multivalued\":false},{\"name\":\"firstName\",\"displayName\":\"${firstName}\",\"validations\":{\"length\":{\"max\":255},\"person-name-prohibited-characters\":{}},\"required\":{\"roles\":[\"user\"]},\"permissions\":{\"view\":[\"admin\",\"user\"],\"edit\":[\"admin\",\"user\"]},\"multivalued\":false},{\"name\":\"lastName\",\"displayName\":\"${lastName}\",\"validations\":{\"length\":{\"max\":255},\"person-name-prohibited-characters\":{}},\"required\":{\"roles\":[\"user\"]},\"permissions\":{\"view\":[\"admin\",\"user\"],\"edit\":[\"admin\",\"user\"]},\"multivalued\":false}],\"groups\":[{\"name\":\"user-metadata\",\"displayHeader\":\"User metadata\",\"displayDescription\":\"Attributes, which refer to user metadata\"}],\"unmanagedAttributePolicy\":\"ENABLED\"}" ]
}
} ],
"org.keycloak.keys.KeyProvider" : [ {
+ "id" : "2f53ccf3-37b0-4d34-83e7-ed497499ee51",
+ "name" : "rsa-enc-generated",
+ "providerId" : "rsa-enc-generated",
+ "subComponents" : { },
+ "config" : {
+ "privateKey" : [ "MIIEowIBAAKCAQEA3b1tNLfcjFLUw9UShVDNf+ZD8sQqb4YBaIXcSJTX/zDQUPiCp176BBGI3s4VplDArnOW+LumozmKogeoHEnGEIDW8ovgK5uMU9tSA2p0qqGBUMOdR8YATTIfCJe7qGiiuGa3WZy3sQLM70SuRzx02YU8gvUcvl2Js4KyqAziOUX/w3Wa59H9jjGNUXYyqaPWJp73eHzbVYWySzyLG22mVlcUtBx5siL5T2/Xu0p9z4l7/bapwwmOVi1ZrcHjbEAwdGEiSMGI/uWqAF+r1BRpmJLR7HNXcL3eK4/56VYLaiwSejfyYeRFMITEn/UxGYhcXZ5xMUUCG0TxjBhLYpTBuwIDAQABAoIBAA4dwebcxkrH99Poa8+WkiE7JgaS9sahx9OBI2xwJANoIU2TpzGuNLQZ76uLgB+rPWZTD9Xm5a1iJjwOyQ9/937TzPCk91D0tpgcusRikb8jx/6TGB9acL4kBjYUVCCHr3BA2G75MKKGtJ2OMvAbCQSosZj+r2VDwYFEPUkV2jheE5JHSBkwyIRrus3JCwu8gu5fyCg9z8ljcxJxI5HIsi4v8Z21aCw/cLj7h5cMt44wCjQz4rOfYNBEFeHDtlfR1QtWKgjm4ZHHJbKrzf9b2kQXclziceEbSM0tYbROEXKi+s0Zc+z3HEG89vv0vfN400clmzzIAijKY6gg3pPRWdECgYEA+lnWYbSlXDMNYx6RBXm1RnlMUYIm4oy4/9ljgnoGJ6WCn3SjFkgaDtiKfGIG1BSB85r04pAPANgcWHf5tWDnq0ARvBVG0BX2bKd++7B3D4d3CRYKCwm88SslJXv9dfHVhq4+zViFPiUWwT20A72jCuUCvL88y5fh/YBecfdh+jECgYEA4r5RD0NB9dMaeg5/jk/GEHIo4Z9KLc6FrSoOFo2xFkPOy1sgDpDOiNtypuWvniO7k7Ose3DS3hlfTMsKzIW/CgQJ20+Y4cvBWDaOsRxfjj7w3d+jH5OSJdKKSzTrgLKc9ZhlRzVXy0J0hipIA6HG5kdVdLXmh85ITmf1CbJhE6sCgYBjPVeBNbXTHZ2x6/z62aslO5IoQVqetb/kE82hfDOSZcao5Ph9Lam+ttH2ynkAevykj4mBgi+gWwqpey2uW7KaLPSaxShj9kDQA3mP1fzsV/u0y1rB02Nlin/YIxVvOqU1FT9p8SwoXVVu1sHUNck62VtDbN9xqUx5S/ikXrclEQKBgQCoTssOwEcK+Vty9KYcdfy4onTUHZBLdjxl8Iyqkxy7QTQUYRznkvesQPDXEDGO+kk3dyx2KKZt9Hl4IFNww2quPZcvcuMx4DQxjbXXpA8OIIxcta95NepLJwA+mRai3nKCH1A2TlNP7pFeMa5o+8IPly3Ix2lKr4Wepa4PN5i1pwKBgCZ1QP6XAOERl9NznNmU0rXVcvYNP4PIIfQWfvGsldZ4QKkmjjAGiS0/oYqdWs+UDRZyCRChaVjDXO9fk0PEG5OGKAj9nyiYCT/M8xtJ3UeP5ffZZvJ/vnye3QdDIo1e38ZzsWwJHmLYw7fRqY9W5Vxo0Vsy22U3CJY70KTxVdTy" ],
+ "keyUse" : [ "ENC" ],
+ "certificate" : [ "MIICmzCCAYMCBgGG3GWycDANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZkYnJlcG8wHhcNMjMwMzEzMTkxMzE3WhcNMzMwMzEzMTkxNDU3WjARMQ8wDQYDVQQDDAZkYnJlcG8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDdvW00t9yMUtTD1RKFUM1/5kPyxCpvhgFohdxIlNf/MNBQ+IKnXvoEEYjezhWmUMCuc5b4u6ajOYqiB6gcScYQgNbyi+Arm4xT21IDanSqoYFQw51HxgBNMh8Il7uoaKK4ZrdZnLexAszvRK5HPHTZhTyC9Ry+XYmzgrKoDOI5Rf/DdZrn0f2OMY1RdjKpo9Ymnvd4fNtVhbJLPIsbbaZWVxS0HHmyIvlPb9e7Sn3PiXv9tqnDCY5WLVmtweNsQDB0YSJIwYj+5aoAX6vUFGmYktHsc1dwvd4rj/npVgtqLBJ6N/Jh5EUwhMSf9TEZiFxdnnExRQIbRPGMGEtilMG7AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAK3kQ1VkQrzvSWvmXmazmNoA1ZiPzRDs1XhGUWxgsxzgPylr3dGBuqQbKvgnLUBQLSqlJHpI4fZflHswu1qrvVZYtekPcGef4WhcKAu2i1RwxrKa6RJQ1tRbrLuVYCzPv5p/DWgltWVn88aoLnqQn0SK/0PB/o4a4Cm7Kq2ZzCr1dACBr06LvOHsc7249OySmbG4HH+pLK6jVURhZ9VaObqAHe2FJBVVoIzURbdiRRURqumrIvbnpeaU1aFyg6ED5wTnXvmMPmVPt9F79mcB33bASO5wyu00X8t1hyN2Show2l2vxLACGUzVkTQt15s7uDLKE7qLmKSR3EuSGXWv3wA=" ],
+ "priority" : [ "100" ],
+ "algorithm" : [ "RSA-OAEP" ]
+ }
+ }, {
"id" : "28ca0b6d-b2e2-4785-b04b-2391e6344e30",
"name" : "aes-generated",
"providerId" : "aes-generated",
@@ -2148,23 +2349,11 @@ data:
"providerId" : "hmac-generated",
"subComponents" : { },
"config" : {
- "kid" : [ "c8500166-5cc4-4085-ad0f-853c3b0b0233" ],
- "secret" : [ "TI3xg__G2Qy8C47DracpYir2X4ItQZSrhgr5KSlwRNISDbBqZ-ky3OcAyokSXMcpweSOaCPvbivpvzJNklUBvw" ],
+ "kid" : [ "7f9f9054-5697-4f60-bdc8-67e3bd0f4db6" ],
+ "secret" : [ "1SCIY20z3AbAHCL28LuJfBU-7zfsZv5dacgliUeGdRW_WK3vH9fJUpPu1f7iDrdlhF7YQmHxLXsWjxhQId4ShI7QBdgKCArHWqi0GeH37oNXfZFg_uv-K_3JSfxfGBRu5jpRQhhSBxESZWsFVkskhxWUvNe6b5l9dFbMIif72rI" ],
"priority" : [ "100" ],
"algorithm" : [ "HS256" ]
}
- }, {
- "id" : "2f53ccf3-37b0-4d34-83e7-ed497499ee51",
- "name" : "rsa-enc-generated",
- "providerId" : "rsa-enc-generated",
- "subComponents" : { },
- "config" : {
- "privateKey" : [ "MIIEowIBAAKCAQEA3b1tNLfcjFLUw9UShVDNf+ZD8sQqb4YBaIXcSJTX/zDQUPiCp176BBGI3s4VplDArnOW+LumozmKogeoHEnGEIDW8ovgK5uMU9tSA2p0qqGBUMOdR8YATTIfCJe7qGiiuGa3WZy3sQLM70SuRzx02YU8gvUcvl2Js4KyqAziOUX/w3Wa59H9jjGNUXYyqaPWJp73eHzbVYWySzyLG22mVlcUtBx5siL5T2/Xu0p9z4l7/bapwwmOVi1ZrcHjbEAwdGEiSMGI/uWqAF+r1BRpmJLR7HNXcL3eK4/56VYLaiwSejfyYeRFMITEn/UxGYhcXZ5xMUUCG0TxjBhLYpTBuwIDAQABAoIBAA4dwebcxkrH99Poa8+WkiE7JgaS9sahx9OBI2xwJANoIU2TpzGuNLQZ76uLgB+rPWZTD9Xm5a1iJjwOyQ9/937TzPCk91D0tpgcusRikb8jx/6TGB9acL4kBjYUVCCHr3BA2G75MKKGtJ2OMvAbCQSosZj+r2VDwYFEPUkV2jheE5JHSBkwyIRrus3JCwu8gu5fyCg9z8ljcxJxI5HIsi4v8Z21aCw/cLj7h5cMt44wCjQz4rOfYNBEFeHDtlfR1QtWKgjm4ZHHJbKrzf9b2kQXclziceEbSM0tYbROEXKi+s0Zc+z3HEG89vv0vfN400clmzzIAijKY6gg3pPRWdECgYEA+lnWYbSlXDMNYx6RBXm1RnlMUYIm4oy4/9ljgnoGJ6WCn3SjFkgaDtiKfGIG1BSB85r04pAPANgcWHf5tWDnq0ARvBVG0BX2bKd++7B3D4d3CRYKCwm88SslJXv9dfHVhq4+zViFPiUWwT20A72jCuUCvL88y5fh/YBecfdh+jECgYEA4r5RD0NB9dMaeg5/jk/GEHIo4Z9KLc6FrSoOFo2xFkPOy1sgDpDOiNtypuWvniO7k7Ose3DS3hlfTMsKzIW/CgQJ20+Y4cvBWDaOsRxfjj7w3d+jH5OSJdKKSzTrgLKc9ZhlRzVXy0J0hipIA6HG5kdVdLXmh85ITmf1CbJhE6sCgYBjPVeBNbXTHZ2x6/z62aslO5IoQVqetb/kE82hfDOSZcao5Ph9Lam+ttH2ynkAevykj4mBgi+gWwqpey2uW7KaLPSaxShj9kDQA3mP1fzsV/u0y1rB02Nlin/YIxVvOqU1FT9p8SwoXVVu1sHUNck62VtDbN9xqUx5S/ikXrclEQKBgQCoTssOwEcK+Vty9KYcdfy4onTUHZBLdjxl8Iyqkxy7QTQUYRznkvesQPDXEDGO+kk3dyx2KKZt9Hl4IFNww2quPZcvcuMx4DQxjbXXpA8OIIxcta95NepLJwA+mRai3nKCH1A2TlNP7pFeMa5o+8IPly3Ix2lKr4Wepa4PN5i1pwKBgCZ1QP6XAOERl9NznNmU0rXVcvYNP4PIIfQWfvGsldZ4QKkmjjAGiS0/oYqdWs+UDRZyCRChaVjDXO9fk0PEG5OGKAj9nyiYCT/M8xtJ3UeP5ffZZvJ/vnye3QdDIo1e38ZzsWwJHmLYw7fRqY9W5Vxo0Vsy22U3CJY70KTxVdTy" ],
- "keyUse" : [ "ENC" ],
- "certificate" : [ "MIICmzCCAYMCBgGG3GWycDANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZkYnJlcG8wHhcNMjMwMzEzMTkxMzE3WhcNMzMwMzEzMTkxNDU3WjARMQ8wDQYDVQQDDAZkYnJlcG8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDdvW00t9yMUtTD1RKFUM1/5kPyxCpvhgFohdxIlNf/MNBQ+IKnXvoEEYjezhWmUMCuc5b4u6ajOYqiB6gcScYQgNbyi+Arm4xT21IDanSqoYFQw51HxgBNMh8Il7uoaKK4ZrdZnLexAszvRK5HPHTZhTyC9Ry+XYmzgrKoDOI5Rf/DdZrn0f2OMY1RdjKpo9Ymnvd4fNtVhbJLPIsbbaZWVxS0HHmyIvlPb9e7Sn3PiXv9tqnDCY5WLVmtweNsQDB0YSJIwYj+5aoAX6vUFGmYktHsc1dwvd4rj/npVgtqLBJ6N/Jh5EUwhMSf9TEZiFxdnnExRQIbRPGMGEtilMG7AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAK3kQ1VkQrzvSWvmXmazmNoA1ZiPzRDs1XhGUWxgsxzgPylr3dGBuqQbKvgnLUBQLSqlJHpI4fZflHswu1qrvVZYtekPcGef4WhcKAu2i1RwxrKa6RJQ1tRbrLuVYCzPv5p/DWgltWVn88aoLnqQn0SK/0PB/o4a4Cm7Kq2ZzCr1dACBr06LvOHsc7249OySmbG4HH+pLK6jVURhZ9VaObqAHe2FJBVVoIzURbdiRRURqumrIvbnpeaU1aFyg6ED5wTnXvmMPmVPt9F79mcB33bASO5wyu00X8t1hyN2Show2l2vxLACGUzVkTQt15s7uDLKE7qLmKSR3EuSGXWv3wA=" ],
- "priority" : [ "100" ],
- "algorithm" : [ "RSA-OAEP" ]
- }
}, {
"id" : "2293ff99-3c6d-46d1-8635-5e679d5b134a",
"name" : "rsa-generated",
@@ -2176,12 +2365,23 @@ data:
"certificate" : [ "MIICmzCCAYMCBgGG3GWyBTANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZkYnJlcG8wHhcNMjMwMzEzMTkxMzE3WhcNMzMwMzEzMTkxNDU3WjARMQ8wDQYDVQQDDAZkYnJlcG8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqqcdDYFZZb28M0tEJzEP77FmD/Xqioyj9zWX6VwUSOMAgmMmn8eqs9hT9T0a+q4YTo9tUW1PNbUpwprA5b4Uk04DcIajxDVMUR/PjcHytmkqwVskq9AZW/Vngdoo+8tSbuIybwe/3Vwt266hbHpDcM97a+DXcYooRl7tQWCEX7RP27wQrMD9epDQ6IgKayZg9vC9/03dsIqwH9jXQRiZlFvwiEKhX2aY7lPGBaCK414JO00K/Z49iov9TRa/IYVbSt5qwgrx6DcqsBSPwOnI6A85UGfeUEZ/7coVJiL7RvBlsllapsL9eWTbQajVh94k9Ei3sibEPbtH+U2OAM78zAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAASnN1Cuif1sdfEK2kWAURSXGJCohCROLWdKFjaeHPRaEfpbFJsgxW0Yj3nwX5O3bUlOWoTyENwnXSsXMQsqnNi+At32CKaKO8+AkhAbgQL9F0B+KeJwmYv3cUj5N/LYkJjBvZBzUZ4Ugu5dcxH0k7AktLAIwimkyEnxTNolOA3UyrGGpREr8MCKWVr10RFuOpF/0CsJNNwbHXzalO9D756EUcRWZ9VSg6QVNso0YYRKTnILWDn9hcTRnqGy3SHo3anFTqQZ+BB57YbgFWy6udC0LYRB3zdp6zNti87eu/VEymiDY/mmo1AB8Tm0b6vxFz4AKcL3ax5qS6YnZ9efSzk=" ],
"priority" : [ "100" ]
}
+ }, {
+ "id" : "addbae10-c6ae-4735-851f-7a5ea035ce25",
+ "name" : "hmac-generated-hs512",
+ "providerId" : "hmac-generated",
+ "subComponents" : { },
+ "config" : {
+ "kid" : [ "352d0ea1-8218-42b5-ab78-e2ca56cf6a95" ],
+ "secret" : [ "_kr6EZOZ8IKqPWgJltHAAsQ34wCIGPs8oOQLYWwJrSIH7Qie3CEVKZnICyBP1goR-QgUtg25tR8Qu5MkvYkb8assJ8Iok5x_8iYCR4Txkf_mS-emrlAtQajlIjmOfNBtx704dTnZlP9rWzqpW6mrpeiOaiCw1K0XCpY5C_ZjXKw" ],
+ "priority" : [ "100" ],
+ "algorithm" : [ "HS512" ]
+ }
} ]
},
"internationalizationEnabled" : false,
"supportedLocales" : [ ],
"authenticationFlows" : [ {
- "id" : "81aad346-5dea-4764-a97d-70fa27c7d4a0",
+ "id" : "259dd7b6-01b7-433a-bda4-028857151ecd",
"alias" : "Account verification options",
"description" : "Method with which to verity the existing account",
"providerId" : "basic-flow",
@@ -2203,36 +2403,7 @@ data:
"userSetupAllowed" : false
} ]
}, {
- "id" : "1677aaa5-9086-4d75-8f07-c76e25f90167",
- "alias" : "Authentication Options",
- "description" : "Authentication options.",
- "providerId" : "basic-flow",
- "topLevel" : false,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "basic-auth",
- "authenticatorFlow" : false,
- "requirement" : "REQUIRED",
- "priority" : 10,
- "autheticatorFlow" : false,
- "userSetupAllowed" : false
- }, {
- "authenticator" : "basic-auth-otp",
- "authenticatorFlow" : false,
- "requirement" : "DISABLED",
- "priority" : 20,
- "autheticatorFlow" : false,
- "userSetupAllowed" : false
- }, {
- "authenticator" : "auth-spnego",
- "authenticatorFlow" : false,
- "requirement" : "DISABLED",
- "priority" : 30,
- "autheticatorFlow" : false,
- "userSetupAllowed" : false
- } ]
- }, {
- "id" : "04270a38-4dd9-4820-bccd-0eeab6d5e60b",
+ "id" : "542ca1d7-9627-4102-b843-98837ce433fb",
"alias" : "Browser - Conditional OTP",
"description" : "Flow to determine if the OTP is required for the authentication",
"providerId" : "basic-flow",
@@ -2254,7 +2425,7 @@ data:
"userSetupAllowed" : false
} ]
}, {
- "id" : "82af3fdb-f93f-40cd-9a1b-5aaac3c99fc4",
+ "id" : "4f153b98-6851-440b-a022-0a14e67a9b2f",
"alias" : "Direct Grant - Conditional OTP",
"description" : "Flow to determine if the OTP is required for the authentication",
"providerId" : "basic-flow",
@@ -2276,7 +2447,7 @@ data:
"userSetupAllowed" : false
} ]
}, {
- "id" : "9f7a2dee-a00b-4ed0-a28d-aebd5b04c098",
+ "id" : "3d791b35-d35c-40b2-bb3e-e806d72b27ee",
"alias" : "First broker login - Conditional OTP",
"description" : "Flow to determine if the OTP is required for the authentication",
"providerId" : "basic-flow",
@@ -2298,7 +2469,7 @@ data:
"userSetupAllowed" : false
} ]
}, {
- "id" : "8bb2d6f7-095f-4be5-844e-aa7351be07a3",
+ "id" : "9b746104-9371-4c3f-b69f-9322cead1b08",
"alias" : "Handle Existing Account",
"description" : "Handle what to do if there is existing account with same email/username like authenticated identity provider",
"providerId" : "basic-flow",
@@ -2320,7 +2491,7 @@ data:
"userSetupAllowed" : false
} ]
}, {
- "id" : "dc8b131c-6078-4730-9c89-0f6e523bd42e",
+ "id" : "7a164efe-c97b-4fbb-950d-7745359ba9a4",
"alias" : "Reset - Conditional OTP",
"description" : "Flow to determine if the OTP should be reset or not. Set to REQUIRED to force.",
"providerId" : "basic-flow",
@@ -2342,7 +2513,7 @@ data:
"userSetupAllowed" : false
} ]
}, {
- "id" : "f308ac01-8dfa-4593-b19f-562c26d95bbd",
+ "id" : "4fdc5e1b-1b55-4662-8360-67d75fa22677",
"alias" : "User creation or linking",
"description" : "Flow for the existing/non-existing user alternatives",
"providerId" : "basic-flow",
@@ -2365,7 +2536,7 @@ data:
"userSetupAllowed" : false
} ]
}, {
- "id" : "12fe4a00-c0ee-4a21-929f-c9e510f7edd4",
+ "id" : "75893341-c338-44d8-ae27-a3fc7bfe8f2d",
"alias" : "Verify Existing Account by Re-authentication",
"description" : "Reauthentication of existing account",
"providerId" : "basic-flow",
@@ -2387,7 +2558,7 @@ data:
"userSetupAllowed" : false
} ]
}, {
- "id" : "4add5b6a-55d9-4d95-8d24-00e508039883",
+ "id" : "89626b76-f4cf-4c46-934c-4408c225a44b",
"alias" : "browser",
"description" : "browser based authentication",
"providerId" : "basic-flow",
@@ -2423,7 +2594,7 @@ data:
"userSetupAllowed" : false
} ]
}, {
- "id" : "783c72d8-b771-45ff-9b94-facbc7fe7c33",
+ "id" : "4112115a-e7a7-44c2-9af5-65d538e4ba0d",
"alias" : "clients",
"description" : "Base authentication for clients",
"providerId" : "client-flow",
@@ -2459,7 +2630,7 @@ data:
"userSetupAllowed" : false
} ]
}, {
- "id" : "55bed153-d2e3-44fa-9a42-4fe971325112",
+ "id" : "f82a9b0a-2c0a-4cb1-96b2-6c78b0b1f14f",
"alias" : "direct grant",
"description" : "OpenID Connect Resource Owner Grant",
"providerId" : "basic-flow",
@@ -2488,7 +2659,7 @@ data:
"userSetupAllowed" : false
} ]
}, {
- "id" : "8fc5834a-2853-47e5-9b0b-9af49ec8ae4f",
+ "id" : "3614e155-e8ce-4958-98fb-a27e4706cc70",
"alias" : "docker auth",
"description" : "Used by Docker clients to authenticate against the IDP",
"providerId" : "basic-flow",
@@ -2503,7 +2674,7 @@ data:
"userSetupAllowed" : false
} ]
}, {
- "id" : "34062276-646c-48d7-ab65-4f086c3575fb",
+ "id" : "506f9b96-5002-47c0-96e3-3830a0fcfa26",
"alias" : "first broker login",
"description" : "Actions taken after first broker login with identity provider account, which is not yet linked to any Keycloak account",
"providerId" : "basic-flow",
@@ -2526,7 +2697,7 @@ data:
"userSetupAllowed" : false
} ]
}, {
- "id" : "47f8b7df-bc03-43cd-ab0b-be6ca3320f1c",
+ "id" : "4b7a7e91-36db-4b27-8e2d-01a04a822980",
"alias" : "forms",
"description" : "Username, password, otp and other auth forms.",
"providerId" : "basic-flow",
@@ -2548,29 +2719,7 @@ data:
"userSetupAllowed" : false
} ]
}, {
- "id" : "e975f4cf-3cad-458a-b0c5-1f6c5bb14d1b",
- "alias" : "http challenge",
- "description" : "An authentication flow based on challenge-response HTTP Authentication Schemes",
- "providerId" : "basic-flow",
- "topLevel" : true,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "no-cookie-redirect",
- "authenticatorFlow" : false,
- "requirement" : "REQUIRED",
- "priority" : 10,
- "autheticatorFlow" : false,
- "userSetupAllowed" : false
- }, {
- "authenticatorFlow" : true,
- "requirement" : "REQUIRED",
- "priority" : 20,
- "autheticatorFlow" : true,
- "flowAlias" : "Authentication Options",
- "userSetupAllowed" : false
- } ]
- }, {
- "id" : "5a570e5c-22aa-4cb9-ba03-9729876a0f14",
+ "id" : "04c2fe01-5076-4aa4-9596-4efb4004195f",
"alias" : "registration",
"description" : "registration flow",
"providerId" : "basic-flow",
@@ -2586,7 +2735,7 @@ data:
"userSetupAllowed" : false
} ]
}, {
- "id" : "2a50f240-7f9c-4663-b922-bf141d8cecea",
+ "id" : "d12f77e1-7733-44a2-98ff-fd75c784d721",
"alias" : "registration form",
"description" : "registration form",
"providerId" : "form-flow",
@@ -2599,13 +2748,6 @@ data:
"priority" : 20,
"autheticatorFlow" : false,
"userSetupAllowed" : false
- }, {
- "authenticator" : "registration-profile-action",
- "authenticatorFlow" : false,
- "requirement" : "REQUIRED",
- "priority" : 40,
- "autheticatorFlow" : false,
- "userSetupAllowed" : false
}, {
"authenticator" : "registration-password-action",
"authenticatorFlow" : false,
@@ -2622,7 +2764,7 @@ data:
"userSetupAllowed" : false
} ]
}, {
- "id" : "4136e336-cf46-444c-9aaa-77ec1b2eaec0",
+ "id" : "91f6048c-a376-4809-8f37-c8d7a517830c",
"alias" : "reset credentials",
"description" : "Reset credentials for a user if they forgot their password or something",
"providerId" : "basic-flow",
@@ -2658,7 +2800,7 @@ data:
"userSetupAllowed" : false
} ]
}, {
- "id" : "d1ba354a-8203-42d5-bf16-d850182f7336",
+ "id" : "7b8fb487-53b8-4533-a696-76bc05256cb1",
"alias" : "saml ecp",
"description" : "SAML ECP Profile Authentication Flow",
"providerId" : "basic-flow",
@@ -2674,13 +2816,13 @@ data:
} ]
} ],
"authenticatorConfig" : [ {
- "id" : "cea49223-ea27-4324-816c-b6a890548097",
+ "id" : "48372696-0579-45e5-b074-5e8dbdbbe7d6",
"alias" : "create unique user config",
"config" : {
"require.password.update.after.registration" : "false"
}
}, {
- "id" : "3627d68d-6f05-45b2-835d-8127ab90a6b3",
+ "id" : "08df3b83-e522-42a7-9e24-9028b960bf39",
"alias" : "review profile config",
"config" : {
"update.profile.on.first.login" : "missing"
@@ -2750,6 +2892,14 @@ data:
"defaultAction" : false,
"priority" : 80,
"config" : { }
+ }, {
+ "alias" : "delete_credential",
+ "name" : "Delete Credential",
+ "providerId" : "delete_credential",
+ "enabled" : true,
+ "defaultAction" : false,
+ "priority" : 100,
+ "config" : { }
}, {
"alias" : "update_user_locale",
"name" : "Update User Locale",
@@ -2765,6 +2915,7 @@ data:
"resetCredentialsFlow" : "reset credentials",
"clientAuthenticationFlow" : "clients",
"dockerAuthenticationFlow" : "docker auth",
+ "firstBrokerLoginFlow" : "first broker login",
"attributes" : {
"cibaBackchannelTokenDeliveryMode" : "poll",
"cibaAuthRequestedUserHint" : "login_hint",
@@ -2784,7 +2935,7 @@ data:
"clientSessionMaxLifespan" : "0",
"shortVerificationUri" : ""
},
- "keycloakVersion" : "21.0.2",
+ "keycloakVersion" : "24.0.5",
"userManagedAccessAllowed" : false,
"clientProfiles" : {
"profiles" : [ ]
@@ -2793,4 +2944,4 @@ data:
"policies" : [ ]
}
}
-{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/helm/dbrepo/templates/broker-secret.yaml b/helm/dbrepo/templates/broker-secret.yaml
index 9291cdbead49275baa472b9aecd9f7a83dc407d2..4348be52896a8cb09672379ed10cf746803651e8 100644
--- a/helm/dbrepo/templates/broker-secret.yaml
+++ b/helm/dbrepo/templates/broker-secret.yaml
@@ -6,6 +6,24 @@ metadata:
name: broker-service-secret
namespace: {{ .Values.namespace }}
stringData:
+ advanced.config: |
+ [
+ {
+ rabbitmq_auth_backend_ldap,
+ [
+ {
+ tag_queries, [
+ {
+ administrator, {in_group_nested, "cn=system,ou=users,{{ .Values.identityservice.global.ldapDomain }}", "member"}
+ },
+ {
+ management, {constant, true}
+ }
+ ]
+ }
+ ]
+ }
+ ].
load_definition.json: |
{
"bindings": [
@@ -30,15 +48,7 @@ stringData:
],
"global_parameters": [],
"parameters": [],
- "permissions": [
- {
- "configure": ".*",
- "read": ".*",
- "user": "broker",
- "vhost": "dbrepo",
- "write": ".*"
- }
- ],
+ "permissions": [],
"policies": [],
"queues": [
{
@@ -56,17 +66,7 @@ stringData:
"rabbit_version": "3.10.25",
"rabbitmq_version": "3.10.25",
"topic_permissions": [],
- "users": [
- {
- "hashing_algorithm": "rabbit_password_hashing_sha256",
- "limits": {},
- "name": "broker",
- "password_hash": "Sek6WxpX2L6UhxlwRkD0cnYAH5GbtTcCFq1yY/SCc1mAa0gB",
- "tags": [
- "administrator"
- ]
- }
- ],
+ "users": [],
"vhosts": [
{
"limits": [],
@@ -78,12 +78,4 @@ stringData:
}
]
}
- cert.pem: |
- -----BEGIN CERTIFICATE-----
- MIICmzCCAYMCBgGG3GWyBTANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZkYnJlcG8wHhcNMjMwMzEzMTkxMzE3WhcNMzMwMzEzMTkxNDU3WjARMQ8wDQYDVQQDDAZkYnJlcG8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqqcdDYFZZb28M0tEJzEP77FmD/Xqioyj9zWX6VwUSOMAgmMmn8eqs9hT9T0a+q4YTo9tUW1PNbUpwprA5b4Uk04DcIajxDVMUR/PjcHytmkqwVskq9AZW/Vngdoo+8tSbuIybwe/3Vwt266hbHpDcM97a+DXcYooRl7tQWCEX7RP27wQrMD9epDQ6IgKayZg9vC9/03dsIqwH9jXQRiZlFvwiEKhX2aY7lPGBaCK414JO00K/Z49iov9TRa/IYVbSt5qwgrx6DcqsBSPwOnI6A85UGfeUEZ/7coVJiL7RvBlsllapsL9eWTbQajVh94k9Ei3sibEPbtH+U2OAM78zAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAASnN1Cuif1sdfEK2kWAURSXGJCohCROLWdKFjaeHPRaEfpbFJsgxW0Yj3nwX5O3bUlOWoTyENwnXSsXMQsqnNi+At32CKaKO8+AkhAbgQL9F0B+KeJwmYv3cUj5N/LYkJjBvZBzUZ4Ugu5dcxH0k7AktLAIwimkyEnxTNolOA3UyrGGpREr8MCKWVr10RFuOpF/0CsJNNwbHXzalO9D756EUcRWZ9VSg6QVNso0YYRKTnILWDn9hcTRnqGy3SHo3anFTqQZ+BB57YbgFWy6udC0LYRB3zdp6zNti87eu/VEymiDY/mmo1AB8Tm0b6vxFz4AKcL3ax5qS6YnZ9efSzk=
- -----END CERTIFICATE-----
- pubkey.pem: |
- -----BEGIN RSA PUBLIC KEY-----
- MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB
- -----END RSA PUBLIC KEY-----
{{- end }}
diff --git a/helm/dbrepo/templates/data-deployment.yaml b/helm/dbrepo/templates/data-deployment.yaml
index 5ca77b9a44f131c739ea9c94ada32f0f6808dd4a..d46f6d6573e7b8703037bab3acf6fc9c63e31d59 100644
--- a/helm/dbrepo/templates/data-deployment.yaml
+++ b/helm/dbrepo/templates/data-deployment.yaml
@@ -22,21 +22,16 @@ spec:
app: data-service
service: data-service
spec:
- securityContext:
- runAsNonRoot: true
+ {{- if .Values.dataservice.podSecurityContext.enabled }}
+ securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.dataservice.podSecurityContext "context" $) | nindent 8 }}
+ {{- end }}
containers:
- name: data-service
image: {{ .Values.dataservice.image.name }}
imagePullPolicy: {{ .Values.dataservice.image.pullPolicy | default "IfNotPresent" }}
- securityContext:
- runAsNonRoot: true
- readOnlyRootFilesystem: true
- allowPrivilegeEscalation: false
- seccompProfile:
- type: {{ .Values.dataservice.profileType | default "RuntimeDefault" }}
- capabilities:
- drop:
- - ALL
+ {{- if .Values.dataservice.containerSecurityContext.enabled }}
+ securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.dataservice.containerSecurityContext "context" $) | nindent 12 }}
+ {{- end }}
ports:
- containerPort: 80
protocol: TCP
@@ -85,7 +80,9 @@ spec:
- "curl -sSL localhost:8080/actuator/health/liveness | grep 'UP' || exit 1"
initialDelaySeconds: 30
periodSeconds: 30
+ {{- if .Values.dataservice.resources }}
+ resources: {{- toYaml .Values.dataservice.resources | nindent 12 }}
+ {{- end }}
volumeMounts: []
- resources: {{ toYaml .Values.resources | nindent 12 }}
volumes: []
{{- end }}
diff --git a/helm/dbrepo/templates/data-secret.yaml b/helm/dbrepo/templates/data-secret.yaml
index 3e74a24fb3d4a73eb29ce0f3493a38ee867488db..c783f98bf2993b7ce9a43db1e176601ec973a1ca 100644
--- a/helm/dbrepo/templates/data-secret.yaml
+++ b/helm/dbrepo/templates/data-secret.yaml
@@ -6,21 +6,19 @@ metadata:
namespace: {{ .Values.namespace }}
stringData:
ADMIN_EMAIL: "{{ .Values.metadataservice.admin.email }}"
- ADMIN_USERNAME: "{{ .Values.admin.username }}"
- ADMIN_PASSWORD: "{{ .Values.admin.password }}"
AUTH_SERVICE_ADMIN: "{{ .Values.authservice.auth.adminUser }}"
AUTH_SERVICE_ADMIN_PASSWORD: "{{ .Values.authservice.auth.adminPassword }}"
AUTH_SERVICE_CLIENT: "{{ .Values.authservice.client.id }}"
AUTH_SERVICE_CLIENT_SECRET: "{{ .Values.authservice.client.secret }}"
- AUTH_SERVICE_HOST: "{{ .Values.authservice.endpoint }}"
+ AUTH_SERVICE_ENDPOINT: "{{ .Values.authservice.endpoint }}"
BROKER_EXCHANGE_NAME: "{{ .Values.brokerservice.exchangeName }}"
BROKER_HOST: "{{ .Values.brokerservice.host }}"
BROKER_QUEUE_NAME: "{{ .Values.brokerservice.queueName }}"
- BROKER_PASSWORD: "{{ .Values.brokerservice.auth.password }}"
+ BROKER_PASSWORD: "{{ .Values.dataservice.rabbitmq.consumer.password }}"
BROKER_PORT: "{{ .Values.brokerservice.port }}"
BROKER_ROUTING_KEY: "{{ .Values.brokerservice.routingKey }}"
- BROKER_SERVICE_ENDPOINT: "{{ .Values.brokerservice.url }}"
- BROKER_USERNAME: "{{ .Values.brokerservice.auth.username }}"
+ BROKER_SERVICE_ENDPOINT: "{{ .Values.brokerservice.endpoint }}"
+ BROKER_USERNAME: "{{ .Values.dataservice.rabbitmq.consumer.username }}"
BROKER_VIRTUALHOST: "{{ .Values.brokerservice.virtualHost }}"
CONNECTION_TIMEOUT: "{{ .Values.brokerservice.connectionTimeout }}"
GATEWAY_SERVICE_ENDPOINT: "{{ .Values.gateway }}"
@@ -30,9 +28,9 @@ stringData:
DEFAULT_TIME_FORMAT_ID: "{{ .Values.dataservice.default.time }}"
DEFAULT_TIMESTAMP_FORMAT_ID: "{{ .Values.dataservice.default.timestamp }}"
JWT_PUBKEY: "{{ .Values.authservice.jwt.pubkey }}"
- LOG_LEVEL: "{{ ternary "debug" "info" .Values.dataservice.image.debug }}"
+ LOG_LEVEL: "{{ ternary "trace" "info" .Values.dataservice.image.debug }}"
METADATA_SERVICE_ENDPOINT: "{{ .Values.metadataservice.endpoint }}"
- MIN_CONCURRENT_CONSUMERS: "{{ .Values.dataservice.consumerConcurrentMin }}"
- MAX_CONCURRENT_CONSUMERS: "{{ .Values.dataservice.consumerConcurrentMax }}"
- REQUEUE_REJECTED: "{{ .Values.dataservice.requeueRejected }}"
- S3_FILE_PATH: "{{.Values.dataservice.s3FilePath}}"
\ No newline at end of file
+ MIN_CONCURRENT_CONSUMERS: "{{ .Values.dataservice.rabbitmq.consumerConcurrentMin }}"
+ MAX_CONCURRENT_CONSUMERS: "{{ .Values.dataservice.rabbitmq.consumerConcurrentMax }}"
+ REQUEUE_REJECTED: "{{ .Values.dataservice.rabbitmq.requeueRejected }}"
+ S3_FILE_PATH: "{{ .Values.dataservice.s3.filePath }}"
diff --git a/helm/dbrepo/templates/metadata-configmap.yaml b/helm/dbrepo/templates/metadata-configmap.yaml
index 4bb2eb136b557c0a44f3a9fb77d8d6a023ab67ea..9fd137bb39201b6149f5cce21c5c37c0f7ad6b20 100644
--- a/helm/dbrepo/templates/metadata-configmap.yaml
+++ b/helm/dbrepo/templates/metadata-configmap.yaml
@@ -12,7 +12,7 @@ data:
02-setup-data.sql: |
BEGIN;
INSERT INTO `mdb_containers` (name, internal_name, image_id, host, port, sidecar_host, sidecar_port, privileged_username, privileged_password)
- VALUES ('MariaDB Galera 11.1.3', 'mariadb_11_1_3', 1, 'data-db', 3306, 'data-db', 80, 'root', 'dbrepo');
+ VALUES ('MariaDB 11.1.3', 'mariadb_11_1_3', 1, 'data-db', 3306, 'data-db', 8080, 'root', 'dbrepo');
COMMIT;
01-setup-schema.sql: |
BEGIN;
diff --git a/helm/dbrepo/templates/metadata-deployment.yaml b/helm/dbrepo/templates/metadata-deployment.yaml
index b2c2731f6d10ccfce3d8d17221c234b638697d73..f0f5b2eb3c4d137892294187ca14098d9f9f2e81 100644
--- a/helm/dbrepo/templates/metadata-deployment.yaml
+++ b/helm/dbrepo/templates/metadata-deployment.yaml
@@ -10,8 +10,8 @@ metadata:
service: metadata-service
spec:
replicas: {{ .Values.metadataservice.replicaCount }}
- strategy:
- type: {{ .Values.strategyType }}
+ strategy:
+ type: {{ .Values.strategyType }}
selector:
matchLabels:
app: metadata-service
@@ -22,21 +22,16 @@ spec:
app: metadata-service
service: metadata-service
spec:
- securityContext:
- runAsNonRoot: true
+ {{- if .Values.metadataservice.podSecurityContext.enabled }}
+ securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.metadataservice.podSecurityContext "context" $) | nindent 8 }}
+ {{- end }}
containers:
- name: metadata-service
image: {{ .Values.metadataservice.image.name }}
imagePullPolicy: {{ .Values.metadataservice.image.pullPolicy | default "IfNotPresent" }}
- securityContext:
- runAsNonRoot: true
- readOnlyRootFilesystem: true
- allowPrivilegeEscalation: false
- seccompProfile:
- type: {{ .Values.metadataservice.profileType | default "RuntimeDefault" }}
- capabilities:
- drop:
- - ALL
+ {{- if .Values.metadataservice.containerSecurityContext.enabled }}
+ securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.metadataservice.containerSecurityContext "context" $) | nindent 12 }}
+ {{- end }}
ports:
- containerPort: 80
protocol: TCP
@@ -85,5 +80,7 @@ spec:
- "curl -sSL localhost:8080/actuator/health/liveness | grep 'UP' || exit 1"
initialDelaySeconds: 30
periodSeconds: 30
- resources: {{ toYaml .Values.resources | nindent 12 }}
+ {{- if .Values.metadataservice.resources }}
+ resources: {{- toYaml .Values.metadataservice.resources | nindent 12 }}
+ {{- end }}
{{- end }}
diff --git a/helm/dbrepo/templates/metadata-secret.yaml b/helm/dbrepo/templates/metadata-secret.yaml
index b87c23f975d7c3bc7d3e385606715865bf994497..56db68774deaabb3e0469592ecf1c7fc523f84b1 100644
--- a/helm/dbrepo/templates/metadata-secret.yaml
+++ b/helm/dbrepo/templates/metadata-secret.yaml
@@ -7,15 +7,13 @@ metadata:
namespace: {{ .Values.namespace }}
stringData:
ADMIN_EMAIL: "{{ .Values.metadataservice.admin.email }}"
- ADMIN_PASSWORD: "{{ .Values.admin.password }}"
- ADMIN_USERNAME: "{{ .Values.admin.username }}"
ANALYSE_SERVICE_ENDPOINT: "{{ .Values.analyseservice.endpoint }}"
AUTH_SERVICE_ADMIN: "{{ .Values.authservice.auth.adminUser }}"
AUTH_SERVICE_ADMIN_PASSWORD: "{{ .Values.authservice.auth.adminPassword }}"
AUTH_SERVICE_CLIENT: "{{ .Values.authservice.client.id }}"
AUTH_SERVICE_CLIENT_SECRET: "{{ .Values.authservice.client.secret }}"
AUTH_SERVICE_ENDPOINT: "{{ .Values.authservice.endpoint }}"
- BASE_URL: "{{ .Values.hostname }}"
+ BASE_URL: "{{ .Values.gateway }}"
BROKER_EXCHANGE_NAME: "{{ .Values.brokerservice.exchangeName }}"
BROKER_HOST: "{{ .Values.brokerservice.host }}"
BROKER_QUEUE_NAME: "{{ .Values.brokerservice.queueName }}"
@@ -24,6 +22,7 @@ stringData:
BROKER_SERVICE_ENDPOINT: "{{ .Values.brokerservice.endpoint }}"
BROKER_USERNAME: "{{ .Values.brokerservice.auth.username }}"
BROKER_VIRTUALHOST: "{{ .Values.brokerservice.virtualHost }}"
+ CROSSREF_ENDPOINT: "{{ .Values.metadataservice.crossref.endpoint}}"
DATA_SERVICE_ENDPOINT: "{{ .Values.dataservice.endpoint }}"
DATACITE_URL: "{{ .Values.metadataservice.datacite.url }}"
DATACITE_PREFIX: "{{ .Values.metadataservice.datacite.prefix | toString }}"
@@ -40,6 +39,7 @@ stringData:
METADATA_PASSWORD: "{{ .Values.metadatadb.rootUser.password }}"
PID_BASE: "{{ $pidBase }}"
REPOSITORY_NAME: "{{ .Values.metadataservice.repositoryName }}"
+ ROR_ENDPOINT: "{{ .Values.metadataservice.ror.endpoint}}"
SEARCH_SERVICE_ENDPOINT: "{{ .Values.searchservice.endpoint }}"
SPARQL_CONNECTION_TIMEOUT: "{{ .Values.metadataservice.sparql.connectionTimeout }}"
SPRING_PROFILES_ACTIVE: "{{ ternary "doi" "" .Values.metadataservice.datacite.enabled }}"
diff --git a/helm/dbrepo/templates/search-deployment.yaml b/helm/dbrepo/templates/search-deployment.yaml
index 4af5fc79d661fa8ee8857a80e06ae647329c4f61..044bd85a50e4fb34790a77add60757c2842c665c 100644
--- a/helm/dbrepo/templates/search-deployment.yaml
+++ b/helm/dbrepo/templates/search-deployment.yaml
@@ -10,8 +10,8 @@ metadata:
service: search-service
spec:
replicas: {{ .Values.searchservice.replicaCount }}
- strategy:
- type: {{ .Values.strategyType }}
+ strategy:
+ type: {{ .Values.strategyType }}
selector:
matchLabels:
app: search-service
@@ -22,21 +22,16 @@ spec:
app: search-service
service: search-service
spec:
- securityContext:
- runAsNonRoot: true
+ {{- if .Values.searchservice.podSecurityContext.enabled }}
+ securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.searchservice.podSecurityContext "context" $) | nindent 8 }}
+ {{- end }}
initContainers:
- name: init
image: {{ .Values.searchservice.init.image.name }}
imagePullPolicy: {{ .Values.searchservice.init.image.pullPolicy | default "IfNotPresent" }}
- securityContext:
- runAsNonRoot: true
- readOnlyRootFilesystem: true
- allowPrivilegeEscalation: false
- seccompProfile:
- type: {{ .Values.searchservice.profileType | default "RuntimeDefault" }}
- capabilities:
- drop:
- - ALL
+ {{- if .Values.searchservice.containerSecurityContext.enabled }}
+ securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.searchservice.containerSecurityContext "context" $) | nindent 12 }}
+ {{- end }}
envFrom:
- secretRef:
name: search-service-secret
@@ -46,8 +41,9 @@ spec:
image: {{ .Values.searchservice.image.name }}
imagePullPolicy: {{ .Values.searchservice.image.pullPolicy | default "IfNotPresent" }}
securityContext:
+ allowPrivilegeEscalation: false
runAsNonRoot: true
- readOnlyRootFilesystem: true
+ # readOnlyRootFilesystem: true
allowPrivilegeEscalation: false
seccompProfile:
type: {{ .Values.searchservice.profileType | default "RuntimeDefault" }}
@@ -76,7 +72,9 @@ spec:
- "curl -sSL localhost:8080/health | grep 'UP' || exit 1"
initialDelaySeconds: 10
periodSeconds: 30
+ {{- if .Values.searchservice.resources }}
+ resources: {{- toYaml .Values.searchservice.resources | nindent 12 }}
+ {{- end }}
volumeMounts: [ ]
- resources: {{ toYaml .Values.resources | nindent 12 }}
volumes: [ ]
{{- end }}
diff --git a/helm/dbrepo/templates/search-secret.yaml b/helm/dbrepo/templates/search-secret.yaml
index 9bd98de98bfc4b8c50241689aed98145b1dd25c7..41665ac2bc1614653262f93cf28882a55638e4ec 100644
--- a/helm/dbrepo/templates/search-secret.yaml
+++ b/helm/dbrepo/templates/search-secret.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.searchservice.enabled }}
---
apiVersion: v1
kind: Secret
@@ -5,8 +6,8 @@ metadata:
name: search-service-secret
namespace: {{ .Values.namespace }}
stringData:
- ADMIN_USERNAME: "{{ .Values.admin.username }}"
- ADMIN_PASSWORD: "{{ .Values.admin.password }}"
+ ADMIN_USERNAME: "{{ .Values.identityservice.users }}"
+ ADMIN_PASSWORD: "{{ .Values.identityservice.userPasswords }}"
AUTH_SERVICE_ADMIN: "{{ .Values.authservice.auth.adminUser }}"
AUTH_SERVICE_ADMIN_PASSWORD: "{{ .Values.authservice.auth.adminPassword }}"
AUTH_SERVICE_CLIENT: "{{ .Values.authservice.client.id }}"
@@ -17,5 +18,6 @@ stringData:
LOG_LEVEL: "{{ ternary "DEBUG" "INFO" .Values.searchservice.image.debug }}"
OPENSEARCH_HOST: "{{ .Values.searchdb.host }}"
OPENSEARCH_PORT: "{{ .Values.searchdb.port }}"
- OPENSEARCH_USERNAME: "{{ .Values.searchdb.username }}"
- OPENSEARCH_PASSWORD: "{{ .Values.searchdb.password }}"
\ No newline at end of file
+ OPENSEARCH_USERNAME: "{{ .Values.searchdb.security.adminUsername }}"
+ OPENSEARCH_PASSWORD: "{{ .Values.searchdb.security.adminPassword }}"
+{{- end }}
diff --git a/helm/dbrepo/templates/ui-deployment.yaml b/helm/dbrepo/templates/ui-deployment.yaml
index 567f6822f0f4bdf7fa48d47eaf7750a5c861ed3e..64cea9bf103dd3c66446ba353528b9ddb96b42a7 100644
--- a/helm/dbrepo/templates/ui-deployment.yaml
+++ b/helm/dbrepo/templates/ui-deployment.yaml
@@ -10,8 +10,8 @@ metadata:
service: ui
spec:
replicas: {{ .Values.ui.replicaCount }}
- strategy:
- type: {{ .Values.strategyType }}
+ strategy:
+ type: {{ .Values.strategyType }}
selector:
matchLabels:
app: ui
@@ -22,21 +22,16 @@ spec:
app: ui
service: ui
spec:
- securityContext:
- runAsNonRoot: true
+ {{- if .Values.ui.podSecurityContext.enabled }}
+ securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.ui.podSecurityContext "context" $) | nindent 8 }}
+ {{- end }}
containers:
- name: ui
image: {{ .Values.ui.image.name }}
imagePullPolicy: {{ .Values.ui.image.pullPolicy | default "IfNotPresent" }}
- securityContext:
- runAsNonRoot: true
- readOnlyRootFilesystem: true
- allowPrivilegeEscalation: false
- seccompProfile:
- type: {{ .Values.ui.profileType | default "RuntimeDefault" }}
- capabilities:
- drop:
- - ALL
+ {{- if .Values.ui.containerSecurityContext.enabled }}
+ securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.ui.containerSecurityContext "context" $) | nindent 12 }}
+ {{- end }}
ports:
- containerPort: 3000
protocol: TCP
@@ -142,7 +137,9 @@ spec:
port: 3000
initialDelaySeconds: 30
periodSeconds: 30
- resources: {{ toYaml .Values.resourcesLittle | nindent 12 }}
+ {{- if .Values.ui.resources }}
+ resources: {{- toYaml .Values.ui.resources | nindent 12 }}
+ {{- end }}
volumes:
{{- if .Values.ui.extraVolumes }}
{{- .Values.ui.extraVolumes | toYaml | nindent 8 }}
diff --git a/helm/dbrepo/templates/ui-secret.yaml b/helm/dbrepo/templates/ui-secret.yaml
index ddb0f902ecd7d67d3534d335ca180009e101cea1..af933da2e36e6af80711e46692757f4c650202f5 100644
--- a/helm/dbrepo/templates/ui-secret.yaml
+++ b/helm/dbrepo/templates/ui-secret.yaml
@@ -1,4 +1,5 @@
-{{ $api := printf "https://%s" .Values.hostname }}
+{{- if .Values.ui.enabled }}
+{{ $uploadEndpoint := printf "%s/api/upload/files" .Values.gateway }}
---
apiVersion: v1
kind: Secret
@@ -6,20 +7,22 @@ metadata:
name: ui-secret
namespace: {{ .Values.namespace }}
stringData:
- public-api-client: "{{ .Values.ui.public.api.client | default $api }}"
- public-api-server: "{{ .Values.ui.public.api.server | default $api }}"
- public-title: "{{ .Values.ui.public.title }}"
- public-logo: "{{ .Values.ui.public.logo }}"
- public-icon: "{{ .Values.ui.public.icon }}"
- public-touch: "{{ .Values.ui.public.touch }}"
- public-broker-host: "{{ .Values.ui.public.broker.host }}"
- public-broker-port: {{ .Values.ui.public.broker.port | toJson | quote }}
- public-broker-extra: "{{ .Values.ui.public.broker.extra }}"
- public-database-extra: "{{ .Values.ui.public.database.extra }}"
- public-links-keycloak-text: "{{ .Values.ui.public.links.keycloak.text }}"
- public-links-keycloak-href: "{{ .Values.ui.public.links.keycloak.href }}"
- public-links-rabbitmq-text: "{{ .Values.ui.public.links.rabbitmq.text }}"
- public-links-rabbitmq-href: "{{ .Values.ui.public.links.rabbitmq.href }}"
- public-pid-default-publisher: "{{ .Values.ui.public.pid.default.publisher }}"
- public-doi-enabled: "{{ .Values.ui.public.doi.enabled }}"
- public-doi-endpoint: "{{ .Values.ui.public.doi.endpoint }}"
\ No newline at end of file
+ NUXT_PUBLIC_API_CLIENT: "{{ .Values.ui.public.api.client | default .Values.gateway }}"
+ NUXT_PUBLIC_API_SERVER: "{{ .Values.ui.public.api.server | default .Values.gateway }}"
+ NUXT_PUBLIC_TITLE: "{{ .Values.ui.public.title }}"
+ NUXT_PUBLIC_LOGO: "{{ .Values.ui.public.logo }}"
+ NUXT_PUBLIC_ICON: "{{ .Values.ui.public.icon }}"
+ NUXT_PUBLIC_TOUCH: "{{ .Values.ui.public.touch }}"
+ NUXT_PUBLIC_BROKER_HOST: "{{ .Values.ui.public.broker.host }}"
+ NUXT_PUBLIC_BROKER_PORT: {{ .Values.ui.public.broker.port | toJson | quote }}
+ NUXT_PUBLIC_BROKER_EXTRA: "{{ .Values.ui.public.broker.extra }}"
+ NUXT_PUBLIC_DATABASE_EXTRA: "{{ .Values.ui.public.database.extra }}"
+ NUXT_PUBLIC_DOI_ENABLED: "{{ .Values.ui.public.doi.enabled }}"
+ NUXT_PUBLIC_DOI_ENDPOINT: "{{ .Values.ui.public.doi.endpoint }}"
+ NUXT_PUBLIC_LINKS_KEYCLOAK_HREF: "{{ .Values.ui.public.links.keycloak.href }}"
+ NUXT_PUBLIC_LINKS_KEYCLOAK_TEXT: "{{ .Values.ui.public.links.keycloak.text }}"
+ NUXT_PUBLIC_LINKS_RABBITMQ_HREF: "{{ .Values.ui.public.links.rabbitmq.href }}"
+ NUXT_PUBLIC_LINKS_RABBITMQ_TEXT: "{{ .Values.ui.public.links.rabbitmq.text }}"
+ NUXT_PUBLIC_PID_DEFAULT_PUBLISHER: "{{ .Values.ui.public.pid.default.publisher }}"
+ NUXT_PUBLIC_UPLOAD_CLIENT: "{{ .Values.ui.public.upload.client | default $uploadEndpoint }}"
+{{- end }}
diff --git a/helm/dbrepo/values.schema.json b/helm/dbrepo/values.schema.json
index 3f555c67054181b24d05054dc93fabc9dabb8d86..843f7e799100a7b8a5041c96b8914275326ea2b7 100644
--- a/helm/dbrepo/values.schema.json
+++ b/helm/dbrepo/values.schema.json
@@ -1,22 +1,60 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"properties": {
- "admin": {
- "properties": {
- "password": {
- "type": "string"
- },
- "username": {
- "type": "string"
- }
- },
- "type": "object"
- },
"analyseservice": {
"properties": {
+ "containerSecurityContext": {
+ "properties": {
+ "allowPrivilegeEscalation": {
+ "type": "boolean"
+ },
+ "capabilities": {
+ "properties": {
+ "drop": {
+ "items": {
+ "type": "string"
+ },
+ "type": "array"
+ }
+ },
+ "type": "object"
+ },
+ "enabled": {
+ "type": "boolean"
+ },
+ "readOnlyRootFilesystem": {
+ "type": "boolean"
+ },
+ "runAsGroup": {
+ "type": "integer"
+ },
+ "runAsNonRoot": {
+ "type": "boolean"
+ },
+ "runAsUser": {
+ "type": "integer"
+ },
+ "seLinuxOptions": {
+ "properties": {},
+ "type": "object"
+ },
+ "seccompProfile": {
+ "properties": {
+ "type": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ }
+ },
+ "type": "object"
+ },
"enabled": {
"type": "boolean"
},
+ "endpoint": {
+ "type": "string"
+ },
"image": {
"properties": {
"debug": {
@@ -31,9 +69,56 @@
},
"type": "object"
},
+ "podSecurityContext": {
+ "properties": {
+ "enabled": {
+ "type": "boolean"
+ },
+ "fsGroup": {
+ "type": "integer"
+ },
+ "fsGroupChangePolicy": {
+ "type": "string"
+ },
+ "supplementalGroups": {
+ "type": "array"
+ },
+ "sysctls": {
+ "type": "array"
+ }
+ },
+ "type": "object"
+ },
"replicaCount": {
"type": "integer"
},
+ "resources": {
+ "properties": {
+ "limits": {
+ "properties": {
+ "cpu": {
+ "type": "string"
+ },
+ "memory": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ },
+ "requests": {
+ "properties": {
+ "cpu": {
+ "type": "string"
+ },
+ "memory": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ }
+ },
+ "type": "object"
+ },
"s3": {
"properties": {
"endpoint": {
@@ -153,6 +238,9 @@
},
"enabled": {
"type": "boolean"
+ },
+ "fullnameOverride": {
+ "type": "string"
}
},
"type": "object"
@@ -179,11 +267,11 @@
},
"brokerservice": {
"properties": {
+ "advancedConfigurationExistingSecret": {
+ "type": "string"
+ },
"auth": {
"properties": {
- "password": {
- "type": "string"
- },
"tls": {
"properties": {
"enabled": {
@@ -200,9 +288,6 @@
}
},
"type": "object"
- },
- "username": {
- "type": "string"
}
},
"type": "object"
@@ -219,31 +304,9 @@
"exchangeName": {
"type": "string"
},
- "extraConfiguration": {
- "type": "string"
- },
"extraPlugins": {
"type": "string"
},
- "extraVolumes": {
- "items": {
- "properties": {
- "name": {
- "type": "string"
- },
- "secret": {
- "properties": {
- "secretName": {
- "type": "string"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
- },
- "type": "array"
- },
"fullnameOverride": {
"type": "string"
},
@@ -258,6 +321,41 @@
},
"type": "object"
},
+ "ldap": {
+ "properties": {
+ "authorisationEnabled": {
+ "type": "boolean"
+ },
+ "basedn": {
+ "type": "string"
+ },
+ "binddn": {
+ "type": "string"
+ },
+ "bindpw": {
+ "type": "string"
+ },
+ "enabled": {
+ "type": "boolean"
+ },
+ "port": {
+ "type": "integer"
+ },
+ "servers": {
+ "items": {
+ "type": "string"
+ },
+ "type": "array"
+ },
+ "uidField": {
+ "type": "string"
+ },
+ "userDnPattern": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ },
"loadDefinition": {
"properties": {
"enabled": {
@@ -311,60 +409,26 @@
},
"datadb": {
"properties": {
- "enabled": {
- "type": "boolean"
- },
- "extraFlags": {
- "type": "string"
- },
- "extraVolumeMounts": {
- "items": {
- "properties": {
- "mountPath": {
- "type": "string"
- },
- "name": {
- "type": "string"
- }
+ "auth": {
+ "properties": {
+ "replicationPassword": {
+ "type": "string"
},
- "type": "object"
- },
- "type": "array"
- },
- "extraVolumes": {
- "items": {
- "properties": {
- "emptyDir": {
- "properties": {},
- "type": "object"
- },
- "name": {
- "type": "string"
- }
+ "replicationUser": {
+ "type": "string"
},
- "type": "object"
+ "rootPassword": {
+ "type": "string"
+ }
},
- "type": "array"
+ "type": "object"
+ },
+ "enabled": {
+ "type": "boolean"
},
"fullnameOverride": {
"type": "string"
},
- "galera": {
- "properties": {
- "mariabackup": {
- "properties": {
- "password": {
- "type": "string"
- },
- "user": {
- "type": "string"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
- },
"image": {
"properties": {
"debug": {
@@ -381,204 +445,275 @@
},
"type": "object"
},
- "persistence": {
- "properties": {
- "enabled": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
- "replicaCount": {
- "type": "integer"
- },
- "rootUser": {
- "properties": {
- "password": {
- "type": "string"
- },
- "user": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "service": {
+ "primary": {
"properties": {
- "extraPorts": {
+ "extraVolumeMounts": {
"items": {
"properties": {
- "name": {
+ "mountPath": {
"type": "string"
},
- "port": {
- "type": "integer"
- },
- "protocol": {
+ "name": {
"type": "string"
- },
- "targetPort": {
- "type": "integer"
}
},
"type": "object"
},
"type": "array"
- }
- },
- "type": "object"
- },
- "sidecars": {
- "items": {
- "properties": {
- "envFrom": {
- "items": {
- "properties": {
- "secretRef": {
- "properties": {
- "name": {
- "type": "string"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
- },
- "type": "array"
- },
- "image": {
- "type": "string"
- },
- "livenessProbe": {
+ },
+ "extraVolumes": {
+ "items": {
"properties": {
- "exec": {
- "properties": {
- "command": {
- "items": {
- "type": "string"
- },
- "type": "array"
- }
- },
+ "emptyDir": {
+ "properties": {},
"type": "object"
},
- "initialDelaySeconds": {
- "type": "integer"
- },
- "periodSeconds": {
- "type": "integer"
+ "name": {
+ "type": "string"
}
},
"type": "object"
},
- "name": {
- "type": "string"
+ "type": "array"
+ },
+ "persistence": {
+ "properties": {
+ "enabled": {
+ "type": "boolean"
+ }
},
- "ports": {
- "items": {
- "properties": {
- "containerPort": {
- "type": "integer"
- },
- "name": {
- "type": "string"
+ "type": "object"
+ },
+ "service": {
+ "properties": {
+ "extraPorts": {
+ "items": {
+ "properties": {
+ "name": {
+ "type": "string"
+ },
+ "port": {
+ "type": "integer"
+ },
+ "protocol": {
+ "type": "string"
+ },
+ "targetPort": {
+ "type": "integer"
+ }
},
- "protocol": {
- "type": "string"
- }
+ "type": "object"
},
- "type": "object"
- },
- "type": "array"
+ "type": "array"
+ }
},
- "readinessProbe": {
+ "type": "object"
+ },
+ "sidecars": {
+ "items": {
"properties": {
- "exec": {
+ "envFrom": {
+ "items": {
+ "properties": {
+ "secretRef": {
+ "properties": {
+ "name": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ }
+ },
+ "type": "object"
+ },
+ "type": "array"
+ },
+ "image": {
+ "type": "string"
+ },
+ "imagePullPolicy": {
+ "type": "string"
+ },
+ "livenessProbe": {
"properties": {
- "command": {
- "items": {
- "type": "string"
+ "exec": {
+ "properties": {
+ "command": {
+ "items": {
+ "type": "string"
+ },
+ "type": "array"
+ }
},
- "type": "array"
+ "type": "object"
+ },
+ "initialDelaySeconds": {
+ "type": "integer"
+ },
+ "periodSeconds": {
+ "type": "integer"
}
},
"type": "object"
},
- "initialDelaySeconds": {
- "type": "integer"
+ "name": {
+ "type": "string"
},
- "periodSeconds": {
- "type": "integer"
- }
- },
- "type": "object"
- },
- "securityContext": {
- "properties": {
- "allowPrivilegeEscalation": {
- "type": "boolean"
+ "ports": {
+ "items": {
+ "properties": {
+ "containerPort": {
+ "type": "integer"
+ },
+ "name": {
+ "type": "string"
+ },
+ "protocol": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ },
+ "type": "array"
},
- "capabilities": {
+ "readinessProbe": {
"properties": {
- "drop": {
- "items": {
- "type": "string"
+ "exec": {
+ "properties": {
+ "command": {
+ "items": {
+ "type": "string"
+ },
+ "type": "array"
+ }
},
- "type": "array"
+ "type": "object"
+ },
+ "initialDelaySeconds": {
+ "type": "integer"
+ },
+ "periodSeconds": {
+ "type": "integer"
}
},
"type": "object"
},
- "runAsGroup": {
- "type": "integer"
- },
- "runAsNonRoot": {
- "type": "boolean"
- },
- "runAsUser": {
- "type": "integer"
- },
- "seccompProfile": {
+ "securityContext": {
"properties": {
- "type": {
- "type": "string"
+ "allowPrivilegeEscalation": {
+ "type": "boolean"
+ },
+ "capabilities": {
+ "properties": {
+ "drop": {
+ "items": {
+ "type": "string"
+ },
+ "type": "array"
+ }
+ },
+ "type": "object"
+ },
+ "runAsGroup": {
+ "type": "integer"
+ },
+ "runAsNonRoot": {
+ "type": "boolean"
+ },
+ "runAsUser": {
+ "type": "integer"
+ },
+ "seccompProfile": {
+ "properties": {
+ "type": {
+ "type": "string"
+ }
+ },
+ "type": "object"
}
},
"type": "object"
+ },
+ "volumeMounts": {
+ "items": {
+ "properties": {
+ "mountPath": {
+ "type": "string"
+ },
+ "name": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ },
+ "type": "array"
}
},
"type": "object"
},
- "volumeMounts": {
- "items": {
- "properties": {
- "mountPath": {
- "type": "string"
- },
- "name": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "type": "array"
- }
- },
- "type": "object"
+ "type": "array"
+ }
},
- "type": "array"
+ "type": "object"
+ },
+ "secondary": {
+ "properties": {
+ "replicaCount": {
+ "type": "integer"
+ }
+ },
+ "type": "object"
}
},
"type": "object"
},
"dataservice": {
"properties": {
- "consumerConcurrentMax": {
- "type": "integer"
- },
- "consumerConcurrentMin": {
- "type": "integer"
+ "containerSecurityContext": {
+ "properties": {
+ "allowPrivilegeEscalation": {
+ "type": "boolean"
+ },
+ "capabilities": {
+ "properties": {
+ "drop": {
+ "items": {
+ "type": "string"
+ },
+ "type": "array"
+ }
+ },
+ "type": "object"
+ },
+ "enabled": {
+ "type": "boolean"
+ },
+ "readOnlyRootFilesystem": {
+ "type": "boolean"
+ },
+ "runAsGroup": {
+ "type": "integer"
+ },
+ "runAsNonRoot": {
+ "type": "boolean"
+ },
+ "runAsUser": {
+ "type": "integer"
+ },
+ "seLinuxOptions": {
+ "properties": {},
+ "type": "object"
+ },
+ "seccompProfile": {
+ "properties": {
+ "type": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ }
+ },
+ "type": "object"
},
"default": {
"properties": {
@@ -625,15 +760,29 @@
},
"type": "object"
},
- "replicaCount": {
- "type": "integer"
- },
- "requeueRejected": {
- "type": "boolean"
+ "podSecurityContext": {
+ "properties": {
+ "enabled": {
+ "type": "boolean"
+ },
+ "fsGroup": {
+ "type": "integer"
+ },
+ "fsGroupChangePolicy": {
+ "type": "string"
+ },
+ "supplementalGroups": {
+ "type": "array"
+ },
+ "sysctls": {
+ "type": "array"
+ }
+ },
+ "type": "object"
},
- "s3": {
+ "rabbitmq": {
"properties": {
- "auth": {
+ "consumer": {
"properties": {
"password": {
"type": "string"
@@ -644,17 +793,37 @@
},
"type": "object"
},
- "bucket": {
+ "consumerConcurrentMax": {
+ "type": "integer"
+ },
+ "consumerConcurrentMin": {
+ "type": "integer"
+ },
+ "requeueRejected": {
+ "type": "boolean"
+ }
+ },
+ "type": "object"
+ },
+ "replicaCount": {
+ "type": "integer"
+ },
+ "s3": {
+ "properties": {
+ "auth": {
"properties": {
- "export": {
+ "password": {
"type": "string"
},
- "import": {
+ "username": {
"type": "string"
}
},
"type": "object"
},
+ "bucket": {
+ "type": "string"
+ },
"endpoint": {
"type": "string"
},
@@ -670,9 +839,115 @@
"gateway": {
"type": "string"
},
+ "global": {
+ "properties": {
+ "compatibility": {
+ "properties": {
+ "openshift": {
+ "properties": {
+ "adaptSecurityContext": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ }
+ },
+ "type": "object"
+ },
+ "storageClass": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ },
"hostname": {
"type": "string"
},
+ "identityservice": {
+ "properties": {
+ "customSchemaFiles": {
+ "properties": {
+ "00-memberof.ldif": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ },
+ "enabled": {
+ "type": "boolean"
+ },
+ "fullnameOverride": {
+ "type": "string"
+ },
+ "global": {
+ "properties": {
+ "adminPassword": {
+ "type": "string"
+ },
+ "adminUser": {
+ "type": "string"
+ },
+ "configUserEnabled": {
+ "type": "boolean"
+ },
+ "ldapDomain": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ },
+ "group": {
+ "type": "string"
+ },
+ "ltb-passwd": {
+ "properties": {
+ "ingress": {
+ "properties": {
+ "enabled": {
+ "type": "boolean"
+ }
+ },
+ "type": "object"
+ }
+ },
+ "type": "object"
+ },
+ "persistence": {
+ "properties": {
+ "enabled": {
+ "type": "boolean"
+ }
+ },
+ "type": "object"
+ },
+ "phpldapadmin": {
+ "properties": {
+ "enabled": {
+ "type": "boolean"
+ }
+ },
+ "type": "object"
+ },
+ "replicaCount": {
+ "type": "integer"
+ },
+ "replication": {
+ "properties": {
+ "enabled": {
+ "type": "boolean"
+ }
+ },
+ "type": "object"
+ },
+ "userPasswords": {
+ "type": "string"
+ },
+ "users": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ },
"ingress": {
"properties": {
"annotations": {
@@ -767,10 +1042,6 @@
"enabled": {
"type": "boolean"
},
- "extraInitDbScripts": {
- "properties": {},
- "type": "object"
- },
"fullnameOverride": {
"type": "string"
},
@@ -793,12 +1064,8 @@
"host": {
"type": "string"
},
- "image": {
- "properties": {
- "debug": {
- "type": "boolean"
- }
- },
+ "initdbScripts": {
+ "properties": {},
"type": "object"
},
"initdbScriptsConfigMap": {
@@ -836,33 +1103,69 @@
}
},
"type": "object"
+ }
+ },
+ "type": "object"
+ },
+ "metadataservice": {
+ "properties": {
+ "admin": {
+ "properties": {
+ "email": {
+ "type": "string"
+ }
+ },
+ "type": "object"
},
- "service": {
+ "containerSecurityContext": {
"properties": {
- "annotations": {
- "properties": {},
+ "allowPrivilegeEscalation": {
+ "type": "boolean"
+ },
+ "capabilities": {
+ "properties": {
+ "drop": {
+ "items": {
+ "type": "string"
+ },
+ "type": "array"
+ }
+ },
"type": "object"
},
- "loadBalancerIP": {
- "type": "string"
+ "enabled": {
+ "type": "boolean"
},
- "loadBalancerSourceRanges": {
- "type": "array"
+ "readOnlyRootFilesystem": {
+ "type": "boolean"
},
- "type": {
- "type": "string"
+ "runAsGroup": {
+ "type": "integer"
+ },
+ "runAsNonRoot": {
+ "type": "boolean"
+ },
+ "runAsUser": {
+ "type": "integer"
+ },
+ "seLinuxOptions": {
+ "properties": {},
+ "type": "object"
+ },
+ "seccompProfile": {
+ "properties": {
+ "type": {
+ "type": "string"
+ }
+ },
+ "type": "object"
}
},
"type": "object"
- }
- },
- "type": "object"
- },
- "metadataservice": {
- "properties": {
- "admin": {
+ },
+ "crossref": {
"properties": {
- "email": {
+ "endpoint": {
"type": "string"
}
},
@@ -894,6 +1197,9 @@
"enabled": {
"type": "boolean"
},
+ "endpoint": {
+ "type": "string"
+ },
"granularity": {
"type": "string"
},
@@ -911,35 +1217,82 @@
},
"type": "object"
},
+ "podSecurityContext": {
+ "properties": {
+ "enabled": {
+ "type": "boolean"
+ },
+ "fsGroup": {
+ "type": "integer"
+ },
+ "fsGroupChangePolicy": {
+ "type": "string"
+ },
+ "supplementalGroups": {
+ "type": "array"
+ },
+ "sysctls": {
+ "type": "array"
+ }
+ },
+ "type": "object"
+ },
"replicaCount": {
"type": "integer"
},
"repositoryName": {
"type": "string"
},
- "s3": {
+ "resources": {
"properties": {
- "auth": {
+ "limits": {
"properties": {
- "password": {
+ "cpu": {
"type": "string"
},
- "username": {
+ "memory": {
"type": "string"
}
},
"type": "object"
},
- "bucket": {
+ "requests": {
"properties": {
- "export": {
+ "cpu": {
"type": "string"
},
- "import": {
+ "memory": {
"type": "string"
}
},
"type": "object"
+ }
+ },
+ "type": "object"
+ },
+ "ror": {
+ "properties": {
+ "endpoint": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ },
+ "s3": {
+ "properties": {
+ "auth": {
+ "properties": {
+ "password": {
+ "type": "string"
+ },
+ "username": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ },
+ "bucket": {
+ "type": "string"
},
"endpoint": {
"type": "string"
@@ -966,120 +1319,33 @@
"clusterName": {
"type": "string"
},
- "config": {
- "properties": {
- "opensearch.yml": {
- "type": "string"
- }
- },
- "type": "object"
- },
"enabled": {
"type": "boolean"
},
- "extraEnvs": {
- "items": {
- "properties": {
- "name": {
- "type": "string"
- },
- "value": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "type": "array"
- },
- "extraVolumeMounts": {
- "items": {
- "properties": {
- "mountPath": {
- "type": "string"
- },
- "name": {
- "type": "string"
- },
- "readOnly": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
- "type": "array"
- },
- "extraVolumes": {
- "items": {
- "properties": {
- "name": {
- "type": "string"
- },
- "secret": {
- "properties": {
- "secretName": {
- "type": "string"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
- },
- "type": "array"
- },
"fullnameOverride": {
"type": "string"
},
- "host": {
- "type": "string"
- },
- "masterService": {
- "type": "string"
- },
- "password": {
+ "host": {
"type": "string"
},
- "persistence": {
- "properties": {
- "enabled": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
"port": {
"type": "integer"
},
- "protocol": {
- "type": "string"
- },
- "replicas": {
- "type": "integer"
- },
- "service": {
+ "security": {
"properties": {
- "annotations": {
- "properties": {},
- "type": "object"
- },
- "loadBalancerSourceRanges": {
- "type": "array"
+ "adminPassword": {
+ "type": "string"
},
- "type": {
+ "adminUsername": {
"type": "string"
- }
- },
- "type": "object"
- },
- "sysctlInit": {
- "properties": {
+ },
"enabled": {
"type": "boolean"
}
},
"type": "object"
},
- "username": {
+ "servicenameOverride": {
"type": "string"
}
},
@@ -1087,6 +1353,52 @@
},
"searchservice": {
"properties": {
+ "containerSecurityContext": {
+ "properties": {
+ "allowPrivilegeEscalation": {
+ "type": "boolean"
+ },
+ "capabilities": {
+ "properties": {
+ "drop": {
+ "items": {
+ "type": "string"
+ },
+ "type": "array"
+ }
+ },
+ "type": "object"
+ },
+ "enabled": {
+ "type": "boolean"
+ },
+ "readOnlyRootFilesystem": {
+ "type": "boolean"
+ },
+ "runAsGroup": {
+ "type": "integer"
+ },
+ "runAsNonRoot": {
+ "type": "boolean"
+ },
+ "runAsUser": {
+ "type": "integer"
+ },
+ "seLinuxOptions": {
+ "properties": {},
+ "type": "object"
+ },
+ "seccompProfile": {
+ "properties": {
+ "type": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ }
+ },
+ "type": "object"
+ },
"enabled": {
"type": "boolean"
},
@@ -1123,8 +1435,55 @@
},
"type": "object"
},
+ "podSecurityContext": {
+ "properties": {
+ "enabled": {
+ "type": "boolean"
+ },
+ "fsGroup": {
+ "type": "integer"
+ },
+ "fsGroupChangePolicy": {
+ "type": "string"
+ },
+ "supplementalGroups": {
+ "type": "array"
+ },
+ "sysctls": {
+ "type": "array"
+ }
+ },
+ "type": "object"
+ },
"replicaCount": {
"type": "integer"
+ },
+ "resources": {
+ "properties": {
+ "limits": {
+ "properties": {
+ "cpu": {
+ "type": "string"
+ },
+ "memory": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ },
+ "requests": {
+ "properties": {
+ "cpu": {
+ "type": "string"
+ },
+ "memory": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ }
+ },
+ "type": "object"
}
},
"type": "object"
@@ -1136,44 +1495,15 @@
},
"filer": {
"properties": {
- "enablePVC": {
- "type": "boolean"
- },
"enabled": {
"type": "boolean"
- },
- "replicas": {
- "type": "integer"
- },
- "s3": {
- "properties": {
- "allowEmptyFolder": {
- "type": "boolean"
- },
- "enableAuth": {
- "type": "boolean"
- },
- "enabled": {
- "type": "boolean"
- },
- "existingConfigSecret": {
- "type": "string"
- },
- "port": {
- "type": "integer"
- },
- "skipAuthSecretCreation": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
- "storage": {
- "type": "string"
}
},
"type": "object"
},
+ "fullnameOverride": {
+ "type": "string"
+ },
"init": {
"properties": {
"image": {
@@ -1185,6 +1515,17 @@
},
"type": "object"
},
+ "mariadb": {
+ "properties": {
+ "enabled": {
+ "type": "boolean"
+ },
+ "fullnameOverride": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ },
"master": {
"properties": {
"enabled": {
@@ -1197,46 +1538,26 @@
"properties": {
"auth": {
"properties": {
- "password": {
+ "adminAccessKeyId": {
"type": "string"
},
- "username": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "bucket": {
- "properties": {
- "export": {
+ "adminSecretAccessKey": {
"type": "string"
},
- "import": {
- "type": "string"
+ "enabled": {
+ "type": "boolean"
}
},
"type": "object"
},
- "enableAuth": {
- "type": "boolean"
+ "bucket": {
+ "type": "string"
},
"enabled": {
"type": "boolean"
},
- "existingConfigSecret": {
- "type": "string"
- },
- "metricsPort": {
- "type": "integer"
- },
- "port": {
- "type": "integer"
- },
- "replicas": {
+ "replicaCount": {
"type": "integer"
- },
- "skipAuthSecretCreation": {
- "type": "boolean"
}
},
"type": "object"
@@ -1245,9 +1566,6 @@
"properties": {
"enabled": {
"type": "boolean"
- },
- "replicas": {
- "type": "integer"
}
},
"type": "object"
@@ -1260,6 +1578,52 @@
},
"ui": {
"properties": {
+ "containerSecurityContext": {
+ "properties": {
+ "allowPrivilegeEscalation": {
+ "type": "boolean"
+ },
+ "capabilities": {
+ "properties": {
+ "drop": {
+ "items": {
+ "type": "string"
+ },
+ "type": "array"
+ }
+ },
+ "type": "object"
+ },
+ "enabled": {
+ "type": "boolean"
+ },
+ "readOnlyRootFilesystem": {
+ "type": "boolean"
+ },
+ "runAsGroup": {
+ "type": "integer"
+ },
+ "runAsNonRoot": {
+ "type": "boolean"
+ },
+ "runAsUser": {
+ "type": "integer"
+ },
+ "seLinuxOptions": {
+ "properties": {},
+ "type": "object"
+ },
+ "seccompProfile": {
+ "properties": {
+ "type": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ }
+ },
+ "type": "object"
+ },
"enabled": {
"type": "boolean"
},
@@ -1283,6 +1647,26 @@
},
"type": "object"
},
+ "podSecurityContext": {
+ "properties": {
+ "enabled": {
+ "type": "boolean"
+ },
+ "fsGroup": {
+ "type": "integer"
+ },
+ "fsGroupChangePolicy": {
+ "type": "string"
+ },
+ "supplementalGroups": {
+ "type": "array"
+ },
+ "sysctls": {
+ "type": "array"
+ }
+ },
+ "type": "object"
+ },
"public": {
"properties": {
"api": {
@@ -1388,12 +1772,47 @@
},
"touch": {
"type": "string"
+ },
+ "upload": {
+ "properties": {
+ "client": {
+ "type": "string"
+ }
+ },
+ "type": "object"
}
},
"type": "object"
},
"replicaCount": {
"type": "integer"
+ },
+ "resources": {
+ "properties": {
+ "limits": {
+ "properties": {
+ "cpu": {
+ "type": "string"
+ },
+ "memory": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ },
+ "requests": {
+ "properties": {
+ "cpu": {
+ "type": "string"
+ },
+ "memory": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ }
+ },
+ "type": "object"
}
},
"type": "object"
@@ -1441,6 +1860,42 @@
},
"replicaCount": {
"type": "integer"
+ },
+ "securityContext": {
+ "properties": {
+ "allowPrivilegeEscalation": {
+ "type": "boolean"
+ },
+ "capabilities": {
+ "properties": {
+ "drop": {
+ "items": {
+ "type": "string"
+ },
+ "type": "array"
+ }
+ },
+ "type": "object"
+ },
+ "runAsGroup": {
+ "type": "integer"
+ },
+ "runAsNonRoot": {
+ "type": "boolean"
+ },
+ "runAsUser": {
+ "type": "integer"
+ },
+ "seccompProfile": {
+ "properties": {
+ "type": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ }
+ },
+ "type": "object"
}
},
"type": "object"
diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml
index cefd74d04d3505d468f9fed757da55d9b018d47b..c5b5bb542dfc90c4ee951a4ca9380f3e5d53271c 100644
--- a/helm/dbrepo/values.yaml
+++ b/helm/dbrepo/values.yaml
@@ -84,9 +84,14 @@ authservice:
## @param authservice.endpoint The hostname for the microservices.
endpoint: http://auth-service
auth:
+ ## @param authservice.auth.adminUser The admin username.
adminUser: admin
+ ## @param authservice.auth.adminPassword The admin user password.
adminPassword: de4aingohyohveeRooZe
+ ## @skip authservice.postgresql
postgresql:
+ enabled: true
+ fullnameOverride: auth-db
auth:
postgresPassword: Zaethie2gai3phogh3wa
## @skip authservice.extraStartupArgs
@@ -305,7 +310,7 @@ brokerservice:
## @param brokerservice.ldap.uidField The field containing the user id.
uidField: uid
## @param brokerservice.ldap.basedn The base domain name containing the users.
- basedn: ou=users,dc=dbrepo,dc=at
+ basedn: dc=dbrepo,dc=at
## @param brokerservice.ldap.userDnPattern The pattern to determine the user.
userDnPattern: ${username}
auth:
diff --git a/install.sh b/install.sh
index 9850ccd35eaae4c71032655bbe72e97892aba0f1..a9fcf6d10d374f048d14289d20fc89d01ef82813 100644
--- a/install.sh
+++ b/install.sh
@@ -1,14 +1,15 @@
#!/bin/bash
# preset
-VERSION="latest"
+VERSION="1.4.5"
MIN_CPU=8
MIN_RAM=8
MIN_MAP_COUNT=262144
SKIP_CHECKS=${SKIP_CHECKS:-0}
+DOWNLOAD_ONLY=${DOWNLOAD_ONLY:-0}
# checks
-if [[ $SKIP_CHECKS -eq 0 ]]; then
+if [[ $SKIP_CHECKS -eq 0 ]] && [[ $DOWNLOAD_ONLY -ne 1 ]]; then
echo "[✨] Startup check ..."
docker info > /dev/null
if [[ $? -ne 0 ]]; then
@@ -40,7 +41,7 @@ if [[ $SKIP_CHECKS -eq 0 ]]; then
else
echo "RAM ${RAM}GB OK"
fi
- MAX_MAP_COUNT=$(cat /etc/sysctl.conf | grep -oP "vm.max_map_count=.*" | grep -oP "[0-9]+")
+ MAX_MAP_COUNT=$(cat /proc/sys/vm/max_map_count)
if [[ $MAX_MAP_COUNT -lt $MIN_MAP_COUNT ]]; then
echo "You do not have enough max. map counts:"
echo ""
@@ -56,19 +57,14 @@ else
fi
# environment
-echo "[🚀] Gathering environment ..."
-mkdir -p ./dist
-curl -sSL -o ./docker-compose.yml "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-${VERSION}/.docker/docker-compose.yml"
-curl -sSL -o ./dist/2_setup-data.sql "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-${VERSION}/dbrepo-metadata-db/2_setup-data.sql"
-curl -sSL -o ./dist/rabbitmq.conf "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-${VERSION}/dbrepo-broker-service/rabbitmq.conf"
-curl -sSL -o ./dist/enabled_plugins "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-${VERSION}/dbrepo-broker-service/enabled_plugins"
-curl -sSL -o ./dist/cert.pem "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-${VERSION}/dbrepo-broker-service/cert.pem"
-curl -sSL -o ./dist/pubkey.pem "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-${VERSION}/dbrepo-broker-service/pubkey.pem"
-curl -sSL -o ./dist/definitions.json "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-${VERSION}/dbrepo-broker-service/definitions.json"
-curl -sSL -o ./dist/dbrepo.conf "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-${VERSION}/dbrepo-gateway-service/dbrepo.conf"
-curl -sSL -o ./dist/opensearch_dashboards.yml "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-${VERSION}/dbrepo-search-db/opensearch_dashboards.yml"
-curl -sSL -o ./dist/dbrepo.config.json "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-${VERSION}/dbrepo-ui/dbrepo.config.json"
-curl -sSL -o ./dist/s3_config.json "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-${VERSION}/dbrepo-storage-service/s3_config.json"
+echo "[🚀] Gathering environment for version ${VERSION} ..."
+curl -sSL -o ./dist.tar.gz "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-${VERSION}/.docker/dist.tar.gz"
+tar xzfv ./dist.tar.gz
+
+if [[ $DOWNLOAD_ONLY -eq 1 ]]; then
+ echo "[🎉] Successfully downloaded environment!"
+ exit 0
+fi
echo "[📦] Pulling images for version ${VERSION} ..."
docker compose pull
@@ -83,5 +79,5 @@ if [ $? -eq 0 ]; then
echo ""
echo " docker compose logs -f"
echo ""
- echo "Read about next steps online: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/${VERSION}/deployment-docker-compose/#next-steps"
+ echo "Read about next steps online: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/${VERSION}/installation/#next-steps"
fi
diff --git a/lib/python/Makefile b/lib/python/Makefile
index 7c79a178bfd875327542c07e6bbdd0353a068b19..229fa04db39df9ca8d20263cf3777b8b79e1febe 100644
--- a/lib/python/Makefile
+++ b/lib/python/Makefile
@@ -19,8 +19,8 @@ install:
(cd ../../dbrepo-analyse-service && pipenv lock)
cp ./dist/dbrepo-* ../../dbrepo-search-service/lib/
(cd ../../dbrepo-search-service && pipenv lock)
- cp ./dist/dbrepo-* ../../../dpm2024/lib/
- (cd ../../../dpm2024 && pipenv lock)
+ cp ./dist/dbrepo-* ../../dbrepo-search-service/init/lib/
+ (cd ../../dbrepo-search-service/init && pipenv lock)
deploy: build
python3 -m twine upload --config-file ~/.pypirc --verbose --repository pypi ./dist/dbrepo-*
diff --git a/lib/python/README.md b/lib/python/README.md
index c8785a2e84153752e2e3020b6dfb56c3a119ce04..96166554a7f5cf5a1c3cb1d3fa76650f970eb8bf 100644
--- a/lib/python/README.md
+++ b/lib/python/README.md
@@ -15,72 +15,50 @@ This package supports Python 3.11+.
## Quickstart
-Create a table and import a .csv file from your computer.
+Get public data from a table as pandas `DataFrame`:
```python
from dbrepo.RestClient import RestClient
-from dbrepo.api.dto import CreateTableColumn, ColumnType, CreateTableConstraints
-client = RestClient(endpoint='https://test.dbrepo.tuwien.ac.at', username="foo",
- password="bar")
+client = RestClient(endpoint="https://dbrepo1.ec.tuwien.ac.at")
+# Get a small data slice of just three rows
+df = client.get_table_data(database_id=7, table_id=13, page=0, size=3, df=True)
+print(df)
+# x_coord component unit ... value stationid meantype
+# 0 16.52617 Feinstaub (PM10) µg/m³ ... 21.0 01:0001 HMW
+# 1 16.52617 Feinstaub (PM10) µg/m³ ... 23.0 01:0001 HMW
+# 2 16.52617 Feinstaub (PM10) µg/m³ ... 26.0 01:0001 HMW
+#
+# [3 rows x 12 columns]
+```
+
+Import data into a table:
+
+```python
+import pandas as pd
+from dbrepo.RestClient import RestClient
-# analyse csv
-analysis = client.analyse_datatypes(file_path="sensor.csv", separator=",")
-print(f"Analysis result: {analysis}")
-# -> columns=(date=date, precipitation=decimal, lat=decimal, lng=decimal), separator=,
-# line_termination=\n
-
-# create table
-table = client.create_table(database_id=1,
- name="Sensor Data",
- constraints=CreateTableConstraints(
- checks=['precipitation >= 0'],
- uniques=[['precipitation']]),
- columns=[CreateTableColumn(name="date",
- type=ColumnType.DATE,
- dfid=3, # YYYY-MM-dd
- primary_key=True,
- null_allowed=False),
- CreateTableColumn(name="precipitation",
- type=ColumnType.DECIMAL,
- size=10,
- d=4,
- primary_key=False,
- null_allowed=True),
- CreateTableColumn(name="lat",
- type=ColumnType.DECIMAL,
- size=10,
- d=4,
- primary_key=False,
- null_allowed=True),
- CreateTableColumn(name="lng",
- type=ColumnType.DECIMAL,
- size=10,
- d=4,
- primary_key=False,
- null_allowed=True)])
-print(f"Create table result {table}")
-# -> (id=1, internal_name=sensor_data, ...)
-
-client.import_table_data(database_id=1, table_id=1, file_path="sensor.csv", separator=",",
- skip_lines=1, line_encoding="\n")
-print(f"Finished.")
+client = RestClient(endpoint="https://dbrepo1.ec.tuwien.ac.at", username="foo",
+ password="bar")
+df = pd.DataFrame(data={'x_coord': 16.52617, 'component': 'Feinstaub (PM10)',
+ 'unit': 'µg/m³', ...})
+client.import_table_data(database_id=7, table_id=13, file_name_or_data_frame=df)
```
## Supported Features & Best-Practices
- Manage user
- account ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo//usage-overview/#create-user-account))
+ account ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.5/api/#create-user-account))
- Manage
databases ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo//usage-overview/#create-database))
- Manage database access &
- visibility ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo//usage-overview/#private-database-access))
+ visibility ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.5/api/#create-database))
- Import
- dataset ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo//usage-overview/#private-database-access))
+ dataset ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.5/api/#import-dataset))
- Create persistent
- identifiers ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo//usage-overview/#assign-database-pid))
+ identifiers ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.5/api/#assign-database-pid))
- Execute
- queries ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo//usage-overview/#export-subset))
+ queries ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.5/api/#export-subset))
- Get data from tables/views/subsets
## Configure
@@ -89,16 +67,26 @@ All credentials can optionally be set/overridden with environment variables. Thi
Jupyter Notebooks by creating an invisible `.env` file and loading it:
```
-REST_API_ENDPOINT="https://test.dbrepo.tuwien.ac.at"
+REST_API_ENDPOINT="https://dbrepo1.ec.tuwien.ac.at"
REST_API_USERNAME="foo"
REST_API_PASSWORD="bar"
REST_API_SECURE="True"
-AMQP_API_HOST="https://test.dbrepo.tuwien.ac.at"
+AMQP_API_HOST="https://dbrepo1.ec.tuwien.ac.at"
AMQP_API_PORT="5672"
AMQP_API_USERNAME="foo"
AMQP_API_PASSWORD="bar"
-AMQP_API_VIRTUAL_HOST="/"
-REST_UPLOAD_ENDPOINT="https://test.dbrepo.tuwien.ac.at/api/upload/files"
+AMQP_API_VIRTUAL_HOST="dbrepo"
+REST_UPLOAD_ENDPOINT="https://dbrepo1.ec.tuwien.ac.at/api/upload/files"
+```
+
+You can disable logging by setting the log level to e.g. `INFO`:
+
+```python
+from dbrepo.RestClient import RestClient
+import logging
+logging.getLogger().setLevel(logging.INFO)
+...
+client = RestClient(...)
```
## Roadmap
diff --git a/lib/python/dbrepo/AmqpClient.py b/lib/python/dbrepo/AmqpClient.py
index 1afcc2a7b582e7fdac634d6d7a14fdd35c4d3797..1cc0e0319c03e46935a5ea9a21a963b609242726 100644
--- a/lib/python/dbrepo/AmqpClient.py
+++ b/lib/python/dbrepo/AmqpClient.py
@@ -7,6 +7,8 @@ import logging
from dbrepo.api.dto import CreateData
+logger = logging.getLogger("AmqpClient")
+
class AmqpClient:
"""
@@ -58,5 +60,5 @@ class AmqpClient:
connection = pika.BlockingConnection(parameters)
channel = connection.channel()
channel.basic_publish(exchange=exchange, routing_key=routing_key,
- body=json.dumps(dataclasses.asdict(CreateData(data=data))))
+ body=json.dumps(data))
connection.close()
diff --git a/lib/python/dbrepo/RestClient.py b/lib/python/dbrepo/RestClient.py
index 22790681d804174e4f522c4c568cbf1b93a5b90a..85c55613ef0eb5259b37d72393677476c980f94f 100644
--- a/lib/python/dbrepo/RestClient.py
+++ b/lib/python/dbrepo/RestClient.py
@@ -1,6 +1,7 @@
-import sys
import os
+import sys
import logging
+import time
import requests
from pydantic import TypeAdapter
@@ -10,8 +11,10 @@ from pandas import DataFrame
from dbrepo.UploadClient import UploadClient
from dbrepo.api.dto import *
from dbrepo.api.exceptions import ResponseCodeError, UsernameExistsError, EmailExistsError, NotExistsError, \
- ForbiddenError, MalformedError, NameExistsError, QueryStoreError, MetadataConsistencyError, ExternalSystemError, \
- AuthenticationError, UploadError
+ ForbiddenError, MalformedError, NameExistsError, QueryStoreError, ExternalSystemError, \
+ AuthenticationError, UploadError, FormatNotAvailable, RequestError, ServiceError, ServiceConnectionError
+
+logger = logging.getLogger("RestClient")
class RestClient:
@@ -45,33 +48,35 @@ class RestClient:
self.secure = os.environ.get('REST_API_SECURE') == 'True'
else:
self.secure = secure
+ logger.debug(
+ f'initialized rest client with endpoint={self.endpoint}, username={username}, verify_ssl={secure}')
def _wrapper(self, method: str, url: str, params: [(str,)] = None, payload=None, headers: dict = None,
force_auth: bool = False, stream: bool = False) -> requests.Response:
if force_auth and (self.username is None and self.password is None):
raise AuthenticationError(f"Failed to perform request: authentication required")
url = f'{self.endpoint}{url}'
- logging.debug(f'method: {method}')
- logging.debug(f'url: {url}')
+ logger.debug(f'method: {method}')
+ logger.debug(f'url: {url}')
if params is not None:
- logging.debug(f'params: {params}')
+ logger.debug(f'params: {params}')
if stream is not None:
- logging.debug(f'stream: {stream}')
- logging.debug(f'secure: {self.secure}')
+ logger.debug(f'stream: {stream}')
+ logger.debug(f'secure: {self.secure}')
if headers is not None:
- logging.debug(f'headers: {headers}')
+ logger.debug(f'headers: {headers}')
else:
headers = dict()
- logging.debug(f'no headers set')
+ logger.debug(f'no headers set')
if payload is not None:
payload = payload.model_dump()
auth = None
if self.username is None and self.password is not None:
headers["Authorization"] = f"Bearer {self.password}"
- logging.debug(f'configured for oidc/bearer auth')
+ logger.debug(f'configured for oidc/bearer auth')
elif self.username is not None and self.password is not None:
auth = (self.username, self.password)
- logging.debug(f'configured for basic auth: username={self.username}, password=(hidden)')
+ logger.debug(f'configured for basic auth: username={self.username}, password=(hidden)')
return requests.request(method=method, url=url, auth=auth, verify=self.secure,
json=payload, headers=headers, params=params, stream=stream)
@@ -93,14 +98,18 @@ class RestClient:
def get_jwt_auth(self, username: str = None, password: str = None) -> JwtAuth:
"""
- Obtains a JWT auth object from the Auth Service containing e.g. the access token and refresh token.
+ Obtains a JWT auth object from the auth service containing e.g. the access token and refresh token.
- :param username: The username used to authenticate with the Auth Service. Optional. Default: username from the `RestClient` constructor.
- :param password: The password used to authenticate with the Auth Service. Optional. Default: password from the `RestClient` constructor.
+ :param username: The username used to authenticate with the auth service. Optional. Default: username from the `RestClient` constructor.
+ :param password: The password used to authenticate with the auth service. Optional. Default: password from the `RestClient` constructor.
- :returns: JWT auth object from the Auth Service, if successful.
+ :returns: JWT auth object from the auth service, if successful.
- :raises ForbiddenError: If something went wrong with the authentication.
+ :raises MalformedError: If the payload was rejected by the service.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises AuthenticationError: If something went wrong with the authentication.
+ :raises ServiceConnectionError: If something went wrong with connection to the auth service.
+ :raises ServiceError: If something went wrong with obtaining the information in the auth service.
:raises ResponseCodeError: If something went wrong with the authentication.
"""
if username is None:
@@ -112,9 +121,45 @@ class RestClient:
if response.status_code == 202:
body = response.json()
return JwtAuth.model_validate(body)
+ if response.status_code == 400:
+ raise MalformedError(f'Failed to get JWT: {response.text}')
if response.status_code == 403:
- raise ForbiddenError(f'Failed to get JWT auth')
- raise ResponseCodeError(f'Failed to get JWT auth: response code: {response.status_code} is not 202 (ACCEPTED)')
+ raise ForbiddenError(f'Failed to get JWT: not allowed')
+ if response.status_code == 428:
+ raise AuthenticationError(f'Failed to get JWT: account not fully setup (requires password change?)')
+ if response.status_code == 502:
+ raise ServiceConnectionError(f'Failed to get JWT: failed to establish connection with auth service')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to get JWT: failed to get user in auth service')
+ raise ResponseCodeError(f'Failed to get JWT: response code: {response.status_code} is not '
+ f'202 (ACCEPTED): {response.text}')
+
+ def refresh_jwt_auth(self, refresh_token: str) -> JwtAuth:
+ """
+ Refreshes a JWT auth object from the auth service containing e.g. the access token and refresh token.
+
+ :param refresh_token: The refresh token.
+
+ :returns: JWT auth object from the auth service, if successful.
+
+ :raises MalformedError: If the payload was rejected by the service.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises ServiceConnectionError: If something went wrong with the connection to the auth service.
+ :raises ResponseCodeError: If something went wrong with the authentication.
+ """
+ url = f'{self.endpoint}/api/user/token'
+ response = self._wrapper(method="put", url=url, payload={"refresh_token": refresh_token})
+ if response.status_code == 202:
+ body = response.json()
+ return JwtAuth.model_validate(body)
+ if response.status_code == 400:
+ raise MalformedError(f'Failed to refresh JWT: {response.text}')
+ if response.status_code == 403:
+ raise ForbiddenError(f'Failed to refresh JWT: not allowed')
+ if response.status_code == 502:
+ raise ServiceConnectionError(f'Failed to refresh JWT: failed to establish connection with auth service')
+ raise ResponseCodeError(f'Failed to refresh JWT: response code: {response.status_code} is not '
+ f'202 (ACCEPTED): {response.text}')
def whoami(self) -> str | None:
"""
@@ -123,9 +168,9 @@ class RestClient:
:returns: The username, if set.
"""
if self.username is not None:
- logging.info(f"{self.username}")
+ print(f"{self.username}")
return self.username
- logging.info(f"No username set!")
+ print(f"No username set!")
return None
def get_users(self) -> List[UserBrief]:
@@ -141,7 +186,24 @@ class RestClient:
if response.status_code == 200:
body = response.json()
return TypeAdapter(List[UserBrief]).validate_python(body)
- raise ResponseCodeError(f'Failed to find users: response code: {response.status_code} is not 200 (OK)')
+ raise ResponseCodeError(f'Failed to find users: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
+
+ def get_units(self) -> List[Unit]:
+ """
+ Get all units known to the metadata database.
+
+ :returns: List of units, if successful.
+
+ :raises ResponseCodeError: If something went wrong with the retrieval.
+ """
+ url = f'/api/unit'
+ response = self._wrapper(method="get", url=url)
+ if response.status_code == 200:
+ body = response.json()
+ return TypeAdapter(List[Unit]).validate_python(body)
+ raise ResponseCodeError(f'Failed to find units: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
def get_user(self, user_id: str) -> User:
"""
@@ -150,17 +212,20 @@ class RestClient:
:returns: The user, if successful.
:raises ResponseCodeError: If something went wrong with the retrieval.
- :raises NotExistsError: If theuser does not exist.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the user does not exist.
"""
url = f'/api/user/{user_id}'
response = self._wrapper(method="get", url=url)
if response.status_code == 200:
body = response.json()
return User.model_validate(body)
+ if response.status_code == 403:
+ raise ForbiddenError(f'Failed to find user: not allowed')
if response.status_code == 404:
- raise NotExistsError(f'Failed to find user with id {user_id}')
- raise ResponseCodeError(
- f'Failed to find user with id {user_id}: response code: {response.status_code} is not 200 (OK)')
+ raise NotExistsError(f'Failed to find user: not found')
+ raise ResponseCodeError(f'Failed to find user: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
def create_user(self, username: str, password: str, email: str) -> UserBrief:
"""
@@ -172,11 +237,14 @@ class RestClient:
:returns: The user, if successful.
- :raises ResponseCodeError: If something went wrong with the creation.
+ :raises MalformedError: If the payload was rejected by the service.
+ :raises ForbiddenError: If the internal authentication to the auth service is invalid.
:raises UsernameExistsError: The username exists already.
- :raises ForbiddenError: If the action is not allowed.
- :raises NotExistsError: If thedefault role was not found.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the created user was not found in the auth service.
:raises EmailExistsError: The email exists already.
+ :raises ServiceConnectionError: If something went wrong with connection to the auth service.
+ :raises ServiceError: If something went wrong with obtaining the information in the auth service.
"""
url = f'/api/user'
response = self._wrapper(method="post", url=url,
@@ -184,16 +252,22 @@ class RestClient:
if response.status_code == 201:
body = response.json()
return UserBrief.model_validate(body)
+ if response.status_code == 400:
+ raise MalformedError(f'Failed to create user: {response.text}')
if response.status_code == 403:
- raise ForbiddenError(f'Failed to update user password: not allowed')
+ raise ForbiddenError(f'Failed to create user: internal authentication to the auth service is invalid')
if response.status_code == 404:
- raise NotExistsError(f'Failed to create user: default role not found')
+ raise NotExistsError(f'Failed to create user: created user not found in auth service')
if response.status_code == 409:
raise UsernameExistsError(f'Failed to create user: user with username exists')
if response.status_code == 417:
raise EmailExistsError(f'Failed to create user: user with e-mail exists')
- raise ResponseCodeError(
- f'Failed to create user: response code: {response.status_code} is not 201 (CREATED)')
+ if response.status_code == 502:
+ raise ServiceConnectionError(f'Failed to create user: failed to establish connection with auth service')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to create user: failed to create in auth service')
+ raise ResponseCodeError(f'Failed to create user: response code: {response.status_code} is not '
+ f'201 (CREATED): {response.text}')
def update_user(self, user_id: str, theme: str, language: str, firstname: str = None, lastname: str = None,
affiliation: str = None, orcid: str = None) -> User:
@@ -210,9 +284,10 @@ class RestClient:
:returns: The user, if successful.
+ :raises MalformedError: If the payload was rejected by the service.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the user does not exist.
:raises ResponseCodeError: If something went wrong with the update.
- :raises ForbiddenError: If the action is not allowed.
- :raises NotExistsError: If theuser does not exist.
"""
url = f'/api/user/{user_id}'
response = self._wrapper(method="put", url=url, force_auth=True,
@@ -222,15 +297,13 @@ class RestClient:
body = response.json()
return User.model_validate(body)
if response.status_code == 400:
- raise ResponseCodeError(f'Failed to update user: invalid values')
+ raise MalformedError(f'Failed to update user: {response.text}')
if response.status_code == 403:
raise ForbiddenError(f'Failed to update user password: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to update user: user not found')
- if response.status_code == 405:
- raise ForbiddenError(f'Failed to update user: foreign user')
- raise ResponseCodeError(
- f'Failed to update user: response code: {response.status_code} is not 202 (ACCEPTED)')
+ raise ResponseCodeError(f'Failed to update user: response code: {response.status_code} is not '
+ f'202 (ACCEPTED): {response.text}')
def update_user_password(self, user_id: str, password: str) -> User:
"""
@@ -241,9 +314,12 @@ class RestClient:
:returns: The user, if successful.
+ :raises MalformedError: If the payload was rejected by the service.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the user does not exist.
+ :raises ServiceConnectionError: If something went wrong with connection to the auth service.
+ :raises ServiceError: If something went wrong with obtaining the information in the auth service.
:raises ResponseCodeError: If something went wrong with the update.
- :raises ForbiddenError: If the action is not allowed.
- :raises NotExistsError: If theuser does not exist.
"""
url = f'/api/user/{user_id}/password'
response = self._wrapper(method="put", url=url, force_auth=True, payload=UpdateUserPassword(password=password))
@@ -251,17 +327,18 @@ class RestClient:
body = response.json()
return User.model_validate(body)
if response.status_code == 400:
- raise ResponseCodeError(f'Failed to update user password: invalid values')
+ raise MalformedError(f'Failed to update user password: {response.text}')
if response.status_code == 403:
raise ForbiddenError(f'Failed to update user password: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to update user password: not found')
- if response.status_code == 405:
- raise ForbiddenError(f'Failed to update user password: foreign user')
+ if response.status_code == 502:
+ raise ServiceConnectionError(
+ f'Failed to update user password: failed to establish connection with auth service')
if response.status_code == 503:
- raise ResponseCodeError(f'Failed to update user password: keycloak error')
- raise ResponseCodeError(
- f'Failed to update user theme: response code: {response.status_code} is not 202 (ACCEPTED)')
+ raise ServiceError(f'Failed to update user password: failed to update in auth service')
+ raise ResponseCodeError(f'Failed to update user theme: response code: {response.status_code} is not '
+ f'202 (ACCEPTED): {response.text}')
def get_containers(self) -> List[ContainerBrief]:
"""
@@ -276,7 +353,8 @@ class RestClient:
if response.status_code == 200:
body = response.json()
return TypeAdapter(List[ContainerBrief]).validate_python(body)
- raise ResponseCodeError(f'Failed to find containers: response code: {response.status_code} is not 200 (OK)')
+ raise ResponseCodeError(f'Failed to find containers: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
def get_container(self, container_id: int) -> Container:
"""
@@ -294,9 +372,10 @@ class RestClient:
return Container.model_validate(body)
if response.status_code == 404:
raise NotExistsError(f'Failed to get container: not found')
- raise ResponseCodeError(f'Failed to get container: response code: {response.status_code} is not 200 (OK)')
+ raise ResponseCodeError(f'Failed to get container: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
- def get_databases(self) -> List[Database]:
+ def get_databases(self) -> List[DatabaseBrief]:
"""
Get all databases.
@@ -308,8 +387,9 @@ class RestClient:
response = self._wrapper(method="get", url=url)
if response.status_code == 200:
body = response.json()
- return TypeAdapter(List[Database]).validate_python(body)
- raise ResponseCodeError(f'Failed to find databases: response code: {response.status_code} is not 200 (OK)')
+ return TypeAdapter(List[DatabaseBrief]).validate_python(body)
+ raise ResponseCodeError(f'Failed to find databases: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
def get_databases_count(self) -> int:
"""
@@ -322,7 +402,8 @@ class RestClient:
response = self._wrapper(method="head", url=url)
if response.status_code == 200:
return int(response.headers.get("x-count"))
- raise ResponseCodeError(f'Failed to find databases: response code: {response.status_code} is not 200 (OK)')
+ raise ResponseCodeError(f'Failed to find databases: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
def get_database(self, database_id: int) -> Database:
"""
@@ -332,6 +413,9 @@ class RestClient:
:returns: The database, if successful.
+ :raises NotExistsError: If the container does not exist.
+ :raises ServiceConnectionError: If something went wrong with connection to the broker service.
+ :raises ServiceError: If something went wrong with obtaining the information in the broker service.
:raises ResponseCodeError: If something went wrong with the retrieval.
"""
url = f'/api/database/{database_id}'
@@ -340,9 +424,13 @@ class RestClient:
body = response.json()
return Database.model_validate(body)
if response.status_code == 404:
- raise NotExistsError(f'Failed to find database with id {database_id}')
- raise ResponseCodeError(
- f'Failed to find database with id {database_id}: response code: {response.status_code} is not 200 (OK)')
+ raise NotExistsError(f'Failed to find database: not found')
+ if response.status_code == 502:
+ raise ServiceConnectionError(f'Failed to find database: failed to establish connection with broker service')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to find database: failed to obtain queue metadata from broker service')
+ raise ResponseCodeError(f'Failed to find database: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
def create_database(self, name: str, container_id: int, is_public: bool) -> Database:
"""
@@ -355,9 +443,13 @@ class RestClient:
:returns: The database, if successful.
- :raises ResponseCodeError: If something went wrong with the retrieval.
- :raises ForbiddenError: If the action is not allowed.
+ :raises MalformedError: If the payload was rejected by the service.
+ :raises ForbiddenError: If something went wrong with the authorization.
:raises NotExistsError: If the container does not exist.
+ :raises QueryStoreError: If something went wrong with the query store.
+ :raises ServiceConnectionError: If something went wrong with connection to the search service.
+ :raises ServiceError: If something went wrong with obtaining the information in the search service.
+ :raises ResponseCodeError: If something went wrong with the retrieval.
"""
url = f'/api/database'
response = self._wrapper(method="post", url=url, force_auth=True,
@@ -365,12 +457,68 @@ class RestClient:
if response.status_code == 201:
body = response.json()
return Database.model_validate(body)
+ if response.status_code == 400:
+ raise MalformedError(f'Failed to create database: {response.text}')
if response.status_code == 403:
raise ForbiddenError(f'Failed to create database: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to create database: container not found')
- raise ResponseCodeError(
- f'Failed to create database: response code: {response.status_code} is not 201 (CREATED)')
+ if response.status_code == 409:
+ raise QueryStoreError(f'Failed to create database: failed to create query store in data database')
+ if response.status_code == 502:
+ raise ServiceConnectionError(f'Failed to create database: failed to establish connection to search service')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to create database: failed to create in search service')
+ raise ResponseCodeError(f'Failed to create database: response code: {response.status_code} is not '
+ f'201 (CREATED): {response.text}')
+
+ def create_container(self, name: str, host: str, image_id: int, sidecar_host: str, sidecar_port: int,
+ privileged_username: str, privileged_password: str, port: int = None, ui_host: str = None,
+ ui_port: int = None) -> Container:
+ """
+ Register a container instance executing a given container image. Note that this does not create a container,
+ but only saves it in the metadata database to be used within DBRepo. The container still needs to be created
+ through e.g. `docker run image:tag -d`.
+
+ :param name: The container name.
+ :param host: The container hostname.
+ :param image_id: The container image id.
+ :param sidecar_host: The container sidecar hostname.
+ :param sidecar_port: The container sidecar port.
+ :param privileged_username: The container privileged user username.
+ :param privileged_password: The container privileged user password.
+ :param port: The container port bound to the host. Optional.
+ :param ui_host: The container hostname displayed in the user interface. Optional. Default: value of `host`
+ :param ui_port: The container port displayed in the user interface. Optional. Default: `default_port` of image.
+
+ :returns: The container, if successful.
+
+ :raises MalformedError: If the payload was rejected by the service.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the container does not exist.
+ :raises NameExistsError: If a container with this name already exists.
+ :raises ResponseCodeError: If something went wrong with the retrieval.
+ """
+ url = f'/api/container'
+ response = self._wrapper(method="post", url=url, force_auth=True,
+ payload=CreateContainer(name=name, host=host, image_id=image_id,
+ sidecar_host=sidecar_host, sidecar_port=sidecar_port,
+ privileged_username=privileged_username,
+ privileged_password=privileged_password, port=port,
+ ui_host=ui_host, ui_port=ui_port))
+ if response.status_code == 201:
+ body = response.json()
+ return Container.model_validate(body)
+ if response.status_code == 400:
+ raise MalformedError(f'Failed to create container: {response.text}')
+ if response.status_code == 403:
+ raise ForbiddenError(f'Failed to create container: not allowed')
+ if response.status_code == 404:
+ raise NotExistsError(f'Failed to create container: container not found')
+ if response.status_code == 409:
+ raise NameExistsError(f'Failed to create container: container name already exists')
+ raise ResponseCodeError(f'Failed to create container: response code: {response.status_code} is not '
+ f'201 (CREATED): {response.text}')
def update_database_visibility(self, database_id: int, is_public: bool) -> Database:
"""
@@ -382,19 +530,29 @@ class RestClient:
:returns: The database, if successful.
- :raises ResponseCodeError: If something went wrong with the retrieval.
- :raises ForbiddenError: If the action is not allowed.
- :raises NotExistsError: If thedatabase does not exist.
+ :raises MalformedError: If the payload was rejected by the service.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the database does not exist.
+ :raises ServiceConnectionError: If something went wrong with connection to the search service.
+ :raises ServiceError: If something went wrong with obtaining the information in the search service.
+ :raises ResponseCodeError: If something went wrong with the update.
"""
url = f'/api/database/{database_id}'
response = self._wrapper(method="put", url=url, force_auth=True, payload=ModifyVisibility(is_public=is_public))
if response.status_code == 202:
body = response.json()
return Database.model_validate(body)
+ if response.status_code == 400:
+ raise MalformedError(f'Failed to update database visibility: {response.text}')
if response.status_code == 403:
raise ForbiddenError(f'Failed to update database visibility: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to update database visibility: not found')
+ if response.status_code == 502:
+ raise ServiceConnectionError(
+ f'Failed to update database visibility: failed to establish connection to search service')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to update database visibility: failed to update in search service')
raise ResponseCodeError(
f'Failed to update database visibility: response code: {response.status_code} is not 202 (ACCEPTED)')
@@ -407,21 +565,71 @@ class RestClient:
:returns: The database, if successful.
- :raises ResponseCodeError: If something went wrong with the retrieval.
- :raises NotExistsError: If thedatabase does not exist.
+ :raises MalformedError: If the payload was rejected by the service.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the database does not exist.
+ :raises ServiceConnectionError: If something went wrong with connection to the search service.
+ :raises ServiceError: If something went wrong with obtaining the information in the search service.
+ :raises ResponseCodeError: If something went wrong with the update.
"""
url = f'/api/database/{database_id}/owner'
response = self._wrapper(method="put", url=url, force_auth=True, payload=ModifyOwner(id=user_id))
if response.status_code == 202:
body = response.json()
return Database.model_validate(body)
+ if response.status_code == 400:
+ raise MalformedError(f'Failed to update database visibility: {response.text}')
if response.status_code == 403:
raise ForbiddenError(f'Failed to update database visibility: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to update database visibility: not found')
+ if response.status_code == 502:
+ raise ServiceConnectionError(
+ f'Failed to update database visibility: failed to establish connection to search service')
+ if response.status_code == 503:
+ raise ServiceError(
+ f'Failed to update database visibility: failed to update in search service')
raise ResponseCodeError(
f'Failed to update database visibility: response code: {response.status_code} is not 202 (ACCEPTED)')
+ def update_database_schema(self, database_id: int) -> Database:
+ """
+ Updates the database table and view metadata of a database with given database id.
+
+ :param database_id: The database id.
+
+ :returns: The updated database, if successful.
+
+ :raises MalformedError: If the payload was rejected by the service.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the database does not exist.
+ :raises ServiceConnectionError: If something went wrong with connection to the data service.
+ :raises ServiceError: If something went wrong with obtaining the information in the data service.
+ :raises ResponseCodeError: If something went wrong with the update.
+ """
+ url = f'/api/database/{database_id}/metadata/table'
+ response = self._wrapper(method="put", url=url, force_auth=True)
+ if response.status_code == 200:
+ response.json()
+ url = f'/api/database/{database_id}/metadata/view'
+ response = self._wrapper(method="put", url=url, force_auth=True)
+ if response.status_code == 200:
+ body = response.json()
+ return Database.model_validate(body)
+ if response.status_code == 400:
+ raise MalformedError(f'Failed to update database schema: {response.text}')
+ if response.status_code == 403:
+ raise ForbiddenError(f'Failed to update database schema: not allowed')
+ if response.status_code == 404:
+ raise NotExistsError(f'Failed to update database schema: not found')
+ if response.status_code == 502:
+ raise ServiceConnectionError(
+ f'Failed to update database schema: failed to establish connection to search service')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to update database schema: failed to update in search service')
+ raise ResponseCodeError(
+ f'Failed to update database schema: response code: {response.status_code} is not 200 (OK)')
+
def create_table(self, database_id: int, name: str, columns: List[CreateTableColumn],
constraints: CreateTableConstraints, description: str = None) -> Table:
"""
@@ -435,11 +643,13 @@ class RestClient:
:returns: The table, if successful.
- :raises ResponseCodeError: If something went wrong with the retrieval.
- :raises NameExistsError: If a table with this name already exists.
- :raises ForbiddenError: If the action is not allowed.
:raises MalformedError: If the payload is rejected by the service.
- :raises NotExistsError: If the container does not exist.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the database does not exist.
+ :raises NameExistsError: If a table with this name already exists.
+ :raises ServiceConnectionError: If something went wrong with connection to the data service.
+ :raises ServiceError: If something went wrong with obtaining the information in the data service.
+ :raises ResponseCodeError: If something went wrong with the creation.
"""
url = f'/api/database/{database_id}/table'
response = self._wrapper(method="post", url=url, force_auth=True,
@@ -449,15 +659,19 @@ class RestClient:
body = response.json()
return Table.model_validate(body)
if response.status_code == 400:
- raise MalformedError(f'Failed to create table: service rejected malformed payload')
+ raise MalformedError(f'Failed to create table: {response.text}')
if response.status_code == 403:
raise ForbiddenError(f'Failed to create table: not allowed')
if response.status_code == 404:
- raise NotExistsError(f'Failed to create table: container not found')
+ raise NotExistsError(f'Failed to create table: not found')
if response.status_code == 409:
raise NameExistsError(f'Failed to create table: table name exists')
- raise ResponseCodeError(
- f'Failed to create table: response code: {response.status_code} is not 201 (CREATED)')
+ if response.status_code == 502:
+ raise ServiceConnectionError(f'Failed to create table: failed to establish connection to data service')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to create table: failed to create table in data service')
+ raise ResponseCodeError(f'Failed to create table: response code: {response.status_code} is not '
+ f'201 (CREATED): {response.text}')
def get_tables(self, database_id: int) -> List[TableBrief]:
"""
@@ -467,6 +681,8 @@ class RestClient:
:returns: List of tables, if successful.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the database does not exist.
:raises ResponseCodeError: If something went wrong with the retrieval.
"""
url = f'/api/database/{database_id}/table'
@@ -474,7 +690,12 @@ class RestClient:
if response.status_code == 200:
body = response.json()
return TypeAdapter(List[TableBrief]).validate_python(body)
- raise ResponseCodeError(f'Failed to find tables: response code: {response.status_code} is not 200 (OK)')
+ if response.status_code == 403:
+ raise ForbiddenError(f'Failed to get tables: not allowed')
+ if response.status_code == 404:
+ raise NotExistsError(f'Failed to get tables: database not found')
+ raise ResponseCodeError(f'Failed to get tables: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
def get_table(self, database_id: int, table_id: int) -> Table:
"""
@@ -485,9 +706,11 @@ class RestClient:
:returns: List of tables, if successful.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the table does not exist.
+ :raises ServiceConnectionError: If something went wrong with connection to the metadata service.
+ :raises ServiceError: If something went wrong with obtaining the information in the metadata service.
:raises ResponseCodeError: If something went wrong with the retrieval.
- :raises ForbiddenError: If the action is not allowed.
- :raises NotExistsError: If thecontainer does not exist.
"""
url = f'/api/database/{database_id}/table/{table_id}'
response = self._wrapper(method="get", url=url)
@@ -498,7 +721,12 @@ class RestClient:
raise ForbiddenError(f'Failed to find table: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to find table: not found')
- raise ResponseCodeError(f'Failed to find table: response code: {response.status_code} is not 200 (OK)')
+ if response.status_code == 502:
+ raise ServiceConnectionError(f'Failed to find table: failed to establish connection to broker service')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to find table: failed to obtain queue information from broker service')
+ raise ResponseCodeError(f'Failed to find table: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
def delete_table(self, database_id: int, table_id: int) -> None:
"""
@@ -507,19 +735,55 @@ class RestClient:
:param database_id: The database id.
:param table_id: The table id.
- :raises ResponseCodeError: If something went wrong with the retrieval.
- :raises ForbiddenError: If the action is not allowed.
- :raises NotExistsError: If thecontainer does not exist.
+ :raises MalformedError: If the payload is rejected by the service.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the container does not exist.
+ :raises ServiceConnectionError: If something went wrong with connection to the data service.
+ :raises ServiceError: If something went wrong with obtaining the information in the data service.
+ :raises ResponseCodeError: If something went wrong with the deletion.
"""
url = f'/api/database/{database_id}/table/{table_id}'
response = self._wrapper(method="delete", url=url, force_auth=True)
if response.status_code == 202:
return
+ if response.status_code == 400:
+ raise MalformedError(f'Failed to delete table: {response.text}')
if response.status_code == 403:
raise ForbiddenError(f'Failed to delete table: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to delete table: not found')
- raise ResponseCodeError(f'Failed to delete table: response code: {response.status_code} is not 202 (ACCEPTED)')
+ if response.status_code == 502:
+ raise ServiceConnectionError(f'Failed to delete table: failed to establish connection to search service')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to delete table: failed to delete in search service')
+ raise ResponseCodeError(f'Failed to delete table: response code: {response.status_code} is not '
+ f'202 (ACCEPTED): {response.text}')
+
+ def delete_container(self, container_id: int) -> None:
+ """
+ Deletes a container with given id. Note that this does not delete the container, but deletes the entry in the
+ metadata database. The container still needs to be removed, e.g. `docker container stop hash` and then
+ `docker container rm hash`.
+
+ :param container_id: The container id.
+
+ :raises MalformedError: If the payload is rejected by the service.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the container does not exist.
+ :raises ResponseCodeError: If something went wrong with the deletion.
+ """
+ url = f'/api/container/{container_id}'
+ response = self._wrapper(method="delete", url=url, force_auth=True)
+ if response.status_code == 202:
+ return
+ if response.status_code == 400:
+ raise MalformedError(f'Failed to delete container: {response.text}')
+ if response.status_code == 403:
+ raise ForbiddenError(f'Failed to delete container: not allowed')
+ if response.status_code == 404:
+ raise NotExistsError(f'Failed to delete container: not found')
+ raise ResponseCodeError(f'Failed to delete container: response code: {response.status_code} is not '
+ f'202 (ACCEPTED): {response.text}')
def get_table_metadata(self, database_id: int) -> Database:
"""
@@ -527,9 +791,9 @@ class RestClient:
:param database_id: The database id.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the table does not exist.
:raises ResponseCodeError: If something went wrong with the retrieval.
- :raises ForbiddenError: If the action is not allowed.
- :raises NotExistsError: If the container does not exist.
"""
url = f'/api/database/{database_id}/metadata/table'
response = self._wrapper(method="put", url=url, force_auth=True)
@@ -540,7 +804,38 @@ class RestClient:
raise ForbiddenError(f'Failed to get tables metadata: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to get tables metadata: not found')
- raise ResponseCodeError(f'Failed to get tables metadata: response code: {response.status_code} is not 200 (OK)')
+ raise ResponseCodeError(f'Failed to get tables metadata: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
+
+ def get_table_history(self, database_id: int, table_id: int, size: int = 100) -> Database:
+ """
+ Get the table history of insert/delete operations.
+
+ :param database_id: The database id.
+ :param table_id: The table id.
+ :param size: The number of operations. Optional. Default: 100.
+
+ :raises MalformedError: If the payload is rejected by the service.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the table does not exist.
+ :raises ServiceError: If something went wrong with obtaining the information in the data service.
+ :raises ResponseCodeError: If something went wrong with the retrieval.
+ """
+ url = f'/api/database/{database_id}/table/{table_id}/history?size={size}'
+ response = self._wrapper(method="get", url=url, force_auth=True)
+ if response.status_code == 200:
+ body = response.json()
+ return Database.model_validate(body)
+ if response.status_code == 400:
+ raise MalformedError(f'Failed to get table history: {response.text}')
+ if response.status_code == 403:
+ raise ForbiddenError(f'Failed to get table history: not allowed')
+ if response.status_code == 404:
+ raise NotExistsError(f'Failed to get table history: not found')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to get table history: failed to establish connection with metadata service')
+ raise ResponseCodeError(f'Failed to get table history: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
def get_views(self, database_id: int) -> List[View]:
"""
@@ -550,20 +845,18 @@ class RestClient:
:returns: The list of views, if successful.
+ :raises NotExistsError: If the container does not exist.
:raises ResponseCodeError: If something went wrong with the retrieval.
- :raises ForbiddenError: If the action is not allowed.
- :raises NotExistsError: If thecontainer does not exist.
"""
url = f'/api/database/{database_id}/view'
response = self._wrapper(method="get", url=url)
if response.status_code == 200:
body = response.json()
return TypeAdapter(List[View]).validate_python(body)
- if response.status_code == 403:
- raise ForbiddenError(f'Failed to find views: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to find views: not found')
- raise ResponseCodeError(f'Failed to find views: response code: {response.status_code} is not 200 (OK)')
+ raise ResponseCodeError(f'Failed to find views: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
def get_view(self, database_id: int, view_id: int) -> View:
"""
@@ -574,9 +867,9 @@ class RestClient:
:returns: The view, if successful.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the container does not exist.
:raises ResponseCodeError: If something went wrong with the retrieval.
- :raises ForbiddenError: If the action is not allowed.
- :raises NotExistsError: If thecontainer does not exist.
"""
url = f'/api/database/{database_id}/view/{view_id}'
response = self._wrapper(method="get", url=url)
@@ -587,7 +880,8 @@ class RestClient:
raise ForbiddenError(f'Failed to find view: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to find view: not found')
- raise ResponseCodeError(f'Failed to find view: response code: {response.status_code} is not 200 (OK)')
+ raise ResponseCodeError(f'Failed to find view: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
def create_view(self, database_id: int, name: str, query: str, is_public: bool) -> View:
"""
@@ -601,9 +895,13 @@ class RestClient:
:returns: The created view, if successful.
+ :raises MalformedError: If the payload is rejected by the service.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the database does not exist.
+ :raises ExternalSystemError: If the mapped view creation query is erroneous.
+ :raises ServiceConnectionError: If something went wrong with connection to the search service.
+ :raises ServiceError: If something went wrong with obtaining the information in the search service.
:raises ResponseCodeError: If something went wrong with the retrieval.
- :raises ForbiddenError: If the action is not allowed.
- :raises NotExistsError: If thecontainer does not exist.
"""
url = f'/api/database/{database_id}/view'
response = self._wrapper(method="post", url=url, force_auth=True,
@@ -611,13 +909,20 @@ class RestClient:
if response.status_code == 201:
body = response.json()
return View.model_validate(body)
- if response.status_code == 400 or response.status_code == 423:
- raise MalformedError(f'Failed to create view: service rejected malformed payload')
- if response.status_code == 403 or response.status_code == 405:
+ if response.status_code == 400:
+ raise MalformedError(f'Failed to create view: {response.text}')
+ if response.status_code == 403:
raise ForbiddenError(f'Failed to create view: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to create view: not found')
- raise ResponseCodeError(f'Failed to create view: response code: {response.status_code} is not 201 (CREATED)')
+ if response.status_code == 423:
+ raise ExternalSystemError(f'Failed to create view: mapped invalid query: {response.text}')
+ if response.status_code == 502:
+ raise ServiceConnectionError(f'Failed to create view: failed to establish connection to search service')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to create view: failed to save in search service')
+ raise ResponseCodeError(f'Failed to create view: response code: {response.status_code} is not '
+ f'201 (CREATED): {response.text}')
def delete_view(self, database_id: int, view_id: int) -> None:
"""
@@ -626,21 +931,32 @@ class RestClient:
:param database_id: The database id.
:param view_id: The view id.
- :raises ResponseCodeError: If something went wrong with the retrieval.
- :raises ForbiddenError: If the action is not allowed.
- :raises NotExistsError: If thecontainer does not exist.
+ :raises MalformedError: If the payload is rejected by the service.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the container does not exist.
+ :raises ExternalSystemError: If the mapped view deletion query is erroneous.
+ :raises ServiceConnectionError: If something went wrong with connection to the search service.
+ :raises ServiceError: If something went wrong with obtaining the information in the search service.
+ :raises ResponseCodeError: If something went wrong with the deletion.
"""
url = f'/api/database/{database_id}/view/{view_id}'
response = self._wrapper(method="delete", url=url, force_auth=True)
if response.status_code == 202:
return
- if response.status_code == 400 or response.status_code == 423:
- raise MalformedError(f'Failed to delete view: service rejected malformed payload')
- if response.status_code == 403 or response.status_code == 405:
+ if response.status_code == 400:
+ raise MalformedError(f'Failed to delete view: {response.text}')
+ if response.status_code == 403:
raise ForbiddenError(f'Failed to delete view: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to delete view: not found')
- raise ResponseCodeError(f'Failed to delete view: response code: {response.status_code} is not 202 (ACCEPTED)')
+ if response.status_code == 423:
+ raise ExternalSystemError(f'Failed to delete view: mapped invalid delete query')
+ if response.status_code == 502:
+ raise ServiceConnectionError(f'Failed to delete view: failed to establish connection to search service')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to delete view: failed to save in search service')
+ raise ResponseCodeError(f'Failed to delete view: response code: {response.status_code} is not '
+ f'202 (ACCEPTED): {response.text}')
def get_view_data(self, database_id: int, view_id: int, page: int = 0, size: int = 10,
df: bool = False) -> Result | DataFrame:
@@ -655,9 +971,12 @@ class RestClient:
:returns: The result of the view query, if successful.
- :raises ResponseCodeError: If something went wrong with the retrieval.
- :raises ForbiddenError: If the action is not allowed.
+ :raises MalformedError: If the payload is rejected by the service.
+ :raises ForbiddenError: If something went wrong with the authorization.
:raises NotExistsError: If the view does not exist.
+ :raises ExternalSystemError: If the mapped view selection query is erroneous.
+ :raises ServiceError: If something went wrong with obtaining the information in the metadata service.
+ :raises ResponseCodeError: If something went wrong with the retrieval.
"""
url = f'/api/database/{database_id}/view/{view_id}/data'
params = []
@@ -672,12 +991,18 @@ class RestClient:
return DataFrame.from_records(res.result)
return res
if response.status_code == 400:
- raise MalformedError(f'Failed to get view data: service rejected malformed payload')
+ raise MalformedError(f'Failed to get view data: {response.text}')
if response.status_code == 403:
raise ForbiddenError(f'Failed to get view data: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to get view data: not found')
- raise ResponseCodeError(f'Failed to get view data: response code: {response.status_code} is not 200 (OK)')
+ if response.status_code == 409:
+ raise ExternalSystemError(f'Failed to get view data: mapping failed: {response.text}')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to get view data: data service failed to establish connection to '
+ f'metadata service')
+ raise ResponseCodeError(f'Failed to get view data: response code: {response.status_code} is not '
+ f'200 (OK):{response.text}')
def get_views_metadata(self, database_id: int) -> Database:
"""
@@ -685,9 +1010,9 @@ class RestClient:
:param database_id: The database id.
- :raises ResponseCodeError: If something went wrong with the retrieval.
- :raises ForbiddenError: If the action is not allowed.
+ :raises ForbiddenError: If something went wrong with the authorization.
:raises NotExistsError: If the container does not exist.
+ :raises ResponseCodeError: If something went wrong with the retrieval.
"""
url = f'/api/database/{database_id}/metadata/view'
response = self._wrapper(method="put", url=url, force_auth=True)
@@ -698,7 +1023,8 @@ class RestClient:
raise ForbiddenError(f'Failed to get views metadata: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to get views metadata: not found')
- raise ResponseCodeError(f'Failed to get views metadata: response code: {response.status_code} is not 200 (OK)')
+ raise ResponseCodeError(f'Failed to get views metadata: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
def get_table_data(self, database_id: int, table_id: int, page: int = 0, size: int = 10,
timestamp: datetime.datetime = None, df: bool = False) -> Result | DataFrame:
@@ -714,10 +1040,11 @@ class RestClient:
:returns: The result of the view query, if successful.
- :raises ResponseCodeError: If something went wrong with the retrieval.
- :raises ForbiddenError: If the action is not allowed.
+ :raises MalformedError: If the payload is rejected by the service.
+ :raises ForbiddenError: If something went wrong with the authorization.
:raises NotExistsError: If the table does not exist.
- :raises QueryStoreError: If the result set could not be counted.
+ :raises ServiceError: If something went wrong with obtaining the information in the metadata service.
+ :raises ResponseCodeError: If something went wrong with the retrieval.
"""
url = f'/api/database/{database_id}/table/{table_id}/data'
params = []
@@ -734,14 +1061,16 @@ class RestClient:
return DataFrame.from_records(res.result)
return res
if response.status_code == 400:
- raise MalformedError(f'Failed to get table data: service rejected malformed payload')
+ raise MalformedError(f'Failed to get table data: {response.text}')
if response.status_code == 403:
raise ForbiddenError(f'Failed to get table data: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to get table data: not found')
- if response.status_code == 409:
- raise QueryStoreError(f'Failed to get table data: service rejected result count')
- raise ResponseCodeError(f'Failed to get table data: response code: {response.status_code} is not 200 (OK)')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to get table data: data service failed to establish connection to '
+ f'metadata service')
+ raise ResponseCodeError(f'Failed to get table data: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
def create_table_data(self, database_id: int, table_id: int, data: dict) -> None:
"""
@@ -751,35 +1080,39 @@ class RestClient:
:param table_id: The table id.
:param data: The data dictionary to be inserted into the table with the form column=value of the table.
- :raises ResponseCodeError: If something went wrong with the insert.
- :raises ForbiddenError: If the action is not allowed.
+ :raises MalformedError: If the payload is rejected by the service (e.g. LOB could not be imported).
+ :raises ForbiddenError: If something went wrong with the authorization.
:raises NotExistsError: If the table does not exist.
- :raises MalformedError: If the payload is rejected by the service (e.g. LOB data could not be imported).
+ :raises ServiceError: If something went wrong with obtaining the information in the metadata service.
+ :raises ResponseCodeError: If something went wrong with the insert.
"""
url = f'/api/database/{database_id}/table/{table_id}/data'
response = self._wrapper(method="post", url=url, force_auth=True, payload=CreateData(data=data))
if response.status_code == 201:
return
- if response.status_code == 400 or response.status_code == 410:
- raise MalformedError(f'Failed to insert table data: service rejected malformed payload')
+ if response.status_code == 400:
+ raise MalformedError(f'Failed to insert table data: {response.text}')
if response.status_code == 403:
raise ForbiddenError(f'Failed to insert table data: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to insert table data: not found')
- raise ResponseCodeError(
- f'Failed to insert table data: response code: {response.status_code} is not 201 (CREATED)')
+ if response.status_code == 503:
+ raise ServiceError(
+ f'Failed to insert table data: data service failed to establish connection to metadata service')
+ raise ResponseCodeError(f'Failed to insert table data: response code: {response.status_code} is not '
+ f'201 (CREATED): {response.text}')
- def import_table_data(self, database_id: int, table_id: int, separator: str, file_path: str,
- quote: str = None, skip_lines: int = 0, false_encoding: str = None,
- true_encoding: str = None, null_encoding: str = None,
- line_encoding: str = "\r\n") -> None:
+ def import_table_data(self, database_id: int, table_id: int, file_name_or_data_frame: str | DataFrame,
+ separator: str = None, quote: str = None, skip_lines: int = 0,
+ false_encoding: str = None, true_encoding: str = None, null_encoding: str = None,
+ line_encoding: str = "\n") -> None:
"""
Import a csv dataset from a file into a table in a database with given database id and table id.
:param database_id: The database id.
:param table_id: The table id.
- :param separator: The csv column separator.
- :param file_path: The path of the file that is imported on the storage service.
+ :param file_name_or_data_frame: The path of the file that is imported on the storage service or pandas dataframe.
+ :param separator: The csv column separator. Optional.
:param quote: The column data quotation character. Optional.
:param skip_lines: The number of lines to skip. Optional. Default: 0.
:param false_encoding: The encoding of boolean false. Optional.
@@ -787,12 +1120,19 @@ class RestClient:
:param null_encoding: The encoding of null. Optional.
:param line_encoding: The encoding of the line termination. Optional. Default: CR (Windows).
- :raises ResponseCodeError: If something went wrong with the insert.
- :raises ForbiddenError: If the action is not allowed.
+ :raises MalformedError: If the payload is rejected by the service (e.g. LOB could not be imported).
+ :raises ForbiddenError: If something went wrong with the authorization.
:raises NotExistsError: If the table does not exist.
- :raises MalformedError: If the payload is rejected by the service (e.g. LOB data could not be imported).
+ :raises ServiceError: If something went wrong with obtaining the information in the metadata service.
+ :raises ResponseCodeError: If something went wrong with the insert.
"""
client = UploadClient(endpoint=f"{self.endpoint}/api/upload/files")
+ if type(file_name_or_data_frame) is DataFrame:
+ file_path: str = f"./tmp-{time.time()}"
+ df: DataFrame = file_name_or_data_frame
+ df.to_csv(path_or_buf=file_path, index=False, header=False)
+ else:
+ file_path: str = file_name_or_data_frame
filename = client.upload(file_path=file_path)
url = f'/api/database/{database_id}/table/{table_id}/data/import'
response = self._wrapper(method="post", url=url, force_auth=True,
@@ -803,15 +1143,16 @@ class RestClient:
if response.status_code == 202:
return
if response.status_code == 400:
- raise MalformedError(f'Failed to import table data: service rejected malformed payload')
+ raise MalformedError(f'Failed to import table data: {response.text}')
if response.status_code == 403:
raise ForbiddenError(f'Failed to import table data: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to import table data: not found')
- if response.status_code == 409 or response.status_code == 422:
- raise ExternalSystemError(f'Failed to import table data: sidecar rejected the import')
- raise ResponseCodeError(
- f'Failed to import table data: response code: {response.status_code} is not 202 (ACCEPTED)')
+ if response.status_code == 503:
+ raise ServiceError(
+ f'Failed to insert table data: data service failed to establish connection to metadata service')
+ raise ResponseCodeError(f'Failed to import table data: response code: {response.status_code} is not '
+ f'202 (ACCEPTED): {response.text}')
def analyse_datatypes(self, file_path: str, separator: str, enum: bool = None,
enum_tol: int = None, upload: bool = True) -> DatatypeAnalysis:
@@ -827,9 +1168,9 @@ class RestClient:
:returns: The determined data types, if successful.
- :raises ResponseCodeError: If something went wrong with the analysis.
:raises MalformedError: If the payload is rejected by the service.
:raises NotExistsError: If the file was not found by the Analyse Service.
+ :raises ResponseCodeError: If something went wrong with the analysis.
"""
if upload:
client = UploadClient(endpoint=f"{self.endpoint}/api/upload/files")
@@ -847,12 +1188,12 @@ class RestClient:
if response.status_code == 202:
body = response.json()
return DatatypeAnalysis.model_validate(body)
- if response.status_code == 400 or response.status_code == 500:
- raise MalformedError(f'Failed to analyse data types: service rejected malformed payload')
+ if response.status_code == 400:
+ raise MalformedError(f'Failed to analyse data types: {response.text}')
if response.status_code == 404:
- raise NotExistsError(f'Failed to analyse data types: failed to find file in Storage Service')
- raise ResponseCodeError(
- f'Failed to analyse data types: response code: {response.status_code} is not 202 (ACCEPTED)')
+ raise NotExistsError(f'Failed to analyse data types: failed to find file in storage service')
+ raise ResponseCodeError(f'Failed to analyse data types: response code: {response.status_code} is not '
+ f'202 (ACCEPTED): {response.text}')
def analyse_keys(self, file_path: str, separator: str, upload: bool = True) -> KeyAnalysis:
"""
@@ -865,9 +1206,9 @@ class RestClient:
:returns: The determined ranking of the primary key candidates, if successful.
- :raises ResponseCodeError: If something went wrong with the analysis.
:raises MalformedError: If the payload is rejected by the service.
:raises NotExistsError: If the file was not found by the Analyse Service.
+ :raises ResponseCodeError: If something went wrong with the analysis.
"""
if upload:
client = UploadClient(endpoint=f"{self.endpoint}/api/upload/files")
@@ -883,12 +1224,12 @@ class RestClient:
if response.status_code == 202:
body = response.json()
return KeyAnalysis.model_validate(body)
- if response.status_code == 400 or response.status_code == 500:
- raise MalformedError(f'Failed to analyse data types: service rejected malformed payload')
+ if response.status_code == 400:
+ raise MalformedError(f'Failed to analyse data keys: {response.text}')
if response.status_code == 404:
- raise NotExistsError(f'Failed to analyse data types: failed to find file in Storage Service')
- raise ResponseCodeError(
- f'Failed to analyse data types: response code: {response.status_code} is not 202 (ACCEPTED)')
+ raise NotExistsError(f'Failed to analyse data keys: failed to find file in Storage Service')
+ raise ResponseCodeError(f'Failed to analyse data types: response code: {response.status_code} is not '
+ f'202 (ACCEPTED): {response.text}')
def analyse_table_statistics(self, database_id: int, table_id: int) -> TableStatistics:
"""
@@ -899,9 +1240,11 @@ class RestClient:
:returns: The table statistics, if successful.
- :raises ResponseCodeError: If something went wrong with the analysis.
:raises MalformedError: If the payload is rejected by the service.
:raises NotExistsError: If the file was not found by the Analyse Service.
+ :raises ServiceConnectionError: If something went wrong with connection to the metadata service.
+ :raises ServiceError: If something went wrong with obtaining the information in the search service.
+ :raises ResponseCodeError: If something went wrong with the analysis.
"""
url = f'/api/analyse/database/{database_id}/table/{table_id}/statistics'
response = self._wrapper(method="get", url=url)
@@ -909,11 +1252,16 @@ class RestClient:
body = response.json()
return TableStatistics.model_validate(body)
if response.status_code == 400:
- raise MalformedError(f'Failed to analyse table statistics: service rejected malformed payload')
+ raise MalformedError(f'Failed to analyse table statistics: {response.text}')
if response.status_code == 404:
raise NotExistsError(f'Failed to analyse table statistics: separator error')
- raise ResponseCodeError(
- f'Failed to analyse table statistics: response code: {response.status_code} is not 202 (ACCEPTED)')
+ if response.status_code == 502:
+ raise NotExistsError(
+ f'Failed to analyse table statistics: data service failed to establish connection to metadata service')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to analyse table statistics: failed to save statistic in search service')
+ raise ResponseCodeError(f'Failed to analyse table statistics: response code: {response.status_code} is not '
+ f'202 (ACCEPTED): {response.text}')
def update_table_data(self, database_id: int, table_id: int, data: dict, keys: dict) -> None:
"""
@@ -924,23 +1272,27 @@ class RestClient:
:param data: The data dictionary to be updated into the table with the form column=value of the table.
:param keys: The key dictionary matching the rows in the form column=value.
- :raises ResponseCodeError: If something went wrong with the update.
- :raises ForbiddenError: If the action is not allowed.
- :raises NotExistsError: If the table does not exist.
:raises MalformedError: If the payload is rejected by the service (e.g. LOB data could not be imported).
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the table does not exist.
+ :raises ServiceError: If something went wrong with obtaining the information in the metadata service.
+ :raises ResponseCodeError: If something went wrong with the update.
"""
url = f'/api/database/{database_id}/table/{table_id}/data'
response = self._wrapper(method="put", url=url, force_auth=True, payload=UpdateData(data=data, keys=keys))
if response.status_code == 202:
return
- if response.status_code == 400 or response.status_code == 410:
- raise MalformedError(f'Failed to update table data: service rejected malformed payload')
+ if response.status_code == 400:
+ raise MalformedError(f'Failed to update table data: {response.text}')
if response.status_code == 403:
raise ForbiddenError(f'Failed to update table data: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to update table data: not found')
- raise ResponseCodeError(
- f'Failed to update table data: response code: {response.status_code} is not 202 (ACCEPTED)')
+ if response.status_code == 503:
+ raise ServiceError(
+ f'Failed to update table data: data service failed to establish connection to metadata service')
+ raise ResponseCodeError(f'Failed to update table data: response code: {response.status_code} is not '
+ f'202 (ACCEPTED): {response.text}')
def delete_table_data(self, database_id: int, table_id: int, keys: dict) -> None:
"""
@@ -950,23 +1302,27 @@ class RestClient:
:param table_id: The table id.
:param keys: The key dictionary matching the rows in the form column=value.
- :raises ResponseCodeError: If something went wrong with the deletion.
- :raises ForbiddenError: If the action is not allowed.
- :raises NotExistsError: If the table does not exist.
:raises MalformedError: If the payload is rejected by the service.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the table does not exist.
+ :raises ServiceError: If something went wrong with obtaining the information in the metadata service.
+ :raises ResponseCodeError: If something went wrong with the deletion.
"""
url = f'/api/database/{database_id}/table/{table_id}/data'
response = self._wrapper(method="delete", url=url, force_auth=True, payload=DeleteData(keys=keys))
if response.status_code == 202:
return
if response.status_code == 400:
- raise MalformedError(f'Failed to delete table data: service rejected malformed payload')
+ raise MalformedError(f'Failed to delete table data: {response.text}')
if response.status_code == 403:
raise ForbiddenError(f'Failed to delete table data: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to delete table data: not found')
- raise ResponseCodeError(
- f'Failed to delete table data: response code: {response.status_code} is not 202 (ACCEPTED)')
+ if response.status_code == 503:
+ raise ServiceError(
+ f'Failed to update table data: data service failed to establish connection to metadata service')
+ raise ResponseCodeError(f'Failed to delete table data: response code: {response.status_code} is not '
+ f'202 (ACCEPTED): {response.text}')
def get_table_data_count(self, database_id: int, table_id: int, page: int = 0, size: int = 10,
timestamp: datetime.datetime = None) -> int:
@@ -981,10 +1337,12 @@ class RestClient:
:returns: The result of the view query, if successful.
- :raises ResponseCodeError: If something went wrong with the retrieval.
- :raises ForbiddenError: If the action is not allowed.
+ :raises MalformedError: If the payload is rejected by the service.
+ :raises ForbiddenError: If something went wrong with the authorization.
:raises NotExistsError: If the table does not exist.
- :raises QueryStoreError: If the result set could not be counted.
+ :raises ExternalSystemError: If the mapped view selection query is erroneous.
+ :raises ServiceError: If something went wrong with obtaining the information in the metadata service.
+ :raises ResponseCodeError: If something went wrong with the retrieval.
"""
url = f'/api/database/{database_id}/table/{table_id}/data'
if page is not None and size is not None:
@@ -999,14 +1357,18 @@ class RestClient:
if response.status_code == 200:
return int(response.headers.get('X-Count'))
if response.status_code == 400:
- raise MalformedError(f'Failed to get table data: service rejected malformed payload')
+ raise MalformedError(f'Failed to count table data: {response.text}')
if response.status_code == 403:
- raise ForbiddenError(f'Failed to get table data: not allowed')
+ raise ForbiddenError(f'Failed to count table data: not allowed')
if response.status_code == 404:
- raise NotExistsError(f'Failed to get table data: not found')
+ raise NotExistsError(f'Failed to count table data: not found')
if response.status_code == 409:
- raise QueryStoreError(f'Failed to get table data: service rejected result count')
- raise ResponseCodeError(f'Failed to get table data: response code: {response.status_code} is not 200 (OK)')
+ raise ExternalSystemError(f'Failed to count table data: mapping failed: {response.text}')
+ if response.status_code == 503:
+ raise ServiceError(
+ f'Failed to count table data: data service failed to establish connection to metadata service')
+ raise ResponseCodeError(f'Failed to count table data: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
def get_view_data_count(self, database_id: int, view_id: int) -> int:
"""
@@ -1017,22 +1379,30 @@ class RestClient:
:returns: The result count of the view query, if successful.
- :raises ResponseCodeError: If something went wrong with the retrieval.
:raises MalformedError: If the payload is rejected by the service.
- :raises ForbiddenError: If the action is not allowed.
- :raises NotExistsError: If thecontainer does not exist.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the view does not exist.
+ :raises ExternalSystemError: If the mapped view selection query is erroneous.
+ :raises ServiceError: If something went wrong with obtaining the information in the metadata service.
+ :raises ResponseCodeError: If something went wrong with the retrieval.
"""
url = f'/api/database/{database_id}/view/{view_id}/data'
response = self._wrapper(method="head", url=url)
if response.status_code == 200:
return int(response.headers.get('X-Count'))
if response.status_code == 400:
- raise MalformedError(f'Failed to get view data count: service rejected malformed payload')
+ raise MalformedError(f'Failed to count view data: {response.text}')
if response.status_code == 403:
- raise ForbiddenError(f'Failed to get view data count: not allowed')
+ raise ForbiddenError(f'Failed to count view data: not allowed')
if response.status_code == 404:
- raise NotExistsError(f'Failed to get view data count: not found')
- raise ResponseCodeError(f'Failed to get view data count: response code: {response.status_code} is not 200 (OK)')
+ raise NotExistsError(f'Failed to count view data: not found')
+ if response.status_code == 409:
+ raise ExternalSystemError(f'Failed to count view data: mapping failed: {response.text}')
+ if response.status_code == 503:
+ raise ServiceError(
+ f'Failed to count view data: data service failed to establish connection to metadata service')
+ raise ResponseCodeError(f'Failed to count view data: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
def get_database_access(self, database_id: int) -> AccessType:
"""
@@ -1042,9 +1412,9 @@ class RestClient:
:returns: The access type, if successful.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the container does not exist.
:raises ResponseCodeError: If something went wrong with the retrieval.
- :raises ForbiddenError: If the action is not allowed.
- :raises NotExistsError: If thecontainer does not exist.
"""
url = f'/api/database/{database_id}/access'
response = self._wrapper(method="get", url=url)
@@ -1055,7 +1425,31 @@ class RestClient:
raise ForbiddenError(f'Failed to get database access: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to get database access: not found')
- raise ResponseCodeError(f'Failed to get database access: response code: {response.status_code} is not 200 (OK)')
+ raise ResponseCodeError(f'Failed to get database access: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
+
+ def check_database_access(self, database_id: int) -> bool:
+ """
+ Checks access of a view in a database with given database id and view id.
+
+ :param database_id: The database id.
+
+ :returns: The access type, if successful.
+
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the container does not exist.
+ :raises ResponseCodeError: If something went wrong with the retrieval.
+ """
+ url = f'/api/database/{database_id}/access'
+ response = self._wrapper(method="get", url=url)
+ if response.status_code == 200:
+ return True
+ if response.status_code == 403:
+ return False
+ if response.status_code == 404:
+ raise NotExistsError(f'Failed to check database access: not found')
+ raise ResponseCodeError(f'Failed to check database access: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
def create_database_access(self, database_id: int, user_id: str, type: AccessType) -> AccessType:
"""
@@ -1067,10 +1461,12 @@ class RestClient:
:returns: The access type, if successful.
- :raises ResponseCodeError: If something went wrong with the retrieval.
:raises MalformedError: If the payload is rejected by the service.
- :raises ForbiddenError: If the action is not allowed.
- :raises NotExistsError: If thedatabase or user does not exist.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the database or user does not exist.
+ :raises ServiceConnectionError: If something went wrong with connection to the data service.
+ :raises ServiceError: If something went wrong with obtaining the information in the data service.
+ :raises ResponseCodeError: If something went wrong with the retrieval.
"""
url = f'/api/database/{database_id}/access/{user_id}'
response = self._wrapper(method="post", url=url, force_auth=True, payload=CreateAccess(type=type))
@@ -1078,13 +1474,18 @@ class RestClient:
body = response.json()
return DatabaseAccess.model_validate(body).type
if response.status_code == 400:
- raise MalformedError(f'Failed to create database access: service rejected malformed payload')
- if response.status_code == 403 or response.status_code == 405:
+ raise MalformedError(f'Failed to create database access: {response.text}')
+ if response.status_code == 403:
raise ForbiddenError(f'Failed to create database access: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to create database access: not found')
- raise ResponseCodeError(
- f'Failed to create database access: response code: {response.status_code} is not 202 (ACCEPTED)')
+ if response.status_code == 502:
+ raise ServiceConnectionError(
+ f'Failed to create database access: failed to establish connection to data service')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to create database access: failed to create access in data service')
+ raise ResponseCodeError(f'Failed to create database access: response code: {response.status_code} is not '
+ f'202 (ACCEPTED): {response.text}')
def update_database_access(self, database_id: int, user_id: str, type: AccessType) -> AccessType:
"""
@@ -1096,10 +1497,12 @@ class RestClient:
:returns: The access type, if successful.
- :raises ResponseCodeError: If something went wrong with the retrieval.
:raises MalformedError: If the payload is rejected by the service.
- :raises ForbiddenError: If the action is not allowed.
- :raises NotExistsError: If thedatabase or user does not exist.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the database or user does not exist.
+ :raises ServiceConnectionError: If something went wrong with connection to the data service.
+ :raises ServiceError: If something went wrong with obtaining the information in the data service.
+ :raises ResponseCodeError: If something went wrong with the retrieval.
"""
url = f'/api/database/{database_id}/access/{user_id}'
response = self._wrapper(method="put", url=url, force_auth=True, payload=UpdateAccess(type=type))
@@ -1107,13 +1510,18 @@ class RestClient:
body = response.json()
return DatabaseAccess.model_validate(body).type
if response.status_code == 400:
- raise MalformedError(f'Failed to update database access: service rejected malformed payload')
- if response.status_code == 403 or response.status_code == 405:
+ raise MalformedError(f'Failed to update database access: {response.text}')
+ if response.status_code == 403:
raise ForbiddenError(f'Failed to update database access: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to update database access: not found')
- raise ResponseCodeError(
- f'Failed to update database access: response code: {response.status_code} is not 202 (ACCEPTED)')
+ if response.status_code == 502:
+ raise ServiceConnectionError(
+ f'Failed to update database access: failed to establish connection to data service')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to update database access: failed to update access in data service')
+ raise ResponseCodeError(f'Failed to update database access: response code: {response.status_code} is not '
+ f'202 (ACCEPTED): {response.text}')
def delete_database_access(self, database_id: int, user_id: str) -> None:
"""
@@ -1122,26 +1530,33 @@ class RestClient:
:param database_id: The database id.
:param user_id: The user id.
- :raises ResponseCodeError: If something went wrong with the retrieval.
:raises MalformedError: If the payload is rejected by the service.
- :raises ForbiddenError: If the action is not allowed.
- :raises NotExistsError: If thedatabase or user does not exist.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the database or user does not exist.
+ :raises ServiceConnectionError: If something went wrong with connection to the data service.
+ :raises ServiceError: If something went wrong with obtaining the information in the data service.
+ :raises ResponseCodeError: If something went wrong with the retrieval.
"""
url = f'/api/database/{database_id}/access/{user_id}'
response = self._wrapper(method="delete", url=url, force_auth=True)
if response.status_code == 202:
return
if response.status_code == 400:
- raise MalformedError(f'Failed to delete database access: service rejected malformed payload')
- if response.status_code == 403 or response.status_code == 405:
+ raise MalformedError(f'Failed to delete database access: {response.text}')
+ if response.status_code == 403:
raise ForbiddenError(f'Failed to delete database access: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to delete database access: not found')
- raise ResponseCodeError(
- f'Failed to delete database access: response code: {response.status_code} is not 201 (CREATED)')
+ if response.status_code == 502:
+ raise ServiceConnectionError(
+ f'Failed to delete database access: failed to establish connection to data service')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to delete database access: failed to delete access in data service')
+ raise ResponseCodeError(f'Failed to delete database access: response code: {response.status_code} is not '
+ f'201 (CREATED): {response.text}')
- def execute_query(self, database_id: int, query: str, page: int = 0, size: int = 10,
- timestamp: datetime.datetime = datetime.datetime.now()) -> Result:
+ def create_subset(self, database_id: int, query: str, page: int = 0, size: int = 10,
+ df: bool = False) -> Result | DataFrame:
"""
Executes a SQL query in a database where the current user has at least read access with given database id. The
result set can be paginated with setting page and size (both). Historic data can be queried by setting
@@ -1151,45 +1566,51 @@ class RestClient:
:param query: The query statement.
:param page: The result pagination number. Optional. Default: 0.
:param size: The result pagination size. Optional. Default: 10.
- :param timestamp: The query execution time. Optional.
+ :param df: If true, the result is returned as Pandas DataFrame. Optional. Default: False.
:returns: The result set, if successful.
- :raises ResponseCodeError: If something went wrong with the retrieval.
:raises MalformedError: If the payload is rejected by the service.
- :raises ForbiddenError: If the action is not allowed.
+ :raises ForbiddenError: If something went wrong with the authorization.
:raises NotExistsError: If the database, table or user does not exist.
:raises QueryStoreError: The query store rejected the query.
- :raises MetadataConsistencyError: The service failed to parse columns from the metadata database.
+ :raises FormatNotAvailable: The subset query contains non-supported keywords.
+ :raises ServiceError: If something went wrong with obtaining the information in the data service.
+ :raises ResponseCodeError: If something went wrong with the retrieval.
"""
url = f'/api/database/{database_id}/subset'
if page is not None and size is not None:
url += f'?page={page}&size={size}'
- response = self._wrapper(method="post", url=url, force_auth=True,
- payload=ExecuteQuery(statement=query, timestamp=timestamp))
+ response = self._wrapper(method="post", url=url, force_auth=True, headers={"Accept": "application/json"},
+ payload=ExecuteQuery(statement=query))
if response.status_code == 201:
body = response.json()
- return Result.model_validate(body)
+ res = Result.model_validate(body)
+ if df:
+ return DataFrame.from_records(res.result)
+ return res
if response.status_code == 400:
- raise MalformedError(f'Failed to execute query: service rejected malformed payload')
+ raise MalformedError(f'Failed to create subset: {response.text}')
if response.status_code == 403:
- raise ForbiddenError(f'Failed to execute query: not allowed')
+ raise ForbiddenError(f'Failed to create subset: not allowed')
if response.status_code == 404:
- raise NotExistsError(f'Failed to execute query: not found')
- if response.status_code == 409:
- raise QueryStoreError(f'Failed to execute query: query store rejected query')
+ raise NotExistsError(f'Failed to create subset: not found')
if response.status_code == 417:
- raise MetadataConsistencyError(f'Failed to execute query: service expected other metadata')
- raise ResponseCodeError(
- f'Failed to execute query: response code: {response.status_code} is not 202 (ACCEPTED)')
+ raise QueryStoreError(f'Failed to create subset: query store rejected query')
+ if response.status_code == 501:
+ raise FormatNotAvailable(f'Failed to create subset: contains non-supported keywords: {response.text}')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to create subset: failed to establish connection with data database')
+ raise ResponseCodeError(f'Failed to create subset: response code: {response.status_code} is not '
+ f'201 (CREATED): {response.text}')
- def get_query_data(self, database_id: int, query_id: int, page: int = 0, size: int = 10,
- df: bool = False) -> Result | DataFrame:
+ def get_subset_data(self, database_id: int, subset_id: int, page: int = 0, size: int = 10,
+ df: bool = False) -> Result | DataFrame:
"""
Re-executes a query in a database with given database id and query id.
:param database_id: The database id.
- :param query_id: The query id.
+ :param subset_id: The subset id.
:param page: The result pagination number. Optional. Default: 0.
:param size: The result pagination size. Optional. Default: 10.
:param size: The result pagination size. Optional. Default: 10.
@@ -1197,15 +1618,14 @@ class RestClient:
:returns: The result set, if successful.
- :raises ResponseCodeError: If something went wrong with the retrieval.
:raises MalformedError: If the payload is rejected by the service.
- :raises ForbiddenError: If the action is not allowed.
+ :raises ForbiddenError: If something went wrong with the authorization.
:raises NotExistsError: If the database, query or user does not exist.
- :raises QueryStoreError: The query store rejected the query.
- :raises MetadataConsistencyError: The service failed to parse columns from the metadata database.
+ :raises ServiceError: If something went wrong with obtaining the information in the data service.
+ :raises ResponseCodeError: If something went wrong with the retrieval.
"""
headers = {}
- url = f'/api/database/{database_id}/subset/{query_id}/data'
+ url = f'/api/database/{database_id}/subset/{subset_id}/data'
if page is not None and size is not None:
url += f'?page={page}&size={size}'
response = self._wrapper(method="get", url=url, headers=headers)
@@ -1216,85 +1636,80 @@ class RestClient:
return DataFrame.from_records(res.result)
return res
if response.status_code == 400:
- raise MalformedError(f'Failed to re-execute query: service rejected malformed payload')
- if response.status_code == 403 or response.status_code == 405:
- raise ForbiddenError(f'Failed to re-execute query: not allowed')
+ raise MalformedError(f'Failed to get query data: {response.text}')
+ if response.status_code == 403:
+ raise ForbiddenError(f'Failed to get query data: not allowed')
if response.status_code == 404:
- raise NotExistsError(f'Failed to re-execute query: not found')
- if response.status_code == 409:
- raise QueryStoreError(f'Failed to re-execute query: query store rejected query')
- if response.status_code == 417:
- raise MetadataConsistencyError(f'Failed to re-execute query: service expected other metadata')
- raise ResponseCodeError(
- f'Failed to re-execute query: response code: {response.status_code} is not 200 (OK)')
+ raise NotExistsError(f'Failed to get query data: not found')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to get query data: failed to establish connection with data database')
+ raise ResponseCodeError(f'Failed to get query data: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
- def get_query_data_count(self, database_id: int, query_id: int, page: int = 0, size: int = 10) -> int:
+ def get_subset_data_count(self, database_id: int, subset_id: int, page: int = 0, size: int = 10) -> int:
"""
Re-executes a query in a database with given database id and query id and only counts the results.
:param database_id: The database id.
- :param query_id: The query id.
+ :param subset_id: The subset id.
:param page: The result pagination number. Optional. Default: 0.
:param size: The result pagination size. Optional. Default: 10.
:returns: The result set, if successful.
- :raises ResponseCodeError: If something went wrong with the retrieval.
:raises MalformedError: If the payload is rejected by the service.
- :raises ForbiddenError: If the action is not allowed.
+ :raises ForbiddenError: If something went wrong with the authorization.
:raises NotExistsError: If the database, query or user does not exist.
- :raises QueryStoreError: The query store rejected the query.
- :raises MetadataConsistencyError: The service failed to parse columns from the metadata database.
+ :raises ServiceError: If something went wrong with obtaining the information in the data service.
+ :raises ResponseCodeError: If something went wrong with the retrieval.
"""
- url = f'/api/database/{database_id}/subset/{query_id}/data'
+ url = f'/api/database/{database_id}/subset/{subset_id}/data'
if page is not None and size is not None:
url += f'?page={page}&size={size}'
response = self._wrapper(method="head", url=url)
if response.status_code == 200:
return int(response.headers.get('X-Count'))
if response.status_code == 400:
- raise MalformedError(f'Failed to re-execute query: service rejected malformed payload')
- if response.status_code == 403 or response.status_code == 405:
- raise ForbiddenError(f'Failed to re-execute query: not allowed')
+ raise MalformedError(f'Failed to get query count: {response.text}')
+ if response.status_code == 403:
+ raise ForbiddenError(f'Failed to get query count: not allowed')
if response.status_code == 404:
- raise NotExistsError(f'Failed to re-execute query: not found')
- if response.status_code == 409:
- raise QueryStoreError(f'Failed to re-execute query: query store rejected query')
- if response.status_code == 417:
- raise MetadataConsistencyError(f'Failed to re-execute query: service expected other metadata')
+ raise NotExistsError(f'Failed to get query count: not found')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to get query count: failed to establish connection with data database')
raise ResponseCodeError(
- f'Failed to re-execute query: response code: {response.status_code} is not 200 (OK)')
+ f'Failed to get query count: response code: {response.status_code} is not 200 (OK)')
- def get_query(self, database_id: int, query_id: int) -> Query:
+ def get_subset(self, database_id: int, subset_id: int) -> Query:
"""
Get query from a database with given database id and query id.
:param database_id: The database id.
- :param query_id: The query id.
+ :param subset_id: The subset id.
:returns: The query, if successful.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the database, query or user does not exist.
+ :raises FormatNotAvailable: If the service could not represent the output.
+ :raises ServiceError: If something went wrong with obtaining the information in the data service.
:raises ResponseCodeError: If something went wrong with the retrieval.
- :raises ForbiddenError: If the action is not allowed.
- :raises NotExistsError: If thedatabase, query or user does not exist.
- :raises QueryStoreError: The query store rejected the query.
- :raises MetadataConsistencyError: The service failed to parse columns from the metadata database.
"""
- url = f'/api/database/{database_id}/subset/{query_id}'
+ url = f'/api/database/{database_id}/subset/{subset_id}'
response = self._wrapper(method="get", url=url)
if response.status_code == 200:
body = response.json()
return Query.model_validate(body)
+ if response.status_code == 403:
+ raise ForbiddenError(f'Failed to find subset: not allowed')
if response.status_code == 404:
- raise NotExistsError(f'Failed to find query: not found')
- if response.status_code == 403 or response.status_code == 405:
- raise ForbiddenError(f'Failed to find query: not allowed')
- if response.status_code == 417:
- raise MetadataConsistencyError(f'Failed to find query: service expected other metadata')
- if response.status_code == 501 or response.status_code == 503 or response.status_code == 504:
- raise QueryStoreError(f'Failed to find query: query store rejected query')
- raise ResponseCodeError(
- f'Failed to find query: response code: {response.status_code} is not 200 (OK)')
+ raise NotExistsError(f'Failed to find subset: not found')
+ if response.status_code == 406:
+ raise FormatNotAvailable(f'Failed to find subset: failed to provide acceptable representation')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to find subset: failed to establish connection with data database')
+ raise ResponseCodeError(f'Failed to find subset: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
def get_queries(self, database_id: int) -> List[Query]:
"""
@@ -1304,63 +1719,66 @@ class RestClient:
:returns: List of queries, if successful.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the database or user does not exist.
+ :raises ServiceError: If something went wrong with obtaining the information in the data service.
:raises ResponseCodeError: If something went wrong with the retrieval.
- :raises MalformedError: If the query is rejected by the service.
- :raises ForbiddenError: If the action is not allowed.
- :raises NotExistsError: If thedatabase or user does not exist.
- :raises QueryStoreError: The query store rejected the query.
"""
url = f'/api/database/{database_id}/subset'
response = self._wrapper(method="get", url=url)
if response.status_code == 200:
body = response.json()
return TypeAdapter(List[Query]).validate_python(body)
- if response.status_code == 403 or response.status_code == 405:
+ if response.status_code == 403:
raise ForbiddenError(f'Failed to find queries: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to find queries: not found')
- if response.status_code == 423:
- raise MalformedError(f'Failed to find queries: service rejected malformed query')
- if response.status_code == 501 or response.status_code == 503 or response.status_code == 504:
- raise QueryStoreError(f'Failed to find queries: query store rejected query')
- raise ResponseCodeError(
- f'Failed to find query: response code: {response.status_code} is not 200 (OK)')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to find queries: failed to establish connection with data database')
+ raise ResponseCodeError(f'Failed to find query: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
- def update_query(self, database_id: int, query_id: int, persist: bool) -> Query:
+ def update_subset(self, database_id: int, subset_id: int, persist: bool) -> Query:
"""
- Update query from a database with given database id and query id.
+ Save query or mark it for deletion (at a later time) in a database with given database id and query id.
:param database_id: The database id.
- :param query_id: The query id.
- :param persist: If set to true, the query will be saved and visible in the User Interface, otherwise the query \
- is marked for deletion in the future and not visible in the User Interface.
+ :param subset_id: The subset id.
+ :param persist: If set to true, the query will be saved and visible in the user interface, otherwise the query \
+ is marked for deletion in the future and not visible in the user interface.
:returns: The query, if successful.
- :raises ResponseCodeError: If something went wrong with the retrieval.
- :raises ForbiddenError: If the action is not allowed.
- :raises NotExistsError: If thedatabase or user does not exist.
+ :raises MalformedError: If the payload is rejected by the service.
+ :raises ForbiddenError: If something went wrong with the authorization.
+ :raises NotExistsError: If the database or user does not exist.
:raises QueryStoreError: The query store rejected the update.
+ :raises ServiceError: If something went wrong with obtaining the information in the data service.
+ :raises ResponseCodeError: If something went wrong with the retrieval.
"""
- url = f'/api/database/{database_id}/subset/{query_id}'
+ url = f'/api/database/{database_id}/subset/{subset_id}'
response = self._wrapper(method="put", url=url, force_auth=True, payload=UpdateQuery(persist=persist))
if response.status_code == 202:
body = response.json()
return Query.model_validate(body)
- if response.status_code == 403 or response.status_code == 405:
+ if response.status_code == 400:
+ raise MalformedError(f'Failed to update query: {response.text}')
+ if response.status_code == 403:
raise ForbiddenError(f'Failed to update query: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to update query: not found')
- if response.status_code == 412:
+ if response.status_code == 417:
raise QueryStoreError(f'Failed to update query: query store rejected update')
- raise ResponseCodeError(
- f'Failed to update query: response code: {response.status_code} is not 200 (OK)')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to update query: failed to establish connection with data database')
+ raise ResponseCodeError(f'Failed to update query: response code: {response.status_code} is not '
+ f'202 (ACCEPTED): {response.text}')
def create_identifier(self, database_id: int, type: IdentifierType, titles: List[CreateIdentifierTitle],
publisher: str, creators: List[CreateIdentifierCreator], publication_year: int,
descriptions: List[CreateIdentifierDescription] = None,
funders: List[CreateIdentifierFunder] = None, licenses: List[License] = None,
- language: Language = None, query_id: int = None, view_id: int = None, table_id: int = None,
+ language: Language = None, subset_id: int = None, view_id: int = None, table_id: int = None,
publication_day: int = None, publication_month: int = None,
related_identifiers: List[CreateRelatedIdentifier] = None) -> Identifier:
"""
@@ -1376,7 +1794,7 @@ class RestClient:
:param funders: The funders(s) of the created identifier. Optional.
:param licenses: The license(s) of the created identifier. Optional.
:param language: The language of the created identifier. Optional.
- :param query_id: The query id of the created identifier. Required when type=SUBSET, otherwise invalid. Optional.
+ :param subset_id: The subset id of the created identifier. Required when type=SUBSET, otherwise invalid. Optional.
:param view_id: The view id of the created identifier. Required when type=VIEW, otherwise invalid. Optional.
:param table_id: The table id of the created identifier. Required when type=TABLE, otherwise invalid. Optional.
:param publication_day: The publication day of the created identifier. Optional.
@@ -1385,16 +1803,17 @@ class RestClient:
:returns: The identifier, if successful.
- :raises ResponseCodeError: If something went wrong with the creation of the identifier.
- :raises ForbiddenError: If the action is not allowed.
:raises MalformedError: If the payload is rejected by the service.
+ :raises ForbiddenError: If something went wrong with the authorization.
:raises NotExistsError: If the database, table/view/subset or user does not exist.
- :raises ExternalSystemError: If the external system (DataCite) refused communication with the service.
+ :raises ServiceConnectionError: If something went wrong with connection to the search service.
+ :raises ServiceError: If something went wrong with obtaining the information in the search service.
+ :raises ResponseCodeError: If something went wrong with the creation of the identifier.
"""
url = f'/api/identifier'
payload = CreateIdentifier(database_id=database_id, type=type, titles=titles, publisher=publisher,
creators=creators, publication_year=publication_year, descriptions=descriptions,
- funders=funders, licenses=licenses, language=language, query_id=query_id,
+ funders=funders, licenses=licenses, language=language, subset_id=subset_id,
view_id=view_id, table_id=table_id, publication_day=publication_day,
publication_month=publication_month, related_identifiers=related_identifiers)
response = self._wrapper(method="post", url=url, force_auth=True, payload=payload)
@@ -1402,21 +1821,24 @@ class RestClient:
body = response.json()
return Identifier.model_validate(body)
if response.status_code == 400:
- raise MalformedError(f'Failed to create identifier: service rejected malformed payload')
- if response.status_code == 403 or response.status_code == 405:
+ raise MalformedError(f'Failed to create identifier: {response.text}')
+ if response.status_code == 403:
raise ForbiddenError(f'Failed to create identifier: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to create identifier: not found')
+ if response.status_code == 502:
+ raise ServiceConnectionError(
+ f'Failed to create identifier: failed to establish connection with search service')
if response.status_code == 503:
- raise ExternalSystemError(f'Failed to create identifier: external system rejected communication')
- raise ResponseCodeError(
- f'Failed to create identifier: response code: {response.status_code} is not 201 (CREATED)')
+ raise ServiceError(f'Failed to create identifier: failed to save in search service')
+ raise ResponseCodeError(f'Failed to create identifier: response code: {response.status_code} is not '
+ f'201 (CREATED): {response.text}')
def save_identifier(self, identifier_id: int, database_id: int, type: IdentifierType,
titles: List[CreateIdentifierTitle], publisher: str, creators: List[CreateIdentifierCreator],
publication_year: int, descriptions: List[CreateIdentifierDescription] = None,
funders: List[CreateIdentifierFunder] = None, licenses: List[License] = None,
- language: Language = None, query_id: int = None, view_id: int = None, table_id: int = None,
+ language: Language = None, subset_id: int = None, view_id: int = None, table_id: int = None,
publication_day: int = None, publication_month: int = None,
related_identifiers: List[CreateRelatedIdentifier] = None) -> Identifier:
"""
@@ -1433,7 +1855,7 @@ class RestClient:
:param funders: The funders(s) of the created identifier. Optional.
:param licenses: The license(s) of the created identifier. Optional.
:param language: The language of the created identifier. Optional.
- :param query_id: The query id of the created identifier. Required when type=SUBSET, otherwise invalid. Optional.
+ :param subset_id: The subset id of the created identifier. Required when type=SUBSET, otherwise invalid. Optional.
:param view_id: The view id of the created identifier. Required when type=VIEW, otherwise invalid. Optional.
:param table_id: The table id of the created identifier. Required when type=TABLE, otherwise invalid. Optional.
:param publication_day: The publication day of the created identifier. Optional.
@@ -1442,32 +1864,36 @@ class RestClient:
:returns: The identifier, if successful.
- :raises ResponseCodeError: If something went wrong with the creation of the identifier.
- :raises ForbiddenError: If the action is not allowed.
:raises MalformedError: If the payload is rejected by the service.
+ :raises ForbiddenError: If something went wrong with the authorization.
:raises NotExistsError: If the database, table/view/subset or user does not exist.
- :raises ExternalSystemError: If the external system (DataCite) refused communication with the service.
+ :raises ServiceConnectionError: If something went wrong with connection to the search service.
+ :raises ServiceError: If something went wrong with obtaining the information in the search service.
+ :raises ResponseCodeError: If something went wrong with the creation of the identifier.
"""
url = f'/api/identifier/{identifier_id}'
payload = CreateIdentifier(database_id=database_id, type=type, titles=titles, publisher=publisher,
creators=creators, publication_year=publication_year, descriptions=descriptions,
- funders=funders, licenses=licenses, language=language, query_id=query_id,
+ funders=funders, licenses=licenses, language=language, subset_id=subset_id,
view_id=view_id, table_id=table_id, publication_day=publication_day,
publication_month=publication_month, related_identifiers=related_identifiers)
response = self._wrapper(method="put", url=url, force_auth=True, payload=payload)
- if response.status_code == 201:
+ if response.status_code == 202:
body = response.json()
return Identifier.model_validate(body)
if response.status_code == 400:
- raise MalformedError(f'Failed to save identifier: service rejected malformed payload')
- if response.status_code == 403 or response.status_code == 405:
+ raise MalformedError(f'Failed to save identifier: {response.text}')
+ if response.status_code == 403:
raise ForbiddenError(f'Failed to save identifier: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to save identifier: not found')
+ if response.status_code == 502:
+ raise ServiceConnectionError(
+ f'Failed to save identifier: failed to establish connection with search service')
if response.status_code == 503:
- raise ExternalSystemError(f'Failed to save identifier: external system rejected communication')
- raise ResponseCodeError(
- f'Failed to save identifier: response code: {response.status_code} is not 202 (ACCEPTED)')
+ raise ServiceError(f'Failed to save identifier: failed to update in search service')
+ raise ResponseCodeError(f'Failed to save identifier: response code: {response.status_code} is not '
+ f'202 (ACCEPTED): {response.text}')
def publish_identifier(self, identifier_id: int) -> Identifier:
"""
@@ -1477,87 +1903,102 @@ class RestClient:
:returns: The identifier, if successful.
- :raises ResponseCodeError: If something went wrong with the creation of the identifier.
- :raises ForbiddenError: If the action is not allowed.
:raises MalformedError: If the payload is rejected by the service.
+ :raises ForbiddenError: If something went wrong with the authorization.
:raises NotExistsError: If the database, table/view/subset or user does not exist.
- :raises ExternalSystemError: If the external system (DataCite) refused communication with the service.
+ :raises ServiceConnectionError: If something went wrong with connection to the search service.
+ :raises ServiceError: If something went wrong with obtaining the information in the search service.
+ :raises ResponseCodeError: If something went wrong with the creation of the identifier.
"""
url = f'/api/identifier/{identifier_id}/publish'
response = self._wrapper(method="put", url=url, force_auth=True)
- if response.status_code == 201:
+ if response.status_code == 202:
body = response.json()
return Identifier.model_validate(body)
if response.status_code == 400:
- raise MalformedError(f'Failed to publish identifier: service rejected malformed payload')
- if response.status_code == 403 or response.status_code == 405:
+ raise MalformedError(f'Failed to publish identifier: {response.text}')
+ if response.status_code == 403:
raise ForbiddenError(f'Failed to publish identifier: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to publish identifier: not found')
+ if response.status_code == 502:
+ raise ServiceConnectionError(
+ f'Failed to publish identifier: failed to establish connection with search service')
if response.status_code == 503:
- raise ExternalSystemError(f'Failed to publish identifier: external system rejected communication')
- raise ResponseCodeError(
- f'Failed to publish identifier: response code: {response.status_code} is not 201 (CREATED)')
+ raise ServiceError(f'Failed to publish identifier: failed to update in search service')
+ raise ResponseCodeError(f'Failed to publish identifier: response code: {response.status_code} is not '
+ f'202 (ACCEPTED): {response.text}')
- def suggest_identifier(self, uri: str) -> Identifier:
+ def get_licenses(self) -> List[License]:
"""
- Suggest identifier metadata for a given identifier URI. Example: ROR, ORCID, ISNI, GND, DOI.
-
- :param uri: The identifier URI.
-
- :returns: The identifier, if successful.
+ Get list of licenses allowed.
- :raises ResponseCodeError: If something went wrong with the suggestion of the identifier.
- :raises NotExistsError: If no metadata can be found or the identifier type is not supported.
+ :returns: List of licenses, if successful.
"""
- url = f'/api/identifier?url={uri}'
+ url = f'/api/database/license'
response = self._wrapper(method="get", url=url)
if response.status_code == 200:
body = response.json()
- return Identifier.model_validate(body)
- if response.status_code == 404:
- raise NotExistsError(f'Failed to suggest identifier: not found or not supported')
- raise ResponseCodeError(f'Failed to suggest identifier: response code: {response.status_code} is not 200 (OK)')
+ return TypeAdapter(List[License]).validate_python(body)
+ raise ResponseCodeError(f'Failed to get licenses: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
- def get_licenses(self) -> List[License]:
+ def get_concepts(self) -> List[Concept]:
"""
- Get list of licenses allowed.
+ Get list of concepts known to the metadata database.
- :returns: List of licenses, if successful.
+ :returns: List of concepts, if successful.
"""
- url = f'/api/database/license'
+ url = f'/api/concept'
response = self._wrapper(method="get", url=url)
if response.status_code == 200:
body = response.json()
- return TypeAdapter(List[License]).validate_python(body)
- raise ResponseCodeError(f'Failed to get licenses: response code: {response.status_code} is not 200 (OK)')
+ return TypeAdapter(List[Concept]).validate_python(body)
+ raise ResponseCodeError(f'Failed to get concepts: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
- def get_identifiers(self, ld: bool = False) -> List[Identifier] | str:
+ def get_identifiers(self, database_id: int = None, subset_id: int = None, view_id: int = None,
+ table_id: int = None) -> List[Identifier] | str:
"""
- Get list of identifiers.
+ Get list of identifiers, filter by the remaining optional arguments.
- :param ld: If set to true, identifiers are requested as JSON-LD. Optional. Default: false.
+ :param database_id: The database id. Optional.
+ :param subset_id: The subset id. Optional. Requires `database_id` to be set.
+ :param view_id: The view id. Optional. Requires `database_id` to be set.
+ :param table_id: The table id. Optional. Requires `database_id` to be set.
:returns: List of identifiers, if successful.
- :raises ResponseCodeError: If something went wrong with the retrieval of the identifiers.
:raises NotExistsError: If the accept header is neither application/json nor application/ld+json.
+ :raises FormatNotAvailable: If the service could not represent the output.
+ :raises ResponseCodeError: If something went wrong with the retrieval of the identifiers.
"""
- url = f'/api/pid'
- headers = None
- if ld:
- headers = {'Accept': 'application/ld+json'}
- response = self._wrapper(method="get", url=url, headers=headers)
+ url = f'/api/identifiers'
+ if database_id is not None:
+ url += f'?dbid={database_id}'
+ if subset_id is not None:
+ if database_id is None:
+ raise RequestError(f'Filtering by subset_id requires database_id to be set')
+ url += f'&qid={subset_id}'
+ if view_id is not None:
+ if database_id is None:
+ raise RequestError(f'Filtering by view_id requires database_id to be set')
+ url += f'&vid={view_id}'
+ if table_id is not None:
+ if database_id is None:
+ raise RequestError(f'Filtering by table_id requires database_id to be set')
+ url += f'&tid={table_id}'
+ response = self._wrapper(method="get", url=url, headers={'Accept': 'application/json'})
if response.status_code == 200:
- if ld:
- return response.json()
- else:
- body = response.json()
- return TypeAdapter(List[Identifier]).validate_python(body)
+ body = response.json()
+ return TypeAdapter(List[Identifier]).validate_python(body)
+ if response.status_code == 404:
+ raise NotExistsError(f'Failed to get identifiers: requested style is not known')
if response.status_code == 406:
raise MalformedError(
f'Failed to get identifiers: accept header must be application/json or application/ld+json')
- raise ResponseCodeError(f'Failed to get identifiers: response code: {response.status_code} is not 200 (OK)')
+ raise ResponseCodeError(f'Failed to get identifiers: response code: {response.status_code} is not '
+ f'200 (OK): {response.text}')
def update_table_column(self, database_id: int, table_id: int, column_id: int, concept_uri: str = None,
unit_uri: str = None) -> Column:
@@ -1572,8 +2013,12 @@ class RestClient:
:returns: The column, if successful.
- :raises ResponseCodeError: If something went wrong with the retrieval of the identifiers.
+ :raises MalformedError: If the payload is rejected by the service.
+ :raises ForbiddenError: If something went wrong with the authorization.
:raises NotExistsError: If the accept header is neither application/json nor application/ld+json.
+ :raises ServiceConnectionError: If something went wrong with connection to the search service.
+ :raises ServiceError: If something went wrong with obtaining the information in the search service.
+ :raises ResponseCodeError: If something went wrong with the retrieval of the identifiers.
"""
url = f'/api/database/{database_id}/table/{table_id}/column/{column_id}'
response = self._wrapper(method="put", url=url, force_auth=True,
@@ -1582,9 +2027,13 @@ class RestClient:
body = response.json()
return Column.model_validate(body)
if response.status_code == 400:
- raise MalformedError(f'Failed to update column: service rejected malformed payload')
+ raise MalformedError(f'Failed to update column: {response.text}')
if response.status_code == 403:
raise ForbiddenError(f'Failed to update colum: not allowed')
if response.status_code == 404:
raise NotExistsError(f'Failed to update colum: not found')
+ if response.status_code == 502:
+ raise ServiceConnectionError(f'Failed to update colum: failed to establish connection to search service')
+ if response.status_code == 503:
+ raise ServiceError(f'Failed to update colum: failed to save in search service')
raise ResponseCodeError(f'Failed to update colum: response code: {response.status_code} is not 202 (ACCEPTED)')
diff --git a/lib/python/dbrepo/UploadClient.py b/lib/python/dbrepo/UploadClient.py
index ebcb5aba57bad1eba1c3e7040bc284f702465c83..05fa133d64b2be902deb81423fef9bdc07e8c66d 100644
--- a/lib/python/dbrepo/UploadClient.py
+++ b/lib/python/dbrepo/UploadClient.py
@@ -4,6 +4,8 @@ import re
import sys
from tusclient import client
+logger = logging.getLogger("UploadClient")
+
class UploadClient:
"""
@@ -33,5 +35,5 @@ class UploadClient:
uploader.upload()
m = re.search('\\/([a-f0-9]+)\\+', uploader.url)
filename = m.group(0)[1:-1]
- logging.debug(f'uploaded file {file_path} to storage service with key: {filename}')
+ logger.debug(f'uploaded file {file_path} to storage service with key: {filename}')
return filename
diff --git a/lib/python/dbrepo/api/dto.py b/lib/python/dbrepo/api/dto.py
index 5eae072f35610faf5315d7145544556036dfe7eb..c601125767c2065e62062c9c82e39ad402ee5bc8 100644
--- a/lib/python/dbrepo/api/dto.py
+++ b/lib/python/dbrepo/api/dto.py
@@ -56,6 +56,19 @@ class CreateDatabase(BaseModel):
is_public: bool
+class CreateContainer(BaseModel):
+ name: str
+ host: str
+ image_id: int
+ sidecar_host: str
+ sidecar_port: int
+ privileged_username: str
+ privileged_password: str
+ ui_host: Optional[str] = None
+ ui_port: Optional[int] = None
+ port: Optional[int] = None
+
+
class CreateUser(BaseModel):
username: str
email: str
@@ -707,7 +720,6 @@ class Unit(BaseModel):
class ExecuteQuery(BaseModel):
statement: str
- timestamp: Timestamp
class TitleType(str, Enum):
@@ -981,6 +993,18 @@ class Database(BaseModel):
exchange_type: Optional[str] = None
+class DatabaseBrief(BaseModel):
+ id: int
+ name: str
+ internal_name: str
+ description: Optional[str] = None
+ is_public: bool
+ identifiers: Optional[List[Identifier]] = field(default_factory=list)
+ contact: UserBrief
+ owner: UserBrief
+ created: Timestamp
+
+
class Unique(BaseModel):
id: int
table: TableMinimal
diff --git a/lib/python/dbrepo/api/exceptions.py b/lib/python/dbrepo/api/exceptions.py
index a606a4fc7b15ad38d2938edd40f905f4b5e50f89..9aeb83d93b505ec6adaa0eb30a6a91f66905552a 100644
--- a/lib/python/dbrepo/api/exceptions.py
+++ b/lib/python/dbrepo/api/exceptions.py
@@ -61,6 +61,13 @@ class MetadataConsistencyError(Exception):
pass
+class FormatNotAvailable(Exception):
+ """
+ The service cannot provide the result in the requested representation.
+ """
+ pass
+
+
class ExternalSystemError(Exception):
"""
The service could not communicate with the external system.
@@ -75,8 +82,29 @@ class AuthenticationError(Exception):
pass
+class ServiceConnectionError(Exception):
+ """
+ The service failed to establish connection.
+ """
+ pass
+
+
+class ServiceError(Exception):
+ """
+ The service failed to perform the requested action.
+ """
+ pass
+
+
class UploadError(Exception):
"""
The upload was not successful.
"""
pass
+
+
+class RequestError(Exception):
+ """
+ The request cannot be sent.
+ """
+ pass
diff --git a/lib/python/docs/index.rst b/lib/python/docs/index.rst
index f905221999ac672b663611b248d6c75266c82e26..688a62683170012b263ffc1df234c881323ab9fb 100644
--- a/lib/python/docs/index.rst
+++ b/lib/python/docs/index.rst
@@ -12,7 +12,7 @@ Quickstart
----------
Find numerous quickstart examples on
-the `DBRepo website <https://www.ifs.tuwien.ac.at/infrastructures/dbrepo//usage-overview/>`_.
+the `DBRepo website <https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.5/api/>`_.
AMQP API Client
-----------
diff --git a/lib/python/pyproject.toml b/lib/python/pyproject.toml
index e8de41883d8bd20d26997934c3de288ec9b218e5..99d20acc30f636a2089ec0379c7247827dd6a32f 100644
--- a/lib/python/pyproject.toml
+++ b/lib/python/pyproject.toml
@@ -1,6 +1,6 @@
[project]
name = "dbrepo"
-version = "1.4.4"
+version = "1.4.5"
description = "DBRepo Python Library"
keywords = [
"DBRepo",
@@ -12,7 +12,7 @@ authors = [
readme = "README.md"
license = { file = "LICENSE" }
classifiers = [
- "Development Status :: 3 - Alpha",
+ "Development Status :: 4 - Beta",
"Topic :: Software Development :: Libraries",
"Programming Language :: Python :: 3.11",
"Operating System :: OS Independent",
@@ -34,7 +34,7 @@ requires = [
build-backend = "setuptools.build_meta"
[project.urls]
-Homepage = "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.3/"
-Documentation = "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.3/sphinx/"
+Homepage = "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.4/"
+Documentation = "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.4/python/"
Issues = "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues"
Source = "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/"
\ No newline at end of file
diff --git a/lib/python/setup.py b/lib/python/setup.py
index 4d5b26206dee68602d6b09fdaf3723956919e4ae..8785f71036fb3b888b278b48c3be9cff68f85eff 100644
--- a/lib/python/setup.py
+++ b/lib/python/setup.py
@@ -2,9 +2,9 @@
from distutils.core import setup
setup(name="dbrepo",
- version="1.4.4",
+ version="1.4.5",
description="A library for communicating with DBRepo",
- url="https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.3/",
+ url="https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.5/",
author="Martin Weise",
license="Apache-2.0",
author_email="martin.weise@tuwien.ac.at",
diff --git a/lib/python/tests/test_unit_database.py b/lib/python/tests/test_unit_database.py
index cb0bb19a702233cc3b573c028bd4fe1589e54fa3..dea15691e22a990434772c433683eb6eefc0b253 100644
--- a/lib/python/tests/test_unit_database.py
+++ b/lib/python/tests/test_unit_database.py
@@ -6,7 +6,8 @@ import datetime
from pydantic_core import ValidationError
from dbrepo.RestClient import RestClient
-from dbrepo.api.dto import Database, User, Container, Image, UserAttributes, DatabaseAccess, AccessType
+from dbrepo.api.dto import Database, User, Container, Image, UserAttributes, DatabaseAccess, AccessType, DatabaseBrief, \
+ UserBrief
from dbrepo.api.exceptions import ResponseCodeError, NotExistsError, ForbiddenError, MalformedError, AuthenticationError
from dbrepo.api.dto import ImageDate
@@ -24,47 +25,14 @@ class DatabaseUnitTest(unittest.TestCase):
def test_get_databases_succeeds(self):
exp = [
- Database(
+ DatabaseBrief(
id=1,
name='test',
- creator=User(id='8638c043-5145-4be8-a3e4-4b79991b0a16', username='mweise',
- attributes=UserAttributes(theme='light')),
- owner=User(id='8638c043-5145-4be8-a3e4-4b79991b0a16', username='mweise',
- attributes=UserAttributes(theme='light')),
- contact=User(id='8638c043-5145-4be8-a3e4-4b79991b0a16', username='mweise',
- attributes=UserAttributes(theme='light')),
+ owner=UserBrief(id='8638c043-5145-4be8-a3e4-4b79991b0a16', username='mweise'),
+ contact=UserBrief(id='8638c043-5145-4be8-a3e4-4b79991b0a16', username='mweise'),
created=datetime.datetime(2024, 1, 1, 0, 0, 0, 0, datetime.timezone.utc),
- exchange_name='dbrepo',
internal_name='test_abcd',
- is_public=True,
- container=Container(
- id=1,
- name='MariaDB Galera 11.1.3',
- internal_name='mariadb',
- host='data-db',
- port=3306,
- sidecar_host='data-db-sidecar',
- sidecar_port=3305,
- created=datetime.datetime(2024, 1, 1, 0, 0, 0, 0, datetime.timezone.utc),
- image=Image(
- id=1,
- registry='docker.io',
- name='mariadb',
- version='11.2.2',
- dialect='org.hibernate.dialect.MariaDBDialect',
- driver_class='org.mariadb.jdbc.Driver',
- jdbc_method='mariadb',
- default_port=3306,
- date_formats=[ImageDate(id=1,
- created_at=datetime.datetime(2024, 3, 25, 18, 2, 14, 0,
- datetime.timezone.utc),
- example="2024-03-25 18:02:14",
- database_format='%Y-%c-%d %H:%i:%S',
- unix_format='yyyy-MM-dd HH:mm:ss',
- has_time=True)]
- )
- )
- )
+ is_public=True)
]
with requests_mock.Mocker() as mock:
# mock
diff --git a/lib/python/tests/test_unit_identifier.py b/lib/python/tests/test_unit_identifier.py
index b64816731d4dcae28d87b38f1e4ef43ae25cf439..2832f0e799afa66558f7aaf83f38252b81f484e3 100644
--- a/lib/python/tests/test_unit_identifier.py
+++ b/lib/python/tests/test_unit_identifier.py
@@ -9,8 +9,7 @@ from dbrepo.api.dto import Identifier, IdentifierType, CreateIdentifierTitle, Cr
IdentifierCreator, IdentifierTitle, IdentifierDescription, CreateIdentifierDescription, Language, \
CreateIdentifierFunder, CreateRelatedIdentifier, RelatedIdentifierRelation, RelatedIdentifierType, IdentifierFunder, \
RelatedIdentifier, UserBrief, IdentifierStatusType
-from dbrepo.api.exceptions import MalformedError, ForbiddenError, NotExistsError, ExternalSystemError, \
- AuthenticationError
+from dbrepo.api.exceptions import MalformedError, ForbiddenError, NotExistsError, AuthenticationError
class IdentifierUnitTest(unittest.TestCase):
@@ -100,22 +99,6 @@ class IdentifierUnitTest(unittest.TestCase):
except NotExistsError:
pass
- def test_create_identifier_not_found_fails(self):
- with requests_mock.Mocker() as mock:
- # mock
- mock.post('/api/identifier', status_code=503)
- # test
- try:
- client = RestClient(username="a", password="b")
- response = client.create_identifier(
- database_id=1, type=IdentifierType.VIEW,
- titles=[CreateIdentifierTitle(title='Test Title')],
- descriptions=[CreateIdentifierDescription(description='Test')],
- publisher='TU Wien', publication_year=2024,
- creators=[CreateIdentifierCreator(creator_name='Carberry, Josiah')])
- except ExternalSystemError:
- pass
-
def test_create_identifier_not_auth_fails(self):
with requests_mock.Mocker() as mock:
# mock
@@ -131,38 +114,6 @@ class IdentifierUnitTest(unittest.TestCase):
except AuthenticationError:
pass
- def test_suggest_identifier_succeeds(self):
- with requests_mock.Mocker() as mock:
- exp = Identifier(id=10,
- database_id=1,
- publication_year=2024,
- publisher='TU Wien',
- titles=[IdentifierTitle(id=10, title='Test Title')],
- descriptions=[IdentifierDescription(id=10, description='Test')],
- created=datetime.datetime(2024, 1, 1, 0, 0, 0, 0, datetime.timezone.utc),
- last_modified=datetime.datetime(2024, 1, 1, 0, 0, 0, 0, datetime.timezone.utc),
- type=IdentifierType.VIEW,
- creators=[IdentifierCreator(id=5, creator_name='Carberry, Josiah',
- name_identifier='https://orcid.org/0000-0002-1825-0097')],
- status=IdentifierStatusType.DRAFT,
- creator=UserBrief(id='8638c043-5145-4be8-a3e4-4b79991b0a16', username='mweise')
- )
- # mock
- mock.get('/api/identifier?url=https://orcid.org/0000-0002-1825-0097', json=exp.model_dump())
- # test
- response = RestClient().suggest_identifier("https://orcid.org/0000-0002-1825-0097")
- self.assertEqual(exp, response)
-
- def test_suggest_identifier_not_found_fails(self):
- with requests_mock.Mocker() as mock:
- # mock
- mock.get('/api/identifier?url=https://orcid.org/0000-0002-1825-0097', status_code=404)
- # test
- try:
- response = RestClient().suggest_identifier("https://orcid.org/0000-0002-1825-0097")
- except NotExistsError:
- pass
-
def test_get_identifiers_succeeds(self):
with requests_mock.Mocker() as mock:
exp = [Identifier(id=10,
@@ -184,25 +135,11 @@ class IdentifierUnitTest(unittest.TestCase):
status=IdentifierStatusType.PUBLISHED,
creator=UserBrief(id='8638c043-5145-4be8-a3e4-4b79991b0a16', username='mweise'))]
# mock
- mock.get('/api/pid', json=[exp[0].model_dump()], headers={"Accept": "application/json"})
+ mock.get('/api/identifiers', json=[exp[0].model_dump()], headers={"Accept": "application/json"})
# test
response = RestClient().get_identifiers()
self.assertEqual(exp, response)
- def test_get_identifiers_ld_json_succeeds(self):
- with requests_mock.Mocker() as mock:
- exp = [{"@context": "https://schema.org/", "@type": "Dataset", "url": "http://localhost/database/2/info",
- "citation": "http://localhost/pid/2", "hasPart": [], "version": "2024-03-21T12:05:46.000Z",
- "name": "sdfsdf", "description": "sfsdf", "identifier": ["http://localhost/pid/2"],
- "license": "https://creativecommons.org/licenses/by/4.0/legalcode", "creator": [
- {"name": "Weise, Martin", "@type": "Person", "sameAs": "https://orcid.org/0000-0003-4216-302X",
- "givenName": "Martin", "familyName": "Weise"}], "temporalCoverage": 2024}]
- # mock
- mock.get('/api/pid', json=exp, headers={"Accept": "application/ld+json"})
- # test
- response = RestClient().get_identifiers(ld=True)
- self.assertEqual(exp, response)
-
if __name__ == "__main__":
unittest.main()
diff --git a/lib/python/tests/test_unit_query.py b/lib/python/tests/test_unit_query.py
index 628a0914b230a8a2999a3e26d0fad24d6670a2c6..d2de6f8278bc33a123cf38525493ec93532ce87a 100644
--- a/lib/python/tests/test_unit_query.py
+++ b/lib/python/tests/test_unit_query.py
@@ -15,7 +15,7 @@ from dbrepo.api.exceptions import MalformedError, NotExistsError, ForbiddenError
class QueryUnitTest(unittest.TestCase):
- def test_execute_query_succeeds(self):
+ def test_create_subset_succeeds(self):
with requests_mock.Mocker() as mock:
exp = Result(result=[{'id': 1, 'username': 'foo'}, {'id': 2, 'username': 'bar'}],
headers=[{'id': 0, 'username': 1}],
@@ -24,77 +24,53 @@ class QueryUnitTest(unittest.TestCase):
mock.post('/api/database/1/subset', json=exp.model_dump(), status_code=201)
# test
client = RestClient(username="a", password="b")
- response = client.execute_query(database_id=1, page=0, size=10,
+ response = client.create_subset(database_id=1, page=0, size=10,
query="SELECT id, username FROM some_table WHERE id IN (1,2)")
self.assertEqual(exp, response)
- def test_execute_query_malformed_fails(self):
+ def test_create_subset_malformed_fails(self):
with requests_mock.Mocker() as mock:
# mock
mock.post('/api/database/1/subset', status_code=400)
# test
try:
client = RestClient(username="a", password="b")
- response = client.execute_query(database_id=1,
+ response = client.create_subset(database_id=1,
query="SELECT id, username FROM some_table WHERE id IN (1,2)")
except MalformedError:
pass
- def test_execute_query_not_allowed_fails(self):
+ def test_create_subset_not_allowed_fails(self):
with requests_mock.Mocker() as mock:
# mock
mock.post('/api/database/1/subset', status_code=403)
# test
try:
client = RestClient(username="a", password="b")
- response = client.execute_query(database_id=1,
+ response = client.create_subset(database_id=1,
query="SELECT id, username FROM some_table WHERE id IN (1,2)")
except ForbiddenError:
pass
- def test_execute_query_not_found_fails(self):
+ def test_create_subset_not_found_fails(self):
with requests_mock.Mocker() as mock:
# mock
mock.post('/api/database/1/subset', status_code=404)
# test
try:
client = RestClient(username="a", password="b")
- response = client.execute_query(database_id=1,
+ response = client.create_subset(database_id=1,
query="SELECT id, username FROM some_table WHERE id IN (1,2)")
except NotExistsError:
pass
- def test_execute_query_not_valid_fails(self):
- with requests_mock.Mocker() as mock:
- # mock
- mock.post('/api/database/1/subset', status_code=409)
- # test
- try:
- client = RestClient(username="a", password="b")
- response = client.execute_query(database_id=1,
- query="SELECT id, username FROM some_table WHERE id IN (1,2)")
- except QueryStoreError:
- pass
-
- def test_execute_query_not_expected_fails(self):
- with requests_mock.Mocker() as mock:
- # mock
- mock.post('/api/database/1/subset', status_code=417)
- # test
- try:
- client = RestClient(username="a", password="b")
- response = client.execute_query(database_id=1,
- query="SELECT id, username FROM some_table WHERE id IN (1,2)")
- except MetadataConsistencyError:
- pass
-
- def test_execute_query_not_auth_fails(self):
+ def test_create_subset_not_auth_fails(self):
with requests_mock.Mocker() as mock:
# mock
mock.post('/api/database/1/subset', status_code=417)
# test
try:
- response = RestClient().execute_query(database_id=1,
+ response = RestClient().create_subset(database_id=1,
query="SELECT id, username FROM some_table WHERE id IN (1,2)")
except AuthenticationError:
pass
@@ -119,7 +95,7 @@ class QueryUnitTest(unittest.TestCase):
# mock
mock.get('/api/database/1/subset/6', json=exp.model_dump())
# test
- response = RestClient().get_query(database_id=1, query_id=6)
+ response = RestClient().get_subset(database_id=1, subset_id=6)
self.assertEqual(exp, response)
def test_find_query_not_allowed_fails(self):
@@ -128,7 +104,7 @@ class QueryUnitTest(unittest.TestCase):
mock.get('/api/database/1/subset/6', status_code=403)
# test
try:
- response = RestClient().get_query(database_id=1, query_id=6)
+ response = RestClient().get_subset(database_id=1, subset_id=6)
except ForbiddenError:
pass
@@ -138,30 +114,10 @@ class QueryUnitTest(unittest.TestCase):
mock.get('/api/database/1/subset/6', status_code=404)
# test
try:
- response = RestClient().get_query(database_id=1, query_id=6)
+ response = RestClient().get_subset(database_id=1, subset_id=6)
except NotExistsError:
pass
- def test_find_query_not_valid_fails(self):
- with requests_mock.Mocker() as mock:
- # mock
- mock.get('/api/database/1/subset/6', status_code=501)
- # test
- try:
- response = RestClient().get_query(database_id=1, query_id=6)
- except QueryStoreError:
- pass
-
- def test_find_query_not_expected_fails(self):
- with requests_mock.Mocker() as mock:
- # mock
- mock.get('/api/database/1/subset/6', status_code=417)
- # test
- try:
- response = RestClient().get_query(database_id=1, query_id=6)
- except MetadataConsistencyError:
- pass
-
def test_get_queries_empty_succeeds(self):
with requests_mock.Mocker() as mock:
exp = []
@@ -214,27 +170,7 @@ class QueryUnitTest(unittest.TestCase):
except NotExistsError:
pass
- def test_get_queries_not_valid_fails(self):
- with requests_mock.Mocker() as mock:
- # mock
- mock.get('/api/database/1/subset', status_code=501)
- # test
- try:
- response = RestClient().get_queries(database_id=1)
- except QueryStoreError:
- pass
-
- def test_get_queries_malformed_fails(self):
- with requests_mock.Mocker() as mock:
- # mock
- mock.get('/api/database/1/subset', status_code=423)
- # test
- try:
- response = RestClient().get_queries(database_id=1)
- except MalformedError:
- pass
-
- def test_get_query_data_succeeds(self):
+ def test_get_subset_data_succeeds(self):
with requests_mock.Mocker() as mock:
exp = Result(result=[{'id': 1, 'username': 'foo'}, {'id': 2, 'username': 'bar'}],
headers=[{'id': 0, 'username': 1}],
@@ -242,10 +178,10 @@ class QueryUnitTest(unittest.TestCase):
# mock
mock.get('/api/database/1/subset/6/data', json=exp.model_dump())
# test
- response = RestClient().get_query_data(database_id=1, query_id=6)
+ response = RestClient().get_subset_data(database_id=1, subset_id=6)
self.assertEqual(exp, response)
- def test_get_query_data_dataframe_succeeds(self):
+ def test_get_subset_data_dataframe_succeeds(self):
with requests_mock.Mocker() as mock:
res = Result(result=[{'id': 1, 'username': 'foo'}, {'id': 2, 'username': 'bar'}],
headers=[{'id': 0, 'username': 1}],
@@ -254,99 +190,59 @@ class QueryUnitTest(unittest.TestCase):
# mock
mock.get('/api/database/1/subset/6/data', json=res.model_dump())
# test
- response = RestClient().get_query_data(database_id=1, query_id=6, df=True)
+ response = RestClient().get_subset_data(database_id=1, subset_id=6, df=True)
self.assertEqual(exp.shape, response.shape)
self.assertTrue(DataFrame.equals(exp, response))
- def test_get_query_data_not_allowed_fails(self):
+ def test_get_subset_data_not_allowed_fails(self):
with requests_mock.Mocker() as mock:
# mock
mock.get('/api/database/1/subset/6/data', status_code=403)
# test
try:
- response = RestClient().get_query_data(database_id=1, query_id=6)
+ response = RestClient().get_subset_data(database_id=1, subset_id=6)
except ForbiddenError:
pass
- def test_get_query_data_not_found_fails(self):
+ def test_get_subset_data_not_found_fails(self):
with requests_mock.Mocker() as mock:
# mock
mock.get('/api/database/1/subset/6/data', status_code=404)
# test
try:
- response = RestClient().get_query_data(database_id=1, query_id=6)
+ response = RestClient().get_subset_data(database_id=1, subset_id=6)
except NotExistsError:
pass
- def test_get_query_data_not_valid_fails(self):
- with requests_mock.Mocker() as mock:
- # mock
- mock.get('/api/database/1/subset/6/data', status_code=409)
- # test
- try:
- response = RestClient().get_query_data(database_id=1, query_id=6)
- except QueryStoreError:
- pass
-
- def test_get_query_data_not_consistent_fails(self):
- with requests_mock.Mocker() as mock:
- # mock
- mock.get('/api/database/1/subset/6/data', status_code=417)
- # test
- try:
- response = RestClient().get_query_data(database_id=1, query_id=6)
- except MetadataConsistencyError:
- pass
-
- def test_get_query_data_count_succeeds(self):
+ def test_get_subset_data_count_succeeds(self):
with requests_mock.Mocker() as mock:
exp = 2
# mock
mock.head('/api/database/1/subset/6/data', headers={'X-Count': str(exp)})
# test
- response = RestClient().get_query_data_count(database_id=1, query_id=6)
+ response = RestClient().get_subset_data_count(database_id=1, subset_id=6)
self.assertEqual(exp, response)
- def test_get_query_data_count_not_allowed_fails(self):
+ def test_get_subset_data_count_not_allowed_fails(self):
with requests_mock.Mocker() as mock:
# mock
mock.head('/api/database/1/subset/6/data', status_code=403)
# test
try:
- response = RestClient().get_query_data_count(database_id=1, query_id=6)
+ response = RestClient().get_subset_data_count(database_id=1, subset_id=6)
except ForbiddenError:
pass
- def test_get_query_data_count_not_found_fails(self):
+ def test_get_subset_data_count_not_found_fails(self):
with requests_mock.Mocker() as mock:
# mock
mock.head('/api/database/1/subset/6/data', status_code=404)
# test
try:
- response = RestClient().get_query_data_count(database_id=1, query_id=6)
+ response = RestClient().get_subset_data_count(database_id=1, subset_id=6)
except NotExistsError:
pass
- def test_get_query_data_count_not_valid_fails(self):
- with requests_mock.Mocker() as mock:
- # mock
- mock.head('/api/database/1/subset/6/data', status_code=409)
- # test
- try:
- response = RestClient().get_query_data_count(database_id=1, query_id=6)
- except QueryStoreError:
- pass
-
- def test_get_query_data_count_not_consistent_fails(self):
- with requests_mock.Mocker() as mock:
- # mock
- mock.head('/api/database/1/subset/6/data', status_code=417)
- # test
- try:
- response = RestClient().get_query_data_count(database_id=1, query_id=6)
- except MetadataConsistencyError:
- pass
-
if __name__ == "__main__":
unittest.main()
diff --git a/lib/python/tests/test_unit_table.py b/lib/python/tests/test_unit_table.py
index 5dff01582ec536a116e4a996e60e9236c765db52..0be3a4a9fbaa47c129e7a937230d348e37a8eb17 100644
--- a/lib/python/tests/test_unit_table.py
+++ b/lib/python/tests/test_unit_table.py
@@ -10,7 +10,7 @@ from pandas import DataFrame
from dbrepo.api.dto import Table, CreateTableConstraints, UserAttributes, User, Column, Constraints, ColumnType, Result, \
Concept, Unit, TableStatistics, ColumnStatistic, PrimaryKey, TableMinimal, ColumnMinimal, TableBrief, UserBrief
from dbrepo.api.exceptions import MalformedError, ForbiddenError, NotExistsError, NameExistsError, QueryStoreError, \
- AuthenticationError
+ AuthenticationError, ExternalSystemError
class TableUnitTest(unittest.TestCase):
@@ -294,16 +294,6 @@ class TableUnitTest(unittest.TestCase):
except NotExistsError:
pass
- def test_get_table_data_not_countable_fails(self):
- with requests_mock.Mocker() as mock:
- # mock
- mock.get('/api/database/1/table/9/data', status_code=409)
- # test
- try:
- response = RestClient().get_table_data(database_id=1, table_id=9)
- except QueryStoreError:
- pass
-
def test_get_table_data_count_succeeds(self):
with requests_mock.Mocker() as mock:
exp = 2
@@ -350,7 +340,7 @@ class TableUnitTest(unittest.TestCase):
# test
try:
response = RestClient().get_table_data_count(database_id=1, table_id=9)
- except QueryStoreError:
+ except ExternalSystemError:
pass
def test_create_table_data_succeeds(self):
@@ -398,29 +388,6 @@ class TableUnitTest(unittest.TestCase):
except NotExistsError:
pass
- def test_create_table_data_not_lob_fails(self):
- with requests_mock.Mocker() as mock:
- # mock
- mock.post('/api/database/1/table/9/data', status_code=410)
- # test
- try:
- client = RestClient(username="a", password="b")
- client.create_table_data(database_id=1, table_id=9,
- data={'name': 'Josiah', 'age': 45, 'gender': 'male'})
- except MalformedError:
- pass
-
- def test_create_table_data_not_auth_fails(self):
- with requests_mock.Mocker() as mock:
- # mock
- mock.post('/api/database/1/table/9/data', status_code=410)
- # test
- try:
- RestClient().create_table_data(database_id=1, table_id=9,
- data={'name': 'Josiah', 'age': 45, 'gender': 'male'})
- except AuthenticationError:
- pass
-
def test_update_table_data_succeeds(self):
with requests_mock.Mocker() as mock:
# mock
@@ -470,31 +437,6 @@ class TableUnitTest(unittest.TestCase):
except NotExistsError:
pass
- def test_update_table_data_not_lob_fails(self):
- with requests_mock.Mocker() as mock:
- # mock
- mock.put('/api/database/1/table/9/data', status_code=410)
- # test
- try:
- client = RestClient(username="a", password="b")
- client.update_table_data(database_id=1, table_id=9,
- data={'name': 'Josiah', 'age': 45, 'gender': 'male'},
- keys={'id': 1})
- except MalformedError:
- pass
-
- def test_update_table_data_not_auth_fails(self):
- with requests_mock.Mocker() as mock:
- # mock
- mock.put('/api/database/1/table/9/data', status_code=410)
- # test
- try:
- RestClient().update_table_data(database_id=1, table_id=9,
- data={'name': 'Josiah', 'age': 45, 'gender': 'male'},
- keys={'id': 1})
- except AuthenticationError:
- pass
-
def test_delete_table_data_succeeds(self):
with requests_mock.Mocker() as mock:
# mock
diff --git a/lib/python/tests/test_unit_user.py b/lib/python/tests/test_unit_user.py
index 08133fa6f02318a585ce0bcdb7f328072ba860de..0d12ecf48f5dffa40d8936b2a19e02e421c78d3b 100644
--- a/lib/python/tests/test_unit_user.py
+++ b/lib/python/tests/test_unit_user.py
@@ -5,7 +5,7 @@ import requests_mock
from dbrepo.RestClient import RestClient
from dbrepo.api.dto import User, UserAttributes, UserBrief
from dbrepo.api.exceptions import ResponseCodeError, UsernameExistsError, EmailExistsError, NotExistsError, \
- ForbiddenError, AuthenticationError
+ ForbiddenError, AuthenticationError, MalformedError, ServiceError
class UserUnitTest(unittest.TestCase):
@@ -66,18 +66,7 @@ class UserUnitTest(unittest.TestCase):
# test
try:
response = RestClient().create_user(username='mweise', password='s3cr3t', email='mweise@example.com')
- except ResponseCodeError as e:
- pass
-
- def test_create_user_not_allowed_fails(self):
- with requests_mock.Mocker() as mock:
- exp = UserBrief(id='8638c043-5145-4be8-a3e4-4b79991b0a16', username='mweise')
- # mock
- mock.post('http://gateway-service/api/user', json=exp.model_dump(), status_code=403)
- # test
- try:
- response = RestClient().create_user(username='mweise', password='s3cr3t', email='mweise@example.com')
- except ForbiddenError as e:
+ except MalformedError as e:
pass
def test_create_user_username_exists_fails(self):
@@ -171,18 +160,6 @@ class UserUnitTest(unittest.TestCase):
except NotExistsError as e:
pass
- def test_update_user_foreign_fails(self):
- with requests_mock.Mocker() as mock:
- # mock
- mock.put('http://gateway-service/api/user/8638c043-5145-4be8-a3e4-4b79991b0a16', status_code=405)
- # test
- try:
- client = RestClient(username="a", password="b")
- response = client.update_user(user_id='8638c043-5145-4be8-a3e4-4b79991b0a16', firstname='Martin',
- language='en', theme='light')
- except ForbiddenError as e:
- pass
-
def test_update_user_not_auth_fails(self):
with requests_mock.Mocker() as mock:
# mock
@@ -231,18 +208,6 @@ class UserUnitTest(unittest.TestCase):
except NotExistsError as e:
pass
- def test_update_user_password_foreign_fails(self):
- with requests_mock.Mocker() as mock:
- # mock
- mock.put('http://gateway-service/api/user/8638c043-5145-4be8-a3e4-4b79991b0a16/password', status_code=405)
- # test
- try:
- client = RestClient(username="a", password="b")
- response = client.update_user_password(user_id='8638c043-5145-4be8-a3e4-4b79991b0a16',
- password='s3cr3t1n0rm4t10n')
- except ForbiddenError as e:
- pass
-
def test_update_user_password_keycloak_fails(self):
with requests_mock.Mocker() as mock:
# mock
@@ -252,7 +217,7 @@ class UserUnitTest(unittest.TestCase):
client = RestClient(username="a", password="b")
response = client.update_user_password(user_id='8638c043-5145-4be8-a3e4-4b79991b0a16',
password='s3cr3t1n0rm4t10n')
- except ResponseCodeError as e:
+ except ServiceError as e:
pass
def test_update_user_password_not_auth_fails(self):
diff --git a/lib/python/tests/test_unit_view.py b/lib/python/tests/test_unit_view.py
index 476f0473700ed79f9af1faaa4da7291517c117ca..19a88be85a10dceef0eb8129dd65be733e3025e3 100644
--- a/lib/python/tests/test_unit_view.py
+++ b/lib/python/tests/test_unit_view.py
@@ -44,16 +44,6 @@ class ViewUnitTest(unittest.TestCase):
response = RestClient().get_views(database_id=1)
self.assertEqual(exp, response)
- def test_get_views_not_allowed_fails(self):
- with requests_mock.Mocker() as mock:
- # mock
- mock.get('/api/database/1/view', status_code=403)
- # test
- try:
- response = RestClient().get_views(database_id=1)
- except ForbiddenError:
- pass
-
def test_get_views_not_found_fails(self):
with requests_mock.Mocker() as mock:
# mock
diff --git a/make/dev.mk b/make/dev.mk
index 14eba11d525485a73a4fe40fcb898f47c3a833de..fa3c71a537aec28528036d7a891a79336e78e4ca 100644
--- a/make/dev.mk
+++ b/make/dev.mk
@@ -8,3 +8,15 @@ start-dev: build-images ## Start the development deployment.
.PHONY: stop-dev
stop-dev: ## Stop the development deployment and remove all data.
docker compose down
+
+.PHONY: package-config
+package-config: ## Package the config files
+ cp ./dbrepo-metadata-db/1_setup-schema.sql ./.docker/config
+ cp ./dbrepo-metadata-db/2_setup-data.sql ./.docker/config
+ cp ./dbrepo-broker-service/rabbitmq.conf ./.docker/config
+ cp ./dbrepo-broker-service/enabled_plugins ./.docker/config
+ cp ./dbrepo-broker-service/definitions.json ./.docker/config
+ cp ./dbrepo-broker-service/advanced.config ./.docker/config
+ cp ./dbrepo-storage-service/s3_config.json ./.docker/config
+ cp ./dbrepo-gateway-service/dbrepo.conf ./.docker/config
+ cd ./.docker && tar czfv ./dist.tar.gz ./docker-compose.yml ./.env ./config
diff --git a/make/gen.mk b/make/gen.mk
index 14206d66334bed074579ad2bab7ef4642e8f914c..b81d504213bdee6cae172d1edfc18db82f2ef65a 100644
--- a/make/gen.mk
+++ b/make/gen.mk
@@ -1,20 +1,15 @@
##@ Generate
.PHONY: gen-swagger-doc
-gen-swagger-doc: ## Generate Swagger documentation.
- bash .docs/.swagger/swagger-site.sh
-
-.PHONY: gen-swagger-doc-fe
-gen-swagger-doc-fe: build-images ## Generate Swagger documentation and fetch.
+gen-swagger-doc: build-images ## Generate Swagger documentation and fetch.
docker compose up -d
bash .docs/.swagger/swagger-generate.sh
- bash .docs/.swagger/swagger-site.sh
docker compose down
openapi-merge-cli --config .docs/.swagger/openapi-merge.json
.PHONY: gen-helm-doc
gen-helm-doc: build-helm ## Generate Helm documentation and schema
- helm schema -input ./helm/dbrepo/values.yaml
+ helm schema -input ./helm/dbrepo/values.yaml -output ./helm/dbrepo/values.schema.json
readme-generator-for-helm --readme ./helm/dbrepo/README.md --values ./helm/dbrepo/values.yaml
.PHONY: gen-dbrepo-doc
diff --git a/make/rel.mk b/make/rel.mk
index c06bb234334f0f55fc0bcf4ab3a6becf04825a63..97aeca4e161ada3786dab0b3ecfca1fc2c3c5a62 100644
--- a/make/rel.mk
+++ b/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}"
diff --git a/make/test.mk b/make/test.mk
index 5760075a2956bf282b7243ff78993b5022aebc7f..c3d2cd8804831f25d7450d0f34914c69c6f53477 100644
--- a/make/test.mk
+++ b/make/test.mk
@@ -15,30 +15,3 @@ test-analyse-service: ## Test the Analyse Service.
.PHONY: test-lib
test-lib: ## Test the Python Library.
bash ./lib/python/test.sh
-
-.PHONY: scan-images
-scan-images: ## Scan the docker images for vulnerabilities.
- trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-analyse-service-report.json dbrepo-analyse-service:latest
- trivy image --insecure --exit-code 1 --severity CRITICAL dbrepo-analyse-service:latest
- trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-authentication-service-report.json dbrepo-authentication-service:latest
- trivy image --insecure --exit-code 1 --severity CRITICAL dbrepo-authentication-service:latest
- trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-broker-service-report.json bitnami/rabbitmq:3.10
- trivy image --insecure --exit-code 1 --severity CRITICAL bitnami/rabbitmq:3.10
- trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-gateway-service-report.json "nginx:1.25.0-alpine-slim"
- trivy image --insecure --exit-code 1 --severity CRITICAL "nginx:1.25.0-alpine-slim"
- trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-metadata-db-report.json dbrepo-metadata-db:latest
- trivy image --insecure --exit-code 1 --severity CRITICAL dbrepo-metadata-db:latest
- trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-metadata-service-report.json dbrepo-metadata-service:latest
- trivy image --insecure --exit-code 1 --severity CRITICAL dbrepo-metadata-service:latest
- trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-data-service-report.json dbrepo-data-service:latest
- trivy image --insecure --exit-code 1 --severity CRITICAL dbrepo-data-service:latest
- trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-search-db-report.json "dbrepo-search-db"
- trivy image --insecure --exit-code 1 --severity CRITICAL "dbrepo-search-db"
- trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-search-db-report.json "opensearchproject/opensearch-dashboards:2.10.0"
- trivy image --insecure --exit-code 1 --severity CRITICAL "opensearchproject/opensearch-dashboards:2.10.0"
- trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-data-db-report.json "bitnami/mariadb:11.2.2-debian-11-r0"
- trivy image --insecure --exit-code 1 --severity CRITICAL "bitnami/mariadb:11.2.2-debian-11-r0"
- trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-ui-report.json dbrepo-ui:latest
- trivy image --insecure --exit-code 1 --severity CRITICAL dbrepo-ui:latest
- trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-search-service-report.json dbrepo-search-service:latest
- trivy image --insecure --exit-code 1 --severity CRITICAL dbrepo-search-service:latest
\ No newline at end of file
diff --git a/mkdocs.yml b/mkdocs.yml
index 86b83c4eeb73fad7393f6255583527d9159f7078..9bb4588f27727a8e7926caf585094989553957fa 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,5 +1,5 @@
site_name: Database Repository
-site_url: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/
+site_url: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.5/
repo_url: https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services
repo_name: fda-services
site_author: Research Unit Data Science, Technische Universität Wien
@@ -10,9 +10,8 @@ nav:
- Welcome to DBRepo: index.md
- Why use DBRepo: why.md
- Help with DBRepo: help.md
- - Installation: deployment-docker-compose.md
- - Kubernetes: deployment-helm.md
- - Migration Guide: migration.md
+ - Installation: installation.md
+ - Kubernetes: kubernetes.md
- contributing.md
- Concepts:
- Overview: concepts/index.md
@@ -22,7 +21,6 @@ nav:
- Monitoring: concepts/monitoring.md
- Persistent Identifier: concepts/pid.md
- Search: concepts/search.md
- - Storage: concepts/storage.md
- User Interface: concepts/ui.md
- API:
- Overview: api/index.md
@@ -35,8 +33,10 @@ nav:
- Services:
- Analyse Service: api/analyse-service.md
- Auth Service: api/auth-service.md
+ - Broker Service: api/broker-service.md
- Data Service: api/data-service.md
- Gateway Service: api/gateway-service.md
+ - Identity Service: api/identity-service.md
- Metadata Service: api/metadata-service.md
- Search Service: api/search-service.md
- Storage Service: api/storage-service.md
@@ -44,8 +44,15 @@ nav:
- UI:
- Customization: api/ui.md
- Examples:
- - Hazardous Materials: examples/hazard.md
- - Transportation Monitoring: examples/transportation.md
+ - Air Quality Data: examples/air.md
+ - COVID-19 Data: examples/covid-19.md
+ - Hazard Data: examples/hazard.md
+ - Industry 4.0 Power Data: examples/power.md
+ - Survey Data: examples/survey.md
+ - Lute Data: examples/lute-data.md
+ - Music-ML Data: examples/music.md
+ - Transportation Data: examples/transportation.md
+ - XPS Data: examples/xps-data.md
- publications.md
- contact.md
extra_css:
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 0000000000000000000000000000000000000000..45670cc4659d29f9badf6419ed16dbe2cceba60f
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,15 @@
+# sonarqube
+sonar.projectKey=fair-data-austria-db-repository_fda-services_a57fa043-ab99-4cdd-a721-162d9a916d77
+sonar.host.url=https://s34.datalab.tuwien.ac.at
+# project
+sonar.projectVersion=1.4.4
+# general
+sonar.qualitygate.wait=true
+sonar.projectCreation.mainBranchName=master
+# java services
+sonar.sources=./dbrepo-metadata-service/test/src/main,./dbrepo-metadata-service/services/src/main,./dbrepo-metadata-service/repositories/src/main,./dbrepo-metadata-service/rest-service/src/main,./dbrepo-metadata-service/api/src/main,./dbrepo-metadata-service/oai/src/main,./dbrepo-metadata-service/entities/src/main,./dbrepo-data-service/services/src/main,./dbrepo-data-service/rest-service/src/main,./dbrepo-data-service/querystore/src/main
+sonar.java.binaries=./dbrepo-metadata-service/test/target/classes,./dbrepo-metadata-service/services/target/classes,./dbrepo-metadata-service/repositories/target/classes,./dbrepo-metadata-service/rest-service/target/classes,./dbrepo-metadata-service/api/target/classes,./dbrepo-metadata-service/oai/target/classes,./dbrepo-metadata-service/entities/target/classes,./dbrepo-data-service/services/target/classes,./dbrepo-data-service/rest-service/target/classes,./dbrepo-data-service/querystore/target/classes
+sonar.junit.reportPaths=./dbrepo-metadata-service/rest-service/target/surefire-reports,./dbrepo-data-service/rest-service/target/surefire-reports
+sonar.coverage.jacoco.xmlReportPaths=./dbrepo-metadata-service/report/target/site/jacoco-aggregate/jacoco.xml,./dbrepo-data-service/report/target/site/jacoco-aggregate/jacoco.xml
+# python services
+sonar.python.version=3.11
diff --git a/values.schema.json b/values.schema.json
deleted file mode 100644
index 2cc52abfed3216d26a5e140292c82ffc2e023a8f..0000000000000000000000000000000000000000
--- a/values.schema.json
+++ /dev/null
@@ -1,1459 +0,0 @@
-{
- "$schema": "https://json-schema.org/draft/2020-12/schema",
- "properties": {
- "admin": {
- "properties": {
- "password": {
- "type": "string"
- },
- "username": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "analyseservice": {
- "properties": {
- "enabled": {
- "type": "boolean"
- },
- "endpoint": {
- "type": "string"
- },
- "image": {
- "properties": {
- "debug": {
- "type": "boolean"
- },
- "name": {
- "type": "string"
- },
- "pullPolicy": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "replicaCount": {
- "type": "integer"
- },
- "s3": {
- "properties": {
- "endpoint": {
- "type": "string"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
- },
- "authservice": {
- "properties": {
- "auth": {
- "properties": {
- "adminPassword": {
- "type": "string"
- },
- "adminUser": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "client": {
- "properties": {
- "id": {
- "type": "string"
- },
- "secret": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "enabled": {
- "type": "boolean"
- },
- "endpoint": {
- "type": "string"
- },
- "extraEnvVarsCM": {
- "type": "string"
- },
- "extraStartupArgs": {
- "type": "string"
- },
- "extraVolumeMounts": {
- "items": {
- "properties": {
- "mountPath": {
- "type": "string"
- },
- "name": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "type": "array"
- },
- "extraVolumes": {
- "items": {
- "properties": {
- "configMap": {
- "properties": {
- "name": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "name": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "type": "array"
- },
- "fullnameOverride": {
- "type": "string"
- },
- "image": {
- "properties": {
- "debug": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
- "jwt": {
- "properties": {
- "pubkey": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "metrics": {
- "properties": {
- "enabled": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
- "postgresql": {
- "properties": {
- "auth": {
- "properties": {
- "postgresPassword": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "enabled": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
- "replicaCount": {
- "type": "integer"
- },
- "tls": {
- "properties": {
- "enabled": {
- "type": "boolean"
- },
- "existingSecret": {
- "type": "string"
- },
- "usePem": {
- "type": "boolean"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
- },
- "brokerservice": {
- "properties": {
- "auth": {
- "properties": {
- "password": {
- "type": "string"
- },
- "tls": {
- "properties": {
- "enabled": {
- "type": "boolean"
- },
- "existingSecret": {
- "type": "string"
- },
- "failIfNoPeerCert": {
- "type": "boolean"
- },
- "sslOptionsVerify": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
- "username": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "connectionTimeout": {
- "type": "integer"
- },
- "enabled": {
- "type": "boolean"
- },
- "endpoint": {
- "type": "string"
- },
- "exchangeName": {
- "type": "string"
- },
- "extraConfiguration": {
- "type": "string"
- },
- "extraPlugins": {
- "type": "string"
- },
- "extraVolumes": {
- "items": {
- "properties": {
- "name": {
- "type": "string"
- },
- "secret": {
- "properties": {
- "secretName": {
- "type": "string"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
- },
- "type": "array"
- },
- "fullnameOverride": {
- "type": "string"
- },
- "host": {
- "type": "string"
- },
- "image": {
- "properties": {
- "debug": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
- "loadDefinition": {
- "properties": {
- "enabled": {
- "type": "boolean"
- },
- "existingSecret": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "persistence": {
- "properties": {
- "enabled": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
- "port": {
- "type": "integer"
- },
- "queueName": {
- "type": "string"
- },
- "replicaCount": {
- "type": "integer"
- },
- "routingKey": {
- "type": "string"
- },
- "service": {
- "properties": {
- "managerPortEnabled": {
- "type": "boolean"
- },
- "type": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "virtualHost": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "clusterDomain": {
- "type": "string"
- },
- "datadb": {
- "properties": {
- "enabled": {
- "type": "boolean"
- },
- "extraFlags": {
- "type": "string"
- },
- "extraVolumeMounts": {
- "items": {
- "properties": {
- "mountPath": {
- "type": "string"
- },
- "name": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "type": "array"
- },
- "extraVolumes": {
- "items": {
- "properties": {
- "emptyDir": {
- "properties": {},
- "type": "object"
- },
- "name": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "type": "array"
- },
- "fullnameOverride": {
- "type": "string"
- },
- "galera": {
- "properties": {
- "mariabackup": {
- "properties": {
- "password": {
- "type": "string"
- },
- "user": {
- "type": "string"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
- },
- "image": {
- "properties": {
- "debug": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
- "metrics": {
- "properties": {
- "enabled": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
- "persistence": {
- "properties": {
- "enabled": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
- "replicaCount": {
- "type": "integer"
- },
- "rootUser": {
- "properties": {
- "password": {
- "type": "string"
- },
- "user": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "service": {
- "properties": {
- "extraPorts": {
- "items": {
- "properties": {
- "name": {
- "type": "string"
- },
- "port": {
- "type": "integer"
- },
- "protocol": {
- "type": "string"
- },
- "targetPort": {
- "type": "integer"
- }
- },
- "type": "object"
- },
- "type": "array"
- }
- },
- "type": "object"
- },
- "sidecars": {
- "items": {
- "properties": {
- "envFrom": {
- "items": {
- "properties": {
- "secretRef": {
- "properties": {
- "name": {
- "type": "string"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
- },
- "type": "array"
- },
- "image": {
- "type": "string"
- },
- "imagePullPolicy": {
- "type": "string"
- },
- "livenessProbe": {
- "properties": {
- "exec": {
- "properties": {
- "command": {
- "items": {
- "type": "string"
- },
- "type": "array"
- }
- },
- "type": "object"
- },
- "initialDelaySeconds": {
- "type": "integer"
- },
- "periodSeconds": {
- "type": "integer"
- }
- },
- "type": "object"
- },
- "name": {
- "type": "string"
- },
- "ports": {
- "items": {
- "properties": {
- "containerPort": {
- "type": "integer"
- },
- "name": {
- "type": "string"
- },
- "protocol": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "type": "array"
- },
- "readinessProbe": {
- "properties": {
- "exec": {
- "properties": {
- "command": {
- "items": {
- "type": "string"
- },
- "type": "array"
- }
- },
- "type": "object"
- },
- "initialDelaySeconds": {
- "type": "integer"
- },
- "periodSeconds": {
- "type": "integer"
- }
- },
- "type": "object"
- },
- "securityContext": {
- "properties": {
- "allowPrivilegeEscalation": {
- "type": "boolean"
- },
- "capabilities": {
- "properties": {
- "drop": {
- "items": {
- "type": "string"
- },
- "type": "array"
- }
- },
- "type": "object"
- },
- "runAsGroup": {
- "type": "integer"
- },
- "runAsNonRoot": {
- "type": "boolean"
- },
- "runAsUser": {
- "type": "integer"
- },
- "seccompProfile": {
- "properties": {
- "type": {
- "type": "string"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
- },
- "volumeMounts": {
- "items": {
- "properties": {
- "mountPath": {
- "type": "string"
- },
- "name": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "type": "array"
- }
- },
- "type": "object"
- },
- "type": "array"
- }
- },
- "type": "object"
- },
- "dataservice": {
- "properties": {
- "consumerConcurrentMax": {
- "type": "integer"
- },
- "consumerConcurrentMin": {
- "type": "integer"
- },
- "default": {
- "properties": {
- "date": {
- "type": "integer"
- },
- "time": {
- "type": "integer"
- },
- "timestamp": {
- "type": "integer"
- }
- },
- "type": "object"
- },
- "enabled": {
- "type": "boolean"
- },
- "endpoint": {
- "type": "string"
- },
- "grant": {
- "properties": {
- "read": {
- "type": "string"
- },
- "write": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "image": {
- "properties": {
- "debug": {
- "type": "boolean"
- },
- "name": {
- "type": "string"
- },
- "pullPolicy": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "replicaCount": {
- "type": "integer"
- },
- "requeueRejected": {
- "type": "boolean"
- },
- "s3": {
- "properties": {
- "auth": {
- "properties": {
- "password": {
- "type": "string"
- },
- "username": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "bucket": {
- "properties": {
- "export": {
- "type": "string"
- },
- "import": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "endpoint": {
- "type": "string"
- },
- "filePath": {
- "type": "string"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
- },
- "gateway": {
- "type": "string"
- },
- "hostname": {
- "type": "string"
- },
- "ingress": {
- "properties": {
- "annotations": {
- "properties": {
- "basic": {
- "properties": {},
- "type": "object"
- },
- "rewriteApi": {
- "properties": {
- "nginx.ingress.kubernetes.io/rewrite-target": {
- "type": "string"
- },
- "nginx.ingress.kubernetes.io/use-regex": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "rewritePid": {
- "properties": {
- "nginx.ingress.kubernetes.io/rewrite-target": {
- "type": "string"
- },
- "nginx.ingress.kubernetes.io/use-regex": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "rewriteRoot": {
- "properties": {
- "nginx.ingress.kubernetes.io/rewrite-target": {
- "type": "string"
- },
- "nginx.ingress.kubernetes.io/use-regex": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "rewriteRootSecure": {
- "properties": {
- "nginx.ingress.kubernetes.io/backend-protocol": {
- "type": "string"
- },
- "nginx.ingress.kubernetes.io/force-ssl-redirect": {
- "type": "string"
- },
- "nginx.ingress.kubernetes.io/rewrite-target": {
- "type": "string"
- },
- "nginx.ingress.kubernetes.io/use-regex": {
- "type": "string"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
- },
- "className": {
- "type": "string"
- },
- "enabled": {
- "type": "boolean"
- },
- "tls": {
- "properties": {
- "enabled": {
- "type": "boolean"
- },
- "secretName": {
- "type": "string"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
- },
- "metadatadb": {
- "properties": {
- "db": {
- "properties": {
- "name": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "enabled": {
- "type": "boolean"
- },
- "extraInitDbScripts": {
- "properties": {},
- "type": "object"
- },
- "fullnameOverride": {
- "type": "string"
- },
- "galera": {
- "properties": {
- "mariabackup": {
- "properties": {
- "password": {
- "type": "string"
- },
- "user": {
- "type": "string"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
- },
- "host": {
- "type": "string"
- },
- "image": {
- "properties": {
- "debug": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
- "initdbScriptsConfigMap": {
- "type": "string"
- },
- "jdbcExtraArgs": {
- "type": "string"
- },
- "metrics": {
- "properties": {
- "enabled": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
- "persistence": {
- "properties": {
- "enabled": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
- "replicaCount": {
- "type": "integer"
- },
- "rootUser": {
- "properties": {
- "password": {
- "type": "string"
- },
- "user": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "service": {
- "properties": {
- "annotations": {
- "properties": {},
- "type": "object"
- },
- "loadBalancerIP": {
- "type": "string"
- },
- "loadBalancerSourceRanges": {
- "type": "array"
- },
- "type": {
- "type": "string"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
- },
- "metadataservice": {
- "properties": {
- "admin": {
- "properties": {
- "email": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "datacite": {
- "properties": {
- "enabled": {
- "type": "boolean"
- },
- "password": {
- "type": "string"
- },
- "prefix": {
- "type": "string"
- },
- "url": {
- "type": "string"
- },
- "username": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "deletedRecord": {
- "type": "string"
- },
- "enabled": {
- "type": "boolean"
- },
- "endpoint": {
- "type": "string"
- },
- "granularity": {
- "type": "string"
- },
- "image": {
- "properties": {
- "debug": {
- "type": "boolean"
- },
- "name": {
- "type": "string"
- },
- "pullPolicy": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "replicaCount": {
- "type": "integer"
- },
- "repositoryName": {
- "type": "string"
- },
- "s3": {
- "properties": {
- "auth": {
- "properties": {
- "password": {
- "type": "string"
- },
- "username": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "bucket": {
- "properties": {
- "export": {
- "type": "string"
- },
- "import": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "endpoint": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "sparql": {
- "properties": {
- "connectionTimeout": {
- "type": "integer"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
- },
- "namespace": {
- "type": "string"
- },
- "searchdb": {
- "properties": {
- "clusterName": {
- "type": "string"
- },
- "config": {
- "properties": {
- "opensearch.yml": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "enabled": {
- "type": "boolean"
- },
- "extraEnvs": {
- "items": {
- "properties": {
- "name": {
- "type": "string"
- },
- "value": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "type": "array"
- },
- "extraVolumeMounts": {
- "items": {
- "properties": {
- "mountPath": {
- "type": "string"
- },
- "name": {
- "type": "string"
- },
- "readOnly": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
- "type": "array"
- },
- "extraVolumes": {
- "items": {
- "properties": {
- "name": {
- "type": "string"
- },
- "secret": {
- "properties": {
- "secretName": {
- "type": "string"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
- },
- "type": "array"
- },
- "fullnameOverride": {
- "type": "string"
- },
- "host": {
- "type": "string"
- },
- "masterService": {
- "type": "string"
- },
- "password": {
- "type": "string"
- },
- "persistence": {
- "properties": {
- "enabled": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
- "port": {
- "type": "integer"
- },
- "protocol": {
- "type": "string"
- },
- "replicas": {
- "type": "integer"
- },
- "service": {
- "properties": {
- "annotations": {
- "properties": {},
- "type": "object"
- },
- "loadBalancerSourceRanges": {
- "type": "array"
- },
- "type": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "sysctlInit": {
- "properties": {
- "enabled": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
- "username": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "searchservice": {
- "properties": {
- "enabled": {
- "type": "boolean"
- },
- "endpoint": {
- "type": "string"
- },
- "image": {
- "properties": {
- "debug": {
- "type": "boolean"
- },
- "name": {
- "type": "string"
- },
- "pullPolicy": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "init": {
- "properties": {
- "image": {
- "properties": {
- "name": {
- "type": "string"
- },
- "pullPolicy": {
- "type": "string"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
- },
- "replicaCount": {
- "type": "integer"
- }
- },
- "type": "object"
- },
- "storageservice": {
- "properties": {
- "enabled": {
- "type": "boolean"
- },
- "filer": {
- "properties": {
- "enablePVC": {
- "type": "boolean"
- },
- "enabled": {
- "type": "boolean"
- },
- "replicas": {
- "type": "integer"
- },
- "s3": {
- "properties": {
- "allowEmptyFolder": {
- "type": "boolean"
- },
- "enableAuth": {
- "type": "boolean"
- },
- "enabled": {
- "type": "boolean"
- },
- "existingConfigSecret": {
- "type": "string"
- },
- "port": {
- "type": "integer"
- },
- "skipAuthSecretCreation": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
- "storage": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "init": {
- "properties": {
- "image": {
- "type": "string"
- },
- "pullPolicy": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "master": {
- "properties": {
- "enabled": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
- "s3": {
- "properties": {
- "auth": {
- "properties": {
- "password": {
- "type": "string"
- },
- "username": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "bucket": {
- "properties": {
- "export": {
- "type": "string"
- },
- "import": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "enableAuth": {
- "type": "boolean"
- },
- "enabled": {
- "type": "boolean"
- },
- "existingConfigSecret": {
- "type": "string"
- },
- "metricsPort": {
- "type": "integer"
- },
- "port": {
- "type": "integer"
- },
- "replicas": {
- "type": "integer"
- },
- "skipAuthSecretCreation": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
- "volume": {
- "properties": {
- "enabled": {
- "type": "boolean"
- },
- "replicas": {
- "type": "integer"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
- },
- "strategyType": {
- "type": "string"
- },
- "ui": {
- "properties": {
- "enabled": {
- "type": "boolean"
- },
- "extraVolumeMounts": {
- "type": "array"
- },
- "extraVolumes": {
- "type": "array"
- },
- "image": {
- "properties": {
- "debug": {
- "type": "boolean"
- },
- "name": {
- "type": "string"
- },
- "pullPolicy": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "public": {
- "properties": {
- "api": {
- "properties": {
- "client": {
- "type": "string"
- },
- "server": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "broker": {
- "properties": {
- "extra": {
- "type": "string"
- },
- "host": {
- "type": "string"
- },
- "port": {
- "properties": {
- "5671": {
- "type": "boolean"
- },
- "5672": {
- "type": "boolean"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
- },
- "database": {
- "properties": {
- "extra": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "doi": {
- "properties": {
- "enabled": {
- "type": "boolean"
- },
- "endpoint": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "icon": {
- "type": "string"
- },
- "links": {
- "properties": {
- "keycloak": {
- "properties": {
- "href": {
- "type": "string"
- },
- "text": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "rabbitmq": {
- "properties": {
- "href": {
- "type": "string"
- },
- "text": {
- "type": "string"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
- },
- "logo": {
- "type": "string"
- },
- "pid": {
- "properties": {
- "default": {
- "properties": {
- "publisher": {
- "type": "string"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
- },
- "title": {
- "type": "string"
- },
- "touch": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "replicaCount": {
- "type": "integer"
- }
- },
- "type": "object"
- },
- "uploadservice": {
- "properties": {
- "containerArgs": {
- "items": {
- "type": "string"
- },
- "type": "array"
- },
- "enabled": {
- "type": "boolean"
- },
- "envFrom": {
- "items": {
- "properties": {
- "secretRef": {
- "properties": {
- "name": {
- "type": "string"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
- },
- "type": "array"
- },
- "fullnameOverride": {
- "type": "string"
- },
- "image": {
- "properties": {
- "repository": {
- "type": "string"
- },
- "tag": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "replicaCount": {
- "type": "integer"
- }
- },
- "type": "object"
- }
- },
- "type": "object"
-}
diff --git a/versions.json b/versions.json
index ecd7dd1b937003a9c5bf34579d16d8965310e284..b17c2c59962f34c3f0fc4693ae0c6088212f6eb6 100644
--- a/versions.json
+++ b/versions.json
@@ -1,8 +1,13 @@
[
+ {
+ "version": "1.4.5",
+ "title": "1.4.5",
+ "aliases": ["latest"]
+ },
{
"version": "1.4.4",
"title": "1.4.4",
- "aliases": ["latest"]
+ "aliases": []
},
{
"version": "1.4.3",