Merge pull request #19 from emeraldpay/fix/extra-slash-on-bucket-start

emeraldpay · Dec 24, 2023 · aa9c9b0 · aa9c9b0
2 parents 4dd2e08 + 46d8152
commit aa9c9b0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/archive/storage/gcp/GoogleStorage.kt b/src/main/kotlin/io/emeraldpay/dshackle/archive/storage/gcp/GoogleStorage.kt
@@ -25,7 +25,9 @@ class GoogleStorage(
     private val export: RunConfig.ExportBucket = runConfig.export.bucket!!
     val bucket = export.bucket
     val bucketPath = BucketPath(
-        export.path.let { if (it.endsWith("/")) it.substring(0, it.length - 2) else it },
+        export.path
+            .let { if (it.endsWith("/")) it.substring(0, it.length - 2) else it }
+            .trimStart('/'),
     )
 
     lateinit var storage: Storage

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/archive/storage/s3/S3Config.kt b/src/main/kotlin/io/emeraldpay/dshackle/archive/storage/s3/S3Config.kt
@@ -46,7 +46,8 @@ class S3Config(
     val bucket = export.bucket
     val bucketPath = BucketPath(
         export.path
-            .let { if (it.endsWith("/")) it.substring(0, it.length - 2) else it },
+            .let { if (it.endsWith("/")) it.substring(0, it.length - 2) else it }
+            .trimStart('/'),
     )
 
     lateinit var storage: S3Client