From 2d17c15b71acca37dfa0b6695b7e1a8808a1bcc1 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 4 Apr 2023 15:25:42 +0200
Subject: [PATCH] feat: add persistent volumes

---
 app/Jobs/DeployApplicationJob.php             | 49 +++++++++++++------
 ...03_27_081716_create_applications_table.php |  2 +-
 database/seeders/DatabaseSeeder.php           |  2 +-
 .../seeders/LocalPersistentVolumeSeeder.php   |  3 +-
 4 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/app/Jobs/DeployApplicationJob.php b/app/Jobs/DeployApplicationJob.php
index 223aefa1b..9a08a052e 100644
--- a/app/Jobs/DeployApplicationJob.php
+++ b/app/Jobs/DeployApplicationJob.php
@@ -154,6 +154,8 @@ class DeployApplicationJob implements ShouldQueue
 
     private function generate_docker_compose()
     {
+        $persistentStorages = $this->generate_local_persistent_volumes();
+        $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
         $docker_compose = [
             'version' => '3.8',
             'services' => [
@@ -192,15 +194,36 @@ class DeployApplicationJob implements ShouldQueue
         if (count($this->application->ports_mappings) > 0) {
             $docker_compose['services'][$this->application->uuid]['ports'] = $this->application->ports_mappings;
         }
-        // if (count($volumes) > 0) {
-        //     $docker_compose['services'][$this->application->uuid]['volumes'] = $volumes;
-        // }
-        // if (count($volume_names) > 0) {
-        //     $docker_compose['volumes'] = $volume_names;
-        // }
+        if (count($persistentStorages) > 0) {
+            $docker_compose['services'][$this->application->uuid]['volumes'] = $persistentStorages;
+        }
+        if (count($volume_names) > 0) {
+            $docker_compose['volumes'] = $volume_names;
+        }
         return Yaml::dump($docker_compose);
     }
+    private function generate_local_persistent_volumes()
+    {
+        foreach ($this->application->persistentStorages as $persistentStorage) {
+            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
+            $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+        }
+        return $local_persistent_volumes ?? [];
+    }
 
+    private function generate_local_persistent_volumes_only_volume_names()
+    {
+        foreach ($this->application->persistentStorages as $persistentStorage) {
+            if ($persistentStorage->host_path) {
+                continue;
+            }
+            $local_persistent_volumes_names[$persistentStorage->name] = [
+                'name' => $persistentStorage->name,
+                'external' => false,
+            ];
+        }
+        return $local_persistent_volumes_names ?? [];
+    }
     private function generate_healthcheck_commands()
     {
         if (!$this->application->health_check_port) {
@@ -208,18 +231,12 @@ class DeployApplicationJob implements ShouldQueue
         }
         if ($this->application->health_check_path) {
             $generated_healthchecks_commands = [
-                "curl -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$this->application->health_check_port}{$this->application->health_check_path}"
+                "curl -s -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$this->application->health_check_port}{$this->application->health_check_path} > /dev/null"
             ];
         } else {
-            $generated_healthchecks_commands = [];
-            foreach ($this->application->ports_exposes as $key => $port) {
-                $generated_healthchecks_commands = [
-                    "curl -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$port}/"
-                ];
-                if (count($this->application->ports_exposes) != $key + 1) {
-                    $generated_healthchecks_commands[] = '&&';
-                }
-            }
+            $generated_healthchecks_commands = [
+                "curl -s -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$this->application->health_check_port}/"
+            ];
         }
         return implode(' ', $generated_healthchecks_commands);
     }
diff --git a/database/migrations/2023_03_27_081716_create_applications_table.php b/database/migrations/2023_03_27_081716_create_applications_table.php
index 021f8f434..23b6575e7 100644
--- a/database/migrations/2023_03_27_081716_create_applications_table.php
+++ b/database/migrations/2023_03_27_081716_create_applications_table.php
@@ -40,7 +40,7 @@ return new class extends Migration
             $table->string('base_directory')->default('/');
             $table->string('publish_directory')->nullable();
 
-            $table->string('health_check_path')->nullable();
+            $table->string('health_check_path')->default('/');
             $table->string('health_check_port')->nullable();
             $table->string('health_check_host')->default('localhost');
             $table->string('health_check_method')->default('GET');
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index 8588b5082..a5bcd329a 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -18,7 +18,6 @@ class DatabaseSeeder extends Seeder
             ProjectSeeder::class,
             ProjectSettingSeeder::class,
             EnvironmentSeeder::class,
-            LocalPersistentVolumeSeeder::class,
             StandaloneDockerSeeder::class,
             SwarmDockerSeeder::class,
             KubernetesSeeder::class,
@@ -28,6 +27,7 @@ class DatabaseSeeder extends Seeder
             ApplicationSettingsSeeder::class,
             DBSeeder::class,
             ServiceSeeder::class,
+            LocalPersistentVolumeSeeder::class,
         ]);
     }
 }
diff --git a/database/seeders/LocalPersistentVolumeSeeder.php b/database/seeders/LocalPersistentVolumeSeeder.php
index 79c105ed3..61f0f7ae5 100644
--- a/database/seeders/LocalPersistentVolumeSeeder.php
+++ b/database/seeders/LocalPersistentVolumeSeeder.php
@@ -13,10 +13,11 @@ class LocalPersistentVolumeSeeder extends Seeder
      */
     public function run(): void
     {
+        $application = Application::where('name', 'Public application (from GitHub)')->first();
         LocalPersistentVolume::create([
             'name' => 'test-pv',
             'mount_path' => '/data',
-            'resource_id' => 1,
+            'resource_id' => $application->id,
             'resource_type' => Application::class,
         ]);
     }