♻️ Maintenance: removing/adding EFS env vars ⚠️ (ITISFoundation#6837)

sanderegg · Dec 2, 2024 · dfd1463 · dfd1463
1 parent dc35757
commit dfd1463
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/.env-devel b/.env-devel
@@ -90,8 +90,8 @@ EFS_GROUP_NAME=efs-group
 EFS_DNS_NAME=fs-xxx.efs.us-east-1.amazonaws.com
 EFS_MOUNTED_PATH=/tmp/efs
 EFS_PROJECT_SPECIFIC_DATA_DIRECTORY=project-specific-data
-EFS_ONLY_ENABLED_FOR_USERIDS=[]
 EFS_GUARDIAN_TRACING={}
+EFS_DEFAULT_USER_SERVICE_SIZE_BYTES=10000
 
 # DATCORE_ADAPTER
 DATCORE_ADAPTER_TRACING={}

diff --git a/packages/settings-library/src/settings_library/efs.py b/packages/settings-library/src/settings_library/efs.py
@@ -14,10 +14,6 @@ class AwsEfsSettings(BaseCustomSettings):
     EFS_MOUNTED_PATH: Path = Field(
         description="This is the path where EFS is mounted to the EC2 machine",
     )
-    EFS_ONLY_ENABLED_FOR_USERIDS: list[int] = Field(
-        description="This is temporary solution so we can enable it for specific users for testing purpose",
-        examples=[[1]],
-    )
 
 
 NFS_PROTOCOL = "4.1"

diff --git a/services/docker-compose.yml b/services/docker-compose.yml
@@ -345,7 +345,6 @@ services:
 
       EFS_DNS_NAME: ${EFS_DNS_NAME}
       EFS_MOUNTED_PATH: ${EFS_MOUNTED_PATH}
-      EFS_ONLY_ENABLED_FOR_USERIDS: ${EFS_ONLY_ENABLED_FOR_USERIDS}
       EFS_PROJECT_SPECIFIC_DATA_DIRECTORY: ${EFS_PROJECT_SPECIFIC_DATA_DIRECTORY}
 
       RABBIT_HOST: ${RABBIT_HOST}
@@ -433,8 +432,8 @@ services:
       EFS_GROUP_ID: ${EFS_GROUP_ID}
       EFS_GROUP_NAME: ${EFS_GROUP_NAME}
       EFS_DNS_NAME: ${EFS_DNS_NAME}
+      EFS_DEFAULT_USER_SERVICE_SIZE_BYTES: ${EFS_DEFAULT_USER_SERVICE_SIZE_BYTES}
       EFS_MOUNTED_PATH: ${EFS_MOUNTED_PATH}
-      EFS_ONLY_ENABLED_FOR_USERIDS: ${EFS_ONLY_ENABLED_FOR_USERIDS}
       EFS_PROJECT_SPECIFIC_DATA_DIRECTORY: ${EFS_PROJECT_SPECIFIC_DATA_DIRECTORY}
       EFS_GUARDIAN_TRACING: ${EFS_GUARDIAN_TRACING}
       TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}

diff --git a/services/efs-guardian/tests/conftest.py b/services/efs-guardian/tests/conftest.py
@@ -72,7 +72,6 @@ def app_environment(
             "EFS_DNS_NAME": "fs-xxx.efs.us-east-1.amazonaws.com",
             "EFS_MOUNTED_PATH": "/tmp/efs",
             "EFS_PROJECT_SPECIFIC_DATA_DIRECTORY": "project-specific-data",
-            "EFS_ONLY_ENABLED_FOR_USERIDS": "[]",
             "EFS_GUARDIAN_TRACING": "null",
             "SC_USER_ID": "8004",
             "SC_USER_NAME": "scu",