fix: use dynamic wait for establishing ssh tunnel to database server

carlalexander · carlalexander · commit 6159adcb7e64 · 2024-11-19T09:37:10.000-05:00
diff --git a/src/Command/Database/AbstractDatabaseCommand.php b/src/Command/Database/AbstractDatabaseCommand.php
@@ -13,6 +13,7 @@
 
 namespace Ymir\Cli\Command\Database;
 
+use Carbon\Carbon;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Ymir\Cli\Command\AbstractCommand;
 use Ymir\Cli\Command\Network\AddBastionHostCommand;
@@ -92,11 +93,19 @@ protected function startSshTunnel(array $databaseServer): Process
             throw new RuntimeException(sprintf('The database server network does\'t have a bastion host to connect to. You can add one to the network with the "%s" command.', AddBastionHostCommand::NAME));
         }
 
-        $tunnel = Ssh::tunnelBastionHost($network->get('bastion_host'), 3305, $databaseServer['endpoint'], 3306);
+        $bastionHost = $network->get('bastion_host');
+        $tunnel = Ssh::tunnelBastionHost($bastionHost, 3305, $databaseServer['endpoint'], 3306);
 
-        // Need to wait a bit while SSH connection opens
-        sleep(1);
+        $timeout = Carbon::now()->addSeconds(10);
 
-        return $tunnel;
+        while ($tunnel->isRunning() && Carbon::now()->lessThan($timeout)) {
+            if (str_contains($tunnel->getIncrementalErrorOutput(), sprintf('Authenticated to %s', $bastionHost['endpoint']))) {
+                return $tunnel;
+            }
+
+            usleep(100000);
+        }
+
+        throw new RuntimeException('Attempt to create a SSH tunnel to the bastion host timed out after 10 seconds');
     }
 }
diff --git a/src/Tool/Ssh.php b/src/Tool/Ssh.php
@@ -41,7 +41,7 @@ public static function tunnelBastionHost(array $bastionHost, int $localPort, str
         $filesystem->dumpFile($identityFilePath, $bastionHost['private_key']);
         $filesystem->chmod($identityFilePath, 0600);
 
-        $command = sprintf('ec2-user@%s -i %s -o LogLevel=error -L %s:%s:%s -N', $bastionHost['endpoint'], $identityFilePath, $localPort, $remoteHost, $remotePort);
+        $command = sprintf('ec2-user@%s -i %s -o LogLevel=debug -L %s:%s:%s -N', $bastionHost['endpoint'], $identityFilePath, $localPort, $remoteHost, $remotePort);
 
         $process = self::getProcess($command, $cwd, null);
         $process->start(function ($type, $buffer) use ($localPort) {
