Merge pull request #615 from pantheon-systems/collection_err

Accessing invalid collection members now results in error & nonzero exit

Author: TeslaDethray

CHANGELOG.md

@@ -14,6 +14,7 @@ All notable changes to this project starting with the 0.6.0 release will be docu
 - `site create-env` no longer fails to clone from an environment. (#602)
 - `site backups list` filtering by element fixed. (#602)
 - Four SSH-based commands now return with unavailable errors: `wp import`, `wp db`, `drush sql-connect`, and `drush sql-sync`. (#607)
+- When trying to access an invalid collection member, Terminus now exits instead of having a fatal error. (#615)
 
 ### Changed
 - Logged errors now exit with -1. (#576)

php/Terminus/Models/Collections/TerminusCollection.php

@@ -3,6 +3,7 @@
 namespace Terminus\Models\Collections;
 
 use TerminusCommand;
+use Terminus\Exceptions\TerminusException;
 use Terminus\Models\TerminusModel;
 
 abstract class TerminusCollection extends TerminusModel {
@@ -61,7 +62,15 @@ public function get($id) {
     if (isset($models[$id])) {
       return $models[$id];
     }
-    return null;
+    $model = explode('\\', $this->getMemberName());
+    throw new TerminusException(
+      'Could not find {model} "{id}"',
+      array(
+        'model' => strtolower(array_pop($model)),
+        'id'    => $id,
+      ),
+      1
+    );
   }
 
   /**

tests/features/site_organizations.feature

@@ -57,5 +57,5 @@ Feature: Site organizations
     When I run "terminus site organizations remove --site=[[test_site_name]] --org=[[enterprise_org_name]]"
     Then I should get:
     """
-    [[enterprise_org_uuid]] is not a member of [[test_site_name]]
+    Could not find siteorganizationmembership "[[enterprise_org_uuid]]"
     """

tests/features/terminus_model.feature

@@ -0,0 +1,11 @@
+Feature: Finding member items in a collection
+  
+  Scenario: Failure to find a member item in a collection
+    @vcr collection_get_failure
+    Given I am authenticated
+    And a site named "[[test_site_name]]"
+    When I run "terminus site set-connection-mode --site=[[test_site_name]] --env=invalid --mode=sftp"
+    Then I should get:
+    """
+    Could not find environment "invalid"
+    """