Merge 2d9ade8 into c5f0d34

typhonius · Dec 18, 2018 · 5c15bad · 5c15bad
2 parents c5f0d34 + 2d9ade8
commit 5c15bad
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/CloudApi/Client.php b/src/CloudApi/Client.php
@@ -292,15 +292,16 @@ public function databaseBackups($environmentUuid, $dbName)
      * Gets information about a database backup.
      *
      * @param string $environmentUuid
+     * @param string $dbName
      * @param int    $backupId
      * @return BackupResponse
      */
-    public function databaseBackup($environmentUuid, $backupId)
+    public function databaseBackup($environmentUuid, $dbName, $backupId)
     {
         return new BackupResponse(
             $this->connector->request(
                 'get',
-                "/environments/${environmentUuid}/database-backups/${backupId}",
+                "/environments/${environmentUuid}/databases/${dbName}/backups/${backupId}",
                 $this->query
             )
         );
@@ -310,15 +311,16 @@ public function databaseBackup($environmentUuid, $backupId)
      * Restores a database backup to a database in an environment.
      *
      * @param string $environmentUuid
+     * @param string $dbName
      * @param int    $backupId
      * @return OperationResponse
      */
-    public function restoreDatabaseBackup($environmentUuid, $backupId)
+    public function restoreDatabaseBackup($environmentUuid, $dbName, $backupId)
     {
         return new OperationResponse(
             $this->connector->request(
                 'post',
-                "/environments/${environmentUuid}/database-backups/${backupId}/actions/restore",
+                "/environments/${environmentUuid}/databases/${dbName}/backups/${backupId}/actions/restore",
                 $this->query
             )
         );

diff --git a/src/CloudApi/ClientInterface.php b/src/CloudApi/ClientInterface.php
@@ -150,19 +150,21 @@ public function databaseBackups($environmentUuid, $dbName);
      * Gets information about a database backup.
      *
      * @param string $environmentUuid
+     * @param string $dbName
      * @param int    $backupId
      * @return BackupResponse
      */
-    public function databaseBackup($environmentUuid, $backupId);
+    public function databaseBackup($environmentUuid, $dbName, $backupId);
 
     /**
      * Restores a database backup to a database in an environment.
      *
      * @param string $environmentUuid
+     * @param string $dbName
      * @param int    $backupId
      * @return OperationResponse
      */
-    public function restoreDatabaseBackup($environmentUuid, $backupId);
+    public function restoreDatabaseBackup($environmentUuid, $dbName, $backupId);
 
     /**
      * Copies files from an environment to another environment.

diff --git a/tests/Endpoints/DatabasesTest.php b/tests/Endpoints/DatabasesTest.php
@@ -136,7 +136,7 @@ public function testGetDatabaseBackup()
         $client = $this->getMockClient($response);
 
         /** @var \AcquiaCloudApi\CloudApi\ClientInterface $client */
-        $result = $client->databaseBackup('24-a47ac10b-58cc-4372-a567-0e02b2c3d470', 12);
+        $result = $client->databaseBackup('24-a47ac10b-58cc-4372-a567-0e02b2c3d470', 'db_name', 12);
 
         $this->assertNotInstanceOf('\AcquiaCloudApi\Response\BackupsResponse', $result);
         $this->assertInstanceOf('\AcquiaCloudApi\Response\BackupResponse', $result);
@@ -152,7 +152,7 @@ public function testRestoreDatabaseBackup()
         $client = $this->getMockClient($response);
 
         /** @var \AcquiaCloudApi\CloudApi\ClientInterface $client */
-        $result = $client->restoreDatabaseBackup('24-a47ac10b-58cc-4372-a567-0e02b2c3d470', 12);
+        $result = $client->restoreDatabaseBackup('24-a47ac10b-58cc-4372-a567-0e02b2c3d470', 'db_name', 12);
 
         $this->assertInstanceOf('\AcquiaCloudApi\Response\OperationResponse', $result);