Merge pull request #107 from fortrabbit/tiny-fixes

fix volume check
fortrabbit · Apr 8, 2021 · 062a4bf · 062a4bf
2 parents ae7df6a + 7ab2999
commit 062a4bf
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 #  Changelog
 
+## 1.0.4 - 2021-04-08
+- Don't throw exception if no local volumes exist
+- Remove DB_TABLE_PREFIX check 
+
 ## 1.0.3 - 2021-01-11
 - Fixed type issue with symfony/process 5.x (use `Process::fromShellCommandline()`)
 

diff --git a/src/Actions/InfoAction.php b/src/Actions/InfoAction.php
@@ -74,7 +74,6 @@ public function run()
                 $this->envRow('SECURITY_KEY', null, true),
                 new TableSeparator(),
 
-                $this->envRow('DB_TABLE_PREFIX'),
                 $this->envRow('DB_SERVER', function ($local, $remote) {
                     return stristr($remote, '.frbit.com');
                 }),
@@ -103,7 +102,7 @@ public function run()
             );
 
             // Error message with more instructions
-            $errors = array_filter(['SECURITY_KEY', 'DB_TABLE_PREFIX'], function ($key) {
+            $errors = array_filter(['SECURITY_KEY'], function ($key) {
                 return ! self::assertEquals(
                     $this->remoteInfo[$key],
                     getenv($key)

diff --git a/src/Actions/VolumesDownAction.php b/src/Actions/VolumesDownAction.php
@@ -57,8 +57,13 @@ public function run(?string $stage = null, ?array $volumeHandles = null)
             return ExitCode::UNSPECIFIED_ERROR;
         }
 
-        $volumes = $this->localVolume->filterByHandle($volumeHandles);
-        $lastVolume = end($volumes);
+        try {
+            $volumes = $this->localVolume->filterByHandle($volumeHandles);
+            $lastVolume = end($volumes);
+        } catch (VolumeNotFound $exception) {
+            $this->line('No local volumes found.' . PHP_EOL);
+            return ExitCode::OK;
+        }
 
         foreach ($volumes as $volume) {
             $path = $this->prepareForRsync($volume->path);

diff --git a/src/Actions/VolumesUpAction.php b/src/Actions/VolumesUpAction.php
@@ -57,8 +57,14 @@ public function run(?string $stage = null, ?array $volumeHandles = null)
             return ExitCode::UNSPECIFIED_ERROR;
         }
 
-        $volumes = $this->localVolume->filterByHandle($volumeHandles);
-        $lastVolume = end($volumes);
+        try {
+            $volumes = $this->localVolume->filterByHandle($volumeHandles);
+            $lastVolume = end($volumes);
+        } catch (VolumeNotFound $exception) {
+            $this->line('No local volumes found.' . PHP_EOL);
+            return ExitCode::OK;
+        }
+
 
         foreach ($volumes as $volume) {
             $path = $this->prepareForRsync($volume->path);