Merge remote-tracking branch 'origin/next' into v5-parallel-inertia-react

app/Console/Commands/SyncBunny.php

@@ -5,9 +5,12 @@ namespace App\Console\Commands;
 use Illuminate\Console\Command;
 use Illuminate\Http\Client\PendingRequest;
 use Illuminate\Http\Client\Pool;
+use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Http;
 
 use function Laravel\Prompts\confirm;
+use function Laravel\Prompts\multiselect;
+use function Laravel\Prompts\select;
 
 class SyncBunny extends Command
 {
@@ -16,7 +19,7 @@ class SyncBunny extends Command
      *
      * @var string
      */
-    protected $signature = 'sync:bunny {--templates} {--release} {--nightly}';
+    protected $signature = 'sync:bunny {--bunny}';
 
     /**
      * The console command description.
@@ -25,15 +28,234 @@ class SyncBunny extends Command
      */
     protected $description = 'Sync files to BunnyCDN';
 
+    protected function removeTemporaryDirectory(string $tmpDir): void
+    {
+        $temporaryRoot = realpath(sys_get_temp_dir());
+        $temporaryDirectory = realpath($tmpDir);
+
+        if ($temporaryRoot === false || $temporaryDirectory === false) {
+            return;
+        }
+
+        $expectedPrefix = rtrim($temporaryRoot, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.'coollabs-cdn-';
+        if (! str_starts_with($temporaryDirectory, $expectedPrefix)) {
+            return;
+        }
+
+        File::deleteDirectory($temporaryDirectory);
+    }
+
+    /**
+     * Fetch GitHub releases and sync to GitHub repository
+     */
+    private function syncReleasesToGitHubRepo(array $files, bool $nightly = false): bool
+    {
+        $this->info('Fetching releases from GitHub...');
+        try {
+            $response = Http::timeout(30)
+                ->get('https://api.github.com/repos/coollabsio/coolify/releases', [
+                    'per_page' => 30,  // Fetch more releases for better changelog
+                ]);
+
+            if (! $response->successful()) {
+                $this->error('Failed to fetch releases from GitHub: '.$response->status());
+
+                return false;
+            }
+
+            $releasesFile = tempnam(sys_get_temp_dir(), 'coolify-releases-');
+            if ($releasesFile === false || file_put_contents($releasesFile, json_encode($response->json(), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)) === false) {
+                $this->error('Failed to create temporary releases.json.');
+
+                return false;
+            }
+
+            $files[$releasesFile] = $nightly ? 'json/coolify/nightly/releases.json' : 'json/coolify/releases.json';
+
+            try {
+                return $this->syncFilesToGitHubRepo($files, $nightly);
+            } finally {
+                @unlink($releasesFile);
+            }
+        } catch (\Throwable $e) {
+            $this->error('Error syncing releases: '.$e->getMessage());
+
+            return false;
+        }
+    }
+
+    /**
+     * Sync install.sh, docker-compose, and env files to GitHub repository via PR
+     */
+    private function syncFilesToGitHubRepo(array $files, bool $nightly = false): bool
+    {
+        $envLabel = $nightly ? 'NIGHTLY' : 'PRODUCTION';
+        $this->info("Syncing $envLabel files to GitHub repository...");
+        try {
+            $timestamp = time();
+            $tmpDir = sys_get_temp_dir().'/coollabs-cdn-files-'.$timestamp;
+            $branchName = 'update-files-'.$timestamp;
+
+            // Clone the repository
+            $this->info('Cloning coollabs-cdn repository...');
+            $output = [];
+            exec('gh repo clone coollabsio/coollabs-cdn '.escapeshellarg($tmpDir).' 2>&1', $output, $returnCode);
+            if ($returnCode !== 0) {
+                $this->error('Failed to clone repository: '.implode("\n", $output));
+
+                return false;
+            }
+
+            // Create feature branch
+            $this->info('Creating feature branch...');
+            $output = [];
+            exec('cd '.escapeshellarg($tmpDir).' && git checkout -b '.escapeshellarg($branchName).' 2>&1', $output, $returnCode);
+            if ($returnCode !== 0) {
+                $this->error('Failed to create branch: '.implode("\n", $output));
+                $this->removeTemporaryDirectory($tmpDir);
+
+                return false;
+            }
+
+            // Copy each file to its target path in the CDN repo
+            $copiedFiles = [];
+            foreach ($files as $sourceFile => $targetPath) {
+                if (! file_exists($sourceFile)) {
+                    $this->warn("Source file not found, skipping: $sourceFile");
+
+                    continue;
+                }
+
+                $destPath = "$tmpDir/$targetPath";
+                $destDir = dirname($destPath);
+
+                if (! is_dir($destDir)) {
+                    if (! mkdir($destDir, 0755, true)) {
+                        $this->error("Failed to create directory: $destDir");
+                        $this->removeTemporaryDirectory($tmpDir);
+
+                        return false;
+                    }
+                }
+
+                if (copy($sourceFile, $destPath) === false) {
+                    $this->error("Failed to copy $sourceFile to $destPath");
+                    $this->removeTemporaryDirectory($tmpDir);
+
+                    return false;
+                }
+
+                $copiedFiles[] = $targetPath;
+                $this->info("Copied: $targetPath");
+            }
+
+            if (empty($copiedFiles)) {
+                $this->warn('No files were copied. Nothing to commit.');
+                $this->removeTemporaryDirectory($tmpDir);
+
+                return true;
+            }
+
+            // Stage all copied files
+            $this->info('Staging changes...');
+            $output = [];
+            $stageCmd = 'cd '.escapeshellarg($tmpDir).' && git add '.implode(' ', array_map('escapeshellarg', $copiedFiles)).' 2>&1';
+            exec($stageCmd, $output, $returnCode);
+            if ($returnCode !== 0) {
+                $this->error('Failed to stage changes: '.implode("\n", $output));
+                $this->removeTemporaryDirectory($tmpDir);
+
+                return false;
+            }
+
+            // Check for changes
+            $this->info('Checking for changes...');
+            $changedFiles = [];
+            exec('cd '.escapeshellarg($tmpDir).' && git diff --cached --name-only 2>&1', $changedFiles, $returnCode);
+            if ($returnCode !== 0) {
+                $this->error('Failed to check changed files: '.implode("\n", $changedFiles));
+                $this->removeTemporaryDirectory($tmpDir);
+
+                return false;
+            }
+
+            $changedFiles = array_values(array_filter($changedFiles));
+            if (empty($changedFiles)) {
+                $this->info('All files are already up to date. No changes to commit.');
+                $this->removeTemporaryDirectory($tmpDir);
+
+                return true;
+            }
+
+            // Commit changes
+            $commitMessage = "Update $envLabel files (install.sh, docker-compose, env) - ".date('Y-m-d H:i:s');
+            $output = [];
+            exec('cd '.escapeshellarg($tmpDir).' && git commit -m '.escapeshellarg($commitMessage).' 2>&1', $output, $returnCode);
+            if ($returnCode !== 0) {
+                $this->error('Failed to commit changes: '.implode("\n", $output));
+                $this->removeTemporaryDirectory($tmpDir);
+
+                return false;
+            }
+
+            // Push to remote
+            $this->info('Pushing branch to remote...');
+            $output = [];
+            exec('cd '.escapeshellarg($tmpDir).' && git push origin '.escapeshellarg($branchName).' 2>&1', $output, $returnCode);
+            if ($returnCode !== 0) {
+                $this->error('Failed to push branch: '.implode("\n", $output));
+                $this->removeTemporaryDirectory($tmpDir);
+
+                return false;
+            }
+
+            // Create pull request
+            $this->info('Creating pull request...');
+            $prTitle = "Update $envLabel files - ".date('Y-m-d H:i:s');
+            $fileList = implode("\n- ", $changedFiles);
+            $prBody = "Automated update of $envLabel files:\n- $fileList";
+            $prCommand = 'gh pr create --repo coollabsio/coollabs-cdn --title '.escapeshellarg($prTitle).' --body '.escapeshellarg($prBody).' --base main --head '.escapeshellarg($branchName).' 2>&1';
+            $output = [];
+            exec($prCommand, $output, $returnCode);
+
+            // Clean up
+            $this->removeTemporaryDirectory($tmpDir);
+
+            if ($returnCode !== 0) {
+                $this->error('Failed to create PR: '.implode("\n", $output));
+
+                return false;
+            }
+
+            $this->info('Pull request created successfully!');
+            if (! empty($output)) {
+                $this->info('PR URL: '.implode("\n", $output));
+            }
+            $this->info('Files synced: '.count($changedFiles));
+
+            return true;
+        } catch (\Throwable $e) {
+            $this->error('Error syncing files to GitHub: '.$e->getMessage());
+
+            return false;
+        }
+    }
+
     /**
      * Execute the console command.
      */
     public function handle()
     {
         $that = $this;
-        $only_template = $this->option('templates');
-        $only_version = $this->option('release');
-        $nightly = $this->option('nightly');
+        $only_bunny = $this->option('bunny');
+        $nightly = select(
+            label: 'Which environment would you like to sync?',
+            options: [
+                'production' => 'Production',
+                'nightly' => 'Nightly',
+            ],
+            default: 'production',
+        ) === 'nightly';
         $bunny_cdn = 'https://cdn.coollabs.io';
         $bunny_cdn_path = 'coolify';
         $bunny_cdn_storage_name = 'coolcdn';
@@ -55,6 +277,7 @@ class SyncBunny extends Command
         $upgrade_script_location = "$parent_dir/scripts/upgrade.sh";
         $upgrade_postgres_script_location = "$parent_dir/scripts/upgrade-postgres.sh";
         $production_env_location = "$parent_dir/.env.production";
+        $service_template_location = "$parent_dir/templates/$service_template";
         $versions_location = "$parent_dir/$versions";
 
         PendingRequest::macro('storage', function ($fileName) use ($that) {
@@ -93,7 +316,7 @@ class SyncBunny extends Command
                 $install_script_location = "$parent_dir/other/nightly/$install_script";
                 $versions_location = "$parent_dir/other/nightly/$versions";
             }
-            if (! $only_template && ! $only_version) {
+            if ($only_bunny) {
                 $envLabel = $nightly ? 'NIGHTLY' : 'PRODUCTION';
                 $this->info("About to sync $envLabel files to BunnyCDN.");
                 $this->newLine();
@@ -108,7 +331,7 @@ class SyncBunny extends Command
                     $install_script_location => "$bunny_cdn/$bunny_cdn_path/$install_script",
                 ];
 
-                $diffTmpDir = sys_get_temp_dir().'/coolify-cdn-diff-'.time();
+                $diffTmpDir = sys_get_temp_dir().'/coollabs-cdn-diff-'.time();
                 @mkdir($diffTmpDir, 0755, true);
                 $hasChanges = false;
 
@@ -151,7 +374,7 @@ class SyncBunny extends Command
                     }
                 }
 
-                exec('rm -rf '.escapeshellarg($diffTmpDir));
+                $this->removeTemporaryDirectory($diffTmpDir);
 
                 if (! $hasChanges) {
                     $this->newLine();
@@ -167,49 +390,55 @@ class SyncBunny extends Command
                     return;
                 }
             }
-            if ($only_template) {
-                $this->info('About to sync '.config('constants.services.file_name').' to BunnyCDN.');
-                $confirmed = confirm('Are you sure you want to sync?');
-                if (! $confirmed) {
-                    return;
-                }
-                Http::pool(fn (Pool $pool) => [
-                    $pool->storage(fileName: "$parent_dir/templates/$service_template")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$service_template"),
-                    $pool->purge("$bunny_cdn/$bunny_cdn_path/$service_template"),
-                ]);
-                $this->info('Service template uploaded & purged...');
+            if (! $only_bunny) {
+                $envLabel = $nightly ? 'NIGHTLY' : 'PRODUCTION';
+                $this->info("About to sync $envLabel releases, versions, compose, and environment files to GitHub repository.");
 
-                return;
-            } elseif ($only_version) {
                 if ($nightly) {
-                    $this->info('About to sync NIGHTLY versions.json to BunnyCDN.');
+                    $files = [
+                        $versions_location => 'json/coolify/nightly/versions.json',
+                        $compose_file_location => 'json/coolify/nightly/docker-compose.yml',
+                        $compose_file_prod_location => 'json/coolify/nightly/docker-compose.prod.yml',
+                        $production_env_location => 'json/coolify/nightly/.env.production',
+                        $install_script_location => 'json/coolify/nightly/install.sh',
+                        $upgrade_script_location => 'json/coolify/nightly/upgrade.sh',
+                        $upgrade_postgres_script_location => 'json/coolify/nightly/upgrade-postgres.sh',
+                        $service_template_location => 'json/coolify/nightly/service-templates-latest.json',
+                    ];
                 } else {
-                    $this->info('About to sync PRODUCTION versions.json to BunnyCDN.');
-                }
-                $file = file_get_contents($versions_location);
-                $json = json_decode($file, true);
-                $actual_version = data_get($json, 'coolify.v4.version');
-
-                $this->info("Version: {$actual_version}");
-                $this->info('This will:');
-                $this->info('  1. Sync versions.json to BunnyCDN');
-                $this->newLine();
-
-                $confirmed = confirm('Are you sure you want to proceed?');
-                if (! $confirmed) {
-                    return;
+                    $files = [
+                        $versions_location => 'json/coolify/versions.json',
+                        $compose_file_location => 'json/coolify/docker-compose.yml',
+                        $compose_file_prod_location => 'json/coolify/docker-compose.prod.yml',
+                        $production_env_location => 'json/coolify/.env.production',
+                        $install_script_location => 'json/coolify/install.sh',
+                        $upgrade_script_location => 'json/coolify/upgrade.sh',
+                        $upgrade_postgres_script_location => 'json/coolify/upgrade-postgres.sh',
+                        $service_template_location => 'json/coolify/service-templates-latest.json',
+                    ];
                 }
 
-                $this->info('Syncing versions.json to BunnyCDN...');
-                Http::pool(fn (Pool $pool) => [
-                    $pool->storage(fileName: $versions_location)->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$versions"),
-                    $pool->purge("$bunny_cdn/$bunny_cdn_path/$versions"),
-                ]);
-                $this->info('✓ versions.json uploaded & purged to BunnyCDN');
-                $this->newLine();
+                $releasesTarget = $nightly ? 'json/coolify/nightly/releases.json' : 'json/coolify/releases.json';
+                $options = [$releasesTarget, ...array_values($files)];
+                $selectedFiles = multiselect(
+                    label: 'Which files would you like to sync?',
+                    options: $options,
+                    default: $options,
+                    required: true,
+                    scroll: count($options),
+                );
 
-                $this->info('=== Summary ===');
-                $this->info('BunnyCDN sync: ✓ Complete');
+                $includeReleases = in_array($releasesTarget, $selectedFiles, true);
+                $files = array_filter(
+                    $files,
+                    fn (string $targetPath) => in_array($targetPath, $selectedFiles, true),
+                );
+
+                if ($includeReleases) {
+                    $this->syncReleasesToGitHubRepo($files, $nightly);
+                } else {
+                    $this->syncFilesToGitHubRepo($files, $nightly);
+                }
 
                 return;
             }
@@ -231,10 +460,6 @@ class SyncBunny extends Command
                 $pool->purge("$bunny_cdn/$bunny_cdn_path/$install_script"),
             ]);
             $this->info('All files uploaded & purged to BunnyCDN.');
-            $this->newLine();
-
-            $this->info('=== Summary ===');
-            $this->info('BunnyCDN sync: Complete');
         } catch (\Throwable $e) {
             $this->error('Error: '.$e->getMessage());
         }