Merge branch 'patricio-wip-11' into patricio-wip-11-merger

# Conflicts: # app/Http/Livewire/DeployApplication.php # app/Jobs/ContainerStatusJob.php # bootstrap/helpers.php
2024-10-22 08:04:19 +02:00 · 2023-05-03 06:29:05 +01:00 · 2023-05-03 06:29:05 +01:00 · 85af1b4ffb
commit 85af1b4ffb
parent f723b504a1 e7763f3b73
16 changed files with 75 additions and 61 deletions
--- a/.gitignore
+++ b/.gitignore
@ -21,5 +21,8 @@ yarn-error.log
 /.bash_history
 /_volumes

+resources/recipes
+
 .lesshst
 psysh_history
+.psql_history
--- a/app/Actions/RemoteProcess/DispatchRemoteProcess.php
+++ b/app/Actions/RemoteProcess/DispatchRemoteProcess.php
@ -1,16 +1,16 @@
 <?php

-namespace App\Actions\RemoteProcess;
+namespace App\Actions\CoolifyTask;

-use App\Data\RemoteProcessArgs;
-use App\Jobs\ExecuteRemoteProcess;
+use App\Data\CoolifyTaskArgs;
+use App\Jobs\HandleCoolifyTaskInQueue;
 use Spatie\Activitylog\Models\Activity;

