Merge pull request #89 from ptah-sh/4-configure-cicd

chore: #4 add ci step
ptah-sh · Jul 31, 2024 · 1b2807b · 1b2807b
2 parents cff95f9 + 368f484
commit 1b2807b
Show file tree

Hide file tree

Showing 182 changed files with 1,136 additions and 727 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,95 @@
+name: Code Quality
+
+on: [push]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    env:
+      HUSKY: 0
+      BROADCAST_DRIVER: log
+      CACHE_DRIVER: redis
+      QUEUE_CONNECTION: redis
+      SESSION_DRIVER: redis
+      DB_CONNECTION: pgsql
+      DB_HOST: localhost
+      DB_PASSWORD: postgres
+      DB_USERNAME: postgres
+      DB_DATABASE: postgres
+
+    # Docs: https://docs.github.com/en/actions/using-containerized-services
+    services:
+      postgres:
+        image: postgres:latest
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: postgres
+        ports:
+          - 5432/tcp
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 3
+
+      redis:
+        image: redis
+        ports:
+          - 6379/tcp
+        options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.3'
+          extensions: pdo pdo_pgsql pgsql bcmath
+          coverage: xdebug
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          # Use composer.json for key, if composer.lock is not committed.
+          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install Composer dependencies
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'npm'
+
+      - name: Install Node dependencies
+        run: npm i --frozen-lockfile
+
+      - name: Build JS
+        run: npm run build
+
+      - name: Prepare the application
+        run: |
+          php -r "file_exists('.env') || copy('.env.example', '.env');"
+          php artisan key:generate
+
+      - name: Clear Config
+        run: php artisan config:clear
+
+      - name: Run Migration
+        run: php artisan migrate -v
+        env:
+          DB_PORT: ${{ job.services.postgres.ports[5432] }}
+          REDIS_PORT: ${{ job.services.redis.ports['6379'] }}
+
+      - name: Test with pest
+        run: php artisan test --coverage-text
+        env:
+          DB_PORT: ${{ job.services.postgres.ports[5432] }}
+          REDIS_PORT: ${{ job.services.redis.ports['6379'] }}
+
+      - name: Pint!
+        run: vendor/bin/pint --test
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -0,0 +1 @@
+lint-staged
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+18.x
diff --git a/api-nodes/Http/Controllers/EventController.php b/api-nodes/Http/Controllers/EventController.php
@@ -4,10 +4,7 @@
 
 use ApiNodes\Models\AgentStartedEventData;
 use App\Models\Node;
-use App\Models\NodeData;
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
 
 class EventController
 {
@@ -29,8 +26,8 @@ public function started(Node $node, AgentStartedEventData $data)
 
         return [
             'settings' => [
-                'poll_interval' => 5
-            ]
+                'poll_interval' => 5,
+            ],
         ];
     }
-}
+}
diff --git a/api-nodes/Http/Controllers/NextTaskController.php b/api-nodes/Http/Controllers/NextTaskController.php
@@ -3,7 +3,6 @@
 namespace ApiNodes\Http\Controllers;
 
 use App\Models\Node;
-use App\Models\NodeTasks\TaskStatus;
 use App\Models\NodeTaskGroup;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Response;
@@ -14,7 +13,7 @@ public function __invoke(Node $node)
     {
         if ($node->swarm_id === null) {
             return new Response([
-               'message' => 'No task found.'
+                'message' => 'No task found.',
             ], 204);
         }
 
@@ -29,20 +28,20 @@ public function __invoke(Node $node)
             return $task->only([
                 'id',
                 'type',
-                'payload'
+                'payload',
             ]);
         }
 
         return new Response([
-            'message' => 'No task found.'
+            'message' => 'No task found.',
         ], 204);
     }
 
     protected function getNextTaskFromGroup(Node $node, NodeTaskGroup $taskGroup)
     {
         if ($taskGroup->tasks()->running()->first()) {
             return new Response([
-                'error_message' => 'Another task should be already running.'
+                'error_message' => 'Another task should be already running.',
             ], 409);
         }
 
@@ -63,7 +62,7 @@ protected function pickNextTask(Node $node)
             return $query->where('node_id', $node->id)->orWhere('node_id', null);
         })->pending()->first();
 
-        if (!$taskGroup) {
+        if (! $taskGroup) {
             return null;
         }
 
@@ -73,4 +72,4 @@ protected function pickNextTask(Node $node)
 
         return $task;
     }
