pulumi-django-azure 1.0.14__py3-none-any.whl → 1.0.16__py3-none-any.whl

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:
         """
@@ -65,6 +68,7 @@ class DjangoDeployment(pulumi.ComponentResource):
         appservice_ip_prefix: str,
         app_service_sku: azure.web.SkuDescriptionArgs,
         storage_account_name: str,
+        storage_allowed_origins: Optional[Sequence[str]] = None,
         pgadmin_access_ip: Optional[Sequence[str]] = None,
         pgadmin_dns_zone: Optional[azure.network.Zone] = None,
         cdn_host: Optional[HostDefinition] = None,
@@ -82,6 +86,7 @@ class DjangoDeployment(pulumi.ComponentResource):
         :param appservice_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.
         :param pgadmin_access_ip: The IP addresses to allow access to pgAdmin. If empty, all IP addresses are allowed.
         :param pgadmin_dns_zone: The Azure DNS zone to a pgadmin DNS record in. (optional)
         :param cdn_host: A custom CDN host name. (optional)
@@ -99,7 +104,7 @@ class DjangoDeployment(pulumi.ComponentResource):
         self._vnet = vnet
 
         # Storage resources
-        self._create_storage(account_name=storage_account_name)
+        self._create_storage(account_name=storage_account_name, allowed_origins=storage_allowed_origins)
         self._cdn_host = self._create_cdn(custom_host=cdn_host)
 
         # PostgreSQL resources
@@ -119,7 +124,7 @@ class DjangoDeployment(pulumi.ComponentResource):
         # Create a pgAdmin app
         self._create_pgadmin_app(access_ip=pgadmin_access_ip, dns_zone=pgadmin_dns_zone)
 
-    def _create_storage(self, account_name: str):
+    def _create_storage(self, account_name: str, allowed_origins: Optional[Sequence[str]] = None):
         # Create blob storage
         self._storage_account = azure.storage.StorageAccount(
             f"sa-{self._name}",
@@ -135,6 +140,25 @@ class DjangoDeployment(pulumi.ComponentResource):
             enable_https_traffic_only=True,
         )
 
+        if allowed_origins:
+            azure.storage.BlobServiceProperties(
+                f"sa-{self._name}-blob-properties",
+                resource_group_name=self._rg,
+                account_name=self._storage_account.name,
+                blob_services_name="default",
+                cors=azure.storage.CorsRulesArgs(
+                    cors_rules=[
+                        azure.storage.CorsRuleArgs(
+                            allowed_headers=["*"],
+                            allowed_methods=["GET", "OPTIONS", "HEAD"],
+                            allowed_origins=allowed_origins,
+                            exposed_headers=["Access-Control-Allow-Origin"],
+                            max_age_in_seconds=86400,
+                        )
+                    ]
+                ),
+            )
+
     def _create_cdn(self, custom_host: Optional[HostDefinition]) -> pulumi.Output[str]:
         """
         Create a CDN endpoint. If a host name is given, it will be used as the custom domain.
@@ -178,7 +202,7 @@ class DjangoDeployment(pulumi.ComponentResource):
             profile_name=self._cdn_profile.name,
             origin_host_header=endpoint_origin,
             origins=[azure.cdn.DeepCreatedOriginArgs(name="origin-storage", host_name=endpoint_origin)],
-            query_string_caching_behavior=azure.cdn.QueryStringCachingBehavior.IGNORE_QUERY_STRING,
+            query_string_caching_behavior=azure.cdn.QueryStringCachingBehavior.USE_QUERY_STRING,
         )
 
         pulumi.export("cdn_cname", self._cdn_endpoint.host_name)
@@ -526,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=[
@@ -538,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"]),
@@ -882,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)
@@ -1031,27 +1044,6 @@ class DjangoDeployment(pulumi.ComponentResource):
             scope=self._cdn_endpoint.id,
         )
 
-        # Create a CORS rules for this website
-        origins = [pulumi.Output.concat("https://", host.full_host) for host in website_hosts] if website_hosts else ["*"]
-
-        azure.storage.BlobServiceProperties(
-            f"sa-{name}-blob-properties",
-            resource_group_name=self._rg,
-            account_name=self._storage_account.name,
-            blob_services_name="default",
-            cors=azure.storage.CorsRulesArgs(
-                cors_rules=[
-                    azure.storage.CorsRuleArgs(
-                        allowed_headers=["*"],
-                        allowed_methods=["GET", "OPTIONS", "HEAD"],
-                        allowed_origins=origins,
-                        exposed_headers=["Access-Control-Allow-Origin"],
-                        max_age_in_seconds=86400,
-                    )
-                ]
-            ),
-        )
-
         return app
 
     def _strip_off_dns_zone_name(self, host: str, zone: azure.network.Zone) -> pulumi.Output[str]:

{pulumi_django_azure-1.0.14.dist-info → pulumi_django_azure-1.0.16.dist-info}/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.14.dist-info → pulumi_django_azure-1.0.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pulumi-django-azure
-Version: 1.0.14
+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.16.dist-info/RECORD

@@ -0,0 +1,7 @@
+pulumi_django_azure/__init__.py,sha256=5RY9reSVNw-HULrOXfhcq3cyPne-94ojFmeV1m6kIVg,79
+pulumi_django_azure/django_deployment.py,sha256=NorAfJ8i4zhzY6dZ7TBDB3NKwqfAMH2-PyMQv5IurPw,43986
+pulumi_django_azure-1.0.16.dist-info/LICENSE,sha256=tlZQiilfsHDYlvhWMA5PvDV2FxpaCQbE9aapcygnhEQ,1088
+pulumi_django_azure-1.0.16.dist-info/METADATA,sha256=SZX_zbLE-ytF-NYk3krUN8k3hbKzfyiGil0Sz9ATk3g,13954
+pulumi_django_azure-1.0.16.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+pulumi_django_azure-1.0.16.dist-info/top_level.txt,sha256=MNPRJhq-_G8EMCHRkjdcb_xrqzOkmKogXUGV7Ysz3g0,20
+pulumi_django_azure-1.0.16.dist-info/RECORD,,

{pulumi_django_azure-1.0.14.dist-info → pulumi_django_azure-1.0.16.dist-info}/WHEEL

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

pulumi_django_azure-1.0.14.dist-info/RECORD

@@ -1,7 +0,0 @@
-pulumi_django_azure/__init__.py,sha256=5RY9reSVNw-HULrOXfhcq3cyPne-94ojFmeV1m6kIVg,79
-pulumi_django_azure/django_deployment.py,sha256=BWw8GVSsjPLIu2ud09KJGr4D-G7VuJNnJey4nBTCEHI,44199
-pulumi_django_azure-1.0.14.dist-info/LICENSE,sha256=NX2LN3U319Zaac8b7ZgfNOco_nTBbN531X_M_13niSg,1087
-pulumi_django_azure-1.0.14.dist-info/METADATA,sha256=4po_NMDQbKi7lopg17jjZ1LrLM4Ojoy7yiF7NdIibAs,13954
-pulumi_django_azure-1.0.14.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-pulumi_django_azure-1.0.14.dist-info/top_level.txt,sha256=MNPRJhq-_G8EMCHRkjdcb_xrqzOkmKogXUGV7Ysz3g0,20
-pulumi_django_azure-1.0.14.dist-info/RECORD,,