From ba72dedd66ece73ae4638fc84d5214a32b96809d Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Wed, 12 Apr 2023 14:51:15 +0100
Subject: [PATCH] feat(chalice): configurable mobs expiration

(cherry picked from commit 5c0faea838077e86c5bd1c3f773e7414f2fd9076)
---
 api/chalicelib/utils/s3.py | 2 +-
 api/env.default            | 3 ++-
 ee/api/env.default         | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/api/chalicelib/utils/s3.py b/api/chalicelib/utils/s3.py
index d1acff558..cdd22aa4e 100644
--- a/api/chalicelib/utils/s3.py
+++ b/api/chalicelib/utils/s3.py
@@ -115,7 +115,7 @@ def schedule_for_deletion(bucket, key):
     s3 = __get_s3_resource()
     s3_object = s3.Object(bucket, key)
     s3_object.copy_from(CopySource={'Bucket': bucket, 'Key': key},
-                        Expires=datetime.now() + timedelta(days=7),
+                        Expires=datetime.utcnow() + timedelta(days=config("SCH_DELETE_DAYS", cast=int, default=7)),
                         MetadataDirective='REPLACE')
     return True
 
diff --git a/api/env.default b/api/env.default
index 074d9b643..e0560619f 100644
--- a/api/env.default
+++ b/api/env.default
@@ -53,4 +53,5 @@ PRESIGNED_URL_EXPIRATION=3600
 ASSIST_JWT_EXPIRATION=144000
 ASSIST_JWT_SECRET=
 PYTHONUNBUFFERED=1
-REDIS_STRING=redis://redis-master.db.svc.cluster.local:6379
\ No newline at end of file
+REDIS_STRING=redis://redis-master.db.svc.cluster.local:6379
+SCH_DELETE_DAYS=7
\ No newline at end of file
diff --git a/ee/api/env.default b/ee/api/env.default
index 1947e9847..603c291b0 100644
--- a/ee/api/env.default
+++ b/ee/api/env.default
@@ -73,4 +73,5 @@ PRESIGNED_URL_EXPIRATION=3600
 ASSIST_JWT_EXPIRATION=144000
 ASSIST_JWT_SECRET=
 KAFKA_SERVERS=kafka.db.svc.cluster.local:9092
-KAFKA_USE_SSL=false
\ No newline at end of file
+KAFKA_USE_SSL=false
+SCH_DELETE_DAYS=7
\ No newline at end of file