CLI-1377 Delay API lookup of application by ID (#1781)

* CLI-1377 Delay API lookup of application by ID * move api call * fix phpcs and remove ignored mocks * remove mocks from testPushArtifactWithArgs * remove mocks from testCloudAppFromLocalConfig * put back getApplicationIdes mock --------- Co-authored-by: Dane Powell <[email protected]>
acquia · Sep 9, 2024 · f4fa8e7 · f4fa8e7
1 parent 9960580
commit f4fa8e7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/src/Command/CommandBase.php b/src/Command/CommandBase.php
@@ -878,12 +878,13 @@ protected function determineCloudApplication(bool $promptLinkApp = false): ?stri
             throw new AcquiaCliException("Could not determine Cloud Application. Run this command interactively or use `acli link` to link a Cloud Application before running non-interactively.");
         }
 
-        $application = $this->getCloudApplication($applicationUuid);
         // No point in trying to link a directory that's not a repo.
         if (!empty($this->projectDir) && !$this->getCloudUuidFromDatastore()) {
             if ($promptLinkApp) {
+                $application = $this->getCloudApplication($applicationUuid);
                 $this->saveCloudUuidToDatastore($application);
             } elseif (!AcquiaDrupalEnvironmentDetector::isAhIdeEnv() && !$this->getCloudApplicationUuidFromBltYaml()) {
+                $application = $this->getCloudApplication($applicationUuid);
                 $this->promptLinkApplication($application);
             }
         }

diff --git a/src/Command/Push/PushArtifactCommand.php b/src/Command/Push/PushArtifactCommand.php
@@ -95,8 +95,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $destinationGitUrls = [];
         $destinationGitRef = '';
         if (!$input->getOption('no-clone')) {
-            $applicationUuid = $this->determineCloudApplication();
-            $destinationGitUrls = $this->determineDestinationGitUrls($applicationUuid);
+            $destinationGitUrls = $this->determineDestinationGitUrls();
             $destinationGitRef = $this->determineDestinationGitRef();
             $sourceGitBranch = $this->determineSourceGitRef();
             $destinationGitUrlsString = implode(',', $destinationGitUrls);
@@ -153,18 +152,20 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     /**
      * @return string[]
      */
-    private function determineDestinationGitUrls(?string $applicationUuid): array
+    private function determineDestinationGitUrls(): array
     {
         if ($this->input->getOption('destination-git-urls')) {
             return $this->input->getOption('destination-git-urls');
         }
         if ($envVar = getenv('ACLI_PUSH_ARTIFACT_DESTINATION_GIT_URLS')) {
             return explode(',', $envVar);
         }
+
         if ($this->datastoreAcli->get('push.artifact.destination-git-urls')) {
             return $this->datastoreAcli->get('push.artifact.destination-git-urls');
         }
 
+        $applicationUuid = $this->determineCloudApplication();
         return [$this->getAnyVcsUrl($applicationUuid)];
     }
 

diff --git a/tests/phpunit/src/Commands/CommandBaseTest.php b/tests/phpunit/src/Commands/CommandBaseTest.php
@@ -42,7 +42,6 @@ public function testUnauthenticatedFailure(): void
     public function testCloudAppFromLocalConfig(): void
     {
         $this->command = $this->injectCommand(IdeListCommand::class);
-        $this->mockRequest('getApplicationByUuid', 'a47ac10b-58cc-4372-a567-0e02b2c3d470');
         $this->mockRequest('getApplicationIdes', 'a47ac10b-58cc-4372-a567-0e02b2c3d470');
         $this->createMockAcliConfigFile('a47ac10b-58cc-4372-a567-0e02b2c3d470');
         $this->executeCommand();

diff --git a/tests/phpunit/src/Commands/Push/PushArtifactCommandTest.php b/tests/phpunit/src/Commands/Push/PushArtifactCommandTest.php
@@ -122,9 +122,6 @@ public function testPushTagArtifact(): void
 
     public function testPushArtifactWithAcquiaCliFile(): void
     {
-        $applications = $this->mockRequest('getApplications');
-        $this->mockRequest('getApplicationByUuid', $applications[0]->uuid);
-        $this->mockRequest('getApplicationEnvironments', $applications[0]->uuid);
         $this->datastoreAcli->set('push.artifact.destination-git-urls', [
             'https://github.com/example1/cli.git',
             'https://github.com/example2/cli.git',
@@ -143,9 +140,6 @@ public function testPushArtifactWithAcquiaCliFile(): void
 
     public function testPushArtifactWithArgs(): void
     {
-        $applications = $this->mockRequest('getApplications');
-        $this->mockRequest('getApplicationByUuid', $applications[0]->uuid);
-        $this->mockRequest('getApplicationEnvironments', $applications[0]->uuid);
         $destinationGitUrls = [
             'https://github.com/example1/cli.git',
             'https://github.com/example2/cli.git',