Refactor cloud backup agent to use updated file handling methods (#149231)

homeassistant/components/cloud/backup.py

@@ -10,14 +10,8 @@ import random
 from typing import Any
 
 from aiohttp import ClientError, ClientResponseError
-from hass_nabucasa import Cloud, CloudError
-from hass_nabucasa.api import CloudApiError, CloudApiNonRetryableError
-from hass_nabucasa.cloud_api import (
-    FilesHandlerListEntry,
-    async_files_delete_file,
-    async_files_list,
-)
-from hass_nabucasa.files import FilesError, StorageType, calculate_b64md5
+from hass_nabucasa import Cloud, CloudApiError, CloudApiNonRetryableError, CloudError
+from hass_nabucasa.files import FilesError, StorageType, StoredFile, calculate_b64md5
 
 from homeassistant.components.backup import (
     AgentBackup,
@@ -186,8 +180,7 @@ class CloudBackupAgent(BackupAgent):
         """
         backup = await self._async_get_backup(backup_id)
         try:
-            await async_files_delete_file(
-                self._cloud,
+            await self._cloud.files.delete(
                 storage_type=StorageType.BACKUP,
                 filename=backup["Key"],
             )
@@ -199,12 +192,10 @@ class CloudBackupAgent(BackupAgent):
         backups = await self._async_list_backups()
         return [AgentBackup.from_dict(backup["Metadata"]) for backup in backups]
 
-    async def _async_list_backups(self) -> list[FilesHandlerListEntry]:
+    async def _async_list_backups(self) -> list[StoredFile]:
         """List backups."""
         try:
-            backups = await async_files_list(
-                self._cloud, storage_type=StorageType.BACKUP
-            )
+            backups = await self._cloud.files.list(storage_type=StorageType.BACKUP)
         except (ClientError, CloudError) as err:
             raise BackupAgentError("Failed to list backups") from err
 
@@ -220,7 +211,7 @@ class CloudBackupAgent(BackupAgent):
         backup = await self._async_get_backup(backup_id)
         return AgentBackup.from_dict(backup["Metadata"])
 
-    async def _async_get_backup(self, backup_id: str) -> FilesHandlerListEntry:
+    async def _async_get_backup(self, backup_id: str) -> StoredFile:
         """Return a backup."""
         backups = await self._async_list_backups()
 

tests/components/cloud/test_backup.py

@@ -3,7 +3,7 @@
 from collections.abc import AsyncGenerator, Generator
 from io import StringIO
 from typing import Any
-from unittest.mock import ANY, Mock, PropertyMock, patch
+from unittest.mock import ANY, AsyncMock, Mock, PropertyMock, patch
 
 from aiohttp import ClientError, ClientResponseError
 from hass_nabucasa import CloudError
@@ -48,22 +48,16 @@ async def setup_integration(
 
 
 @pytest.fixture
-def mock_delete_file() -> Generator[MagicMock]:
-    """Mock list files."""
-    with patch(
-        "homeassistant.components.cloud.backup.async_files_delete_file",
-        spec_set=True,
-    ) as delete_file:
-        yield delete_file
+def mock_delete_file(cloud: MagicMock) -> Generator[AsyncMock]:
+    """Mock delete files."""
+    cloud.files.delete = AsyncMock()
+    return cloud.files.delete
 
 
 @pytest.fixture
-def mock_list_files() -> Generator[MagicMock]:
+def mock_list_files(cloud: MagicMock) -> Generator[MagicMock]:
     """Mock list files."""
-    with patch(
-        "homeassistant.components.cloud.backup.async_files_list", spec_set=True
-    ) as list_files:
-        list_files.return_value = [
+    cloud.files.list.return_value = [
         {
             "Key": "462e16810d6841228828d9dd2f9e341e.tar",
             "LastModified": "2024-11-22T10:49:01.182Z",
@@ -103,7 +97,7 @@ def mock_list_files() -> Generator[MagicMock]:
             },
         },
     ]
-        yield list_files
+    return cloud.files.list
 
 
 @pytest.fixture
@@ -141,7 +135,7 @@ async def test_agents_list_backups(
     client = await hass_ws_client(hass)
     await client.send_json_auto_id({"type": "backup/info"})
     response = await client.receive_json()
-    mock_list_files.assert_called_once_with(cloud, storage_type="backup")
+    mock_list_files.assert_called_once_with(storage_type="backup")
 
     assert response["success"]
     assert response["result"]["agent_errors"] == {}
@@ -250,7 +244,7 @@ async def test_agents_get_backup(
     client = await hass_ws_client(hass)
     await client.send_json_auto_id({"type": "backup/details", "backup_id": backup_id})
     response = await client.receive_json()
-    mock_list_files.assert_called_once_with(cloud, storage_type="backup")
+    mock_list_files.assert_called_once_with(storage_type="backup")
 
     assert response["success"]
     assert response["result"]["agent_errors"] == {}
@@ -726,7 +720,6 @@ async def test_agents_delete(
     assert response["success"]
     assert response["result"] == {"agent_errors": {}}
     mock_delete_file.assert_called_once_with(
-        cloud,
         filename="462e16810d6841228828d9dd2f9e341e.tar",
         storage_type=StorageType.BACKUP,
     )