Replace Allocations with Endpoints #395

lancepioch · 2024-06-15T09:16:34Z

Resolves #68

# Conflicts: # app/Filament/Resources/ServerResource/Pages/CreateServer.php # app/Models/Node.php

# Conflicts: # app/Filament/Resources/EggResource/RelationManagers/ServersRelationManager.php # app/Filament/Resources/NodeResource/RelationManagers/AllocationsRelationManager.php # app/Filament/Resources/NodeResource/RelationManagers/NodesRelationManager.php # app/Filament/Resources/ServerResource/Pages/CreateServer.php # app/Filament/Resources/ServerResource/Pages/ListServers.php # app/Filament/Resources/ServerResource/RelationManagers/AllocationsRelationManager.php # app/Filament/Resources/UserResource/RelationManagers/ServersRelationManager.php # app/Models/Allocation.php # app/Models/ApiKey.php # app/Models/Server.php # app/Models/User.php

# Conflicts: # app/Filament/Resources/ServerResource/Pages/CreateServer.php # app/Filament/Resources/ServerResource/Pages/EditServer.php # app/Filament/Resources/ServerResource/RelationManagers/AllocationsRelationManager.php # app/Services/Allocations/AssignmentService.php # database/Seeders/eggs/minecraft/egg-bungeecord.json # database/Seeders/eggs/minecraft/egg-forge-minecraft.json # database/Seeders/eggs/minecraft/egg-paper.json # database/Seeders/eggs/minecraft/egg-sponge-sponge-vanilla.json # database/Seeders/eggs/minecraft/egg-vanilla-minecraft.json # database/Seeders/eggs/rust/egg-rust.json # database/Seeders/eggs/source-engine/egg-counter-strike-global-offensive.json # database/Seeders/eggs/source-engine/egg-custom-source-engine-game.json # database/Seeders/eggs/source-engine/egg-garrys-mod.json # database/Seeders/eggs/source-engine/egg-insurgency.json # database/Seeders/eggs/source-engine/egg-team-fortress2.json # database/Seeders/eggs/voice-servers/egg-mumble-server.json # database/Seeders/eggs/voice-servers/egg-teamspeak3-server.json

# Conflicts: # app/Filament/Resources/NodeResource/Pages/CreateNode.php # app/Filament/Resources/NodeResource/RelationManagers/AllocationsRelationManager.php # app/Filament/Resources/NodeResource/RelationManagers/NodesRelationManager.php # app/Filament/Resources/ServerResource/Pages/CreateServer.php # app/Filament/Resources/ServerResource/Pages/EditServer.php # app/Filament/Resources/ServerResource/Pages/ListServers.php # app/Filament/Resources/ServerResource/RelationManagers/AllocationsRelationManager.php # app/Filament/Resources/UserResource/RelationManagers/ServersRelationManager.php # app/Transformers/Api/Client/ServerTransformer.php # composer.lock # config/panel.php

# Conflicts: # app/Filament/Resources/NodeResource/RelationManagers/AllocationsRelationManager.php # app/Filament/Resources/ServerResource/Pages/CreateServer.php # app/Filament/Resources/ServerResource/Pages/EditServer.php # app/Filament/Resources/ServerResource/RelationManagers/AllocationsRelationManager.php # app/Filament/Resources/UserResource/Pages/EditProfile.php # app/Models/Node.php # app/Models/Objects/DeploymentObject.php # app/Services/Allocations/AssignmentService.php # app/Services/Servers/ServerCreationService.php # app/Services/Servers/TransferServerService.php # pint.json

Boy132 · 2024-10-21T07:34:14Z

app/Filament/Resources/ServerResource/Pages/EditServer.php

+                                Forms\Components\ToggleButtons::make('condition')
+                                    ->label('Status')
+                                    ->formatStateUsing(fn (Server $server) => $server->condition)
+                                    ->options(fn ($state) => collect(array_merge(ContainerStatus::cases(), ServerState::cases()))
+                                        ->filter(fn ($condition) => $condition->value === $state)
+                                        ->mapWithKeys(fn ($state) => [$state->value => str($state->value)->replace('_', ' ')->ucwords()])
+                                    )
+                                    ->colors(collect(array_merge(ContainerStatus::cases(), ServerState::cases()))->mapWithKeys(
+                                        fn ($status) => [$status->value => $status->color()]
+                                    ))
+                                    ->icons(collect(array_merge(ContainerStatus::cases(), ServerState::cases()))->mapWithKeys(
+                                        fn ($status) => [$status->value => $status->icon()]
+                                    ))
+                                    ->columnSpan([
+                                        'default' => 2,
+                                        'sm' => 1,
+                                        'md' => 1,
+                                        'lg' => 1,
+                                    ]),
+


