Merge branch 'development'

platformsh · Oct 8, 2015 · cf40ae9 · cf40ae9
2 parents d890b3a + f419946
commit cf40ae9
Show file tree

Hide file tree

Showing 14 changed files with 110 additions and 56 deletions.
diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "require": {
         "doctrine/cache": "~1.4.2",
         "platformsh/console-form": "0.0.4",
-        "platformsh/client": "0.1.27",
+        "platformsh/client": "0.1.31",
         "symfony/console": "~2.5 >=2.5.2",
         "symfony/yaml": "~2.5",
         "symfony/finder": "~2.5",

diff --git a/composer.lock b/composer.lock
diff --git a/platform b/platform
@@ -3,7 +3,7 @@
 
 define('CLI_ROOT', __DIR__);
 
-error_reporting(E_ERROR | E_WARNING | E_PARSE);
+error_reporting(getenv('PLATFORMSH_CLI_DEBUG') ? E_ALL : false);
 
 if (file_exists(CLI_ROOT . '/vendor/autoload.php')) {
     require CLI_ROOT . '/vendor/autoload.php';

diff --git a/src/Command/Activity/ActivityListCommand.php b/src/Command/Activity/ActivityListCommand.php
@@ -22,11 +22,12 @@ protected function configure()
           ->addOption('limit', null, InputOption::VALUE_REQUIRED, 'Limit the number of results displayed', 5)
           ->addOption('pipe', null, InputOption::VALUE_NONE, 'Output tab-separated results')
           ->addOption('start', null, InputOption::VALUE_REQUIRED, 'Only activities created before this date will be listed')
-          ->setDescription('Get the most recent activities for an environment');
+          ->setDescription('Get a list of activities for an environment');
         $this->addProjectOption()
              ->addEnvironmentOption();
         $this->addExample('List recent activities on the current environment')
-          ->addExample('List recent pushes', '--type environment.push');
+          ->addExample('List recent pushes', '--type environment.push')
+          ->addExample('List pushes made before 15 March', '--type environment.push --start 2015-03-15');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
@@ -73,7 +74,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             return 0;
         }
 
-        $this->stdErr->writeln("Recent activities for the environment <info>" . $environment['id'] . "</info>");
+        $this->stdErr->writeln("Activities for the environment <info>" . $environment['id'] . "</info>");
         $table = new Table($output);
         $table->setHeaders($headers);
         $table->addRows($rows);

diff --git a/src/Command/Snapshot/SnapshotListCommand.php b/src/Command/Snapshot/SnapshotListCommand.php
@@ -21,6 +21,8 @@ protected function configure()
           ->addOption('start', null, InputOption::VALUE_REQUIRED, 'Only snapshots created before this date will be listed');
         $this->addProjectOption()
              ->addEnvironmentOption();
+        $this->addExample('List the most recent snapshots')
+          ->addExample('List snapshots made before last week', "--start '1 week ago'");
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)

diff --git a/src/Command/User/UserAddCommand.php b/src/Command/User/UserAddCommand.php
@@ -1,6 +1,8 @@
 <?php
 namespace Platformsh\Cli\Command\User;
 
+use Platformsh\Cli\Util\ActivityUtil;
+use Platformsh\Client\Model\Activity;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -16,7 +18,8 @@ protected function configure()
           ->setName('user:add')
           ->setDescription('Add a user to the project')
           ->addArgument('email', InputArgument::OPTIONAL, "The new user's email address")
-          ->addOption('role', null, InputOption::VALUE_REQUIRED, "The new user's role: 'admin' or 'viewer'");
+          ->addOption('role', null, InputOption::VALUE_REQUIRED, "The new user's role: 'admin' or 'viewer'")
+          ->addOption('wait', null, InputOption::VALUE_NONE, 'Wait for environment(s) to be redeployed, if necessary');
         $this->addProjectOption();
         $this->addExample('Add Alice as a new administrator', '[email protected] --role admin');
     }
@@ -106,7 +109,26 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
         }
 
