Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

deployment/.env

@@ -1,12 +1,9 @@
 ###################### GENERAL #########################
-#User that is used to deploy the containers
-DEPLOY_USER=1000
-DEPLOY_GROUP=1000
 #version selections
 PROXY_TAG=mainline-alpine
-MAIN_APP_TAG=2.1.8
+MAIN_APP_TAG=2.1.10
-NOTIFICATION_APP_TAG=2.1.7
+NOTIFICATION_APP_TAG=2.1.11
-ANNOTATION_APP_TAG=2.1.7
+ANNOTATION_APP_TAG=2.1.10
 DOCX_APP_TAG=0.0.13
 JSON_APP_TAG=0.0.9
 ZENODO_APP_TAG=2.0.9

deployment/deploy_opencdmp.sh

@@ -22,6 +22,7 @@ for network in "${networks[@]}"; do
 done
 
 docker-compose down
+docker-compose pull
 
 chmod 744 ./elk/elasticsearch/index_init.sh
 

deployment/docker-compose.override.yml

@@ -34,7 +34,6 @@ services:
       - opencdmp-proxy-network
       - opencdmp-backend-network
       - opencdmp-plugins-network
-      - opencdmp-gotenberg-shared-network
       - opencdmp-elastic-shared-network
       - opencdmp-keycloak-shared-network
       - opencdmp-postgres-shared-network
@@ -69,7 +68,6 @@ services:
     networks:
       - opencdmp-proxy-network
       - opencdmp-backend-network
-      - opencdmp-plugins-network
       - opencdmp-rabbitmq-shared-network
       - opencdmp-keycloak-shared-network
       - opencdmp-postgres-shared-network
@@ -89,7 +87,6 @@ services:
     networks:
       - opencdmp-proxy-network
       - opencdmp-backend-network
-      - opencdmp-plugins-network
       - opencdmp-rabbitmq-shared-network
       - opencdmp-keycloak-shared-network
       - opencdmp-postgres-shared-network
@@ -110,7 +107,6 @@ services:
       - ./logs/opencdmp/file-transformer-docx:/logs
       - ./storage/opencdmp/file-transformer-docx:/storage
     networks:
-      - opencdmp-backend-network
       - opencdmp-plugins-network
       - opencdmp-gotenberg-shared-network
 
@@ -129,7 +125,6 @@ services:
       - ./logs/opencdmp/file-transformer-rda-json:/logs
       - ./storage/opencdmp/file-transformer-rda-json:/storage
     networks:
-      - opencdmp-backend-network
       - opencdmp-plugins-network
 
 # ############################## ZENODO #######################################
@@ -238,7 +233,6 @@ services:
     volumes:
      - /rabbitmq/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf:ro
     networks:
-      - opencdmp-proxy-network
       - opencdmp-rabbitmq-shared-network
 
 ################################# GOTENBERG ##############################################

deployment/keycloak/imports/opencdmp-realm.json

@@ -779,6 +779,8 @@
       "enabled": true,
       "email": "opencdmp@admin.com",
       "emailVerified": true,
