From bd6545b42343f067c0218730bb8e023edc9202b9 Mon Sep 17 00:00:00 2001
From: Jacopo Gasparetto <jacopo.gasparetto@cnaf.infn.it>
Date: Wed, 12 Apr 2023 14:08:19 +0200
Subject: [PATCH] Rename BucketReponse to BucketInfoResponse
---
backend/src/ceph_service.py | 6 +++---
backend/src/models/buckets.py | 4 +++-
backend/src/routes/buckets.py | 4 ++--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/backend/src/ceph_service.py b/backend/src/ceph_service.py
index 49b8903..4fdc62d 100644
--- a/backend/src/ceph_service.py
+++ b/backend/src/ceph_service.py
@@ -1,4 +1,4 @@
-from models.buckets import Bucket, BucketRWAccess, BucketResponse
+from models.buckets import Bucket, BucketRWAccess, BucketInfoResponse
import boto3
import json
import os
@@ -20,7 +20,7 @@ def get_s3_client():
)
-def list_buckets() -> BucketResponse:
+def list_buckets() -> BucketInfoResponse:
s3 = get_s3_client()
client = s3.meta.client
response = client.list_buckets()
@@ -49,4 +49,4 @@ def list_buckets() -> BucketResponse:
objects=n_objects,
size=size_byte
)
- return BucketResponse(buckets=buckets, total=len(buckets))
+ return BucketInfoResponse(buckets=buckets, total=len(buckets))
diff --git a/backend/src/models/buckets.py b/backend/src/models/buckets.py
index 4d7bd41..13ddbe1 100644
--- a/backend/src/models/buckets.py
+++ b/backend/src/models/buckets.py
@@ -16,6 +16,8 @@ class Bucket(BaseModel):
objects: int
size: int
-class BucketResponse(BaseModel):
+
+class BucketInfoResponse(BaseModel):
buckets: List[Bucket]
total: int
+
diff --git a/backend/src/routes/buckets.py b/backend/src/routes/buckets.py
index d3bb3af..766c6b7 100644
--- a/backend/src/routes/buckets.py
+++ b/backend/src/routes/buckets.py
@@ -1,4 +1,4 @@
-from models.buckets import BucketResponse
+from models.buckets import BucketInfoResponse
from fastapi import APIRouter
import ceph_service
@@ -6,5 +6,5 @@ router = APIRouter()
@router.get("/buckets")
-def list_buckets() -> BucketResponse:
+def list_buckets() -> BucketInfoResponse:
return ceph_service.list_buckets()
--
GitLab