prehistoric-systems/coolify
1
0
Fork 0
mirror of https://github.com/coollabsio/coolify.git synced 2026-03-11 08:55:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Don't delete all routes if only one domain is bad, return warnings instead. duh.

Browse source
This commit is contained in:
Iisyourdad 2026-02-27 23:55:05 -06:00
parent e1453f0e5a
commit c6e561afc8
2 changed files with 64 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Services/EdgeProxyRemoteRouteService.php
View file

@ -103,22 +103,18 @@ class EdgeProxyRemoteRouteService
foreach ($warnings as $warning) {
$this->logWarning($warning);
}
$this->deleteRouteFile($edgeProxyServer, $service->uuid);
return $warnings;
}
if (empty($routes)) {
$this->deleteRouteFile($edgeProxyServer, $service->uuid);
return [];
return $warnings;
}
$config = $this->generateTraefikConfig($service->uuid, $routes);
$this->writeRouteFile($edgeProxyServer, $service->uuid, $config);
return [];
return $warnings;
}
public function deleteService(Service $service): void

62
tests/Unit/EdgeProxyRemoteRouteServiceTest.php
View file

@ -156,6 +156,68 @@ YAML;
->and(implode("\n", $manager->calls[0]['commands']))->not->toContain('tee');
});
it('keeps valid edge routes when one domain port cannot be resolved and returns warning only for invalid domain', function () {
$manager = new class extends EdgeProxyRemoteRouteService
{
public array $calls = [];
protected function runRemoteCommands(Server $server, array $commands, bool $throwError = true): ?string
{
$this->calls[] = [
'commands' => $commands,
'throw_error' => $throwError,
];
return null;
}
};
$edgeProxyServer = Mockery::mock(Server::class)->makePartial();
$edgeProxyServer->id = 0;
$edgeProxyServer->shouldReceive('proxyType')->andReturn('TRAEFIK');
$edgeProxyServer->shouldReceive('proxyPath')->andReturn('/tmp/proxy');
$deploymentServer = Mockery::mock(Server::class)->makePartial();
$deploymentServer->id = 13;
$deploymentServer->ip = '10.8.0.18';
$deploymentServer->proxy = ['type' => 'NONE'];
$service = new Service;
$service->uuid = 'service-partial-routes';
$service->docker_compose_raw = <<<'YAML'
services:
app:
ports:
- "9010:3000"
- "9020:4000"
YAML;
$application = new ServiceApplication;
$application->name = 'app';
$application->fqdn = 'https://good.example.com:3000,https://bad.example.com:9999';
$service->setRelation('applications', collect([$application]));
$application->setRelation('service', $service);
$warnings = $manager->syncServiceWithServers($service, $edgeProxyServer, $deploymentServer);
expect($warnings)->not->toBeEmpty()
->and($warnings[0])->toContain('published host port could not be resolved')
->and($manager->calls)->toHaveCount(1);
$writeCommands = implode("\n", $manager->calls[0]['commands']);
expect($writeCommands)->toContain('/tmp/proxy/dynamic/service-remote-service-partial-routes.yaml')
->and($writeCommands)->toContain('tee')
->and($writeCommands)->not->toContain('rm -f');
preg_match("/echo '([^']+)' \\| base64 -d/", $manager->calls[0]['commands'][1], $payloadMatches);
$payload = base64_decode($payloadMatches[1]);
expect($payload)->toContain('Host(`good.example.com`)')
->and($payload)->not->toContain('Host(`bad.example.com`)')
->and($payload)->toContain('http://10.8.0.18:9010');
});
it('does not generate edge route file when remote host is missing and returns actionable warning', function () {
$manager = new class extends EdgeProxyRemoteRouteService
{