banquise/pelican-panel-mirror
3
0
Fork 1
mirror of https://github.com/pelican-dev/panel.git synced 2025-05-20 07:34:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Backwards compatibility

Browse Source
This commit is contained in:
Lance Pioch 2024-05-21 22:04:12 -04:00
parent 5c33c7495a
commit b579f14f3f
4 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Api/Application/Nodes/NodeDeploymentController.php
View File

@ -27,7 +27,7 @@ class NodeDeploymentController extends ApplicationApiController
$data['disk'] ?? 0, $data['disk'] ?? 0,
$data['memory'] ?? 0, $data['memory'] ?? 0,
$data['cpu'] ?? 0, $data['cpu'] ?? 0,
$data['location_ids'] ?? $data['tags'] ?? [], $data['tags'] ?? $data['location_ids'] ?? [],
); );
return $this->fractal->collection($nodes) return $this->fractal->collection($nodes)

2
app/Http/Requests/Api/Application/Nodes/GetDeployableNodesRequest.php
View File

@ -10,6 +10,8 @@ class GetDeployableNodesRequest extends GetNodesRequest
'page' => 'integer', 'page' => 'integer',
'memory' => 'required|integer|min:0', 'memory' => 'required|integer|min:0',
'disk' => 'required|integer|min:0', 'disk' => 'required|integer|min:0',
'location_ids' => 'array',
'tags' => 'array',
]; ];
} }
} }

10
app/Http/Requests/Api/Application/Servers/StoreServerRequest.php
View File

@ -123,6 +123,15 @@ class StoreServerRequest extends ApplicationApiRequest
return !$input->deploy; return !$input->deploy;
}); });
/** @deprecated use tags instead */
$validator->sometimes('deploy.locations', 'present', function ($input) {
return $input->deploy;
});
$validator->sometimes('deploy.tags', 'present', function ($input) {
return $input->deploy;
});
$validator->sometimes('deploy.port_range', 'present', function ($input) { $validator->sometimes('deploy.port_range', 'present', function ($input) {
return $input->deploy; return $input->deploy;
}); });
@ -139,6 +148,7 @@ class StoreServerRequest extends ApplicationApiRequest
$object = new DeploymentObject(); $object = new DeploymentObject();
$object->setDedicated($this->input('deploy.dedicated_ip', false)); $object->setDedicated($this->input('deploy.dedicated_ip', false));
$object->setTags($this->input('deploy.tags', $this->input('deploy.locations', [])));
$object->setPorts($this->input('deploy.port_range', [])); $object->setPorts($this->input('deploy.port_range', []));
return $object; return $object;

15
app/Models/Objects/DeploymentObject.php
View File

@ -6,6 +6,8 @@ class DeploymentObject
{ {
private bool $dedicated = false; private bool $dedicated = false;
private array $tags = [];
private array $ports = []; private array $ports = [];
public function isDedicated(): bool public function isDedicated(): bool
@ -31,4 +33,17 @@ class DeploymentObject
return $this; return $this;
} }
public function getTags(): array
{
return $this->tags;
}
public function setTags(array $tags): self
{
$this->tags = $tags;
return $this;
}
} }