fix: Using script to load modules in __init__; fixing permission for

mounts

Author: vedharish

Access/base_email_access/access_modules_init.py

@@ -0,0 +1,5 @@
+from os.path import dirname, basename, isfile, join
+import glob
+
+modules = glob.glob(join(dirname(__file__), "*"))
+__all__ = [basename(f) for f in modules if not isfile(f)]

Makefile

@@ -1,13 +1,21 @@
 APP_UID := $(shell id -u)
 
+setup_mounts:
+	@mkdir -p mounts/db
+	@mkdir -p mounts/logs
+	@mkdir -p mounts/modules
+	@chown $(APP_UID) mounts/db
+	@chown $(APP_UID) mounts/logs
+	@chown $(APP_UID) mounts/modules
+
 ## make all : Run service, test and linter
 .PHONY: all
 all: build test lint
 
 ## make dev : Build and start docker containers - (web/test/db)
 .PHONY: dev
 dev: export APPUID = $(APP_UID)
-dev:
+dev: setup_mounts
 	@docker-compose build && docker-compose up -d web celery
 
 ## make build : Build and start docker containers - (web and db)
@@ -26,7 +34,7 @@ logs:
 
 ## Run tests with coverage
 .PHONY: test
-test:
+test: setup_mounts
 	@if [ $$(docker ps -a -f name=dev | wc -l) -eq 2 ]; then \
 		docker exec dev python -m pytest --version; \
 	else \

docker-compose.yml

@@ -12,9 +12,9 @@ services:
     - ./secrets/ops_app_dev.env
     volumes:
     - ./:/srv/code/dev
-    - access_modules:/srv/code/dev/Access/access_modules
-    - database_store:/srv/code/dev/db
-    - logs_volume:/ebs/logs
+    - ./mounts/modules:/srv/code/dev/Access/access_modules
+    - ./mounts/db:/srv/code/dev/db
+    - ./mounts/logs:/ebs/logs
     ports:
     - 8000:8000
     depends_on:
@@ -30,7 +30,7 @@ services:
     env_file:
     - ./secrets/ops_mysql_dev.env
     volumes:
-    - database_store:/var/lib/mysql
+    - ./mounts/db:/var/lib/mysql
   redis:
     container_name: redis
     image: redis:alpine
@@ -46,9 +46,9 @@ services:
       args:
         APPUID: "${APPUID}"
     volumes:
-    - access_modules_celery:/srv/code/dev/Access/access_modules
-    - database_store:/srv/code/dev/db
-    - logs_volume:/ebs/logs
+    - ./mounts/modules:/srv/code/dev/Access/access_modules
+    - ./mounts/db:/srv/code/dev/db
+    - ./mounts/logs:/ebs/logs
     env_file:
     - ./secrets/ops_app_celery.env
     depends_on:
@@ -69,9 +69,4 @@ services:
     - ./secrets/ops_app_test.env
     volumes:
     - .:/srv/code/dev
-    - logs_volume:/ebs/logs
-volumes:
-  access_modules:
-  access_modules_celery:
-  database_store:
-  logs_volume:
+    - ./mounts/logs:/ebs/logs

scripts/clone_access_modules.py

@@ -16,7 +16,7 @@
             shutil.rmtree("Access/access_modules/%s" % each_access_module)
         except Exception as e:
             print("Got Error while deleting the path %s" % str(e))
-    open('Access/access_modules/__init__.py', 'w').close()
+    shutil.copyfile('Access/base_email_access/access_modules_init.py', "Access/access_modules/__init__.py")
 
     requirements_file = 'Access/access_modules/requirements.txt'
     if not os.path.exists(requirements_file):