Merge pull request #180 from laravel/feat/serverless-v2

Adds Aurora Serverless v2 support

Author: nunomaduro

src/Commands/DatabaseCommand.php

@@ -107,15 +107,16 @@ protected function determineDatabaseType($public)
             return 'rds';
         }
 
-        return tap($this->option('serverless') ? 'aurora-serverless' : $this->menu('Which type of database would you like to create?', [
+        return tap($this->option('serverless') ? 'aurora-serverless-v2' : $this->menu('Which type of database would you like to create?', [
             'rds'                     => 'Fixed Size MySQL Instance 8.0 (Free Tier Eligible)',
             'rds-mysql-5.7'           => 'Fixed Size MySQL Instance 5.7 (Free Tier Eligible)',
-            'aurora-serverless'       => 'Serverless MySQL Aurora Cluster',
+            'aurora-serverless'       => 'Serverless v1 MySQL 5.7 Aurora Cluster',
+            'aurora-serverless-v2'    => 'Serverless v2 MySQL 8.0 Aurora Cluster',
             'rds-pgsql-13.4'          => 'Fixed Size PostgreSQL Instance 13.4',
             'rds-pgsql-11.10'         => 'Fixed Size PostgreSQL Instance 11.10',
             'aurora-serverless-pgsql' => 'Serverless PostgreSQL Aurora Cluster',
         ]), function ($type) use ($public) {
-            if ($type == 'aurora-serverless' && $public) {
+            if (in_array($type, ['aurora-serverless', 'aurora-serverless-v2', 'aurora-serverless-pgsql']) && $public) {
                 Helpers::abort('Aurora Serverless clusters may not be publicly accessible.');
             }
         });
@@ -133,7 +134,7 @@ protected function determineInstanceClass($type)
             return 'db.t3.micro';
         }
 
-        if ($type == 'aurora-serverless') {
+        if (in_array($type, ['aurora-serverless', 'aurora-serverless-v2'])) {
             return;
         }
 
@@ -178,7 +179,7 @@ protected function determineRdsInstanceClass()
      */
     protected function determineAllocatedStorage($type)
     {
-        if ($type == 'aurora-serverless') {
+        if (in_array($type, ['aurora-serverless', 'aurora-serverless-v2', 'aurora-serverless-pgsql'])) {
             return;
         }
 

src/Commands/DatabaseListCommand.php

@@ -36,7 +36,9 @@ public function handle()
                 $database['cloud_provider']['name'],
                 $database['name'],
                 $database['region'],
-                $database['type'] == 'aurora-serverless' ? 'Serverless' : 'Fixed Size',
+                in_array($database['type'], ['aurora-serverless', 'aurora-serverless-v2', 'aurora-serverless-pgsql'])
+                    ? 'Serverless'
+                    : 'Fixed Size',
                 $database['instance_class'],
                 $database['storage'].'GB',
                 Str::title(str_replace('_', ' ', $database['status'])),

src/Commands/DatabaseShellCommand.php

@@ -46,7 +46,7 @@ public function handle()
 
         $user = $this->findDatabaseUser($database);
 
-        if (in_array($database['type'], ['rds', 'rds-mysql-5.7', 'aurora-serverless'])) {
+        if (in_array($database['type'], ['rds', 'rds-mysql-5.7', 'aurora-serverless', 'aurora-serverless-v2'])) {
             passthru(sprintf(
                 'ssh -t ec2-user@%s -i %s -o LogLevel=error "mysql -u %s -p%s -h %s vapor"',
                 $jumpBox['endpoint'],
@@ -79,7 +79,7 @@ protected function findCompatibleJumpBox(array $database)
             return $jumpBox['network_id'] == $database['network_id'];
         });
 
-        $jumpBox = in_array($database['type'], ['rds', 'aurora-serverless'])
+        $jumpBox = in_array($database['type'], ['rds', 'aurora-serverless', 'aurora-serverless-v2'])
             ? $jumpBoxes->first()
             : $jumpBoxes->firstWhere('version', '>', 1);
 

src/Commands/DatabaseShowCommand.php

@@ -48,7 +48,7 @@ public function handle()
                 $database['cloud_provider']['name'],
                 $database['name'],
                 $database['region'],
-                $database['type'] == 'aurora-serverless' ? 'Serverless' : 'Fixed Size',
+                in_array($database['type'], ['aurora-serverless', 'aurora-serverless-v2', 'aurora-serverless-pgsql']) ? 'Serverless' : 'Fixed Size',
                 $database['instance_class'],
                 $database['storage'].'GB',
                 Str::title(str_replace('_', ' ', $database['status'])),

src/Commands/DatabaseTunnelCommand.php

@@ -70,7 +70,7 @@ protected function findCompatibleJumpBox(array $database)
             return $jumpBox['network_id'] == $database['network_id'];
         });
 
-        $jumpBox = in_array($database['type'], ['rds', 'aurora-serverless'])
+        $jumpBox = in_array($database['type'], ['rds', 'aurora-serverless', 'aurora-serverless-v2'])
             ? $jumpBoxes->first()
             : $jumpBoxes->firstWhere('version', '>', 1);
 

src/Commands/DatabaseUpgradeCommand.php

@@ -16,7 +16,8 @@ class DatabaseUpgradeCommand extends Command
     protected $databaseTypes = [
         'rds'                     => 'Fixed Size MySQL Instance 8.0 (Free Tier Eligible)',
         'rds-mysql-5.7'           => 'Fixed Size MySQL Instance 5.7 (Free Tier Eligible)',
-        'aurora-serverless'       => 'Serverless MySQL Aurora Cluster',
+        'aurora-serverless'       => 'Serverless v1 MySQL 5.7 Aurora Cluster',
+        'aurora-serverless-v2'    => 'Serverless v2 MySQL 8.0 Aurora Cluster',
         'rds-pgsql-13.4'          => 'Fixed Size PostgreSQL Instance 13.4',
         'rds-pgsql-11.10'         => 'Fixed Size PostgreSQL Instance 11.10',
         'rds-pgsql'               => 'Fixed Size PostgreSQL Instance 10.7',