Make redis and ssh args consistent; allow multiple args in redis comm…

…and (#1497)
platformsh · Nov 22, 2024 · 0842554 · 0842554
1 parent 12e11ca
commit 0842554
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/Command/Service/RedisCliCommand.php b/src/Command/Service/RedisCliCommand.php
@@ -18,7 +18,7 @@ protected function configure()
         $this->setName('service:redis-cli');
         $this->setAliases(['redis']);
         $this->setDescription('Access the Redis CLI');
-        $this->addArgument('args', InputArgument::OPTIONAL, 'Arguments to add to the Redis command');
+        $this->addArgument('args', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, 'Arguments to add to the Redis command');
         Relationships::configureInput($this->getDefinition());
         Ssh::configureInput($this->getDefinition());
         $this->addProjectOption()
@@ -52,18 +52,20 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $service['port']
         );
         if ($args = $input->getArgument('args')) {
-            $redisCommand .= ' ' . $args;
+            if (count($args) === 1) {
+                $redisCommand .= ' ' . $args[0];
+            } else {
+                $redisCommand .= ' ' . implode(' ', array_map([OsUtil::class, 'escapePosixShellArg'], $args));
+            }
+        } elseif ($this->isTerminal(STDIN) && $host instanceof RemoteHost) {
+            // Force TTY output when the input is a terminal.
+            $host->setExtraSshOptions(['RequestTTY yes']);
         }
 
         $this->stdErr->writeln(
             sprintf('Connecting to Redis service via relationship <info>%s</info> on <info>%s</info>', $service['_relationship_name'], $host->getLabel())
         );
 
-        // Force TTY output when the input is a terminal.
-        if ($this->isTerminal(STDIN) && $host instanceof RemoteHost) {
-            $host->setExtraSshOptions(['RequestTTY yes']);
-        }
-
         return $host->runCommandDirect($redisCommand);
     }
 }
diff --git a/src/Service/Ssh.php b/src/Service/Ssh.php
@@ -184,7 +184,7 @@ private function getSshOptions($hostIsInternal)
      *   the command line.
      * @param string[] $extraOptions
      *   SSH options, e.g. 'RequestTTY yes'.
-     * @param string|null $remoteCommand
+     * @param string[]|string|null $remoteCommand
      *   A remote command to run on the host.
      * @param bool $omitUrl
      *   Omit the URL from the command. Use this if the URL is specified in