continue implementing the listIacTemplates API

bernardodemarco · bernardodemarco · commit 784d1e1e0645 · 2026-05-12T21:45:30.000-03:00
diff --git a/plugins/iac/nimble/src/main/java/org/apache/cloudstack/api/command/ListIacTemplatesCmd.java b/plugins/iac/nimble/src/main/java/org/apache/cloudstack/api/command/ListIacTemplatesCmd.java
@@ -12,7 +12,6 @@
 import org.apache.cloudstack.api.response.IacTemplateResponse;
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.ProjectResponse;
-import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.persistence.iactemplates.IacTemplate;
 import org.apache.cloudstack.service.NimbleService;
 
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
@@ -23,6 +23,7 @@
 public interface IacTemplateAccountMapDao extends GenericDao<IacTemplateAccountMapVO, Long> {
 
     List<IacTemplateAccountMapVO> listByIacTemplateId(long iacTemplateId);
+    List<IacTemplateAccountMapVO> listByAccountId(long accountId);
     void removeByIacTemplateId(long iacTemplateId);
     void removeByAccountId(long accountId);
     void removeUserAccountMappingsByIacTemplateId(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
@@ -46,6 +46,13 @@ public List<IacTemplateAccountMapVO> listByIacTemplateId(long iacTemplateId) {
         return listBy(searchCriteria);
     }
 
+    @Override
+    public List<IacTemplateAccountMapVO> listByAccountId(long accountId) {
+        SearchCriteria<IacTemplateAccountMapVO> searchCriteria = accountMappingSearch.create();
+        searchCriteria.setParameters(ACCOUNT_ID, accountId);
+        return listBy(searchCriteria);
+    }
+
     @Override
     public void removeByIacTemplateId(long iacTemplateId) {
         SearchCriteria<IacTemplateAccountMapVO> searchCriteria = accountMappingSearch.create();
diff --git a/plugins/iac/nimble/src/main/java/org/apache/cloudstack/persistence/iactemplates/IacTemplateDao.java b/plugins/iac/nimble/src/main/java/org/apache/cloudstack/persistence/iactemplates/IacTemplateDao.java
@@ -16,11 +16,15 @@
 // under the License.
 package org.apache.cloudstack.persistence.iactemplates;
 
+import com.cloud.utils.Pair;
 import com.cloud.utils.db.GenericDao;
 
 import java.util.List;
 
 public interface IacTemplateDao extends GenericDao<IacTemplateVO, Long> {
     void removeByAccountId(long accountId);
     List<IacTemplateVO> listByAccountId(long accountId);
+    Pair<List<IacTemplateVO>, Integer> listIacTemplates(Long id, String name, List<Long> domainIds, Long accountId,
+                                                        boolean showIacTemplateContent, boolean showSharedIacTemplates,
+                                                        String keyword, Long pageSizeVal, Long startIndex);
 }
diff --git a/plugins/iac/nimble/src/main/java/org/apache/cloudstack/persistence/iactemplates/IacTemplateDaoImpl.java b/plugins/iac/nimble/src/main/java/org/apache/cloudstack/persistence/iactemplates/IacTemplateDaoImpl.java
@@ -16,7 +16,9 @@
 // under the License.
 package org.apache.cloudstack.persistence.iactemplates;
 
+import com.cloud.utils.Pair;
 import com.cloud.utils.db.DB;
+import com.cloud.utils.db.Filter;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
@@ -27,7 +29,12 @@
 
 @Component
 public class IacTemplateDaoImpl extends GenericDaoBase<IacTemplateVO, Long> implements IacTemplateDao {
+    private static final String ID = "id";
+    private static final String NAME = "name";
+    private static final String DOMAIN_IDS = "domainIds";
     private static final String ACCOUNT_ID = "accountId";
+    private static final String CREATED = "created";
+    private static final String NAME_LIKE_KEYWORD = "nameLikeKeyword";
 
     @Inject
     private IacTemplateAccountMapDao iacTemplateAccountMapDao;
@@ -39,6 +46,9 @@ public class IacTemplateDaoImpl extends GenericDaoBase<IacTemplateVO, Long> impl
 
     public IacTemplateDaoImpl() {
         iacTemplatesSearch = createSearchBuilder();
+        iacTemplatesSearch.and(ID, iacTemplatesSearch.entity().getId(), SearchCriteria.Op.EQ);
+        iacTemplatesSearch.and(NAME, iacTemplatesSearch.entity().getName(), SearchCriteria.Op.EQ);
+        iacTemplatesSearch.and(DOMAIN_IDS, iacTemplatesSearch.entity().getDomainId(), SearchCriteria.Op.IN);
         iacTemplatesSearch.and(ACCOUNT_ID, iacTemplatesSearch.entity().getAccountId(), SearchCriteria.Op.EQ);
         iacTemplatesSearch.done();
     }
@@ -80,4 +90,21 @@ public List<IacTemplateVO> listByAccountId(long accountId) {
         searchCriteria.setParameters(ACCOUNT_ID, accountId);
         return listBy(searchCriteria);
     }
+
+    @Override
+    public Pair<List<IacTemplateVO>, Integer> listIacTemplates(Long id, String name, List<Long> domainIds, Long accountId,
+                                                               boolean showIacTemplateContent, boolean showSharedIacTemplates,
+                                                               String keyword, Long pageSizeVal, Long startIndex) {
+        SearchCriteria<IacTemplateVO> searchCriteria = iacTemplatesSearch.create();
+        searchCriteria.setParametersIfNotNull(ID, id);
+        searchCriteria.setParametersIfNotNull(NAME, name);
+        searchCriteria.setParameters(DOMAIN_IDS, domainIds.toArray());
+        searchCriteria.setParametersIfNotNull(ACCOUNT_ID, accountId);
+        if (keyword != null) {
+            searchCriteria.setParameters(NAME_LIKE_KEYWORD, "%" + keyword + "%");
+        }
+
+        Filter filter = new Filter(IacTemplateVO.class, CREATED, false, startIndex, pageSizeVal);
+        return null;
+    }
 }
diff --git a/plugins/iac/nimble/src/main/java/org/apache/cloudstack/persistence/iactemplates/IacTemplateDomainMapDao.java b/plugins/iac/nimble/src/main/java/org/apache/cloudstack/persistence/iactemplates/IacTemplateDomainMapDao.java
@@ -22,6 +22,7 @@
 
 public interface IacTemplateDomainMapDao extends GenericDao<IacTemplateDomainMapVO, Long> {
     List<IacTemplateDomainMapVO> listByIacTemplateId(long iacTemplateId);
+    List<IacTemplateDomainMapVO> listByDomainId(long domainId);
     void removeByIacTemplateId(long iacTemplateId);
     void removeByDomainId(long domainId);
 }
diff --git a/plugins/iac/nimble/src/main/java/org/apache/cloudstack/persistence/iactemplates/IacTemplateDomainMapDaoImpl.java b/plugins/iac/nimble/src/main/java/org/apache/cloudstack/persistence/iactemplates/IacTemplateDomainMapDaoImpl.java
@@ -44,6 +44,13 @@ public List<IacTemplateDomainMapVO> listByIacTemplateId(long iacTemplateId) {
         return listBy(searchCriteria);
     }
 
+    @Override
+    public List<IacTemplateDomainMapVO> listByDomainId(long domainId) {
+        SearchCriteria<IacTemplateDomainMapVO> searchCriteria = domainMappingSearch.create();
+        searchCriteria.setParameters(DOMAIN_ID, domainId);
+        return listBy(searchCriteria);
+    }
+
     @Override
     public void removeByIacTemplateId(long iacTemplateId) {
         SearchCriteria<IacTemplateDomainMapVO> searchCriteria = domainMappingSearch.create();
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
@@ -136,13 +136,36 @@ public ListResponse<IacResourceTypeResponse> listIacResourceTypes(ListIacResourc
     public ListResponse<IacTemplateResponse> listIacTemplates(ListIacTemplatesCmd cmd) {
         Account caller = CallContext.current().getCallingAccount();
         long domainId = getBaseDomainIdToListIacTemplatesFrom(cmd.getDomainId(), caller);
-        Project projectId = getProjectToListIacTemplatesFor(cmd.getProjectId(), caller);
-        List<Long> domainIds = cmd.isRecursive() ? domainDao.getDomainAndChildrenIds(cmd.getDomainId()) : List.of(cmd.getDomainId());
-// ACL validations are ready -> need to understand how to grab those shared templates and that's basically it :)
+        List<Long> domainIds = cmd.isRecursive() ? domainDao.getDomainAndChildrenIds(domainId) : List.of(domainId);
+        Long accountId = getAccountIdToListIacTemplatesFor(cmd.getAccountId(), cmd.getProjectId(), caller);
+
+        List<Long> sharedIacTemplateIds = new ArrayList<>();
+        // WHERE id = blabla AND name = blabla AND name LIKE %blabla%
+        // AND domain_id IN (domain1, domain2, domain3) OR id IN (shareddomainid1, shareddomainid2)
+        if (cmd.isShowSharedIacTemplates()) {
+            sharedIacTemplateIds = getListOfSharedIacTemplatesIds(domainId, ObjectUtils.defaultIfNull(accountId, caller.getId()));
+        }
+
+        iacTemplateDao.listIacTemplates(cmd.getId(), cmd.getName(), domainIds, accountId,
+                cmd.isShowIacTemplateContent(), cmd.isShowSharedIacTemplates(), cmd.getKeyword(),
+                cmd.getPageSizeVal(), cmd.getStartIndex());
 
         return null;
     }
 
+    List<Long> getListOfSharedIacTemplatesIds(long domainId, Long accountId) {
+        List<Long> sharedIacTemplateIds = new ArrayList<>();
+
+        iacTemplateAccountMapDao.listByAccountId(accountId).stream()
+                .map(IacTemplateAccountMapVO::getIacTemplateId)
+                .forEach(sharedIacTemplateIds::add);
+        iacTemplateDomainMapDao.listByDomainId(domainId).stream()
+                .map(IacTemplateDomainMapVO::getIacTemplateId)
+                .forEach(sharedIacTemplateIds::add);
+        
+        return sharedIacTemplateIds;
+    }
+
     private long getBaseDomainIdToListIacTemplatesFrom(Long domainId, Account caller) {
         if (domainId == null) {
             return caller.getDomainId();
@@ -157,11 +180,27 @@ private long getBaseDomainIdToListIacTemplatesFrom(Long domainId, Account caller
         return domainId;
     }
 
-    private Project getProjectToListIacTemplatesFor(Long projectId, Account caller) {
-        if (projectId == null) {
-            return null;
+    private Long getAccountIdToListIacTemplatesFor(Long accountId, Long projectId, Account caller) {
+        if (ObjectUtils.allNotNull(accountId, projectId)) {
+            throw new InvalidParameterValueException("Parameters [accountid, projectid] cannot be specified together. Please specify only one of them.");
+        }
+
+        if (projectId != null) {
+            return getProjectAccountIdToListIacTemplatesFor(projectId, caller);
+        }
+
+        if (accountId != null) {
+            return accountId;
         }
 
+        if (accountService.isNormalUser(caller.getId())) {
+            return caller.getId();
+        }
+
+        return null;
+    }
+
+    private long getProjectAccountIdToListIacTemplatesFor(long projectId, Account caller) {
         Project project = projectManager.getProject(projectId);
         if (project == null) {
             throw new InvalidParameterValueException("Unable to find the specified project.");
@@ -176,7 +215,7 @@ private Project getProjectToListIacTemplatesFor(Long projectId, Account caller)
             throw new InvalidParameterValueException(exceptionMessage);
         }
 
-        return project;
+        return project.getProjectAccountId();
     }
 
     private boolean doesUserHaveAccessToNodeTypeApis(Pair<String, String> nodeTypeApis) {
@@ -290,6 +329,9 @@ private IacTemplate persistIacTemplate(BaseIacTemplateRegistrationCmd cmd, Accou
     }
 
     private void persistDomainMappings(Set<Long> sharedDomainIds, long iacTemplateId, Account iacTemplateOwner) {
+
+
+        // alterar aqui para ja fazer o spread sobre os dominios recursivamente
         for (Long domainId : sharedDomainIds) {
             Domain domain = domainManager.getDomain(domainId);
             if (domain == null) {

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`
`23`	`23`	`public interface IacTemplateDomainMapDao extends GenericDao<IacTemplateDomainMapVO, Long> {`
`24`	`24`	`List<IacTemplateDomainMapVO> listByIacTemplateId(long iacTemplateId);`
	`25`	`+ List<IacTemplateDomainMapVO> listByDomainId(long domainId);`
`25`	`26`	`void removeByIacTemplateId(long iacTemplateId);`
`26`	`27`	`void removeByDomainId(long domainId);`
`27`	`28`	`}`