pulumi-django-azure 1.0.38__py3-none-any.whl → 1.0.39__py3-none-any.whl

pulumi_django_azure/django_deployment.py

@@ -1,10 +1,11 @@
 from collections.abc import Sequence
 
 import pulumi
+import pulumi_azure as azure_classic
 import pulumi_azure_native as azure
 import pulumi_random
 
-REDIS_IMAGE = "redis:8.2"
+REDIS_IMAGE = "redis:8.2-alpine"
 
 
 class HostDefinition:
@@ -478,16 +479,6 @@ class DjangoDeployment(pulumi.ComponentResource):
             },
         )
 
-    def _get_existing_web_app_host_name_binding(self, resource_group_name: str, app_name: str, host_name: str):
-        try:
-            return azure.web.get_web_app_host_name_binding(
-                resource_group_name=resource_group_name,
-                name=app_name,
-                host_name=host_name,
-            )
-        except Exception:
-            return None
-
     def _add_webapp_host(
         self,
         app: azure.web.WebApp,
@@ -495,13 +486,9 @@ class DjangoDeployment(pulumi.ComponentResource):
         suffix: str,
         identifier: str,
         depends_on: Sequence[pulumi.Resource] | None = None,
-    ):
+    ) -> azure.web.WebAppHostNameBinding:
         """
-        Because of a circular dependency, we need to create the certificate and the binding in two steps.
-        First we create a binding without a certificate,
-        then we create the certificate and then we update the binding.
-
-        The certificate needs the binding, and the binding needs the thumbprint of the certificate.
+        We need to use a few steps and CertificateBinding from Azure Classic to make this work.
 
         See also: https://github.com/pulumi/pulumi-azure-native/issues/578
 
@@ -514,52 +501,37 @@ class DjangoDeployment(pulumi.ComponentResource):
         if not depends_on:
             depends_on = []
 
-        # Retrieve the existing binding (None if it doesn't exist)
-        existing_binding = pulumi.Output.all(app.resource_group, app.name, host).apply(
-            lambda args: self._get_existing_web_app_host_name_binding(
-                resource_group_name=args[0],
-                app_name=args[1],
-                host_name=args[2],
-            )
+        # Create a binding without a certificate
+        binding = azure.web.WebAppHostNameBinding(
+            f"host-binding-{suffix}-{identifier}",
+            resource_group_name=self._rg,
+            name=app.name,
+            host_name=host,
+            ssl_state=azure.web.SslState.DISABLED,
+            # Ignore changes in SSL state and thumbprint
+            opts=pulumi.ResourceOptions(depends_on=depends_on, ignore_changes=["ssl_state", "thumbprint"]),
         )
 
-        # Create an inline function that we will invoke through the Output.apply lambda
-        def _create_binding_with_cert(existing_binding):
-            if existing_binding:
-                # Create a managed certificate
-                # This will work because the binding exists actually
-                certificate = azure.web.Certificate(
-                    f"cert-{suffix}-{identifier}",
-                    resource_group_name=self._rg,
-                    server_farm_id=app.server_farm_id,
-                    canonical_name=host,
-                    host_names=[host],
-                    opts=pulumi.ResourceOptions(depends_on=depends_on),
-                )
-
-                # Create a new binding, replacing the old one,
-                # with the certificate
-                azure.web.WebAppHostNameBinding(
-                    f"host-binding-{suffix}-{identifier}",
-                    resource_group_name=self._rg,
-                    name=app.name,
-                    host_name=host,
-                    ssl_state=azure.web.SslState.SNI_ENABLED,
-                    thumbprint=certificate.thumbprint,
-                    opts=pulumi.ResourceOptions(depends_on=depends_on),
-                )
+        # Create a certificate that depends on the binding
+        certificate = azure.web.Certificate(
+            f"cert-{suffix}-{identifier}",
+            resource_group_name=self._rg,
+            server_farm_id=app.server_farm_id,
+            canonical_name=host,
+            opts=pulumi.ResourceOptions(depends_on=[binding] + depends_on),
+        )
 
-            else:
-                # Create a binding without a certificate
-                azure.web.WebAppHostNameBinding(
-                    f"host-binding-{suffix}-{identifier}",
-                    resource_group_name=self._rg,
-                    name=app.name,
-                    host_name=host,
-                    opts=pulumi.ResourceOptions(depends_on=depends_on),
-                )
+        # Create CertificateBinding from Azure Classic to link it together
+        # Inspired by https://github.com/pulumi/pulumi-azure-native/issues/578#issuecomment-2705952672
+        azure_classic.appservice.CertificateBinding(
+            f"cert-binding-{suffix}-{identifier}",
+            hostname_binding_id=binding.id,
+            certificate_id=certificate.id,
+            ssl_state="SniEnabled",
+            opts=pulumi.ResourceOptions(depends_on=depends_on, ignore_changes=["hostname_binding_id"]),
+        )
 
-        existing_binding.apply(_create_binding_with_cert)
+        return binding
 
     def _create_comms_dns_records(self, suffix, host: HostDefinition, records: dict) -> list[azure.dns.RecordSet]:
         created_records = []
@@ -773,7 +745,8 @@ class DjangoDeployment(pulumi.ComponentResource):
         comms_domains: list[HostDefinition] | None = None,
         dedicated_app_service_sku: azure.web.SkuDescriptionArgs | None = None,
         vault_administrators: list[str] | None = None,
-        redis_cache: bool = True,
+        redis_sidecar: bool = True,
+        django_tasks: bool = True,
         startup_timeout: int = 300,
     ) -> azure.web.WebApp:
         """
