Do not enforce owner validation in update call if table owner has not…

… changed (#534)
Netflix · Feb 20, 2023 · 1142f21 · 1142f21
1 parent a9c816f
commit 1142f21
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/metacat-main/src/main/java/com/netflix/metacat/main/services/impl/TableServiceImpl.java b/metacat-main/src/main/java/com/netflix/metacat/main/services/impl/TableServiceImpl.java
@@ -475,7 +475,11 @@ public TableDto updateAndReturn(final QualifiedName name, final TableDto tableDt
         // we do ownership validation and enforcement only if table owner is set in the dto
         // because if it is null, we do not update the owner in the existing metadata record
         if (tableDto.getTableOwner().isPresent()) {
-            ownerValidationService.enforceOwnerValidation("updateTable", name, tableDto);
+            // only if the owner is different from the previous, we run the enforcement
+            // for backwards compatibility
+            if (!tableDto.getTableOwner().get().equals(oldTable.getTableOwner().orElse(null))) {
+                ownerValidationService.enforceOwnerValidation("updateTable", name, tableDto);
+            }
         }
 
         try {

diff --git a/...t-main/src/test/groovy/com/netflix/metacat/main/services/impl/TableServiceImplSpec.groovy b/...t-main/src/test/groovy/com/netflix/metacat/main/services/impl/TableServiceImplSpec.groovy
@@ -261,6 +261,13 @@ class TableServiceImplSpec extends Specification {
 
         then:
         1 * ownerValidationService.enforceOwnerValidation("updateTable", name, updatedTableDto)
+
+        when:
+        tableDto.setDefinitionMetadata(toObjectNode("{\"owner\":{\"userId\":\"ssarma\"}}"))
+        service.updateAndReturn(name, updatedTableDto)
+
+        then:
+        0 * ownerValidationService.enforceOwnerValidation(_, _, _)
     }
 
     def "Will not throw on Successful Table Update with Failed Get"() {