feat: #195 improve backups folder layout

Author: bohdan-shulha

Diff for: app/Console/Commands/DispatchProcessBackupTask.php

@@ -9,6 +9,7 @@
 use Exception;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
 
 class DispatchProcessBackupTask extends Command
 {
@@ -67,8 +68,9 @@ protected function dispatchBackupTask(): void
         ]);
 
         $date = now()->format('Y-m-d_His');
-        $backupFileName = dockerize_name("svc-{$service->id}-{$process->name}_backup-{$backupCmd->name}-{$date}").'.tar.gz';
-        $archivePath = "{$process->backupVolume->path}/$backupFileName";
+        $backupFilePath = "svc_{$service->id}/{$process->name}/cmd/{$backupCmd->name}/{$process->name}-cmd-{$backupCmd->name}-{$date}.tar.gz";
+        $backupFileSlug = Str::slug($backupFilePath, separator: '_');
+        $archivePath = "{$process->backupVolume->path}/$backupFileSlug";
         $backupCommand = "mkdir -p /tmp/{$backupCmd->id} && cd /tmp/{$backupCmd->id} && {$backupCmd->command} && tar czfv $archivePath -C /tmp/{$backupCmd->id} . && rm -rf /tmp/{$backupCmd->id}";
 
         $s3Storage = $node->swarm->data->findS3Storage($backupCmd->backupSchedule->s3StorageId);
@@ -105,7 +107,7 @@ protected function dispatchBackupTask(): void
                         'Target' => $process->backupVolume->path,
                     ],
                     'SrcFilePath' => $archivePath,
-                    'DestFilePath' => $s3Storage->pathPrefix.'/'.$backupFileName,
+                    'DestFilePath' => $s3Storage->pathPrefix.'/'.$backupFilePath,
                 ],
             ],
         ]);

Diff for: app/Console/Commands/DispatchVolumeBackupTask.php

@@ -10,6 +10,7 @@
 use Exception;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
 
 class DispatchVolumeBackupTask extends Command
 {
@@ -54,7 +55,7 @@ protected function dispatchBackupTask(): void
 
         $volume = $process->findVolume($this->option('volume-id'));
         if ($volume === null) {
-            throw new Exception("Could not find volume {$this->option('volume')} in process {$process->name}.");
+            throw new Exception("Could not find volume {$this->option('volume-id')} in process {$process->name}.");
         }
 
         $node = Node::withoutGlobalScope(TeamScope::class)->findOrFail($process->placementNodeId);
@@ -68,8 +69,9 @@ protected function dispatchBackupTask(): void
         ]);
 
         $date = now()->format('Y-m-d_His');
-        $backupFileName = dockerize_name("svc-{$service->id}-{$process->name}-vol-{$volume->name}-{$date}").'.tar.gz';
-        $archivePath = "{$process->backupVolume->path}/$backupFileName";
+        $backupFilePath = "svc_{$service->id}/{$process->name}/vol/{$volume->name}/{$process->name}-vol-{$volume->name}-{$date}.tar.gz";
+        $backupFileSlug = Str::slug($backupFilePath, separator: '_');
+        $archivePath = "{$process->backupVolume->path}/$backupFileSlug";
         $backupCommand = "tar czfv $archivePath -C {$volume->path} .";
 
         // TODO: get rid of copy-pasted code.
@@ -108,7 +110,7 @@ protected function dispatchBackupTask(): void
                         'Target' => $process->backupVolume->path,
                     ],
                     'SrcFilePath' => $archivePath,
-                    'DestFilePath' => $s3Storage->pathPrefix.'/'.$backupFileName,
+                    'DestFilePath' => $s3Storage->pathPrefix.'/'.$backupFilePath,
                 ],
             ],
         ]);