+      "firstName": "opencdmp",
+      "lastName": "admin",
       "credentials": [
         {
           "type": "password",
@@ -798,6 +800,8 @@
       "enabled": true,
       "email": "dmp@api.com",
       "emailVerified": true,
+      "firstName": "keycloak",
+      "lastName": "api",
       "credentials": [
         {
           "type": "password",

deployment/opencdmp/annotation/config/app.env

@@ -7,13 +7,6 @@ DB_PASSWORD=postgres-admin
 WEB_PORT=8087
 
 #Security
-IDP_APIKEY_CLIENT_ID=dmp_annotation
-IDP_APIKEY_CLIENT_SECRET=annotation_secret
-IDP_APIKEY_SCOPE=dmp_annotation-dedicated
-
-IDP_OPAQUE_CLIENT_ID=
-IDP_OPAQUE_CLIENT_SECRET=
-
 IDP_ISSUER_URI=http://host.docker.internal:8081/keycloak/realms/OpenCDMP
 QUEUE_APP_ID=opencdmp-annotation-dev
 
@@ -21,13 +14,4 @@ QUEUE_APP_ID=opencdmp-annotation-dev
 RABBIT_HOST=opencdmp.rabbitmq
 RABBIT_PORT=5672
 RABBIT_USER=guest
-RABBIT_PASS=guest
+RABBIT_PASS=guest
-
-#EMAIL
-MAIL_HOST=smtp.office365.com
-MAIL_PORT=587
-MAIL_USERNAME=
-MAIL_PASSWORD=
-MAIL_AUTH=false
-MAIL_TLS=true
-MAIL_ADDRESS=dmp_annotation@admin.gr

deployment/opencdmp/annotation/config/cipher-test.yml

@@ -1,12 +0,0 @@
-cipher:
-  symetric-encryption:
-    default-o: null
-    options:
-      configuration:
-        aes:
-          key: ${CIPHER_SYMETRIC_ENCRYPTION_CONFIGURATION_AES_KEY:}
-          iv: ${CIPHER_SYMETRIC_ENCRYPTION_CONFIGURATION_AES_IV:}
-      queue:
-        aes:
-          key: ${CIPHER_SYMETRIC_ENCRYPTION_QUEUE_AES_KEY:}
-          iv: ${CIPHER_SYMETRIC_ENCRYPTION_QUEUE_AES_IV:}

deployment/opencdmp/annotation/config/db-test.yml

@@ -1,15 +1,5 @@
 spring:
-  jpa:
-    show-sql: true
-    properties:
-      hibernate:
-        show_sql: true
-        format_sql: false
   datasource:
     maxIdle: 10
     minIdle: 5
-    maxActive: 10
+    maxActive: 10
-    url: ${DB_CONNECTION_STRING}
-    username: ${DB_USER}
-    password: ${DB_PASSWORD}
-    driver-class-name: org.postgresql.Driver

deployment/opencdmp/annotation/config/email-test.yml

@@ -1,14 +0,0 @@
-spring:
-  mail:
-    host: ${MAIL_HOST:}
-    port: ${MAIL_PORT:}
-    username: ${MAIL_USERNAME:}
-    password: ${MAIL_PASSWORD:}
-    properties:
-      mail:
-        smtp:
-          auth: ${MAIL_AUTH:}
-          starttls:
-            enable: ${MAIL_TLS:}
-email:
-  address: ${MAIL_ADDRESS:}

deployment/opencdmp/annotation/config/logging/logback-test.xml

@@ -36,26 +36,17 @@
 
 	<logger name="org.springframework.web" level="WARN" additivity="false">
 		<appender-ref ref="TROUBLESHOOTING"/>
-		<appender-ref ref="STDOUT"/>
 	</logger>
 	<logger name="org.hibernate" level="WARN" additivity="false">
 		<appender-ref ref="TROUBLESHOOTING"/>
-		<appender-ref ref="STDOUT"/>
 	</logger>
 	<logger name="gr.cite" level="WARN" additivity="false">
 		<appender-ref ref="TROUBLESHOOTING"/>
-		<appender-ref ref="STDOUT"/>
-	</logger>
-	<logger name="org.springframework.data.elasticsearch.client.WIRE" level="TRACE" additivity="false">
-		<appender-ref ref="TROUBLESHOOTING"/>
-		<appender-ref ref="STDOUT"/>
 	</logger>
 	<logger name="audit" level="INFO" additivity="false">
 		<appender-ref ref="AUDITING"/>
-		<appender-ref ref="STDOUT"/>
 	</logger>
 	<root level="info">
 		<appender-ref ref="TROUBLESHOOTING"/>
-		<appender-ref ref="STDOUT"/>
 	</root>
 </configuration>

deployment/opencdmp/annotation/config/queue-test.yml

@@ -1,9 +1,5 @@
 queue:
   rabbitmq:
-    host: ${RABBIT_HOST}
-    port: ${RABBIT_PORT}
-    username: ${RABBIT_USER}
-    password: ${RABBIT_PASS}
     enable: true
     durable: true
     queue: cite_dmp_test_annotation_inbox_queue

deployment/opencdmp/annotation/config/security-test.yml

@@ -1,21 +1,7 @@
 web:
   security:
-    enabled: true
-    authorized-endpoints: [ api ]
-    allowed-endpoints: [ health ]
     idp:
-      api-key:
-        enabled: true
-        authorization-header: Authorization
-        client-id: ${IDP_APIKEY_CLIENT_ID:}
-        client-secret: ${IDP_APIKEY_CLIENT_SECRET:}
-        scope: ${IDP_APIKEY_SCOPE:}
       resource:
-        token-type: JWT #| opaque
-        opaque:
-          client-id: ${IDP_OPAQUE_CLIENT_ID:}
-          client-secret: ${IDP_OPAQUE_CLIENT_SECRET:}
         jwt:
           claims: [ role, x-role ]
-          issuer-uri: ${IDP_ISSUER_URI:}
           audiences: [ "dmp_annotation" ]

deployment/opencdmp/annotation/config/server-test.yml

@@ -1,3 +1,2 @@
 server:
-  port: ${WEB_PORT}
   forward-headers-strategy: FRAMEWORK

deployment/opencdmp/backend/certificates/elasticsearch_dev04.crt

@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDXDCCAkSgAwIBAgIUK8FEbNAIdyPoRF/pTyqNuL3kP54wDQYJKoZIhvcNAQEL
-BQAwRzELMAkGA1UEBhMCR1IxDTALBgNVBAgMBENJVEUxDDAKBgNVBAcMA0FUSDEN
-MAsGA1UECgwEQ0lURTEMMAoGA1UEAwwDZWxrMCAXDTIyMDkwODA4MjgxM1oYDzIx
-MjIwODE1MDgyODEzWjAYMRYwFAYDVQQDDA1lbGFzdGljc2VhcmNoMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoC6DoPC1kesTH0cKs1blVW8ddsQ3VmFO
-ROJiUorhDIHB3sXJhCSw0hxZFNZtqgG35CTa5w3XiQMT1fr6Ar/ztOQmARg9CMQa
-mOf8gR+tMTSwP7zr7WBR/1Q+GseeOnthFOfvfq7LLpRs8VNb/mhcSIjJsT9kMNXN
-5iHIyEuGhQSwPZDUYx+6Ag4belQLvic+QYDhwvujtPFWj8qLSG7kTpbBK5ahH/5E
-mvT5mpOYTR10f3LG4DKw7t6qG9tzh4WkwR0JYmlgxpAA/HBSa/QjS7CGxLrA4Sop
-gQF8KQPEP/0w98EbYpBUPS5jqbkBr6093M7Epksi86oRjtbcXAT0qwIDAQABo20w
-azApBgNVHREEIjAggg1lbGFzdGljc2VhcmNogglsb2NhbGhvc3SHBH8AAAEwHQYD
-VR0OBBYEFC/cKMOAVbx8bwyoKdg2Oiej9xoSMB8GA1UdIwQYMBaAFBIAjWDf6ACx
-PkEdV9pY+U0XL0iCMA0GCSqGSIb3DQEBCwUAA4IBAQBo42FOuxIMeIiMaKa347gc
-WsHpkazYOA6iHK5xXPsVUU1xSCLKp5HLCC04FU5P9njCDyZo1e/SR6rirQJJHEtT
-SAn7iabREE+vy0oN3JnyV+eJPmKWxlqeFr9Cs9uIXQbgjwyyj9rxT06eLr3M1MA1
-IsARV2eyxcgS5sCC8JBCEpKR4jLRrpAs0tGJOeIh1cmf/1id+NQaDa14sLFKHBH1
-3+6TfBPrhJoGqFz92jV2airr7dppyCXgmWymVc66iD00Nak6Bvchg6ARTkqJnfoZ
-2/Tz7asHV2V052ZLiow7Si34nS/9Hp8F8vUaj+FYXowvGwQUXLQIg/53KXh7piuW
------END CERTIFICATE-----

deployment/opencdmp/backend/config/app.env

@@ -15,9 +15,6 @@ ELASTIC_DESCRIPTION_INDEX=opencdmp-descriptions-test
 #SERVER
 WEB_PORT=8081
 
-#GOTENBERG
-PDF_CONVERTER_URL=http://opencdmp.gotenberg:3000/
-
 #STORAGE
 FILE_STORAGE=/storage
 
@@ -31,7 +28,7 @@ RABBIT_PASS=guest
 KEYCLOAK_API_SERVER_URL=http://host.docker.internal:8081/keycloak
 KEYCLOAK_API_REALM=OpenCDMP
 KEYCLOAK_API_USERNAME=dmp-keycloak-api
-KEYCLOAK_API_PASSWORD=dmp-api
+KEYCLOAK_API_PASSWORD=admin
 KEYCLOAK_API_CLIENT_ID=dmp_web
 KEYCLOAK_API_CLIENT_SECRET=web_secret
 
@@ -45,13 +42,4 @@ IDP_APIKEY_SCOPE=dmp_plugins
 #METRICS
 IDP_APIKEY_CLIENT_ID_UUID=c82150e9-a9e5-4a5f-bd0f-5f25460b3e08
 
-QUEUE_APP_ID=opencdmp-api-dev
+QUEUE_APP_ID=opencdmp-api-dev
-
-#EMAIL
-MAIL_HOST=smtp.office365.com
-MAIL_PORT=587
-MAIL_USERNAME=
-MAIL_PASSWORD=
-MAIL_AUTH=false
-MAIL_TLS=true
-MAIL_ADDRESS=dmp_web@admin.gr

deployment/opencdmp/backend/config/db-test.yml

@@ -1,14 +1,7 @@
 spring:
-  jpa:
-    show-sql: true
-    properties:
-      hibernate:
-        format_sql: false
   datasource:
     maxIdle: 10
     minIdle: 5
     maxActive: 10
-    url: ${DB_URL:}
+
-    username: ${DB_USER:}
-    password: ${DB_PASS:}
         

deployment/opencdmp/backend/config/elasticsearch-test.yml

@@ -1,23 +0,0 @@
-elastic:
-  enabled: ${ELASTIC_ENABLED:}
-  disableHostnameVerifier: true
-  serverCertificatePaths:
-    - /certificates/elasticsearch_dev04.crt
-  hosts:
-    - ${ELASTIC_HOST:}
-  username: ${ELASTIC_USER:}
-  password: ${ELASTIC_PASS:}
-  useSSL: ${ELASTIC_USE_SSL:}
-  socketTimeoutMillis: 30000
-  connectTimeoutMillis: 30000
-  defaultResultSize: 100
-  defaultCollectAllResultSize: 1000
-  defaultScrollSize: 100
-  defaultScrollSeconds: 120
-  defaultCompositeAggregationResultSize: 200000
-app-elastic:
-  enableIcuAnalysisPlugin: true
-  enabled: ${ELASTIC_ENABLED:}
-  dmpIndexName: ${ELASTIC_DMP_INDEX:}
-  descriptionIndexName: ${ELASTIC_DESCRIPTION_INDEX:}
-  resetBatchSize: 1000

deployment/opencdmp/backend/config/logging/logback-test.xml

@@ -34,34 +34,26 @@
         </encoder>
     </appender>
 
-
     <logger name="org.springframework.web" level="WARN" additivity="false">
         <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
     </logger>
     <logger name="org.hibernate" level="WARN" additivity="false">
         <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
     </logger>
     <logger name="gr.cite" level="WARN" additivity="false">
         <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
     </logger>
     <logger name="eu.eudat" level="WARN" additivity="false">
         <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
     </logger>
     <logger name="org.springframework.data.elasticsearch.client.WIRE" level="TRACE" additivity="false">
         <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
     </logger>
     <logger name="audit" level="INFO" additivity="false">
         <appender-ref ref="AUDITING"/>
-        <appender-ref ref="STDOUT"/>
     </logger>
     <root level="INFO">
         <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
     </root>
 </configuration>
 

deployment/opencdmp/backend/config/metrics-test.yml

@@ -11,3 +11,7 @@ metrics:
 endpoints:
   prometheus:
     sensitive: false
+management:
+  endpoints:
+    web:
+      base-path: /api

deployment/opencdmp/backend/config/security-test.yml

@@ -1,15 +1,8 @@
 web:
   security:
-    enabled: true
+    allowed-endpoints: [ api/public, api/dmp/public, api/description/public, /api/supportive-material/public, api/language/public, api/contact-support/public, api/dashboard/public, api/prometheus, api/health, api/metrics ]
-    authorized-endpoints: [ api ]
-    allowed-endpoints: [ api/public, api/dmp/public, api/description/public, /api/supportive-material/public, api/language/public, api/contact-support/public, api/dashboard/public, prometheus, health, metrics ]
     idp:
-      api-key:
-        enabled: false
       resource:
-        token-type: JWT #| opaque
         jwt:
           claims: [ role, x-role ]
-          issuer-uri: ${IDP_ISSUER_URI:}
+          audiences: [ "dmp_web" ]
-          audiences: [ "dmp_web" ]
-          validIssuer: ${IDP_ISSUER_URI:}

deployment/opencdmp/file-transformer-docx/config/logging/logback-test.xml

@@ -34,34 +34,23 @@
         </encoder>
     </appender>
 
-
     <logger name="org.springframework.web" level="WARN" additivity="false">
         <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
     </logger>
     <logger name="org.hibernate" level="WARN" additivity="false">
         <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
     </logger>
     <logger name="gr.cite" level="WARN" additivity="false">
         <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
     </logger>
     <logger name="eu.eudat" level="WARN" additivity="false">
         <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
-    </logger>
-    <logger name="org.springframework.data.elasticsearch.client.WIRE" level="TRACE" additivity="false">
-        <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
     </logger>
     <logger name="audit" level="INFO" additivity="false">
         <appender-ref ref="AUDITING"/>
-        <appender-ref ref="STDOUT"/>
     </logger>
     <root level="INFO">
         <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
     </root>
 </configuration>
 

deployment/opencdmp/file-transformer-docx/config/pdf-test.yml

@@ -1,3 +0,0 @@
-pdf:
-  converter:
-    url: ${PDF_CONVERTER_URL}

deployment/opencdmp/file-transformer-docx/config/storage-test.yml

@@ -1,4 +0,0 @@
-file:
-  storage:
-    temp: ${STORAGE_PATH}/tmp
-    transient-path: ${STORAGE_PATH}/shared

deployment/opencdmp/file-transformer-rda-json/config/logging/logback-test.xml

@@ -37,31 +37,21 @@
 
     <logger name="org.springframework.web" level="WARN" additivity="false">
         <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
     </logger>
     <logger name="org.hibernate" level="WARN" additivity="false">
         <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
     </logger>
     <logger name="gr.cite" level="WARN" additivity="false">
         <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
     </logger>
     <logger name="eu.eudat" level="WARN" additivity="false">
         <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
-    </logger>
-    <logger name="org.springframework.data.elasticsearch.client.WIRE" level="TRACE" additivity="false">
-        <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
     </logger>
     <logger name="audit" level="INFO" additivity="false">
         <appender-ref ref="AUDITING"/>
-        <appender-ref ref="STDOUT"/>
     </logger>
     <root level="INFO">
         <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
     </root>
 </configuration>
 

deployment/opencdmp/file-transformer-rda-json/config/storage-test.yml

@@ -1,4 +0,0 @@
-file:
-  storage:
-    temp: ${STORAGE_PATH}/tmp
-    transient-path: ${STORAGE_PATH}/shared

deployment/opencdmp/frontend/config.json

@@ -64,5 +64,10 @@
 				"cultures": ["en"]
 			}
 		]
+	},
+	"referenceTypes": {
+        "researcherId": "5a2112e7-ea99-4cfe-98a1-68665e26726e",
+        "grantId": "5b9c284f-f041-4995-96cc-fad7ad13289c",
+        "organizationId": "7eeffb98-58fb-4921-82ec-e27f32f8e738"
 	}
 }

