From 1923591a943b87a1a0f8393f9953f5484f3de946 Mon Sep 17 00:00:00 2001
From: Sriharsha Chintalapani <harshach@users.noreply.github.com>
Date: Thu, 9 Jun 2022 21:02:32 -0700
Subject: [PATCH] Fix #5275: OpenMetadata database driver should be
 configurable via Env (#5402)

---
 .../org/openmetadata/catalog/airflow/AuthConfiguration.java | 2 +-
 .../catalog/util/OpenMetadataClientSecurityUtil.java        | 2 +-
 conf/openmetadata.yaml                                      | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/airflow/AuthConfiguration.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/airflow/AuthConfiguration.java
index 91a02e80013..21fcb83f500 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/airflow/AuthConfiguration.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/airflow/AuthConfiguration.java
@@ -34,5 +34,5 @@ public class AuthConfiguration {
 
   @Getter @Setter private CustomOIDCSSOClientConfig customOidc;
 
-  @Getter @Setter private OpenMetadataJWTClientConfig openMetadataJWTClientConfig;
+  @Getter @Setter private OpenMetadataJWTClientConfig openMetadataJWT;
 }
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/util/OpenMetadataClientSecurityUtil.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/util/OpenMetadataClientSecurityUtil.java
index ca69431166d..4483200dbac 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/util/OpenMetadataClientSecurityUtil.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/util/OpenMetadataClientSecurityUtil.java
@@ -85,7 +85,7 @@ public final class OpenMetadataClientSecurityUtil {
         openMetadataServerConnection.setSecurityConfig(customOIDCSSOClientConfig);
         break;
       case OPENMETADATA:
-        OpenMetadataJWTClientConfig openMetadataJWTClientConfig = authConfig.getOpenMetadataJWTClientConfig();
+        OpenMetadataJWTClientConfig openMetadataJWTClientConfig = authConfig.getOpenMetadataJWT();
         checkAuthConfig(openMetadataJWTClientConfig, authProvider);
         checkRequiredField(JWT_TOKEN, openMetadataJWTClientConfig.getJwtToken(), authProvider);
         openMetadataServerConnection.setSecurityConfig(openMetadataJWTClientConfig);
diff --git a/conf/openmetadata.yaml b/conf/openmetadata.yaml
index 1a31d8ae499..ba42e145263 100644
--- a/conf/openmetadata.yaml
+++ b/conf/openmetadata.yaml
@@ -115,12 +115,12 @@ logging:
 
 database:
   # the name of the JDBC driver, mysql in our case
-  driverClass: com.mysql.cj.jdbc.Driver
+  driverClass: ${DB_DRIVER_CLASS:com.mysql.cj.jdbc.Driver}
   # the username and password
   user: ${MYSQL_USER:-openmetadata_user}
   password: ${MYSQL_USER_PASSWORD:-openmetadata_password}
   # the JDBC URL; the database is called openmetadata_db
-  url: jdbc:mysql://${MYSQL_HOST:-localhost}:${MYSQL_PORT:-3306}/${MYSQL_DATABASE:-openmetadata_db}?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC
+  url: jdbc:${DB_SCHEME:-mysql}://${MYSQL_HOST:-localhost}:${MYSQL_PORT:-3306}/${MYSQL_DATABASE:-openmetadata_db}?allowPublicKeyRetrieval=true&useSSL=${DB_USE_SSL:-false}&serverTimezone=UTC
 
 migrationConfiguration:
   path: "./bootstrap/sql"
@@ -196,6 +196,8 @@ airflowConfiguration:
       clientId: ${OM_AUTH_AIRFLOW_CUSTOM_OIDC_CLIENT_ID:-""}
       secretKey: ${OM_AUTH_AIRFLOW_CUSTOM_OIDC_SECRET_KEY_PATH:-""}
       tokenEndpoint: ${OM_AUTH_AIRFLOW_CUSTOM_OIDC_TOKEN_ENDPOINT_URL:-""}
+    openMetadataJWT:
+      jwtToken: ${OM_AUTH_JWT_TOKEN:-""}
 
 slackEventPublishers:
   - name: "slack events"