From 42f974d096cbfbcc06b13348e86053cf585ff6f2 Mon Sep 17 00:00:00 2001
From: Jay Zeng <astrozzc@gmail.com>
Date: Tue, 1 Oct 2024 11:48:36 -0400
Subject: [PATCH] Add a flag to disable the UMB JOB processing

---
 deploy/rbac-clowdapp.yml |  5 +++++
 rbac/rbac/celery.py      | 11 ++++++-----
 rbac/rbac/settings.py    |  1 +
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/deploy/rbac-clowdapp.yml b/deploy/rbac-clowdapp.yml
index d5e46c35..646e21c0 100644
--- a/deploy/rbac-clowdapp.yml
+++ b/deploy/rbac-clowdapp.yml
@@ -293,6 +293,8 @@ objects:
               optional: true
         - name: PRINCIPAL_CLEANUP_DELETION_ENABLED_UMB
           value: ${PRINCIPAL_CLEANUP_DELETION_ENABLED_UMB}
+        - name: UMB_JOB_ENABLED
+          value: ${UMB_JOB_ENABLED}
 
     - name: service
       minReplicas: ${{MIN_REPLICAS}}
@@ -895,6 +897,9 @@ parameters:
 - name: PRINCIPAL_CLEANUP_DELETION_ENABLED_UMB
   description: Allow cleanup job to delete principals via messages from UMB
   value: 'False'
+- name: UMB_JOB_ENABLE
+  description: Temp env to enable the UMB job
+  value: 'True'
 - name: UMB_HOST
   description: Host of the UMB service
   value: 'localhost'
diff --git a/rbac/rbac/celery.py b/rbac/rbac/celery.py
index 87a28d36..e55f0f88 100644
--- a/rbac/rbac/celery.py
+++ b/rbac/rbac/celery.py
@@ -48,11 +48,12 @@
 }
 
 if settings.PRINCIPAL_CLEANUP_DELETION_ENABLED_UMB:
-    app.conf.beat_schedule["principal-cleanup-every-minute"] = {
-        "task": "management.tasks.principal_cleanup_via_umb",
-        "schedule": 60,  # Every 60 second
-        "args": [],
-    }
+    if settings.UMB_JOB_ENABLED:  # TODO: This is temp flag, remove it after populating user_id
+        app.conf.beat_schedule["principal-cleanup-every-minute"] = {
+            "task": "management.tasks.principal_cleanup_via_umb",
+            "schedule": 60,  # Every 60 second
+            "args": [],
+        }
 else:
     app.conf.beat_schedule["principal-cleanup-every-sevenish-days"] = {
         "task": "management.tasks.principal_cleanup",
diff --git a/rbac/rbac/settings.py b/rbac/rbac/settings.py
index a07e3938..89ce4c0d 100644
--- a/rbac/rbac/settings.py
+++ b/rbac/rbac/settings.py
@@ -475,6 +475,7 @@
 
 # Settings for enabling/disabling deletion in principal cleanup job via UMB
 PRINCIPAL_CLEANUP_DELETION_ENABLED_UMB = ENVIRONMENT.bool("PRINCIPAL_CLEANUP_DELETION_ENABLED_UMB", default=False)
+UMB_JOB_ENABLED = ENVIRONMENT.bool("UMB_JOB_ENABLED", default=True)
 UMB_HOST = ENVIRONMENT.get_value("UMB_HOST", default="localhost")
 UMB_PORT = ENVIRONMENT.get_value("UMB_PORT", default="61612")
 # Service account name