fix: conflicts

Author: sumedha-bhatt

Access/access_modules/base_email_access/access.py

@@ -3,7 +3,7 @@
 import traceback
 
 from Access.models import UserAccessMapping, GroupAccessMapping
-from BrowserStackAutomation.settings import ACCESS_APPROVE_EMAIL, PERMISSION_CONSTANTS
+from EnigmaAutomation.settings import ACCESS_APPROVE_EMAIL, PERMISSION_CONSTANTS
 from bootprocess.general import emailSES
 
 logger = logging.getLogger(__name__)

Access/accessrequest_helper.py

@@ -2,7 +2,7 @@
 import time
 from Access.views_helper import execute_group_access, accept_request
 
-from BrowserStackAutomation.settings import DECLINE_REASONS, MAIL_APPROVER_GROUPS
+from EnigmaAutomation.settings import DECLINE_REASONS, MAIL_APPROVER_GROUPS
 import datetime
 import json
 from django.db import transaction

Access/background_task_manager.py

@@ -8,7 +8,7 @@
 
 from Access import helpers
 from bootprocess import general
-from BrowserStackAutomation.settings import AUTOMATED_EXEC_IDENTIFIER
+from EnigmaAutomation.settings import AUTOMATED_EXEC_IDENTIFIER
 from Access.models import UserAccessMapping, ApprovalType
 from Access import notifications
 

Access/group_helper.py

@@ -4,7 +4,7 @@
 import datetime
 import logging
 from Access.views_helper import execute_group_access
-from BrowserStackAutomation.settings import MAIL_APPROVER_GROUPS, PERMISSION_CONSTANTS
+from EnigmaAutomation.settings import MAIL_APPROVER_GROUPS, PERMISSION_CONSTANTS
 from . import helpers as helper
 from Access.background_task_manager import revoke_request
 import json

Access/helpers.py

@@ -7,7 +7,7 @@
 import random
 
 from Access.access_modules import *  # NOQA
-from BrowserStackAutomation.settings import PERMISSION_CONSTANTS
+from EnigmaAutomation.settings import PERMISSION_CONSTANTS
 from Access.models import User
 
 logger = logging.getLogger(__name__)

Access/models.py

@@ -1,6 +1,6 @@
 from django.contrib.auth.models import User as user
 from django.db import models, transaction
-from BrowserStackAutomation.settings import PERMISSION_CONSTANTS
+from EnigmaAutomation.settings import PERMISSION_CONSTANTS
 import datetime
 import enum
 

Access/notifications.py

@@ -1,6 +1,6 @@
 from bootprocess import general
 from Access import helpers
-from BrowserStackAutomation.settings import MAIL_APPROVER_GROUPS
+from EnigmaAutomation.settings import MAIL_APPROVER_GROUPS
 import logging
 
 logger = logging.getLogger(__name__)

Access/views.py

@@ -36,7 +36,7 @@
     IdentityNotChangedException,
 )
 from Access.views_helper import render_error_message
-from BrowserStackAutomation.settings import PERMISSION_CONSTANTS
+from EnigmaAutomation.settings import PERMISSION_CONSTANTS
 from . import helpers as helper
 from .decorators import user_admin_or_ops, authentication_classes, user_with_permission
 
