Fixes #123: Infer applicationUuid argument for api:* commands. (#128)

acquia · Jun 9, 2020 · 08df362 · 08df362
1 parent a7e8837
commit 08df362
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 2 deletions.
diff --git a/src/Command/Api/ApiCommandBase.php b/src/Command/Api/ApiCommandBase.php
@@ -43,6 +43,24 @@ class ApiCommandBase extends CommandBase {
   /** @var array  */
   private $pathParams = [];
 
+  /**
+   * @param \Symfony\Component\Console\Input\InputInterface $input
+   * @param \Symfony\Component\Console\Output\OutputInterface $output
+   *
+   * @throws \Acquia\Cli\Exception\AcquiaCliException
+   */
+  protected function initialize(InputInterface $input, OutputInterface $output) {
+    parent::initialize($input, $output);
+
+    if ($input->hasArgument('applicationUuid') && !$input->getArgument('applicationUuid')) {
+      $output->writeln('Inferring Cloud Application UUID for this command since none was provided...');
+      if ($application_uuid = $this->determineCloudApplication()) {
+        $output->writeln("Set application uuid to <comment>$application_uuid</comment>");
+        $input->setArgument('applicationUuid', $application_uuid);
+      }
+    }
+  }
+
   /**
    * @param \Symfony\Component\Console\Input\InputInterface $input
    * @param \Symfony\Component\Console\Output\OutputInterface $output

diff --git a/src/Command/CommandBase.php b/src/Command/CommandBase.php
@@ -679,7 +679,7 @@ protected function getAppUuidFromLocalProjectInfo() {
   protected function promptLinkApplication(
     ?ApplicationResponse $cloud_application
     ): bool {
-    $question = new ConfirmationQuestion("<question>Would you like to link the Cloud application {$cloud_application->name} to this repository</question>? ");
+    $question = new ConfirmationQuestion("<question>Would you like to link the Cloud application <comment>{$cloud_application->name}</comment> to this repository</question>? ");
     $helper = $this->getHelper('question');
     $answer = $helper->ask($this->input, $this->output, $question);
     if ($answer) {

diff --git a/tests/phpunit/src/Commands/Api/ApiCommandTest.php b/tests/phpunit/src/Commands/Api/ApiCommandTest.php
@@ -49,6 +49,28 @@ public function testApiCommandExecutionForHttpGet(): void {
     $this->assertArrayHasKey('uuid', $contents[0]);
   }
 
+  public function testInferApplicationUuidArgument() {
+    $mock_body = $this->getMockResponseFromSpec('/applications/{applicationUuid}', 'get', '200');
+    $this->clientProphecy->request('get', '/applications')->willReturn([$mock_body])->shouldBeCalled();
+    $this->clientProphecy->request('get', '/applications/' . $mock_body->uuid)->willReturn($mock_body)->shouldBeCalled();
+    $this->command = $this->getApiCommandByName('api:applications:find');
+    $this->executeCommand([], [
+      // Would you like Acquia CLI to search for a Cloud application that matches your local git config?
+      'n',
+      // Please select an Acquia Cloud application:
+      '0',
+      // Would you like to link the Cloud application Sample application to this repository?
+      'n'
+    ]);
+
+    // Assert.
+    $this->prophet->checkPredictions();
+    $output = $this->getDisplay();
+    $this->assertStringContainsString('Inferring Cloud Application UUID for this command since none was provided...', $output);
+    $this->assertStringContainsString('Set application uuid to ' . $mock_body->uuid, $output);
+    $this->assertEquals(0, $this->getStatusCode());
+  }
+
   public function testApiCommandExecutionForHttpPost(): void {
     $mock_request_args = $this->getMockRequestBodyFromSpec('/account/ssh-keys');
     $mock_response_body = $this->getMockResponseFromSpec('/account/ssh-keys', 'post', '202');
@@ -123,9 +145,9 @@ public function providerTestApiCommandDefinitionRequestBody(): array {
   /**
    * @dataProvider providerTestApiCommandDefinitionRequestBody
    *
-   * @param $use_command_cache
    * @param $command_name
    * @param $method
+   * @param $usage
    *
    * @throws \Psr\Cache\InvalidArgumentException
    */