Merge pull request #44 from aclark4life/main

Misc updates

Author: aclark4life

django_mongodb_cli/project.py

@@ -228,6 +228,10 @@ def migrate_project(
         None,
         help="Optional MongoDB connection URI. Falls back to $MONGODB_URI if not provided.",
     ),
+    database: str = typer.Option(
+        None,
+        help="Specify the database to migrate.",
+    ),
 ):
     """
     Run Django migrations using django-admin instead of manage.py.
@@ -238,7 +242,8 @@ def migrate_project(
         cmd.append(app_label)
     if migration_name:
         cmd.append(migration_name)
-
+    if database:
+        cmd.append(f"--database={database}")
     typer.echo(f"📦 Applying migrations for project '{name}'")
     _django_manage_command(
         name, directory, *cmd, extra_env=_build_mongodb_env(mongodb_uri)
@@ -277,6 +282,10 @@ def manage_command(
     mongodb_uri: str = typer.Option(
         None, "--mongodb-uri", help="MongoDB connection URI"
     ),
+    database: str = typer.Option(
+        None,
+        help="Specify the database to use.",
+    ),
 ):
     """
     Run any django-admin command for a project.
@@ -297,6 +306,9 @@ def manage_command(
 
         os.environ["MONGODB_URI"] = mongodb_uri
 
+    if database:
+        args.append(f"--database={database}")
+
     if command:
         typer.echo(f"⚙️  Running django-admin {command} {' '.join(args)} for '{name}'")
         _django_manage_command(name, directory, command, *args)

django_mongodb_cli/templates/project_template/project_name/routers.py

@@ -1,19 +1,23 @@
+from django_mongodb_backend.utils import model_has_encrypted_fields
+
+
 class EncryptedRouter:
-    def db_for_read(self, model, **hints):
-        if model._meta.app_label == "django_mongodb_demo":
-            return "encrypted"
+    def allow_migrate(self, db, app_label, model_name=None, **hints):
+        if hints.get("model"):
+            if model_has_encrypted_fields(hints["model"]):
+                return db == "encrypted"
+            else:
+                return db == "default"
         return None
 
-    db_for_write = db_for_read
+    def db_for_read(self, model, **hints):
+        if model_has_encrypted_fields(model):
+            return "encrypted"
+        return "default"
 
-    def allow_migrate(self, db, app_label, model_name=None, **hints):
-        if app_label == "django_mongodb_demo":
-            print("allow_migrate for django_mongodb_demo:", db)
-            return db == "encrypted"
-        # Don't create other app's models in the encrypted database.
-        if db == "encrypted":
-            return False
+    def kms_provider(self, model):
+        if model_has_encrypted_fields(model):
+            return "local"
         return None
 
-    def kms_provider(self, model, **hints):
-        return "local"
+    db_for_write = db_for_read

django_mongodb_cli/templates/project_template/project_name/settings/project_name.py

@@ -16,8 +16,12 @@
     "NAME": "{{ project_name }}_encrypted",
     "OPTIONS": {
         "auto_encryption_opts": AutoEncryptionOpts(
-            kms_providers={"local": {"key": os.urandom(96)}},  # noqa
-            key_vault_namespace="keyvault.__keyVault",
+            kms_providers={
+                "local": {
+                    "key": b"tO\x7f\xf2L0\x9e\xab\xcd'\xd3\xd4'P\xf5;3\x94\xde8\xd7\xa4\xc5J\xe9\xb7\xc6\t\xbe\xa3<\xb3\xbe\xb3\xe5E\xb1\xdf[\xfb\x94\x8c`\x9e\xa20*\x82\x16\x98\xa32\x11\xa6\xeb\xfa\x05e\x08/\xe2\x01\xe8\xf1'#\xf9E\xde\xb0\x07Z\x93V\x84.\xf5\xb9\xdbR\xf6\xf6!\xd7;\xa9c\x087\xa1f\x9c\x1b\x86\xe8D"
+                }
+            },
+            key_vault_namespace="{{ project_name }}_encrypted.__keyVault",
         ),
     },
 }

pyproject.toml

@@ -86,6 +86,7 @@ repos = [
     "mongo @ git+ssh://[email protected]/mongodb/mongo@master",
     "drivers-evergreen-tools @ git+ssh://[email protected]/mongodb-labs/drivers-evergreen-tools@master",
     "docs @ git+ssh://[email protected]/mongodb/docs@main",
+    "docs-sample-apps @ git+ssh://[email protected]/mongodb/docs-sample-apps@main",
     "flask-pymongo @ git+ssh://[email protected]/mongodb-labs/flask-pymongo",
     "mongo-arrow @ git+ssh://[email protected]/mongodb-labs/mongo-arrow@main",
     "mongo-orchestration @ git+ssh://[email protected]/mongodb-labs/mongo-orchestration@master",

test/settings/qe.py

@@ -6,6 +6,12 @@
 
 
 MONGODB_URI = os.environ.get("MONGODB_URI", "mongodb://localhost:27017")
+
+KMS_CREDENTIALS = {
+    "local": {
+        "key": os.urandom(96),
+    },
+}
 DATABASES = {
     "default": {
         "ENGINE": "django_mongodb_backend",
@@ -24,26 +30,14 @@
         "OPTIONS": {
             "auto_encryption_opts": AutoEncryptionOpts(
                 key_vault_namespace="djangotests_encrypted.__keyVault",
-                kms_providers={
-                    "local": {"key": os.urandom(96)},
-                },
+                kms_providers=KMS_CREDENTIALS,
             ),
         },
     },
 }
 
 
 class EncryptedRouter:
-    def db_for_read(self, model, **hints):
-        if model_has_encrypted_fields(model):
-            return "encrypted"
-        return "default"
-
-    def db_for_write(self, model, **hints):
-        if model_has_encrypted_fields(model):
-            return "encrypted"
-        return "default"
-
     def allow_migrate(self, db, app_label, model_name=None, **hints):
         if hints.get("model"):
             if model_has_encrypted_fields(hints["model"]):
@@ -52,11 +46,18 @@ def allow_migrate(self, db, app_label, model_name=None, **hints):
                 return db == "default"
         return None
 
+    def db_for_read(self, model, **hints):
+        if model_has_encrypted_fields(model):
+            return "encrypted"
+        return "default"
+
     def kms_provider(self, model):
         if model_has_encrypted_fields(model):
             return "local"
         return None
 
+    db_for_write = db_for_read
+
 
 DATABASE_ROUTERS = [EncryptedRouter()]
 DEFAULT_AUTO_FIELD = "django_mongodb_backend.fields.ObjectIdAutoField"