Status is already there:

Suggested change

Forms\Components\ToggleButtons::make('condition')

->label('Status')

->formatStateUsing(fn (Server $server) => $server->condition)

->options(fn ($state) => collect(array_merge(ContainerStatus::cases(), ServerState::cases()))

->filter(fn ($condition) => $condition->value === $state)

->mapWithKeys(fn ($state) => [$state->value => str($state->value)->replace('_', ' ')->ucwords()])

)

->colors(collect(array_merge(ContainerStatus::cases(), ServerState::cases()))->mapWithKeys(

fn ($status) => [$status->value => $status->color()]

))

->icons(collect(array_merge(ContainerStatus::cases(), ServerState::cases()))->mapWithKeys(

fn ($status) => [$status->value => $status->icon()]

))

->columnSpan([

'default' => 2,

'sm' => 1,

'md' => 1,

'lg' => 1,

]),

Boy132 · 2024-10-21T07:35:21Z

app/Filament/Resources/ServerResource/Pages/EditServer.php

+                                    ->afterStateUpdated(self::ports(...))
+                                    ->live(),
+
+                                Forms\Components\Repeater::make('portVariables')


If there are no port variables we should display a placeholder/ info text instead of just empty whiteness.

Boy132 · 2024-10-21T07:39:02Z

app/Filament/Resources/ServerResource/Pages/EditServer.php

+                                    ->afterStateUpdated(self::ports(...))
+                                    ->live(),
+
+                                Forms\Components\Repeater::make('portVariables')


If you don't select an optional port it will auto select the first port upon saving. This should not happen.

Boy132 · 2024-10-21T07:41:07Z

app/Filament/Resources/ServerResource/Pages/CreateServer.php

