GL-2368: Updated binary check for curl.

acquia · Mar 28, 2024 · 9f00e5d · 9f00e5d
1 parent 07a5789
commit 9f00e5d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/Command/CodeStudio/CodeStudioWizardCommand.php b/src/Command/CodeStudio/CodeStudioWizardCommand.php
@@ -5,7 +5,6 @@
 namespace Acquia\Cli\Command\CodeStudio;
 
 use Acquia\Cli\Command\WizardCommandBase;
-use Acquia\Cli\Exception\AcquiaCliException;
 use Acquia\Cli\Output\Checklist;
 use AcquiaCloudApi\Endpoints\Account;
 use DateTime;
@@ -124,10 +123,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $this->setGitLabCiCdVariablesForPhpProject($project, $appUuid, $cloudKey, $cloudSecret, $projectAccessTokenName, $projectAccessToken, $phpVersion);
         break;
       case "Node_project":
-        $cmdOutput = $this->localMachineHelper->executeFromCmd($curlCommand);
-        if (!$cmdOutput->isSuccessful()) {
-          throw new AcquiaCliException('Unable to execute curl command. {error_message}', ['error_message' => $cmdOutput->getErrorOutput()]);
-        }
+        $this->invokeCurlCommand($curlCommand);
         $this->setGitLabCiCdVariablesForNodeProject($project, $appUuid, $cloudKey, $cloudSecret, $projectAccessTokenName, $projectAccessToken, $nodeVersion);
         break;
     }

diff --git a/src/Command/CommandBase.php b/src/Command/CommandBase.php
@@ -1571,6 +1571,14 @@ protected function createMySqlDumpOnLocal(string $dbHost, string $dbUser, string
     return $localFilepath;
   }
 
+  protected function invokeCurlCommand(string $command, Closure $outputCallback = NULL): void {
+    $this->localMachineHelper->checkRequiredBinariesExist(['curl']);
+    $process = $this->localMachineHelper->executeFromCmd($command, $outputCallback, NULL, ($this->output->getVerbosity() > OutputInterface::VERBOSITY_NORMAL));
+    if (!$process->isSuccessful()) {
+      throw new AcquiaCliException('Unable to execute curl command. {error_message}', ['error_message' => $process->getErrorOutput()]);
+    }
+  }
+
   protected function promptOpenBrowserToCreateToken(
     InputInterface $input
   ): void {