pulumi-django-azure 1.0.32__tar.gz → 1.0.34__tar.gz

{pulumi_django_azure-1.0.32 → pulumi_django_azure-1.0.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulumi-django-azure
-Version: 1.0.32
+Version: 1.0.34
 Summary: Simply deployment of Django on Azure with Pulumi
 Author-email: Maarten Ureel <maarten@youreal.eu>
 License-Expression: MIT
@@ -19,10 +19,10 @@ Requires-Dist: django-azure-communication-email<2.0.0,>=1.3.2
 Requires-Dist: django-environ<0.13.0,>=0.12.0
 Requires-Dist: django-redis<6.0.0,>=5.4.0
 Requires-Dist: django-storages[azure]<2.0.0,>=1.14.6
-Requires-Dist: pulumi>=3.165.0
+Requires-Dist: pulumi>=3.166.0
 Requires-Dist: pulumi-azure-native>=3.2.0
-Requires-Dist: pulumi-random>=4.18.1
-Requires-Dist: redis[hiredis]<6.0.0,>=5.2.1
+Requires-Dist: pulumi-random>=4.18.2
+Requires-Dist: redis[hiredis]<7.0.0,>=6.0.0
 
 # Pulumi Django Deployment
 

{pulumi_django_azure-1.0.32 → pulumi_django_azure-1.0.34}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pulumi-django-azure"
-version = "1.0.32"
+version = "1.0.34"
 description = "Simply deployment of Django on Azure with Pulumi"
 readme = "README.md"
 authors = [{ name = "Maarten Ureel", email = "maarten@youreal.eu" }]
@@ -24,10 +24,10 @@ dependencies = [
     "django-environ (>=0.12.0,<0.13.0)",
     "django-redis (>=5.4.0,<6.0.0)",
     "django-storages[azure] (>=1.14.6,<2.0.0)",
-    "pulumi (>=3.165.0)",
+    "pulumi (>=3.166.0)",
     "pulumi-azure-native (>=3.2.0)",
-    "pulumi-random (>=4.18.1)",
-    "redis[hiredis] (>=5.2.1,<6.0.0)"
+    "pulumi-random (>=4.18.2)",
+    "redis[hiredis] (>=6.0.0,<7.0.0)"
 ]
 requires-python = ">=3.11,<3.14"
 
@@ -36,7 +36,7 @@ Homepage = "https://gitlab.com/MaartenUreel/pulumi-django-azure"
 
 [tool.poetry]
 name = "pulumi-django-azure"
-version = "1.0.32"
+version = "1.0.34"
 description = "Simplify deployment of Django websites on Azure with Pulumi"
 authors = ["Maarten Ureel <maarten@youreal.eu>"]
 
@@ -51,10 +51,10 @@ django-azure-communication-email = "^1.3.2"
 django-environ = "^0.12.0"
 django-redis = "^5.4.0"
 django-storages = {extras = ["azure"], version = "^1.14.6"}
-pulumi = ">=3.165.0"
+pulumi = ">=3.166.0"
 pulumi-azure-native = ">=3.2.0"
-pulumi-random = ">=4.18.1"
-redis = {extras = ["hiredis"], version = "^5.2.1"}
+pulumi-random = ">=4.18.2"
+redis = {extras = ["hiredis"], version = "^6.0.0"}
 
 [tool.poetry.group.dev.dependencies]
 build = "^1.2.2.post1"

pulumi_django_azure-1.0.34/src/pulumi_django_azure/azure_helper.py

@@ -0,0 +1,78 @@
+import base64
+import json
+import logging
+import os
+from dataclasses import dataclass
+from subprocess import check_output
+
+from azure.identity import DefaultAzureCredential
+from azure.mgmt.resource import SubscriptionClient
+from azure.mgmt.resource.subscriptions.models import Subscription
+
+logger = logging.getLogger("pulumi_django_azure.azure_helper")
+
+
+# Azure credentials
+AZURE_CREDENTIAL = DefaultAzureCredential()
+
+# Get the local IP addresses of the machine (only when runnig on Azure)
+if os.environ.get("IS_AZURE_ENVIRONMENT"):
+    LOCAL_IP_ADDRESSES = check_output(["hostname", "--all-ip-addresses"]).decode("utf-8").strip().split(" ")
+else:
+    LOCAL_IP_ADDRESSES = []
+
+
+def get_db_password() -> str:
+    """
+    Get a valid password for the database.
+    """
+    token = AZURE_CREDENTIAL.get_token("https://ossrdbms-aad.database.windows.net/.default")
+
+    logger.debug("New database token: %s", token)
+
+    return token.token
+
+
+@dataclass
+class RedisCredentials:
+    username: str
+    password: str
+
+
+def get_redis_credentials() -> RedisCredentials:
+    """
+    Get valid credentials for the Redis cache.
+    """
+    token = AZURE_CREDENTIAL.get_token("https://redis.azure.com/.default")
+
+    logger.debug("New Redis token: %s", token)
+
+    return RedisCredentials(_extract_username_from_token(token.token), token.token)
+
+
+def get_subscription() -> Subscription:
+    """
+    Get the subscription for the current user.
+    """
+    subscription_client = SubscriptionClient(AZURE_CREDENTIAL)
+    subscriptions = list(subscription_client.subscriptions.list())
+    return subscriptions[0]
+
+
+def _extract_username_from_token(token: str) -> str:
+    """
+    Extract the username from the JSON Web Token (JWT) token.
+    """
+    parts = token.split(".")
+    base64_str = parts[1]
+
+    if len(base64_str) % 4 == 2:
+        base64_str += "=="
+    elif len(base64_str) % 4 == 3:
+        base64_str += "="
+
+    json_bytes = base64.b64decode(base64_str)
+    json_str = json_bytes.decode("utf-8")
+    jwt = json.loads(json_str)
+
+    return jwt["oid"]

{pulumi_django_azure-1.0.32 → pulumi_django_azure-1.0.34}/src/pulumi_django_azure/middleware.py

@@ -8,7 +8,7 @@ from django.db.utils import OperationalError
 from django.http import HttpResponse
 from django_redis import get_redis_connection
 
-from .azure_helper import db_token_will_expire, get_db_password, get_redis_credentials, redis_token_will_expire
+from .azure_helper import get_db_password, get_redis_credentials
 
 logger = logging.getLogger("pulumi_django_azure.health_check")
 
@@ -27,25 +27,30 @@ class HealthCheckMiddleware:
             # Update the database credentials if needed
             if settings.AZURE_DB_PASSWORD:
                 try:
-                    if db_token_will_expire():
-                        logger.debug("Database token will expire, fetching new credentials")
-                        settings.DATABASES["default"]["PASSWORD"] = get_db_password()
+                    current_db_password = settings.DATABASES["default"]["PASSWORD"]
+                    new_db_password = get_db_password()
+
+                    if new_db_password != current_db_password:
+                        logger.debug("Database password has changed, updating credentials")
+                        settings.DATABASES["default"]["PASSWORD"] = new_db_password
+
+                        # Close existing connections to force reconnect with new password
+                        connection.close()
                     else:
-                        logger.debug("Database token is still valid, skipping credentials update")
+                        logger.debug("Database password unchanged, keeping existing credentials")
                 except Exception as e:
                     logger.error("Failed to update database credentials: %s", str(e))
-
                     self._self_heal()
-
                     return HttpResponse(status=503)
 
             # Update the Redis credentials if needed
             if settings.AZURE_REDIS_CREDENTIALS:
                 try:
-                    if redis_token_will_expire():
-                        logger.debug("Redis token will expire, fetching new credentials")
+                    current_redis_password = settings.CACHES["default"]["OPTIONS"]["PASSWORD"]
+                    redis_credentials = get_redis_credentials()
 
-                        redis_credentials = get_redis_credentials()
+                    if redis_credentials.password != current_redis_password:
+                        logger.debug("Redis password has changed, updating credentials")
 
                         # Re-authenticate the Redis connection
                         redis_connection = get_redis_connection("default")
@@ -53,12 +58,10 @@ class HealthCheckMiddleware:
 
                         settings.CACHES["default"]["OPTIONS"]["PASSWORD"] = redis_credentials.password
                     else:
-                        logger.debug("Redis token is still valid, skipping credentials update")
+                        logger.debug("Redis password unchanged, keeping existing credentials")
                 except Exception as e:
                     logger.error("Failed to update Redis credentials: %s", str(e))
-
                     self._self_heal()
-
                     return HttpResponse(status=503)
 
             try:
@@ -72,11 +75,10 @@ class HealthCheckMiddleware:
 
                 return HttpResponse("OK")
 
-            except OperationalError as e:
-                logger.error("Database connection failed: %s", str(e))
-                return HttpResponse(status=503)
             except Exception as e:
                 logger.error("Health check failed with unexpected error: %s", str(e))
+                logger.warning("Self-healing by gracefully restarting workers.")
+                self._self_heal()
                 return HttpResponse(status=503)
 
         return self.get_response(request)

{pulumi_django_azure-1.0.32 → pulumi_django_azure-1.0.34}/src/pulumi_django_azure.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulumi-django-azure
-Version: 1.0.32
+Version: 1.0.34
 Summary: Simply deployment of Django on Azure with Pulumi
 Author-email: Maarten Ureel <maarten@youreal.eu>
 License-Expression: MIT
@@ -19,10 +19,10 @@ Requires-Dist: django-azure-communication-email<2.0.0,>=1.3.2
 Requires-Dist: django-environ<0.13.0,>=0.12.0
 Requires-Dist: django-redis<6.0.0,>=5.4.0
 Requires-Dist: django-storages[azure]<2.0.0,>=1.14.6
-Requires-Dist: pulumi>=3.165.0
+Requires-Dist: pulumi>=3.166.0
 Requires-Dist: pulumi-azure-native>=3.2.0
-Requires-Dist: pulumi-random>=4.18.1
-Requires-Dist: redis[hiredis]<6.0.0,>=5.2.1
+Requires-Dist: pulumi-random>=4.18.2
+Requires-Dist: redis[hiredis]<7.0.0,>=6.0.0
 
 # Pulumi Django Deployment
 

{pulumi_django_azure-1.0.32 → pulumi_django_azure-1.0.34}/src/pulumi_django_azure.egg-info/requires.txt

@@ -7,7 +7,7 @@ django-azure-communication-email<2.0.0,>=1.3.2
 django-environ<0.13.0,>=0.12.0
 django-redis<6.0.0,>=5.4.0
 django-storages[azure]<2.0.0,>=1.14.6
-pulumi>=3.165.0
+pulumi>=3.166.0
 pulumi-azure-native>=3.2.0
-pulumi-random>=4.18.1
-redis[hiredis]<6.0.0,>=5.2.1
+pulumi-random>=4.18.2
+redis[hiredis]<7.0.0,>=6.0.0

pulumi_django_azure-1.0.32/src/pulumi_django_azure/azure_helper.py

@@ -1,114 +0,0 @@
-import base64
-import json
-import logging
-import os
-import time
-from dataclasses import dataclass
-from subprocess import check_output
-
-from azure.identity import DefaultAzureCredential
-from azure.mgmt.resource import SubscriptionClient
-from azure.mgmt.resource.subscriptions.models import Subscription
-
-_redis_token_cache = None
-_database_token_cache = None
-
-logger = logging.getLogger("pulumi_django_azure.azure_helper")
-
-
-# Azure credentials
-AZURE_CREDENTIAL = DefaultAzureCredential()
-
-# Get the local IP addresses of the machine (only when runnig on Azure)
-if os.environ.get("IS_AZURE_ENVIRONMENT"):
-    LOCAL_IP_ADDRESSES = check_output(["hostname", "--all-ip-addresses"]).decode("utf-8").strip().split(" ")
-else:
-    LOCAL_IP_ADDRESSES = []
-
-
-def get_db_password() -> str:
-    """
-    Get a valid password for the database.
-    """
-    global _database_token_cache
-    _database_token_cache = AZURE_CREDENTIAL.get_token("https://ossrdbms-aad.database.windows.net/.default")
-
-    logger.debug("New database token: %s", _database_token_cache)
-
-    return _database_token_cache.token
-
-
-def db_token_will_expire(treshold=300) -> bool:
-    """
-    Check if the database token will expire in the next treshold seconds.
-    """
-    # If the token is not cached, we consider it expired (so a new one will be fetched)
-    if _database_token_cache is None:
-        return True
-
-    logger.debug("Database token expires on: %s", _database_token_cache.expires_on)
-
-    # If the token is cached, check if it will expire in the next treshold seconds
-    return _database_token_cache.expires_on - time.time() < treshold
-
-
-@dataclass
-class RedisCredentials:
-    username: str
-    password: str
-
-
-def get_redis_credentials() -> RedisCredentials:
-    """
-    Get valid credentials for the Redis cache.
-    """
-    global _redis_token_cache
-    _redis_token_cache = AZURE_CREDENTIAL.get_token("https://redis.azure.com/.default")
-
-    t = _redis_token_cache.token
-
-    logger.debug("New Redis token: %s", _redis_token_cache)
-
-    return RedisCredentials(_extract_username_from_token(t), t)
-
-
-def redis_token_will_expire(treshold=300) -> bool:
-    """
-    Check if the Redis token will expire in the next treshold seconds.
-    """
-    # If the token is not cached, we consider it expired (so a new one will be fetched)
-    if _redis_token_cache is None:
-        return True
-
-    logger.debug("Redis token expires on: %s", _redis_token_cache.expires_on)
-
-    # If the token is cached, check if it will expire in the next treshold seconds
-    return _redis_token_cache.expires_on - time.time() < treshold
-
-
-def get_subscription() -> Subscription:
-    """
-    Get the subscription for the current user.
-    """
-    subscription_client = SubscriptionClient(AZURE_CREDENTIAL)
-    subscriptions = list(subscription_client.subscriptions.list())
-    return subscriptions[0]
-
-
-def _extract_username_from_token(token: str) -> str:
-    """
-    Extract the username from the JSON Web Token (JWT) token.
-    """
-    parts = token.split(".")
-    base64_str = parts[1]
-
-    if len(base64_str) % 4 == 2:
-        base64_str += "=="
-    elif len(base64_str) % 4 == 3:
-        base64_str += "="
-
-    json_bytes = base64.b64decode(base64_str)
-    json_str = json_bytes.decode("utf-8")
-    jwt = json.loads(json_str)
-
-    return jwt["oid"]