Merge branch 'ZSV-11415@@2' into 'zsv_5.0.0'

<fix>[account]: transfer all resources to admin when deleting users

See merge request zstackio/zstack!9349

Author: gitlab

compute/src/main/java/org/zstack/compute/vm/VmCascadeExtension.java

@@ -540,8 +540,7 @@ public List<String> getEdgeNames() {
                 IpRangeVO.class.getSimpleName(),
                 PrimaryStorageVO.class.getSimpleName(),
                 L2NetworkVO.class.getSimpleName(),
-                InstanceOfferingVO.class.getSimpleName(),
-                AccountVO.class.getSimpleName());
+                InstanceOfferingVO.class.getSimpleName());
     }
 
     @Override

configuration/src/main/java/org/zstack/configuration/DiskOfferingCascadeExtension.java

@@ -23,7 +23,7 @@
 import org.zstack.utils.logging.CLogger;
 
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -102,7 +102,7 @@ private void handleDeletionCheck(CascadeAction action, Completion completion) {
 
     @Override
     public List<String> getEdgeNames() {
-        return Arrays.asList(AccountVO.class.getSimpleName());
+        return Collections.emptyList();
     }
 
     @Override

configuration/src/main/java/org/zstack/configuration/InstanceOfferingCascadeExtension.java

@@ -23,7 +23,7 @@
 import org.zstack.utils.logging.CLogger;
 
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -101,7 +101,7 @@ private void handleDeletionCheck(CascadeAction action, Completion completion) {
 
     @Override
     public List<String> getEdgeNames() {
-        return Arrays.asList(AccountVO.class.getSimpleName());
+        return Collections.emptyList();
     }
 
     @Override

identity/src/main/java/org/zstack/identity/AccountBase.java

@@ -201,6 +201,16 @@ public void fail(ErrorCode errorCode) {
                     }
                 });
 
+                flow(new NoRollbackFlow() {
+                    String __name__ = "transfer-account-resource-to-admin";
+
+                    @Override
+                    public void run(FlowTrigger trigger, Map data) {
+                        transferAllOwnedResourcesToAdmin();
+                        trigger.next();
+                    }
+                });
+
                 done(new FlowDoneHandler(completion) {
                     @Override
                     public void handle(Map data) {
@@ -248,6 +258,15 @@ public void fail(ErrorCode errorCode) {
         });
     }
 
+    private void transferAllOwnedResourcesToAdmin() {
+        SQL.New(AccountResourceRefVO.class)
+                .eq(AccountResourceRefVO_.accountUuid, self.getUuid())
+                .eq(AccountResourceRefVO_.type, AccessLevel.Own)
+                .set(AccountResourceRefVO_.accountUuid, AccountConstant.INITIAL_SYSTEM_ADMIN_UUID)
+                .update();
+    }
+
+
     private void deleteRelatedResources() {
         new SQLBatch() {
             @Override

image/src/main/java/org/zstack/image/ImageCascadeExtension.java

@@ -105,7 +105,7 @@ private void handleDeletionCheck(CascadeAction action, Completion completion) {
 
     @Override
     public List<String> getEdgeNames() {
-        return Arrays.asList(BackupStorageVO.class.getSimpleName(), AccountVO.class.getSimpleName());
+        return Arrays.asList(BackupStorageVO.class.getSimpleName());
     }
 
     @Override

network/src/main/java/org/zstack/network/l2/L2NetworkCascadeExtension.java

@@ -214,7 +214,7 @@ private void handleDeletionCheck(CascadeAction action, Completion completion) {
 
     @Override
     public List<String> getEdgeNames() {
-        return Arrays.asList(ZoneVO.class.getSimpleName(), AccountVO.class.getSimpleName());
+        return Arrays.asList(ZoneVO.class.getSimpleName());
     }
 
     @Override

network/src/main/java/org/zstack/network/l3/L3NetworkCascadeExtension.java

@@ -132,7 +132,7 @@ private void handleDeletionCheck(CascadeAction action, Completion completion) {
 
     @Override
     public List<String> getEdgeNames() {
-        return Arrays.asList(L2NetworkVO.class.getSimpleName(), AccountVO.class.getSimpleName());
+        return Arrays.asList(L2NetworkVO.class.getSimpleName());
     }
 
     @Override

plugin/acl/src/main/java/org/zstack/acl/AccessControlListCascadeExtension.java

@@ -20,7 +20,7 @@
 import org.zstack.utils.Utils;
 import org.zstack.utils.logging.CLogger;
 
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 public class AccessControlListCascadeExtension extends AbstractAsyncCascadeExtension {
@@ -87,7 +87,7 @@ private void handleDeletionCleanup(CascadeAction action, Completion completion)
 
     @Override
     public List<String> getEdgeNames() {
-        return Arrays.asList(AccountVO.class.getSimpleName());
+        return Collections.emptyList();
     }
 
     @Override

plugin/applianceVm/src/main/java/org/zstack/appliancevm/ApplianceVmCascadeExtension.java

@@ -642,8 +642,7 @@ private void handleDeletionCheck(CascadeAction action, Completion completion) {
     @Override
     public List<String> getEdgeNames() {
         return Arrays.asList(HostVO.class.getSimpleName(), L3NetworkVO.class.getSimpleName(),
-                IpRangeVO.class.getSimpleName(), PrimaryStorageVO.class.getSimpleName(), L2NetworkVO.class.getSimpleName(),
-                AccountVO.class.getSimpleName());
+                IpRangeVO.class.getSimpleName(), PrimaryStorageVO.class.getSimpleName(), L2NetworkVO.class.getSimpleName());
     }
 
     @Override

plugin/loadBalancer/src/main/java/org/zstack/network/service/lb/LoadBalancerCascadeExtension.java

@@ -203,7 +203,6 @@ private void handleDeletionCheck(CascadeAction action, Completion completion) {
     @Override
     public List<String> getEdgeNames() {
         List<String> ret = new ArrayList<>();
-        ret.add(AccountVO.class.getSimpleName());
         ret.add(VipVO.class.getSimpleName());
         ret.add(AccessControlListVO.class.getSimpleName());
         return ret;