-        $project->addUser($email, $projectRole);
+        $this->stdErr->writeln("Adding the user to the project");
+        $user = $project->addUser($email, $projectRole);
+
+        if (!empty($environmentRoles)) {
+            $this->stdErr->writeln("Setting environment role(s)");
+            $activities = [];
+            foreach ($environmentRoles as $environmentId => $role) {
+                if (!isset($environments[$environmentId])) {
+                    $this->stdErr->writeln("<error>Environment not found: $environmentId</error>");
+                    continue;
+                }
+                $result = $user->changeEnvironmentRole($environments[$environmentId], $role);
+                if ($result instanceof Activity) {
+                    $activities[] = $result;
+                }
+            }
+            if ($input->getOption('wait')) {
+                ActivityUtil::waitMultiple($activities, $this->stdErr, 'Waiting for environment(s) to be redeployed');
+            }
+        }
 
         $this->stdErr->writeln("User <info>$email</info> created");
         return 0;

diff --git a/src/Command/User/UserRoleCommand.php b/src/Command/User/UserRoleCommand.php
@@ -1,6 +1,8 @@
 <?php
 namespace Platformsh\Cli\Command\User;
 
+use Platformsh\Cli\Util\ActivityUtil;
+use Platformsh\Client\Model\Activity;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -17,7 +19,8 @@ protected function configure()
           ->addArgument('email', InputArgument::REQUIRED, "The user's email address")
           ->addOption('role', 'r', InputOption::VALUE_REQUIRED, "A new role for the user")
           ->addOption('level', 'l', InputOption::VALUE_REQUIRED, "The role level ('project' or 'environment')", 'project')
-          ->addOption('pipe', null, InputOption::VALUE_NONE, 'Output the role only');
+          ->addOption('pipe', null, InputOption::VALUE_NONE, 'Output the role only')
+          ->addOption('wait', null, InputOption::VALUE_NONE, 'Wait for environment(s) to be redeployed, if necessary');
         $this->addProjectOption()
           ->addEnvironmentOption();
         $this->addExample("View Alice's role on the project", '[email protected]');
@@ -85,8 +88,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->stdErr->writeln("User <info>$email</info> updated");
         }
         elseif ($role && $level == 'environment') {
-            $selectedUser->changeEnvironmentRole($this->getSelectedEnvironment(), $role);
+            $result = $selectedUser->changeEnvironmentRole($this->getSelectedEnvironment(), $role);
             $this->stdErr->writeln("User <info>$email</info> updated");
+            if ($input->getOption('wait') && $result instanceof Activity) {
+                ActivityUtil::waitAndLog(
+                  $result,
+                  $this->stdErr,
+                  'Environment redeployed successfully',
+                  'Failed to redeploy environment'
+                );
+            }
         }
 
         if ($input->getOption('pipe')) {

diff --git a/src/Console/EventSubscriber.php b/src/Console/EventSubscriber.php
@@ -3,9 +3,10 @@
 
 use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Exception\ConnectException;
-use GuzzleHttp\Exception\ParseException;
+use GuzzleHttp\Exception\ServerException;
 use Platformsh\Cli\Command\PlatformCommand;
 use Platformsh\Cli\Exception\ConnectionFailedException;
+use Platformsh\Cli\Exception\HttpException;
 use Platformsh\Cli\Exception\LoginRequiredException;
 use Platformsh\Cli\Exception\PermissionDeniedException;
 use Platformsh\Client\Exception\EnvironmentStateException;
@@ -44,40 +45,42 @@ public function onException(ConsoleExceptionEvent $event)
             $event->stopPropagation();
         }
 
