Merge pull request #616 from pantheon-systems/fix_set-connection-mode_error

Invalid connection mode from API no longer inhibits connection type setting

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)
+- Failure of the API to return a connection mode no longer inhibits its setting. (#616)
 - When trying to access an invalid collection member, Terminus now exits instead of having a fatal error. (#615)
 
 ### Changed

php/Terminus/Models/Environment.php

@@ -814,7 +814,7 @@ public function info($key = null) {
       if (isset($info[$key])) {
         return $info[$key];
       } else {
-        throw new TerminusException('There is no such field.', array(), -1);
+        throw new TerminusException('There is no such field.', array(), 1);
       }
     } else {
       return $info;

php/commands/site.php

@@ -2,6 +2,7 @@
 
 use Terminus\Utils;
 use Terminus\Helpers\Input;
+use Terminus\Exceptions\TerminusException;
 use Terminus\Models\User;
 use Terminus\Models\Collections\Sites;
 
@@ -161,15 +162,22 @@ public function set_connection_mode($args, $assoc_args) {
   if (in_array($env->get('id'), array('test', 'live'))) {
     $this->failure('Connection mode cannot be set in Test or Live environments');
   }
-  if ($mode == $env->info('connection_mode')) {
-    $this->failure(
-      'The connection mode on {site} for {env} is already set to {mode}.',
-      array(
-        'site' => $site->get('name'),
-        'env' => $env->get('id'),
-        'mode' => $mode
-      ),
-      -1
+  try {
+    $current_mode = $env->info('connection_mode');
+    if ($current_mode == $env->info('connection_mode')) {
+      $this->failure(
+        'The connection mode on {site} for {env} is already set to {mode}.',
+        array(
+          'site' => $site->get('name'),
+          'env' => $env->get('id'),
+          'mode' => $mode
+        ),
+        -1
+      );
+    }
+  } catch (TerminusException $e) {
+    $this->log()->info(
+      'Current connection info not available. Proceeding with mode change.'
     );
   }
   $workflow = $env->changeConnectionMode($mode);

…ts/features/site_connection-mode.feature …eatures/site_set-connection-mode.featuretests/features/site_connection-mode.feature renamed to tests/features/site_set-connection-mode.feature tests/features/site_connection-mode.feature renamed to tests/features/site_set-connection-mode.feature

@@ -1,7 +1,7 @@
 Feature: Site set connection mode
 
   Scenario: Setting connection mode to git
-    @vcr site_connection-mode_git
+    @vcr site_set-connection-mode_git
     Given I am authenticated
     And a site named "[[test_site_name]]"
     When I run "terminus site set-connection-mode --site=[[test_site_name]] --env=dev --mode=git"
@@ -12,7 +12,7 @@ Feature: Site set connection mode
     """
 
   Scenario: Setting connection mode to sftp
-    @vcr site_connection-mode_sftp
+    @vcr site_set-connection-mode_sftp
     Given I am authenticated
     And a site named "[[test_site_name]]"
     When I run "terminus site set-connection-mode --site=[[test_site_name]] --env=dev --mode=sftp"
@@ -23,7 +23,7 @@ Feature: Site set connection mode
     """
 
   Scenario: Failing to set connection mode to invalid mode
-    @vcr site_connection-mode_git
+    @vcr site_set-connection-mode_git
     Given I am authenticated
     And a site named "[[test_site_name]]"
     When I run "terminus site set-connection-mode --site=[[test_site_name]] --env=dev --mode=invalid"
@@ -34,11 +34,11 @@ Feature: Site set connection mode
     """
 
   Scenario: Failing to set the connection mode to the current mode
-    @vcr site_connection-mode_git
+    @vcr site_set-connection-mode_git
     Given I am authenticated
     And a site named "[[test_site_name]]"
     When I run "terminus site set-connection-mode --site=[[test_site_name]] --env=dev --mode=sftp"
     Then I should get:
     """
-    The connection mode on [[test_site_name]] for dev is already set to sftp.
+    The connection mode is already set to sftp.
     """