display S3 endpoint and bucket in secondary storage details

Author: Daman Arora

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

@@ -71,6 +71,14 @@ public class ImageStoreResponse extends BaseResponseWithAnnotations {
     @Param(description = "The host's currently used disk size")
     private Long diskSizeUsed;
 
+    @SerializedName(ApiConstants.S3_END_POINT)
+    @Param(description = "The S3 endpoint URL")
+    private String s3Endpoint;
+
+    @SerializedName(ApiConstants.S3_BUCKET_NAME)
+    @Param(description = "The S3 bucket name")
+    private String s3BucketName;
+
     public ImageStoreResponse() {
     }
 
@@ -156,4 +164,20 @@ public void setDiskSizeTotal(Long diskSizeTotal) {
     public void setDiskSizeUsed(Long diskSizeUsed) {
         this.diskSizeUsed = diskSizeUsed;
     }
+
+    public String getS3Endpoint() {
+        return s3Endpoint;
+    }
+
+    public void setS3Endpoint(String s3Endpoint) {
+        this.s3Endpoint = s3Endpoint;
+    }
+
+    public String getS3BucketName() {
+        return s3BucketName;
+    }
+
+    public void setS3BucketName(String s3BucketName) {
+        this.s3BucketName = s3BucketName;
+    }
 }

server/src/main/java/com/cloud/api/query/dao/ImageStoreJoinDaoImpl.java

@@ -18,6 +18,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import javax.inject.Inject;
 
@@ -26,7 +27,10 @@
 import com.cloud.user.AccountManager;
 import org.apache.cloudstack.annotation.AnnotationService;
 import org.apache.cloudstack.annotation.dao.AnnotationDao;
+import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider;
+import org.apache.cloudstack.storage.datastore.db.ImageStoreDetailsDao;
 import org.springframework.stereotype.Component;
 
 import org.apache.cloudstack.api.response.ImageStoreResponse;
@@ -48,6 +52,8 @@ public class ImageStoreJoinDaoImpl extends GenericDaoBase<ImageStoreJoinVO, Long
     private AnnotationDao annotationDao;
     @Inject
     private AccountManager accountManager;
+    @Inject
+    private ImageStoreDetailsDao imageStoreDetailsDao;
 
     private final SearchBuilder<ImageStoreJoinVO> dsSearch;
 
@@ -92,6 +98,14 @@ public ImageStoreResponse newImageStoreResponse(ImageStoreJoinVO ids) {
         osResponse.setHasAnnotation(annotationDao.hasAnnotations(ids.getUuid(), AnnotationService.EntityType.SECONDARY_STORAGE.name(),
                 accountManager.isRootAdmin(CallContext.current().getCallingAccount().getId())));
 
+        if (DataStoreProvider.S3_IMAGE.equalsIgnoreCase(ids.getProviderName())) {
+            Map<String, String> s3Details = imageStoreDetailsDao.getDetails(ids.getId());
+            if (s3Details != null) {
+                osResponse.setS3Endpoint(s3Details.get(ApiConstants.S3_END_POINT));
+                osResponse.setS3BucketName(s3Details.get(ApiConstants.S3_BUCKET_NAME));
+            }
+        }
+
         osResponse.setObjectName("imagestore");
         return osResponse;
     }

ui/src/config/section/infra/secondaryStorages.js

@@ -36,7 +36,7 @@ export default {
     return fields
   },
   details: () => {
-    var fields = ['name', 'id', 'url', 'protocol', 'provider', 'scope', 'zonename']
+    var fields = ['name', 'id', 'url', 'protocol', 'provider', 'scope', 'zonename', 'endpoint', 'bucket']
     if (store.getters.apis.listImageStores.params.filter(x => x.name === 'readonly').length > 0) {
       fields.push('readonly')
     }