-class DispatchRemoteProcess
+class PrepareCoolifyTask
 {
    protected Activity $activity;

-    public function __construct(RemoteProcessArgs $remoteProcessArgs)
+    public function __construct(CoolifyTaskArgs $remoteProcessArgs)
    {
        if ($remoteProcessArgs->model) {
            $properties = $remoteProcessArgs->toArray();
@ -31,7 +31,7 @@ public function __construct(RemoteProcessArgs $remoteProcessArgs)

    public function __invoke(): Activity
    {
-        $job = new ExecuteRemoteProcess($this->activity);
+        $job = new HandleCoolifyTaskInQueue($this->activity);
        dispatch($job);
        $this->activity->refresh();
        return $this->activity;
--- a/app/Actions/RemoteProcess/RunRemoteProcess.php
+++ b/app/Actions/RemoteProcess/RunRemoteProcess.php
@ -1,6 +1,6 @@
 <?php

-namespace App\Actions\RemoteProcess;
+namespace App\Actions\CoolifyTask;

 use App\Enums\ActivityTypes;
 use App\Enums\ProcessStatus;
--- a/app/Data/CoolifyTaskArgs.php
+++ b/app/Data/CoolifyTaskArgs.php
@ -0,0 +1,23 @@
+<?php
+
+namespace App\Data;
+
+use App\Enums\ProcessStatus;
+use Illuminate\Database\Eloquent\Model;
+use Spatie\LaravelData\Data;
+
+class CoolifyTaskArgs extends Data
+{
+    public function __construct(
+        public string  $server_ip,
+        public string  $private_key_location,
+        public string  $command,
+        public int     $port,
+        public string  $user,
+        public string  $type,
+        public ?string $type_uuid = null,
+        public ?Model  $model = null,
+        public string  $status = ProcessStatus::HOLDING->value,
+    ) {
+    }
+}
--- a/app/Data/RemoteProcessArgs.php
+++ b/app/Data/RemoteProcessArgs.php
@ -1,24 +0,0 @@
-<?php
-
-namespace App\Data;
-
-use App\Enums\ActivityTypes;
-use App\Enums\ProcessStatus;
-use Illuminate\Database\Eloquent\Model;
-use Spatie\LaravelData\Data;
-
-class RemoteProcessArgs extends Data
-{
-    public function __construct(
-        public string           $server_ip,
-        public string           $private_key_location,
-        public string|null      $deployment_uuid,
-        public string           $command,
-        public int              $port,
-        public string           $user,
-        public string           $type = ActivityTypes::REMOTE_PROCESS->value,
-        public string           $status = ProcessStatus::HOLDING->value,
-        public ?Model           $model = null,
-    ) {
-    }
-}
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@ -93,7 +93,10 @@ public function application_deployment()
        if (!$application) {
            return redirect()->route('dashboard');
        }
-        $activity = Activity::where('properties->deployment_uuid', '=', $deployment_uuid)->first();
+        $activity = Activity::query()
+            ->where('properties->type', '=', 'deployment')
+            ->where('properties->uuid', '=', $deployment_uuid)
+            ->first();

        return view('project.application.deployment', [
            'application' => $application,
--- a/app/Http/Livewire/Project/Application/PollDeployment.php
+++ b/app/Http/Livewire/Project/Application/PollDeployment.php
@ -2,6 +2,7 @@

 namespace App\Http\Livewire\Project\Application;

+use App\Enums\ActivityTypes;
 use Livewire\Component;
 use Spatie\Activitylog\Models\Activity;

@ -14,7 +15,9 @@ class PollDeployment extends Component
    public function polling()
    {
        if ( is_null($this->activity) && isset($this->deployment_uuid)) {
-            $this->activity = Activity::where('properties->deployment_uuid', '=', $this->deployment_uuid)
+            $this->activity = Activity::query()
+                ->where('properties->type', '=', ActivityTypes::DEPLOYMENT->value)
+                ->where('properties->type_uuid', '=', $this->deployment_uuid)
                ->first();
        } else {
            $this->activity?->refresh();
--- a/app/Jobs/ContainerStatusJob.php
+++ b/app/Jobs/ContainerStatusJob.php
@ -38,7 +38,7 @@ protected function checkAllServers()
        $not_found_applications = $applications;
        $containers = collect();
        foreach ($servers as $server) {
-            $output = runRemoteCommandSync($server, ['docker ps -a -q --format \'{{json .}}\'']);
+            $output = instantRemoteProcess($server, ['docker ps -a -q --format \'{{json .}}\'']);
            $containers = $containers->concat(formatDockerCmdOutputToJson($output));
        }
        foreach ($containers as $container) {
@ -67,7 +67,7 @@ protected function checkContainerStatus()
            return;
        }
        if ($application->destination->server) {
-            $container = runRemoteCommandSync($application->destination->server, ["docker inspect --format '{{json .State}}' {$this->container_id}"]);
+            $container = instantRemoteProcess($application->destination->server, ["docker inspect --format '{{json .State}}' {$this->container_id}"]);
            $container = formatDockerCmdOutputToJson($container);
            $application->status = $container[0]['Status'];
            $application->save();
--- a/app/Jobs/DeployApplicationJob.php
+++ b/app/Jobs/DeployApplicationJob.php
@ -2,8 +2,8 @@

 namespace App\Jobs;

-use App\Actions\RemoteProcess\RunRemoteProcess;
-use App\Data\RemoteProcessArgs;
+use App\Actions\CoolifyTask\RunRemoteProcess;
+use App\Data\CoolifyTaskArgs;
 use App\Enums\ActivityTypes;
 use App\Models\Application;
 use App\Models\InstanceSettings;
@ -55,14 +55,14 @@ public function __construct(

        $private_key_location = savePrivateKeyForServer($server);

-        $remoteProcessArgs = new RemoteProcessArgs(
+        $remoteProcessArgs = new CoolifyTaskArgs(
            server_ip: $server->ip,
            private_key_location: $private_key_location,
-            deployment_uuid: $this->deployment_uuid,
            command: 'overwritten-later',
            port: $server->port,
            user: $server->user,
            type: ActivityTypes::DEPLOYMENT->value,
+            type_uuid: $this->deployment_uuid,
        );

        $this->activity = activity()
--- a/app/Jobs/HandleCoolifyTaskInQueue.php
+++ b/app/Jobs/HandleCoolifyTaskInQueue.php
@ -2,7 +2,7 @@

 namespace App\Jobs;

-use App\Actions\RemoteProcess\RunRemoteProcess;
+use App\Actions\CoolifyTask\RunRemoteProcess;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@ -10,7 +10,7 @@
 use Illuminate\Queue\SerializesModels;
 use Spatie\Activitylog\Models\Activity;

-class ExecuteRemoteProcess implements ShouldQueue
+class HandleCoolifyTaskInQueue implements ShouldQueue
 {
    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@ -2,6 +2,7 @@

 namespace App\Providers;

+use App\Jobs\HandleCoolifyTaskInQueue;
 use Illuminate\Queue\Events\JobProcessed;
 use Illuminate\Support\Facades\Process;
 use Illuminate\Support\Facades\Queue;
@ -31,7 +32,7 @@ public function boot(): void
    {
        Queue::after(function (JobProcessed $event) {
             // @TODO: Remove `coolify-builder` container after the remoteProcess job is finishged and remoteProcess->type == `deployment`.
-            if ($event->job->resolveName() === 'App\Jobs\ExecuteRemoteProcess') {
+            if ($event->job->resolveName() === HandleCoolifyTaskInQueue::class) {

            }
        });
--- a/bootstrap/helpers.php
+++ b/bootstrap/helpers.php
@ -1,8 +1,7 @@
 <?php

-use App\Actions\RemoteProcess\DispatchRemoteProcess;
-use App\Data\RemoteProcessArgs;
-use App\Enums\ActivityTypes;
+use App\Actions\CoolifyTask\PrepareCoolifyTask;
+use App\Data\CoolifyTaskArgs;
 use App\Models\Server;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
@ -19,10 +18,10 @@
     *
     */
    function remoteProcess(
-        array           $command,
-        Server          $server,
-        ?string         $deployment_uuid = null,
-        ?Model          $model = null,
+        array   $command,
+        Server  $server,
+        ?string $type_uuid = null,
+        ?Model  $model = null,
    ): Activity {

        $command_string = implode("\n", $command);
@ -32,17 +31,17 @@ function remoteProcess(

        $private_key_location = savePrivateKeyForServer($server);

-        return resolve(DispatchRemoteProcess::class, [
-            'remoteProcessArgs' => new RemoteProcessArgs(
+        return resolve(PrepareCoolifyTask::class, [
+            'remoteProcessArgs' => new CoolifyTaskArgs(
                server_ip: $server->ip,
                private_key_location: $private_key_location,
-                deployment_uuid: $deployment_uuid,
                command: <<<EOT
                {$command_string}
                EOT,
                port: $server->port,
                user: $server->user,
-                type: $deployment_uuid ? ActivityTypes::DEPLOYMENT->value : ActivityTypes::REMOTE_PROCESS->value,
+                type: $type_uuid,
+                type_uuid: $type_uuid,
                model: $model,
            ),
        ])();
@ -119,8 +118,8 @@ function formatDockerLabelsToJson($rawOutput): Collection
            })[0];
    }
 }
-if (!function_exists('runRemoteCommandSync')) {
-    function runRemoteCommandSync(Server $server, array $command, $throwError = true)
+if (!function_exists('instantRemoteProcess')) {
+    function instantRemoteProcess(Server $server, array $command, $throwError = true)
    {
        $command_string = implode("\n", $command);
        $private_key_location = savePrivateKeyForServer($server);
--- a/resources/views/livewire/project/application/poll-deployment.blade.php
+++ b/resources/views/livewire/project/application/poll-deployment.blade.php
@ -1,3 +1,6 @@
 <div>
-    <pre style="width: 100%;overflow-y: scroll;" @if ($isKeepAliveOn) wire:poll.750ms="polling" @endif>{{ \App\Actions\RemoteProcess\RunRemoteProcess::decodeOutput($activity) }}</pre>
+    <pre
+        style="width: 100%;overflow-y: scroll;"
+        @if ($isKeepAliveOn) wire:poll.750ms="polling" @endif
+    >{{ \App\Actions\CoolifyTask\RunRemoteProcess::decodeOutput($activity) }}</pre>
 </div>
--- a/resources/views/livewire/run-command.blade.php
+++ b/resources/views/livewire/run-command.blade.php
@ -1,7 +1,7 @@
 <div>
    <div>
        <label for="command">
-            <input autofocus id="command" wire:model.defer="command" type="text" wire:keydown.enter="runCommand" />
+            <input autofocus id="command" wire:model.defer="command" type="text" wire:keydown.enter="runCommand"/>
            <select wire:model.defer="server">
                @foreach ($servers as $server)
                    <option value="{{ $server->uuid }}">{{ $server->name }}</option>
@ -21,6 +21,9 @@
        @endif
    </div>
    @isset($activity?->id)
-        <pre style="width: 100%;overflow-y: scroll;" @if ($isKeepAliveOn || $manualKeepAlive) wire:poll.750ms="polling" @endif>{{ data_get($activity, 'description') }}</pre>
+        <pre
+            style="width: 100%;overflow-y: scroll;"
+            @if ($isKeepAliveOn) wire:poll.750ms="polling" @endif
+        >{{ \App\Actions\CoolifyTask\RunRemoteProcess::decodeOutput($activity) }}</pre>
    @endisset
 </div>
--- a/tests/Feature/DockerCommandsTest.php
+++ b/tests/Feature/DockerCommandsTest.php
@ -1,7 +1,7 @@
 <?php

-use App\Actions\RemoteProcess\RunRemoteProcess;
-use App\Actions\RemoteProcess\TidyOutput;
+use App\Actions\CoolifyTask\RunRemoteProcess;
+use App\Actions\CoolifyTask\TidyOutput;
 use App\Models\User;
 use App\Models\Server;
 use Database\Seeders\DatabaseSeeder;
--- a/tests/Feature/RemoteProcessTest.php
+++ b/tests/Feature/RemoteProcessTest.php
@ -1,6 +1,6 @@
 <?php

-use App\Actions\RemoteProcess\RunRemoteProcess;
+use App\Actions\CoolifyTask\RunRemoteProcess;
 use App\Models\Server;
 use Database\Seeders\DatabaseSeeder;
 use Illuminate\Foundation\Testing\DatabaseMigrations;