fix: filter out failed network and database servers

carlalexander · carlalexander · commit 5a27d6a8fa50 · 2020-12-09T01:12:23.000-05:00
diff --git a/src/Command/Database/CreateDatabaseServerCommand.php b/src/Command/Database/CreateDatabaseServerCommand.php
@@ -80,7 +80,7 @@ protected function perform(InputInterface $input, ConsoleOutput $output)
     private function determineNetwork(InputInterface $input, ConsoleOutput $output): array
     {
         $networkIdOrName = $this->getStringOption($input, 'network', true);
-        $networks = $this->apiClient->getTeamNetworks($this->cliConfiguration->getActiveTeamId())->whereNotIn('status', 'deleting');
+        $networks = $this->apiClient->getTeamNetworks($this->cliConfiguration->getActiveTeamId())->whereNotIn('status', ['deleting', 'failed']);
 
         if ($networks->isEmpty() && !$output->confirm('Your team doesn\'t have any provisioned networks to create the database server on. Would you like to create one first? <fg=default>(Answering "<comment>no</comment>" will cancel the command.)</>')) {
             throw new CommandCancelledException();
diff --git a/src/Command/Project/InitializeProjectCommand.php b/src/Command/Project/InitializeProjectCommand.php
@@ -180,7 +180,7 @@ private function addEnvironmentDatabaseNodes(array $environments, ConsoleOutput
     private function determineDatabaseServer(ConsoleOutput $output, string $region): ?array
     {
         $database = null;
-        $databases = $this->apiClient->getDatabaseServers($this->cliConfiguration->getActiveTeamId())->where('region', $region)->whereNotIn('status', 'deleting');
+        $databases = $this->apiClient->getDatabaseServers($this->cliConfiguration->getActiveTeamId())->where('region', $region)->whereNotIn('status', ['deleting', 'failed']);
 
         if (!$databases->isEmpty() && $output->confirm('Would you like to use an existing database server for this project?')) {
             $database = (string) $output->choiceWithResourceDetails('Which database server would you like to use?', $databases);

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ protected function perform(InputInterface $input, ConsoleOutput $output)`
`80`	`80`	`private function determineNetwork(InputInterface $input, ConsoleOutput $output): array`
`81`	`81`	`{`
`82`	`82`	`$networkIdOrName = $this->getStringOption($input, 'network', true);`
`83`		`- $networks = $this->apiClient->getTeamNetworks($this->cliConfiguration->getActiveTeamId())->whereNotIn('status', 'deleting');`
	`83`	`+ $networks = $this->apiClient->getTeamNetworks($this->cliConfiguration->getActiveTeamId())->whereNotIn('status', ['deleting', 'failed']);`
`84`	`84`
`85`	`85`	`if ($networks->isEmpty() && !$output->confirm('Your team doesn\'t have any provisioned networks to create the database server on. Would you like to create one first? <fg=default>(Answering "<comment>no</comment>" will cancel the command.)</>')) {`
`86`	`86`	`throw new CommandCancelledException();`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ private function addEnvironmentDatabaseNodes(array $environments, ConsoleOutput`
`180`	`180`	`private function determineDatabaseServer(ConsoleOutput $output, string $region): ?array`
`181`	`181`	`{`
`182`	`182`	`$database = null;`
`183`		`- $databases = $this->apiClient->getDatabaseServers($this->cliConfiguration->getActiveTeamId())->where('region', $region)->whereNotIn('status', 'deleting');`
	`183`	`+ $databases = $this->apiClient->getDatabaseServers($this->cliConfiguration->getActiveTeamId())->where('region', $region)->whereNotIn('status', ['deleting', 'failed']);`
`184`	`184`
`185`	`185`	`if (!$databases->isEmpty() && $output->confirm('Would you like to use an existing database server for this project?')) {`
`186`	`186`	`$database = (string) $output->choiceWithResourceDetails('Which database server would you like to use?', $databases);`