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

{pulumi_django_azure-1.0.15 → pulumi_django_azure-1.0.17}/LICENSE

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pulumi-django-azure
-Version: 1.0.15
+Version: 1.0.17
 Summary: Simply deployment of Django on Azure with Pulumi
 Author-email: Maarten Ureel <maarten@youreal.eu>
 License: MIT License
@@ -33,9 +33,9 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pulumi>=3.99.0
-Requires-Dist: pulumi-azure-native>=2.24.0
-Requires-Dist: pulumi-random>=4.14.0
+Requires-Dist: pulumi>=3.146.0
+Requires-Dist: pulumi-azure-native>=2.82.0
+Requires-Dist: pulumi-random>=4.17.0
 
 # Pulumi Django Deployment
 

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pulumi-django-azure"
-version = "1.0.15"
+version = "1.0.17"
 description = "Simply deployment of Django on Azure with Pulumi"
 readme = "README.md"
 authors = [{ name = "Maarten Ureel", email = "maarten@youreal.eu" }]
@@ -16,9 +16,9 @@ classifiers = [
 ]
 keywords = ["django", "pulumi", "azure"]
 dependencies = [
-    "pulumi >= 3.99.0",
-    "pulumi-azure-native >= 2.24.0",
-    "pulumi-random >= 4.14.0",
+    "pulumi (>=3.146.0)",
+    "pulumi-azure-native (>=2.82.0)",
+    "pulumi-random (>=4.17.0)",
 ]
 requires-python = ">=3.9"
 
@@ -27,20 +27,20 @@ Homepage = "https://gitlab.com/MaartenUreel/pulumi-django-azure"
 
 [tool.poetry]
 name = "pulumi-django-azure"
-version = "1.0.15"
+version = "1.0.17"
 description = "Simply deployment of Django on Azure with Pulumi"
 authors = ["Maarten Ureel <maarten@youreal.eu>"]
 
 [tool.poetry.dependencies]
 python = "^3.11"
-pulumi-azure-native = "^2.64.2"
-pulumi = "^3.135.0"
-pulumi-random = "^4.16.6"
+pulumi-azure-native = ">=2.82.0"
+pulumi = ">=3.146.0"
+pulumi-random = ">=4.17.0"
 
 [tool.poetry.group.dev.dependencies]
-twine = "^5.1.1"
-build = "^1.2.2"
-ruff = "^0.4.9"
+twine = "^6.0.1"
+build = "^1.2.2.post1"
+ruff = "^0.9.2"
 
 [tool.ruff]
 line-length = 140

{pulumi_django_azure-1.0.15 → pulumi_django_azure-1.0.17}/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:
         """
@@ -62,7 +65,7 @@ class DjangoDeployment(pulumi.ComponentResource):
         vnet: azure.network.VirtualNetwork,
         pgsql_sku: azure.dbforpostgresql.SkuArgs,
         pgsql_ip_prefix: str,
-        appservice_ip_prefix: str,
+        app_service_ip_prefix: str,
         app_service_sku: azure.web.SkuDescriptionArgs,
         storage_account_name: str,
         storage_allowed_origins: Optional[Sequence[str]] = None,
@@ -80,7 +83,7 @@ class DjangoDeployment(pulumi.ComponentResource):
         :param vnet: The virtual network to create the subnets in.
         :param pgsql_sku: The SKU for the PostgreSQL server.
         :param pgsql_ip_prefix: The IP prefix for the PostgreSQL subnet.
-        :param appservice_ip_prefix: The IP prefix for the app service subnet.
+        :param app_service_ip_prefix: The IP prefix for the app service subnet.
         :param app_service_sku: The SKU for the app service plan.
         :param storage_account_name: The name of the storage account. Should be unique across Azure.
         :param storage_allowed_origins: The origins (hosts) to allow access through CORS policy. You can specify '*' to allow all.
@@ -110,7 +113,7 @@ class DjangoDeployment(pulumi.ComponentResource):
         # Subnet for the apps
         self._app_subnet = self._create_subnet(
             name="app-service",
-            prefix=appservice_ip_prefix,
+            prefix=app_service_ip_prefix,
             delegation_service="Microsoft.Web/serverFarms",
             service_endpoints=["Microsoft.Storage"],
         )
@@ -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"]),
@@ -743,6 +751,7 @@ class DjangoDeployment(pulumi.ComponentResource):
         secrets: Optional[dict[str, str]] = None,
         comms_data_location: Optional[str] = None,
         comms_domains: Optional[list[HostDefinition]] = None,
+        dedicated_app_service_sku: Optional[azure.web.SkuDescriptionArgs] = None,
         vault_administrators: Optional[list[str]] = None,
     ) -> azure.web.WebApp:
         """
@@ -760,6 +769,7 @@ class DjangoDeployment(pulumi.ComponentResource):
             and the name of the secret in the Key Vault.
         :param comms_data_location: The data location for the Communication Services (optional if you don't need it).
         :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_administrator: The principal ID of the vault administrator (optional).
         """
 
@@ -822,11 +832,23 @@ class DjangoDeployment(pulumi.ComponentResource):
         ]
 
         allowed_hosts = pulumi.Output.concat(*[pulumi.Output.concat(host.full_host, ",") for host in website_hosts])
+        
+        # Create a dedicated App Service Plan if requested
+        if dedicated_app_service_sku:
+            app_service_plan = azure.web.AppServicePlan(
+                f"asp-{self._name}-{name}",
+                resource_group_name=self._rg,
+                kind="Linux",
+                reserved=True,
+                sku=dedicated_app_service_sku,
+            )
+        else:
+            app_service_plan = self._app_service_plan
 
         app = azure.web.WebApp(
             f"app-{name}-{self._name}",
             resource_group_name=self._rg,
-            server_farm_id=self._app_service_plan.id,
+            server_farm_id=app_service_plan.id,
             virtual_network_subnet_id=self._app_subnet.id,
             identity=azure.web.ManagedServiceIdentityArgs(
                 type=azure.web.ManagedServiceIdentityType.SYSTEM_ASSIGNED,
@@ -903,39 +925,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.17/src/pulumi_django_azure.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pulumi-django-azure
-Version: 1.0.15
+Version: 1.0.17
 Summary: Simply deployment of Django on Azure with Pulumi
 Author-email: Maarten Ureel <maarten@youreal.eu>
 License: MIT License
@@ -33,9 +33,9 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pulumi>=3.99.0
-Requires-Dist: pulumi-azure-native>=2.24.0
-Requires-Dist: pulumi-random>=4.14.0
+Requires-Dist: pulumi>=3.146.0
+Requires-Dist: pulumi-azure-native>=2.82.0
+Requires-Dist: pulumi-random>=4.17.0
 
 # Pulumi Django Deployment
 

pulumi_django_azure-1.0.17/src/pulumi_django_azure.egg-info/requires.txt

@@ -0,0 +1,3 @@
+pulumi>=3.146.0
+pulumi-azure-native>=2.82.0
+pulumi-random>=4.17.0

pulumi_django_azure-1.0.15/src/pulumi_django_azure.egg-info/requires.txt

@@ -1,3 +0,0 @@
-pulumi>=3.99.0
-pulumi-azure-native>=2.24.0
-pulumi-random>=4.14.0