Merge branch 'fix-redis-db-ui' into fix-redis

app/Livewire/Project/Database/Redis/General.php

@@ -25,6 +25,7 @@ class General extends Component
         'database.name' => 'required',
         'database.description' => 'nullable',
         'database.redis_conf' => 'nullable',
+        'database.redis_username' => 'required',
         'database.redis_password' => 'required',
         'database.image' => 'required',
         'database.ports_mappings' => 'nullable',
@@ -38,6 +39,7 @@ class General extends Component
         'database.name' => 'Name',
         'database.description' => 'Description',
         'database.redis_conf' => 'Redis Configuration',
+        'database.redis_username' => 'Redis Username',
         'database.redis_password' => 'Redis Password',
         'database.image' => 'Image',
         'database.ports_mappings' => 'Port Mapping',
@@ -75,16 +77,33 @@ public function submit()
     {
         try {
             $this->validate();
-            if ($this->database->redis_conf === '') {
+
-                $this->database->redis_conf = null;
+            $redis_version = $this->get_redis_version();
+
+            if (version_compare($redis_version, '6.0', '>=')) {
+                if ($this->database->isDirty('redis_username')) {
+                    $this->database->redis_username = $this->database->redis_username;
+                }
             }
+
+            if ($this->database->isDirty('redis_password')) {
+                $this->database->redis_password = $this->database->redis_password;
+            }
+
             $this->database->save();
+
             $this->dispatch('success', 'Database updated.');
         } catch (Exception $e) {
             return handleError($e, $this);
         }
     }
 
+    private function get_redis_version()
+    {
+        $image_parts = explode(':', $this->database->image);
+        return $image_parts[1] ?? '0.0';
+    }
+
     public function instantSave()
     {
         try {
@@ -125,4 +144,4 @@ public function render()
     {
         return view('livewire.project.database.redis.general');
     }
-}
+}

app/Models/StandaloneRedis.php

@@ -16,6 +16,14 @@ class StandaloneRedis extends BaseModel
 
     protected $appends = ['internal_db_url', 'external_db_url', 'database_type', 'server_status'];
 
+    protected $casts = [
+        'redis_password' => 'encrypted',
+    ];
+
+    protected $attributes = [
+        'redis_username' => 'redis',
+    ];
+
     protected static function booted()
     {
         static::created(function ($database) {
@@ -210,7 +218,11 @@ public function databaseType(): Attribute
     protected function internalDbUrl(): Attribute
     {
         return new Attribute(
-            get: fn () => "redis://:{$this->redis_password}@{$this->uuid}:6379/0",
+            get: function () {
+                $redis_version = $this->get_redis_version();
+                $username_part = version_compare($redis_version, '6.0', '>=') ? "{$this->redis_username}:" : "";
+                return "redis://{$username_part}{$this->redis_password}@{$this->uuid}:6379/0";
+            }
         );
     }
 
@@ -219,14 +231,21 @@ protected function externalDbUrl(): Attribute
         return new Attribute(
             get: function () {
                 if ($this->is_public && $this->public_port) {
-                    return "redis://:{$this->redis_password}@{$this->destination->server->getIp}:{$this->public_port}/0";
+                    $redis_version = $this->get_redis_version();
+                    $username_part = version_compare($redis_version, '6.0', '>=') ? "{$this->redis_username}:" : "";
+                    return "redis://{$username_part}{$this->redis_password}@{$this->destination->server->getIp}:{$this->public_port}/0";
                 }
-
                 return null;
             }
         );
     }
 
+    private function get_redis_version()
+    {
+        $image_parts = explode(':', $this->image);
+        return $image_parts[1] ?? '0.0';
+    }
+
     public function environment()
     {
         return $this->belongsTo(Environment::class);
@@ -290,9 +309,9 @@ public function getMetrics(int $mins = 5)
             return $parsedCollection->toArray();
         }
     }
-
     public function isBackupSolutionAvailable()
     {
         return false;
     }
 }
+

database/migrations/2024_08_21_165435_add_redis_username_to_standalone_redis_table.php

@@ -0,0 +1,22 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('standalone_redis', function (Blueprint $table) {
+            $table->string('redis_username')->default('redis')->after('description');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('standalone_redis', function (Blueprint $table) {
+            $table->dropColumn('redis_username');
+        });
+    }
+};

resources/views/livewire/project/database/redis/general.blade.php

@@ -9,8 +9,16 @@
         <div class="flex gap-2">
             <x-forms.input label="Name" id="database.name" />
             <x-forms.input label="Description" id="database.description" />
-            <x-forms.input label="Image" id="database.image" required
+            <x-forms.input label="Image" id="database.image" required helper="For all available images, check here:<br><br><a target='_blank' href='https://hub.docker.com/_/redis'>https://hub.docker.com/_/redis</a>" />
-                helper="For all available images, check here:<br><br><a target='_blank' href='https://hub.docker.com/_/redis'>https://hub.docker.com/_/redis</a>" />
+        </div>
+        <div class="flex flex-col gap-2">
+            @php
+                $redis_version = explode(':', $database->image)[1] ?? '0.0';
+            @endphp
+            @if (version_compare($redis_version, '6.0', '>='))
+                <x-forms.input label="Username" id="database.redis_username" required helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." />
+            @endif
+            <x-forms.input label="Password" id="database.redis_password" type="password" required helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." wire:model.defer="database.redis_password" />
         </div>
         <x-forms.input
             helper="You can add custom docker run options that will be used when your container is started.<br>Note: Not all options are supported, as they could mess up Coolify's automation and could cause bad experience for users.<br><br>Check the <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/custom-commands'>docs.</a>"
@@ -19,42 +27,32 @@
         <div class="flex flex-col gap-2">
             <h3 class="py-2">Network</h3>
             <div class="flex items-end gap-2">
-                <x-forms.input placeholder="3000:5432" id="database.ports_mappings" label="Ports Mappings"
+                <x-forms.input placeholder="3000:5432" id="database.ports_mappings" label="Ports Mappings" helper="A comma separated list of ports you would like to map to the host system.<br><span class='inline-block font-bold dark:text-warning'>Example</span>3000:5432,3002:5433" />
-                    helper="A comma separated list of ports you would like to map to the host system.<br><span class='inline-block font-bold dark:text-warning'>Example</span>3000:5432,3002:5433" />
             </div>
-            <x-forms.input label="Redis URL (internal)"
+            <x-forms.input label="Redis URL (internal)" helper="If you change the user/password/port, this could be different. This is with the default values." type="password" readonly wire:model="db_url" />
-                helper="If you change the user/password/port, this could be different. This is with the default values."
-                type="password" readonly wire:model="db_url" />
             @if ($db_url_public)
-                <x-forms.input label="Redis URL (public)"
+            <x-forms.input label="Redis URL (public)" helper="If you change the user/password/port, this could be different. This is with the default values." type="password" readonly wire:model="db_url_public" />
-                    helper="If you change the user/password/port, this could be different. This is with the default values."
-                    type="password" readonly wire:model="db_url_public" />
             @endif
         </div>
         <div>
             <h3 class="py-2">Proxy</h3>
             <div class="flex items-end gap-2">
-                <x-forms.input placeholder="5432" disabled="{{ data_get($database, 'is_public') }}"
+                <x-forms.input placeholder="5432" disabled="{{ data_get($database, 'is_public') }}" id="database.public_port" label="Public Port" />
-                    id="database.public_port" label="Public Port" />
                 <x-slide-over fullScreen>
                     <x-slot:title>Proxy Logs</x-slot:title>
                     <x-slot:content>
-                        <livewire:project.shared.get-logs :server="$server" :resource="$database"
+                        <livewire:project.shared.get-logs :server="$server" :resource="$database" container="{{ data_get($database, 'uuid') }}-proxy" lazy />
-                            container="{{ data_get($database, 'uuid') }}-proxy" lazy />
                     </x-slot:content>
-                    <x-forms.button disabled="{{ !data_get($database, 'is_public') }}" @click="slideOverOpen=true"
+                    <x-forms.button disabled="{{ !data_get($database, 'is_public') }}" @click="slideOverOpen=true" class="w-28">Proxy Logs</x-forms.button>
-                        class="w-28">Proxy Logs</x-forms.button>
                 </x-slide-over>
                 <x-forms.checkbox instantSave id="database.is_public" label="Make it publicly available" />
             </div>
         </div>
-        <x-forms.textarea
+        <x-forms.textarea helper="<a target='_blank' class='underline dark:text-white' href='https://raw.githubusercontent.com/redis/redis/7.2/redis.conf'>Redis Default Configuration</a>" label="Custom Redis Configuration" rows="10" id="database.redis_conf" />
-            helper="<a target='_blank' class='underline dark:text-white' href='https://raw.githubusercontent.com/redis/redis/7.2/redis.conf'>Redis Default Configuration</a>"
-            label="Custom Redis Configuration" rows="10" id="database.redis_conf" />
         <h3 class="pt-4">Advanced</h3>
         <div class="flex flex-col">
-            <x-forms.checkbox helper="Drain logs to your configured log drain endpoint in your Server settings."
+            <x-forms.checkbox helper="Drain logs to your configured log drain endpoint in your Server settings." instantSave="instantSaveAdvanced" id="database.is_log_drain_enabled" label="Drain Logs" />
-                instantSave="instantSaveAdvanced" id="database.is_log_drain_enabled" label="Drain Logs" />
         </div>
+
     </form>
-</div>
+</div>