From 0d23b29775b0325801e9d9c0e0b768bea91ccc33 Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Tue, 18 Aug 2026 09:16:29 +0200 Subject: [PATCH] fix: honor GitHub default branches and reconcile proxy networks Use searchable repository and branch selectors, select each repository's default branch when available, and discover running container networks during proxy reconciliation. --- .../Project/New/GithubPrivateRepository.php | 10 ++-- bootstrap/helpers/proxy.php | 23 ++++---- .../forms/searchable-listbox.blade.php | 2 +- .../new/github-private-repository.blade.php | 8 +-- tests/Feature/GithubPrivateRepositoryTest.php | 48 +++++++++++++++-- .../RuntimeNetworkReconciliationTest.php | 53 +++++++++++++++++++ .../SearchableListboxComponentTest.php | 1 + 7 files changed, 123 insertions(+), 22 deletions(-) create mode 100644 tests/Feature/Proxy/RuntimeNetworkReconciliationTest.php diff --git a/app/Livewire/Project/New/GithubPrivateRepository.php b/app/Livewire/Project/New/GithubPrivateRepository.php index 925f8d969..cef0cf6ac 100644 --- a/app/Livewire/Project/New/GithubPrivateRepository.php +++ b/app/Livewire/Project/New/GithubPrivateRepository.php @@ -134,8 +134,9 @@ public function loadRepositories(int $github_app_id): void public function loadBranches() { - $this->selected_repository_owner = $this->repositories->where('id', $this->selected_repository_id)->first()['owner']['login']; - $this->selected_repository_repo = $this->repositories->where('id', $this->selected_repository_id)->first()['name']; + $repository = $this->repositories->firstWhere('id', $this->selected_repository_id); + $this->selected_repository_owner = data_get($repository, 'owner.login'); + $this->selected_repository_repo = data_get($repository, 'name'); $this->branches = collect(); $this->page = 1; $this->loadBranchByPage(); @@ -146,7 +147,10 @@ public function loadBranches() } } $this->branches = sortBranchesByPriority($this->branches); - $this->selected_branch_name = data_get($this->branches, '0.name', 'main'); + $defaultBranch = data_get($repository, 'default_branch', 'main'); + $this->selected_branch_name = $this->branches->contains('name', $defaultBranch) + ? $defaultBranch + : data_get($this->branches, '0.name', 'main'); } protected function loadBranchByPage() diff --git a/bootstrap/helpers/proxy.php b/bootstrap/helpers/proxy.php index 699704393..31e55da33 100644 --- a/bootstrap/helpers/proxy.php +++ b/bootstrap/helpers/proxy.php @@ -107,8 +107,8 @@ function collectDockerNetworksByServer(Server $server) } function connectProxyToNetworks(Server $server) { - ['networks' => $networks] = collectDockerNetworksByServer($server); if ($server->isSwarm()) { + ['networks' => $networks] = collectDockerNetworksByServer($server); $commands = $networks->map(function ($network) { $safe = escapeshellarg($network); @@ -118,19 +118,20 @@ function connectProxyToNetworks(Server $server) "echo 'Successfully connected coolify-proxy to {$safe} network.'", ]; }); - } else { - $commands = $networks->map(function ($network) { - $safe = escapeshellarg($network); - return [ - "docker network ls --format '{{.Name}}' | grep '^{$network}$' >/dev/null || docker network create --attachable {$safe} >/dev/null", - "docker network connect {$safe} coolify-proxy >/dev/null 2>&1 || true", - "echo 'Successfully connected coolify-proxy to {$safe} network.'", - ]; - }); + return $commands->flatten(); } - return $commands->flatten(); + return collect([ + 'for network in $(docker inspect $(docker ps --filter label=coolify.managed=true --format "{{.ID}}") --format=\'{{range $network, $_ := .NetworkSettings.Networks}}{{println $network}}{{end}}\' 2>/dev/null | sort -u); do', + ' if [ -z "$network" ] || [ "$network" = "bridge" ] || [ "$network" = "host" ] || [ "$network" = "none" ] || [ "$network" = "default" ]; then', + ' continue', + ' fi', + ' if docker network inspect "$network" >/dev/null 2>&1; then', + ' docker network connect "$network" coolify-proxy >/dev/null 2>&1 || true', + ' fi', + 'done', + ]); } /** diff --git a/resources/views/components/forms/searchable-listbox.blade.php b/resources/views/components/forms/searchable-listbox.blade.php index c75a50c0b..9a7a88efd 100644 --- a/resources/views/components/forms/searchable-listbox.blade.php +++ b/resources/views/components/forms/searchable-listbox.blade.php @@ -111,7 +111,7 @@ @click.stop>
+ class="pointer-events-none absolute top-1/2 left-3 size-3 -translate-y-1/2 text-neutral-400 dark:text-fg-faint" /> @if ($repositories->isNotEmpty())
-
- assertSee('class="listbox-panel searchable-listbox-panel"', false) + ->assertSee('placeholder="Search repositories…"', false) ->assertSee('wire:loading.attr="disabled"', false) ->assertSee('wire:target="loadBranches,selected_repository_id"', false) ->assertDontSee(' 1, + 'name' => 'alpha-repo', + 'default_branch' => 'production', + 'owner' => ['login' => 'testuser'], + ]; + + fakeGithubHttp([$repository]); + Http::fake([ + 'https://api.github.com/zen' => Http::response('Keep it logically awesome.', 200, [ + 'Date' => now()->toRfc7231String(), + ]), + 'https://api.github.com/app/installations/67890/access_tokens' => Http::response([ + 'token' => 'fake-installation-token', + ], 201), + 'https://api.github.com/installation/repositories*' => Http::response([ + 'total_count' => 1, + 'repositories' => [$repository], + ], 200), + 'https://api.github.com/repos/testuser/alpha-repo/branches*' => Http::response([ + ['name' => 'main'], + ['name' => 'feature/login'], + ['name' => 'production'], + ], 200), + ]); + + Livewire::test(GithubPrivateRepository::class, ['type' => 'private-gh-app']) + ->call('loadRepositories', $this->githubApp->id) + ->call('loadBranches') + ->assertSet('selected_branch_name', 'production') + ->assertSet('branches', collect([ + ['name' => 'main'], + ['name' => 'feature/login'], + ['name' => 'production'], + ])) + ->assertSee('placeholder="Search branches…"', false); + }); + test('continue button uses the shared submit loading indicator', function () { fakeGithubHttp([ ['id' => 1, 'name' => 'alpha-repo', 'owner' => ['login' => 'testuser']], @@ -301,11 +341,11 @@ function githubPrivateRepositoryTestPrivateKeyForTeam(Team $team): PrivateKey Livewire::test(GithubPrivateRepository::class, ['type' => 'private-gh-app']) ->call('loadRepositories', $this->githubApp->id) - ->assertSee('Refresh Repository List'); + ->assertSee('Refresh'); }); test('refresh button is not visible before repositories are loaded', function () { Livewire::test(GithubPrivateRepository::class, ['type' => 'private-gh-app']) - ->assertDontSee('Refresh Repository List'); + ->assertDontSee('Refresh'); }); }); diff --git a/tests/Feature/Proxy/RuntimeNetworkReconciliationTest.php b/tests/Feature/Proxy/RuntimeNetworkReconciliationTest.php new file mode 100644 index 000000000..719455539 --- /dev/null +++ b/tests/Feature/Proxy/RuntimeNetworkReconciliationTest.php @@ -0,0 +1,53 @@ +create(); + $server = Server::factory()->create(['team_id' => $team->id]); + + $commands = connectProxyToNetworks($server)->implode("\n"); + + expect($commands) + ->toContain('docker ps --filter label=coolify.managed=true') + ->toContain('.NetworkSettings.Networks') + ->toContain('docker network inspect "$network"') + ->toContain('docker network connect "$network" coolify-proxy') + ->not->toContain('docker network create'); +}); + +it('skips Docker system networks during runtime reconciliation', function () { + $team = Team::factory()->create(); + $server = Server::factory()->create(['team_id' => $team->id]); + + $commands = connectProxyToNetworks($server)->implode("\n"); + + expect($commands) + ->toContain('"$network" = "bridge"') + ->toContain('"$network" = "host"') + ->toContain('"$network" = "none"') + ->toContain('"$network" = "default"'); +}); + +it('preserves runtime reconciliation loops for non-root SSH users', function () { + $team = Team::factory()->create(); + $server = Server::factory()->create([ + 'team_id' => $team->id, + 'user' => 'ubuntu', + ]); + + $commands = collect(parseCommandsByLineForSudo(connectProxyToNetworks($server), $server))->implode("\n"); + + expect($commands) + ->toContain('$(sudo docker ps') + ->toMatch('/sudo\s+docker inspect/') + ->toMatch('/sudo\s+docker network inspect/') + ->toMatch('/sudo\s+docker network connect/') + ->not->toContain('sudo while') + ->not->toContain('sudo done') + ->not->toContain('sudo continue'); +}); diff --git a/tests/Feature/SearchableListboxComponentTest.php b/tests/Feature/SearchableListboxComponentTest.php index a0f66d422..828e498f2 100644 --- a/tests/Feature/SearchableListboxComponentTest.php +++ b/tests/Feature/SearchableListboxComponentTest.php @@ -19,6 +19,7 @@ ->toContain('No matching timezone') ->toContain('serverTimezone-trigger') ->toContain('x-ref="search"') + ->toContain('left-3 size-3') ->toContain('get filtered()') ->toContain('searchable-listbox-panel') ->toContain('Berlin')