deployment/opencdmp/notification/config/app.env

@@ -7,13 +7,6 @@ DB_PASSWORD=postgres-admin
 WEB_PORT=8080
 
 #Security
-IDP_APIKEY_CLIENT_ID=dmp_notification
-IDP_APIKEY_CLIENT_SECRET=notification_secret
-IDP_APIKEY_SCOPE=dmp_notification-dedicated
-
-IDP_OPAQUE_CLIENT_ID=
-IDP_OPAQUE_CLIENT_SECRET=
-
 IDP_ISSUER_URI=http://host.docker.internal:8081/keycloak/realms/OpenCDMP
 
 #RABBITMQ
@@ -23,19 +16,13 @@ RABBIT_USER=guest
 RABBIT_PASS=guest
 
 #EMAIL
-MAIL_HOST=smtp.office365.com
+MAIL_HOST=
-MAIL_PORT=587
+MAIL_PORT=
 MAIL_USERNAME=
 MAIL_PASSWORD=
-MAIL_AUTH=false
+MAIL_AUTH=
-MAIL_TLS=true
+MAIL_TLS=
 MAIL_ADDRESS=dmp_notification@admin.gr
 
-#CIPHER
-CIPHER_SYMETRIC_ENCRYPTION_CONFIGURATION_AES_KEY=
-CIPHER_SYMETRIC_ENCRYPTION_CONFIGURATION_AES_IV=
-CIPHER_SYMETRIC_ENCRYPTION_QUEUE_AES_KEY=
-CIPHER_SYMETRIC_ENCRYPTION_QUEUE_AES_IV=
-
 #NOTIFICATION