@@ -794,7 +767,7 @@ class DjangoDeployment(pulumi.ComponentResource):
         :param comms_domains: The list of custom domains for the E-mail Communication Services (optional).
         :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 redis_cache: Whether to create a Redis sidecar container.
+        :param redis_sidecar: Whether to create a Redis sidecar container.
         :param startup_timeout: The startup timeout for the App Service (default is 300 seconds).
         """
 
@@ -825,9 +798,15 @@ class DjangoDeployment(pulumi.ComponentResource):
         )
 
         # Redis cache environment variable
-        if redis_cache:
+        if redis_sidecar:
             environment_variables["REDIS_SIDECAR"] = "true"
 
+        if django_tasks:
+            if not redis_sidecar:
+                raise ValueError("django-tasks requires redis-sidecar to be enabled.")
+
+            environment_variables["DJANGO_TASKS"] = "true"
+
         # Communication Services (optional)
         if comms_data_location:
             if not comms_domains:
@@ -891,6 +870,7 @@ class DjangoDeployment(pulumi.ComponentResource):
                 python_version=python_version,
                 # scm_type=azure.web.ScmType.EXTERNAL_GIT,
                 linux_fx_version=f"PYTHON|{python_version}",
+                http20_enabled=True,
                 app_settings=[
                     # Startup settings
                     azure.web.NameValuePairArgs(name="WEBSITES_CONTAINER_START_TIME_LIMIT", value=str(startup_timeout)),
@@ -929,13 +909,13 @@ class DjangoDeployment(pulumi.ComponentResource):
         )
 
         # Redis cache
-        if redis_cache:
+        if redis_sidecar:
             azure.web.WebAppSiteContainer(
-                f"redis-cache-{name}-{self._name}",
+                f"redis-sidecar-{name}-{self._name}",
                 resource_group_name=self._rg,
                 name=app.name,
                 is_main=False,
-                container_name="redis-cache",
+                container_name="redis-sidecar",
                 image=REDIS_IMAGE,
                 target_port="6379",
             )
@@ -962,8 +942,10 @@ class DjangoDeployment(pulumi.ComponentResource):
 
         pulumi.export(f"{name}_deploy_url", pulumi.Output.concat(credentials.scm_uri, "/deploy"))
 
+        bindings = []
         for host in website_hosts:
-            dependencies = []
+            # Only one binding can be created at a time, so we need to depend on the previous one.
+            dependencies = bindings or []
 
             if host.zone:
                 # Create a DNS record in the zone.
@@ -1004,7 +986,7 @@ class DjangoDeployment(pulumi.ComponentResource):
                 dependencies.append(txt_validation)
 
             # Add the host with optional dependencies
-            self._add_webapp_host(
+            binding = self._add_webapp_host(
                 app=app,
                 host=host.full_host,
                 suffix=f"{name}-{self._name}",
@@ -1012,6 +994,8 @@ class DjangoDeployment(pulumi.ComponentResource):
                 depends_on=dependencies,
             )
 
+            bindings.append(binding)
+
         # To enable deployment from GitLab
         azure.web.WebAppSourceControl(
             f"app-{name}-sourcecontrol-{self._name}",

pulumi_django_azure/settings.py

@@ -151,3 +151,20 @@ if REDIS_SIDECAR:
             },
         },
     }
+
+
+# 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",
+        }
+    }

{pulumi_django_azure-1.0.38.dist-info → pulumi_django_azure-1.0.39.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulumi-django-azure
-Version: 1.0.38
+Version: 1.0.39
 Summary: Simply deployment of Django on Azure with Pulumi
 License-Expression: MIT
 Keywords: django,pulumi,azure
@@ -9,7 +9,7 @@ Author-email: maarten@youreal.eu
 Requires-Python: >=3.11,<3.14
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Requires-Dist: azure-identity (>=1.25.0,<2.0.0)
+Requires-Dist: azure-identity (>=1.25.1,<2.0.0)
 Requires-Dist: azure-keyvault-secrets (>=4.10.0,<5.0.0)
 Requires-Dist: azure-mgmt-cdn (>=13.1.1,<14.0.0)
 Requires-Dist: azure-mgmt-resource (>=24.0.0,<25.0.0)
@@ -18,9 +18,11 @@ Requires-Dist: django-azure-communication-email (>=1.4.0,<2.0.0)
 Requires-Dist: django-environ (>=0.12.0,<0.13.0)
 Requires-Dist: django-redis (>=6.0.0,<7.0.0)
 Requires-Dist: django-storages[azure] (>=1.14.6,<2.0.0)
-Requires-Dist: pulumi (>=3.199.0)
+Requires-Dist: django-tasks[rq] (>=0.8.0,<0.10.0)
+Requires-Dist: pulumi (>=3.203.0)
+Requires-Dist: pulumi-azure (>=6.28.0,<7.0.0)
 Requires-Dist: pulumi-azure-native (>=3.8.0)
-Requires-Dist: pulumi-random (>=4.18.3)
+Requires-Dist: pulumi-random (>=4.18.4)
 Requires-Dist: redis[hiredis] (>=6.4.0,<7.0.0)
 Requires-Dist: tenacity (>=9.1.2,<10.0.0)
 Project-URL: Homepage, https://gitlab.com/MaartenUreel/pulumi-django-azure

{pulumi_django_azure-1.0.38.dist-info → pulumi_django_azure-1.0.39.dist-info}/RECORD

@@ -1,13 +1,13 @@
 pulumi_django_azure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulumi_django_azure/azure_helper.py,sha256=vZLIVZo44EP1-GGeq0XLJ10c42wJDDpKSL5-_sVgUzA,3053
 pulumi_django_azure/context_processors.py,sha256=Qm2e_WBipJYMDH3clYAAaHvEDkG8au2czSQqRkS5928,1136
-pulumi_django_azure/django_deployment.py,sha256=bVDEHrd7KeT6CAuLj0gozn_qSnfSBmm7iRk_6Yy2A34,46655
+pulumi_django_azure/django_deployment.py,sha256=0Lb4Ug35Mf0_66CT5KAXS5tMeHbBau2rTrWlKJygNYc,45919
 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/management/commands/test_redis.py,sha256=_jQXmv48NSPVGrgGZTmASWm0WAWYhqt9HaE3XdJ22U4,10225
 pulumi_django_azure/middleware.py,sha256=XykZAmilyCaZR_5mM950h2WI4053HRqr95LGV1p8uR0,2472
-pulumi_django_azure/settings.py,sha256=hneKnLgm-gzxgX724wEs1rJxK6oq7W5EgT2sJyx7bxY,5231
-pulumi_django_azure-1.0.38.dist-info/METADATA,sha256=LKKnOR0zT3RVJ0kGIbE1CnLRyJ9BCX2stNO_o_oH-LU,9609
-pulumi_django_azure-1.0.38.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-pulumi_django_azure-1.0.38.dist-info/RECORD,,
+pulumi_django_azure/settings.py,sha256=nHQJRTefcCs0W9on8EkO1tbrJLKAhjRAfAujRN77oDU,5595
+pulumi_django_azure-1.0.39.dist-info/METADATA,sha256=ROXjYcWKx-hqOC6Lrr_-ipPKaScp-VEnDwc74e7xGt4,9705
+pulumi_django_azure-1.0.39.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+pulumi_django_azure-1.0.39.dist-info/RECORD,,