pulumi-django-azure 1.0.3__py3-none-any.whl → 1.0.6__py3-none-any.whl

pulumi_django_azure/django_deployment.py

@@ -14,6 +14,7 @@ class DjangoDeployment(pulumi.ComponentResource):
         tenant_id: str,
         resource_group_name: pulumi.Input[str],
         vnet: azure.network.VirtualNetwork,
+        pgsql_sku: azure.dbforpostgresql.SkuArgs,
         pgsql_ip_prefix: str,
         appservice_ip_prefix: str,
         app_service_sku: azure.web.SkuDescriptionArgs,
@@ -50,7 +51,7 @@ class DjangoDeployment(pulumi.ComponentResource):
         self._cdn_host = self._create_cdn(custom_host=cdn_host)
 
         # PostgreSQL resources
-        self._create_database(ip_prefix=pgsql_ip_prefix)
+        self._create_database(sku=pgsql_sku, ip_prefix=pgsql_ip_prefix)
 
         # Subnet for the apps
         self._app_subnet = self._create_subnet(
@@ -145,7 +146,7 @@ class DjangoDeployment(pulumi.ComponentResource):
             # Return the default CDN host name
             return self._cdn_endpoint.host_name
 
-    def _create_database(self, ip_prefix: str):
+    def _create_database(self, sku: azure.dbforpostgresql.SkuArgs, ip_prefix: str):
         # Create subnet for PostgreSQL
         subnet = self._create_subnet(
             name="pgsql",
@@ -176,10 +177,7 @@ class DjangoDeployment(pulumi.ComponentResource):
         self._pgsql = azure.dbforpostgresql.Server(
             f"pgsql-{self._name}",
             resource_group_name=self._rg,
-            sku=azure.dbforpostgresql.SkuArgs(
-                name="Standard_B2s",
-                tier=azure.dbforpostgresql.SkuTier.BURSTABLE,
-            ),
+            sku=sku,
             version="16",
             auth_config=azure.dbforpostgresql.AuthConfigArgs(
                 password_auth=azure.dbforpostgresql.PasswordAuthEnum.DISABLED,
@@ -260,8 +258,6 @@ class DjangoDeployment(pulumi.ComponentResource):
                     # azure.web.NameValuePairArgs(name="WEBSITE_HTTPLOGGING_RETENTION_DAYS", value="7"),
                     # pgAdmin settings
                     azure.web.NameValuePairArgs(name="PGADMIN_DISABLE_POSTFIX", value="true"),
-                    azure.web.NameValuePairArgs(name="PGADMIN_AUTHENTICATION_SOURCES", value="['oauth2, 'internal']"),
-                    azure.web.NameValuePairArgs(name="PGADMIN_OAUTH2_NAME", value="azure"),
                     azure.web.NameValuePairArgs(name="PGADMIN_DEFAULT_EMAIL", value="dbadmin@dbadmin.net"),
                     azure.web.NameValuePairArgs(name="PGADMIN_DEFAULT_PASSWORD", value="dbadmin"),
                 ],
@@ -357,10 +353,11 @@ class DjangoDeployment(pulumi.ComponentResource):
         :param storage_account: The storage account
         :return: The access keys
         """
-
-        keys = azure.storage.list_storage_account_keys(
-            resource_group_name=self._rg,
-            account_name=storage_account.name,
+        keys = pulumi.Output.all(self._rg, storage_account.name).apply(
+            lambda args: azure.storage.list_storage_account_keys(
+                resource_group_name=args[0],
+                account_name=args[1],
+            )
         )
 
         return keys.keys
@@ -533,8 +530,12 @@ class DjangoDeployment(pulumi.ComponentResource):
             scope=self._storage_account.id,
         )
 
-        # Create a CORS rule for this website
-        # Add cors rules
+        # Create a CORS rules for this website
+        if website_hosts:
+            origins = [f"https://{host}" for host in website_hosts]
+        else:
+            origins = ["*"]
+
         azure.storage.BlobServiceProperties(
             f"sa-{name}-blob-properties",
             resource_group_name=self._rg,
@@ -545,7 +546,7 @@ class DjangoDeployment(pulumi.ComponentResource):
                     azure.storage.CorsRuleArgs(
                         allowed_headers=["*"],
                         allowed_methods=["GET", "OPTIONS", "HEAD"],
-                        allowed_origins=[f"https://{host}" for host in website_hosts],
+                        allowed_origins=origins,
                         exposed_headers=["Access-Control-Allow-Origin"],
                         max_age_in_seconds=86400,
                     )

{pulumi_django_azure-1.0.3.dist-info → pulumi_django_azure-1.0.6.dist-info}/METADATA

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

pulumi_django_azure-1.0.6.dist-info/RECORD

@@ -0,0 +1,7 @@
+pulumi_django_azure/__init__.py,sha256=tXTvPfr8-Nll5cjMyY9yj_0z_PQ0XAcxihzHRCES-hU,63
+pulumi_django_azure/django_deployment.py,sha256=G41_JrvkyEwuzEHxirC6xRUiu64_L28rwm8XsphWpp0,23156
+pulumi_django_azure-1.0.6.dist-info/LICENSE,sha256=NX2LN3U319Zaac8b7ZgfNOco_nTBbN531X_M_13niSg,1087
+pulumi_django_azure-1.0.6.dist-info/METADATA,sha256=jnYAd1tB3vTwOa2snWf0VWbnQgvXAuzCQmrznUdmKhM,7887
+pulumi_django_azure-1.0.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+pulumi_django_azure-1.0.6.dist-info/top_level.txt,sha256=MNPRJhq-_G8EMCHRkjdcb_xrqzOkmKogXUGV7Ysz3g0,20
+pulumi_django_azure-1.0.6.dist-info/RECORD,,

{pulumi_django_azure-1.0.3.dist-info → pulumi_django_azure-1.0.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pulumi_django_azure-1.0.3.dist-info/RECORD

@@ -1,7 +0,0 @@
-pulumi_django_azure/__init__.py,sha256=tXTvPfr8-Nll5cjMyY9yj_0z_PQ0XAcxihzHRCES-hU,63
-pulumi_django_azure/django_deployment.py,sha256=y9xdV2bn2BgjUwt80kJDDpXypWk_qfKbnszlnW-rjd0,23241
-pulumi_django_azure-1.0.3.dist-info/LICENSE,sha256=NX2LN3U319Zaac8b7ZgfNOco_nTBbN531X_M_13niSg,1087
-pulumi_django_azure-1.0.3.dist-info/METADATA,sha256=WUtNjjn6aHhx2aw3dkBVJzbTWEl8efOlBg9IYuKdsrc,7887
-pulumi_django_azure-1.0.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-pulumi_django_azure-1.0.3.dist-info/top_level.txt,sha256=MNPRJhq-_G8EMCHRkjdcb_xrqzOkmKogXUGV7Ysz3g0,20
-pulumi_django_azure-1.0.3.dist-info/RECORD,,