finish updateIacTemplate API

bernardodemarco · bernardodemarco · commit f7e593c9070a · 2026-05-10T20:46:34.000-03:00
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-42100to42200.sql b/engine/schema/src/main/resources/META-INF/db/schema-42100to42200.sql
@@ -49,6 +49,7 @@ CREATE TABLE IF NOT EXISTS `cloud`.`iac_templates` (
 CREATE TABLE IF NOT EXISTS `cloud`.`iac_template_account_map` (
     `iac_template_id` BIGINT(20) UNSIGNED NOT NULL,
     `account_id` BIGINT(20) UNSIGNED NOT NULL,
+    `is_project_account` TINYINT(1) NOT NULL,
     PRIMARY KEY (`iac_template_id`, `account_id`),
     CONSTRAINT `fk_iac_template_account_map__iac_template_id` FOREIGN KEY (`iac_template_id`) REFERENCES `iac_templates`(`id`),
     CONSTRAINT `fk_iac_template_account_map__account_id` FOREIGN KEY (`account_id`) REFERENCES `account`(`id`)
diff --git a/plugins/iac/nimble/src/main/java/org/apache/cloudstack/api/command/BaseIacTemplateRegistrationCmd.java b/plugins/iac/nimble/src/main/java/org/apache/cloudstack/api/command/BaseIacTemplateRegistrationCmd.java
@@ -25,8 +25,9 @@
 import org.apache.cloudstack.service.NimbleService;
 
 import javax.inject.Inject;
-import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 public abstract class BaseIacTemplateRegistrationCmd extends BaseCmd {
     @Inject
@@ -66,19 +67,16 @@ public boolean isTemplateShared() {
         return sharedDomainIds != null || sharedAccountIds != null || sharedProjectIds != null;
     }
 
-    public List<Long> getSharedDomainIds() {
-        return sharedDomainIds;
+    public Set<Long> getSharedDomainIds() {
+        return sharedDomainIds == null ? null : new HashSet<>(sharedDomainIds);
     }
 
-    public List<Long> getSharedAccountIds() {
-        return sharedAccountIds;
+    public Set<Long> getSharedAccountIds() {
+        return sharedAccountIds == null ? null : new HashSet<>(sharedAccountIds);
     }
 
-    public List<Long> getSharedProjectIds() {
-        if (sharedProjectIds == null) {
-            return new ArrayList<>();
-        }
-        return sharedProjectIds;
+    public Set<Long> getSharedProjectIds() {
+        return sharedProjectIds == null ? null : new HashSet<>(sharedProjectIds);
     }
 
     public Boolean isRecursiveDomains() {
diff --git a/plugins/iac/nimble/src/main/java/org/apache/cloudstack/persistence/iactemplates/IacTemplateAccountMapDao.java b/plugins/iac/nimble/src/main/java/org/apache/cloudstack/persistence/iactemplates/IacTemplateAccountMapDao.java
@@ -25,4 +25,6 @@ public interface IacTemplateAccountMapDao extends GenericDao<IacTemplateAccountM
     List<IacTemplateAccountMapVO> listByIacTemplateId(long iacTemplateId);
     void removeByIacTemplateId(long iacTemplateId);
     void removeByAccountId(long accountId);
+    void removeUserAccountMappingsByIacTemplateId(long iacTemplateId);
+    void removeProjectAccountMappingsByIacTemplateId(long iacTemplateId);
 }
diff --git a/plugins/iac/nimble/src/main/java/org/apache/cloudstack/persistence/iactemplates/IacTemplateAccountMapDaoImpl.java b/plugins/iac/nimble/src/main/java/org/apache/cloudstack/persistence/iactemplates/IacTemplateAccountMapDaoImpl.java
@@ -27,13 +27,15 @@
 public class IacTemplateAccountMapDaoImpl extends GenericDaoBase<IacTemplateAccountMapVO, Long> implements IacTemplateAccountMapDao {
     private static final String IAC_TEMPLATE_ID = "iacTemplateId";
     private static final String ACCOUNT_ID = "accountId";
+    private static final String IS_PROJECT_ACCOUNT = "isProjectAccount";
 
     private final SearchBuilder<IacTemplateAccountMapVO> accountMappingSearch;
 
     public IacTemplateAccountMapDaoImpl() {
         accountMappingSearch = createSearchBuilder();
         accountMappingSearch.and(IAC_TEMPLATE_ID, accountMappingSearch.entity().getIacTemplateId(), SearchCriteria.Op.EQ);
         accountMappingSearch.and(ACCOUNT_ID, accountMappingSearch.entity().getAccountId(), SearchCriteria.Op.EQ);
+        accountMappingSearch.and(IS_PROJECT_ACCOUNT, accountMappingSearch.entity().isProjectAccount(), SearchCriteria.Op.EQ);
         accountMappingSearch.done();
     }
 
@@ -51,6 +53,22 @@ public void removeByIacTemplateId(long iacTemplateId) {
         remove(searchCriteria);
     }
 
+    @Override
+    public void removeUserAccountMappingsByIacTemplateId(long iacTemplateId) {
+        SearchCriteria<IacTemplateAccountMapVO> searchCriteria = accountMappingSearch.create();
+        searchCriteria.setParameters(IAC_TEMPLATE_ID, iacTemplateId);
+        searchCriteria.setParameters(IS_PROJECT_ACCOUNT, false);
+        remove(searchCriteria);
+    }
+
+    @Override
+    public void removeProjectAccountMappingsByIacTemplateId(long iacTemplateId) {
+        SearchCriteria<IacTemplateAccountMapVO> searchCriteria = accountMappingSearch.create();
+        searchCriteria.setParameters(IAC_TEMPLATE_ID, iacTemplateId);
+        searchCriteria.setParameters(IS_PROJECT_ACCOUNT, true);
+        remove(searchCriteria);
+    }
+
     @Override
     public void removeByAccountId(long accountId) {
         SearchCriteria<IacTemplateAccountMapVO> searchCriteria = accountMappingSearch.create();
diff --git a/plugins/iac/nimble/src/main/java/org/apache/cloudstack/persistence/iactemplates/IacTemplateAccountMapVO.java b/plugins/iac/nimble/src/main/java/org/apache/cloudstack/persistence/iactemplates/IacTemplateAccountMapVO.java
@@ -29,12 +29,16 @@ public class IacTemplateAccountMapVO {
     @Column(name = "account_id", nullable = false)
     private long accountId;
 
+    @Column(name = "is_project_account", nullable = false)
+    private boolean projectAccount;
+
     public IacTemplateAccountMapVO() {
     }
 
-    public IacTemplateAccountMapVO(long iacTemplateId, long accountId) {
+    public IacTemplateAccountMapVO(long iacTemplateId, long accountId, boolean projectAccount) {
         this.iacTemplateId = iacTemplateId;
         this.accountId = accountId;
+        this.projectAccount = projectAccount;
     }
 
     public long getIacTemplateId() {
@@ -44,4 +48,8 @@ public long getIacTemplateId() {
     public long getAccountId() {
         return accountId;
     }
+
+    public boolean isProjectAccount() {
+        return projectAccount;
+    }
 }
diff --git a/plugins/iac/nimble/src/main/java/org/apache/cloudstack/service/NimbleManagerImpl.java b/plugins/iac/nimble/src/main/java/org/apache/cloudstack/service/NimbleManagerImpl.java
@@ -64,6 +64,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 public class NimbleManagerImpl extends ManagerBase implements NimbleService {
@@ -206,25 +207,23 @@ private IacTemplate persistIacTemplate(BaseIacTemplateRegistrationCmd cmd, Accou
                 if (iacTemplateUpdate) {
                     iacTemplateDomainMapDao.removeByIacTemplateId(iacTemplate.getId());
                 }
-//                convert to sets -> remove duplicates
-                List<IacTemplateDomainMapVO> domainMappings = persistDomainMappings(cmd.getSharedDomainIds(), persistedTemplate.getId(), owner);
-                persistedTemplate.setDomainMappings(domainMappings);
+                persistDomainMappings(cmd.getSharedDomainIds(), persistedTemplate.getId(), owner);
             }
 
-//            add project flag to the iactemplatwaccountmapvo -> if not, when updating and removing only projects or accoutns, all of them will be removed
-            if (cmd.getSharedAccountIds() != null) {
-                if (iacTemplateUpdate) {
-                    iacTemplateAccountMapDao.removeByIacTemplateId(iacTemplate.getId());
+            if (cmd.getSharedAccountIds() != null || cmd.getSharedProjectIds() != null) {
+                if (iacTemplateUpdate && cmd.getSharedAccountIds() != null) {
+                    iacTemplateAccountMapDao.removeUserAccountMappingsByIacTemplateId(iacTemplate.getId());
+                }
+                if (iacTemplateUpdate && cmd.getSharedProjectIds() != null) {
+                    iacTemplateAccountMapDao.removeProjectAccountMappingsByIacTemplateId(iacTemplate.getId());
                 }
-                List<IacTemplateAccountMapVO> accountMappings = persistAccountMappings(cmd.getSharedAccountIds(), cmd.getSharedProjectIds(), persistedTemplate.getId(), owner);
-                persistedTemplate.setAccountMappings(accountMappings);
+                persistAccountMappings(cmd.getSharedAccountIds(), cmd.getSharedProjectIds(), persistedTemplate.getId(), owner);
             }
-            return persistedTemplate;
+            return iacTemplateDao.findById(persistedTemplate.getId());
         });
     }
 
-    private List<IacTemplateDomainMapVO> persistDomainMappings(List<Long> sharedDomainIds, long iacTemplateId, Account iacTemplateOwner) {
-        List<IacTemplateDomainMapVO> domainMappings = new ArrayList<>();
+    private void persistDomainMappings(Set<Long> sharedDomainIds, long iacTemplateId, Account iacTemplateOwner) {
         for (Long domainId : sharedDomainIds) {
             Domain domain = domainManager.getDomain(domainId);
             if (domain == null) {
@@ -237,36 +236,40 @@ private List<IacTemplateDomainMapVO> persistDomainMappings(List<Long> sharedDoma
             }
             IacTemplateDomainMapVO domainMapping = new IacTemplateDomainMapVO(iacTemplateId, domainId);
             iacTemplateDomainMapDao.persist(domainMapping);
-            domainMappings.add(domainMapping);
         }
-        return domainMappings;
     }
 
-    private List<IacTemplateAccountMapVO> persistAccountMappings(List<Long> sharedAccountIds, List<Long> sharedProjectIds, long iacTemplateId, Account iacTemplateOwner) {
-        List<IacTemplateAccountMapVO> accountMappings = new ArrayList<>();
-        persistAccountMappingsForAccounts(accountMappings, sharedAccountIds, iacTemplateId, iacTemplateOwner);
-        persistAccountMappingsForProjects(accountMappings, sharedProjectIds, iacTemplateId, iacTemplateOwner);
-        return accountMappings;
+    private void persistAccountMappings(Set<Long> sharedAccountIds, Set<Long> sharedProjectIds, long iacTemplateId, Account iacTemplateOwner) {
+        if (sharedAccountIds != null) {
+            persistAccountMappingsForAccounts(sharedAccountIds, iacTemplateId, iacTemplateOwner);
+        }
+        if (sharedProjectIds != null) {
+            persistAccountMappingsForProjects(sharedProjectIds, iacTemplateId, iacTemplateOwner);
+        }
     }
 
-    private void persistAccountMappingsForAccounts(List<IacTemplateAccountMapVO> accountMappings, List<Long> sharedAccountIds, long iacTemplateId, Account iacTemplateOwner) {
+    private void persistAccountMappingsForAccounts(Set<Long> sharedAccountIds, long iacTemplateId, Account iacTemplateOwner) {
         for (Long accountId : sharedAccountIds) {
             Account account = accountService.getActiveAccountById(accountId);
             if (account == null) {
                 throw new InvalidParameterValueException(String.format("Unable to find account with ID [%s].", accountId));
             }
+
+            if (account.getId() == iacTemplateOwner.getId()) {
+                throw new InvalidParameterValueException(String.format("Account [%s] cannot share IaC template with itself.", iacTemplateOwner.getAccountName()));
+            }
+
             try {
                 accountService.checkAccess(iacTemplateOwner, null, false, account);
             } catch (PermissionDeniedException e) {
                 throw new InvalidParameterValueException(String.format("Account [%s] does not have permission to share IaC template with account with ID [%s].", iacTemplateOwner.getAccountName(), account.getUuid()));
             }
-            IacTemplateAccountMapVO accountMapping = new IacTemplateAccountMapVO(iacTemplateId, accountId);
+            IacTemplateAccountMapVO accountMapping = new IacTemplateAccountMapVO(iacTemplateId, accountId, false);
             iacTemplateAccountMapDao.persist(accountMapping);
-            accountMappings.add(accountMapping);
         }
     }
 
-    private void persistAccountMappingsForProjects(List<IacTemplateAccountMapVO> accountMappings, List<Long> sharedProjectIds, long iacTemplateId, Account iacTemplateOwner) {
+    private void persistAccountMappingsForProjects(Set<Long> sharedProjectIds, long iacTemplateId, Account iacTemplateOwner) {
         for (Long projectId : sharedProjectIds) {
             Project project = projectManager.getProject(projectId);
             if (project == null) {
@@ -281,9 +284,8 @@ private void persistAccountMappingsForProjects(List<IacTemplateAccountMapVO> acc
             } catch (PermissionDeniedException e) {
                 throw new InvalidParameterValueException(exceptionMessage);
             }
-            IacTemplateAccountMapVO accountMapping = new IacTemplateAccountMapVO(iacTemplateId, project.getProjectAccountId());
+            IacTemplateAccountMapVO accountMapping = new IacTemplateAccountMapVO(iacTemplateId, project.getProjectAccountId(), true);
             iacTemplateAccountMapDao.persist(accountMapping);
-            accountMappings.add(accountMapping);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,6 @@ public interface IacTemplateAccountMapDao extends GenericDao<IacTemplateAccountM`
`25`	`25`	`List<IacTemplateAccountMapVO> listByIacTemplateId(long iacTemplateId);`
`26`	`26`	`void removeByIacTemplateId(long iacTemplateId);`
`27`	`27`	`void removeByAccountId(long accountId);`
	`28`	`+ void removeUserAccountMappingsByIacTemplateId(long iacTemplateId);`
	`29`	`+ void removeProjectAccountMappingsByIacTemplateId(long iacTemplateId);`
`28`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,16 @@ public class IacTemplateAccountMapVO {`
`29`	`29`	`@Column(name = "account_id", nullable = false)`
`30`	`30`	`private long accountId;`
`31`	`31`
	`32`	`+ @Column(name = "is_project_account", nullable = false)`
	`33`	`+ private boolean projectAccount;`
	`34`	`+`
`32`	`35`	`public IacTemplateAccountMapVO() {`
`33`	`36`	`}`
`34`	`37`
`35`		`- public IacTemplateAccountMapVO(long iacTemplateId, long accountId) {`
	`38`	`+ public IacTemplateAccountMapVO(long iacTemplateId, long accountId, boolean projectAccount) {`
`36`	`39`	`this.iacTemplateId = iacTemplateId;`
`37`	`40`	`this.accountId = accountId;`
	`41`	`+ this.projectAccount = projectAccount;`
`38`	`42`	`}`
`39`	`43`
`40`	`44`	`public long getIacTemplateId() {`
`@@ -44,4 +48,8 @@ public long getIacTemplateId() {`
`44`	`48`	`public long getAccountId() {`
`45`	`49`	`return accountId;`
`46`	`50`	`}`
	`51`	`+`
	`52`	`+ public boolean isProjectAccount() {`
	`53`	`+ return projectAccount;`
	`54`	`+ }`
`47`	`55`	`}`