Don't keep url in details

Author: sureshanaparti

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

@@ -304,7 +304,7 @@ public StoragePoolVO persist(StoragePoolVO pool, Map<String, String> details, Li
         if (details != null) {
             for (Map.Entry<String, String> detail : details.entrySet()) {
                 boolean display = true;
-                if (detail.getKey().toLowerCase().contains("password")) {
+                if (detail.getKey().toLowerCase().contains("password") || detail.getKey().toLowerCase().contains("token")) {
                     display = false;
                 }
                 StoragePoolDetailVO vo = new StoragePoolDetailVO(pool.getId(), detail.getKey(), detail.getValue(), display);

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

@@ -19,5 +19,6 @@
 -- Schema upgrade from 4.19.2.0 to 4.19.3.0
 --;
 
--- Updated display to false for password detail of the storage pool details
+-- 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/storage/src/main/java/org/apache/cloudstack/storage/volume/datastore/PrimaryDataStoreHelper.java

@@ -75,8 +75,7 @@ public class PrimaryDataStoreHelper {
     private AnnotationDao annotationDao;
 
     public DataStore createPrimaryDataStore(PrimaryDataStoreParameters params) {
-        if(params == null)
-        {
+        if (params == null) {
             throw new InvalidParameterValueException("createPrimaryDataStore: Input params is null, please check");
         }
         StoragePoolVO dataStoreVO = dataStoreDao.findPoolByUUID(params.getUuid());

plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java

@@ -125,7 +125,6 @@ public DataStore initialize(Map<String, Object> dsInfos) {
         Long clusterId = (Long)dsInfos.get("clusterId");
         Long podId = (Long)dsInfos.get("podId");
         Long zoneId = (Long)dsInfos.get("zoneId");
-        String url = (String)dsInfos.get("url");
         String providerName = (String)dsInfos.get("providerName");
         HypervisorType hypervisorType = (HypervisorType)dsInfos.get("hypervisorType");
         if (clusterId != null && podId == null) {

server/src/main/java/com/cloud/storage/StorageManagerImpl.java

@@ -992,9 +992,6 @@ public PrimaryDataStoreInfo createPool(CreateStoragePoolCmd cmd) throws Resource
 
         Map<String, String> details = extractApiParamAsMap(cmd.getDetails());
         checkNFSMountOptionsForCreate(details, hypervisorType, uriParams.get("scheme"));
-        if (StringUtils.isNotBlank(cmd.getUrl())) {
-            details.put("url", cmd.getUrl());
-        }
 
         DataCenterVO zone = _dcDao.findById(cmd.getZoneId());
         if (zone == null) {