pulumi-django-azure 1.0.22__tar.gz → 1.0.24__tar.gz

{pulumi_django_azure-1.0.22/src/pulumi_django_azure.egg-info → pulumi_django_azure-1.0.24}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pulumi-django-azure
-Version: 1.0.22
+Version: 1.0.24
 Summary: Simply deployment of Django on Azure with Pulumi
 Author-email: Maarten Ureel <maarten@youreal.eu>
 License: MIT License
@@ -46,6 +46,7 @@ Requires-Dist: pulumi>=3.156.0
 Requires-Dist: pulumi-azure-native>=2.89.1
 Requires-Dist: pulumi-random>=4.18.0
 Requires-Dist: redis[hiredis]<6.0.0,>=5.2.1
+Dynamic: license-file
 
 # Pulumi Django Deployment
 

{pulumi_django_azure-1.0.22 → pulumi_django_azure-1.0.24}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pulumi-django-azure"
-version = "1.0.22"
+version = "1.0.24"
 description = "Simply deployment of Django on Azure with Pulumi"
 readme = "README.md"
 authors = [{ name = "Maarten Ureel", email = "maarten@youreal.eu" }]
@@ -37,7 +37,7 @@ Homepage = "https://gitlab.com/MaartenUreel/pulumi-django-azure"
 
 [tool.poetry]
 name = "pulumi-django-azure"
-version = "1.0.22"
+version = "1.0.24"
 description = "Simply deployment of Django on Azure with Pulumi"
 authors = ["Maarten Ureel <maarten@youreal.eu>"]
 

{pulumi_django_azure-1.0.22 → pulumi_django_azure-1.0.24}/src/pulumi_django_azure/django_deployment.py

@@ -844,6 +844,7 @@ class DjangoDeployment(pulumi.ComponentResource):
         dedicated_app_service_sku: azure.web.SkuDescriptionArgs | None = None,
         vault_administrators: list[str] | None = None,
         cache_db: int | None = None,
+        startup_timeout: int = 300,
     ) -> azure.web.WebApp:
         """
         Create a Django website with it's own database and storage containers.
@@ -864,6 +865,7 @@ class DjangoDeployment(pulumi.ComponentResource):
         :param dedicated_app_service_sku: The SKU for the dedicated App Service Plan (optional).
         :param vault_administrators: The principal IDs of the vault administrators (optional).
         :param cache_db: The index of the cache database to use (optional).
+        :param startup_timeout: The startup timeout for the App Service (default is 300 seconds).
         """
 
         # Create a database
