mirror of
https://github.com/coollabsio/coolify.git
synced 2026-11-15 09:12:32 -04:00
Andras BacsaiandClaude Opus 5.5
6c270a42db
A normal delete now removes a resource from Coolify also when its server is not reachable, so the separate option only left untracked containers running. The danger zone button is gone, and the services API rejects delete_from_coolify_only with 422 instead of ignoring it, so old clients do not delete Docker resources they asked to keep. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
75 lines
2.7 KiB
PHP
75 lines
2.7 KiB
PHP
<?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', 'deploy']);
|
|
$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('delete from coolify only is rejected and deletes nothing', function () {
|
|
$this->withToken($this->bearerToken)
|
|
->deleteJson("/api/v1/services/{$this->service->uuid}?delete_from_coolify_only=true")
|
|
->assertUnprocessable();
|
|
|
|
expect(Service::find($this->service->id))->not->toBeNull();
|
|
Queue::assertNotPushed(DeleteResourceJob::class);
|
|
});
|
|
|
|
test('delete queues a full deletion whether the server is reachable or not', function (bool $serverReachable) {
|
|
setServiceDeleteServerReachable($this->server, $serverReachable);
|
|
|
|
$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);
|
|
})->with([
|
|
'reachable server' => [true],
|
|
'unreachable server' => [false],
|
|
]);
|