From be983ea38257b55f4f86e172390bbff46e6ec315 Mon Sep 17 00:00:00 2001 From: yaso-meth Date: Thu, 1 Aug 2024 13:37:23 +0200 Subject: [PATCH] enable dev and prod for minio --- backend/Minio_Storage/minioConnection.py | 25 ++++++++++++++++-------- backend/routers/fileStorage.py | 6 +++--- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/backend/Minio_Storage/minioConnection.py b/backend/Minio_Storage/minioConnection.py index b2d56128..dfaf1faf 100644 --- a/backend/Minio_Storage/minioConnection.py +++ b/backend/Minio_Storage/minioConnection.py @@ -1,10 +1,19 @@ from minio import Minio -def minioConnect(): - return Minio( - #"minio:9000", - "minio.mzansi-innovation-hub.co.za", - access_key="0RcgutfvcDq28lz7", - secret_key="nEED72ZlKYgDqH9Iy46fVGGT9TfabGWO", - secure=False - ) \ No newline at end of file +def minioConnect(env): + if(env == "dev"): + return Minio( + "minio:9000", + # "minio.mzansi-innovation-hub.co.za", + access_key="0RcgutfvcDq28lz7", + secret_key="nEED72ZlKYgDqH9Iy46fVGGT9TfabGWO", + secure=False + ) + else: + return Minio( + #"minio:9000", + "minio.mzansi-innovation-hub.co.za", + access_key="0RcgutfvcDq28lz7", + secret_key="nEED72ZlKYgDqH9Iy46fVGGT9TfabGWO", + secure=False + ) \ No newline at end of file diff --git a/backend/routers/fileStorage.py b/backend/routers/fileStorage.py index 5ee15195..660ce5ce 100644 --- a/backend/routers/fileStorage.py +++ b/backend/routers/fileStorage.py @@ -33,12 +33,12 @@ class medCertUploud(BaseModel): endDate: str returnDate: str -@router.get("/minio/pull/file/{app_id}/{file_name}", tags=["Minio"]) -async def pull_File_from_user(app_id: str, file_name: str, session: SessionContainer = Depends(verify_session())): #, session: SessionContainer = Depends(verify_session()) +@router.get("/minio/pull/file/{app_id}/{file_name}/{env}", tags=["Minio"]) +async def pull_File_from_user(app_id: str, file_name: str, env: str, session: SessionContainer = Depends(verify_session())): #, session: SessionContainer = Depends(verify_session()) path = app_id + "/" + file_name try: # uploudFile(app_id, file.filename, extension[1], content) - client = Minio_Storage.minioConnection.minioConnect() + client = Minio_Storage.minioConnection.minioConnect(env) miniourl = client.presigned_get_object("mih", path) # temp = minioResponse.data#.encode('utf-8').strip()