storage fixes (#243)

* storage fixes

If storage was enabled in .env it was not reflected correctly in the docker-compose file

add storage information to api/status

* only return detailed info if superadmin

Co-authored-by: Luigi Marini <[email protected]>

Author: robkooper

CHANGELOG.md

@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - When uploading a file, it would ignore any extractors marked disabled at the space level. [#246](https://github.com/clowder-framework/clowder/issues/246)
 - Added index for comments, will speed up index creation
+- If using S3 storage in docker, it was not reflected correctly in the docker-compose file
+
+### Added
+- Status endpoint will now show what storage is used
 
 ### Fixed
 - Docker image for mongo-init now based on python:3.7-slim reduces size

app/api/Status.scala

@@ -1,13 +1,13 @@
 package api
 
 import javax.inject.Inject
-
-import play.api.Logger
+import play.api.{Logger, Play}
 import models.User
 import play.api.Play._
 import play.api.libs.json.{JsValue, Json}
 import services._
 import services.mongodb.MongoSalatPlugin
+import services.s3.S3ByteStorageService
 
 import scala.collection.mutable
 
@@ -35,6 +35,7 @@ class Status @Inject()(spaces: SpaceService,
       "version" -> getVersionInfo,
       "counts" -> getCounts(request.user),
       "plugins" -> getPlugins(request.user),
+      "storage" -> getStorage(request.user),
       "extractors" -> Json.toJson(extractors.getExtractorNames(List.empty))))
   }
 
@@ -138,6 +139,35 @@ class Status @Inject()(spaces: SpaceService,
     Json.toJson(result.toMap[String, JsValue])
   }
 
+  def getStorage(user: Option[User]): JsValue = {
+    val config = Play.current.configuration
+    val result = new mutable.HashMap[String, String]()
+
+    ByteStorageService.storage.getClass.getName match {
+      case "services.mongodb.MongoDBByteStorage" => {
+        result.put("location", "mongo")
+      }
+      case "services.filesystem.DiskByteStorageService" => {
+        result.put("location", "disk")
+        if (Permission.checkServerAdmin(user)) {
+          result.put("path", config.getString("clowder.diskStorage.path").getOrElse[String]("unknown"))
+        }
+      }
+      case "services.s3.S3ByteStorageService" => {
+        result.put("location", "s3")
+        if (Permission.checkServerAdmin(user)) {
+          result.put("endpoint", config.getString(S3ByteStorageService.ServiceEndpoint).getOrElse[String]("unknown"))
+          result.put("region", config.getString(S3ByteStorageService.Region).getOrElse[String]("unknown"))
+          result.put("bucket", config.getString(S3ByteStorageService.BucketName).getOrElse[String]("unknown"))
+        }
+      }
+      case name => {
+        result.put("location", name)
+      }
+    }
+    Json.toJson(result.toMap[String, String])
+  }
+
   def getCounts(user: Option[User]): JsValue = {
     val counts = appConfig.getIndexCounts()
     // TODO: Revisit this check as it is currently too slow

docker-compose.yml

@@ -67,6 +67,12 @@ services:
       - RABBITMQ_CLOWDERURL=${RABBITMQ_CLOWDERURL:-http://clowder:9000}
       - SMTP_MOCK=${SMTP_MOCK:-true}
       - SMTP_SERVER=${SMTP_SERVER:-smtp}
+      - CLOWDER_STORAGE=${CLOWDER_STORAGE:-services.filesystem.DiskByteStorageService}
+      - CLOWDER_DISKPATH=${CLOWDER_DISKPATH:-/home/clowder/data}
+      - S3_ENDPOINT=${S3_ENDPOINT:-http://minio:9000}
+      - S3_BUCKET=${S3_BUCKET:-clowder}
+      - S3_ACCESS_KEY=${S3_ACCESS_KEY:-clowder}
+      - S3_SECRET_KEY=${S3_SECRET_KEY:-catsarecute}
     labels:
       - "traefik.enable=true"
       - "traefik.backend=clowder"