Merge pull request #9 from dployr-io/non-static-deploy

Non static deploy

Author: tobimadehin

.github/workflows/lint.yml

@@ -40,4 +40,4 @@ jobs:
         run: vendor/bin/pint --test
 
       - name: Lint Frontend
-        run: pnpm run format:check
+        run: pnpm run format:check && pnpm run lint

.github/workflows/release.yml

@@ -1,8 +1,8 @@
-name: Release
+name: release
 
 on:
   workflow_run:
-    workflows: ["Test"]
+    workflows: ["tests", "linter"]
     types: [completed]
   pull_request: 
     branches: ["master"]
@@ -12,9 +12,7 @@ permissions:
 
 jobs:
   release:
-    if: >
-      github.event.workflow_run.conclusion == 'success' &&
-      github.event.workflow_run.head_branch == 'master'
+    if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

app/DTOs/Spec.php

@@ -15,10 +15,10 @@ public function __construct(
         public string $runtime,
         public ?int $port,
         public ?string $image,
-        public array $envVars = [],
-        public array $secrets = [],
+        public array $envVars,
+        public array $secrets,
         public ?string $outputDir,
         public ?string $workingDir,
         public ?string $runCmd,
     ) {}
-}
+}

app/Services/Blueprint/BlueprintService.php

@@ -2,6 +2,7 @@
 
 namespace App\Services\Blueprint;
 
+use App\DTOs\Spec;
 use App\Models\Blueprint;
 use App\Models\Remote;
 use App\Models\Service;
@@ -11,13 +12,11 @@
 use App\Services\DirectoryService;
 use App\Services\GitRepoService;
 use Illuminate\Support\Facades\Log;
-use App\Services\Blueprint\BlueprintValidatorService;
-use App\DTOs\Spec;
 
 class BlueprintService
 {
     protected const BASE_PATH = '/home/dployr/services';
-    
+
     public function __construct(
         private Blueprint $blueprint,
     ) {
@@ -31,13 +30,15 @@ private function parseConfig()
 
     private function validateBlueprint()
     {
-        $validator = new BlueprintValidatorService();
+        $validator = new BlueprintValidatorService;
+
         return $validator->validate($this->parseConfig());
     }
 
     private function getAttributes(): Spec
     {
         $config = $this->parseConfig();
+
         return new Spec(
             id: $this->blueprint->id,
             serviceName: $config['name'],
@@ -54,16 +55,15 @@ private function getAttributes(): Spec
             runCmd: $config['run_cmd'] ?? null,
         );
     }
-    
+
     public function processBlueprint()
-    {   
+    {
         $validation = $this->validateBlueprint();
         $spec = $this->getAttributes();
-        $path = rtrim(self::BASE_PATH, '/') . '/' . $spec->serviceName . '/' . ltrim($workingDir ?? '', '/');
-        
+        $path = rtrim(self::BASE_PATH, '/').'/'.$spec->serviceName.'/'.ltrim($workingDir ?? '', '/');
+
         try {
-            if (! $validation['valid'])
-            {
+            if (! $validation['valid']) {
                 throw new \RuntimeException($validation['errors']);
             }
 
@@ -75,7 +75,7 @@ public function processBlueprint()
             // setup runtime
 
             $remoteService = new GitRepoService;
-            $remoteService->cloneRepo($remote->name, $remote->repository, $remote->provider, $this->$path."/".$spec->serviceName);
+            $remoteService->cloneRepo($remote->name, $remote->repository, $remote->provider, $this->$path.'/'.$spec->serviceName);
 
             $newBlock = <<<EOF
             :$spec->port {
@@ -130,4 +130,4 @@ public function processBlueprint()
             Log::error("Failed to create service $spec->serviceName: ".$errorMessage);
         }
     }
-}
+}

app/Services/Blueprint/BlueprintValidatorService.php

@@ -7,15 +7,16 @@
 class BlueprintValidatorService extends SchemaValidatorService
 {
     private const SCHEMA_URL = 'https://dployr.dev/schema/1.0.0/service.json';
+
     private const CACHE_KEY = 'service_schema_v1.0.0';
+
     private const CACHE_TTL = 86400; // 24 hours
 
     private function __construct(
         private string $schema_url = self::SCHEMA_URL,
         private string $cache_key = self::CACHE_KEY,
         private int $cache_ttl = self::CACHE_TTL,
-    ) 
-    {
+    ) {
         parent::__construct($schema_url, $cache_key, $cache_ttl);
     }
 
@@ -33,4 +34,4 @@ public function clearCache(): void
     {
         return parent::clearCache();
     }
-}
+}

app/Services/CaddyService.php

@@ -7,6 +7,7 @@ class CaddyService
     public static function status(): bool
     {
         $result = CmdService::execute('systemctl is-active caddy');
+
         return $result->output === 'active';
     }
 
@@ -18,6 +19,7 @@ public static function config(): string
         if (! $result) {
             throw new \RuntimeException("Caddyfile not found or inaccessible in $path", 1);
         }
+
         return trim($result);
     }
 
@@ -26,13 +28,13 @@ public static function newConfig(string $serviceName, string $block)
         $baseConfig = '/etc/caddy/Caddyfile';
         $sitesDir = '/etc/caddy/sites-enabled';
         $filePath = "$sitesDir/{$serviceName}.conf";
-        
+
         if (! is_dir($sitesDir)) {
             mkdir($sitesDir, 0750, true);
         }
 
         $block = trim(str_replace(["\r\n", "\r"], "\n", $block));
-        $tmp = tempnam(sys_get_temp_dir() . "/dployr", 'caddy');
+        $tmp = tempnam(sys_get_temp_dir().'/dployr', 'caddy');
         file_put_contents($tmp, $block);
         $result = CmdService::execute("chown caddy:caddy $tmp");
 
@@ -70,6 +72,7 @@ public static function checkPort(int $port): bool
     {
         $caddyfile = self::config();
         $pattern = "/^\\s*:$port\\b/m";
+
         return preg_match($pattern, $caddyfile) === 1;
     }
 

app/Services/CleanParseService.php

@@ -6,11 +6,9 @@ class CleanParseService
 {
     /**
      * Strips out null values from an object
-     * @param array $data
-     * @return array
      */
     public static function withoutNulls(array $data): array
     {
-        return array_filter($data, fn($v) => !is_null($v));
+        return array_filter($data, fn ($v) => ! is_null($v));
     }
-}
+}

