pulumi-django-azure 1.0.15__tar.gz → 1.0.16__tar.gz

{pulumi_django_azure-1.0.15/src/pulumi_django_azure.egg-info → pulumi_django_azure-1.0.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pulumi-django-azure
-Version: 1.0.15
+Version: 1.0.16
 Summary: Simply deployment of Django on Azure with Pulumi
 Author-email: Maarten Ureel <maarten@youreal.eu>
 License: MIT License

{pulumi_django_azure-1.0.15 → pulumi_django_azure-1.0.16}/pyproject.toml

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

{pulumi_django_azure-1.0.15 → pulumi_django_azure-1.0.16}/src/pulumi_django_azure/django_deployment.py

@@ -20,6 +20,9 @@ class HostDefinition:
         self.zone = zone
         self._identifier = identifier
 
+    def __eq__(self, other):
+        return self.host == other.host and self.zone.name == other.zone.name
+
     @property
     def identifier(self) -> str:
         """
@@ -547,7 +550,7 @@ class DjangoDeployment(pulumi.ComponentResource):
             f"dns-comms-{suffix}-{host.identifier}-domain",
             resource_group_name=self._rg,
             zone_name=host.zone.name,
-            relative_record_set_name="@",
+            relative_record_set_name=host.host,
             record_type="TXT",
             ttl=3600,
             txt_records=[
@@ -559,11 +562,16 @@ class DjangoDeployment(pulumi.ComponentResource):
 
         # DKIM records (two CNAME records)
         for record in ("d_kim", "d_kim2"):
+            if host.host == "@":
+                relative_record_set_name = records[record]["name"]
+            else:
+                relative_record_set_name = f"{records[record]['name']}.{host.host}"
+
             r = azure.network.RecordSet(
                 f"dns-comms-{suffix}-{host.identifier}-{record}",
                 resource_group_name=self._rg,
                 zone_name=host.zone.name,
-                relative_record_set_name=records[record]["name"],
+                relative_record_set_name=relative_record_set_name,
                 record_type="CNAME",
                 ttl=records[record]["ttl"],
                 cname_record=azure.network.CnameRecordArgs(cname=records[record]["value"]),
@@ -903,39 +911,23 @@ class DjangoDeployment(pulumi.ComponentResource):
             dependencies = []
 
             if host.zone:
-                # Create a DNS record in the zone
-
-                if host.host == "@":
-                    # Create a A record for the virtual IP address
-                    a = azure.network.RecordSet(
-                        f"dns-a-{name}-{self._name}-{host.identifier}",
-                        resource_group_name=self._rg,
-                        zone_name=host.zone.name,
-                        relative_record_set_name=host.host,
-                        record_type="A",
-                        ttl=3600,
-                        a_records=[
-                            azure.network.ARecordArgs(
-                                ipv4_address=virtual_ip,
-                            )
-                        ],
-                    )
+                # Create a DNS record in the zone.
+                # We always use an A record instead of CNAME to avoid collisions with TXT records.
+                a = azure.network.RecordSet(
+                    f"dns-a-{name}-{self._name}-{host.identifier}",
+                    resource_group_name=self._rg,
+                    zone_name=host.zone.name,
+                    relative_record_set_name=host.host,
+                    record_type="A",
+                    ttl=3600,
+                    a_records=[
+                        azure.network.ARecordArgs(
+                            ipv4_address=virtual_ip,
+                        )
+                    ],
+                )
 
-                    dependencies.append(a)
-                else:
-                    # Create a CNAME record for the custom hostname
-                    cname = azure.network.RecordSet(
-                        f"dns-cname-{name}-{self._name}-{host.identifier}",
-                        resource_group_name=self._rg,
-                        zone_name=host.zone.name,
-                        relative_record_set_name=host.host,
-                        record_type="CNAME",
-                        ttl=3600,
-                        cname_record=azure.network.CnameRecordArgs(
-                            cname=app.default_host_name,
-                        ),
-                    )
-                    dependencies.append(cname)
+                dependencies.append(a)
 
                 # For the certificate validation to work
                 relative_record_set_name = "asuid" if host.host == "@" else pulumi.Output.concat("asuid.", host.host)

{pulumi_django_azure-1.0.15 → pulumi_django_azure-1.0.16/src/pulumi_django_azure.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pulumi-django-azure
-Version: 1.0.15
+Version: 1.0.16
 Summary: Simply deployment of Django on Azure with Pulumi
 Author-email: Maarten Ureel <maarten@youreal.eu>
 License: MIT License