yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2026-01-04 03:15:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Empty Connection Overwrite Logic (#18122)

Browse Source
This commit is contained in:
Ayush Shah 2024-10-07 10:10:57 +05:30 committed by GitHub
parent d678e04e2e
commit 2c84442e39
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ServiceEntityRepository.java
View File

@ -124,20 +124,31 @@ public abstract class ServiceEntityRepository<
private void updateConnection() {
ServiceConnectionEntityInterface origConn = original.getConnection();
ServiceConnectionEntityInterface updatedConn = updated.getConnection();
if (!CommonUtil.nullOrEmpty(origConn) && !CommonUtil.nullOrEmpty(updatedConn)) {
if (!CommonUtil.nullOrEmpty(updatedConn)) {
// We check if the updatedConn is null or empty
String origJson = JsonUtils.pojoToJson(origConn);
String updatedJson = JsonUtils.pojoToJson(updatedConn);
S decryptedOrigConn = JsonUtils.readValue(origJson, serviceConnectionClass);
S decryptedUpdatedConn = JsonUtils.readValue(updatedJson, serviceConnectionClass);
SecretsManager secretsManager = SecretsManagerFactory.getSecretsManager();
decryptedOrigConn.setConfig(
secretsManager.decryptServiceConnectionConfig(
decryptedOrigConn.getConfig(), original.getServiceType().value(), serviceType));
if (!CommonUtil.nullOrEmpty(decryptedOrigConn)) {
// Only decrypt the original connection if it is not null or empty
decryptedOrigConn.setConfig(
secretsManager.decryptServiceConnectionConfig(
decryptedOrigConn.getConfig(), original.getServiceType().value(), serviceType));
}
decryptedUpdatedConn.setConfig(
secretsManager.decryptServiceConnectionConfig(
decryptedUpdatedConn.getConfig(), updated.getServiceType().value(), serviceType));
if (!objectMatch.test(decryptedOrigConn, decryptedUpdatedConn)) {
// we don't want save connection config details in our database
// we don't want save connection config details in our database
if (CommonUtil.nullOrEmpty(decryptedOrigConn)
&& !CommonUtil.nullOrEmpty(decryptedUpdatedConn)
|| !objectMatch.test(decryptedOrigConn, decryptedUpdatedConn)) {
// if Original connection is null or empty and updated connection is not null or empty
// or if the connection details are different
recordChange("connection", "old-encrypted-value", "new-encrypted-value", true);
}
}