only return details that are meant for display

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDao.java

@@ -21,6 +21,7 @@
 
 import org.apache.cloudstack.api.ResourceDetail;
 
+import com.cloud.utils.Pair;
 import com.cloud.utils.db.GenericDao;
 
 public interface ResourceDetailsDao<R extends ResourceDetail> extends GenericDao<R, Long> {
@@ -94,6 +95,8 @@ public interface ResourceDetailsDao<R extends ResourceDetail> extends GenericDao
 
     Map<String, Boolean> listDetailsVisibility(long resourceId);
 
+    Pair<Map<String, String>, Map<String, String>> listDetailsKeyPairsWithVisibility(long resourceId);
+
     void saveDetails(List<R> details);
 
     void addDetail(long resourceId, String key, String value, boolean display);

engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDaoBase.java

@@ -23,6 +23,7 @@
 
 import org.apache.commons.collections.CollectionUtils;
 
+import com.cloud.utils.Pair;
 import com.cloud.utils.crypt.DBEncryptionUtil;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.GenericSearchBuilder;
@@ -127,6 +128,19 @@ public Map<String, Boolean> listDetailsVisibility(long resourceId) {
         return details;
     }
 
+    @Override
+    public Pair<Map<String, String>, Map<String, String>> listDetailsKeyPairsWithVisibility(long resourceId) {
+        SearchCriteria<R> sc = AllFieldsSearch.create();
+        sc.setParameters("resourceId", resourceId);
+        List<R> results = search(sc, null);
+        Map<Boolean, Map<String, String>> partitioned = results.stream()
+                .collect(Collectors.partitioningBy(
+                        R::isDisplay,
+                        Collectors.toMap(R::getName, R::getValue)
+                ));
+        return new Pair<>(partitioned.get(true), partitioned.get(false));
+    }
+
     public List<R> listDetails(long resourceId) {
         SearchCriteria<R> sc = AllFieldsSearch.create();
         sc.setParameters("resourceId", resourceId);

framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImpl.java

@@ -459,11 +459,11 @@ protected Map<String, Object> getExternalAccessDetails(Map<String, String> actio
         if (resourceMap == null) {
             return externalDetails;
         }
-        Map<String, String> resourceDetails = extensionResourceMapDetailsDao.listDetailsKeyPairs(resourceMap.getId());
+        Map<String, String> resourceDetails = extensionResourceMapDetailsDao.listDetailsKeyPairs(resourceMap.getId(), true);
         if (MapUtils.isNotEmpty(resourceDetails)) {
             externalDetails.put(ApiConstants.RESOURCE_MAP, resourceDetails);
         }
-        Map<String, String> extensionDetails = extensionDetailsDao.listDetailsKeyPairs(resourceMap.getExtensionId());
+        Map<String, String> extensionDetails = extensionDetailsDao.listDetailsKeyPairs(resourceMap.getExtensionId(), true);
         externalDetails.put(ApiConstants.EXTENSION, extensionDetails);
         return externalDetails;
     }
@@ -779,7 +779,7 @@ public ExtensionResponse createExtensionResponse(Extension extension,
                     extensionResourceResponse.setName(cluster.getName());
                 }
                 Map<String, String> details = extensionResourceMapDetailsDao.listDetailsKeyPairs(
-                        extensionResourceMapVO.getId());
+                        extensionResourceMapVO.getId(), true);
                 if (MapUtils.isNotEmpty(details)) {
                     extensionResourceResponse.setDetails(details);
                 }
@@ -791,7 +791,7 @@ public ExtensionResponse createExtensionResponse(Extension extension,
         }
         if (viewDetails.contains(ApiConstants.ExtensionDetails.all) ||
                 viewDetails.contains(ApiConstants.ExtensionDetails.external)) {
-            Map<String, String> extensionDetails = extensionDetailsDao.listDetailsKeyPairs(extension.getId());
+            Map<String, String> extensionDetails = extensionDetailsDao.listDetailsKeyPairs(extension.getId(), true);
             if (MapUtils.isNotEmpty(extensionDetails)) {
                 response.setDetails(extensionDetails);
             }
@@ -1165,12 +1165,11 @@ public CustomActionResultResponse runCustomAction(RunCustomActionCmd cmd) {
         }
 
         List<ExtensionCustomAction.Parameter> actionParameters = null;
-        Map<String, String> details =
-                extensionCustomActionDetailsDao.listDetailsKeyPairs(customActionVO.getId());
-        if (details.containsKey(ApiConstants.PARAMETERS)) {
+        Pair<Map<String, String>, Map<String, String>> allDetails =
+                extensionCustomActionDetailsDao.listDetailsKeyPairsWithVisibility(customActionVO.getId());
+        if (allDetails.second().containsKey(ApiConstants.PARAMETERS)) {
             actionParameters =
-                    ExtensionCustomAction.Parameter.toListFromJson(details.get(ApiConstants.PARAMETERS));
-            details.remove(ApiConstants.PARAMETERS);
+                    ExtensionCustomAction.Parameter.toListFromJson(allDetails.second().get(ApiConstants.PARAMETERS));
         }
         Map<String, Object> parameters = null;
         if (CollectionUtils.isNotEmpty(actionParameters)) {
@@ -1185,7 +1184,7 @@ public CustomActionResultResponse runCustomAction(RunCustomActionCmd cmd) {
         response.setSuccess(false);
         result.put(ApiConstants.MESSAGE, getActionMessage(false, customActionVO, extensionVO,
                 actionResourceType, entity));
-        Map<String, Object> externalDetails = getExternalAccessDetails(details, hostId, extensionResource);
+        Map<String, Object> externalDetails = getExternalAccessDetails(allDetails.first(), hostId, extensionResource);
         runCustomActionCommand.setParameters(parameters);
         runCustomActionCommand.setExternalDetails(externalDetails);
         try {
@@ -1236,8 +1235,9 @@ public ExtensionCustomActionResponse createCustomActionResponse(ExtensionCustomA
             response.setExtensionId(extensionVO.getUuid());
             response.setExtensionName(extensionVO.getName());
         });
-        Optional.ofNullable(extensionCustomActionDetailsDao.findDetail(customAction.getId(), ApiConstants.PARAMETERS))
-                .map(ExtensionCustomActionDetailsVO::getValue)
+        Pair<Map<String, String>, Map<String, String>> allDetails =
+                extensionCustomActionDetailsDao.listDetailsKeyPairsWithVisibility(customAction.getId());
+        Optional.ofNullable(allDetails.second().get(ApiConstants.PARAMETERS))
                 .map(ExtensionCustomAction.Parameter::toListFromJson)
                 .ifPresent(parameters -> {
                     Set<ExtensionCustomActionParameterResponse> paramResponses = parameters.stream()
@@ -1246,9 +1246,7 @@ public ExtensionCustomActionResponse createCustomActionResponse(ExtensionCustomA
                             .collect(Collectors.toSet());
                     response.setParameters(paramResponses);
                 });
-        Map<String, String> details =
-                extensionCustomActionDetailsDao.listDetailsKeyPairs(customAction.getId(), true);
-        response.setDetails(details);
+        response.setDetails(allDetails.first());
         response.setObjectName(ExtensionCustomAction.class.getSimpleName().toLowerCase());
         return response;
     }