squashme: add saved cloud storage model

Author: olevski

components/renku_data_services/storage/blueprints.py

@@ -55,7 +55,6 @@ async def _get(
             validator: RCloneValidator,
             query: apispec.StorageParams,
         ) -> JSONResponse:
-            storage: list[models.CloudStorage]
             storage = await self.storage_repo.get_storage(user=user, project_id=query.project_id)
 
             return json([dump_storage_with_sensitive_fields(s, validator) for s in storage])
@@ -202,7 +201,6 @@ async def _get(
             validator: RCloneValidator,
             query: apispec.StorageV2Params,
         ) -> JSONResponse:
-            storage: list[models.CloudStorage]
             storage = await self.storage_v2_repo.get_storage(
                 user=user, include_secrets=True, project_id=query.project_id
             )

components/renku_data_services/storage/db.py

@@ -56,7 +56,7 @@ async def get_storage(
         name: str | None = None,
         include_secrets: bool = False,
         filter_by_access_level: bool = True,
-    ) -> list[models.CloudStorage]:
+    ) -> list[models.SavedCloudStorage]:
         """Get a storage from the database."""
         async with self.session_maker() as session:
             if not project_id and not name and not id:
@@ -91,7 +91,7 @@ async def get_storage(
 
             return [s.dump() for s in storage_orms if s.project_id in accessible_projects]
 
-    async def get_storage_by_id(self, storage_id: ULID, user: base_models.APIUser) -> models.CloudStorage:
+    async def get_storage_by_id(self, storage_id: ULID, user: base_models.APIUser) -> models.SavedCloudStorage:
         """Get a single storage by id."""
         storages = await self.get_storage(user, id=str(storage_id), include_secrets=True, filter_by_access_level=False)
 
@@ -102,9 +102,7 @@ async def get_storage_by_id(self, storage_id: ULID, user: base_models.APIUser) -
 
         return storages[0]
 
-    async def insert_storage(
-        self, storage: models.UnsavedCloudStorage, user: base_models.APIUser
-    ) -> models.CloudStorage:
+    async def insert_storage(self, storage: models.CloudStorage, user: base_models.APIUser) -> models.SavedCloudStorage:
         """Insert a new cloud storage entry."""
         if not await self.filter_projects_by_access_level(user, [storage.project_id], authz_models.Role.OWNER):
             raise errors.ForbiddenError(message="User does not have access to this project")
@@ -118,7 +116,9 @@ async def insert_storage(
             session.add(orm)
         return orm.dump()
 
-    async def update_storage(self, storage_id: ULID, user: base_models.APIUser, **kwargs: dict) -> models.CloudStorage:
+    async def update_storage(
+        self, storage_id: ULID, user: base_models.APIUser, **kwargs: dict
+    ) -> models.SavedCloudStorage:
         """Update a cloud storage entry."""
         async with self.session_maker() as session, session.begin():
             res = await session.execute(

components/renku_data_services/storage/models.py

@@ -253,3 +253,9 @@ class CloudStorageSecretUpsert(BaseModel):
 
     name: str = Field()
     value: str = Field()
+
+
+class SavedCloudStorage(CloudStorage):
+    """A cloud storage that has been saved in the DB."""
+
+    storage_id: ULID

components/renku_data_services/storage/orm.py

@@ -81,9 +81,9 @@ def load(cls, storage: models.UnsavedCloudStorage) -> "CloudStorageORM":
             readonly=storage.readonly,
         )
 
-    def dump(self) -> models.CloudStorage:
+    def dump(self) -> models.SavedCloudStorage:
         """Create a cloud storage model from the ORM object."""
-        return models.CloudStorage(
+        return models.SavedCloudStorage(
             project_id=self.project_id,
             name=self.name,
             storage_type=self.storage_type,