pulumi-django-azure 1.0.28__py3-none-any.whl → 1.0.59__py3-none-any.whl

pulumi_django_azure/settings.py

@@ -1,7 +1,7 @@
 import environ
 from azure.keyvault.secrets import SecretClient
 
-from .azure_helper import AZURE_CREDENTIAL, LOCAL_IP_ADDRESSES, get_db_password, get_redis_credentials, get_subscription
+from .azure_helper import AZURE_CREDENTIAL, LOCAL_IP_ADDRESSES, get_db_password, get_subscription
 
 env = environ.Env()
 
@@ -45,11 +45,10 @@ if azure_storage_account_name := env("AZURE_STORAGE_ACCOUNT_NAME", default=None)
 
 
 # CDN domain - shared for all storages
-if cdn_host := env("CDN_HOST", default=None):
-    AZURE_CUSTOM_DOMAIN = cdn_host
+AZURE_CUSTOM_DOMAIN = env("CDN_HOST", default=None)
 
-    STATIC_URL = f"https://{AZURE_CUSTOM_DOMAIN}/static/"
-    MEDIA_URL = f"https://{AZURE_CUSTOM_DOMAIN}/media/"
+# Cache-Control configuration for Azure Storage uploads
+AZURE_CACHE_CONTROL = env("AZURE_CACHE_CONTROL", default="public,max-age=31536000,immutable")
 
 # Storage configuration
 STORAGES = {}
@@ -62,6 +61,9 @@ if container_media := env("AZURE_STORAGE_CONTAINER_MEDIA", default=None):
         },
     }
 
+    if AZURE_CUSTOM_DOMAIN:
+        MEDIA_URL = f"https://{AZURE_CUSTOM_DOMAIN}/{container_media}/"
+
 if container_staticfiles := env("AZURE_STORAGE_CONTAINER_STATICFILES", default=None):
     STORAGES["staticfiles"] = {
         "BACKEND": "storages.backends.azure_storage.AzureStorage",
@@ -69,6 +71,11 @@ if container_staticfiles := env("AZURE_STORAGE_CONTAINER_STATICFILES", default=N
             "azure_container": container_staticfiles,
         },
     }
+    COLLECTFASTA_STRATEGY = "collectfasta.strategies.azure.AzureBlobStrategy"
+
+    if AZURE_CUSTOM_DOMAIN:
+        STATIC_URL = f"https://{AZURE_CUSTOM_DOMAIN}/{container_staticfiles}/"
+
 
 # This setting enables password rotation in the health check middleware
 if IS_AZURE_ENVIRONMENT:
@@ -104,65 +111,86 @@ if IS_AZURE_ENVIRONMENT:
         "disable_existing_loggers": False,
         "formatters": {
             "timestamped": {
-                "format": "{asctime} {levelname} {message}",
+                "format": "{asctime} {levelname} [p:{process:d}] [t:{thread:d}] {message}",
                 "style": "{",
             },
         },
         "handlers": {
-            "file": {
+            "console": {
                 "level": "INFO",
-                "class": "logging.handlers.RotatingFileHandler",
-                "filename": "/home/LogFiles/django.log",
-                # 50 MB
-                "maxBytes": 52428800,
-                "backupCount": 5,
+                "class": "logging.StreamHandler",
                 "formatter": "timestamped",
             },
         },
         "loggers": {
             "django": {
-                "handlers": ["file"],
+                "handlers": ["console"],
                 "level": "INFO",
                 "propagate": True,
             },
             "pulumi_django_azure": {
-                "handlers": ["file"],
-                "level": "INFO",
+                "handlers": ["console"],
+                "level": "DEBUG",
                 "propagate": True,
             },
         },
     }
 
 # Redis, if enabled
-redis_cache_host = env("REDIS_CACHE_HOST", default=None)
-redis_cache_port = env("REDIS_CACHE_PORT", default=None)
-redis_cache_db = env("REDIS_CACHE_DB", default=None)
-
-if redis_cache_host and redis_cache_port and redis_cache_db:
-    # This will enable the health check to update the Redis credentials
-    AZURE_REDIS_CREDENTIALS = True
+REDIS_SIDECAR = env("REDIS_SIDECAR", default=False)
 
-    # This will prevent the website from failing if Redis is not available
+if REDIS_SIDECAR:
+    # This will prevent the website from failing if Redis is not available.
     DJANGO_REDIS_IGNORE_EXCEPTIONS = True
     DJANGO_REDIS_LOG_IGNORED_EXCEPTIONS = True
 
-    REDIS_CACHE_HOST = redis_cache_host
-    REDIS_CACHE_PORT = redis_cache_port
-    REDIS_CACHE_DB = redis_cache_db
-    redis_credentials = get_redis_credentials()
-    REDIS_USERNAME = redis_credentials.username
-    REDIS_PASSWORD = redis_credentials.password
-
     CACHES = {
         "default": {
             "BACKEND": "django_redis.cache.RedisCache",
-            "LOCATION": f"rediss://{REDIS_USERNAME}@{REDIS_CACHE_HOST}:{REDIS_CACHE_PORT}/{REDIS_CACHE_DB}",
+            "LOCATION": "redis://localhost:6379/0",
             "OPTIONS": {
                 "CLIENT_CLASS": "django_redis.client.DefaultClient",
                 "PARSER_CLASS": "redis.connection._HiredisParser",
-                "PASSWORD": REDIS_PASSWORD,
             },
         },
     }
-else:
-    AZURE_REDIS_CREDENTIALS = False
+
+
+# Django tasks
+DJANGO_TASKS = env("DJANGO_TASKS", default=False)
+if DJANGO_TASKS and REDIS_SIDECAR:
+    RQ_QUEUES = {
+        "default": {
+            "USE_REDIS_CACHE": "default",
+            "QUEUES": ["default"],
+        }
+    }
+
+    TASKS = {
+        "default": {
+            "BACKEND": "django_tasks.backends.rq.RQBackend",
+        }
+    }
+
+
+def patch_django_settings_for_azure(INSTALLED_APPS: list, MIDDLEWARE: list, TEMPLATES: list):
+    """
+    Patch the Django settings to add the required apps and middleware.
+
+    :param INSTALLED_APPS: Reference to INSTALLED_APPS setting.
+    :param MIDDLEWARE: Reference to MIDDLEWARE setting.
+    :param TEMPLATES: Reference to TEMPLATES setting.
+    """
+    # Insert collectfasta at the correct position
+    INSTALLED_APPS.insert(INSTALLED_APPS.index("django.contrib.staticfiles"), "collectfasta")
+
+    # Add the required apps
+    INSTALLED_APPS.append("pulumi_django_azure")
+    INSTALLED_APPS.append("django_rq")
+    INSTALLED_APPS.append("django_tasks")
+
+    # Add the middleware
+    MIDDLEWARE.append("pulumi_django_azure.middleware.HealthCheckMiddleware")
+
+    # Add the template context processors
+    TEMPLATES[0]["OPTIONS"]["context_processors"].append("pulumi_django_azure.context_processors.add_build_info")