Move deployer initialization to separate class

Author: tdgroot

src/Command/Cleanup.php

@@ -6,6 +6,7 @@
 
 use Hypernode\Deploy\Brancher\BrancherHypernodeManager;
 use Hypernode\Deploy\ConfigurationLoader;
+use Hypernode\Deploy\DeployerLoader;
 use Hypernode\Deploy\Report\ReportLoader;
 use Hypernode\DeployConfiguration\BrancherServer;
 use Hypernode\DeployConfiguration\Configuration;
@@ -19,17 +20,20 @@
 class Cleanup extends Command
 {
     private ReportLoader $reportLoader;
+    private DeployerLoader $deployerLoader;
     private ConfigurationLoader $configurationLoader;
     private BrancherHypernodeManager $brancherHypernodeManager;
 
     public function __construct(
         ReportLoader $reportLoader,
+        DeployerLoader $deployerLoader,
         ConfigurationLoader $configurationLoader,
         BrancherHypernodeManager $brancherHypernodeManager
     ) {
         parent::__construct();
 
         $this->reportLoader = $reportLoader;
+        $this->deployerLoader = $deployerLoader;
         $this->configurationLoader = $configurationLoader;
         $this->brancherHypernodeManager = $brancherHypernodeManager;
     }
@@ -58,6 +62,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         /** @var string $stageName */
         $stageName = $input->getArgument('stage');
         if ($stageName) {
+            $this->deployerLoader->getOrCreateInstance($output);
             $config = $this->configurationLoader->load($input->getOption('file') ?: 'deploy.php');
             $this->cancelByStage($stageName, $config);
         }

src/DeployRunner.php

@@ -6,11 +6,10 @@
 use Deployer\Exception\Exception;
 use Deployer\Exception\GracefulShutdownException;
 use Deployer\Host\Host;
-use Hypernode\Deploy\Console\Output\OutputWatcher;
+use Hypernode\Deploy\Brancher\BrancherHypernodeManager;
 use Hypernode\Deploy\Deployer\RecipeLoader;
 use Hypernode\Deploy\Deployer\Task\ConfigurableTaskInterface;
 use Hypernode\Deploy\Deployer\Task\TaskFactory;
-use Hypernode\Deploy\Brancher\BrancherHypernodeManager;
 use Hypernode\Deploy\Exception\CreateBrancherHypernodeFailedException;
 use Hypernode\Deploy\Exception\InvalidConfigurationException;
 use Hypernode\Deploy\Exception\TimeoutException;
@@ -21,18 +20,13 @@
 use Hypernode\DeployConfiguration\Server;
 use Hypernode\DeployConfiguration\Stage;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Throwable;
 
 use function Deployer\host;
 use function Deployer\localhost;
 use function Deployer\run;
-use function Deployer\task;
 
 class DeployRunner
 {
@@ -43,6 +37,7 @@ class DeployRunner
     private InputInterface $input;
     private LoggerInterface $log;
     private RecipeLoader $recipeLoader;
+    private DeployerLoader $deployerLoader;
     private ConfigurationLoader $configurationLoader;
     private BrancherHypernodeManager $brancherHypernodeManager;
 
@@ -61,15 +56,17 @@ public function __construct(
         InputInterface $input,
         LoggerInterface $log,
         RecipeLoader $recipeLoader,
+        DeployerLoader $deployerLoader,
         ConfigurationLoader $configurationLoader,
         BrancherHypernodeManager $brancherHypernodeManager
     ) {
         $this->taskFactory = $taskFactory;
         $this->input = $input;
         $this->log = $log;
         $this->recipeLoader = $recipeLoader;
-        $this->brancherHypernodeManager = $brancherHypernodeManager;
+        $this->deployerLoader = $deployerLoader;
         $this->configurationLoader = $configurationLoader;
+        $this->brancherHypernodeManager = $brancherHypernodeManager;
     }
 
     /**
@@ -79,7 +76,7 @@ public function __construct(
      */
     public function run(OutputInterface $output, string $stage, string $task, bool $configureBuildStage, bool $configureServers): int
     {
-        $deployer = $this->getDeployerInstance($output);
+        $deployer = $this->deployerLoader->getOrCreateInstance($output);
 
         try {
             $this->prepare($configureBuildStage, $configureServers, $stage);
@@ -341,19 +338,4 @@ public function getDeploymentReport()
             $this->brancherHypernodesRegistered
         );
     }
-
-    private function getDeployerInstance(OutputInterface $output): Deployer
-    {
-        $console = new Application();
-        $deployer = new Deployer($console);
-        $deployer['output'] = new OutputWatcher($output);
-        $deployer['input'] = new ArrayInput(
-            [],
-            new InputDefinition([
-                new InputOption('limit'),
-                new InputOption('profile'),
-            ])
-        );
-        return $deployer;
-    }
 }

src/DeployerLoader.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hypernode\Deploy;
+
+use Deployer\Deployer;
+use Hypernode\Deploy\Console\Output\OutputWatcher;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class DeployerLoader
+{
+    private ?Deployer $deployer = null;
+
+    public function getOrCreateInstance(OutputInterface $output): Deployer
+    {
+        if ($this->deployer) {
+            return $this->deployer;
+        }
+
+        $console = new Application();
+        $this->deployer = new Deployer($console);
+        $this->deployer['output'] = new OutputWatcher($output);
+        $this->deployer['input'] = new ArrayInput(
+            [],
+            new InputDefinition([
+                new InputOption('limit'),
+                new InputOption('profile'),
+            ])
+        );
+
+        return $this->deployer;
+    }
+}