Merge pull request #203 from RADAR-base/data-dashboard-backend-fixes

[data-dashboard-backend] Several fixes to chart
RADAR-base · Jun 21, 2024 · d955250 · d955250
2 parents b2fc1fb + 7837fec
commit d955250
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 6 deletions.
diff --git a/charts/data-dashboard-backend/Chart.yaml b/charts/data-dashboard-backend/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "0.1.2"
 name: data-dashboard-backend
 description: API for data in the data dashboard
-version: 0.1.9
+version: 0.2.0
 sources: ["https://github.com/thehyve/radar-data-dashboard-backend"]
 deprecated: false
 type: application

diff --git a/charts/data-dashboard-backend/README.md b/charts/data-dashboard-backend/README.md
@@ -2,7 +2,7 @@
 
 # data-dashboard-backend
 
-![Version: 0.1.9](https://img.shields.io/badge/Version-0.1.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.2](https://img.shields.io/badge/AppVersion-0.1.2-informational?style=flat-square)
+![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.2](https://img.shields.io/badge/AppVersion-0.1.2-informational?style=flat-square)
 
 API for data in the data dashboard
 
@@ -47,7 +47,7 @@ API for data in the data dashboard
 | ingress.path | string | `"/api"` | Path within the url structure |
 | ingress.pathType | string | `"ImplementationSpecific"` |  |
 | ingress.hosts | list | `["localhost"]` | Hosts to accept requests from |
-| ingress.tls.secretName | string | `"radar-base-data-dashboard"` |  |
+| ingress.tls.secretName | string | `"radar-base-data-dashboard-tls"` |  |
 | resources | object | `{}` |  |
 | autoscaling.enabled | bool | `false` | Enable horizontal autoscaling |
 | autoscaling.minReplicas | int | `1` |  |
@@ -61,9 +61,12 @@ API for data in the data dashboard
 | managementPortal.url | string | `"http://management-portal:8080/managementportal"` | ManagementPortal URL |
 | managementPortal.clientId | string | `"radar_data_dashboard_backend"` | ManagementPortal OAuth 2.0 client ID, having grant type client_credentials |
 | managementPortal.clientSecret | string | `"secret"` | ManagementPortal OAuth 2.0 client secret |
+| jwtResourceName | string | `"res_DataDashboardAPI"` | JWT Resource name to use for this service in ManagementPortal |
 | path | string | `"/api"` | Base path to use in application |
 | jdbc.driver | string | `"org.postgresql.Driver"` | JDBC Driver to connect to the database. |
 | jdbc.url | string | `"jdbc:postgresql://postgresql:5432/data-dashboard"` | JDBC Connection url of the database. |
 | jdbc.user | string | `"postgres"` | Username of the database |
 | jdbc.password | string | `"secret"` | Password of the user |
 | jdbc.dialect | string | `"org.hibernate.dialect.PostgreSQLDialect"` | Hibernate dialect to use for JDBC Connection |
+| jdbc.properties."hibernate.globally_quoted_identifiers" | bool | `true` | Must be _true_ for compatibility with table created by jdbc-connector |
+| jdbc.properties."hibernate.physical_naming_strategy" | string | `"org.radarbase.datadashboard.api.domain.model.CamelCaseToUppercaseColumnNamingStrategy"` | Must be _CamelCaseToUppercaseColumnNamingStrategy_ for compatibility with table created by jdbc-connector |
diff --git a/charts/data-dashboard-backend/templates/configmap.yaml b/charts/data-dashboard-backend/templates/configmap.yaml
@@ -24,3 +24,5 @@ data:
       user: {{ .Values.jdbc.user }}
       password: {{ .Values.jdbc.password }}
       dialect: {{ .Values.jdbc.dialect }}
+      properties:
+        {{ .Values.jdbc.properties | toYaml | indent 8 | trim }}
diff --git a/charts/data-dashboard-backend/values.yaml b/charts/data-dashboard-backend/values.yaml
@@ -56,7 +56,7 @@ ingress:
   hosts:
     - localhost
   tls:
-    secretName: radar-base-data-dashboard
+    secretName: radar-base-data-dashboard-tls
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
@@ -100,6 +100,8 @@ managementPortal:
   clientId: radar_data_dashboard_backend
   # -- ManagementPortal OAuth 2.0 client secret
   clientSecret: secret
+# -- JWT Resource name to use for this service in ManagementPortal
+jwtResourceName: res_DataDashboardAPI
 
 # -- Base path to use in application
 path: /api
@@ -115,3 +117,8 @@ jdbc:
   password: secret
   # -- Hibernate dialect to use for JDBC Connection
   dialect: org.hibernate.dialect.PostgreSQLDialect
+  properties:
+    # -- Must be _true_ for compatibility with table created by jdbc-connector
+    hibernate.globally_quoted_identifiers: true
+    # -- Must be _CamelCaseToUppercaseColumnNamingStrategy_ for compatibility with table created by jdbc-connector
+    hibernate.physical_naming_strategy: org.radarbase.datadashboard.api.domain.model.CamelCaseToUppercaseColumnNamingStrategy
diff --git a/charts/management-portal/Chart.yaml b/charts/management-portal/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "2.0.0"
 description: A Helm chart for RADAR-Base Management Portal to manage projects and participants throughout RADAR-base.
 name: management-portal
-version: 1.1.6
+version: 1.1.7
 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png"
 sources:
 - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/management-portal

diff --git a/charts/management-portal/README.md b/charts/management-portal/README.md
@@ -3,7 +3,7 @@
 # management-portal
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/management-portal)](https://artifacthub.io/packages/helm/radar-base/management-portal)
 
-![Version: 1.1.6](https://img.shields.io/badge/Version-1.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
+![Version: 1.1.7](https://img.shields.io/badge/Version-1.1.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
 
 A Helm chart for RADAR-Base Management Portal to manage projects and participants throughout RADAR-base.
 

diff --git a/charts/management-portal/values.yaml b/charts/management-portal/values.yaml
@@ -342,8 +342,10 @@ oauth_clients:
       - res_ManagementPortal
       - res_appconfig
       - res_AppServer
+      - res_DataDashboardAPI
     client_secret: ""
     scope:
+      - MEASUREMENT.READ
       - MEASUREMENT.CREATE
       - PROJECT.READ
       - ROLE.READ
@@ -572,10 +574,14 @@ oauth_clients:
     enable: false
     resource_ids:
       - res_DataDashboardAPI
+      - res_ManagementPortal
     client_secret: ""
     scope:
+      - PROJECT.READ
+      - SUBJECT.READ
       - MEASUREMENT.READ
     authorized_grant_types:
       - authorization_code
       - refresh_token
+      - client_credentials
     access_token_validity: 900