yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-09-26 09:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #5275: OpenMetadata database driver should be configurable via Env (#5402)

Browse Source
This commit is contained in:
Sriharsha Chintalapani 2022-06-09 21:02:32 -07:00 committed by GitHub
parent 5611ed7767
commit 1923591a94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
catalog-rest-service/src/main/java/org/openmetadata/catalog/airflow/AuthConfiguration.java
View File

@ -34,5 +34,5 @@ public class AuthConfiguration {
@Getter @Setter private CustomOIDCSSOClientConfig customOidc; @Getter @Setter private CustomOIDCSSOClientConfig customOidc;
@Getter @Setter private OpenMetadataJWTClientConfig openMetadataJWTClientConfig; @Getter @Setter private OpenMetadataJWTClientConfig openMetadataJWT;
} }

2
catalog-rest-service/src/main/java/org/openmetadata/catalog/util/OpenMetadataClientSecurityUtil.java
View File

@ -85,7 +85,7 @@ public final class OpenMetadataClientSecurityUtil {
openMetadataServerConnection.setSecurityConfig(customOIDCSSOClientConfig); openMetadataServerConnection.setSecurityConfig(customOIDCSSOClientConfig);
break; break;
case OPENMETADATA: case OPENMETADATA:
OpenMetadataJWTClientConfig openMetadataJWTClientConfig = authConfig.getOpenMetadataJWTClientConfig(); OpenMetadataJWTClientConfig openMetadataJWTClientConfig = authConfig.getOpenMetadataJWT();
checkAuthConfig(openMetadataJWTClientConfig, authProvider); checkAuthConfig(openMetadataJWTClientConfig, authProvider);
checkRequiredField(JWT_TOKEN, openMetadataJWTClientConfig.getJwtToken(), authProvider); checkRequiredField(JWT_TOKEN, openMetadataJWTClientConfig.getJwtToken(), authProvider);
openMetadataServerConnection.setSecurityConfig(openMetadataJWTClientConfig); openMetadataServerConnection.setSecurityConfig(openMetadataJWTClientConfig);

6
conf/openmetadata.yaml
View File

@ -115,12 +115,12 @@ logging:
database: database:
# the name of the JDBC driver, mysql in our case # 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 # the username and password
user: ${MYSQL_USER:-openmetadata_user} user: ${MYSQL_USER:-openmetadata_user}
password: ${MYSQL_USER_PASSWORD:-openmetadata_password} password: ${MYSQL_USER_PASSWORD:-openmetadata_password}
# the JDBC URL; the database is called openmetadata_db # 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: migrationConfiguration:
path: "./bootstrap/sql" path: "./bootstrap/sql"
@ -196,6 +196,8 @@ airflowConfiguration:
clientId: ${OM_AUTH_AIRFLOW_CUSTOM_OIDC_CLIENT_ID:-""} clientId: ${OM_AUTH_AIRFLOW_CUSTOM_OIDC_CLIENT_ID:-""}
secretKey: ${OM_AUTH_AIRFLOW_CUSTOM_OIDC_SECRET_KEY_PATH:-""} secretKey: ${OM_AUTH_AIRFLOW_CUSTOM_OIDC_SECRET_KEY_PATH:-""}
tokenEndpoint: ${OM_AUTH_AIRFLOW_CUSTOM_OIDC_TOKEN_ENDPOINT_URL:-""} tokenEndpoint: ${OM_AUTH_AIRFLOW_CUSTOM_OIDC_TOKEN_ENDPOINT_URL:-""}
openMetadataJWT:
jwtToken: ${OM_AUTH_JWT_TOKEN:-""}
slackEventPublishers: slackEventPublishers:
- name: "slack events" - name: "slack events"