fix(services): finish service cleanup when a volume cannot be removed

- Try to remove every volume and always delete the configuration directory (it holds the .env with secrets), then report the volumes that failed. - Delete volume backup schedules also when a service is removed from Coolify only. - The delete API no longer claims the server is unreachable when the caller asked to delete from Coolify only. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-14 00:33:44 -04:00 · 2026-10-02 16:00:52 +02:00
parent b98e810e3f
commit 2e2e43fddc
5 changed files with 256 additions and 31 deletions
@@ -0,0 +1,87 @@
+<?php
+
+use App\Jobs\DeleteResourceJob;
+use App\Models\Environment;
+use App\Models\InstanceSettings;
+use App\Models\Project;
+use App\Models\Server;
+use App\Models\Service;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Queue;
+use Illuminate\Support\Facades\Storage;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    Server::flushIdentityMap();
+    Storage::fake('ssh-mux');
+    Queue::fake();
+    InstanceSettings::forceCreate(['id' => 0, 'is_api_enabled' => true]);
+
+    $this->team = Team::factory()->create();
+    $this->user = User::factory()->create();
+    $this->team->members()->attach($this->user->id, ['role' => 'owner']);
+    session(['currentTeam' => $this->team]);
+    $token = $this->user->createToken('service-delete-message', ['write']);
+    $token->accessToken->forceFill(['team_id' => $this->team->id])->save();
+    $this->bearerToken = $token->plainTextToken;
+
+    $this->server = Server::factory()->create(['team_id' => $this->team->id, 'ip' => '10.20.30.40']);
+    $destination = $this->server->standaloneDockers()->firstOrFail();
+    $project = Project::factory()->create(['team_id' => $this->team->id]);
+    $environment = Environment::factory()->create(['project_id' => $project->id]);
+    $this->service = Service::factory()->create([
+        'environment_id' => $environment->id,
+        'destination_id' => $destination->id,
+        'destination_type' => $destination->getMorphClass(),
+        'server_id' => $this->server->id,
+    ]);
+});
+
+function setServiceDeleteServerReachable(Server $server, bool $reachable): void
+{
+    $server->settings->forceFill([
+        'is_reachable' => $reachable,
+        'is_usable' => $reachable,
+        'force_disabled' => false,
+    ])->save();
+    Server::flushIdentityMap();
+}
+
+test('explicit delete from coolify only does not claim the server is unreachable', function (bool $serverReachable) {
+    setServiceDeleteServerReachable($this->server, $serverReachable);
+
+    $this->withToken($this->bearerToken)
+        ->deleteJson("/api/v1/services/{$this->service->uuid}?delete_from_coolify_only=true")
+        ->assertOk()
+        ->assertJsonPath('message', 'The service will be removed from Coolify only; Docker resources will remain.');
+
+    Queue::assertPushed(DeleteResourceJob::class, fn (DeleteResourceJob $job): bool => $job->deleteFromCoolifyOnly);
+})->with([
+    'reachable server' => [true],
+    'unreachable server' => [false],
+]);
+
+test('delete on a reachable server queues a full deletion', function () {
+    setServiceDeleteServerReachable($this->server, true);
+
+    $this->withToken($this->bearerToken)
+        ->deleteJson("/api/v1/services/{$this->service->uuid}")
+        ->assertOk()
+        ->assertJsonPath('message', 'Service deletion request queued.');
+
+    Queue::assertPushed(DeleteResourceJob::class, fn (DeleteResourceJob $job): bool => ! $job->deleteFromCoolifyOnly);
+});
+
+test('delete on an unreachable server falls back to removing from coolify only', function () {
+    setServiceDeleteServerReachable($this->server, false);
+
+    $this->withToken($this->bearerToken)
+        ->deleteJson("/api/v1/services/{$this->service->uuid}")
+        ->assertOk()
+        ->assertJsonPath('message', 'Server is not reachable. The service will be removed from Coolify only; Docker resources may remain.');
+
+    Queue::assertPushed(DeleteResourceJob::class, fn (DeleteResourceJob $job): bool => $job->deleteFromCoolifyOnly);
+});
@@ -0,0 +1,94 @@
+<?php
+
+use App\Actions\Service\DeleteService;
+use App\Jobs\DeleteResourceJob;
+use App\Models\Environment;
+use App\Models\InstanceSettings;
+use App\Models\PrivateKey;
+use App\Models\Project;
+use App\Models\ScheduledVolumeBackup;
+use App\Models\Server;
+use App\Models\Service;
+use App\Models\ServiceApplication;
+use App\Models\ServiceDatabase;
+use App\Models\StandaloneDocker;
+use App\Models\Team;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Process;
+use Illuminate\Support\Facades\Queue;
+use Illuminate\Support\Facades\Storage;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    Server::flushIdentityMap();
+    InstanceSettings::unguarded(fn () => InstanceSettings::firstOrCreate(['id' => 0]));
+    Storage::fake('ssh-keys');
+    Storage::fake('ssh-mux');
+    Queue::fake();
+
+    $team = Team::factory()->create();
+    $server = Server::factory()->create(['team_id' => $team->id]);
+    $privateKey = PrivateKey::factory()->create(['team_id' => $team->id]);
+    $server->update(['private_key_id' => $privateKey->id]);
+    $server->settings()->update(['is_reachable' => true, 'is_usable' => true]);
+    $destination = StandaloneDocker::where('server_id', $server->id)->firstOrFail();
+    $project = Project::factory()->create(['team_id' => $team->id]);
+    $environment = $project->environments()->first()
+        ?? Environment::factory()->create(['project_id' => $project->id]);
+
+    $this->service = Service::factory()->create([
+        'environment_id' => $environment->id,
+        'server_id' => $server->id,
+        'destination_id' => $destination->id,
+        'destination_type' => $destination->getMorphClass(),
+    ]);
+    $this->serviceApplication = ServiceApplication::create(['service_id' => $this->service->id, 'name' => 'web', 'image' => 'nginx:alpine']);
+    $this->serviceDatabase = ServiceDatabase::create(['service_id' => $this->service->id, 'name' => 'db', 'image' => 'postgres:17-alpine']);
+    $this->inUseVolume = $this->serviceApplication->persistentStorages()->create([
+        'name' => "{$this->service->uuid}_web-data",
+        'mount_path' => '/data',
+        'host_path' => null,
+    ]);
+    $this->serviceDatabase->persistentStorages()->create([
+        'name' => "{$this->service->uuid}_db-data",
+        'mount_path' => '/var/lib/postgresql/data',
+        'host_path' => null,
+    ]);
+});
+
+it('removes the other volumes, networks and the configuration directory when one volume is in use', function () {
+    $commands = collect();
+    Process::fake(function ($process) use ($commands) {
+        $commands->push($process->command);
+        if (str_contains($process->command, "docker volume rm -f '{$this->service->uuid}_web-data'")) {
+            return Process::result(errorOutput: "Error response from daemon: remove {$this->service->uuid}_web-data: volume is in use", exitCode: 1);
+        }
+
+        return Process::result(output: '');
+    });
+
+    expect(fn () => app(DeleteService::class)->cleanupRemote($this->service, deleteVolumes: true, deleteConnectedNetworks: true, deleteConfigurations: true))
+        ->toThrow(RuntimeException::class, "{$this->service->uuid}_web-data");
+
+    $commandList = $commands->implode("\n");
+    expect($commandList)
+        ->toContain("docker volume rm -f '{$this->service->uuid}_db-data'")
+        ->toContain("docker network rm {$this->service->uuid}")
+        ->toContain('rm -rf '.$this->service->workdir());
+});
+
+it('removes volume backup schedules when a service is deleted from Coolify only', function () {
+    $backup = $this->inUseVolume->scheduledBackups()->create([
+        'team_id' => $this->service->environment->project->team_id,
+        'frequency' => 'daily',
+        'timeout' => 3600,
+    ]);
+    Process::fake();
+
+    (new DeleteResourceJob($this->service, deleteFromCoolifyOnly: true))->handle();
+
+    Process::assertNothingRan();
+    expect(ScheduledVolumeBackup::query()->find($backup->id))->toBeNull()
+        ->and(Service::withTrashed()->find($this->service->id))->toBeNull();
+});