From 0dff57e69feade4f93a9a2d9d839761b92220017 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 29 Nov 2023 15:03:21 +0100
Subject: [PATCH] Add cleanup option to app:init command

---
 app/Console/Commands/Init.php                 | 57 ++++++++++---------
 .../etc/s6-overlay/s6-rc.d/init-script/up     |  2 +-
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/app/Console/Commands/Init.php b/app/Console/Commands/Init.php
index 4cf0f21bf..862fb7625 100644
--- a/app/Console/Commands/Init.php
+++ b/app/Console/Commands/Init.php
@@ -30,6 +30,7 @@ public function handle()
         $this->alive();
         $cleanup = $this->option('cleanup');
         if ($cleanup) {
+            echo "Running cleanup\n";
             $this->cleanup_stucked_resources();
             $this->cleanup_ssh();
         }
@@ -101,14 +102,14 @@ private function cleanup_stucked_resources()
                     ray('Application without environment', $application->name);
                     $application->delete();
                 }
-                if (!data_get($application, 'destination.server')) {
-                    ray('Application without server', $application->name);
-                    $application->delete();
-                }
                 if (!$application->destination()) {
                     ray('Application without destination', $application->name);
                     $application->delete();
                 }
+                if (!data_get($application, 'destination.server')) {
+                    ray('Application without server', $application->name);
+                    $application->delete();
+                }
             }
         } catch (\Throwable $e) {
             echo "Error in application: {$e->getMessage()}\n";
@@ -120,14 +121,14 @@ private function cleanup_stucked_resources()
                     ray('Postgresql without environment', $postgresql->name);
                     $postgresql->delete();
                 }
-                if (!data_get($postgresql, 'destination.server')) {
-                    ray('Postgresql without server', $postgresql->name);
-                    $postgresql->delete();
-                }
                 if (!$postgresql->destination()) {
                     ray('Postgresql without destination', $postgresql->name);
                     $postgresql->delete();
                 }
+                if (!data_get($postgresql, 'destination.server')) {
+                    ray('Postgresql without server', $postgresql->name);
+                    $postgresql->delete();
+                }
             }
         } catch (\Throwable $e) {
             echo "Error in postgresql: {$e->getMessage()}\n";
@@ -139,14 +140,14 @@ private function cleanup_stucked_resources()
                     ray('Redis without environment', $redis->name);
                     $redis->delete();
                 }
-                if (!data_get($redis, 'destination.server')) {
-                    ray('Redis without server', $redis->name);
-                    $redis->delete();
-                }
                 if (!$redis->destination()) {
                     ray('Redis without destination', $redis->name);
                     $redis->delete();
                 }
+                if (!data_get($redis, 'destination.server')) {
+                    ray('Redis without server', $redis->name);
+                    $redis->delete();
+                }
             }
         } catch (\Throwable $e) {
             echo "Error in redis: {$e->getMessage()}\n";
@@ -159,14 +160,14 @@ private function cleanup_stucked_resources()
                     ray('Mongodb without environment', $mongodb->name);
                     $mongodb->delete();
                 }
-                if (!data_get($mongodb, 'destination.server')) {
-                    ray('Mongodb without server', $mongodb->name);
-                    $mongodb->delete();
-                }
                 if (!$mongodb->destination()) {
                     ray('Mongodb without destination', $mongodb->name);
                     $mongodb->delete();
                 }
+                if (!data_get($mongodb, 'destination.server')) {
+                    ray('Mongodb without server', $mongodb->name);
+                    $mongodb->delete();
+                }
             }
         } catch (\Throwable $e) {
             echo "Error in mongodb: {$e->getMessage()}\n";
@@ -179,14 +180,14 @@ private function cleanup_stucked_resources()
                     ray('Mysql without environment', $mysql->name);
                     $mysql->delete();
                 }
-                if (!data_get($mysql, 'destination.server')) {
-                    ray('Mysql without server', $mysql->name);
-                    $mysql->delete();
-                }
                 if (!$mysql->destination()) {
                     ray('Mysql without destination', $mysql->name);
                     $mysql->delete();
                 }
+                if (!data_get($mysql, 'destination.server')) {
+                    ray('Mysql without server', $mysql->name);
+                    $mysql->delete();
+                }
             }
         } catch (\Throwable $e) {
             echo "Error in mysql: {$e->getMessage()}\n";
@@ -199,14 +200,14 @@ private function cleanup_stucked_resources()
                     ray('Mariadb without environment', $mariadb->name);
                     $mariadb->delete();
                 }
-                if (!data_get($mariadb, 'destination.server')) {
-                    ray('Mariadb without server', $mariadb->name);
-                    $mariadb->delete();
-                }
                 if (!$mariadb->destination()) {
                     ray('Mariadb without destination', $mariadb->name);
                     $mariadb->delete();
                 }
+                if (!data_get($mariadb, 'destination.server')) {
+                    ray('Mariadb without server', $mariadb->name);
+                    $mariadb->delete();
+                }
             }
         } catch (\Throwable $e) {
             echo "Error in mariadb: {$e->getMessage()}\n";
@@ -219,14 +220,14 @@ private function cleanup_stucked_resources()
                     ray('Service without environment', $service->name);
                     $service->delete();
                 }
-                if (!data_get($service, 'server')) {
-                    ray('Service without server', $service->name);
-                    $service->delete();
-                }
                 if (!$service->destination()) {
                     ray('Service without destination', $service->name);
                     $service->delete();
                 }
+                if (!data_get($service, 'server')) {
+                    ray('Service without server', $service->name);
+                    $service->delete();
+                }
             }
         } catch (\Throwable $e) {
             echo "Error in service: {$e->getMessage()}\n";
diff --git a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/init-script/up b/docker/prod-ssu/etc/s6-overlay/s6-rc.d/init-script/up
index 09595f708..32492f6b7 100644
--- a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/init-script/up
+++ b/docker/prod-ssu/etc/s6-overlay/s6-rc.d/init-script/up
@@ -1,2 +1,2 @@
 #!/command/execlineb -P
-php /var/www/html/artisan app:init
+php /var/www/html/artisan app:init --cleanup