Skip to content

AWS_REGION fix #2541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mlodic merged 4 commits into from
Oct 22, 2024
Merged

AWS_REGION fix #2541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a9d3e87
AWS_REGION
mlodic Oct 21, 2024
0c32904
AWS_REGION
mlodic Oct 21, 2024
a446a59
AWS_REGION
mlodic Oct 22, 2024
6db1899
AWS_REGION
mlodic Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion intel_owl/secrets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions intel_owl/settings/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
7 changes: 7 additions & 0 deletions intel_owl/settings/a_secrets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
1 change: 0 additions & 1 deletion intel_owl/settings/aws.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
3 changes: 2 additions & 1 deletion intel_owl/settings/db.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion intel_owl/settings/mail.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down