-}
+}
diff --git a/api-nodes/Http/Controllers/TaskController.php b/api-nodes/Http/Controllers/TaskController.php
@@ -44,4 +44,4 @@ public function fail(NodeTask $task, Request $request)
 
         return new Response('', 204);
     }
-}
+}
diff --git a/api-nodes/Http/Middleware/AgentTokenAuth.php b/api-nodes/Http/Middleware/AgentTokenAuth.php
@@ -3,7 +3,6 @@
 namespace ApiNodes\Http\Middleware;
 
 use App\Models\Node;
-use App\Models\NodeTasks;
 use App\Models\Scopes\TeamScope;
 use App\Models\Team;
 use Closure;
@@ -23,13 +22,13 @@ public function handle(Request $request, Closure $next): Response
     {
         $token = $request->header(self::AUTH_HEADER);
 
-        if (!$token) {
+        if (! $token) {
             if ($request->bearerToken()) {
                 return $next($request);
             }
 
             return response()->json([
-                'message' => 'Unauthorized'
+                'message' => 'Unauthorized',
             ], 403);
         }
 
@@ -39,8 +38,8 @@ public function handle(Request $request, Closure $next): Response
 
         $node->save();
 
-        app()->singleton(Node::class, fn() => $node);
-        app()->singleton(Team::class, fn() => $node->team);
+        app()->singleton(Node::class, fn () => $node);
+        app()->singleton(Team::class, fn () => $node->team);
 
         return $next($request);
     }

diff --git a/api-nodes/Models/AgentStartedEventData.php b/api-nodes/Models/AgentStartedEventData.php
@@ -11,8 +11,5 @@ class AgentStartedEventData extends Data
     public function __construct(
         public NodeData $node,
         public ?SwarmData $swarm,
-    )
-    {
-
-    }
+    ) {}
 }
diff --git a/api-nodes/Models/AgentStartedEventData/SwarmData.php b/api-nodes/Models/AgentStartedEventData/SwarmData.php
@@ -14,8 +14,5 @@ public function __construct(
         #[DataCollectionOf(ManagerNode::class)]
         /* @var ManagerNode[] */
         public array $managerNodes,
-    )
-    {
-
-    }
-}
+    ) {}
+}
diff --git a/app/Actions/Jetstream/AddTeamMember.php b/app/Actions/Jetstream/AddTeamMember.php
@@ -18,7 +18,7 @@ class AddTeamMember implements AddsTeamMembers
     /**
      * Add a new team member to the given team.
      */
-    public function add(User $user, Team $team, string $email, string $role = null): void
+    public function add(User $user, Team $team, string $email, ?string $role = null): void
     {
         Gate::forUser($user)->authorize('addTeamMember', $team);
 

diff --git a/app/Actions/Jetstream/DeleteUser.php b/app/Actions/Jetstream/DeleteUser.php
@@ -13,9 +13,7 @@ class DeleteUser implements DeletesUsers
     /**
      * Create a new action instance.
      */
-    public function __construct(protected DeletesTeams $deletesTeams)
-    {
-    }
+    public function __construct(protected DeletesTeams $deletesTeams) {}
 
     /**
      * Delete the given user.

diff --git a/app/Actions/Jetstream/InviteTeamMember.php b/app/Actions/Jetstream/InviteTeamMember.php
@@ -21,7 +21,7 @@ class InviteTeamMember implements InvitesTeamMembers
     /**
      * Invite a new team member to the given team.
      */
-    public function invite(User $user, Team $team, string $email, string $role = null): void
+    public function invite(User $user, Team $team, string $email, ?string $role = null): void
     {
         Gate::forUser($user)->authorize('addTeamMember', $team);
 

diff --git a/app/Api/Controllers/Controller.php b/app/Api/Controllers/Controller.php
@@ -2,7 +2,4 @@
 
 namespace App\Api\Controllers;
 
-class Controller
-{
-
-}
+class Controller {}
diff --git a/app/Api/Controllers/ServiceController.php b/app/Api/Controllers/ServiceController.php
@@ -2,7 +2,6 @@
 
 namespace App\Api\Controllers;
 
-use App\Models\DeploymentData;
 use App\Models\Service;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
@@ -21,4 +20,4 @@ public function deploy(Service $service, Request $request): array
             'deployment_id' => $deployment->id,
         ];
     }
-}
+}
diff --git a/app/Console/Commands/DispatchProcessBackupTask.php b/app/Console/Commands/DispatchProcessBackupTask.php
@@ -67,7 +67,7 @@ protected function dispatchBackupTask(): void
         ]);
 
         $date = now()->format('Y-m-d_His');
