Allow to disable the creation of a default storage at project creation (

#4713) * Allow to disable the creation of a default storage at project creation * Address feedback --------- Co-authored-by: Simon Dumas <[email protected]>
BlueBrain · Feb 7, 2024 · cfa89dd · cfa89dd
1 parent 67edf52
commit cfa89dd
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/delta/plugins/storage/src/main/resources/storage.conf b/delta/plugins/storage/src/main/resources/storage.conf
@@ -3,6 +3,8 @@ plugins.storage {
   enabled = true
   # The priority of the plugin
   priority = 1
+  # Enable the creation of a default storage when a project is created
+  enable-default-creation = true
   # storages configuration
   storages {
     # Disk storage configuration

diff --git a/...ge/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/StoragePluginConfig.scala b/...ge/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/StoragePluginConfig.scala
@@ -10,6 +10,7 @@ import pureconfig.generic.semiauto.deriveReader
 import pureconfig.{ConfigReader, ConfigSource}
 
 final case class StoragePluginConfig(
+    enableDefaultCreation: Boolean,
     storages: StoragesConfig,
     files: FilesConfig,
     defaults: Defaults

diff --git a/...ge/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/StoragePluginModule.scala b/...ge/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/StoragePluginModule.scala
@@ -305,13 +305,10 @@ class StoragePluginModule(priority: Int) extends ModuleDef {
         .getOrElse(Set.empty[RemoteStorageServiceDependency])
   }
 
-  make[StorageScopeInitialization].from {
-    (storages: Storages, serviceAccount: ServiceAccount, cfg: StoragePluginConfig) =>
-      new StorageScopeInitialization(storages, serviceAccount, cfg.defaults)
+  many[ScopeInitialization].addSet { (storages: Storages, serviceAccount: ServiceAccount, cfg: StoragePluginConfig) =>
+    Option.when(cfg.enableDefaultCreation)(new StorageScopeInitialization(storages, serviceAccount, cfg.defaults)).toSet
   }
 
-  many[ScopeInitialization].ref[StorageScopeInitialization]
-
   many[ProjectDeletionTask].add { (storages: Storages) => StorageDeletionTask(storages) }
 
   many[MetadataContextValue].addEffect(MetadataContextValue.fromFile("contexts/storages-metadata.json"))

diff --git a/...main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/StorageScopeInitialization.scala b/...main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/StorageScopeInitialization.scala
@@ -65,3 +65,17 @@ class StorageScopeInitialization(
 
   override def entityType: EntityType = Storages.entityType
 }
+
+object StorageScopeInitialization {
+
+  /**
+    * Conditionnally create a [[StorageScopeInitialization]]
+    */
+  def when(enabled: Boolean)(
+      storages: Storages,
+      serviceAccount: ServiceAccount,
+      defaults: Defaults
+  ): Option[StorageScopeInitialization] =
+    Option.when(enabled)(new StorageScopeInitialization(storages, serviceAccount, defaults))
+
+}
diff --git a/docs/src/main/paradox/docs/releases/v1.10-release-notes.md b/docs/src/main/paradox/docs/releases/v1.10-release-notes.md
@@ -60,6 +60,10 @@ using the listing endpoints.
 
 ### Storages
 
+#### Disabling default storage
+
+The creation of a default storage at project creation can now be disabled.
+
 #### Undeprecate Storages
 
 Previously deprecated storages can now be undeprecated.