AWS_REGION fix (intelowlproject#2541)

* AWS_REGION * AWS_REGION * AWS_REGION * AWS_REGION
xofolowski · Oct 22, 2024 · 68765cb · 68765cb
1 parent 9cec152
commit 68765cb
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/intel_owl/secrets.py b/intel_owl/secrets.py
@@ -75,7 +75,7 @@ def get_secret(secret_name, default=""):
     """
     secret = os.environ.get(secret_name, default)
     aws_secrets_enabled = os.environ.get("AWS_SECRETS", False) == "True"
-    if not secret and aws_secrets_enabled:
+    if not secret and aws_secrets_enabled and not secret_name == "AWS_REGION":
         try:
             secret = aws_get_secret(secret_name)
         except RetrieveSecretException as e:

diff --git a/intel_owl/settings/__init__.py b/intel_owl/settings/__init__.py
@@ -54,6 +54,7 @@
     "treebeard",
 ]
 
+from .a_secrets import *  # lgtm [py/polluting-import]
 from .auth import *  # lgtm [py/polluting-import]
 from .aws import *  # lgtm [py/polluting-import]
 from .cache import *  # lgtm [py/polluting-import]

diff --git a/intel_owl/settings/a_secrets.py b/intel_owl/settings/a_secrets.py
@@ -0,0 +1,7 @@
+# This file is a part of IntelOwl https://github.com/intelowlproject/IntelOwl
+# See the file 'LICENSE' for copying permission.
+
+from intel_owl import secrets
+
+# this must be first because the function get_secretes depends from it
+AWS_REGION = secrets.get_secret("AWS_REGION", "eu-central-1")
diff --git a/intel_owl/settings/aws.py b/intel_owl/settings/aws.py
@@ -10,7 +10,6 @@
     AWS_SECRET_ACCESS_KEY = secrets.get_secret("AWS_SECRET_ACCESS_KEY")
 AWS_SECRETS = secrets.get_secret("AWS_SECRETS", False) == "True"
 AWS_SQS = secrets.get_secret("AWS_SQS", False) == "True"
-AWS_REGION = secrets.get_secret("AWS_REGION", "eu-central-1")
 AWS_USER_NUMBER = secrets.get_secret("AWS_USER_NUMBER")
 
 AWS_RDS_IAM_ROLE = secrets.get_secret("AWS_RDS_IAM_ROLE", False) == "True"
diff --git a/intel_owl/settings/db.py b/intel_owl/settings/db.py
@@ -7,7 +7,8 @@
 
 from intel_owl import secrets
 
-from .aws import AWS_RDS_IAM_ROLE, AWS_REGION
+from .a_secrets import AWS_REGION
+from .aws import AWS_RDS_IAM_ROLE
 
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 

diff --git a/intel_owl/settings/mail.py b/intel_owl/settings/mail.py
@@ -2,7 +2,7 @@
 # See the file 'LICENSE' for copying permission.
 
 from ._util import get_secret
-from .aws import AWS_REGION
+from .a_secrets import AWS_REGION
 from .commons import STAGE_CI, STAGE_LOCAL
 
 DEFAULT_FROM_EMAIL = get_secret("DEFAULT_FROM_EMAIL")