refactor: site registration moved, removed dormant husky dir, bumped pre-commit version

User is already being registered at Access.admin so commented out the registration of User in bootprocess.admin    adding pytest_bdd in requirements
upgrading pre-commit modules version
removed dormant husky dir

Author: khushhalm

.husky/commit-msg

@@ -19,7 +19,7 @@ repos:
     files: \.(json|json.sample)$
     args: [--autofix, --no-sort-keys]
 - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-  rev: v2.5.0
+  rev: v2.6.0
   hooks:
   - id: pretty-format-yaml
     args: [--autofix]

.pre-commit-config-gh-action.yaml

@@ -19,11 +19,11 @@ repos:
     files: \.(json|json.sample)$
     args: [--autofix, --no-sort-keys]
 - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-  rev: v2.5.0
+  rev: v2.6.0
   hooks:
   - id: pretty-format-yaml
     args: [--autofix]
 - repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
-  rev: v9.3.0
+  rev: v9.4.0
   hooks:
   - id: commitlint

.pre-commit-config.yaml

@@ -1,5 +1,15 @@
 from django.contrib import admin
-from Access.models import User
+
+from Access.models import (
+    User,
+    Permission,
+    UserAccessMapping,
+    Role,
+    AccessV2,
+    GroupV2,
+    MembershipV2,
+    GroupAccessMapping
+)
 
 
 class UserAdmin(admin.ModelAdmin):
@@ -9,3 +19,10 @@ class UserAdmin(admin.ModelAdmin):
 
 
 admin.site.register(User, UserAdmin)
+admin.site.register(Permission)
+admin.site.register(UserAccessMapping)
+admin.site.register(Role)
+admin.site.register(AccessV2)
+admin.site.register(GroupV2)
+admin.site.register(MembershipV2)
+admin.site.register(GroupAccessMapping)

Access/admin.py

@@ -208,7 +208,7 @@ def is_allowed_admin_actions_on_group(self, group):
 
     def is_allowed_to_offboard_user_from_group(self, group):
         return group.member_is_owner(self) or self.has_permission("ALLOW_USER_OFFBOARD")
-    
+
     def create_new_identity(self, access_tag="", identity=""):
         return self.module_identity.create(access_tag=access_tag, identity=identity)
 

Access/models.py

@@ -74,7 +74,7 @@ def saveIdentity(request):
         context["error"] = {
             "title": NEW_IDENTITY_CREATE_ERROR_MESSAGE["title"],
             "msg": NEW_IDENTITY_CREATE_ERROR_MESSAGE["msg"].format(modulename = modname),
-        }            
+        }
         return JsonResponse(json.dumps(context), safe=False, status=400)
 
 @login_required

Access/views.py

@@ -64,69 +64,6 @@ Docker should be running for linter tool:
    docker exec dev make lint
 ```
 
-### Pre-requisistes
-
-- Install Docker
-```bash
-brew install docker docker-compose
-```
-
-- Install Docker Container Runtime
-https://github.com/abiosoft/colima
-```bash
-brew install colima
-colima start
-```
-
-### Setup
-
-1. Create .env file from .env.sample file. Edit the DOCKERIMAGE to the latest image URL.
-
-2. Start the service
-```bash
-make dev
-```
-3. Check logs with
-```bash
-make logs
-```
-4. After seeing migration output in the logs (or waiting a minute after the containers come up),
- create superuser with
-```bash
-# Access the container with:
-docker exec -it dev bash
-#In the container:
-python manage.py createsuperuser
-# Set email to your email id, and password to anything you want
-```
-5. Access the db container with below commands. Password for db container is testtest
-```bash
-docker exec -it db bash
-mysql -u root -p
-create database enigma;
-```
-6. Restart the server by runing below commands
-```bash
-docker-compose -f docker-compose.yml restart
-```
-Enigma should be up and running on port 8000!
-  - Login at localhost:8000/admin
-  - Login here with your superuser credentials, and click the View Site button on the top right after logging in.
-
-### How to run tests
-
-1. Tests:
-If Web service is not running, the command will first load up the service and then run the tests.
-```bash
-make test
-```
-
-2. Linter:
-Docker should be running for linter tool:
-```bash
-   docker exec dev make lint
-```
-
 ### For contributing code
 
 - Python 3.11.0

README.md

@@ -1,20 +0,0 @@
-from django.contrib import admin
-
-from Access.models import (
-    User,
-    Permission,
-    UserAccessMapping,
-    Role,
-    AccessV2,
-    GroupV2,
-    MembershipV2,
-    GroupAccessMapping
-)
-
-admin.site.register(Permission)
-admin.site.register(UserAccessMapping)
-admin.site.register(Role)
-admin.site.register(AccessV2)
-admin.site.register(GroupV2)
-admin.site.register(MembershipV2)
-admin.site.register(GroupAccessMapping)

bootprocess/admin.py

@@ -79,7 +79,7 @@ def getDashboardData(request):
     ec2_regions = list(data.keys())
 
     context = {}
-      
+
     groupCount = len(
         MembershipV2.objects.filter(user=request.user.user, status="Approved")
     )

bootprocess/views_helper.py

@@ -95,8 +95,9 @@ selenium==4.6.0
 pyotp==2.7.0
 attrs==21.3.0
 pytest==7.2.0
-pytest-django==4.5.2
+pytest-bdd==6.1.1
 pytest-cov==4.0.0
+pytest-django==4.5.2
 pytest-mock==3.10.0
 pylama==8.4.1
 semgrep==1.2.1