-#CACHE_DISAMBIGUATION=
+CACHE_DISAMBIGUATION=ntf

deployment/opencdmp/notification/config/cipher-test.yml

@@ -1,12 +0,0 @@
-cipher:
-  symetric-encryption:
-    default-o: null
-    options:
-      configuration:
-        aes:
-          key: ${CIPHER_SYMETRIC_ENCRYPTION_CONFIGURATION_AES_KEY:}
-          iv: ${CIPHER_SYMETRIC_ENCRYPTION_CONFIGURATION_AES_IV:}
-      queue:
-        aes:
-          key: ${CIPHER_SYMETRIC_ENCRYPTION_QUEUE_AES_KEY:}
-          iv: ${CIPHER_SYMETRIC_ENCRYPTION_QUEUE_AES_IV:}

deployment/opencdmp/notification/config/db-test.yml

@@ -1,18 +1,5 @@
 spring:
-  jpa:
-    show-sql: true
-    properties:
-      hibernate:
-        show_sql: true
-        format_sql: false
   datasource:
-    url: ${DB_CONNECTION_STRING}
+    maxIdle: 10
-    username: ${DB_USER}
+    minIdle: 5
-    password: ${DB_PASSWORD}
+    maxActive: 10
-    driver-class-name: org.postgresql.Driver
-    hikari:
-      connection-timeout: 30000
-      minimum-idle: 3
-      maximum-pool-size: 5
-      idle-timeout: 600000
-      max-lifetime: 1800000

