CLI-1046: Cannot assign null to DatabaseResponse::user_name (#1485)

* CLI-1046: Cannot assign null to DatabaseResponse::user_name * update * update * Unfork * fix version constraint
acquia · May 3, 2023 · 4b9405c · 4b9405c
1 parent 556c52d
commit 4b9405c
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 33 deletions.
diff --git a/composer.json b/composer.json
@@ -54,7 +54,7 @@
         "symfony/yaml": "^6.0",
         "thecodingmachine/safe": "^2.4",
         "typhonius/acquia-logstream": "^0.0.13",
-        "typhonius/acquia-php-sdk-v2": "^3.0.7",
+        "typhonius/acquia-php-sdk-v2": "^3.0.8",
         "violuke/rsa-ssh-key-fingerprint": "^1.1",
         "zumba/amplitude-php": "^1.0.4"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/src/Command/Pull/PullCommandBase.php b/src/Command/Pull/PullCommandBase.php
@@ -50,11 +50,19 @@ abstract class PullCommandBase extends CommandBase {
    * @return string
    */
   public static function getBackupPath($environment, DatabaseResponse $database, $backup_response): string {
-    // Filename roughly matches what you'd get with a manual download from Cloud UI.
+    // Databases have a machine name not exposed via the API; we can only
+    // approximately reconstruct it and match the filename you'd get downloading
+    // a backup from Cloud UI.
+    if ($database->flags->default) {
+      $dbMachineName = $database->name . $environment->name;
+    }
+    else {
+      $dbMachineName = 'db' . $database->id;
+    }
     $filename = implode('-', [
         $environment->name,
         $database->name,
-        trim(parse_url($database->url, PHP_URL_PATH), '/'),
+        $dbMachineName,
         $backup_response->completedAt,
       ]) . '.sql.gz';
     return Path::join(sys_get_temp_dir(), $filename);