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

MigrationFix for duplicate ViewAll in OrganizationPolicy (#23524)

Browse Source
This commit is contained in:
Ram Narayan Balaji 2025-09-23 17:58:41 +05:30 committed by GitHub
parent f1afe8f5f1
commit e058c5393e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 108 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openmetadata-service/src/main/java/org/openmetadata/service/migration/mysql/v1910/Migration.java Normal file
View File

@ -0,0 +1,19 @@
package org.openmetadata.service.migration.mysql.v1910;
import lombok.SneakyThrows;
import org.openmetadata.service.migration.api.MigrationProcessImpl;
import org.openmetadata.service.migration.utils.MigrationFile;
import org.openmetadata.service.migration.utils.v1910.MigrationUtil;
public class Migration extends MigrationProcessImpl {
public Migration(MigrationFile migrationFile) {
super(migrationFile);
}
@Override
@SneakyThrows
public void runDataMigration() {
MigrationUtil.removeDuplicateViewAllRules(collectionDAO);
}
}

19
openmetadata-service/src/main/java/org/openmetadata/service/migration/postgres/v1910/Migration.java Normal file
View File

@ -0,0 +1,19 @@
package org.openmetadata.service.migration.postgres.v1910;
import lombok.SneakyThrows;
import org.openmetadata.service.migration.api.MigrationProcessImpl;
import org.openmetadata.service.migration.utils.MigrationFile;
import org.openmetadata.service.migration.utils.v1910.MigrationUtil;
public class Migration extends MigrationProcessImpl {
public Migration(MigrationFile migrationFile) {
super(migrationFile);
}
@Override
@SneakyThrows
public void runDataMigration() {
MigrationUtil.removeDuplicateViewAllRules(collectionDAO);
}
}

2
openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v160/MigrationUtil.java
View File

@ -37,7 +37,7 @@ public class MigrationUtil {
Policy organizationPolicy = repository.findByName("OrganizationPolicy", Include.NON_DELETED);
boolean noViewAllRule = true;
for (Rule rule : organizationPolicy.getRules()) {
if (rule.getName().equals("OrganizationPolicy-View-All-Rule")) {
if (rule.getName().equals("OrganizationPolicy-ViewAll-Rule")) {
noViewAllRule = false;
break;
}

69
openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v1910/MigrationUtil.java Normal file
View File

@ -0,0 +1,69 @@
package org.openmetadata.service.migration.utils.v1910;
import java.util.ArrayList;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.openmetadata.schema.entity.policies.Policy;
import org.openmetadata.schema.entity.policies.accessControl.Rule;
import org.openmetadata.schema.type.Include;
import org.openmetadata.schema.utils.JsonUtils;
import org.openmetadata.service.Entity;
import org.openmetadata.service.exception.EntityNotFoundException;
import org.openmetadata.service.jdbi3.CollectionDAO;
import org.openmetadata.service.jdbi3.PolicyRepository;
@Slf4j
public class MigrationUtil {
public static void removeDuplicateViewAllRules(CollectionDAO collectionDAO) {
PolicyRepository repository = (PolicyRepository) Entity.getEntityRepository(Entity.POLICY);
try {
Policy organizationPolicy = repository.findByName("OrganizationPolicy", Include.NON_DELETED);
List<Rule> rules = organizationPolicy.getRules();
if (rules == null) {
LOG.info("OrganizationPolicy has no rules defined, skipping duplicate removal");
return;
}
List<Rule> viewAllRules = new ArrayList<>();
List<Rule> otherRules = new ArrayList<>();
for (Rule rule : rules) {
if (rule.getName() != null && rule.getName().equals("OrganizationPolicy-ViewAll-Rule")) {
viewAllRules.add(rule);
} else {
otherRules.add(rule);
}
}
if (viewAllRules.size() <= 1) {
LOG.info("No duplicate ViewAll rules found, skipping removal");
return;
}
LOG.info("Found {} duplicate ViewAll rules, keeping the first one", viewAllRules.size());
// Keep only the first ViewAll rule and all other rules
List<Rule> updatedRules = new ArrayList<>(otherRules);
updatedRules.add(viewAllRules.get(0));
organizationPolicy.setRules(updatedRules);
collectionDAO
.policyDAO()
.update(
organizationPolicy.getId(),
organizationPolicy.getFullyQualifiedName(),
JsonUtils.pojoToJson(organizationPolicy));
LOG.info(
"Successfully removed {} duplicate ViewAll rules from OrganizationPolicy",
viewAllRules.size() - 1);
} catch (EntityNotFoundException ex) {
LOG.warn("OrganizationPolicy not found, skipping duplicate ViewAll rule removal");
} catch (Exception ex) {
LOG.error(
"Error removing duplicate ViewAll rules from OrganizationPolicy: {}", ex.getMessage());
}
}
}