Remove roles selector from builtin tasks

tdgroot · tdgroot · commit 729d278eaa23 · 2023-01-04T09:05:47.000+01:00
This was causing task with a certain selector always running.

In the future, when we reiterate on Hypernode Deploy for clusters, we'll see what we really need and what's best to do. For now, it doesn't make sense to keep this in here.
diff --git a/src/DeployRunner.php b/src/DeployRunner.php
@@ -14,8 +14,6 @@
 use Hypernode\Deploy\Exception\InvalidConfigurationException;
 use Hypernode\Deploy\Exception\TimeoutException;
 use Hypernode\Deploy\Exception\ValidationException;
-use Hypernode\DeployConfiguration\Configurable\ServerRoleConfigurableInterface;
-use Hypernode\DeployConfiguration\Configurable\StageConfigurableInterface;
 use Hypernode\DeployConfiguration\Configuration;
 use Hypernode\DeployConfiguration\Server;
 use Hypernode\DeployConfiguration\Stage;
@@ -135,7 +133,7 @@ private function prepare(bool $configureBuildStage, bool $configureServers, stri
     }
 
     /**
-     * Configure deploy tasks based on specific configuration in Hipex deploy configuration
+     * Configure deploy tasks based on specific configuration in Hypernode Deploy configuration
      * @throws InvalidConfigurationException
      */
     private function initializeConfigurableTask(ConfigurableTaskInterface $task, Configuration $mainConfig): void
@@ -146,20 +144,8 @@ private function initializeConfigurableTask(ConfigurableTaskInterface $task, Con
         );
 
         foreach ($configurations as $taskConfig) {
-            if (!$task->supports($taskConfig)) {
-                continue;
-            }
-
-            $deployerTask = $task->configureWithTaskConfig($taskConfig);
-            if ($deployerTask) {
-                if ($taskConfig instanceof StageConfigurableInterface && $taskConfig->getStage()) {
-                    $deployerTask->select("stage={$taskConfig->getStage()->getName()}");
-                }
-
-                if ($taskConfig instanceof ServerRoleConfigurableInterface && $taskConfig->getServerRoles()) {
-                    $roles = implode("&", $taskConfig->getServerRoles());
-                    $deployerTask->select("roles={$roles}");
-                }
+            if ($task->supports($taskConfig)) {
+                $task->configureWithTaskConfig($taskConfig);
             }
         }
     }
diff --git a/src/Deployer/Task/After/AfterTaskGlobal.php b/src/Deployer/Task/After/AfterTaskGlobal.php
@@ -2,10 +2,9 @@
 
 namespace Hypernode\Deploy\Deployer\Task\After;
 
-use Hypernode\Deploy\Deployer\TaskBuilder;
 use Hypernode\Deploy\Deployer\Task\TaskBase;
+use Hypernode\Deploy\Deployer\TaskBuilder;
 use Hypernode\DeployConfiguration\Configuration;
-use Hypernode\DeployConfiguration\ServerRole;
 
 use function count;
 use function Deployer\task;
@@ -32,9 +31,6 @@ public function configure(Configuration $config): void
             };
         }
 
-        $role = ServerRole::APPLICATION;
-        task('deploy:after', $tasks)
-            ->once()
-            ->select("roles=$role");
+        task('deploy:after', $tasks)->once();
     }
 }
diff --git a/src/Deployer/Task/After/CachetoolTask.php b/src/Deployer/Task/After/CachetoolTask.php
@@ -3,8 +3,6 @@
 namespace Hypernode\Deploy\Deployer\Task\After;
 
 use Hypernode\Deploy\Deployer\Task\TaskBase;
-use Hypernode\DeployConfiguration\ServerRole;
-use Hypernode\Deploy\Deployer\Task\TaskInterface;
 use Hypernode\DeployConfiguration\Configuration;
 
 use function Deployer\after;
@@ -57,7 +55,7 @@ public function configure(Configuration $config): void
                 run('curl -L -o cachetool.phar ' . $this->getCachetoolUrl());
                 $cachetoolBinary = '{{release_path}}/cachetool.phar';
 
-                writeln(sprintf("Downloaded cachetool %s for PHP %d", $cachetoolBinary, $this->getPhpVersion()));
+                writeln(sprintf("Downloaded cachetool %s for PHP %f", $cachetoolBinary, $this->getPhpVersion()));
                 return $cachetoolBinary;
             });
             return $cachetoolBinary;
@@ -98,14 +96,11 @@ public function configure(Configuration $config): void
             run("cd {{release_path}} && {{bin/php}} {{bin/cachetool}} apcu:cache:clear {{cachetool_options}}");
         });
 
