feat: use client id instead of x-request-user, for x-request-user attacted to s3 metadata

apis/s3.py

@@ -33,10 +33,18 @@ class S3:
         return [self.client.generate_presigned_url('get_object', Params={'Bucket': bucket_name, 'Key': key}) for key in image_keys]
 
     # Function to upload file to S3
-    def upload_file(self, bucket_name, file, name):
+    def upload_file(self, bucket_name, file, name, req_id):
         res = Response()
         try:
-            self.client.upload_fileobj(file, bucket_name, name)
+            self.client.upload_fileobj(
+                Fileobj=file, 
+                Bucket=bucket_name, 
+                Key=name, 
+                ExtraArgs={
+                    'Metadata': {
+                        'x-request-id': req_id,
+                    }
+                })
             res.status = 200
         except botocore.exceptions.ClientError as error:
             res.status = 429

app.py

@@ -20,7 +20,7 @@ from fastapi.openapi.docs import (
 load_dotenv()
 IS_DEV = os.environ.get('ENV', 'DEV') != 'PROD'
 AWS_S3_BUCKET_NAME = os.getenv('AWS_S3_BUCKET_NAME', '')
-X_REQUEST_USER = os.environ.get('X_REQUEST_USER')
+CLIENT_ID = os.environ.get('CLIENT_ID')
 X_API_KEY = os.environ.get('X_API_KEY')
 
 logging.basicConfig(
@@ -68,6 +68,7 @@ def healthcheck():
 @app.post("/image")
 async def upload(
     o: ImageObject,
+    client_id: str = Header(...),
     x_request_user: str = Header(...),
     x_api_key: str = Header(...)
 ):
@@ -75,7 +76,7 @@ async def upload(
     logging.info("--------------------------------")
     logging.info("Received request to upload image")
     
-    if is_valid(x_request_user, x_api_key):
+    if is_valid(client_id, x_api_key):
         key = f'{o.key}/{o.job_no}/{o.name}'
         logging.info(f'Key for S3 upload: {key}')
         if o.content is not None:
@@ -89,7 +90,7 @@ async def upload(
 
                 # Upload file object to S3
                 # logging.info(f"Uploading file to S3 bucket '{AWS_S3_BUCKET_NAME}' with key '{key}'")
-                res = s3client.upload_file(AWS_S3_BUCKET_NAME, file_obj, key)
+                res = s3client.upload_file(AWS_S3_BUCKET_NAME, file_obj, key, req_id=x_request_user)
                 logging.info("File uploaded successfully")
 
             except Exception as e:
@@ -102,6 +103,7 @@ async def upload(
 
 @app.post("/image-multiparts")
 async def upload2(
+    client_id: str = Header(...),
     x_request_user: str = Header(...),
     x_api_key: str = Header(...),
     job_no: Annotated[str, Form()] = '',
@@ -116,7 +118,7 @@ async def upload2(
     logging.info("Received request to upload image")
 
     # Validate headers
-    if not is_valid(x_request_user, x_api_key):
+    if not is_valid(client_id, x_api_key):
         res.status = HTTPStatus.FORBIDDEN
         res.error = "Invalid credentials"
         return res.json()
@@ -146,7 +148,7 @@ async def upload2(
     return res.json()
 
 def is_valid(u, p):
-    return u == X_REQUEST_USER and p == X_API_KEY
+    return u == CLIENT_ID and p == X_API_KEY
 
 if __name__=='__main__':
     uvicorn.run('app:app', host='0.0.0.0', port=7860, reload=True)