Per-command dependency injection (#1679)

* Move LogstreamManager out of CommandBase * Per-command dependency injection
acquia · Feb 8, 2024 · 18a4a61 · 18a4a61
1 parent 6d963af
commit 18a4a61
Show file tree

Hide file tree

Showing 25 changed files with 481 additions and 363 deletions.
diff --git a/src/Command/Acsf/AcsfCommandFactory.php b/src/Command/Acsf/AcsfCommandFactory.php
@@ -12,8 +12,6 @@
 use Acquia\Cli\Helpers\LocalMachineHelper;
 use Acquia\Cli\Helpers\SshHelper;
 use Acquia\Cli\Helpers\TelemetryHelper;
-use AcquiaLogstream\LogstreamManager;
-use GuzzleHttp\Client;
 use Psr\Log\LoggerInterface;
 
 class AcsfCommandFactory implements CommandFactoryInterface {
@@ -26,11 +24,9 @@ public function __construct(
     private TelemetryHelper $telemetryHelper,
     private string $projectDir,
     private AcsfClientService $cloudApiClientService,
-    private LogstreamManager $logstreamManager,
     private SshHelper $sshHelper,
     private string $sshDir,
     private LoggerInterface $logger,
-    private Client $httpClient
   ) {
   }
 
@@ -43,11 +39,9 @@ public function createCommand(): AcsfApiBaseCommand {
       $this->telemetryHelper,
       $this->projectDir,
       $this->cloudApiClientService,
-      $this->logstreamManager,
       $this->sshHelper,
       $this->sshDir,
       $this->logger,
-      $this->httpClient
     );
   }
 
@@ -60,11 +54,9 @@ public function createListCommand(): AcsfListCommand {
       $this->telemetryHelper,
       $this->projectDir,
       $this->cloudApiClientService,
-      $this->logstreamManager,
       $this->sshHelper,
       $this->sshDir,
       $this->logger,
-      $this->httpClient
     );
   }
 

diff --git a/src/Command/Api/ApiCommandFactory.php b/src/Command/Api/ApiCommandFactory.php
@@ -12,8 +12,6 @@
 use Acquia\Cli\Helpers\LocalMachineHelper;
 use Acquia\Cli\Helpers\SshHelper;
 use Acquia\Cli\Helpers\TelemetryHelper;
-use AcquiaLogstream\LogstreamManager;
-use GuzzleHttp\Client;
 use Psr\Log\LoggerInterface;
 
 class ApiCommandFactory implements CommandFactoryInterface {
@@ -26,11 +24,9 @@ public function __construct(
     private TelemetryHelper $telemetryHelper,
     private string $projectDir,
     private ClientService $cloudApiClientService,
-    private LogstreamManager $logstreamManager,
     private SshHelper $sshHelper,
     private string $sshDir,
     private LoggerInterface $logger,
-    private Client $httpClient
   ) {
   }
 
@@ -43,11 +39,9 @@ public function createCommand(): ApiBaseCommand {
       $this->telemetryHelper,
       $this->projectDir,
       $this->cloudApiClientService,
-      $this->logstreamManager,
       $this->sshHelper,
       $this->sshDir,
       $this->logger,
-      $this->httpClient
     );
   }
 
@@ -60,11 +54,9 @@ public function createListCommand(): ApiListCommand {
       $this->telemetryHelper,
       $this->projectDir,
       $this->cloudApiClientService,
-      $this->logstreamManager,
       $this->sshHelper,
       $this->sshDir,
       $this->logger,
-      $this->httpClient
     );
   }
 

diff --git a/src/Command/App/LogTailCommand.php b/src/Command/App/LogTailCommand.php
@@ -4,9 +4,18 @@
 
 namespace Acquia\Cli\Command\App;
 
+use Acquia\Cli\ApiCredentialsInterface;
 use Acquia\Cli\Attribute\RequireAuth;
+use Acquia\Cli\CloudApi\ClientService;
 use Acquia\Cli\Command\CommandBase;
+use Acquia\Cli\DataStore\AcquiaCliDatastore;
+use Acquia\Cli\DataStore\CloudDataStore;
+use Acquia\Cli\Helpers\LocalMachineHelper;
+use Acquia\Cli\Helpers\SshHelper;
+use Acquia\Cli\Helpers\TelemetryHelper;
 use AcquiaCloudApi\Endpoints\Logs;
+use AcquiaLogstream\LogstreamManager;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -16,6 +25,22 @@
 #[AsCommand(name: 'app:log:tail', description: 'Tail the logs from your environments', aliases: ['tail', 'log:tail'])]
 final class LogTailCommand extends CommandBase {
 
+  public function __construct(
+    public LocalMachineHelper $localMachineHelper,
+    protected CloudDataStore $datastoreCloud,
+    protected AcquiaCliDatastore $datastoreAcli,
+    protected ApiCredentialsInterface $cloudCredentials,
+    protected TelemetryHelper $telemetryHelper,
+    protected string $projectDir,
+    protected ClientService $cloudApiClientService,
+    public SshHelper $sshHelper,
+    protected string $sshDir,
+    LoggerInterface $logger,
+    protected LogstreamManager $logstreamManager,
+  ) {
+    parent::__construct($this->localMachineHelper, $this->datastoreCloud, $this->datastoreAcli, $this->cloudCredentials, $this->telemetryHelper, $this->projectDir, $this->cloudApiClientService, $this->sshHelper, $this->sshDir, $logger);
+  }
+
   protected function configure(): void {
     $this
       ->acceptEnvironmentId();