fix: add warnings when dealing with users on a private database

carlalexander · carlalexander · commit 8d4227e61f18 · 2021-04-21T01:18:46.000-04:00
diff --git a/src/Command/Database/CreateDatabaseUserCommand.php b/src/Command/Database/CreateDatabaseUserCommand.php
@@ -43,25 +43,30 @@ protected function configure()
      */
     protected function perform(InputInterface $input, ConsoleOutput $output)
     {
-        $databaseId = $this->determineDatabaseServer('On which database server would you like to create the new database user?', $input, $output);
         $databases = [];
+        $databaseServer = $this->apiClient->getDatabaseServer($this->determineDatabaseServer('On which database server would you like to create the new database user?', $input, $output));
         $username = $this->getStringArgument($input, 'username');
 
         if (empty($username) && $input->isInteractive()) {
             $username = $output->ask('What is the username of the new database user');
         }
 
-        if (!$output->confirm('Do you want to the new user to have access to all databases?', false)) {
-            $databases = $output->multichoice('Please enter the comma-separated list of databases that you want the user to have access to', $this->apiClient->getDatabases($databaseId)->all());
+        if ($databaseServer['publicly_accessible'] && !$output->confirm('Do you want to the new user to have access to all databases?', false)) {
+            $databases = $output->multichoice('Please enter the comma-separated list of databases that you want the user to have access to', $this->apiClient->getDatabases($databaseServer['id'])->all());
         }
 
-        $user = $this->apiClient->createDatabaseUser($databaseId, $username, $databases);
+        $user = $this->apiClient->createDatabaseUser($databaseServer['id'], $username, $databases);
 
         $output->horizontalTable(
             ['Username', 'Password'],
             [[$user['username'], $user['password']]]
         );
 
         $output->info('Database user created');
+
+        if (!$databaseServer['publicly_accessible']) {
+            $output->newLine();
+            $output->warn('The database user needs to be manually created on the database server because it isn\'t public');
+        }
     }
 }
diff --git a/src/Command/Database/DeleteDatabaseUserCommand.php b/src/Command/Database/DeleteDatabaseUserCommand.php
@@ -44,9 +44,9 @@ protected function configure()
      */
     protected function perform(InputInterface $input, ConsoleOutput $output)
     {
-        $databaseId = $this->determineDatabaseServer('On which database server would you like to delete a database user?', $input, $output);
+        $databaseServer = $this->apiClient->getDatabaseServer($this->determineDatabaseServer('On which database server would you like to create the new database user?', $input, $output));
         $username = $this->getStringArgument($input, 'username');
-        $users = $this->apiClient->getDatabaseUsers($databaseId);
+        $users = $this->apiClient->getDatabaseUsers($databaseServer['id']);
 
         if ($users->isEmpty()) {
             throw new InvalidArgumentException('The database server doesn\'t have any managed database users');
@@ -64,8 +64,13 @@ protected function perform(InputInterface $input, ConsoleOutput $output)
             return;
         }
 
-        $this->apiClient->deleteDatabaseUser($databaseId, $user['id']);
+        $this->apiClient->deleteDatabaseUser($databaseServer['id'], $user['id']);
 
         $output->info('Database user deleted');
+
+        if (!$databaseServer['publicly_accessible']) {
+            $output->newLine();
+            $output->warn('The database user needs to be manually deleted on the database server because it isn\'t public');
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,9 @@ protected function configure()`
`44`	`44`	`*/`
`45`	`45`	`protected function perform(InputInterface $input, ConsoleOutput $output)`
`46`	`46`	`{`
`47`		`- $databaseId = $this->determineDatabaseServer('On which database server would you like to delete a database user?', $input, $output);`
	`47`	`+ $databaseServer = $this->apiClient->getDatabaseServer($this->determineDatabaseServer('On which database server would you like to create the new database user?', $input, $output));`
`48`	`48`	`$username = $this->getStringArgument($input, 'username');`
`49`		`- $users = $this->apiClient->getDatabaseUsers($databaseId);`
	`49`	`+ $users = $this->apiClient->getDatabaseUsers($databaseServer['id']);`
`50`	`50`
`51`	`51`	`if ($users->isEmpty()) {`
`52`	`52`	`throw new InvalidArgumentException('The database server doesn\'t have any managed database users');`
`@@ -64,8 +64,13 @@ protected function perform(InputInterface $input, ConsoleOutput $output)`
`64`	`64`	`return;`
`65`	`65`	`}`
`66`	`66`
`67`		`- $this->apiClient->deleteDatabaseUser($databaseId, $user['id']);`
	`67`	`+ $this->apiClient->deleteDatabaseUser($databaseServer['id'], $user['id']);`
`68`	`68`
`69`	`69`	`$output->info('Database user deleted');`
	`70`	`+`
	`71`	`+ if (!$databaseServer['publicly_accessible']) {`
	`72`	`+ $output->newLine();`
	`73`	`+ $output->warn('The database user needs to be manually deleted on the database server because it isn\'t public');`
	`74`	`+ }`
`70`	`75`	`}`
`71`	`76`	`}`