Remove WORKSPACE from s3 image path

dnum-mi · May 23, 2024 · d89ff1d · d89ff1d
1 parent 5095d4d
commit d89ff1d
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 112 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -62,7 +62,6 @@ jobs:
     container:
       image: ghcr.io/datalab-mi/basegun/basegun-backend:${{ github.head_ref }}
       env:
-        WORKSPACE: dev
         AWS_REGION: gra
         AWS_DEFAULT_REGION: gra
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

diff --git a/Makefile b/Makefile
@@ -29,14 +29,10 @@ check-dc-config-%: check-prerequisites ## Check docker-compose syntax
 	${DC} config -q
 
 build: check-dc-config-%
-	TAG=${TAG} ${DC} build
+	${DC} build
 
 up: check-dc-config-%
-ifeq ("$(WORKSPACE)","preprod")
-	TAG=${TAG} PORT_PROD=8080 ${DC} up -d
-else
-	TAG=${TAG} ${DC} up -d
-endif
+	${DC} up -d
 
 down:
 	${DC} down

diff --git a/backend/src/config.py b/backend/src/config.py
@@ -105,7 +105,7 @@ def get_base_logs(user_agent, user_id: str) -> dict:
 # Object storage
 S3_URL_ENDPOINT = os.environ["S3_URL_ENDPOINT"]
 S3_BUCKET_NAME = os.environ["S3_BUCKET_NAME"]
-S3_PREFIX = os.path.join("uploaded-images/", os.environ["WORKSPACE"])
+S3_PREFIX = os.path.join("uploaded-images/")
 
 S3 = boto3.resource("s3", endpoint_url=S3_URL_ENDPOINT, verify=False)
 

diff --git a/backend/src/utils.py b/backend/src/utils.py
@@ -7,9 +7,7 @@
 
 def upload_image(content: bytes, image_key: str):
     """Uploads an image to s3 bucket
-        path uploaded-images/WORKSPACE/img_name
-        where WORKSPACE is dev, preprod or prod
-
+        path uploaded-images/img_name
     Args:
         content (bytes): file content
         image_key (str): path we want to have

diff --git a/backend/tests/test_api.py b/backend/tests/test_api.py
@@ -66,8 +66,7 @@ def check_log_base(self, log):
 
     def test_upload(self):
         """Checks that the file upload works properly"""
-        if os.environ["WORKSPACE"] == "dev":
-            create_bucket()
+        create_bucket()
         path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "revolver.jpg")
 
         with open(path, "rb") as f:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -19,7 +19,6 @@ services:
       - http_proxy
       - https_proxy
       - no_proxy
-      - WORKSPACE=dev
       - REQUESTS_CA_BUNDLE=$CACERT_LOCATION
     ports:
       - 5000:5000