-        // Handle Guzzle client exceptions, i.e. HTTP 4xx errors.
-        if ($exception instanceof ClientException && ($response = $exception->getResponse())) {
+        // Handle Guzzle exceptions, i.e. HTTP 4xx or 5xx errors.
+        if (($exception instanceof ClientException || $exception instanceof ServerException) && ($response = $exception->getResponse())) {
             $request = $exception->getRequest();
-            try {
-                $response->getBody()->seek(0);
-                $json = $response->json();
-            }
-            catch (ParseException $e) {
-                $json = [];
-            }
+            $response->getBody()->seek(0);
+            $json = (array) json_decode($response->getBody()->getContents(), true);
 
             // Create a friendlier message for the OAuth2 "Invalid refresh token"
             // error.
             if ($response->getStatusCode() === 400 && isset($json['error_description']) && $json['error_description'] === 'Invalid refresh token') {
                 $event->setException(new LoginRequiredException(
                     "Invalid refresh token: please log in again.",
-                    $request
+                    $request,
+                    $response
                 ));
                 $event->stopPropagation();
             }
             elseif ($response->getStatusCode() === 401) {
                 $event->setException(new LoginRequiredException(
                     "Unauthorized: please log in again.",
-                     $request
+                     $request,
+                     $response
                 ));
                 $event->stopPropagation();
             }
             elseif ($response->getStatusCode() === 403) {
                 $event->setException(new PermissionDeniedException(
-                  "Permission denied. Check your project or environment permissions.",
-                  $request
+                    "Permission denied. Check your project or environment permissions.",
+                    $request,
+                    $response
                 ));
                 $event->stopPropagation();
             }
+            else {
+                $event->setException(new HttpException(null, $request, $response));
+                $event->stopPropagation();
+            }
         }
 
         // When an environment is found to be in the wrong state, perhaps our

diff --git a/src/Exception/ConnectionFailedException.php b/src/Exception/ConnectionFailedException.php
@@ -2,7 +2,7 @@
 
 namespace Platformsh\Cli\Exception;
 
-class ConnectionFailedException extends HttpExceptionBase
+class ConnectionFailedException extends HttpException
 {
     protected $message = 'No Internet connection available.';
     protected $code = 5;

diff --git a/src/Exception/HttpException.php b/src/Exception/HttpException.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Platformsh\Cli\Exception;
+
+use GuzzleHttp\Message\RequestInterface;
+use GuzzleHttp\Message\ResponseInterface;
+use Platformsh\Client\Exception\ApiResponseException;
+
+class HttpException extends \RuntimeException
+{
+    protected $message = 'An API error occurred.';
+
+    /**
+     * @param string            $message
+     * @param RequestInterface  $request
+     * @param ResponseInterface $response
+     */
+    public function __construct($message = null, RequestInterface $request = null, ResponseInterface $response = null)
+    {
+        $message = $message ?: $this->message;
+        if ($request !== null && $response !== null) {
+            $details = "[url] " . $request->getUrl();
+            $details .= " [status code] " . $response->getStatusCode();
+            $details .= " [reason phrase] " . $response->getReasonPhrase();
+            $details .= ApiResponseException::getErrorDetails($response);
+            $message .= "\nDetails:\n  " . wordwrap($details);
+        }
+
+        parent::__construct($message, $this->code);
+    }
+}
diff --git a/src/Exception/HttpExceptionBase.php b/src/Exception/HttpExceptionBase.php
diff --git a/src/Exception/LoginRequiredException.php b/src/Exception/LoginRequiredException.php
@@ -2,7 +2,7 @@
 
 namespace Platformsh\Cli\Exception;
 
-class LoginRequiredException extends HttpExceptionBase
+class LoginRequiredException extends HttpException
 {
     protected $message = 'Not logged in.';
     protected $code = 3;

diff --git a/src/Exception/PermissionDeniedException.php b/src/Exception/PermissionDeniedException.php
@@ -2,7 +2,7 @@
 
 namespace Platformsh\Cli\Exception;
 
-class PermissionDeniedException extends HttpExceptionBase
+class PermissionDeniedException extends HttpException
 {
     protected $message = 'Permission denied. Check your project or environment permissions.';
     protected $code = 6;

diff --git a/src/Util/ActivityUtil.php b/src/Util/ActivityUtil.php
@@ -49,15 +49,20 @@ function ($log) use ($output) {
      *
      * @param Activity[]      $activities
      * @param OutputInterface $output
+     * @param string|null $message
      */
-    public static function waitMultiple(array $activities, OutputInterface $output)
+    public static function waitMultiple(array $activities, OutputInterface $output, $message = null)
     {
         $count = count($activities);
         if ($count <= 0) {
             return;
         }
         $complete = 0;
-        $output->writeln("Waiting...");
+        if ($message === null) {
+            $activitiesPlural = $count > 1 ? 'activities' : 'activity';
+            $message = "Waiting for the $activitiesPlural to complete...";
+        }
+        $output->writeln($message);
         $bar = new ProgressBar($output);
         $bar->start($count);
         $bar->setFormat('verbose');