+                        ->columns(4)
+                        ->schema([
+
+                            Forms\Components\TagsInput::make('ports')


An optional port with no default value will get 0 as default value:

Boy132 · 2024-10-21T07:41:34Z

app/Filament/Resources/ServerResource/Pages/CreateServer.php

+                                        ->required(),
+                                ),
+
+                            Forms\Components\Select::make('ip')


What if I want multiple IPs?

Boy132 · 2024-10-21T07:43:29Z

app/Filament/Resources/ServerResource/Pages/CreateServer.php

+
+                    Wizard\Step::make('Allocation')
+                        ->label('Allocation')
+                        ->icon('tabler-transfer-in')


Suggested change

->icon('tabler-transfer-in')

->icon('tabler-network')

Boy132 · 2024-10-21T07:46:42Z

app/Filament/Resources/ServerResource/Pages/CreateServer.php

+                        ->columns(4)
+                        ->schema([
+
+                            Forms\Components\TagsInput::make('ports')


I added a port that already exists (25565). (this shouldn't be possible in the first place)
I can't set it as SERVER_PORT but QUERY_PORT is fine apparently:

Boy132 · 2024-10-21T07:59:40Z

app/Models/Objects/Endpoint.php

+            $this->port = (int) $port;
+        }
+
+        throw_unless(filter_var($this->ip, FILTER_VALIDATE_IP) !== false, new InvalidArgumentException("$this->ip is an invalid IP address"));


This will throw if you previously had allocations with 127.0.0.1 (will post error logs later)

Boy132 · 2024-10-21T08:09:38Z

app/Rules/Port.php

-            $fail('The :attribute must be greater or equal to 0.');
+        // Require minimum valid port
+        if ($value <= Endpoint::PORT_FLOOR) {
+            $fail('The :attribute must be greater than 1024.');


Suggested change

$fail('The :attribute must be greater than 1024.');

$fail('The :attribute must be greater than ' . Endpoint::PORT_FLOOR . '.');

Boy132 · 2024-10-21T08:09:55Z

app/Rules/Port.php

-            $fail('The :attribute must be less or equal to 65535.');
+        // Require maximum valid port
+        if ($value > Endpoint::PORT_CEIL) {
+            $fail('The :attribute must be less than 65535.');


Suggested change

$fail('The :attribute must be less than 65535.');

$fail('The :attribute must be less than ' . Endpoint::PORT_CEIL . '.');

Boy132 · 2024-10-21T08:14:27Z

app/Transformers/Api/Client/ServerTransformer.php

@@ -75,6 +74,7 @@ public function transform(Server $server): array
            // This field is deprecated, please use "status".
            'is_installing' => !$server->isInstalled(),
            'is_transferring' => !is_null($server->transfer),
+            'ports' => $user->can(Permission::ACTION_ALLOCATION_READ, $server) ? $server->ports : collect(),


ports should be removed if the user/ api key doesn't have permissions to read allocations/ endpoints.
Otherwise you can't distinguish if a server really has no ports or if the user just have missing permissions.

lancepioch added 30 commits June 2, 2024 01:22

This isn’t typically used for a brand new server

5b6c462

This is for the api

29f8ac6

Rearrange these

b220c58

Use public member

9c81c0c

Simplify logic

f480a27

Remove auto generated properties

4dbb550

Pint fix

71684dc

Disable this if there’s no egg

2e7c534

Add some new options for ports

bbe09ce

More updates

768a45b

WIP

dbad5ae

Better kebab names

5511758

Wip

be6f795

Skip port variables down below

81f218d

No longer reserved

b16a11c

Wip

32e96dc

Allow startup command to change with server variable

b1d7d21

Wip

beadce9

Move these

9ad113b

Merge branch 'main' into issue/68

4319f24

# Conflicts: # app/Filament/Resources/ServerResource/Pages/CreateServer.php # app/Models/Node.php

Rename translation keys

17bc3de

Remove relation managers

0895bd2

Some filament changes for ports

f5edb34

Swap this for now

510ae3c

Wip

36e2fa8

Wip

e15d515

Add tooltips for versions

30051ab

Add endpoints

4cba154

Reset these for now

405aa85

lancepioch added 17 commits July 4, 2024 13:50

Fix mappings

f2754c3

Don’t need this anymore

aff9f4e

Update Laravel framework

9ba8c1d

Use new migration logic

906d4a7

Update pint

df88d33

This is now an array

2cc4a42

Update laravel framework

97a4601

Fix double test runners

455d054

Smarter check

c2f6842

Force register the validation rule

804ff64

Fix tests

50ffaf4

Thank you merge conflict

a42cb19

This is now an array

4fa49ae

Resolve phpstan issues

3d8847a

Resolve this for now

1aa51d1

lancepioch requested review from Boy132 and notAreYouScared and removed request for Boy132 October 19, 2024 02:51

lancepioch self-assigned this Oct 20, 2024

lancepioch added 3 commits October 20, 2024 15:14

Various improvements

a2108c3

Delete allocation exceptions

4eeefab

Boy132 requested changes Oct 21, 2024

View reviewed changes

Boy132 reviewed Oct 21, 2024

View reviewed changes

RMartinOscar mentioned this pull request Oct 25, 2024

Associate Port #663

Closed

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replace Allocations with Endpoints #395

Replace Allocations with Endpoints #395

lancepioch commented Jun 15, 2024

Boy132 Oct 21, 2024

Boy132 Oct 21, 2024

Boy132 Oct 21, 2024 •

edited

Loading

Boy132 Oct 21, 2024

Boy132 Oct 21, 2024

Boy132 Oct 21, 2024

Boy132 Oct 21, 2024

Boy132 Oct 21, 2024 •

edited

Loading

Boy132 Oct 21, 2024

Boy132 Oct 21, 2024

Boy132 Oct 21, 2024

	$fail('The :attribute must be greater than 1024.');
	$fail('The :attribute must be greater than ' . Endpoint::PORT_FLOOR . '.');

	$fail('The :attribute must be less than 65535.');
	$fail('The :attribute must be less than ' . Endpoint::PORT_CEIL . '.');

Replace Allocations with Endpoints #395

Are you sure you want to change the base?

Replace Allocations with Endpoints #395

Conversation

lancepioch commented Jun 15, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Boy132 Oct 21, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Boy132 Oct 21, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Boy132 Oct 21, 2024 •

edited

Loading

Boy132 Oct 21, 2024 •

edited

Loading