fix: can only create databases for public database servers

carlalexander · carlalexander · commit 4de158607413 · 2021-04-11T14:31:16.000-04:00
diff --git a/grumphp.yml b/grumphp.yml
@@ -29,6 +29,7 @@ grumphp:
     phplint: ~
     phpmd:
       exclude:
+        - 'Command/Project/InitializeProjectCommand.php'
         - 'ApiClient.php'
         - 'activate-ymir-plugin.php'
       ruleset: ['phpmd.xml']
diff --git a/src/Command/AbstractCommand.php b/src/Command/AbstractCommand.php
@@ -22,6 +22,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Ymir\Cli\ApiClient;
 use Ymir\Cli\CliConfiguration;
+use Ymir\Cli\Command\Provider\ConnectProviderCommand;
 use Ymir\Cli\Console\ConsoleOutput;
 use Ymir\Cli\Exception\ApiClientException;
 use Ymir\Cli\Exception\CommandCancelledException;
@@ -80,6 +81,10 @@ protected function determineCloudProvider(string $question, InputInterface $inpu
             $providers = collect([$this->apiClient->getProject($this->projectConfiguration->getProjectId())->get('provider')]);
         }
 
+        if ($providers->isEmpty()) {
+            throw new RuntimeException(sprintf('There are no cloud providers connected to currently active team. You can connect to one using the "%s" command.', ConnectProviderCommand::NAME));
+        }
+
         return 1 === count($providers) ? $providers[0]['id'] : $output->choiceWithId($question, $providers);
     }
 
diff --git a/src/Command/Database/CreateDatabaseCommand.php b/src/Command/Database/CreateDatabaseCommand.php
@@ -33,7 +33,7 @@ protected function configure()
     {
         $this
             ->setName(self::NAME)
-            ->setDescription('Create a new database on a database server')
+            ->setDescription('Create a new database on a public database server')
             ->addArgument('database', InputArgument::OPTIONAL, 'The ID or name of the database server where the database will be created')
             ->addArgument('name', InputArgument::OPTIONAL, 'The username of the new database user');
     }
diff --git a/src/Command/Database/CreateDatabaseUserCommand.php b/src/Command/Database/CreateDatabaseUserCommand.php
@@ -33,7 +33,7 @@ protected function configure()
     {
         $this
             ->setName(self::NAME)
-            ->setDescription('Create a new user on a database server')
+            ->setDescription('Create a new user on a public database server')
             ->addArgument('database', InputArgument::OPTIONAL, 'The ID or name of the database server where the user will be created')
             ->addArgument('username', InputArgument::OPTIONAL, 'The username of the new database user');
     }
diff --git a/src/Command/Database/DeleteDatabaseCommand.php b/src/Command/Database/DeleteDatabaseCommand.php
@@ -33,7 +33,7 @@ protected function configure()
     {
         $this
             ->setName(self::NAME)
-            ->setDescription('Delete a database on a database server')
+            ->setDescription('Delete a database on a public database server')
             ->addArgument('database', InputArgument::OPTIONAL, 'The ID or name of the database server where the database will be deleted')
             ->addArgument('name', InputArgument::OPTIONAL, 'The username of the new database user');
     }
diff --git a/src/Command/Database/DeleteDatabaseUserCommand.php b/src/Command/Database/DeleteDatabaseUserCommand.php
@@ -34,7 +34,7 @@ protected function configure()
     {
         $this
             ->setName(self::NAME)
-            ->setDescription('Create a new user on a database')
+            ->setDescription('Create a new user on a public database')
             ->addArgument('database', InputArgument::OPTIONAL, 'The ID or name of the database server where the database user will be deleted')
             ->addArgument('username', InputArgument::OPTIONAL, 'The username of the new database user');
     }
diff --git a/src/Command/Database/ListDatabaseUsersCommand.php b/src/Command/Database/ListDatabaseUsersCommand.php
@@ -34,7 +34,7 @@ protected function configure()
     {
         $this
             ->setName(self::NAME)
-            ->setDescription('List all the managed users on a database server')
+            ->setDescription('List all the managed users on a public database server')
             ->addArgument('database', InputArgument::OPTIONAL, 'The ID or name of the database server to list users from');
     }
 
diff --git a/src/Command/Database/ListDatabasesCommand.php b/src/Command/Database/ListDatabasesCommand.php
@@ -33,7 +33,7 @@ protected function configure()
     {
         $this
             ->setName(self::NAME)
-            ->setDescription('List all the databases on a database server')
+            ->setDescription('List all the databases on a public database server')
             ->addArgument('database', InputArgument::OPTIONAL, 'The ID or name of the database server to list users from');
     }
 
diff --git a/src/Command/Project/InitializeProjectCommand.php b/src/Command/Project/InitializeProjectCommand.php
@@ -151,7 +151,7 @@ private function addEnvironmentDatabaseNodes(array $environments, ConsoleOutput
 
         if (empty($databaseServer['name'])) {
             return $environments;
-        } elseif ($output->confirm(sprintf('Would you like to create staging and production databases for your project on the "<comment>%s</comment>" database server?', $databaseServer['name']))) {
+        } elseif (!empty($databaseServer['publicly_accessible']) && $output->confirm(sprintf('Would you like to create staging and production databases for your project on the "<comment>%s</comment>" database server?', $databaseServer['name']))) {
             $databasePrefix = $output->askSlug('What database prefix would you like to use for this project?', $projectName);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ protected function configure()`
`33`	`33`	`{`
`34`	`34`	`$this`
`35`	`35`	`->setName(self::NAME)`
`36`		`- ->setDescription('Create a new database on a database server')`
	`36`	`+ ->setDescription('Create a new database on a public database server')`
`37`	`37`	`->addArgument('database', InputArgument::OPTIONAL, 'The ID or name of the database server where the database will be created')`
`38`	`38`	`->addArgument('name', InputArgument::OPTIONAL, 'The username of the new database user');`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ protected function configure()`
`34`	`34`	`{`
`35`	`35`	`$this`
`36`	`36`	`->setName(self::NAME)`
`37`		`- ->setDescription('Create a new user on a database')`
	`37`	`+ ->setDescription('Create a new user on a public database')`
`38`	`38`	`->addArgument('database', InputArgument::OPTIONAL, 'The ID or name of the database server where the database user will be deleted')`
`39`	`39`	`->addArgument('username', InputArgument::OPTIONAL, 'The username of the new database user');`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ private function addEnvironmentDatabaseNodes(array $environments, ConsoleOutput`
`151`	`151`
`152`	`152`	`if (empty($databaseServer['name'])) {`
`153`	`153`	`return $environments;`
`154`		`- } elseif ($output->confirm(sprintf('Would you like to create staging and production databases for your project on the "<comment>%s</comment>" database server?', $databaseServer['name']))) {`
	`154`	`+ } elseif (!empty($databaseServer['publicly_accessible']) && $output->confirm(sprintf('Would you like to create staging and production databases for your project on the "<comment>%s</comment>" database server?', $databaseServer['name']))) {`
`155`	`155`	`$databasePrefix = $output->askSlug('What database prefix would you like to use for this project?', $projectName);`
`156`	`156`	`}`
`157`	`157`