-
-
-
-
- {allocation.alias ? (
-
-
- {allocation.alias}
-
-
- ) : (
-
- {ip(allocation.ip)}
-
- )}
- {allocation.alias ? 'Hostname' : 'IP Address'}
-
-
- {allocation.port}
- Port
-
-
-
-
- A brief description of this server.
- {{ $server->name }}Additional actions to control this server.
-
- Admin Servers {{ $server->name }} Manage
-
-@endsection
-
-@section('content')
- @include('admin.servers.partials.navigation')
-
-
-
-
-
-
This will reinstall the server with the assigned egg scripts. Danger! This could overwrite server data.
-
-
-
-
-
-
-
-
-
If you need to change the install status from uninstalled to installed, or vice versa, you may do so with the button below.
-
-
-
-
-
- @if(! $server->isSuspended())
-
-
-
-
-
This will suspend the server, stop any running processes, and immediately block the user from being able to access their files or otherwise manage the server through the panel or API.
-
-
-
-
- @else
-
-
-
-
-
This will unsuspend the server and restore normal user access.
-
-
-
-
- @endif
-
- @if(is_null($server->transfer))
-
-
-
-
-
- Transfer this server to another node connected to this panel.
- Warning! This feature has not been fully tested and may have bugs.
-
-
-
-
-
-
- @else
-
-
-
-
-
- This server is currently being transferred to another node.
- Transfer was initiated at {{ $server->transfer->created_at }}
-
-
-
-
-
-
- @endif
-
- @switch($node->systemInformation()['version'] ?? 'false')
+ @switch($version = $node->systemInformation()['version'] ?? 'false')
@case('false')
true])
/>
@@ -10,6 +11,7 @@
@default
true])
@style([\Filament\Support\get_color_css_variables('success', shades: [400, 500], alias: 'tables::columns.icon-column.item') => true])
/>
diff --git a/routes/admin.php b/routes/admin.php
index 60d047e01f..ffac12d882 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -117,21 +117,14 @@
Route::get('/view/{node:id}', [Admin\Nodes\NodeViewController::class, 'index'])->name('admin.nodes.view');
Route::get('/view/{node:id}/settings', [Admin\Nodes\NodeViewController::class, 'settings'])->name('admin.nodes.view.settings');
Route::get('/view/{node:id}/configuration', [Admin\Nodes\NodeViewController::class, 'configuration'])->name('admin.nodes.view.configuration');
- Route::get('/view/{node:id}/allocation', [Admin\Nodes\NodeViewController::class, 'allocations'])->name('admin.nodes.view.allocation');
Route::get('/view/{node:id}/servers', [Admin\Nodes\NodeViewController::class, 'servers'])->name('admin.nodes.view.servers');
Route::get('/view/{node:id}/system-information', Admin\Nodes\SystemInformationController::class);
- Route::post('/new', [Admin\NodesController::class, 'store']);
- Route::post('/view/{node:id}/allocation', [Admin\NodesController::class, 'createAllocation']);
- Route::post('/view/{node:id}/allocation/remove', [Admin\NodesController::class, 'allocationRemoveBlock'])->name('admin.nodes.view.allocation.removeBlock');
- Route::post('/view/{node:id}/allocation/alias', [Admin\NodesController::class, 'allocationSetAlias'])->name('admin.nodes.view.allocation.setAlias');
Route::post('/view/{node:id}/settings/token', Admin\NodeAutoDeployController::class)->name('admin.nodes.view.configuration.token');
Route::patch('/view/{node:id}/settings', [Admin\NodesController::class, 'updateSettings']);
Route::delete('/view/{node:id}/delete', [Admin\NodesController::class, 'delete'])->name('admin.nodes.view.delete');
- Route::delete('/view/{node:id}/allocation/remove/{allocation:id}', [Admin\NodesController::class, 'allocationRemoveSingle'])->name('admin.nodes.view.allocation.removeSingle');
- Route::delete('/view/{node:id}/allocations', [Admin\NodesController::class, 'allocationRemoveMultiple'])->name('admin.nodes.view.allocation.removeMultiple');
});
/*
diff --git a/routes/api-application.php b/routes/api-application.php
index 1d7b8b8bef..bd3881f467 100644
--- a/routes/api-application.php
+++ b/routes/api-application.php
@@ -43,12 +43,6 @@
Route::patch('/{node:id}', [Application\Nodes\NodeController::class, 'update']);
Route::delete('/{node:id}', [Application\Nodes\NodeController::class, 'delete']);
-
- Route::prefix('/{node:id}/allocations')->group(function () {
- Route::get('/', [Application\Nodes\AllocationController::class, 'index'])->name('api.application.allocations');
- Route::post('/', [Application\Nodes\AllocationController::class, 'store']);
- Route::delete('/{allocation:id}', [Application\Nodes\AllocationController::class, 'delete'])->name('api.application.allocations.view');
- });
});
/*
@@ -75,7 +69,6 @@
Route::post('/{server:id}/transfer', [Application\Servers\ServerManagementController::class, 'startTransfer'])->name('api.application.servers.transfer');
Route::post('/{server:id}/transfer/cancel', [Application\Servers\ServerManagementController::class, 'cancelTransfer'])->name('api.application.servers.transfer.cancel');
- Route::delete('/{server:id}', [Application\Servers\ServerController::class, 'delete']);
Route::delete('/{server:id}/{force?}', [Application\Servers\ServerController::class, 'delete']);
// Database Management Endpoint
diff --git a/routes/api-client.php b/routes/api-client.php
index ed1190af64..7da1ecfa68 100644
--- a/routes/api-client.php
+++ b/routes/api-client.php
@@ -96,14 +96,6 @@
Route::delete('/{schedule}/tasks/{task}', [Client\Servers\ScheduleTaskController::class, 'delete']);
});
- Route::prefix('/network')->group(function () {
- Route::get('/allocations', [Client\Servers\NetworkAllocationController::class, 'index']);
- Route::post('/allocations', [Client\Servers\NetworkAllocationController::class, 'store']);
- Route::post('/allocations/{allocation}', [Client\Servers\NetworkAllocationController::class, 'update']);
- Route::post('/allocations/{allocation}/primary', [Client\Servers\NetworkAllocationController::class, 'setPrimary']);
- Route::delete('/allocations/{allocation}', [Client\Servers\NetworkAllocationController::class, 'delete']);
- });
-
Route::prefix('/users')->group(function () {
Route::get('/', [Client\Servers\SubuserController::class, 'index']);
Route::post('/', [Client\Servers\SubuserController::class, 'store']);
diff --git a/tests/Integration/Api/Client/ClientApiIntegrationTestCase.php b/tests/Integration/Api/Client/ClientApiIntegrationTestCase.php
index d6dee00da0..cc98921a75 100644
--- a/tests/Integration/Api/Client/ClientApiIntegrationTestCase.php
+++ b/tests/Integration/Api/Client/ClientApiIntegrationTestCase.php
@@ -11,9 +11,7 @@
use App\Models\Database;
use App\Models\Schedule;
use Illuminate\Support\Collection;
-use App\Models\Allocation;
use App\Models\DatabaseHost;
-use App\Tests\Integration\TestResponse;
use App\Tests\Integration\IntegrationTestCase;
use Illuminate\Database\Eloquent\Model as EloquentModel;
use App\Transformers\Api\Client\BaseClientTransformer;
@@ -59,9 +57,6 @@ protected function link(mixed $model, ?string $append = null): string
case Task::class:
$link = "/api/client/servers/{$model->schedule->server->uuid}/schedules/{$model->schedule->id}/tasks/$model->id";
break;
- case Allocation::class:
- $link = "/api/client/servers/{$model->server->uuid}/network/allocations/$model->id";
- break;
case Backup::class:
$link = "/api/client/servers/{$model->server->uuid}/backups/$model->uuid";
break;
diff --git a/tests/Integration/Api/Client/ClientControllerTest.php b/tests/Integration/Api/Client/ClientControllerTest.php
index e4059f6947..0975e68a79 100644
--- a/tests/Integration/Api/Client/ClientControllerTest.php
+++ b/tests/Integration/Api/Client/ClientControllerTest.php
@@ -2,10 +2,10 @@
namespace App\Tests\Integration\Api\Client;
+use App\Models\Objects\Endpoint;
use App\Models\User;
use App\Models\Server;
use App\Models\Subuser;
-use App\Models\Allocation;
use App\Models\Permission;
use App\Models\Role;
@@ -96,49 +96,6 @@ public function testServersAreFilteredUsingNameAndUuidInformation(): void
->assertJsonPath('data.1.attributes.identifier', $servers[2]->uuid_short);
}
- /**
- * Test that using ?filter[*]=:25565 or ?filter[*]=192.168.1.1:25565 returns only those servers
- * with the same allocation for the given user.
- */
- public function testServersAreFilteredUsingAllocationInformation(): void
- {
- /** @var \App\Models\User $user */
- /** @var \App\Models\Server $server */
- [$user, $server] = $this->generateTestAccount();
- $server2 = $this->createServerModel(['user_id' => $user->id, 'node_id' => $server->node_id]);
-
- $allocation = Allocation::factory()->create(['node_id' => $server->node_id, 'server_id' => $server->id, 'ip' => '192.168.1.1', 'port' => 25565]);
- $allocation2 = Allocation::factory()->create(['node_id' => $server->node_id, 'server_id' => $server2->id, 'ip' => '192.168.1.1', 'port' => 25570]);
-
- $server->update(['allocation_id' => $allocation->id]);
- $server2->update(['allocation_id' => $allocation2->id]);
-
- $server->refresh();
- $server2->refresh();
-
- $this->actingAs($user)->getJson('/api/client?filter[*]=192.168.1.1')
- ->assertOk()
- ->assertJsonCount(2, 'data')
- ->assertJsonPath('data.0.attributes.identifier', $server->uuid_short)
- ->assertJsonPath('data.1.attributes.identifier', $server2->uuid_short);
-
- $this->actingAs($user)->getJson('/api/client?filter[*]=192.168.1.1:25565')
- ->assertOk()
- ->assertJsonCount(1, 'data')
- ->assertJsonPath('data.0.attributes.identifier', $server->uuid_short);
-
- $this->actingAs($user)->getJson('/api/client?filter[*]=:25570')
- ->assertOk()
- ->assertJsonCount(1, 'data')
- ->assertJsonPath('data.0.attributes.identifier', $server2->uuid_short);
-
- $this->actingAs($user)->getJson('/api/client?filter[*]=:255')
- ->assertOk()
- ->assertJsonCount(2, 'data')
- ->assertJsonPath('data.0.attributes.identifier', $server->uuid_short)
- ->assertJsonPath('data.1.attributes.identifier', $server2->uuid_short);
- }
-
/**
* Test that servers where the user is a subuser are returned by default in the API call.
*/
@@ -305,20 +262,16 @@ public function testNoServersAreReturnedIfAdminFilterIsPassedByRegularUser(strin
}
/**
- * Test that a subuser without the allocation.read permission is only able to see the primary
- * allocation for the server.
+ * Test that a subuser without the allocation.read permission cannot see any ports
*/
- public function testOnlyPrimaryAllocationIsReturnedToSubuser(): void
+ public function testNoPortsAreReturnedToSubuser(): void
{
/** @var \App\Models\Server $server */
[$user, $server] = $this->generateTestAccount([Permission::ACTION_WEBSOCKET_CONNECT]);
- $server->allocation->notes = 'Test notes';
- $server->allocation->save();
-
- Allocation::factory()->times(2)->create([
- 'node_id' => $server->node_id,
- 'server_id' => $server->id,
- ]);
+ $server->ports->add(new Endpoint(1234));
+ $server->ports->add(new Endpoint(2345, '1.2.3.4'));
+ $server->ports->add(new Endpoint(3456));
+ $server->save();
$server->refresh();
$response = $this->actingAs($user)->getJson('/api/client');
@@ -327,9 +280,7 @@ public function testOnlyPrimaryAllocationIsReturnedToSubuser(): void
$response->assertJsonCount(1, 'data');
$response->assertJsonPath('data.0.attributes.server_owner', false);
$response->assertJsonPath('data.0.attributes.uuid', $server->uuid);
- $response->assertJsonCount(1, 'data.0.attributes.relationships.allocations.data');
- $response->assertJsonPath('data.0.attributes.relationships.allocations.data.0.attributes.id', $server->allocation->id);
- $response->assertJsonPath('data.0.attributes.relationships.allocations.data.0.attributes.notes', null);
+ $response->assertJsonCount(0, 'data.0.attributes.ports');
}
public static function filterTypeDataProvider(): array
diff --git a/tests/Integration/Api/Client/Server/Allocation/AllocationAuthorizationTest.php b/tests/Integration/Api/Client/Server/Allocation/AllocationAuthorizationTest.php
deleted file mode 100644
index 6cd798e165..0000000000
--- a/tests/Integration/Api/Client/Server/Allocation/AllocationAuthorizationTest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-generateTestAccount();
- // Will be a subuser of $server2.
- $server2 = $this->createServerModel();
- // And as no access to $server3.
- $server3 = $this->createServerModel();
-
- // Set the API $user as a subuser of server 2, but with no permissions
- // to do anything with the allocations for that server.
- Subuser::factory()->create(['server_id' => $server2->id, 'user_id' => $user->id]);
-
- $allocation1 = Allocation::factory()->create(['server_id' => $server1->id, 'node_id' => $server1->node_id]);
- $allocation2 = Allocation::factory()->create(['server_id' => $server2->id, 'node_id' => $server2->node_id]);
- $allocation3 = Allocation::factory()->create(['server_id' => $server3->id, 'node_id' => $server3->node_id]);
-
- // This is the only valid call for this test, accessing the allocation for the same
- // server that the API user is the owner of.
- $response = $this->actingAs($user)->json($method, $this->link($server1, '/network/allocations/' . $allocation1->id . $endpoint));
- $this->assertTrue($response->status() <= 204 || $response->status() === 400 || $response->status() === 422);
-
- // This request fails because the allocation is valid for that server but the user
- // making the request is not authorized to perform that action.
- $this->actingAs($user)->json($method, $this->link($server2, '/network/allocations/' . $allocation2->id . $endpoint))->assertForbidden();
-
- // Both of these should report a 404 error due to the allocations being linked to
- // servers that are not the same as the server in the request, or are assigned
- // to a server for which the user making the request has no access to.
- $this->actingAs($user)->json($method, $this->link($server1, '/network/allocations/' . $allocation2->id . $endpoint))->assertNotFound();
- $this->actingAs($user)->json($method, $this->link($server1, '/network/allocations/' . $allocation3->id . $endpoint))->assertNotFound();
- $this->actingAs($user)->json($method, $this->link($server2, '/network/allocations/' . $allocation3->id . $endpoint))->assertNotFound();
- $this->actingAs($user)->json($method, $this->link($server3, '/network/allocations/' . $allocation3->id . $endpoint))->assertNotFound();
- }
-
- public static function methodDataProvider(): array
- {
- return [
- ['POST', ''],
- ['DELETE', ''],
- ['POST', '/primary'],
- ];
- }
-}
diff --git a/tests/Integration/Api/Client/Server/Allocation/CreateNewAllocationTest.php b/tests/Integration/Api/Client/Server/Allocation/CreateNewAllocationTest.php
deleted file mode 100644
index 395e283a2d..0000000000
--- a/tests/Integration/Api/Client/Server/Allocation/CreateNewAllocationTest.php
+++ /dev/null
@@ -1,93 +0,0 @@
-set('panel.client_features.allocations.enabled', true);
- config()->set('panel.client_features.allocations.range_start', 5000);
- config()->set('panel.client_features.allocations.range_end', 5050);
- }
-
- /**
- * Tests that a new allocation can be properly assigned to a server.
- *
- * @dataProvider permissionDataProvider
- */
- public function testNewAllocationCanBeAssignedToServer(array $permission): void
- {
- /** @var \App\Models\Server $server */
- [$user, $server] = $this->generateTestAccount($permission);
- $server->update(['allocation_limit' => 2]);
-
- $response = $this->actingAs($user)->postJson($this->link($server, '/network/allocations'));
- $response->assertJsonPath('object', Allocation::RESOURCE_NAME);
-
- $matched = Allocation::query()->findOrFail($response->json('attributes.id'));
-
- $this->assertSame($server->id, $matched->server_id);
- $this->assertJsonTransformedWith($response->json('attributes'), $matched);
- }
-
- /**
- * Test that a user without the required permissions cannot create an allocation for
- * the server instance.
- */
- public function testAllocationCannotBeCreatedIfUserDoesNotHavePermission(): void
- {
- /** @var \App\Models\Server $server */
- [$user, $server] = $this->generateTestAccount([Permission::ACTION_ALLOCATION_UPDATE]);
- $server->update(['allocation_limit' => 2]);
-
- $this->actingAs($user)->postJson($this->link($server, '/network/allocations'))->assertForbidden();
- }
-
- /**
- * Test that an error is returned to the user if this feature is not enabled on the system.
- */
- public function testAllocationCannotBeCreatedIfNotEnabled(): void
- {
- config()->set('panel.client_features.allocations.enabled', false);
-
- /** @var \App\Models\Server $server */
- [$user, $server] = $this->generateTestAccount();
- $server->update(['allocation_limit' => 2]);
-
- $this->actingAs($user)->postJson($this->link($server, '/network/allocations'))
- ->assertStatus(Response::HTTP_BAD_REQUEST)
- ->assertJsonPath('errors.0.code', 'AutoAllocationNotEnabledException')
- ->assertJsonPath('errors.0.detail', 'Server auto-allocation is not enabled for this instance.');
- }
-
- /**
- * Test that an allocation cannot be created if the server has reached its allocation limit.
- */
- public function testAllocationCannotBeCreatedIfServerIsAtLimit(): void
- {
- /** @var \App\Models\Server $server */
- [$user, $server] = $this->generateTestAccount();
- $server->update(['allocation_limit' => 1]);
-
- $this->actingAs($user)->postJson($this->link($server, '/network/allocations'))
- ->assertStatus(Response::HTTP_BAD_REQUEST)
- ->assertJsonPath('errors.0.code', 'DisplayException')
- ->assertJsonPath('errors.0.detail', 'Cannot assign additional allocations to this server: limit has been reached.');
- }
-
- public static function permissionDataProvider(): array
- {
- return [[[Permission::ACTION_ALLOCATION_CREATE]], [[]]];
- }
-}
diff --git a/tests/Integration/Api/Client/Server/Allocation/DeleteAllocationTest.php b/tests/Integration/Api/Client/Server/Allocation/DeleteAllocationTest.php
deleted file mode 100644
index 07f101a62e..0000000000
--- a/tests/Integration/Api/Client/Server/Allocation/DeleteAllocationTest.php
+++ /dev/null
@@ -1,105 +0,0 @@
-generateTestAccount($permission);
- $server->update(['allocation_limit' => 2]);
-
- /** @var \App\Models\Allocation $allocation */
- $allocation = Allocation::factory()->create([
- 'server_id' => $server->id,
- 'node_id' => $server->node_id,
- 'notes' => 'hodor',
- ]);
-
- $this->actingAs($user)->deleteJson($this->link($allocation))->assertStatus(Response::HTTP_NO_CONTENT);
-
- $this->assertDatabaseHas('allocations', ['id' => $allocation->id, 'server_id' => null, 'notes' => null]);
- }
-
- /**
- * Test that an error is returned if the user does not have permissiont to delete an allocation.
- */
- public function testErrorIsReturnedIfUserDoesNotHavePermission(): void
- {
- /** @var \App\Models\Server $server */
- [$user, $server] = $this->generateTestAccount([Permission::ACTION_ALLOCATION_CREATE]);
-
- /** @var \App\Models\Allocation $allocation */
- $allocation = Allocation::factory()->create([
- 'server_id' => $server->id,
- 'node_id' => $server->node_id,
- 'notes' => 'hodor',
- ]);
-
- $this->actingAs($user)->deleteJson($this->link($allocation))->assertForbidden();
-
- $this->assertDatabaseHas('allocations', ['id' => $allocation->id, 'server_id' => $server->id]);
- }
-
- /**
- * Test that an allocation is not deleted if it is currently marked as the primary allocation
- * for the server.
- */
- public function testErrorIsReturnedIfAllocationIsPrimary(): void
- {
- /** @var \App\Models\Server $server */
- [$user, $server] = $this->generateTestAccount();
- $server->update(['allocation_limit' => 2]);
-
- $this->actingAs($user)->deleteJson($this->link($server->allocation))
- ->assertStatus(Response::HTTP_BAD_REQUEST)
- ->assertJsonPath('errors.0.code', 'DisplayException')
- ->assertJsonPath('errors.0.detail', 'You cannot delete the primary allocation for this server.');
- }
-
- public function testAllocationCannotBeDeletedIfServerLimitIsNotDefined(): void
- {
- [$user, $server] = $this->generateTestAccount();
-
- /** @var \App\Models\Allocation $allocation */
- $allocation = Allocation::factory()->forServer($server)->create(['notes' => 'Test notes']);
-
- $this->actingAs($user)->deleteJson($this->link($allocation))
- ->assertStatus(400)
- ->assertJsonPath('errors.0.detail', 'You cannot delete allocations for this server: no allocation limit is set.');
-
- $allocation->refresh();
- $this->assertNotNull($allocation->notes);
- $this->assertEquals($server->id, $allocation->server_id);
- }
-
- /**
- * Test that an allocation cannot be deleted if it does not belong to the server instance.
- */
- public function testErrorIsReturnedIfAllocationDoesNotBelongToServer(): void
- {
- /** @var \App\Models\Server $server */
- [$user, $server] = $this->generateTestAccount();
- [, $server2] = $this->generateTestAccount();
-
- $this->actingAs($user)->deleteJson($this->link($server2->allocation))->assertNotFound();
- $this->actingAs($user)->deleteJson($this->link($server, "/network/allocations/{$server2->allocation_id}"))->assertNotFound();
- }
-
- public static function permissionDataProvider(): array
- {
- return [[[Permission::ACTION_ALLOCATION_DELETE]], [[]]];
- }
-}
diff --git a/tests/Integration/Api/Client/Server/NetworkAllocationControllerTest.php b/tests/Integration/Api/Client/Server/NetworkAllocationControllerTest.php
deleted file mode 100644
index b1e7279eba..0000000000
--- a/tests/Integration/Api/Client/Server/NetworkAllocationControllerTest.php
+++ /dev/null
@@ -1,140 +0,0 @@
-generateTestAccount();
-
- $response = $this->actingAs($user)->getJson($this->link($server, '/network/allocations'));
-
- $response->assertOk();
- $response->assertJsonPath('object', 'list');
- $response->assertJsonCount(1, 'data');
-
- $this->assertJsonTransformedWith($response->json('data.0.attributes'), $server->allocation);
- }
-
- /**
- * Test that allocations cannot be returned without the required user permissions.
- */
- public function testServerAllocationsAreNotReturnedWithoutPermission(): void
- {
- [$user, $server] = $this->generateTestAccount();
- $user2 = User::factory()->create();
-
- $server->owner_id = $user2->id;
- $server->save();
-
- $this->actingAs($user)->getJson($this->link($server, '/network/allocations'))
- ->assertNotFound();
-
- [$user, $server] = $this->generateTestAccount([Permission::ACTION_ALLOCATION_CREATE]);
-
- $this->actingAs($user)->getJson($this->link($server, '/network/allocations'))
- ->assertForbidden();
- }
-
- /**
- * Tests that notes on an allocation can be set correctly.
- *
- * @dataProvider updatePermissionsDataProvider
- */
- public function testAllocationNotesCanBeUpdated(array $permissions): void
- {
- [$user, $server] = $this->generateTestAccount($permissions);
- $allocation = $server->allocation;
-
- $this->assertNull($allocation->notes);
-
- $this->actingAs($user)->postJson($this->link($allocation), [])
- ->assertStatus(Response::HTTP_UNPROCESSABLE_ENTITY)
- ->assertJsonPath('errors.0.meta.rule', 'present');
-
- $this->actingAs($user)->postJson($this->link($allocation), ['notes' => 'Test notes'])
- ->assertOk()
- ->assertJsonPath('object', Allocation::RESOURCE_NAME)
- ->assertJsonPath('attributes.notes', 'Test notes');
-
- $allocation = $allocation->refresh();
-
- $this->assertSame('Test notes', $allocation->notes);
-
- $this->actingAs($user)->postJson($this->link($allocation), ['notes' => null])
- ->assertOk()
- ->assertJsonPath('object', Allocation::RESOURCE_NAME)
- ->assertJsonPath('attributes.notes', null);
-
- $allocation = $allocation->refresh();
-
- $this->assertNull($allocation->notes);
- }
-
- public function testAllocationNotesCannotBeUpdatedByInvalidUsers(): void
- {
- [$user, $server] = $this->generateTestAccount();
- $user2 = User::factory()->create();
-
- $server->owner_id = $user2->id;
- $server->save();
-
- $this->actingAs($user)->postJson($this->link($server->allocation))->assertNotFound();
-
- [$user, $server] = $this->generateTestAccount([Permission::ACTION_ALLOCATION_CREATE]);
-
- $this->actingAs($user)->postJson($this->link($server->allocation))->assertForbidden();
- }
-
- /**
- * @dataProvider updatePermissionsDataProvider
- */
- public function testPrimaryAllocationCanBeModified(array $permissions): void
- {
- [$user, $server] = $this->generateTestAccount($permissions);
- $allocation = $server->allocation;
- $allocation2 = Allocation::factory()->create(['node_id' => $server->node_id, 'server_id' => $server->id]);
-
- $server->allocation_id = $allocation->id;
- $server->save();
-
- $this->actingAs($user)->postJson($this->link($allocation2, '/primary'))
- ->assertOk();
-
- $server = $server->refresh();
-
- $this->assertSame($allocation2->id, $server->allocation_id);
- }
-
- public function testPrimaryAllocationCannotBeModifiedByInvalidUser(): void
- {
- [$user, $server] = $this->generateTestAccount();
- $user2 = User::factory()->create();
-
- $server->owner_id = $user2->id;
- $server->save();
-
- $this->actingAs($user)->postJson($this->link($server->allocation, '/primary'))
- ->assertNotFound();
-
- [$user, $server] = $this->generateTestAccount([Permission::ACTION_ALLOCATION_CREATE]);
-
- $this->actingAs($user)->postJson($this->link($server->allocation, '/primary'))
- ->assertForbidden();
- }
-
- public static function updatePermissionsDataProvider(): array
- {
- return [[[]], [[Permission::ACTION_ALLOCATION_UPDATE]]];
- }
-}
diff --git a/tests/Integration/Api/Client/Server/Startup/GetStartupAndVariablesTest.php b/tests/Integration/Api/Client/Server/Startup/GetStartupAndVariablesTest.php
index 88cc6ed6f2..25f5658d2a 100644
--- a/tests/Integration/Api/Client/Server/Startup/GetStartupAndVariablesTest.php
+++ b/tests/Integration/Api/Client/Server/Startup/GetStartupAndVariablesTest.php
@@ -40,7 +40,7 @@ public function testStartupVariablesAreReturnedForServer(array $permissions): vo
$response->assertJsonPath('meta.raw_startup_command', $server->startup);
$response->assertJsonPath('object', 'list');
- $response->assertJsonCount(1, 'data');
+ $response->assertJsonMissing(['env_variable' => 'BUNGEE_VERSION']);
$response->assertJsonPath('data.0.object', EggVariable::RESOURCE_NAME);
$this->assertJsonTransformedWith($response->json('data.0.attributes'), $egg->variables[1]);
}
diff --git a/tests/Integration/Services/Allocations/FindAssignableAllocationServiceTest.php b/tests/Integration/Services/Allocations/FindAssignableAllocationServiceTest.php
deleted file mode 100644
index 382703b036..0000000000
--- a/tests/Integration/Services/Allocations/FindAssignableAllocationServiceTest.php
+++ /dev/null
@@ -1,174 +0,0 @@
-set('panel.client_features.allocations.enabled', true);
- config()->set('panel.client_features.allocations.range_start', 0);
- config()->set('panel.client_features.allocations.range_end', 0);
- }
-
- /**
- * Test that an unassigned allocation is preferred rather than creating an entirely new
- * allocation for the server.
- */
- public function testExistingAllocationIsPreferred(): void
- {
- $server = $this->createServerModel();
-
- $created = Allocation::factory()->create([
- 'node_id' => $server->node_id,
- 'ip' => $server->allocation->ip,
- ]);
-
- $response = $this->getService()->handle($server);
-
- $this->assertSame($created->id, $response->id);
- $this->assertSame($server->allocation->ip, $response->ip);
- $this->assertSame($server->node_id, $response->node_id);
- $this->assertSame($server->id, $response->server_id);
- $this->assertNotSame($server->allocation_id, $response->id);
- }
-
- /**
- * Test that a new allocation is created if there is not a free one available.
- */
- public function testNewAllocationIsCreatedIfOneIsNotFound(): void
- {
- $server = $this->createServerModel();
- config()->set('panel.client_features.allocations.range_start', 5000);
- config()->set('panel.client_features.allocations.range_end', 5005);
-
- $response = $this->getService()->handle($server);
- $this->assertSame($server->id, $response->server_id);
- $this->assertSame($server->allocation->ip, $response->ip);
- $this->assertSame($server->node_id, $response->node_id);
- $this->assertNotSame($server->allocation_id, $response->id);
- $this->assertTrue($response->port >= 5000 && $response->port <= 5005);
- }
-
- /**
- * Test that a currently assigned port is never assigned to a server.
- */
- public function testOnlyPortNotInUseIsCreated(): void
- {
- $server = $this->createServerModel();
- $server2 = $this->createServerModel(['node_id' => $server->node_id]);
-
- config()->set('panel.client_features.allocations.range_start', 5000);
- config()->set('panel.client_features.allocations.range_end', 5001);
-
- Allocation::factory()->create([
- 'server_id' => $server2->id,
- 'node_id' => $server->node_id,
- 'ip' => $server->allocation->ip,
- 'port' => 5000,
- ]);
-
- $response = $this->getService()->handle($server);
- $this->assertSame(5001, $response->port);
- }
-
- public function testExceptionIsThrownIfNoMoreAllocationsCanBeCreatedInRange(): void
- {
- $server = $this->createServerModel();
- $server2 = $this->createServerModel(['node_id' => $server->node_id]);
- config()->set('panel.client_features.allocations.range_start', 5000);
- config()->set('panel.client_features.allocations.range_end', 5005);
-
- for ($i = 5000; $i <= 5005; $i++) {
- Allocation::factory()->create([
- 'ip' => $server->allocation->ip,
- 'port' => $i,
- 'node_id' => $server->node_id,
- 'server_id' => $server2->id,
- ]);
- }
-
- $this->expectException(NoAutoAllocationSpaceAvailableException::class);
- $this->expectExceptionMessage('Cannot assign additional allocation: no more space available on node.');
-
- $this->getService()->handle($server);
- }
-
- /**
- * Test that we only auto-allocate from the current server's IP address space, and not a random
- * IP address available on that node.
- */
- public function testExceptionIsThrownIfOnlyFreePortIsOnADifferentIp(): void
- {
- $server = $this->createServerModel();
-
- Allocation::factory()->times(5)->create(['node_id' => $server->node_id]);
-
- $this->expectException(NoAutoAllocationSpaceAvailableException::class);
- $this->expectExceptionMessage('Cannot assign additional allocation: no more space available on node.');
-
- $this->getService()->handle($server);
- }
-
- public function testExceptionIsThrownIfStartOrEndRangeIsNotDefined(): void
- {
- $server = $this->createServerModel();
-
- $this->expectException(NoAutoAllocationSpaceAvailableException::class);
- $this->expectExceptionMessage('Cannot assign additional allocation: no more space available on node.');
-
- $this->getService()->handle($server);
- }
-
- public function testExceptionIsThrownIfStartOrEndRangeIsNotNumeric(): void
- {
- $server = $this->createServerModel();
- config()->set('panel.client_features.allocations.range_start', 'hodor');
- config()->set('panel.client_features.allocations.range_end', 10);
-
- try {
- $this->getService()->handle($server);
- $this->fail('This assertion should not be reached.');
- } catch (\Exception $exception) {
- $this->assertInstanceOf(\InvalidArgumentException::class, $exception);
- $this->assertSame('Expected an integerish value. Got: string', $exception->getMessage());
- }
-
- config()->set('panel.client_features.allocations.range_start', 10);
- config()->set('panel.client_features.allocations.range_end', 'hodor');
-
- try {
- $this->getService()->handle($server);
- $this->fail('This assertion should not be reached.');
- } catch (\Exception $exception) {
- $this->assertInstanceOf(\InvalidArgumentException::class, $exception);
- $this->assertSame('Expected an integerish value. Got: string', $exception->getMessage());
- }
- }
-
- public function testExceptionIsThrownIfFeatureIsNotEnabled(): void
- {
- config()->set('panel.client_features.allocations.enabled', false);
- $server = $this->createServerModel();
-
- $this->expectException(AutoAllocationNotEnabledException::class);
-
- $this->getService()->handle($server);
- }
-
- private function getService(): FindAssignableAllocationService
- {
- return $this->app->make(FindAssignableAllocationService::class);
- }
-}
diff --git a/tests/Integration/Services/Servers/BuildModificationServiceTest.php b/tests/Integration/Services/Servers/BuildModificationServiceTest.php
index 152b11039f..7b269cac83 100644
--- a/tests/Integration/Services/Servers/BuildModificationServiceTest.php
+++ b/tests/Integration/Services/Servers/BuildModificationServiceTest.php
@@ -6,9 +6,7 @@
use GuzzleHttp\Psr7\Request;
use GuzzleHttp\Psr7\Response;
use App\Models\Server;
-use App\Models\Allocation;
use GuzzleHttp\Exception\RequestException;
-use App\Exceptions\DisplayException;
use App\Tests\Integration\IntegrationTestCase;
use App\Repositories\Daemon\DaemonServerRepository;
use App\Services\Servers\BuildModificationService;
@@ -28,82 +26,12 @@ protected function setUp(): void
$this->daemonServerRepository = $this->mock(DaemonServerRepository::class);
}
- /**
- * Test that allocations can be added and removed from a server. Only the allocations on the
- * current node and belonging to this server should be modified.
- */
- public function testAllocationsCanBeModifiedForTheServer(): void
- {
- $server = $this->createServerModel();
- $server2 = $this->createServerModel();
-
- /** @var \App\Models\Allocation[] $allocations */
- $allocations = Allocation::factory()->times(4)->create(['node_id' => $server->node_id, 'notes' => 'Random notes']);
-
- $initialAllocationId = $server->allocation_id;
- $allocations[0]->update(['server_id' => $server->id, 'notes' => 'Test notes']);
-
- // Some additional test allocations for the other server, not the server we are attempting
- // to modify.
- $allocations[2]->update(['server_id' => $server2->id]);
- $allocations[3]->update(['server_id' => $server2->id]);
-
- $this->daemonServerRepository->expects('setServer->sync')->andReturnUndefined();
-
- $response = $this->getService()->handle($server, [
- // Attempt to add one new allocation, and an allocation assigned to another server. The
- // other server allocation should be ignored, and only the allocation for this server should
- // be used.
- 'add_allocations' => [$allocations[2]->id, $allocations[1]->id],
- // Remove the default server allocation, ensuring that the new allocation passed through
- // in the data becomes the default allocation.
- 'remove_allocations' => [$server->allocation_id, $allocations[0]->id, $allocations[3]->id],
- ]);
-
- $this->assertInstanceOf(Server::class, $response);
-
- // Only one allocation should exist for this server now.
- $this->assertCount(1, $response->allocations);
- $this->assertSame($allocations[1]->id, $response->allocation_id);
- $this->assertNull($response->allocation->notes);
-
- // These two allocations should not have been touched.
- $this->assertDatabaseHas('allocations', ['id' => $allocations[2]->id, 'server_id' => $server2->id]);
- $this->assertDatabaseHas('allocations', ['id' => $allocations[3]->id, 'server_id' => $server2->id]);
-
- // Both of these allocations should have been removed from the server, and have had their
- // notes properly reset.
- $this->assertDatabaseHas('allocations', ['id' => $initialAllocationId, 'server_id' => null, 'notes' => null]);
- $this->assertDatabaseHas('allocations', ['id' => $allocations[0]->id, 'server_id' => null, 'notes' => null]);
- }
-
- /**
- * Test that an exception is thrown if removing the default allocation without also assigning
- * new allocations to the server.
- */
- public function testExceptionIsThrownIfRemovingTheDefaultAllocation(): void
- {
- $server = $this->createServerModel();
- /** @var \App\Models\Allocation[] $allocations */
- $allocations = Allocation::factory()->times(4)->create(['node_id' => $server->node_id]);
-
- $allocations[0]->update(['server_id' => $server->id]);
-
- $this->expectException(DisplayException::class);
- $this->expectExceptionMessage('You are attempting to delete the default allocation for this server but there is no fallback allocation to use.');
-
- $this->getService()->handle($server, [
- 'add_allocations' => [],
- 'remove_allocations' => [$server->allocation_id, $allocations[0]->id],
- ]);
- }
-
/**
* Test that the build data for the server is properly passed along to the daemon instance so that
* the server data is updated in realtime. This test also ensures that only certain fields get updated
* for the server, and not just any arbitrary field.
*/
- public function testServerBuildDataIsProperlyUpdatedOndaemon(): void
+ public function testServerBuildDataIsProperlyUpdatedOnDaemon(): void
{
$server = $this->createServerModel();
@@ -164,91 +92,6 @@ public function testConnectionExceptionIsIgnoredWhenUpdatingServerSettings(): vo
$this->assertDatabaseHas('servers', ['id' => $response->id, 'memory' => 256, 'disk' => 10240]);
}
- /**
- * Test that no exception is thrown if we are only removing an allocation.
- */
- public function testNoExceptionIsThrownIfOnlyRemovingAllocation(): void
- {
- $server = $this->createServerModel();
- /** @var \App\Models\Allocation $allocation */
- $allocation = Allocation::factory()->create(['node_id' => $server->node_id, 'server_id' => $server->id]);
-
- $this->daemonServerRepository->expects('setServer->sync')->andReturnUndefined();
-
- $this->getService()->handle($server, [
- 'remove_allocations' => [$allocation->id],
- ]);
-
- $this->assertDatabaseHas('allocations', ['id' => $allocation->id, 'server_id' => null]);
- }
-
- /**
- * Test that allocations in both the add and remove arrays are only added, and not removed.
- * This scenario wouldn't really happen in the UI, but it is possible to perform via the API,
- * so we want to make sure that the logic being used doesn't break if the allocation exists
- * in both arrays.
- *
- * We'll default to adding the allocation in this case.
- */
- public function testAllocationInBothAddAndRemoveIsAdded(): void
- {
- $server = $this->createServerModel();
- /** @var \App\Models\Allocation $allocation */
- $allocation = Allocation::factory()->create(['node_id' => $server->node_id]);
-
- $this->daemonServerRepository->expects('setServer->sync')->andReturnUndefined();
-
- $this->getService()->handle($server, [
- 'add_allocations' => [$allocation->id],
- 'remove_allocations' => [$allocation->id],
- ]);
-
- $this->assertDatabaseHas('allocations', ['id' => $allocation->id, 'server_id' => $server->id]);
- }
-
- /**
- * Test that using the same allocation ID multiple times in the array does not cause an error.
- */
- public function testUsingSameAllocationIdMultipleTimesDoesNotError(): void
- {
- $server = $this->createServerModel();
- /** @var \App\Models\Allocation $allocation */
- $allocation = Allocation::factory()->create(['node_id' => $server->node_id, 'server_id' => $server->id]);
- /** @var \App\Models\Allocation $allocation2 */
- $allocation2 = Allocation::factory()->create(['node_id' => $server->node_id]);
-
- $this->daemonServerRepository->expects('setServer->sync')->andReturnUndefined();
-
- $this->getService()->handle($server, [
- 'add_allocations' => [$allocation2->id, $allocation2->id],
- 'remove_allocations' => [$allocation->id, $allocation->id],
- ]);
-
- $this->assertDatabaseHas('allocations', ['id' => $allocation->id, 'server_id' => null]);
- $this->assertDatabaseHas('allocations', ['id' => $allocation2->id, 'server_id' => $server->id]);
- }
-
- /**
- * Test that any changes we made to the server or allocations are rolled back if there is an
- * exception while performing any action. This is different from the connection exception
- * test which should properly ignore connection issues. We want any other type of exception
- * to properly be thrown back to the caller.
- */
- public function testThatUpdatesAreRolledBackIfExceptionIsEncountered(): void
- {
- $server = $this->createServerModel();
- /** @var \App\Models\Allocation $allocation */
- $allocation = Allocation::factory()->create(['node_id' => $server->node_id]);
-
- $this->daemonServerRepository->expects('setServer->sync')->andThrows(new DisplayException('Test'));
-
- $this->expectException(DisplayException::class);
-
- $this->getService()->handle($server, ['add_allocations' => [$allocation->id]]);
-
- $this->assertDatabaseHas('allocations', ['id' => $allocation->id, 'server_id' => null]);
- }
-
private function getService(): BuildModificationService
{
return $this->app->make(BuildModificationService::class);
diff --git a/tests/Integration/Services/Servers/ServerCreationServiceTest.php b/tests/Integration/Services/Servers/ServerCreationServiceTest.php
index c0b82a285d..7589dbe0a9 100644
--- a/tests/Integration/Services/Servers/ServerCreationServiceTest.php
+++ b/tests/Integration/Services/Servers/ServerCreationServiceTest.php
@@ -2,6 +2,7 @@
namespace App\Tests\Integration\Services\Servers;
+use App\Models\Objects\Endpoint;
use Mockery\MockInterface;
use App\Models\Egg;
use GuzzleHttp\Psr7\Request;
@@ -9,7 +10,6 @@
use App\Models\User;
use GuzzleHttp\Psr7\Response;
use App\Models\Server;
-use App\Models\Allocation;
use Illuminate\Foundation\Testing\WithFaker;
use GuzzleHttp\Exception\BadResponseException;
use Illuminate\Validation\ValidationException;
@@ -59,13 +59,8 @@ public function testServerIsCreatedWithDeploymentObject(): void
/** @var \App\Models\Node $node */
$node = Node::factory()->create();
- /** @var \App\Models\Allocation[]|\Illuminate\Database\Eloquent\Collection $allocations */
- $allocations = Allocation::factory()->times(5)->create([
- 'node_id' => $node->id,
- ]);
-
$deployment = (new DeploymentObject())->setDedicated(true)->setPorts([
- $allocations[0]->port,
+ 1234,
]);
$egg = $this->cloneEggAndVariables($this->bungeecord);
@@ -87,12 +82,12 @@ public function testServerIsCreatedWithDeploymentObject(): void
'startup' => 'java server2.jar',
'image' => 'java:8',
'egg_id' => $egg->id,
- 'allocation_additional' => [
- $allocations[4]->id,
- ],
+ 'ports' => [1234, 2345, 3456],
+ 'node_id' => $node->id,
'environment' => [
'BUNGEE_VERSION' => '123',
'SERVER_JARFILE' => 'server2.jar',
+ 'SERVER_PORT' => '1234',
],
'start_on_completion' => true,
];
@@ -104,13 +99,14 @@ public function testServerIsCreatedWithDeploymentObject(): void
'environment' => [
'BUNGEE_VERSION' => '',
'SERVER_JARFILE' => 'server2.jar',
+ 'SERVER_PORT' => '1234',
],
]), $deployment);
$this->fail('This execution pathway should not be reached.');
} catch (ValidationException $exception) {
- $this->assertCount(1, $exception->errors());
$this->assertArrayHasKey('environment.BUNGEE_VERSION', $exception->errors());
+ $this->assertArrayNotHasKey('environment.SERVER_JARFILE', $exception->errors());
$this->assertSame('The Bungeecord Version variable field is required.', $exception->errors()['environment.BUNGEE_VERSION'][0]);
}
@@ -120,23 +116,24 @@ public function testServerIsCreatedWithDeploymentObject(): void
$this->assertNotNull($response->uuid);
$this->assertSame($response->uuid_short, substr($response->uuid, 0, 8));
$this->assertSame($egg->id, $response->egg_id);
- $this->assertCount(2, $response->variables);
+ $this->assertCount(3, $response->variables);
$this->assertSame('123', $response->variables[0]->server_value);
$this->assertSame('server2.jar', $response->variables[1]->server_value);
foreach ($data as $key => $value) {
- if (in_array($key, ['allocation_additional', 'environment', 'start_on_completion'])) {
+ if (in_array($key, ['environment', 'start_on_completion'])) {
+ continue;
+ }
+
+ if ($key === 'ports') {
+ $this->assertSame($value, $response->ports->map(fn (Endpoint $endpoint) => $endpoint->port)->all());
+
continue;
}
$this->assertSame($value, $response->{$key}, "Failed asserting equality of '$key' in server response. Got: [{$response->{$key}}] Expected: [$value]");
}
- $this->assertCount(2, $response->allocations);
- $this->assertSame($response->allocation_id, $response->allocations[0]->id);
- $this->assertSame($allocations[0]->id, $response->allocations[0]->id);
- $this->assertSame($allocations[4]->id, $response->allocations[1]->id);
-
$this->assertFalse($response->isSuspended());
$this->assertFalse($response->oom_killer);
$this->assertSame(0, $response->database_limit);
@@ -156,17 +153,11 @@ public function testErrorEncounteredByDaemonCausesServerToBeDeleted(): void
/** @var \App\Models\Node $node */
$node = Node::factory()->create();
- /** @var \App\Models\Allocation $allocation */
- $allocation = Allocation::factory()->create([
- 'node_id' => $node->id,
- ]);
-
$data = [
'name' => $this->faker->name(),
'description' => $this->faker->sentence(),
'owner_id' => $user->id,
- 'allocation_id' => $allocation->id,
- 'node_id' => $allocation->node_id,
+ 'node_id' => $node->id,
'memory' => 256,
'swap' => 128,
'disk' => 100,
@@ -178,6 +169,7 @@ public function testErrorEncounteredByDaemonCausesServerToBeDeleted(): void
'environment' => [
'BUNGEE_VERSION' => '123',
'SERVER_JARFILE' => 'server2.jar',
+ 'SERVER_PORT' => '1234',
],
];
diff --git a/tests/Integration/Services/Servers/StartupModificationServiceTest.php b/tests/Integration/Services/Servers/StartupModificationServiceTest.php
index f0d2726e1f..803a98486f 100644
--- a/tests/Integration/Services/Servers/StartupModificationServiceTest.php
+++ b/tests/Integration/Services/Servers/StartupModificationServiceTest.php
@@ -29,6 +29,7 @@ public function testNonAdminCanModifyServerVariables(): void
'environment' => [
'BUNGEE_VERSION' => '$$',
'SERVER_JARFILE' => 'server.jar',
+ 'SERVER_PORT' => '1234',
],
]);
@@ -54,11 +55,12 @@ public function testNonAdminCanModifyServerVariables(): void
'environment' => [
'BUNGEE_VERSION' => '1234',
'SERVER_JARFILE' => 'test.jar',
+ 'SERVER_PORT' => '1234',
],
]);
$this->assertInstanceOf(Server::class, $result);
- $this->assertCount(2, $result->variables);
+ $this->assertCount(3, $result->variables);
$this->assertSame($server->startup, $result->startup);
$this->assertSame('1234', $result->variables[0]->server_value);
$this->assertSame('test.jar', $result->variables[1]->server_value);
@@ -125,7 +127,7 @@ public function testEnvironmentVariablesCanBeUpdatedByAdmin(): void
],
]);
- $this->assertCount(2, $response->variables);
+ $this->assertCount(3, $response->variables);
$this->assertSame('EXIST', $response->variables[0]->server_value);
$this->assertSame('test.jar', $response->variables[1]->server_value);
@@ -135,12 +137,14 @@ public function testEnvironmentVariablesCanBeUpdatedByAdmin(): void
'environment' => [
'BUNGEE_VERSION' => '1234',
'SERVER_JARFILE' => 'test.jar',
+ 'SERVER_PORT' => '1111',
],
]);
- $this->assertCount(2, $response->variables);
+ $this->assertCount(3, $response->variables);
$this->assertSame('1234', $response->variables[0]->server_value);
$this->assertSame('test.jar', $response->variables[1]->server_value);
+ $this->assertSame('1111', $response->variables[2]->server_value);
}
/**
diff --git a/tests/Integration/Services/Servers/VariableValidatorServiceTest.php b/tests/Integration/Services/Servers/VariableValidatorServiceTest.php
index 6f49b97fb2..9f70f8b0d1 100644
--- a/tests/Integration/Services/Servers/VariableValidatorServiceTest.php
+++ b/tests/Integration/Services/Servers/VariableValidatorServiceTest.php
@@ -94,25 +94,28 @@ public function testEnvironmentVariablesCanBeUpdatedAsAdmin(): void
$this->getService()->setUserLevel(User::USER_LEVEL_ADMIN)->handle($egg->id, [
'BUNGEE_VERSION' => '1.2.3',
'SERVER_JARFILE' => 'server.jar',
+ 'SERVER_PORT' => '1234',
]);
$this->fail('This statement should not be reached.');
} catch (ValidationException $exception) {
- $this->assertCount(1, $exception->errors());
$this->assertArrayHasKey('environment.BUNGEE_VERSION', $exception->errors());
}
$response = $this->getService()->setUserLevel(User::USER_LEVEL_ADMIN)->handle($egg->id, [
'BUNGEE_VERSION' => '123',
'SERVER_JARFILE' => 'server.jar',
+ 'SERVER_PORT' => '1234',
]);
$this->assertInstanceOf(Collection::class, $response);
- $this->assertCount(2, $response);
+ $this->assertCount(3, $response);
$this->assertSame('BUNGEE_VERSION', $response->get(0)->key);
$this->assertSame('123', $response->get(0)->value);
$this->assertSame('SERVER_JARFILE', $response->get(1)->key);
$this->assertSame('server.jar', $response->get(1)->value);
+ $this->assertSame('SERVER_PORT', $response->get(2)->key);
+ $this->assertSame('1234', $response->get(2)->value);
}
public function testNullableEnvironmentVariablesCanBeUsedCorrectly(): void
diff --git a/tests/Traits/Integration/CreatesTestModels.php b/tests/Traits/Integration/CreatesTestModels.php
index 0e28cb40e7..f33fc63aa4 100644
--- a/tests/Traits/Integration/CreatesTestModels.php
+++ b/tests/Traits/Integration/CreatesTestModels.php
@@ -8,7 +8,6 @@
use App\Models\User;
use App\Models\Server;
use App\Models\Subuser;
-use App\Models\Allocation;
trait CreatesTestModels
{
@@ -37,12 +36,6 @@ public function createServerModel(array $attributes = []): Server
$attributes['node_id'] = $node->id;
}
- if (!isset($attributes['allocation_id'])) {
- /** @var \App\Models\Allocation $allocation */
- $allocation = Allocation::factory()->create(['node_id' => $attributes['node_id']]);
- $attributes['allocation_id'] = $allocation->id;
- }
-
if (empty($attributes['egg_id'])) {
$egg = $this->getBungeecordEgg();
@@ -54,10 +47,8 @@ public function createServerModel(array $attributes = []): Server
/** @var \App\Models\Server $server */
$server = Server::factory()->create($attributes);
- Allocation::query()->where('id', $server->allocation_id)->update(['server_id' => $server->id]);
-
return $server->fresh([
- 'user', 'node', 'allocation', 'egg',
+ 'user', 'node', 'egg',
]);
}