TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 02:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow to configure a region for s3 backend

Browse Source 
Closes: #2386
This commit is contained in:
eikek
2023-11-17 20:53:27 +01:00
parent bc9a483143
commit 81d8b6c9c1
10 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/backend/src/main/scala/docspell/backend/Config.scala
View File

@ -11,6 +11,7 @@ import cats.implicits._
import docspell.backend.signup.{Config => SignupConfig}
import docspell.common._
import docspell.common.syntax.string._
import docspell.store.file.FileRepositoryConfig
import docspell.store.{JdbcConfig, SchemaMigrateConfig}
@ -51,6 +52,12 @@ object Config {
stores.get(id).map(FileRepositoryConfig.fromFileStoreConfig(chunkSize, _))
def validate: ValidatedNec[String, Files] = {
def filterEmptyRegion =
copy(stores = stores.view.mapValues {
case c: FileStoreConfig.S3 => c.copy(region = c.region.flatMap(_.asNonBlank))
case c => c
}.toMap)
val storesEmpty =
if (enabledStores.isEmpty)
Validated.invalidNec(
@ -65,7 +72,7 @@ object Config {
Validated.invalidNec(s"Default file store not present: ${defaultStore.id}")
}
(storesEmpty |+| defaultStorePresent).map(_ => this)
(storesEmpty |+| defaultStorePresent).map(_ => filterEmptyRegion)
}
}