Skip to content

Commit acfd1d9

Browse files
committed
fix(db-connectors): default values
1 parent f6780ab commit acfd1d9

File tree

3 files changed

+19
-13
lines changed

3 files changed

+19
-13
lines changed

api/src/backend/api/db_router.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33

44
class MainRouter:
55
default_db = "default"
6-
user_read = "prowler_user_read"
6+
default_read = "default_read"
77
admin_db = "admin"
88
admin_read = "admin_read"
99

1010
def db_for_read(self, model, **hints): # noqa: F841
1111
model_table_name = model._meta.db_table
1212
if any(model_table_name.startswith(f"{app}_") for app in ALLOWED_APPS):
1313
return self.admin_read
14-
return self.user_read
14+
return self.default_read
1515

1616
def db_for_write(self, model, **hints): # noqa: F841
1717
model_table_name = model._meta.db_table
@@ -24,7 +24,7 @@ def allow_migrate(self, db, app_label, model_name=None, **hints): # noqa: F841
2424

2525
def allow_relation(self, obj1, obj2, **hints): # noqa: F841
2626
# Allow relations if both objects are using one of our defined connectors
27-
allowed = {self.user_write, self.default_db, self.admin_db, self.admin_read}
27+
allowed = {self.default_db, self.default_read, self.admin_db, self.admin_read}
2828
if {obj1._state.db, obj2._state.db} <= allowed:
2929
return True
3030
return None

api/src/backend/config/django/devel.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,18 @@
1414
"HOST": env("POSTGRES_HOST", default="postgres-db"),
1515
"PORT": env("POSTGRES_PORT", default="5432"),
1616
},
17-
"prowler_user_read": {
17+
"default_read": {
1818
"ENGINE": "psqlextra.backend",
1919
"NAME": env("POSTGRES_DB", default="prowler_db"),
2020
"USER": env("POSTGRES_USER", default="prowler_user"),
2121
"PASSWORD": env("POSTGRES_PASSWORD", default="prowler"),
2222
"HOST": env(
23-
"POSTGRES_HOST_READ_ONLY", env("POSTGRES_HOST", default="postgres-db")
23+
"POSTGRES_HOST_READ_ONLY",
24+
default=env("POSTGRES_HOST", default="postgres-db"),
25+
),
26+
"PORT": env(
27+
"POSTGRES_PORT_READ_ONLY", default=env("POSTGRES_PORT", default="5432")
2428
),
25-
"PORT": env("POSTGRES_PORT_READ_ONLY", env("POSTGRES_PORT", default="5432")),
2629
},
2730
"admin": {
2831
"ENGINE": "psqlextra.backend",
@@ -38,9 +41,12 @@
3841
"USER": env("POSTGRES_ADMIN_USER", default="prowler"),
3942
"PASSWORD": env("POSTGRES_ADMIN_PASSWORD", default="S3cret"),
4043
"HOST": env(
41-
"POSTGRES_HOST_READ_ONLY", env("POSTGRES_HOST", default="postgres-db")
44+
"POSTGRES_HOST_READ_ONLY",
45+
default=env("POSTGRES_HOST", default="postgres-db"),
46+
),
47+
"PORT": env(
48+
"POSTGRES_PORT_READ_ONLY", default=env("POSTGRES_PORT", default="5432")
4249
),
43-
"PORT": env("POSTGRES_PORT_READ_ONLY", env("POSTGRES_PORT", default="5432")),
4450
},
4551
}
4652
DATABASES["default"] = DATABASES["prowler_user"]

api/src/backend/config/django/production.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
"HOST": env("POSTGRES_HOST"),
1515
"PORT": env("POSTGRES_PORT"),
1616
},
17-
"prowler_user_read": {
17+
"default_read": {
1818
"ENGINE": "django.db.backends.postgresql",
1919
"NAME": env("POSTGRES_DB"),
2020
"USER": env("POSTGRES_USER"),
2121
"PASSWORD": env("POSTGRES_PASSWORD"),
22-
"HOST": env("POSTGRES_HOST_READ_ONLY", env("POSTGRES_HOST")),
23-
"PORT": env("POSTGRES_PORT_READ_ONLY", env("POSTGRES_PORT")),
22+
"HOST": env("POSTGRES_HOST_READ_ONLY", default=env("POSTGRES_HOST")),
23+
"PORT": env("POSTGRES_PORT_READ_ONLY", default=env("POSTGRES_PORT")),
2424
},
2525
"admin": {
2626
"ENGINE": "psqlextra.backend",
@@ -35,8 +35,8 @@
3535
"NAME": env("POSTGRES_DB"),
3636
"USER": env("POSTGRES_ADMIN_USER"),
3737
"PASSWORD": env("POSTGRES_ADMIN_PASSWORD"),
38-
"HOST": env("POSTGRES_HOST_READ_ONLY", env("POSTGRES_HOST")),
39-
"PORT": env("POSTGRES_PORT_READ_ONLY", env("POSTGRES_PORT")),
38+
"HOST": env("POSTGRES_HOST_READ_ONLY", default=env("POSTGRES_HOST")),
39+
"PORT": env("POSTGRES_PORT_READ_ONLY", default=env("POSTGRES_PORT")),
4040
},
4141
}
4242
DATABASES["default"] = DATABASES["prowler_user"]

0 commit comments

Comments
 (0)