-
Notifications
You must be signed in to change notification settings - Fork 5
Support for Tasks functionality #112
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Platformsh\Cli\Command\Task; | ||
|
|
||
| use GuzzleHttp\Utils; | ||
| use Platformsh\Cli\Command\CommandBase; | ||
| use Platformsh\Cli\Model\Variable; | ||
| use Platformsh\Cli\Selector\Selector; | ||
| use Platformsh\Cli\Service\Api; | ||
| use Platformsh\Cli\Service\Config; | ||
| use Platformsh\Client\Model\Activity; | ||
| use Platformsh\Client\Model\Result; | ||
| use Symfony\Component\Console\Attribute\AsCommand; | ||
| use Symfony\Component\Console\Input\InputArgument; | ||
| use Symfony\Component\Console\Input\InputInterface; | ||
| use Symfony\Component\Console\Input\InputOption; | ||
| use Symfony\Component\Console\Output\OutputInterface; | ||
|
|
||
| #[AsCommand(name: 'task:execute', description: 'Execute a task on an environment')] | ||
| class TaskExecuteCommand extends CommandBase | ||
| { | ||
| public function __construct(private readonly Api $api, private readonly Config $config, private readonly Selector $selector) | ||
| { | ||
| parent::__construct(); | ||
| } | ||
|
|
||
| protected function configure(): void | ||
| { | ||
| $this | ||
| ->addArgument('task', InputArgument::REQUIRED, 'The name of the task to execute') | ||
| ->addOption('variable', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'A variable to set when running the task, in the format <info>type:name=value</info>'); | ||
|
|
||
| $this->selector->addProjectOption($this->getDefinition()); | ||
| $this->selector->addEnvironmentOption($this->getDefinition()); | ||
| $this->addCompleter($this->selector); | ||
|
|
||
| $this->addExample('Execute the "migrate" task on the environment "main"', 'migrate --environment main'); | ||
| $this->addExample('Execute the "migrate" task, setting environment variable FOO=bar', 'migrate -e main --variable env:FOO=bar'); | ||
| } | ||
|
|
||
| protected function execute(InputInterface $input, OutputInterface $output): int | ||
| { | ||
| $selection = $this->selector->getSelection($input); | ||
| $environment = $selection->getEnvironment(); | ||
|
|
||
| $taskName = $input->getArgument('task'); | ||
| $variables = $this->parseVariables($input->getOption('variable')); | ||
|
|
||
| $this->stdErr->writeln(sprintf( | ||
| 'Executing task <info>%s</info> on the environment %s', | ||
| $taskName, | ||
| $this->api->getEnvironmentLabel($environment), | ||
| )); | ||
|
|
||
| $url = $environment->getUri() . '/tasks/' . rawurlencode($taskName) . '/run'; | ||
| $response = $this->api->getHttpClient()->request('POST', $url, ['json' => ['variables' => (object) $variables]]); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This would benefit from the ApiResponseException wrapping (already used in TaskListCommand). |
||
|
|
||
| $result = new Result( | ||
| (array) Utils::jsonDecode((string) $response->getBody(), true), | ||
| $environment->getUri(), | ||
| $this->api->getHttpClient(), | ||
| Activity::class, | ||
| ); | ||
| $activities = $result->getActivities(); | ||
|
|
||
| $this->stdErr->writeln(''); | ||
| $this->stdErr->writeln('The task has been triggered.'); | ||
|
|
||
| $executable = $this->config->getStr('application.executable'); | ||
| if ($activities !== []) { | ||
| // Reference the exact activity ID so the log can be followed even | ||
| // when several activities are running in parallel. | ||
| $activity = reset($activities); | ||
| $this->stdErr->writeln(sprintf( | ||
| 'To follow its log, run: <info>%s activity:log %s</info>', | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We could directly follow the log here, using the ActivityMonitor service. I think it would be more consistent with other commands. |
||
| $executable, | ||
| $activity->id, | ||
| )); | ||
| } else { | ||
| $this->stdErr->writeln(sprintf( | ||
| 'To follow its log, run: <info>%s activity:log --type environment.task -e %s</info>', | ||
| $executable, | ||
| $environment->id, | ||
| )); | ||
| } | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| /** | ||
| * Parses variables in the format type:name=value into a nested array. | ||
| * | ||
| * @param string[] $variables | ||
| * | ||
| * @return array<string, array<string, string>> | ||
| */ | ||
| private function parseVariables(array $variables): array | ||
| { | ||
| $map = []; | ||
| $variable = new Variable(); | ||
| foreach ($variables as $var) { | ||
| [$type, $name, $value] = $variable->parse($var); | ||
| $map[$type][$name] = $value; | ||
| } | ||
|
|
||
| return $map; | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Platformsh\Cli\Command\Task; | ||
|
|
||
| use GuzzleHttp\Exception\BadResponseException; | ||
| use GuzzleHttp\Utils; | ||
| use Platformsh\Cli\Command\CommandBase; | ||
| use Platformsh\Cli\Selector\Selector; | ||
| use Platformsh\Cli\Service\Api; | ||
| use Platformsh\Cli\Service\Table; | ||
| use Platformsh\Client\Exception\ApiResponseException; | ||
| use Symfony\Component\Console\Attribute\AsCommand; | ||
| use Symfony\Component\Console\Input\InputInterface; | ||
| use Symfony\Component\Console\Output\OutputInterface; | ||
|
|
||
| #[AsCommand(name: 'task:list', description: 'Get a list of tasks on an environment', aliases: ['tasks'])] | ||
| class TaskListCommand extends CommandBase | ||
| { | ||
| /** @var array<string, string> */ | ||
| private array $tableHeader = [ | ||
| 'name' => 'Name', | ||
| 'type' => 'Type', | ||
| 'command' => 'Command', | ||
| 'timeout' => 'Timeout (s)', | ||
| ]; | ||
|
|
||
| public function __construct(private readonly Api $api, private readonly Selector $selector, private readonly Table $table) | ||
| { | ||
| parent::__construct(); | ||
| } | ||
|
|
||
| protected function configure(): void | ||
| { | ||
| Table::configureInput($this->getDefinition(), $this->tableHeader); | ||
| $this->selector->addProjectOption($this->getDefinition()); | ||
| $this->selector->addEnvironmentOption($this->getDefinition()); | ||
| $this->addCompleter($this->selector); | ||
| } | ||
|
|
||
| protected function execute(InputInterface $input, OutputInterface $output): int | ||
| { | ||
| $selection = $this->selector->getSelection($input); | ||
| $environment = $selection->getEnvironment(); | ||
|
|
||
| try { | ||
| $response = $this->api->getHttpClient()->request('GET', $environment->getUri() . '/tasks'); | ||
| } catch (BadResponseException $e) { | ||
| throw ApiResponseException::create($e->getRequest(), $e->getResponse(), $e); | ||
| } | ||
| $tasks = (array) Utils::jsonDecode((string) $response->getBody(), true); | ||
|
|
||
| if ($tasks === []) { | ||
| $this->stdErr->writeln(sprintf( | ||
| 'No tasks were found on the environment %s.', | ||
| $this->api->getEnvironmentLabel($environment), | ||
| )); | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| $rows = []; | ||
| foreach ($tasks as $task) { | ||
| $rows[] = [ | ||
| 'name' => $task['name'] ?? '', | ||
| 'type' => $task['type'] ?? '', | ||
| 'command' => isset($task['run']['command']) ? trim((string) $task['run']['command']) : '', | ||
| 'timeout' => $task['run']['timeout'] ?? '', | ||
| ]; | ||
| } | ||
|
|
||
| if (!$this->table->formatIsMachineReadable()) { | ||
| $this->stdErr->writeln(sprintf( | ||
| 'Tasks on the environment %s:', | ||
| $this->api->getEnvironmentLabel($environment), | ||
| )); | ||
| } | ||
|
|
||
| $this->table->render($rows, $this->tableHeader); | ||
|
|
||
| return 0; | ||
| } | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TBD - in Slack - we are discussing
runinstead ofexecute