Merge pull request coollabsio#3708 from coollabsio/next

v4.0.0-beta.355
winning1120xx · Oct 3, 2024 · a1d395f · a1d395f
2 parents 7442d19 + 4e91268
commit a1d395f
Show file tree

Hide file tree

Showing 7 changed files with 102 additions and 93 deletions.
diff --git a/app/Livewire/Project/Database/ScheduledBackups.php b/app/Livewire/Project/Database/ScheduledBackups.php
@@ -26,7 +26,7 @@ class ScheduledBackups extends Component
     public function mount(): void
     {
         if ($this->selectedBackupId) {
-            $this->setSelectedBackup($this->selectedBackupId);
+            $this->setSelectedBackup($this->selectedBackupId, true);
         }
         $this->parameters = get_route_parameters();
         if ($this->database->getMorphClass() === 'App\Models\ServiceDatabase') {
@@ -37,10 +37,13 @@ public function mount(): void
         $this->s3s = currentTeam()->s3s;
     }
 
-    public function setSelectedBackup($backupId)
+    public function setSelectedBackup($backupId, $force = false)
     {
+        if ($this->selectedBackupId === $backupId && ! $force) {
+            return;
+        }
         $this->selectedBackupId = $backupId;
-        $this->selectedBackup = $this->database->scheduledBackups->find($this->selectedBackupId);
+        $this->selectedBackup = $this->database->scheduledBackups->find($backupId);
         if (is_null($this->selectedBackup)) {
             $this->selectedBackupId = null;
         }

diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php
@@ -325,38 +325,16 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
     $labels->push('traefik.http.middlewares.gzip.compress=true');
     $labels->push('traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https');
 
-    $basic_auth = false;
-    $basic_auth_middleware = null;
-    $redirect = false;
-    $redirect_middleware = null;
+    $middlewares_from_labels = collect([]);
 
     if ($serviceLabels) {
-        $basic_auth = $serviceLabels->contains(function ($value) {
-            return str_contains($value, 'basicauth');
-        });
-        if ($basic_auth) {
-            $basic_auth_middleware = $serviceLabels
-                ->map(function ($item) {
-                    if (preg_match('/traefik\.http\.middlewares\.(.*?)\.basicauth\.users/', $item, $matches)) {
-                        return $matches[1];
-                    }
-                })
-                ->filter()
-                ->first();
-        }
-        $redirect = $serviceLabels->contains(function ($value) {
-            return str_contains($value, 'redirectregex');
-        });
-        if ($redirect) {
-            $redirect_middleware = $serviceLabels
-                ->map(function ($item) {
-                    if (preg_match('/traefik\.http\.middlewares\.(.*?)\.redirectregex\.regex/', $item, $matches)) {
-                        return $matches[1];
-                    }
-                })
-                ->filter()
-                ->first();
-        }
+        $middlewares_from_labels = $serviceLabels->map(function ($item) {
+            if (preg_match('/traefik\.http\.middlewares\.(.*?)(\.|$)/', $item, $matches)) {
+                return $matches[1];
+            }
+            return null;
+        })->filter()
+        ->unique();
     }
     foreach ($domains as $loop => $domain) {
         try {
@@ -404,31 +382,29 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                     $labels->push("traefik.http.services.{$https_label}.loadbalancer.server.port=$port");
                 }
                 if ($path !== '/') {
+                    // Middleware handling
                     $middlewares = collect([]);
-                    if ($is_stripprefix_enabled && ! str($image)->contains('ghost')) {
+                    if ($is_stripprefix_enabled && !str($image)->contains('ghost')) {
                         $labels->push("traefik.http.middlewares.{$https_label}-stripprefix.stripprefix.prefixes={$path}");
                         $middlewares->push("{$https_label}-stripprefix");
                     }
                     if ($is_gzip_enabled) {
                         $middlewares->push('gzip');
                     }
-                    if ($basic_auth && $basic_auth_middleware) {
-                        $middlewares->push($basic_auth_middleware);
-                    }
-                    if ($redirect && $redirect_middleware) {
-                        $middlewares->push($redirect_middleware);
-                    }
                     if (str($image)->contains('ghost')) {
                         $middlewares->push('redir-ghost');
                     }
                     if ($redirect_direction === 'non-www' && str($host)->startsWith('www.')) {
                         $labels = $labels->merge($redirect_to_non_www);
                         $middlewares->push($to_non_www_name);
                     }
-                    if ($redirect_direction === 'www' && ! str($host)->startsWith('www.')) {
+                    if ($redirect_direction === 'www' && !str($host)->startsWith('www.')) {
                         $labels = $labels->merge($redirect_to_www);
                         $middlewares->push($to_www_name);
                     }
+                    $middlewares_from_labels->each(function ($middleware_name) use ($middlewares) {
+                        $middlewares->push($middleware_name);
+                    });
                     if ($middlewares->isNotEmpty()) {
                         $middlewares = $middlewares->join(',');
                         $labels->push("traefik.http.routers.{$https_label}.middlewares={$middlewares}");
@@ -437,13 +413,7 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                     $middlewares = collect([]);
                     if ($is_gzip_enabled) {
                         $middlewares->push('gzip');
-                    }
-                    if ($basic_auth && $basic_auth_middleware) {
-                        $middlewares->push($basic_auth_middleware);
-                    }
-                    if ($redirect && $redirect_middleware) {
-                        $middlewares->push($redirect_middleware);
-                    }
+                    }                   
                     if (str($image)->contains('ghost')) {
                         $middlewares->push('redir-ghost');
                     }
@@ -455,6 +425,9 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                         $labels = $labels->merge($redirect_to_www);
                         $middlewares->push($to_www_name);
                     }
+                    $middlewares_from_labels->each(function ($middleware_name) use ($middlewares) {
+                        $middlewares->push($middleware_name);
+                    });
                     if ($middlewares->isNotEmpty()) {
                         $middlewares = $middlewares->join(',');
                         $labels->push("traefik.http.routers.{$https_label}.middlewares={$middlewares}");
@@ -490,12 +463,6 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                     if ($is_gzip_enabled) {
                         $middlewares->push('gzip');
                     }
-                    if ($basic_auth && $basic_auth_middleware) {
-                        $middlewares->push($basic_auth_middleware);
-                    }
-                    if ($redirect && $redirect_middleware) {
-                        $middlewares->push($redirect_middleware);
-                    }
                     if (str($image)->contains('ghost')) {
                         $middlewares->push('redir-ghost');
                     }
@@ -507,6 +474,9 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                         $labels = $labels->merge($redirect_to_www);
                         $middlewares->push($to_www_name);
                     }
+                    $middlewares_from_labels->each(function ($middleware_name) use ($middlewares) {
+                        $middlewares->push($middleware_name);
+                    });
                     if ($middlewares->isNotEmpty()) {
                         $middlewares = $middlewares->join(',');
                         $labels->push("traefik.http.routers.{$http_label}.middlewares={$middlewares}");
@@ -516,12 +486,6 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                     if ($is_gzip_enabled) {
                         $middlewares->push('gzip');
                     }
-                    if ($basic_auth && $basic_auth_middleware) {
-                        $middlewares->push($basic_auth_middleware);
-                    }
-                    if ($redirect && $redirect_middleware) {
-                        $middlewares->push($redirect_middleware);
-                    }
                     if (str($image)->contains('ghost')) {
                         $middlewares->push('redir-ghost');
                     }
@@ -533,6 +497,9 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                         $labels = $labels->merge($redirect_to_www);
                         $middlewares->push($to_www_name);
                     }
+                    $middlewares_from_labels->each(function ($middleware_name) use ($middlewares) {
+                        $middlewares->push($middleware_name);
+                    });
                     if ($middlewares->isNotEmpty()) {
                         $middlewares = $middlewares->join(',');
                         $labels->push("traefik.http.routers.{$http_label}.middlewares={$middlewares}");

diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
@@ -828,6 +828,31 @@ function convertToArray($collection)
     return $collection;
 }
 
+function parseCommandFromMagicEnvVariable(Str|string $key): Stringable
+{
+    $value = str($key);
+    $count = substr_count($value->value(), '_');
+    if ($count === 2) {
+        if ($value->startsWith('SERVICE_FQDN') || $value->startsWith('SERVICE_URL')) {
+            // SERVICE_FQDN_UMAMI
+            $command = $value->after('SERVICE_')->beforeLast('_');
+        } else {
+            // SERVICE_BASE64_UMAMI
+            $command = $value->after('SERVICE_')->beforeLast('_');
+        }
+    }
+    if ($count === 3) {
+        if ($value->startsWith('SERVICE_FQDN') || $value->startsWith('SERVICE_URL')) {
+            // SERVICE_FQDN_UMAMI_1000
+            $command = $value->after('SERVICE_')->before('_');
+        } else {
+            // SERVICE_BASE64_64_UMAMI
+            $command = $value->after('SERVICE_')->beforeLast('_');
+        }
+    }
+
+    return str($command);
+}
 function parseEnvVariable(Str|string $value)
 {
     $value = str($value);
@@ -859,6 +884,7 @@ function parseEnvVariable(Str|string $value)
             } else {
                 // SERVICE_BASE64_64_UMAMI
                 $command = $value->after('SERVICE_')->beforeLast('_');
+                ray($command);
             }
         }
     }
@@ -3117,7 +3143,7 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
                 foreach ($magicEnvironments as $key => $value) {
                     $key = str($key);
                     $value = replaceVariables($value);
-                    $command = $key->after('SERVICE_')->before('_');
+                    $command = parseCommandFromMagicEnvVariable($key);
                     $found = $resource->environment_variables()->where('key', $key->value())->where($nameOfId, $resource->id)->first();
                     if ($found) {
                         continue;
@@ -3676,6 +3702,18 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
             });
         }
         $serviceLabels = $labels->merge($defaultLabels);
+        if ($serviceLabels->count() > 0) {
+            if ($isApplication) {
+                $isContainerLabelEscapeEnabled = data_get($resource, 'settings.is_container_label_escape_enabled');
+            } else {
+                $isContainerLabelEscapeEnabled = data_get($resource, 'is_container_label_escape_enabled');
+            }
+            if ($isContainerLabelEscapeEnabled) {
+                $serviceLabels = $serviceLabels->map(function ($value, $key) {
+                    return escapeDollarSign($value);
+                });
+            }
+        }
         if (! $isDatabase && $fqdns instanceof Collection && $fqdns->count() > 0) {
             if ($isApplication) {
                 $shouldGenerateLabelsExactly = $resource->destination->server->settings->generate_exact_labels;

diff --git a/config/sentry.php b/config/sentry.php
@@ -7,7 +7,7 @@
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.354',
+    'release' => '4.0.0-beta.355',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

diff --git a/config/version.php b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.354';
+return '4.0.0-beta.355';
diff --git a/resources/views/livewire/project/database/scheduled-backups.blade.php b/resources/views/livewire/project/database/scheduled-backups.blade.php
@@ -1,37 +1,38 @@
 <div>
     <div class="flex flex-col gap-2">
         @forelse($database->scheduledBackups as $backup)
-        @if ($type == 'database')
-        <a class="box"
-            href="{{ route('project.database.backup.execution', [...$parameters, 'backup_uuid' => $backup->uuid]) }}">
-            <div class="flex flex-col">
-                <div>Frequency: {{ $backup->frequency }}</div>
-                <div>Last backup: {{ data_get($backup->latest_log, 'status', 'No backup yet') }}</div>
-                <div>Number of backups to keep (locally): {{ $backup->number_of_backups_locally }}</div>
-            </div>
-        </a>
-        @else
-        <div class="box" wire:click="setSelectedBackup('{{ data_get($backup, 'id') }}')">
-            <div @class([ 'border-coollabs'=>
-                data_get($backup, 'id') === data_get($selectedBackup, 'id'),
-                'flex flex-col border-l-2 border-transparent',
-                ])>
-                <div>Frequency: {{ $backup->frequency }}</div>
-                <div>Last backup: {{ data_get($backup->latest_log, 'status', 'No backup yet') }}</div>
-                <div>Number of backups to keep (locally): {{ $backup->number_of_backups_locally }}</div>
-            </div>
-        </div>
-        @endif
+            @if ($type == 'database')
+                <a class="box"
+                    href="{{ route('project.database.backup.execution', [...$parameters, 'backup_uuid' => $backup->uuid]) }}">
+                    <div class="flex flex-col">
+                        <div>Frequency: {{ $backup->frequency }}</div>
+                        <div>Last backup: {{ data_get($backup->latest_log, 'status', 'No backup yet') }}</div>
+                        <div>Number of backups to keep (locally): {{ $backup->number_of_backups_locally }}</div>
+                    </div>
+                </a>
+            @else
+                <div class="box" wire:click="setSelectedBackup('{{ data_get($backup, 'id') }}')">
+                    <div @class([
+                        'border-coollabs' =>
+                            data_get($backup, 'id') === data_get($selectedBackup, 'id'),
+                        'flex flex-col border-l-2 border-transparent',
+                    ])>
+                        <div>Frequency: {{ $backup->frequency }}</div>
+                        <div>Last backup: {{ data_get($backup->latest_log, 'status', 'No backup yet') }}</div>
+                        <div>Number of backups to keep (locally): {{ $backup->number_of_backups_locally }}</div>
+                    </div>
+                </div>
+            @endif
         @empty
-        <div>No scheduled backups configured.</div>
+            <div>No scheduled backups configured.</div>
         @endforelse
     </div>
     @if ($type === 'service-database' && $selectedBackup)
-    <div class="pt-10">
-        <livewire:project.database.backup-edit wire:key="{{ $selectedBackup->id }}" :backup="$selectedBackup"
-            :s3s="$s3s" :status="data_get($database, 'status')" />
-        <h3 class="py-4">Executions</h3>
-        <livewire:project.database.backup-executions wire:key="{{ $selectedBackup->id }}" :backup="$selectedBackup" :database="$database" />
-    </div>
+        <div class="pt-10">
+            <livewire:project.database.backup-edit wire:key="{{ $selectedBackup->id }}" :backup="$selectedBackup"
+                :s3s="$s3s" :status="data_get($database, 'status')" />
+            <livewire:project.database.backup-executions wire:key="{{ $selectedBackup->uuid }}" :backup="$selectedBackup"
+                :database="$database" />
+        </div>
     @endif
 </div>
diff --git a/versions.json b/versions.json
@@ -1,10 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.354"
+            "version": "4.0.0-beta.355"
         },
         "nightly": {
-            "version": "4.0.0-beta.355"
+            "version": "4.0.0-beta.356"
         },
         "helper": {
             "version": "1.0.1"