pulumi-django-azure 1.0.32__py3-none-any.whl → 1.0.33__py3-none-any.whl

pulumi_django_azure/azure_helper.py

@@ -2,7 +2,6 @@ import base64
 import json
 import logging
 import os
-import time
 from dataclasses import dataclass
 from subprocess import check_output
 
@@ -10,9 +9,6 @@ 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")
 
 
@@ -30,26 +26,11 @@ 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
+    token = AZURE_CREDENTIAL.get_token("https://ossrdbms-aad.database.windows.net/.default")
 
-    logger.debug("Database token expires on: %s", _database_token_cache.expires_on)
+    logger.debug("New database token: %s", token)
 
-    # If the token is cached, check if it will expire in the next treshold seconds
-    return _database_token_cache.expires_on - time.time() < treshold
+    return token.token
 
 
 @dataclass
@@ -62,28 +43,11 @@ 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
+    token = AZURE_CREDENTIAL.get_token("https://redis.azure.com/.default")
 
-    logger.debug("Redis token expires on: %s", _redis_token_cache.expires_on)
+    logger.debug("New Redis token: %s", token)
 
-    # If the token is cached, check if it will expire in the next treshold seconds
-    return _redis_token_cache.expires_on - time.time() < treshold
+    return RedisCredentials(_extract_username_from_token(token), token)
 
 
 def get_subscription() -> Subscription:

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.dist-info → pulumi_django_azure-1.0.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulumi-django-azure
-Version: 1.0.32
+Version: 1.0.33
 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.dist-info → pulumi_django_azure-1.0.33.dist-info}/RECORD

@@ -1,13 +1,13 @@
 pulumi_django_azure/__init__.py,sha256=WoTHLNGnqc3dQoJtzrAJY8OVA7ReP6XFkDb9BXZGfJ8,117
-pulumi_django_azure/azure_helper.py,sha256=eIaOoajwQuIRyt6Q3KHIA1qctLxOqwSF9yurwk2WgzY,3417
+pulumi_django_azure/azure_helper.py,sha256=iCIHNLZJ-nBrXq7bjVn92eUYz7q6-mPFckWFcxpUjMY,2114
 pulumi_django_azure/context_processors.py,sha256=Qm2e_WBipJYMDH3clYAAaHvEDkG8au2czSQqRkS5928,1136
 pulumi_django_azure/django_deployment.py,sha256=l3hXP8Eo5ZUjojQtDsWeBGCFoSKN76NSz7tW9d-s9FA,50964
-pulumi_django_azure/middleware.py,sha256=Lp05G_wn9vlSueRJsnk-g2Rs9FFG155Po2MP2Cv0LDc,3348
+pulumi_django_azure/middleware.py,sha256=7egut5QhBCleB-D3LHWMhZPh6bdrgWQqSShaXuV2tAM,3656
 pulumi_django_azure/settings.py,sha256=BTP5y6KE3oP9pY01TR1ML6GArpLhnzx-mFflrhTQ4SE,5906
 pulumi_django_azure/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulumi_django_azure/management/commands/purge_cache.py,sha256=yjMoNvEPFmtuZctOKXMUacfKJLlTC9xfF-0W-IH3kF0,488
 pulumi_django_azure/management/commands/purge_cdn.py,sha256=8iLuqjndvreTHXRp37sjpvcNltdGTpwhY9YiQokS_P0,2095
-pulumi_django_azure-1.0.32.dist-info/METADATA,sha256=V64GcOLJ9OzFjHRM6CUIqBEaUw-llhbmRFgdDsZxZjI,9759
-pulumi_django_azure-1.0.32.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-pulumi_django_azure-1.0.32.dist-info/top_level.txt,sha256=MNPRJhq-_G8EMCHRkjdcb_xrqzOkmKogXUGV7Ysz3g0,20
-pulumi_django_azure-1.0.32.dist-info/RECORD,,
+pulumi_django_azure-1.0.33.dist-info/METADATA,sha256=y22q3oQlVYjNLPynCAuEObPflOUM_2bjprpMBTJIZ7k,9759
+pulumi_django_azure-1.0.33.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
+pulumi_django_azure-1.0.33.dist-info/top_level.txt,sha256=MNPRJhq-_G8EMCHRkjdcb_xrqzOkmKogXUGV7Ysz3g0,20
+pulumi_django_azure-1.0.33.dist-info/RECORD,,

{pulumi_django_azure-1.0.32.dist-info → pulumi_django_azure-1.0.33.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.0.0)
+Generator: setuptools (80.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any