rebase with main fixes

Author: sureshanaparti

api/src/main/java/org/apache/cloudstack/api/response/StoragePoolResponse.java

@@ -78,10 +78,10 @@ public class StoragePoolResponse extends BaseResponseWithAnnotations {
     private String clusterName;
 
     @SerializedName(ApiConstants.CAPACITY_BYTES)
-    @Param(description = "bytes CloudStack can provision from this storage pool", since = "4.19.3")
+    @Param(description = "bytes CloudStack can provision from this storage pool", since = "4.22.0")
     private Long capacityBytes;
 
-    @Deprecated(since = "4.19.3")
+    @Deprecated(since = "4.22.0")
     @SerializedName("disksizetotal")
     @Param(description = "the total disk size of the storage pool")
     private Long diskSizeTotal;

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41920to41930.java

@@ -320,6 +320,9 @@ public StoragePoolVO persist(StoragePoolVO pool, Map<String, String> details, Li
         pool = super.persist(pool);
         if (details != null) {
             for (Map.Entry<String, String> detail : details.entrySet()) {
+                if (detail.getKey().toLowerCase().contains("password") || detail.getKey().toLowerCase().contains("token")) {
+                    displayDetails = false;
+                }
                 StoragePoolDetailVO vo = new StoragePoolDetailVO(pool.getId(), detail.getKey(), detail.getValue(), displayDetails);
                 _detailsDao.persist(vo);
             }

engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java

@@ -28,3 +28,7 @@ CALL `cloud`.`IDEMPOTENT_CHANGE_COLUMN`('cloud.domain_router', 'scripts_version'
 
 -- Add the column cross_zone_instance_creation to cloud.backup_repository. if enabled it means that new Instance can be created on all Zones from Backups on this Repository.
 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.backup_repository', 'cross_zone_instance_creation', 'TINYINT(1) DEFAULT NULL COMMENT ''Backup Repository can be used for disaster recovery on another zone''');
+
+-- Updated display to false for password/token detail of the storage pool details
+UPDATE `cloud`.`storage_pool_details` SET display = 0 WHERE name LIKE '%password%';
+UPDATE `cloud`.`storage_pool_details` SET display = 0 WHERE name LIKE '%token%';

engine/schema/src/main/resources/META-INF/db/schema-41920to41930-cleanup.sql

@@ -18,6 +18,7 @@
  */
 package org.apache.cloudstack.storage.datastore.lifecycle;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -176,9 +177,10 @@ public DataStore initialize(Map<String, Object> dsInfos) {
 
         String tags = (String)dsInfos.get("tags");
         parameters.setTags(tags);
+        parameters.setIsTagARule((Boolean)dsInfos.get("isTagARule"));
+
         String storageAccessGroups = (String)dsInfos.get(ApiConstants.STORAGE_ACCESS_GROUPS);
         parameters.setStorageAccessGroups(storageAccessGroups);
-        parameters.setIsTagARule((Boolean)dsInfos.get("isTagARule"));
 
         String scheme = dsInfos.get("scheme").toString();
         String storageHost = dsInfos.get("host").toString();