deployment/opencdmp/notification/config/email-test.yml

@@ -1,14 +0,0 @@
-spring:
-  mail:
-    host: ${MAIL_HOST:}
-    port: ${MAIL_PORT:}
-    username: ${MAIL_USERNAME:}
-    password: ${MAIL_PASSWORD:}
-    properties:
-      mail:
-        smtp:
-          auth: ${MAIL_AUTH:}
-          starttls:
-            enable: ${MAIL_TLS:}
-email:
-  address: ${MAIL_ADDRESS:}

deployment/opencdmp/notification/config/logging/logback-test.xml

@@ -36,26 +36,17 @@
 
 	<logger name="org.springframework.web" level="WARN" additivity="false">
 		<appender-ref ref="TROUBLESHOOTING"/>
-		<appender-ref ref="STDOUT"/>
 	</logger>
 	<logger name="org.hibernate" level="WARN" additivity="false">
 		<appender-ref ref="TROUBLESHOOTING"/>
-		<appender-ref ref="STDOUT"/>
 	</logger>
 	<logger name="gr.cite" level="WARN" additivity="false">
 		<appender-ref ref="TROUBLESHOOTING"/>
-		<appender-ref ref="STDOUT"/>
-	</logger>
-	<logger name="org.springframework.data.elasticsearch.client.WIRE" level="TRACE" additivity="false">
-		<appender-ref ref="TROUBLESHOOTING"/>
-		<appender-ref ref="STDOUT"/>
 	</logger>
 	<logger name="audit" level="INFO" additivity="false">
 		<appender-ref ref="AUDITING"/>