-
-        $role = ServerRole::APPLICATION;
-        task('cachetool:clear:opcache')
-            ->select("roles=$role");
+        task('cachetool:clear:opcache');
 
         task('cachetool:cleanup', function () {
             run('cd {{deploy_path}} && rm -f current/{{bin/cachetool}}');
-        })->select("roles=$role");
+        });
     }
 
     protected function getPhpVersion(): float
@@ -121,7 +116,7 @@ public function getCachetoolUrl(): string
         }
 
         if ($phpVersion >= 7.3) {
-            return $this->versionBinaryMapping[6];
+            return $this->versionBinaryMapping[7];
         }
 
         if ($phpVersion >= 7.2) {
diff --git a/src/Deployer/Task/Deploy/CopyTask.php b/src/Deployer/Task/Deploy/CopyTask.php
@@ -4,7 +4,6 @@
 
 use Hypernode\Deploy\Deployer\Task\TaskBase;
 use Hypernode\DeployConfiguration\Configuration;
-use Hypernode\DeployConfiguration\ServerRole;
 
 use function Deployer\run;
 use function Deployer\task;
@@ -14,19 +13,18 @@ class CopyTask extends TaskBase
 {
     public function configure(Configuration $config): void
     {
-        $role = ServerRole::APPLICATION;
         task('deploy:copy:code', function () use ($config) {
             $packageFilepath = $config->getBuildArchiveFile();
             $packageFilename = pathinfo($packageFilepath, PATHINFO_BASENAME);
 
             upload($packageFilepath, '{{release_path}}');
             run('cd {{release_path}} && tar -xf ' . $packageFilename);
             run('cd {{release_path}} && rm -f ' . $packageFilename);
-        })->select("roles=$role");
+        });
 
         task('deploy:copy', [
             'deploy:copy:code',
             'deploy:shared',
-        ])->select("roles=$role");
+        ]);
     }
 }
diff --git a/src/Deployer/Task/Deploy/DeployTask.php b/src/Deployer/Task/Deploy/DeployTask.php
@@ -2,9 +2,8 @@
 
 namespace Hypernode\Deploy\Deployer\Task\Deploy;
 
-use Hypernode\Deploy\Deployer\Task\TaskBase;
-use Hypernode\DeployConfiguration\ServerRole;
 use Hypernode\Deploy\Deployer\RecipeLoader;
+use Hypernode\Deploy\Deployer\Task\TaskBase;
 use Hypernode\DeployConfiguration\Configuration;
 
 use function Deployer\fail;
@@ -25,13 +24,12 @@ public function __construct(RecipeLoader $loader)
     public function configure(Configuration $config): void
     {
         $this->loader->load('deploy/info.php');
-        $role = ServerRole::APPLICATION;
 
         task('deploy', [
             'deploy:upload',
             'deploy:link',
             'deploy:finalize',
-        ])->select("roles=$role");
+        ]);
 
         fail('deploy', 'deploy:failed');
     }
diff --git a/src/Deployer/Task/Deploy/DeployTaskGlobal.php b/src/Deployer/Task/Deploy/DeployTaskGlobal.php
@@ -4,7 +4,6 @@
 
 use Hypernode\Deploy\Deployer\Task\TaskBase;
 use Hypernode\DeployConfiguration\Configuration;
-use Hypernode\DeployConfiguration\ServerRole;
 
 use function Deployer\task;
 use function Hypernode\Deploy\Deployer\noop;
@@ -14,14 +13,13 @@ class DeployTaskGlobal extends TaskBase
     public function configure(Configuration $config): void
     {
         $tasks = $config->getDeployTasks();
-        $role = ServerRole::APPLICATION;
 
         if (count($tasks)) {
             task('deploy:deploy', $tasks);
         } else {
             task('deploy:deploy', noop());
         }
 
-        task('deploy:deploy', $tasks)->select("roles=$role");
+        task('deploy:deploy', $tasks);
     }
 }
diff --git a/src/Deployer/Task/Deploy/FinalizeTask.php b/src/Deployer/Task/Deploy/FinalizeTask.php
@@ -2,9 +2,8 @@
 
 namespace Hypernode\Deploy\Deployer\Task\Deploy;
 
-use Hypernode\Deploy\Deployer\Task\TaskBase;
-use Hypernode\DeployConfiguration\ServerRole;
 use Hypernode\Deploy\Deployer\RecipeLoader;
+use Hypernode\Deploy\Deployer\Task\TaskBase;
 use Hypernode\DeployConfiguration\Configuration;
 
 use function Deployer\after;
