Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow setting the backup limit via the API; closes #2535

Browse source
This commit is contained in:
Dane Everitt 2020-10-17 14:23:00 -07:00
parent 35f24e7f22
commit 5763493c6c
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
5 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Requests/Api/Application/Servers/StoreServerRequest.php
View file

@ -55,6 +55,7 @@ class StoreServerRequest extends ApplicationApiRequest
'feature_limits' => 'required|array', 'feature_limits' => 'required|array',
'feature_limits.databases' => $rules['database_limit'], 'feature_limits.databases' => $rules['database_limit'],
'feature_limits.allocations' => $rules['allocation_limit'], 'feature_limits.allocations' => $rules['allocation_limit'],
'feature_limits.backups' => $rules['backup_limit'],
// Placeholders for rules added in withValidator() function. // Placeholders for rules added in withValidator() function.
'allocation.default' => '', 'allocation.default' => '',
@ -102,6 +103,7 @@ class StoreServerRequest extends ApplicationApiRequest
'start_on_completion' => array_get($data, 'start_on_completion', false), 'start_on_completion' => array_get($data, 'start_on_completion', false),
'database_limit' => array_get($data, 'feature_limits.databases'), 'database_limit' => array_get($data, 'feature_limits.databases'),
'allocation_limit' => array_get($data, 'feature_limits.allocations'), 'allocation_limit' => array_get($data, 'feature_limits.allocations'),
'backup_limit' => array_get($data, 'feature_limits.backups'),
]; ];
} }

7
app/Http/Requests/Api/Application/Servers/UpdateServerBuildConfigurationRequest.php
View file

@ -47,6 +47,7 @@ class UpdateServerBuildConfigurationRequest extends ServerWriteRequest
'feature_limits' => 'required|array', 'feature_limits' => 'required|array',
'feature_limits.databases' => $rules['database_limit'], 'feature_limits.databases' => $rules['database_limit'],
'feature_limits.allocations' => $rules['allocation_limit'], 'feature_limits.allocations' => $rules['allocation_limit'],
'feature_limits.backups' => $rules['backup_limit'],
]; ];
} }
@ -60,8 +61,9 @@ class UpdateServerBuildConfigurationRequest extends ServerWriteRequest
$data = parent::validated(); $data = parent::validated();
$data['allocation_id'] = $data['allocation']; $data['allocation_id'] = $data['allocation'];
$data['database_limit'] = $data['feature_limits']['databases']; $data['database_limit'] = $data['feature_limits']['databases'] ?? null;
$data['allocation_limit'] = $data['feature_limits']['allocations']; $data['allocation_limit'] = $data['feature_limits']['allocations'] ?? null;
$data['backup_limit'] = $data['feature_limits']['backups'] ?? null;
unset($data['allocation'], $data['feature_limits']); unset($data['allocation'], $data['feature_limits']);
// Adjust the limits field to match what is expected by the model. // Adjust the limits field to match what is expected by the model.
@ -90,6 +92,7 @@ class UpdateServerBuildConfigurationRequest extends ServerWriteRequest
'remove_allocations.*' => 'allocation to remove', 'remove_allocations.*' => 'allocation to remove',
'feature_limits.databases' => 'Database Limit', 'feature_limits.databases' => 'Database Limit',
'feature_limits.allocations' => 'Allocation Limit', 'feature_limits.allocations' => 'Allocation Limit',
'feature_limits.backups' => 'Backup Limit',
]; ];
} }

2
app/Models/Server.php
View file

@ -122,7 +122,7 @@ class Server extends Model
'installed' => 'in:0,1,2', 'installed' => 'in:0,1,2',
'database_limit' => 'present|nullable|integer|min:0', 'database_limit' => 'present|nullable|integer|min:0',
'allocation_limit' => 'sometimes|nullable|integer|min:0', 'allocation_limit' => 'sometimes|nullable|integer|min:0',
'backup_limit' => 'present|integer|min:0', 'backup_limit' => 'present|nullable|integer|min:0',
]; ];
/** /**

6
app/Services/Servers/BuildModificationService.php
View file

@ -101,9 +101,9 @@ class BuildModificationService
'threads' => array_get($data, 'threads'), 'threads' => array_get($data, 'threads'),
'disk' => array_get($data, 'disk'), 'disk' => array_get($data, 'disk'),
'allocation_id' => array_get($data, 'allocation_id'), 'allocation_id' => array_get($data, 'allocation_id'),
'database_limit' => array_get($data, 'database_limit', 0), 'database_limit' => array_get($data, 'database_limit', 0) ?? null,
'allocation_limit' => array_get($data, 'allocation_limit', 0), 'allocation_limit' => array_get($data, 'allocation_limit', 0) ?? null,
'backup_limit' => array_get($data, 'backup_limit', 0), 'backup_limit' => array_get($data, 'backup_limit', 0) ?? null,
]); ]);
$updateData = $this->structureService->handle($server); $updateData = $this->structureService->handle($server);

6
tests/Integration/Services/Servers/ServerCreationServiceTest.php
View file

@ -144,9 +144,9 @@ class ServerCreationServiceTest extends IntegrationTestCase
$this->assertFalse($response->suspended); $this->assertFalse($response->suspended);
$this->assertTrue($response->oom_disabled); $this->assertTrue($response->oom_disabled);
$this->assertEmpty($response->database_limit); $this->assertSame(0, $response->database_limit);
$this->assertEmpty($response->allocation_limit); $this->assertSame(0, $response->allocation_limit);
$this->assertEmpty($response->backup_limit); $this->assertSame(0, $response->backup_limit);
} }
/** /**