Skip to content

Refactor code to get connection uri as one single env variable #131

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
asadeg02 merged 10 commits into from
Apr 10, 2025
Merged

Refactor code to get connection uri as one single env variable #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
888d274
feat: refactor mongodb connection urigeneration to get user and passw…
asadeg02 Apr 4, 2025
84266ed
fix: URL-encode MongoDB credentials to prevent InvalidURI errors
asadeg02 Apr 7, 2025
1c065a6
Merge branch 'main' into refactor/mongodb-connection-uri
asadeg02 Apr 7, 2025
0dd069a
fix: update MongoDB health check to ensure compatibility with AWS tas…
asadeg02 Apr 7, 2025
7247fda
Fix syntax error caused by resolving merge conflicts
asadeg02 Apr 7, 2025
5277070
Add relaxed health check endpoint for AWS container and ALB health ch…
asadeg02 Apr 8, 2025
adfd34d
Add option to allow all hosts by setting env variable
asadeg02 Apr 8, 2025
d8ff014
feat: add mongo database name to connection uri
asadeg02 Apr 9, 2025
8c969a1
Merge branch 'main' into refactor/mongodb-connection-uri
asadeg02 Apr 9, 2025
1dc2218
feat: refactor code to get connection uri as one single env variable
asadeg02 Apr 10, 2025
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 backend/backend/apis/bwwc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ def backup(req: HttpRequest) -> HttpResponse:
def mongo_health(req: HttpRequest) -> HttpResponse:
if req.method == "GET":
if not engine.is_mongodb_running():
return HttpResponseBadRequest(f"MongoDB is downnn at: mongodb://{engine.mongo_user}:{engine.mongo_password}@{engine.mongo_host}:{engine.mongo_port}/{engine.mongo_db}?{engine.mongo_params}")
return HttpResponseBadRequest(f"MongoDB is downnn at: {engine.mongo_uri}")
else:
return HttpResponse("MongoDB is up")
else:
Expand Down
7 changes: 1 addition & 6 deletions backend/env/.env.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@ POSTGRES_PORT = 5432
POSTGRES_USERNAME = postgres
POSTGRES_PASSWORD = postgres
POSTGRES_DATABASE = bwwc
MONGO_HOST = mongo
MONGO_PORT = 27017
MONGO_USER = bwwc
MONGO_PASSWORD = mongo
MONGO_DB = bwwc
MONGO_PARAMS = ""
MONGO_URI = mongodb://mongo:27017
DJANGO_ALLOWED_HOSTS = ""
ALLOW_ALL_HOSTS = false
8 changes: 1 addition & 7 deletions backend/env/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ SECRET_KEY = mysecret
PRIME = 2
BASE_URL = http://localhost:8000
THRESHOLD = 3
MONGO_HOST = mongodb://localhost:27017/
REDIS_HOST = localhost
REDIS_PW = secure_password
AUTH_PK_API = https:/auth-service.sail.codes/public-key
Expand All @@ -11,11 +10,6 @@ POSTGRES_PORT = 5432
POSTGRES_USERNAME = postgres
POSTGRES_PASSWORD = postgres
POSTGRES_DATABASE = bwwc
MONGO_HOST = localhost
MONGO_PORT = 27017
MONGO_USER = bwwc
MONGO_PASSWORD = mongo
MONGO_DB = bwwc
MONGO_PARAMS = ""
MONGO_URI = mongodb://localhost:27017/
DJANGO_ALLOWED_HOSTS = ""
ALLOW_ALL_HOSTS = false
7 changes: 4 additions & 3 deletions backend/secretshare/mpce.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,15 @@ class MPCEngine(object):
def __init__(self, protocol: str = "shamirs", prime: int = 180252380737439):
self.logger = logging.getLogger("django")

self.mongo_host = os.environ.get("MONGO_HOST")
'''self.mongo_host = os.environ.get("MONGO_HOST")
self.mongo_port = os.environ.get("MONGO_PORT")
self.mongo_user = urllib.parse.quote_plus(os.environ.get("MONGO_USER", "bwwc"))
self.mongo_password = urllib.parse.quote_plus(os.environ.get("MONGO_PASSWORD"))
self.mongo_db = os.environ.get("MONGO_DB", "bwwc")
self.mongo_params = os.environ.get("MONGO_PARAMS", "")
mongo_uri = f"mongodb://{self.mongo_user}:{self.mongo_password}@{self.mongo_host}:{self.mongo_port}/{self.mongo_db}?{self.mongo_params}"
self.logger.info(f"Connection URI is: {mongo_uri}")
mongo_uri = f"mongodb://{self.mongo_user}:{self.mongo_password}@{self.mongo_host}:{self.mongo_port}/{self.mongo_db}?{self.mongo_params}"'''
self.mongo_uri = os.environ.get("MONGO_URI", "mongodb://localhost:27017/")
self.logger.info(f"Connection URI is: {self.mongo_uri}")

self.mongo_client = MongoClient(mongo_uri)

Expand Down
Loading