Added fix to retrieve correct s3 urls (#2465)

* Added fix to retrieve correct s3 urls

* Fixes to S3 url

* Squashing commits

* Fixing if conditions for storagetype in geturl
This commit is contained in:
Ankit Chawla
2022-07-12 11:56:25 +05:30
committed by GitHub
parent db13455a7b
commit 7838debadf
3 changed files with 16 additions and 26 deletions
+9 -5
View File
@@ -231,19 +231,23 @@ func (ss *StorageService) downloadHandler(w http.ResponseWriter, r *http.Request
func (ss *StorageService) infoHandler(w http.ResponseWriter, r *http.Request) {
fileId, err := ss.getIdFromRequest(r)
fileID, err := ss.getIdFromRequest(r)
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
itemURL, err := ss.storageClient.getURL(fileId)
_, err = ss.storageClient.container.Item(fileID)
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
http.Error(w, err.Error(), http.StatusNotFound)
return
}
w.Header().Add("X-FISSION-ARCHIVEURL", itemURL.String())
storageType := ss.storageClient.config.storage.getStorageType()
if storageType == StorageTypeS3 {
w.Header().Add("X-FISSION-BUCKET", ss.storageClient.config.storage.getContainerName())
}
w.Header().Add("X-FISSION-STORAGETYPE", string(storageType))
}
func (ss *StorageService) healthHandler(w http.ResponseWriter, r *http.Request) {