@@ -962,6 +964,10 @@ class DjangoDeployment(pulumi.ComponentResource):
                 # scm_type=azure.web.ScmType.EXTERNAL_GIT,
                 linux_fx_version=f"PYTHON|{python_version}",
                 app_settings=[
+                    # Startup settings
+                    azure.web.NameValuePairArgs(name="WEBSITES_CONTAINER_START_TIME_LIMIT", value=str(startup_timeout)),
+                    # To support our settings helper
+                    azure.web.NameValuePairArgs(name="IS_AZURE_ENVIRONMENT", value="true"),
                     # Build settings
                     azure.web.NameValuePairArgs(name="SCM_DO_BUILD_DURING_DEPLOYMENT", value="true"),
                     azure.web.NameValuePairArgs(name="PRE_BUILD_COMMAND", value="cicd/pre_build.sh"),

{pulumi_django_azure-1.0.22 → pulumi_django_azure-1.0.24}/src/pulumi_django_azure/middleware.py

@@ -1,43 +1,43 @@
-from django.conf import settings
-from django.core.cache import cache
-from django.db import connection
-from django.db.utils import OperationalError
-from django.http import HttpResponse
-from django_redis import get_redis_connection
-
-from .azure_helper import get_db_password, get_redis_credentials
-
-
-class HealthCheckMiddleware:
-    def __init__(self, get_response):
-        self.get_response = get_response
-
-    def __call__(self, request):
-        if request.path == settings.HEALTH_CHECK_PATH:
-            # Update the database credentials if needed
-            if settings.AZURE_DB_PASSWORD:
-                settings.DATABASES["default"]["PASSWORD"] = get_db_password()
-
-            # Update the Redis credentials if needed
-            if settings.AZURE_REDIS_CREDENTIALS:
-                redis_credentials = get_redis_credentials()
-
-                # Re-authenticate the Redis connection
-                redis_connection = get_redis_connection("default")
-                redis_connection.execute_command("AUTH", redis_credentials.username, redis_credentials.password)
-
-                settings.CACHES["default"]["OPTIONS"]["PASSWORD"] = redis_credentials.password
-
-            try:
-                # Test the database connection
-                connection.ensure_connection()
-
-                # Test the Redis connection
-                cache.set("health_check", "test")
-
-                return HttpResponse("OK")
-
-            except OperationalError:
-                return HttpResponse(status=503)
-
-        return self.get_response(request)
+from django.conf import settings
+from django.core.cache import cache
+from django.db import connection
+from django.db.utils import OperationalError
+from django.http import HttpResponse
+from django_redis import get_redis_connection
+
+from .azure_helper import get_db_password, get_redis_credentials
+
+
+class HealthCheckMiddleware:
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        if request.path == settings.HEALTH_CHECK_PATH:
+            # Update the database credentials if needed
+            if settings.AZURE_DB_PASSWORD:
+                settings.DATABASES["default"]["PASSWORD"] = get_db_password()
+
+            # Update the Redis credentials if needed
+            if settings.AZURE_REDIS_CREDENTIALS:
+                redis_credentials = get_redis_credentials()
+
+                # Re-authenticate the Redis connection
+                redis_connection = get_redis_connection("default")
+                redis_connection.execute_command("AUTH", redis_credentials.username, redis_credentials.password)
+
+                settings.CACHES["default"]["OPTIONS"]["PASSWORD"] = redis_credentials.password
+
+            try:
+                # Test the database connection
+                connection.ensure_connection()
+
+                # Test the Redis connection
+                cache.set("health_check", "test")
+
+                return HttpResponse("OK")
+
+            except OperationalError:
+                return HttpResponse(status=503)
+
+        return self.get_response(request)

pulumi_django_azure-1.0.24/src/pulumi_django_azure/settings.py

@@ -0,0 +1,154 @@
+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
+
+env = environ.Env()
+
+SECRET_KEY = env("DJANGO_SECRET_KEY", default=None)
+
+IS_AZURE_ENVIRONMENT = env("IS_AZURE_ENVIRONMENT", default=False)
+
+# Some generic stuff we only need if we're running in Azure.
+# Most of the other stuff will check for the explicit variable we need.
+if IS_AZURE_ENVIRONMENT:
+    # Detect HTTPS behind AppService
+    SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
+
+    # Azure context
+    AZURE_SUBSCRIPTION = get_subscription()
+    AZURE_TENANT_ID = AZURE_SUBSCRIPTION.tenant_id
+    AZURE_SUBSCRIPTION_ID = AZURE_SUBSCRIPTION.subscription_id
+
+# Health check path
+HEALTH_CHECK_PATH = env("HEALTH_CHECK_PATH", default="/health")
+
+ALLOWED_HOSTS: list = env.list("DJANGO_ALLOWED_HOSTS", default=[])
+
+# WEBSITE_HOSTNAME contains the Azure domain name
+if website_hostname := env("WEBSITE_HOSTNAME", default=None):
+    ALLOWED_HOSTS.append(website_hostname)
+
+# Add the local IP addresses of the machine for health checks
+ALLOWED_HOSTS.extend(LOCAL_IP_ADDRESSES)
+
+# Azure Key Vault
+if azure_key_vault := env("AZURE_KEY_VAULT", default=None):
+    AZURE_KEY_VAULT_URI = f"https://{azure_key_vault}.vault.azure.net"
+    AZURE_KEY_VAULT_CLIENT = SecretClient(vault_url=AZURE_KEY_VAULT_URI, credential=AZURE_CREDENTIAL)
+
+# Allow CSRF cookies to be sent from our domains
+# CSRF_TRUSTED_ORIGINS = ["https://" + host for host in ALLOWED_HOSTS]
+if azure_storage_account_name := env("AZURE_STORAGE_ACCOUNT_NAME", default=None):
+    AZURE_ACCOUNT_NAME = azure_storage_account_name
+    AZURE_TOKEN_CREDENTIAL = AZURE_CREDENTIAL
+
+
+# CDN domain - shared for all storages
+if cdn_host := env("CDN_HOST", default=None):
+    AZURE_CUSTOM_DOMAIN = cdn_host
+
+    STATIC_URL = f"https://{AZURE_CUSTOM_DOMAIN}/static/"
+    MEDIA_URL = f"https://{AZURE_CUSTOM_DOMAIN}/media/"
+
+# Storage configuration
+STORAGES = {}
+if container_media := env("AZURE_STORAGE_CONTAINER_MEDIA", default=None):
+    STORAGES["default"] = {
+        "BACKEND": "storages.backends.azure_storage.AzureStorage",
+        "OPTIONS": {
+            "azure_container": container_media,
+            "overwrite_files": False,
+        },
+    }
+
+if container_staticfiles := env("AZURE_STORAGE_CONTAINER_STATICFILES", default=None):
+    STORAGES["staticfiles"] = {
+        "BACKEND": "storages.backends.azure_storage.AzureStorage",
+        "OPTIONS": {
+            "azure_container": container_staticfiles,
+        },
+    }
+
+# This setting enables password rotation in the health check middleware
+if IS_AZURE_ENVIRONMENT:
+    AZURE_DB_PASSWORD = True
+    DATABASES = {
+        "default": {
+            "ENGINE": "django.db.backends.postgresql",
+            "NAME": env("DB_NAME"),
+            "USER": env("DB_USER"),
+            "HOST": env("DB_HOST"),
+            "PASSWORD": get_db_password(),
+            "PORT": "5432",
+            "OPTIONS": {
+                "sslmode": "require",
+            },
+            # Make connections persistent
+            "CONN_MAX_AGE": None,
+            # To enable health checks, add the following:
+            # "CONN_HEALTH_CHECKS": True,
+        }
+    }
+
+# Email
+EMAIL_BACKEND = "django_azure_communication_email.EmailBackend"
+AZURE_COMMUNICATION_ENDPOINT = env("AZURE_COMMUNICATION_SERVICE_ENDPOINT", default=None)
+DEFAULT_FROM_EMAIL = env("DJANGO_DEFAULT_FROM_EMAIL", default=None)
+
+
+# Logging
+if IS_AZURE_ENVIRONMENT:
+    LOGGING = {
+        "version": 1,
+        "disable_existing_loggers": False,
+        "handlers": {
+            "file": {
+                "level": "INFO",
+                "class": "logging.handlers.TimedRotatingFileHandler",
+                "filename": "/home/LogFiles/django.log",
+                "when": "h",
+                "interval": 1,
+                "backupCount": 24,
+            },
+        },
+        "loggers": {
+            "django": {
+                "handlers": ["file"],
+                "level": "INFO",
+                "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
+
+    # 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}",
+            "OPTIONS": {
+                "CLIENT_CLASS": "django_redis.client.DefaultClient",
+                "PARSER_CLASS": "redis.connection._HiredisParser",
+                "PASSWORD": REDIS_PASSWORD,
+            },
+        },
+    }

{pulumi_django_azure-1.0.22 → pulumi_django_azure-1.0.24/src/pulumi_django_azure.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pulumi-django-azure
-Version: 1.0.22
+Version: 1.0.24
 Summary: Simply deployment of Django on Azure with Pulumi
 Author-email: Maarten Ureel <maarten@youreal.eu>
 License: MIT License
@@ -46,6 +46,7 @@ Requires-Dist: pulumi>=3.156.0
 Requires-Dist: pulumi-azure-native>=2.89.1
 Requires-Dist: pulumi-random>=4.18.0
 Requires-Dist: redis[hiredis]<6.0.0,>=5.2.1
+Dynamic: license-file
 
 # Pulumi Django Deployment
 

pulumi_django_azure-1.0.22/src/pulumi_django_azure/settings.py

@@ -1,137 +0,0 @@
-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
-
-env = environ.Env()
-
-SECRET_KEY = env("DJANGO_SECRET_KEY")
-
-# Health check path
-HEALTH_CHECK_PATH = env("HEALTH_CHECK_PATH", default="/health")
-
-ALLOWED_HOSTS: list = env.list("DJANGO_ALLOWED_HOSTS", default=[])
-# WEBSITE_HOSTNAME contains the Azure domain name
-ALLOWED_HOSTS.append(env("WEBSITE_HOSTNAME"))
-# Add the local IP addresses of the machine for health checks
-ALLOWED_HOSTS.extend(LOCAL_IP_ADDRESSES)
-
-# Detect HTTPS behind AppService
-SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
-
-
-# Azure context
-AZURE_SUBSCRIPTION = get_subscription()
-AZURE_TENANT_ID = AZURE_SUBSCRIPTION.tenant_id
-AZURE_SUBSCRIPTION_ID = AZURE_SUBSCRIPTION.subscription_id
-
-# Azure Key Vault
-AZURE_KEY_VAULT = env("AZURE_KEY_VAULT")
-AZURE_KEY_VAULT_URI = f"https://{AZURE_KEY_VAULT}.vault.azure.net"
-AZURE_KEY_VAULT_CLIENT = SecretClient(vault_url=AZURE_KEY_VAULT_URI, credential=AZURE_CREDENTIAL)
-
-# Allow CSRF cookies to be sent from our domains
-# CSRF_TRUSTED_ORIGINS = ["https://" + host for host in ALLOWED_HOSTS]
-AZURE_ACCOUNT_NAME = env("AZURE_STORAGE_ACCOUNT_NAME")
-AZURE_TOKEN_CREDENTIAL = AZURE_CREDENTIAL
-
-
-# CDN domain - shared for all storages
-AZURE_CUSTOM_DOMAIN = env("CDN_HOST")
-
-STORAGES = {
-    "default": {
-        "BACKEND": "storages.backends.azure_storage.AzureStorage",
-        "OPTIONS": {
-            "azure_container": env("AZURE_STORAGE_CONTAINER_MEDIA"),
-            "overwrite_files": False,
-        },
-    },
-    "staticfiles": {
-        "BACKEND": "storages.backends.azure_storage.AzureStorage",
-        "OPTIONS": {
-            "azure_container": env("AZURE_STORAGE_CONTAINER_STATICFILES"),
-        },
-    },
-}
-
-
-# STATIC_ROOT = BASE_DIR / "staticfiles"
-STATIC_URL = f"https://{AZURE_CUSTOM_DOMAIN}/static/"
-MEDIA_URL = f"https://{AZURE_CUSTOM_DOMAIN}/media/"
-
-# This setting enables password rotation in the health check middleware
-AZURE_DB_PASSWORD = True
-DATABASES = {
-    "default": {
-        "ENGINE": "django.db.backends.postgresql",
-        "NAME": env("DB_NAME"),
-        "USER": env("DB_USER"),
-        "HOST": env("DB_HOST"),
-        "PASSWORD": get_db_password(),
-        "PORT": "5432",
-        "OPTIONS": {
-            "sslmode": "require",
-        },
-        # Make connections persistent
-        "CONN_MAX_AGE": None,
-        # To enable health checks, add the following:
-        # "CONN_HEALTH_CHECKS": True,
-    }
-}
-
-# Email
-EMAIL_BACKEND = "django_azure_communication_email.EmailBackend"
-AZURE_COMMUNICATION_ENDPOINT = env("AZURE_COMMUNICATION_SERVICE_ENDPOINT")
-DEFAULT_FROM_EMAIL = env("DJANGO_DEFAULT_FROM_EMAIL")
-
-
-# Logging
-LOGGING = {
-    "version": 1,
-    "disable_existing_loggers": False,
-    "handlers": {
-        "file": {
-            "level": "INFO",
-            "class": "logging.handlers.RotatingFileHandler",
-            "filename": "/home/LogFiles/django.log",
-            "maxBytes": 1024 * 1024 * 100,  # 100 mb
-            "backupCount": 5,
-        },
-    },
-    "loggers": {
-        "django": {
-            "handlers": ["file"],
-            "level": "INFO",
-            "propagate": True,
-        },
-    },
-}
-
-# Redis, if enabled
-if env("REDIS_CACHE_HOST") and env("REDIS_CACHE_PORT") and env("REDIS_CACHE_DB"):
-    # This will enable the health check to update the Redis credentials
-    AZURE_REDIS_CREDENTIALS = True
-
-    # 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 = env("REDIS_CACHE_HOST")
-    REDIS_CACHE_PORT = env("REDIS_CACHE_PORT")
-    REDIS_CACHE_DB = env("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}",
-            "OPTIONS": {
-                "CLIENT_CLASS": "django_redis.client.DefaultClient",
-                "PARSER_CLASS": "redis.connection._HiredisParser",
-                "PASSWORD": REDIS_PASSWORD,
-            },
-        },
-    }