@@ -26,14 +25,13 @@ public function __construct(RecipeLoader $loader)
     public function configure(Configuration $config): void
     {
         $this->loader->load('deploy/info.php');
-        $role = ServerRole::APPLICATION;
 
         task('deploy:finalize', [
             'deploy:after',
             'deploy:unlock',
             'deploy:cleanup',
             'deploy:success',
-        ])->select("roles=$role");
+        ]);
 
         fail('deploy', 'deploy:failed');
         after('deploy:failed', 'deploy:unlock');
diff --git a/src/Deployer/Task/Deploy/LinkTask.php b/src/Deployer/Task/Deploy/LinkTask.php
@@ -4,7 +4,6 @@
 
 use Hypernode\Deploy\Deployer\Task\TaskBase;
 use Hypernode\DeployConfiguration\Configuration;
-use Hypernode\DeployConfiguration\ServerRole;
 
 use function Deployer\run;
 use function Deployer\task;
@@ -14,11 +13,10 @@ class LinkTask extends TaskBase
 {
     public function configure(Configuration $config): void
     {
-        $role = ServerRole::APPLICATION;
         task('deploy:link', [
             'deploy:symlink',
             'deploy:public_link',
-        ])->select("roles=$role");
+        ]);
 
         // Symlink public_html folder
         task('deploy:public_link', function () {
@@ -33,6 +31,6 @@ public function configure(Configuration $config): void
             } else {
                 run('ln -s {{current_path}}/{{public_folder}} /data/web/public');
             }
-        })->select("roles=$role");
+        });
     }
 }
diff --git a/src/Deployer/Task/Deploy/UploadTask.php b/src/Deployer/Task/Deploy/UploadTask.php
@@ -2,9 +2,8 @@
 
 namespace Hypernode\Deploy\Deployer\Task\Deploy;
 
-use Hypernode\Deploy\Deployer\Task\TaskBase;
-use Hypernode\DeployConfiguration\ServerRole;
 use Hypernode\Deploy\Deployer\RecipeLoader;
+use Hypernode\Deploy\Deployer\Task\TaskBase;
 use Hypernode\DeployConfiguration\Configuration;
 
 use function Deployer\fail;
@@ -25,15 +24,14 @@ public function __construct(RecipeLoader $loader)
     public function configure(Configuration $config): void
     {
         $this->loader->load('deploy/info.php');
-        $role = ServerRole::APPLICATION;
 
         task('deploy:upload', [
             'deploy:info',
             'prepare:ssh',
             'deploy:prepare',
             'deploy:copy',
             'deploy:deploy',
-        ])->select("roles=$role");
+        ]);
 
         fail('deploy', 'deploy:failed');
     }

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace Hypernode\Deploy\Deployer\Task\After;`
`4`	`4`
`5`		`-use Hypernode\Deploy\Deployer\TaskBuilder;`
`6`	`5`	`use Hypernode\Deploy\Deployer\Task\TaskBase;`
	`6`	`+use Hypernode\Deploy\Deployer\TaskBuilder;`
`7`	`7`	`use Hypernode\DeployConfiguration\Configuration;`
`8`		`-use Hypernode\DeployConfiguration\ServerRole;`
`9`	`8`
`10`	`9`	`use function count;`
`11`	`10`	`use function Deployer\task;`
`@@ -32,9 +31,6 @@ public function configure(Configuration $config): void`
`32`	`31`	`};`
`33`	`32`	`}`
`34`	`33`
`35`		`- $role = ServerRole::APPLICATION;`
`36`		`- task('deploy:after', $tasks)`
`37`		`- ->once()`
`38`		`- ->select("roles=$role");`
	`34`	`+ task('deploy:after', $tasks)->once();`
`39`	`35`	`}`
`40`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`use Hypernode\Deploy\Deployer\Task\TaskBase;`
`6`	`6`	`use Hypernode\DeployConfiguration\Configuration;`
`7`		`-use Hypernode\DeployConfiguration\ServerRole;`
`8`	`7`
`9`	`8`	`use function Deployer\task;`
`10`	`9`	`use function Hypernode\Deploy\Deployer\noop;`
`@@ -14,14 +13,13 @@ class DeployTaskGlobal extends TaskBase`
`14`	`13`	`public function configure(Configuration $config): void`
`15`	`14`	`{`
`16`	`15`	`$tasks = $config->getDeployTasks();`
`17`		`- $role = ServerRole::APPLICATION;`
`18`	`16`
`19`	`17`	`if (count($tasks)) {`
`20`	`18`	`task('deploy:deploy', $tasks);`
`21`	`19`	`} else {`
`22`	`20`	`task('deploy:deploy', noop());`
`23`	`21`	`}`
`24`	`22`
`25`		`- task('deploy:deploy', $tasks)->select("roles=$role");`
	`23`	`+ task('deploy:deploy', $tasks);`
`26`	`24`	`}`
`27`	`25`	`}`