CLI-1320: Update cx-api-spec to provide OS upgrade API (#1733)

* CLI-1320: Update cx-api-spec to provide OS upgrade API * Convert schemas to JSON * fix tests * ignore msi with no mutations
acquia · May 14, 2024 · 90fd815 · 90fd815
1 parent 2698b1e
commit 90fd815
Show file tree

Hide file tree

Showing 15 changed files with 54,980 additions and 36,327 deletions.
diff --git a/assets/acquia-spec.json b/assets/acquia-spec.json
diff --git a/assets/acquia-spec.yaml b/assets/acquia-spec.yaml
diff --git a/assets/acsf-spec.json b/assets/acsf-spec.json
diff --git a/assets/acsf-spec.yaml b/assets/acsf-spec.yaml
diff --git a/bin/acli b/bin/acli
@@ -97,8 +97,8 @@ $application->setName('Acquia CLI');
 $application->setVersion(getenv('ACLI_VERSION'));
 /** @var ApiCommandHelper $helper */
 $helper = $container->get(ApiCommandHelper::class);
-$application->addCommands($helper->getApiCommands( __DIR__ . '/../assets/acquia-spec.yaml', 'api', $container->get(ApiCommandFactory::class)));
-$application->addCommands($helper->getApiCommands( __DIR__ . '/../assets/acsf-spec.yaml', 'acsf', $container->get(AcsfCommandFactory::class)));
+$application->addCommands($helper->getApiCommands( __DIR__ . '/../assets/acquia-spec.json', 'api', $container->get(ApiCommandFactory::class)));
+$application->addCommands($helper->getApiCommands( __DIR__ . '/../assets/acsf-spec.json', 'acsf', $container->get(AcsfCommandFactory::class)));
 try {
   $application->add(new SelfUpdateCommand($application->getName(), $application->getVersion(), 'acquia/cli'));
 }

diff --git a/composer.json b/composer.json
@@ -133,7 +133,7 @@
             "infection --threads=max --only-covered"
         ],
         "mutation-diff-lines": [
-            "infection --threads=max --only-covered --git-diff-lines --git-diff-base=origin/$GITHUB_BASE_REF --min-covered-msi=100"
+            "infection --threads=max --only-covered --git-diff-lines --git-diff-base=origin/$GITHUB_BASE_REF --min-covered-msi=100 --ignore-msi-with-no-mutations"
         ],
         "cs": "phpcs",
         "cbf": "phpcbf",

