Alters container to include cloudapi

src/AcquiaCli.php

@@ -66,6 +66,8 @@ public function __construct(Config $config, InputInterface $input = null, Output
 
         // Create and configure container.
         $container = Robo::createDefaultContainer($input, $output, $application, $config);
+        $container->add('cloudApi', \AcquiaCli\CloudApi::class)
+            ->withArgument('config');
 
         $discovery = new CommandFileDiscovery();
         $discovery->setSearchPattern('*Command.php');

src/CloudApi.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace AcquiaCli;
+
+use AcquiaCloudApi\Connector\Client;
+use AcquiaCloudApi\Connector\Connector;
+
+/**
+ * Class CloudApi
+ * @package AcquiaCli
+ */
+final class CloudApi
+{
+
+    private $cloudapi;
+
+    public function __construct($config)
+    {
+
+        $extraConfig = $config->get('extraconfig');
+        $acquia = $config->get('acquia');
+
+        if (getenv('ACQUIACLI_KEY') && getenv('ACQUIACLI_SECRET')) {
+            $acquia['key'] = getenv('ACQUIACLI_KEY');
+            $acquia['secret'] = getenv('ACQUIACLI_SECRET');
+        }
+
+        $connector = new Connector([
+            'key' => $acquia['key'],
+            'secret' => $acquia['secret'],
+        ]);
+        /** @var \AcquiaCloudApi\Connector\Client $cloudapi */
+        $cloudapi = Client::factory($connector);
+
+        $this->setCloudApi($cloudapi);
+    }
+
+    public function getCloudApi()
+    {
+        return $this->cloudapi;
+    }
+
+    public function setCloudApi($cloudapi)
+    {
+        $this->cloudapi = $cloudapi;
+    }
+}

src/Commands/AccountCommand.php

@@ -17,7 +17,7 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->accountAdapter = new Account($this->cloudapi);
+        $this->accountAdapter = new Account($this->getCloudApi());
     }
 
     /**

src/Commands/AcquiaCommand.php

@@ -31,9 +31,6 @@ abstract class AcquiaCommand extends Tasks
     // @TODO https://github.com/boedah/robo-drush/issues/18
     //use \Boedah\Robo\Task\Drush\loadTasks;
 
-    /** @var \AcquiaCloudApi\Connector\Client $cloudapi */
-    protected $cloudapi;
-
     /** Additional configuration. */
     protected $extraConfig;
 
@@ -57,32 +54,28 @@ abstract class AcquiaCommand extends Tasks
      */
     public function __construct()
     {
-        $extraConfig = Robo::config()->get('extraconfig');
-        $this->extraConfig = $extraConfig;
-
-        $acquia = Robo::config()->get('acquia');
+        $config = Robo::config();
+        $this->extraConfig = $config->get('extraconfig');
 
-        // Allows for environment variables for the key and secret
-        // to override configuration values.
-        if (getenv('ACQUIACLI_KEY') && getenv('ACQUIACLI_SECRET')) {
-            $acquia['key'] = getenv('ACQUIACLI_KEY');
-            $acquia['secret'] = getenv('ACQUIACLI_SECRET');
-        }
+        $this->setTableStyles();
+    }
 
-        $connector = new Connector([
-            'key' => $acquia['key'],
-            'secret' => $acquia['secret'],
-        ]);
-        /** @var \AcquiaCloudApi\Connector\Client $cloudapi */
-        $cloudapi = Client::factory($connector);
+    public function getCloudApi()
+    {
+        $cloudapi = Robo::service('cloudApi')->getCloudApi();
+        return $cloudapi;
+    }
 
-        $this->setCloudApi($cloudapi);
-        $this->setTableStyles();
+    public function getEnvironments()
+    {
+        $environments = Robo::service('cloudApi')->getEnvironments();
+        return $environments;
     }
 
