fix: clean up the logic of the determineNetwork method

carlalexander · carlalexander · commit 56e64c8ce439 · 2021-05-09T02:26:29.000-04:00
diff --git a/src/Command/AbstractCommand.php b/src/Command/AbstractCommand.php
@@ -95,18 +95,27 @@ protected function determineCloudProvider(string $question, InputInterface $inpu
      */
     protected function determineNetwork(string $question, InputInterface $input, ConsoleOutput $output): int
     {
-        $networkIdOrName = $this->getStringArgument($input, 'network');
+        $networkIdOrName = null;
+
+        if ($input->hasArgument('network')) {
+            $networkIdOrName = $this->getStringArgument($input, 'network');
+        } elseif ($input->hasOption('network')) {
+            $networkIdOrName = $this->getStringOption($input, 'network');
+        }
+
         $networks = $this->apiClient->getTeamNetworks($this->cliConfiguration->getActiveTeamId());
 
         if (empty($networkIdOrName) && $input->isInteractive()) {
             $networkIdOrName = $output->choiceWithResourceDetails($question, $networks);
+        } elseif (empty($networkIdOrName) && !$input->isInteractive()) {
+            throw new RuntimeException('Must specify a network when running command in non-interactive mode');
+        } elseif (1 < $networks->where('name', $networkIdOrName)->count()) {
+            throw new RuntimeException(sprintf('Unable to select a network because more than one network has the name "%s"', $networkIdOrName));
         }
 
         $network = $networks->firstWhere('name', $networkIdOrName) ?? $networks->firstWhere('id', $networkIdOrName);
 
-        if (1 < $networks->where('name', $networkIdOrName)->count()) {
-            throw new RuntimeException(sprintf('Unable to select a network because more than one network has the name "%s"', $networkIdOrName));
-        } elseif (empty($network['id'])) {
+        if (empty($network['id'])) {
             throw new RuntimeException(sprintf('Unable to find a network with "%s" as the ID or name', $networkIdOrName));
         }
 