diff --git a/src/Command/Api/ApiCommandHelper.php b/src/Command/Api/ApiCommandHelper.php
@@ -12,7 +12,6 @@
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Logger\ConsoleLogger;
-use Symfony\Component\Yaml\Yaml;
 
 class ApiCommandHelper {
 
@@ -300,7 +299,7 @@ private function getCloudApiSpec(string $specFilePath): array {
 
     // Parse file. This can take a long while!
     $this->logger->debug("Rebuilding caches...");
-    $spec = Yaml::parseFile($specFilePath);
+    $spec = json_decode(file_get_contents($specFilePath), TRUE);
 
     $cache->warmUp([
       $cacheKey => $spec,
@@ -316,12 +315,6 @@ private function getCloudApiSpec(string $specFilePath): array {
   private function generateApiCommandsFromSpec(array $acquiaCloudSpec, string $commandPrefix, CommandFactoryInterface $commandFactory): array {
     $apiCommands = [];
     foreach ($acquiaCloudSpec['paths'] as $path => $endpoint) {
-      // Skip internal endpoints. These shouldn't actually be in the spec.
-      // @infection-ignore-all
-      if (array_key_exists('x-internal', $endpoint) && $endpoint['x-internal']) {
-        continue;
-      }
-
       foreach ($endpoint as $method => $schema) {
         if (!array_key_exists('x-cli-name', $schema)) {
           continue;

diff --git a/tests/phpunit/src/CloudApi/AcsfClientServiceTest.php b/tests/phpunit/src/CloudApi/AcsfClientServiceTest.php
@@ -14,7 +14,7 @@
 
 class AcsfClientServiceTest extends TestBase {
 
-  protected string $apiSpecFixtureFilePath = __DIR__ . '/../../../../assets/acsf-spec.yaml';
+  protected string $apiSpecFixtureFilePath = __DIR__ . '/../../../../assets/acsf-spec.json';
   protected string $apiCommandPrefix = 'acsf';
 
   /**

diff --git a/tests/phpunit/src/Commands/Acsf/AcsfApiCommandTest.php b/tests/phpunit/src/Commands/Acsf/AcsfApiCommandTest.php
@@ -20,9 +20,6 @@
  */
 class AcsfApiCommandTest extends AcsfCommandTestBase {
 
-  protected string $apiSpecFixtureFilePath = __DIR__ . '/../../../../../assets/acsf-spec.yaml';
-  protected string $apiCommandPrefix = 'acsf';
-
   public function setUp(): void {
     parent::setUp();
     $this->clientProphecy->addOption('headers', ['Accept' => 'application/hal+json, version=2']);

diff --git a/tests/phpunit/src/Commands/Acsf/AcsfCommandTestBase.php b/tests/phpunit/src/Commands/Acsf/AcsfCommandTestBase.php
@@ -21,6 +21,10 @@ abstract class AcsfCommandTestBase extends CommandTestBase {
 
   protected string $acsfKey = 'h@x0r';
 
+  protected string $apiCommandPrefix = 'acsf';
+
+  protected string $apiSpecFixtureFilePath = __DIR__ . '/../../../../../assets/acsf-spec.json';
+
   /**
    * @return array<mixed>
    */

diff --git a/tests/phpunit/src/Commands/Acsf/AcsfListCommandTest.php b/tests/phpunit/src/Commands/Acsf/AcsfListCommandTest.php
@@ -8,15 +8,11 @@
 use Acquia\Cli\Command\Acsf\AcsfListCommandBase;
 use Acquia\Cli\Command\CommandBase;
 use Acquia\Cli\Command\Self\ListCommand;
-use Acquia\Cli\Tests\CommandTestBase;
 
 /**
  * @property AcsfListCommandBase $command
  */
-class AcsfListCommandTest extends CommandTestBase {
-
-  protected string $apiSpecFixtureFilePath = __DIR__ . '/../../../../../assets/acsf-spec.yaml';
-  protected string $apiCommandPrefix = 'acsf';
+class AcsfListCommandTest extends AcsfCommandTestBase {
 
   public function setUp(): void {
     parent::setUp();

diff --git a/tests/phpunit/src/Commands/Pull/PullCommandTestBase.php b/tests/phpunit/src/Commands/Pull/PullCommandTestBase.php
@@ -288,7 +288,7 @@ protected function mockExecuteMySqlImport(
     $localMachineHelper->checkRequiredBinariesExist(['gunzip', 'mysql'])->shouldBeCalled();
     $this->mockExecutePvExists($localMachineHelper, $pvExists);
     $process = $this->mockProcess($success);
-    $filePath = Path::join(sys_get_temp_dir(), "$env-$dbName-$dbMachineName-2012-05-15T12:00:00Z.sql.gz");
+    $filePath = Path::join(sys_get_temp_dir(), "$env-$dbName-$dbMachineName-2012-05-15T12:00:00.000Z.sql.gz");
     $command = $pvExists ? "pv $filePath --bytes --rate | gunzip | MYSQL_PWD=drupal mysql --host=localhost --user=drupal $localDbName" : "gunzip -c $filePath | MYSQL_PWD=drupal mysql --host=localhost --user=drupal $localDbName";
     // MySQL import command.
     $localMachineHelper

diff --git a/tests/phpunit/src/Commands/Ssh/SshKeyInfoCommandTest.php b/tests/phpunit/src/Commands/Ssh/SshKeyInfoCommandTest.php
@@ -36,7 +36,7 @@ public function testInfo(): void {
     $this->assertStringContainsString('UUID                   02905393-65d7-4bef-873b-24593f73d273', $output);
     $this->assertStringContainsString('Label                  PC Home', $output);
     $this->assertStringContainsString('Fingerprint (md5)      5d:23:fb:45:70:df:ef:ad:ca:bf:81:93:cd:50:26:28', $output);
-    $this->assertStringContainsString('Created at             2017-05-09T20:30:35+00:00', $output);
+    $this->assertStringContainsString('Created at             2017-05-09T20:30:35.000Z', $output);
   }
 
 }
diff --git a/tests/phpunit/src/Misc/ApiSpecTest.php b/tests/phpunit/src/Misc/ApiSpecTest.php
@@ -10,7 +10,7 @@
 class ApiSpecTest extends TestCase {
 
   public function testApiSpec(): void {
-    $apiSpecFile = Path::canonicalize(__DIR__ . '/../../../../assets/acquia-spec.yaml');
+    $apiSpecFile = Path::canonicalize(__DIR__ . '/../../../../assets/acquia-spec.json');
     $this->assertFileExists($apiSpecFile);
     $apiSpec = file_get_contents($apiSpecFile);
     $this->assertStringNotContainsString('x-internal', $apiSpec);

diff --git a/tests/phpunit/src/TestBase.php b/tests/phpunit/src/TestBase.php
@@ -49,7 +49,7 @@
  */
 abstract class TestBase extends TestCase {
 
-  protected string $apiSpecFixtureFilePath = __DIR__ . '/../../../assets/acquia-spec.yaml';
+  protected string $apiSpecFixtureFilePath = __DIR__ . '/../../../assets/acquia-spec.json';
 
   protected ConsoleOutput $consoleOutput;