-    public function setCloudApi($cloudapi)
+    public function getApplications()
     {
-        $this->cloudapi = $cloudapi;
+        $applications = Robo::service('cloudApi')->getApplications();
+        return $applications;
     }
 
     /**
@@ -165,7 +158,7 @@ public function validateUuidHook(CommandData $commandData)
      */
     protected function getEnvironmentFromEnvironmentName($uuid, $environment)
     {
-        $environmentsAdapter = new Environments($this->cloudapi);
+        $environmentsAdapter = $this->getEnvironments();
         $environments = $environmentsAdapter->getAll($uuid);
 
         foreach ($environments as $e) {
@@ -184,7 +177,7 @@ protected function getEnvironmentFromEnvironmentName($uuid, $environment)
      */
     protected function getOrganizationFromOrganizationName($organizationName)
     {
-        $org = new Organizations($this->cloudapi);
+        $org = new Organizations($this->getCloudApi());
         $organizations = $org->getAll();
 
         foreach ($organizations as $organization) {
@@ -203,7 +196,7 @@ protected function getOrganizationFromOrganizationName($organizationName)
      */
     protected function getUuidFromHostingName($name)
     {
-        $app = new Applications($this->cloudapi);
+        $app = $this->getApplications();
         $applications = $app->getAll();
 
         foreach ($applications as $application) {
@@ -245,7 +238,7 @@ protected function waitForNotification($response)
         $progress->setMessage('Looking up notification');
         $progress->start();
 
-        $notificationAdapter = new Notifications($this->cloudapi);
+        $notificationAdapter = new Notifications($this->getCloudApi());
 
         while (true) {
             $progress->advance($sleep);
@@ -295,7 +288,7 @@ protected function waitForNotification($response)
      */
     protected function backupAndMoveDbs($uuid, $environmentFrom, $environmentTo)
     {
-        $dbAdapter = new Databases($this->cloudapi);
+        $dbAdapter = new Databases($this->getCloudApi());
         $databases = $dbAdapter->getAll($uuid);
         foreach ($databases as $database) {
             $this->backupDb($uuid, $environmentTo, $database);
@@ -310,7 +303,7 @@ protected function backupAndMoveDbs($uuid, $environmentFrom, $environmentTo)
                 )
             );
 
-            $databaseAdapter = new Databases($this->cloudapi);
+            $databaseAdapter = new Databases($this->getCloudApi());
             $response = $databaseAdapter->copy($environmentFrom->uuid, $database->name, $environmentTo->uuid);
             $this->waitForNotification($response);
         }
@@ -322,7 +315,7 @@ protected function backupAndMoveDbs($uuid, $environmentFrom, $environmentTo)
      */
     protected function backupAllEnvironmentDbs($uuid, EnvironmentResponse $environment)
     {
-        $dbAdapter = new Databases($this->cloudapi);
+        $dbAdapter = new Databases($this->getCloudApi());
         $databases = $dbAdapter->getAll($uuid);
         foreach ($databases as $database) {
             $this->backupDb($uuid, $environment, $database);
@@ -338,7 +331,7 @@ protected function backupDb($uuid, EnvironmentResponse $environment, DatabaseRes
     {
         // Run database backups.
         $this->say(sprintf('Backing up DB (%s) on %s', $database->name, $environment->label));
-        $dbAdapter = new DatabaseBackups($this->cloudapi);
+        $dbAdapter = new DatabaseBackups($this->getCloudApi());
         $response = $dbAdapter->create($environment->uuid, $database->name);
         $this->waitForNotification($response);
     }
@@ -350,7 +343,7 @@ protected function backupDb($uuid, EnvironmentResponse $environment, DatabaseRes
      */
     protected function copyFiles($uuid, $environmentFrom, $environmentTo)
     {
-        $environmentsAdapter = new Environments($this->cloudapi);
+        $environmentsAdapter = $this->getEnvironments();
         $this->say(sprintf('Copying files from %s to %s', $environmentFrom->label, $environmentTo->label));
         $response = $environmentsAdapter->copyFiles($environmentFrom->uuid, $environmentTo->uuid);
         $this->waitForNotification($response);

src/Commands/ApplicationsCommand.php

@@ -23,9 +23,9 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->applicationsAdapter = new Applications($this->cloudapi);
-        $this->environmentsAdapter = new Environments($this->cloudapi);
-        $this->databasesAdapter = new Databases($this->cloudapi);
+        $this->applicationsAdapter = new Applications($this->getCloudApi());
+        $this->environmentsAdapter = new Environments($this->getCloudApi());
+        $this->databasesAdapter = new Databases($this->getCloudApi());
     }
 
     /**

src/Commands/CodeCommand.php

@@ -20,7 +20,7 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->codeAdapter = new Code($this->cloudapi);
+        $this->codeAdapter = new Code($this->getCloudApi());
     }
 
     /**

src/Commands/CronCommand.php

@@ -20,7 +20,7 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->cronAdapter = new Crons($this->cloudapi);
+        $this->cronAdapter = new Crons($this->getCloudApi());
     }
 
     /**

src/Commands/DbBackupCommand.php

@@ -28,7 +28,7 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->databaseBackupsAdapter = new DatabaseBackups($this->cloudapi);
+        $this->databaseBackupsAdapter = new DatabaseBackups($this->getCloudApi());
     }
 
     /**

src/Commands/DbCommand.php

@@ -24,7 +24,7 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->databaseAdapter = new Databases($this->cloudapi);
+        $this->databaseAdapter = new Databases($this->getCloudApi());
     }
 
     /**

src/Commands/DomainCommand.php

@@ -19,7 +19,7 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->domainAdapter = new Domains($this->cloudapi);
+        $this->domainAdapter = new Domains($this->getCloudApi());
     }
 
     /**

src/Commands/EnvironmentsCommand.php

@@ -21,8 +21,8 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->environmentsAdapter = new Environments($this->cloudapi);
-        $this->serversAdapter = new Servers($this->cloudapi);
+        $this->environmentsAdapter = new Environments($this->getCloudApi());
+        $this->serversAdapter = new Servers($this->getCloudApi());
     }
 
     /**

src/Commands/InsightsCommand.php

@@ -22,7 +22,7 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->insightsAdapter = new Insights($this->cloudapi);
+        $this->insightsAdapter = new Insights($this->getCloudApi());
     }
 
     /**

src/Commands/LogsCommand.php

@@ -25,7 +25,7 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->logsAdapter = new Logs($this->cloudapi);
+        $this->logsAdapter = new Logs($this->getCloudApi());
     }
 
     /**

src/Commands/NotificationsCommand.php

@@ -19,7 +19,7 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->notificationsAdapter = new Notifications($this->cloudapi);
+        $this->notificationsAdapter = new Notifications($this->getCloudApi());
     }
 
     /**

src/Commands/OrganizationsCommand.php

@@ -24,7 +24,7 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->organizationsAdapter = new Organizations($this->cloudapi);
+        $this->organizationsAdapter = new Organizations($this->getCloudApi());
     }
 
     /**

src/Commands/SshCommand.php

@@ -23,13 +23,26 @@ class SshCommand extends EnvironmentsCommand
     public function sshInfo($uuid, $env = null)
     {
 
-        if (null !== $env) {
-            $this->cloudapi->addQuery('filter', "name=${env}");
-        }
+        // if (null !== $env) {
+        //     $this->cloudapi->addQuery('filter', "name=${env}");
+        // }
 
         $environments = $this->environmentsAdapter->getAll($uuid);
 
-        $this->cloudapi->clearQuery();
+        // $a = new \stdClass;
+        // $a->name = 'foo';
+        // $a->sshUrl = 'hello';
+
+        // $b = new \stdClass;
+        // $b->name = 'foo';
+        // $b->sshUrl = 'hello';
+
+        // $environments = [
+        //     1 => $a,
+        //     2 => $b
+        // ];
+        // $this->cloudapi->clearQuery();
+        var_dump($environments);
 
         foreach ($environments as $e) {
             /** @var $e EnvironmentResponse */

src/Commands/TeamsCommand.php

@@ -25,9 +25,9 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->teamsAdapter = new Teams($this->cloudapi);
-        $this->rolesAdapter = new Roles($this->cloudapi);
-        $this->permissionsAdapter = new Permissions($this->cloudapi);
+        $this->teamsAdapter = new Teams($this->getCloudApi());
+        $this->rolesAdapter = new Roles($this->getCloudApi());
+        $this->permissionsAdapter = new Permissions($this->getCloudApi());
     }
 
     /**

src/Commands/VariablesCommand.php

@@ -21,7 +21,7 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->variablesAdapter = new Variables($this->cloudapi);
+        $this->variablesAdapter = new Variables($this->getCloudApi());
     }
 
     /**