Discard ipAddresses cache if wings is offline + Switch to Select (#862)

* Change TextInputColumn to SelectColumn * Discard cache if wings is offline * Return 0.0.0.0 instead of an empty array * Adjustment & remove dns resolve
pelican-dev · Jan 6, 2025 · ae44584 · ae44584
1 parent 77fd54f
commit ae44584
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/app/Filament/Admin/Resources/NodeResource/RelationManagers/AllocationsRelationManager.php b/app/Filament/Admin/Resources/NodeResource/RelationManagers/AllocationsRelationManager.php
@@ -16,6 +16,7 @@
 use Filament\Tables;
 use Filament\Tables\Actions\BulkActionGroup;
 use Filament\Tables\Actions\DeleteBulkAction;
+use Filament\Tables\Columns\SelectColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Columns\TextInputColumn;
 use Filament\Tables\Table;
@@ -69,7 +70,9 @@ public function table(Table $table): Table
                 TextInputColumn::make('ip_alias')
                     ->searchable()
                     ->label('Alias'),
-                TextInputColumn::make('ip')
+                SelectColumn::make('ip')
+                    ->options(fn (Allocation $allocation) => collect($this->getOwnerRecord()->ipAddresses())->merge([$allocation->ip])->mapWithKeys(fn (string $ip) => [$ip => $ip]))
+                    ->selectablePlaceholder(false)
                     ->searchable()
                     ->label('IP'),
             ])

diff --git a/app/Models/Node.php b/app/Models/Node.php
@@ -374,24 +374,21 @@ public function ipAddresses(): array
     {
         return cache()->remember("nodes.$this->id.ips", now()->addHour(), function () {
             $ips = collect();
-            if (is_ip($this->fqdn)) {
-                $ips = $ips->push($this->fqdn);
-            } elseif ($dnsRecords = gethostbynamel($this->fqdn)) {
-                $ips = $ips->concat($dnsRecords);
-            }
 
             try {
                 $addresses = Http::daemon($this)->connectTimeout(1)->timeout(1)->get('/api/system/ips')->json();
                 $ips = $ips->concat(fluent($addresses)->get('ip_addresses'));
             } catch (Exception) {
-                // pass
+                if (is_ip($this->fqdn)) {
+                    $ips->push($this->fqdn);
+                }
             }
 
-            $ips->push('0.0.0.0');
-
             // Only IPV4
             $ips = $ips->filter(fn (string $ip) => filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false);
 
+            $ips->push('0.0.0.0');
+
             return $ips->unique()->all();
         });
     }