-        $backupFileName = dockerize_name("svc-{$service->id}-{$process->name}_backup-{$backupCmd->name}-{$date}") . '.tar.gz';
+        $backupFileName = dockerize_name("svc-{$service->id}-{$process->name}_backup-{$backupCmd->name}-{$date}").'.tar.gz';
         $archivePath = "{$process->backupVolume->path}/$backupFileName";
         $backupCommand = "mkdir -p /tmp/{$backupCmd->id} && cd /tmp/{$backupCmd->id} && {$backupCmd->command} && tar czfv $archivePath -C /tmp/{$backupCmd->id} . && rm -rf /tmp/{$backupCmd->id}";
 
@@ -89,8 +89,8 @@ protected function dispatchBackupTask(): void
                         'AttachStdout' => true,
                         'AttachStderr' => true,
                         'Cmd' => ['sh', '-c', $backupCommand],
-                    ]
-                ]
+                    ],
+                ],
             ],
             [
                 'type' => NodeTaskType::UploadS3File,
@@ -105,9 +105,9 @@ protected function dispatchBackupTask(): void
                         'Target' => $process->backupVolume->path,
                     ],
                     'SrcFilePath' => $archivePath,
-                    'DestFilePath' => $s3Storage->pathPrefix . '/' . $backupFileName,
+                    'DestFilePath' => $s3Storage->pathPrefix.'/'.$backupFileName,
                 ],
-            ]
+            ],
         ]);
     }
 }
diff --git a/app/Console/Commands/DispatchVolumeBackupTask.php b/app/Console/Commands/DispatchVolumeBackupTask.php
@@ -67,7 +67,7 @@ protected function dispatchBackupTask(): void
         ]);
 
         $date = now()->format('Y-m-d_His');
-        $backupFileName = dockerize_name("svc-{$service->id}-{$process->name}-vol-{$volume->name}-{$date}") . '.tar.gz';
+        $backupFileName = dockerize_name("svc-{$service->id}-{$process->name}-vol-{$volume->name}-{$date}").'.tar.gz';
         $archivePath = "{$process->backupVolume->path}/$backupFileName";
         $backupCommand = "tar czfv $archivePath -C {$volume->path} .";
 
@@ -90,8 +90,8 @@ protected function dispatchBackupTask(): void
                         'AttachStdout' => true,
                         'AttachStderr' => true,
                         'Cmd' => ['sh', '-c', $backupCommand],
-                    ]
-                ]
+                    ],
+                ],
             ],
             [
                 'type' => NodeTaskType::UploadS3File,
@@ -106,9 +106,9 @@ protected function dispatchBackupTask(): void
                         'Target' => $process->backupVolume->path,
                     ],
                     'SrcFilePath' => $archivePath,
-                    'DestFilePath' => $s3Storage->pathPrefix . '/' . $backupFileName,
+                    'DestFilePath' => $s3Storage->pathPrefix.'/'.$backupFileName,
                 ],
-            ]
+            ],
         ]);
     }
 }
diff --git a/app/Console/Commands/MakeNodeTask.php b/app/Console/Commands/MakeNodeTask.php
@@ -17,6 +17,7 @@ class MakeNodeTask extends Command
     /**
      * The console command description.
      *34
+     *
      * @var string
      */
     protected $description = 'Create a new node task';
@@ -52,15 +53,15 @@ public function handle(): void
         foreach ($dirs as $dir) {
             $path = app_path($dir);
 
-            $this->info('Creating directory ' . $dir);
+            $this->info('Creating directory '.$dir);
 
             mkdir($path);
         }
 
         foreach ($taskDataFiles as $abstractPath => $template) {
             $path = app_path($abstractPath);
 
-            $this->info('Writing ' . $abstractPath);
+            $this->info('Writing '.$abstractPath);
 
             file_put_contents($path, $template);
         }
@@ -70,7 +71,7 @@ public function handle(): void
 
     protected function readStub($type, $taskName): string
     {
-        $template = file_get_contents(__DIR__ . "/stubs/MakeNodeTask/$type.stub");
+        $template = file_get_contents(__DIR__."/stubs/MakeNodeTask/$type.stub");
 
         return str_replace('$taskName', $taskName, $template);
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,4 +44,4 @@ public function fail(NodeTask $task, Request $request) @@
             return new Response('', 204);
         }
-    }
+    }