Don't allow node environments

src/Command/CommandBase.php

@@ -574,7 +574,7 @@ private function promptChooseDatabases(
     return [$environmentDatabases[$chosenDatabaseIndex]];
   }
 
-  protected function determineEnvironment(InputInterface $input, OutputInterface $output, bool $allowProduction = FALSE): array|string|EnvironmentResponse {
+  protected function determineEnvironment(InputInterface $input, OutputInterface $output, bool $allowProduction = FALSE, bool $allowNode = TRUE): array|string|EnvironmentResponse {
     if ($input->getArgument('environmentId')) {
       $environmentId = $input->getArgument('environmentId');
       $chosenEnvironment = $this->getCloudEnvironment($environmentId);
@@ -584,20 +584,22 @@ protected function determineEnvironment(InputInterface $input, OutputInterface $
       $cloudApplication = $this->getCloudApplication($cloudApplicationUuid);
       $output->writeln('Using Cloud Application <options=bold>' . $cloudApplication->name . '</>');
       $acquiaCloudClient = $this->cloudApiClientService->getClient();
-      $chosenEnvironment = $this->promptChooseEnvironmentConsiderProd($acquiaCloudClient, $cloudApplicationUuid, $allowProduction);
+      $chosenEnvironment = $this->promptChooseEnvironmentConsiderProd($acquiaCloudClient, $cloudApplicationUuid, $allowProduction, $allowNode);
     }
     $this->logger->debug("Using environment $chosenEnvironment->label $chosenEnvironment->uuid");
 
     return $chosenEnvironment;
   }
 
   // Todo: obviously combine this with promptChooseEnvironment.
-  private function promptChooseEnvironmentConsiderProd(Client $acquiaCloudClient, string $applicationUuid, bool $allowProduction = FALSE): EnvironmentResponse {
+  private function promptChooseEnvironmentConsiderProd(Client $acquiaCloudClient, string $applicationUuid, bool $allowProduction = FALSE, bool $allowNode = TRUE): EnvironmentResponse {
     $environmentResource = new Environments($acquiaCloudClient);
     $applicationEnvironments = iterator_to_array($environmentResource->getAll($applicationUuid));
     $choices = [];
     foreach ($applicationEnvironments as $key => $environment) {
-      if (!$allowProduction && $environment->flags->production) {
+      $productionNotAllowed = !$allowProduction && $environment->flags->production;
+      $nodeNotAllowed = !$allowNode && $environment->type === 'node';
+      if ($productionNotAllowed || $nodeNotAllowed) {
         unset($applicationEnvironments[$key]);
         // Re-index array so keys match those in $choices.
         $applicationEnvironments = array_values($applicationEnvironments);
@@ -1682,17 +1684,17 @@ private function getAnyAhEnvironment(string $cloudAppUuid, callable $filter): En
    * Get the first non-prod environment for a given Cloud application.
    */
   protected function getAnyNonProdAhEnvironment(string $cloudAppUuid): EnvironmentResponse|false {
-    return $this->getAnyAhEnvironment($cloudAppUuid, function (mixed $environment) {
-      return !$environment->flags->production;
+    return $this->getAnyAhEnvironment($cloudAppUuid, function (EnvironmentResponse $environment) {
+      return !$environment->flags->production && $environment->type === 'drupal';
     });
   }
 
   /**
    * Get the first prod environment for a given Cloud application.
    */
   protected function getAnyProdAhEnvironment(string $cloudAppUuid): EnvironmentResponse|false {
-    return $this->getAnyAhEnvironment($cloudAppUuid, function (mixed $environment) {
-      return $environment->flags->production;
+    return $this->getAnyAhEnvironment($cloudAppUuid, function (EnvironmentResponse $environment) {
+      return $environment->flags->production && $environment->type === 'drupal';
     });
   }
 
@@ -1848,11 +1850,7 @@ protected function promptChooseDrupalSite(EnvironmentResponse $environment): str
       return $this->promptChooseAcsfSite($environment);
     }
 
-    if ($environment->type === 'drupal') {
-      return $this->promptChooseCloudSite($environment);
-    }
-
-    throw new AcquiaCliException('Environment type {type} is not supported', ['type' => $environment->type]);
+    return $this->promptChooseCloudSite($environment);
   }
 
 }

src/Command/Pull/PullDatabaseCommand.php

@@ -40,7 +40,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     // $noImport implies $noScripts.
     $noScripts = $noImport || $noScripts;
     $this->setDirAndRequireProjectCwd($input);
-    $sourceEnvironment = $this->determineEnvironment($input, $output, TRUE);
+    $sourceEnvironment = $this->determineEnvironment($input, $output, TRUE, FALSE);
     $this->pullDatabase($input, $output, $sourceEnvironment, $onDemand, $noImport, $multipleDbs);
     if (!$noScripts) {
       $this->runDrushCacheClear($this->getOutputCallback($output, $this->checklist), $this->checklist);

src/Command/Pull/PullFilesCommand.php

@@ -22,7 +22,7 @@ protected function configure(): void {
 
   protected function execute(InputInterface $input, OutputInterface $output): int {
     $this->setDirAndRequireProjectCwd($input);
-    $sourceEnvironment = $this->determineEnvironment($input, $output, TRUE);
+    $sourceEnvironment = $this->determineEnvironment($input, $output, TRUE, FALSE);
     $this->pullFiles($input, $output, $sourceEnvironment);
 
     return Command::SUCCESS;

src/Command/Push/PushDatabaseCommand.php

@@ -27,7 +27,7 @@ protected function configure(): void {
   }
 
   protected function execute(InputInterface $input, OutputInterface $output): int {
-    $destinationEnvironment = $this->determineEnvironment($input, $output);
+    $destinationEnvironment = $this->determineEnvironment($input, $output, FALSE, FALSE);
     $acquiaCloudClient = $this->cloudApiClientService->getClient();
     $databases = $this->determineCloudDatabases($acquiaCloudClient, $destinationEnvironment, $input->getArgument('site'));
     // We only support pushing a single database.

src/Command/Push/PushFilesCommand.php

@@ -24,7 +24,7 @@ protected function configure(): void {
 
   protected function execute(InputInterface $input, OutputInterface $output): int {
     $this->setDirAndRequireProjectCwd($input);
-    $destinationEnvironment = $this->determineEnvironment($input, $output);
+    $destinationEnvironment = $this->determineEnvironment($input, $output, FALSE, FALSE);
     $chosenSite = $input->getArgument('site');
     if (!$chosenSite) {
       $chosenSite = $this->promptChooseDrupalSite($destinationEnvironment);

src/Command/Remote/DrushCommand.php

@@ -28,7 +28,7 @@ protected function configure(): void {
   }
 
   protected function execute(InputInterface $input, OutputInterface $output): ?int {
-    $environment = $this->determineEnvironment($input, $output);
+    $environment = $this->determineEnvironment($input, $output, FALSE, FALSE);
     $alias = self::getEnvironmentAlias($environment);
     $acliArguments = $input->getArguments();
     $drushArguments = (array) $acliArguments['drush_command'];