Merge pull request #89 from shawnhooper/customize-db-name

Fix: Sluggify the database name
mehrancodes · Mar 18, 2024 · a277776 · a277776
2 parents 3ae0ef3 + fb51fdc
commit a277776
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 12 deletions.
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -11,9 +11,7 @@ class AppServiceProvider extends ServiceProvider
 {
     public function boot(): void
     {
-        $this->app->setLocale('en');
-
-        $this->loadTranslationsFrom(base_path('lang'), 'harbor');
+        //
     }
 
     public function register(): void

diff --git a/app/Services/Forge/ForgeService.php b/app/Services/Forge/ForgeService.php
@@ -80,13 +80,20 @@ public function getFormattedDomainName(): string
         );
     }
 
-    public function getStandardizedBranchName(): string
+    public function getSiteIsolationUsername(): string
     {
         return GenerateStandardizedBranchName::run(
             $this->getFormattedBranchName()
         );
     }
 
+    public function getFormattedDatabaseName(): string
+    {
+        return $this->setting->dbName ?? GenerateStandardizedBranchName::run(
+            $this->getFormattedBranchName()
+        );
+    }
+
     public function siteNginxTemplate(): string
     {
         return $this->forge->siteNginxFile($this->setting->server, $this->site->id);

diff --git a/app/Services/Forge/ForgeSetting.php b/app/Services/Forge/ForgeSetting.php
@@ -206,7 +206,7 @@ class ForgeSetting
         'site_isolation_required' => ['boolean'],
         'job_scheduler_required' => ['boolean'],
         'db_creation_required' => ['boolean'],
-        'db_name' => ['nullable', 'string'],
+        'db_name' => ['nullable', 'string', 'regex:/^[a-zA-Z0-9_]+$/'],
         'auto_source_required' => ['boolean'],
         'ssl_required' => ['boolean'],
         'wait_on_ssl' => ['boolean'],
@@ -230,7 +230,14 @@ public function __construct()
 
     private function init(array $configurations): void
     {
-        $validator = Validator::make($configurations, $this->validationRules);
+        $validator = Validator::make(
+            $configurations,
+            $this->validationRules,
+            [
+                'db_name.regex' => 'The :attribute must only contain letters, numbers, and underscores.'
+            ],
+            ['db_name' => 'FORGE_DB_NAME']
+        );
 
         throw_if($validator->fails(), ValidationException::class, $validator->errors()->all());
 

diff --git a/app/Services/Forge/Pipeline/CreateDatabase.php b/app/Services/Forge/Pipeline/CreateDatabase.php
@@ -13,6 +13,7 @@
 
 namespace App\Services\Forge\Pipeline;
 
+use App\Actions\GenerateStandardizedBranchName;
 use App\Services\Forge\ForgeService;
 use App\Traits\Outputifier;
 use Closure;
@@ -28,8 +29,8 @@ public function __invoke(ForgeService $service, Closure $next)
             return $next($service);
         }
 
+        $dbName = $service->getFormattedDatabaseName();
         $dbPassword = Str::random(16);
-        $dbName = $service->setting->dbName ?? $service->getStandardizedBranchName();
 
         if (! $this->databaseExists($service, $dbName)) {
             $this->information('Creating database.');

diff --git a/app/Services/Forge/Pipeline/OrCreateNewSite.php b/app/Services/Forge/Pipeline/OrCreateNewSite.php
@@ -54,7 +54,7 @@ private function gatherSiteData(ForgeService $service): array
             $this->information('---> Enabling site isolation.');
 
             $data['isolated'] = true;
-            $data['username'] = $service->getStandardizedBranchName();
+            $data['username'] = $service->getSiteIsolationUsername();
         }
 
         return $data;

diff --git a/app/Services/Forge/Pipeline/RemoveDatabaseUser.php b/app/Services/Forge/Pipeline/RemoveDatabaseUser.php
@@ -24,7 +24,7 @@ class RemoveDatabaseUser
     public function __invoke(ForgeService $service, Closure $next)
     {
         foreach ($service->forge->databaseUsers($service->setting->server) as $databaseUser) {
-            if ($databaseUser->name === $service->getStandardizedBranchName()) {
+            if ($databaseUser->name === $service->getFormattedDatabaseName()) {
                 $this->information('Removing database with user.');
 
                 foreach ($databaseUser->databases as $database) {

diff --git a/config/app.php b/config/app.php
@@ -55,6 +55,18 @@
 
     'timezone' => 'UTC',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Application Locale Configuration
+    |--------------------------------------------------------------------------
+    |
+    | The application locale determines the default locale that will be used
+    | by the translation service provider. You are free to set this value
+    | to any of the locales which will be supported by the application.
+    |
+    */
+    'locale' => 'en',
+
     /*
     |--------------------------------------------------------------------------
     | Autoloaded Service Providers

diff --git a/lang/en/valiadtion.php → resources/lang/en/valiadtion.php b/lang/en/valiadtion.php → resources/lang/en/valiadtion.php
@@ -163,8 +163,8 @@
     */
 
     'custom' => [
-        'attribute-name' => [
-            'rule-name' => 'custom-message',
+        'db_name' => [
+            'regex' => 'The :attribute must only contain letters, numbers, and underscores.',
         ],
     ],
 
@@ -179,6 +179,8 @@
     |
     */
 
-    'attributes' => [],
+    'attributes' => [
+        'db_name' => 'FORGE_DB_NAME'
+    ],
 
 ];