-		<appender-ref ref="STDOUT"/>
 	</logger>
 	<root level="info">
 		<appender-ref ref="TROUBLESHOOTING"/>
-		<appender-ref ref="STDOUT"/>
 	</root>
 </configuration>

deployment/opencdmp/notification/config/notification-test.yml

@@ -486,5 +486,5 @@ notification:
           priority-key: null
           cipher-fields: [ ]
       template-cache:
-        prefix: ${CACHE_DISAMBIGUATION:}
+        prefix: ${CACHE_DISAMBIGUATION}
         key-pattern: "{prefix}:Notification_Message_InApp_Template:{key}:v0"

deployment/opencdmp/notification/config/queue-test.yml

@@ -1,9 +1,5 @@
 queue:
   rabbitmq:
-    host: ${RABBIT_HOST}
-    port: ${RABBIT_PORT}
-    username: ${RABBIT_USER}
-    password: ${RABBIT_PASS}
     enable: true
     durable: true
     queue: cite_dmp_test_notification_inbox_queue

deployment/opencdmp/notification/config/security-test.yml

@@ -1,21 +1,7 @@
 web:
   security:
-    enabled: true
-    authorized-endpoints: [ api ]
-    allowed-endpoints: [ health ]
     idp:
-      api-key:
-        enabled: true
-        authorization-header: Authorization
-        client-id: ${IDP_APIKEY_CLIENT_ID:}
-        client-secret: ${IDP_APIKEY_CLIENT_SECRET:}
-        scope: ${IDP_APIKEY_SCOPE:}
       resource:
