Refactor S3 image store URL construction to handle endpoint and bucket name more effectively

Author: Damans227

api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddImageStoreS3CMD.java

@@ -131,9 +131,8 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE
             dm.put(ApiConstants.S3_USE_TCP_KEEPALIVE, getUseTCPKeepAlive().toString());
         }
 
-        String url = "s3://" + getEndPoint().replaceFirst("^https?://", "") + "/" + getBucketName();
         try{
-            ImageStore result = _storageService.discoverImageStore(null, url, "S3", zoneId, dm);
+            ImageStore result = _storageService.discoverImageStore(null, null, "S3", zoneId, dm);
             ImageStoreResponse storeResponse;
             if (result != null) {
                 storeResponse = _responseGenerator.createImageStoreResponse(result);

plugins/storage/image/s3/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/S3ImageStoreLifeCycleImpl.java

@@ -22,6 +22,7 @@
 
 import javax.inject.Inject;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 
@@ -80,7 +81,16 @@ public DataStore initialize(Map<String, Object> dsInfos) {
         DataStoreRole role = (DataStoreRole)dsInfos.get("role");
         Map<String, String> details = (Map<String, String>)dsInfos.get("details");
 
-        logger.info("Trying to add a S3 store with endpoint: " + details.get(ApiConstants.S3_END_POINT));
+        String endPoint = details.get(ApiConstants.S3_END_POINT);
+        String bucketName = details.get(ApiConstants.S3_BUCKET_NAME);
+        logger.info("Trying to add a S3 store with endpoint: " + endPoint);
+
+        if (StringUtils.isEmpty(url) && StringUtils.isNotEmpty(endPoint) && StringUtils.isNotEmpty(bucketName)) {
+            url = "s3://" + endPoint.replaceFirst("^https?://", "") + "/" + bucketName;
+        }
+        if (StringUtils.isEmpty(name) && StringUtils.isNotEmpty(url)) {
+            name = url;
+        }
 
         Map<String, Object> imageStoreParameters = new HashMap();
         imageStoreParameters.put("name", name);