@@ -68,7 +68,7 @@ def show_access_history(request):
 
     return render(
         request,
-        "BSOps/showAccessHistory.html",
+        "EnigmaOps/showAccessHistory.html",
         {
             "dataList": access_user.get_access_history(
                 helper.get_available_access_modules()
@@ -83,14 +83,14 @@ def pending_failure(request):
     """Access requests where grant failed."""
     try:
         response = get_grant_failed_requests(request)
-        return render(request, "BSOps/failureAdminRequests.html", response)
+        return render(request, "EnigmaOps/failureAdminRequests.html", response)
     except Exception as ex:
         logger.error(
             "Error in request not found OR Invalid request type, Error: %s", str(ex)
         )
         json_response = {}
         json_response["error"] = {"error_msg": str(ex), "msg": INVALID_REQUEST_MESSAGE}
-        return render(request, "BSOps/accessStatus.html", json_response)
+        return render(request, "EnigmaOps/accessStatus.html", json_response)
 
 
 @login_required
@@ -99,14 +99,14 @@ def pending_revoke(request):
     """Access requests where the revoke failed."""
     try:
         response = get_pending_revoke_failures(request)
-        return render(request, "BSOps/failureAdminRequests.html", response)
+        return render(request, "EnigmaOps/failureAdminRequests.html", response)
     except Exception as ex:
         logger.debug(
             "Error in request not found OR Invalid request type, Error: %s", str(ex)
         )
         json_response = {}
         json_response["error"] = {"error_msg": str(ex), "msg": INVALID_REQUEST_MESSAGE}
-        return render(request, "BSOps/accessStatus.html", json_response)
+        return render(request, "EnigmaOps/accessStatus.html", json_response)
 
 
 @login_required
@@ -164,16 +164,16 @@ def create_new_group(request):
     if request.POST:
         context = group_helper.create_group(request)
         if "status" in context or "error" in context:
-            return render(request, "BSOps/accessStatus.html", context)
-        return render(request, "BSOps/createNewGroup.html", context)
-    return render(request, "BSOps/createNewGroup.html", {})
+            return render(request, "EnigmaOps/accessStatus.html", context)
+        return render(request, "EnigmaOps/createNewGroup.html", context)
+    return render(request, "EnigmaOps/createNewGroup.html", {})
 
 
 @login_required
 def all_users_list(request):
     """List of all users."""
     context = getallUserList(request)
-    return render(request, "BSOps/allUsersList.html", context)
+    return render(request, "EnigmaOps/allUsersList.html", context)
 
 
 @login_required
@@ -213,10 +213,10 @@ def request_access(request):
         context = create_request(
             auth_user=request.user, access_request_form=request.POST
         )
-        return render(request, "BSOps/accessStatus.html", context)
+        return render(request, "EnigmaOps/accessStatus.html", context)
 
     context = get_request_access(request)
-    return render(request, "BSOps/accessRequestForm.html", context)
+    return render(request, "EnigmaOps/accessRequestForm.html", context)
 
 
 @login_required
@@ -232,12 +232,12 @@ def group_access(request):
     """
     if request.POST:
         context = group_helper.save_group_access_request(request.POST, request.user)
-        return render(request, "BSOps/accessStatus.html", context)
+        return render(request, "EnigmaOps/accessStatus.html", context)
 
     context = group_helper.get_group_access(request.GET, request.user)
     if "status" in context:
-        return render(request, 'BSOps/accessStatus.html',context)
-    return render(request, "BSOps/groupAccessRequestForm.html", context)
+        return render(request, 'EnigmaOps/accessStatus.html',context)
+    return render(request, "EnigmaOps/groupAccessRequestForm.html", context)
 
 
 @login_required
@@ -246,9 +246,9 @@ def group_access_list(request, group_name):
     try:
         context = group_helper.get_group_access_list(request.user, group_name)
         if "error" in context:
-            return render(request, "BSOps/accessStatus.html", context)
+            return render(request, "EnigmaOps/accessStatus.html", context)
 
-        return render(request, "BSOps/groupAccessList.html", context)
+        return render(request, "EnigmaOps/groupAccessList.html", context)
     except Exception as ex:
         logger.debug(
             "Error in request not found OR Invalid request type, Error: %s", str(ex)
@@ -258,7 +258,7 @@ def group_access_list(request, group_name):
             "error_msg": INVALID_REQUEST_MESSAGE,
             "msg": INVALID_REQUEST_MESSAGE,
         }
-        return render(request, "BSOps/accessStatus.html", json_response)
+        return render(request, "EnigmaOps/accessStatus.html", json_response)
 
 
 @login_required
@@ -290,7 +290,7 @@ def update_group_owners(request, group_name):
 @login_required
 def group_dashboard(request):
     """Template to capture new group data."""
-    return render(request, "BSOps/createNewGroup.html")
+    return render(request, "EnigmaOps/createNewGroup.html")
 
 
 def approve_new_group(request, group_id):
@@ -319,10 +319,10 @@ def add_user_to_group(request, group_name):
     """
     if request.POST:
         context = group_helper.add_user_to_group(request)
-        return render(request, "BSOps/accessStatus.html", context)
+        return render(request, "EnigmaOps/accessStatus.html", context)
 
     context = group_helper.get_user_group(request, group_name)
-    return render(request, "BSOps/addUserToGroupForm.html", context)
+    return render(request, "EnigmaOps/addUserToGroupForm.html", context)
 
 
 @api_view(["GET"])
@@ -331,7 +331,7 @@ def add_user_to_group(request, group_name):
 def pending_requests(request):
     """pending access requests"""
     context = get_pending_requests(request)
-    return render(request, "BSOps/pendingRequests.html", context)
+    return render(request, "EnigmaOps/pendingRequests.html", context)
 
 
 @login_required
@@ -553,7 +553,7 @@ def all_user_access_list(request, load_ui=True):
         if response_type == "csv":
             return views_helper.gen_all_user_access_list_csv(data_list=data_list)
         if load_ui:
-            return render(request, "BSOps/allUserAccessList.html", context)
+            return render(request, "EnigmaOps/allUserAccessList.html", context)
 
         return JsonResponse(context)
 
@@ -568,7 +568,7 @@ def all_user_access_list(request, load_ui=True):
             "error_msg": INVALID_REQUEST_MESSAGE,
             "msg": INVALID_REQUEST_MESSAGE,
         }
-        return render(request, "BSOps/accessStatus.html", json_response)
+        return render(request, "EnigmaOps/accessStatus.html", json_response)
 
 
 @login_required
@@ -644,15 +644,8 @@ def individual_resolve(request):
                 )
                 json_response["status_list"] += response["status"]
             else:
-                json_response["status_list"].append(
-                    {
-                        "title": "The Request ("
-                        + request_id
-                        + ") is already resolved.",
-                        "msg": "The request is already in final state.",
-                    }
-                )
-        return render(request, "BSOps/accessStatus.html", json_response)
+                json_response["status_list"].append({'title': 'The Request ('+request_id+') is already resolved.', 'msg': 'The request is already in final state.'})
+        return render(request,'EnigmaOps/accessStatus.html',json_response)
     except Exception as e:
         logger.exception(str(e))
         json_response["error"] = {
@@ -740,7 +733,7 @@ def resolve_bulk(request):
         logger.exception(e)
         json_response = {}
         json_response['error'] = {'error_msg': "Bad request", 'msg': "Error in request not found OR Invalid request type"}
-        return render(request,'BSOps/accessStatus.html',json_response)
+        return render(request,'EnigmaOps/accessStatus.html',json_response)
 
 def revoke_group_access(request):
     try:

Access/views_helper.py

@@ -104,7 +104,7 @@ def render_error_message(request, log_message, user_message, user_message_descri
     logger.error(log_message)
     return render(
         request,
-        "BSOps/accessStatus.html",
+        "EnigmaOps/accessStatus.html",
         {
             "error": {
                 "error_msg": user_message,

Dockerfile

@@ -5,7 +5,7 @@
 # Set the base image to use to Ubuntu
 FROM python:3.11-slim-buster AS base
 
-ENV DJANGO_SETTINGS_MODULE=BrowserStackAutomation.settings 
+ENV DJANGO_SETTINGS_MODULE=EnigmaAutomation.settings
 RUN DEBIAN_FRONTEND=noninteractive \
   apt-get update -y \
   && apt-get install --no-install-recommends -y \