app/Services/SchemaValidatorService.php

@@ -2,30 +2,29 @@
 
 namespace App\Services;
 
-use JsonSchema\Validator;
-use JsonSchema\Constraints\Constraint;
-use App\Services\HttpService;
 use Illuminate\Support\Facades\Cache;
+use JsonSchema\Constraints\Constraint;
+use JsonSchema\Validator;
 
 abstract class SchemaValidatorService
 {
     public function __construct(
-        protected string $schema_url, 
-        protected string $cache_key, 
+        protected string $schema_url,
+        protected string $cache_key,
         protected int $cache_ttl
     ) {}
 
     /**
      * Validate the blueprint config against the JSON schema
      *
-     * @param array $config The config array to validate
+     * @param  array  $config  The config array to validate
      * @return array Returns ['valid' => bool, 'errors' => array]
      */
     public function validate(array $config): array
     {
         $schema = $this->getSchema();
         $configObject = json_decode(json_encode($config));
-        $validator = new Validator();
+        $validator = new Validator;
         $validator->validate(
             $configObject,
             $schema,
@@ -35,7 +34,7 @@ public function validate(array $config): array
         if ($validator->isValid()) {
             return [
                 'valid' => true,
-                'errors' => []
+                'errors' => [],
             ];
         }
         $errors = [];
@@ -46,17 +45,17 @@ public function validate(array $config): array
                 'constraint' => $error['constraint'] ?? null,
             ];
         }
+
         return [
             'valid' => false,
-            'errors' => $errors
+            'errors' => $errors,
         ];
     }
 
     /**
      * Get validation errors as a formatted string
      *
-     * @param array $errors The errors array from validate()
-     * @return string
+     * @param  array  $errors  The errors array from validate()
      */
     public function formatErrors(array $errors): string
     {
@@ -72,17 +71,16 @@ public function formatErrors(array $errors): string
     /**
      * Fetch and cache the JSON schema
      *
-     * @return object
      * @throws \RuntimeException
      */
     private function getSchema(): object
     {
-        $schema = Cache::remember($this->cache_key,  $this->cache_ttl, function () {
+        $schema = Cache::remember($this->cache_key, $this->cache_ttl, function () {
             try {
                 return HttpService::makeRequest('get', $this->schema_url);
             } catch (\Exception $e) {
                 throw new \RuntimeException(
-                    "Unable to fetch schema from " . $this->schema_url . ": " . $e->getMessage()
+                    'Unable to fetch schema from '.$this->schema_url.': '.$e->getMessage()
                 );
             }
         });
@@ -97,4 +95,4 @@ public function clearCache(): void
     {
         Cache::forget($this->schema_url);
     }
-}
+}

composer.json

@@ -66,6 +66,9 @@
             "@php artisan test"
         ],
         "lint": [
+            "vendor/bin/pint"
+        ],
+        "lint:check": [
             "vendor/bin/pint --test"
         ],
         "sync": [

resources/js/components/app-sidebar.tsx

@@ -2,7 +2,17 @@ import { NavFooter } from '@/components/nav-footer';
 import { NavMain } from '@/components/nav-main';
 import { NavUser } from '@/components/nav-user';
 import { Sidebar, SidebarContent, SidebarFooter, SidebarHeader, SidebarMenu, SidebarMenuButton, SidebarMenuItem } from '@/components/ui/sidebar';
-import { console, deploymentsIndex, imagesIndex, logs, projectsIndex, remotesIndex, specsIndex, notificationsIndex, resourceManagerIndex } from '@/routes';
+import {
+    console,
+    deploymentsIndex,
+    imagesIndex,
+    logs,
+    notificationsIndex,
+    projectsIndex,
+    remotesIndex,
+    resourceManagerIndex,
+    specsIndex,
+} from '@/routes';
 import { type NavItem } from '@/types';
 import { Link } from '@inertiajs/react';
 import {