Merge pull request #6 from zeroae/f/handle-empty-prefix

Handle empty key prefix

Author: sodre

.github/.github-update-disabled

@@ -17,3 +17,32 @@
 # Crash log files
 crash.log
 test.log
+
+### macOS template
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+

.gitignore

@@ -271,7 +271,7 @@ In general, PRs are welcome. We follow the typical "fork-and-pull" Git workflow.
 
 ## Copyrights
 
-Copyright © 2020-2021 [Zero A.E., LLC](https://zero-ae.com)
+Copyright © 2020-2022 [Zero A.E., LLC](https://zero-ae.com)
 
 
 

README.md

@@ -1,5 +1,8 @@
 locals {
-  key_prefix = trimsuffix(var.bucket_key_prefix, "/")
+  key_prefix = join("/", compact([
+    trimprefix(trimsuffix(var.bucket_key_prefix, "/"), "/"),
+    module.volume_label.id
+  ]))
 }
 
 module "volume_label" {
@@ -10,10 +13,10 @@ module "volume_label" {
 }
 
 # TODO: Implement a health check
-# TODO: Support multiple volumes
+# TODO: Support different user/groups
 module "mobius3" {
   source          = "git::https://github.com/cloudposse/terraform-aws-ecs-container-definition.git?ref=tags/0.57.0"
-  container_name  = "mobius3"
+  container_name  = "mobius3-${var.volume_name}"
   container_image = var.mobius3_image
   essential       = true
 
@@ -25,7 +28,7 @@ module "mobius3" {
     var.bucket_id,
     "https://{}.s3.${var.bucket_region}.amazonaws.com/",
     var.bucket_region,
-    "--prefix", "${local.key_prefix}/${module.volume_label.id}/",
+    "--prefix", "${local.key_prefix}/",
     "--credentials-source", "ecs-container-endpoint",
     "--log-level", "INFO"
   ]