cleanup custom checks

pelican-dev · Dec 13, 2024 · aebfc48 · aebfc48
1 parent 6e15de3
commit aebfc48
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/app/Checks/NodeVersionsCheck.php b/app/Checks/NodeVersionsCheck.php
@@ -10,6 +10,8 @@
 
 class NodeVersionsCheck extends Check
 {
+    public function __construct(private SoftwareVersionService $versionService) {}
+
     public function run(): Result
     {
         $all = Node::query()->count();
@@ -21,8 +23,7 @@ public function run(): Result
             return $result;
         }
 
-        // @phpstan-ignore-next-line
-        $latestVersion = app(SoftwareVersionService::class)->latestWingsVersion();
+        $latestVersion = $this->versionService->latestWingsVersion();
 
         $outdated = Node::query()->get()
             ->filter(fn (Node $node) => !isset($node->systemInformation()['exception']) && $node->systemInformation()['version'] !== $latestVersion)
@@ -36,7 +37,7 @@ public function run(): Result
             ->shortSummary($outdated === 0 ? 'All up-to-date' : "{$outdated}/{$all} outdated");
 
         return $outdated === 0
-            ? $result->ok('All Nodes are up-to-date')
-            : $result->failed("`{$outdated}`/`{$all}` Nodes are outdated");
+            ? $result->ok('All Nodes are up-to-date.')
+            : $result->failed(':outdated/:all Nodes are outdated.');
     }
 }
diff --git a/app/Checks/PanelVersionCheck.php b/app/Checks/PanelVersionCheck.php
@@ -8,14 +8,13 @@
 
 class PanelVersionCheck extends Check
 {
+    public function __construct(private SoftwareVersionService $versionService) {}
+
     public function run(): Result
     {
-        /** @var SoftwareVersionService $versionService */
-        $versionService = app(SoftwareVersionService::class); // @phpstan-ignore-line
-
-        $isLatest = $versionService->isLatestPanel();
-        $currentVersion = $versionService->currentPanelVersion();
-        $latestVersion = $versionService->latestPanelVersion();
+        $isLatest = $this->versionService->isLatestPanel();
+        $currentVersion = $this->versionService->currentPanelVersion();
+        $latestVersion = $this->versionService->latestPanelVersion();
 
         $result = Result::make()
             ->meta([
@@ -26,7 +25,7 @@ public function run(): Result
             ->shortSummary($isLatest ? 'up-to-date' : 'outdated');
 
         return $isLatest
-            ? $result->ok('Panel is up-to-date')
-            : $result->failed("Installed version is `{$currentVersion}` but latest is `{$latestVersion}`");
+            ? $result->ok('Panel is up-to-date.')
+            : $result->failed('Installed version is `:currentVersion` but latest is `:latestVersion`.');
     }
 }