-        token-type: JWT #| opaque
-        opaque:
-          client-id: ${IDP_OPAQUE_CLIENT_ID:}
-          client-secret: ${IDP_OPAQUE_CLIENT_SECRET:}
         jwt:
           claims: [ role, x-role ]
-          issuer-uri: ${IDP_ISSUER_URI:}
           audiences: [ "dmp_notification" ]

deployment/opencdmp/notification/config/server-test.yml

@@ -1,3 +1,2 @@
 server:
-  port: ${WEB_PORT}
   forward-headers-strategy: FRAMEWORK

deployment/opencdmp/notification/config/tenant-test.yml

@@ -6,5 +6,4 @@ tenant:
     default-tenant-code: default
   interceptor:
     client-claims-prefix: client_
-    enforce-trusted-tenant: false
+    enforce-trusted-tenant: false
-    auto-create-tenant-user: true

deployment/opencdmp/zenodo/config/logging/logback-test.xml

@@ -34,34 +34,23 @@
         </encoder>
     </appender>
 
-
     <logger name="org.springframework.web" level="WARN" additivity="false">
         <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
     </logger>
     <logger name="org.hibernate" level="WARN" additivity="false">
         <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
     </logger>
     <logger name="gr.cite" level="WARN" additivity="false">
         <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
     </logger>
     <logger name="eu.eudat" level="WARN" additivity="false">
         <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
-    </logger>
-    <logger name="org.springframework.data.elasticsearch.client.WIRE" level="TRACE" additivity="false">
-        <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
     </logger>
     <logger name="audit" level="INFO" additivity="false">
         <appender-ref ref="AUDITING"/>
-        <appender-ref ref="STDOUT"/>
     </logger>
     <root level="INFO">
         <appender-ref ref="TROUBLESHOOTING"/>
-        <appender-ref ref="STDOUT"/>
     </root>
 </configuration>
 

deployment/opencdmp/zenodo/config/security-test.yml

@@ -4,6 +4,4 @@ web:
       resource:
         jwt:
           claims: [ role, x-role ]
-          issuer-uri: ${IDP_ISSUER_URI}
-          validIssuer: ${IDP_ISSUER_URI}
           audiences: [ "dmp_plugins" ]

deployment/opencdmp/zenodo/config/server-test.yml

@@ -1,4 +1,2 @@
 server:
-  max-http-request-header-size: 16KB
+  max-http-request-header-size: 16KB
-  port: ${WEB_PORT}
-  # forward-headers-strategy: FRAMEWORK

deployment/opencdmp/zenodo/config/storage-test.yml

@@ -1,4 +0,0 @@
-file:
-  storage:
-    temp: ${STORAGE_PATH}/tmp
-    transient-path: ${STORAGE_PATH}/shared