sync with autogenerated

Author: john0isaac

.gitignore

@@ -13,6 +13,9 @@
 __pycache__/
 media
 
+# If your build process includes running collectstatic, then you probably don't need
+# or want to include staticfiles/ in your Git repository.
+src/staticfiles/
 
 ### Django.Python Stack ###
 # Byte-compiled / optimized / DLL files

infra/core/database/mysql/flexibleserver.bicep

@@ -1,42 +1,31 @@
+metadata description = 'Creates an Azure Database for MySQL - Flexible Server.'
 param name string
 param location string = resourceGroup().location
 param tags object = {}
 
 param sku object
 param storage object
-@description('Database administrator login name')
-@minLength(1)
-param adminName string = 'mySqlAdmin'
+param administratorLogin string
 @secure()
-param adminPassword string
+param administratorLoginPassword string
+param highAvailabilityMode string = 'Disabled'
 param databaseNames array = []
 param allowAzureIPsFirewall bool = false
 param allowAllIPsFirewall bool = false
 param allowedSingleIPs array = []
 
-@description('MySQL version')
-@allowed([
-  '5.7'
-  '8.0.21'
-])
-param version string = '8.0.21'
-
-@allowed([
-  'Disabled'
-  'ZoneRedundant'
-  'SameZone'
-])
-param highAvailabilityMode string = 'Disabled'
+// MySQL version
+param version string
 
-resource mysqlServer 'Microsoft.DBforMySQL/flexibleServers@2021-05-01' = {
+resource mysqlServer 'Microsoft.DBforMySQL/flexibleServers@2023-06-30' = {
   location: location
   tags: tags
   name: name
   sku: sku
   properties: {
     version: version
-    administratorLogin: adminName
-    administratorLoginPassword: adminPassword
+    administratorLogin: administratorLogin
+    administratorLoginPassword: administratorLoginPassword
     storage: storage
     highAvailability: {
       mode: highAvailabilityMode
@@ -45,33 +34,29 @@ resource mysqlServer 'Microsoft.DBforMySQL/flexibleServers@2021-05-01' = {
 
   resource database 'databases' = [for name in databaseNames: {
     name: name
-    properties: {
-      charset: 'utf8'
-      collation: 'utf8_general_ci'
-    }
   }]
 
   resource firewall_all 'firewallRules' = if (allowAllIPsFirewall) {
     name: 'allow-all-IPs'
     properties: {
-        startIpAddress: '0.0.0.0'
-        endIpAddress: '255.255.255.255'
+      startIpAddress: '0.0.0.0'
+      endIpAddress: '255.255.255.255'
     }
   }
 
   resource firewall_azure 'firewallRules' = if (allowAzureIPsFirewall) {
     name: 'allow-all-azure-internal-IPs'
     properties: {
-        startIpAddress: '0.0.0.0'
-        endIpAddress: '0.0.0.0'
+      startIpAddress: '0.0.0.0'
+      endIpAddress: '0.0.0.0'
     }
   }
 
   resource firewall_single 'firewallRules' = [for ip in allowedSingleIPs: {
     name: 'allow-single-${replace(ip, '.', '')}'
     properties: {
-        startIpAddress: ip
-        endIpAddress: ip
+      startIpAddress: ip
+      endIpAddress: ip
     }
   }]
 

infra/db.bicep

@@ -22,8 +22,8 @@ module dbserver 'core/database/mysql/flexibleserver.bicep' = {
       storageSizeGB: 20
     }
     version: '8.0.21'
-    adminName: dbserverUser
-    adminPassword: dbserverPassword
+    administratorLogin: dbserverUser
+    administratorLoginPassword: dbserverPassword
     databaseNames: [ dbserverDatabaseName ]
     allowAzureIPsFirewall: true
   }

infra/main.bicep

@@ -138,4 +138,4 @@ output AZURE_KEY_VAULT_ENDPOINT string = keyVault.outputs.endpoint
 output AZURE_KEY_VAULT_NAME string = keyVault.outputs.name
 output APPLICATIONINSIGHTS_NAME string = monitoring.outputs.applicationInsightsName
 
-output BACKEND_URI string = web.outputs.uri
+output BACKEND_URI string = web.outputs.uri

src/.dockerignore

@@ -0,0 +1,3 @@
+.git*
+.venv/
+**/*.pyc

src/Dockerfile

@@ -14,4 +14,4 @@ COPY entrypoint.sh .
 RUN chmod +x entrypoint.sh
 
 COPY . .
-CMD bash -c ". entrypoint.sh"
+CMD bash -c ". entrypoint.sh"

src/project/settings.py

@@ -34,10 +34,10 @@
     DEBUG = False
     DEFAULT_SECRET = None
     ALLOWED_HOSTS = [
-        os.environ["WEBSITE_HOSTNAME"],
+        os.environ["CONTAINER_APP_NAME"] + "." + os.environ["CONTAINER_APP_ENV_DNS_SUFFIX"],
     ]
     CSRF_TRUSTED_ORIGINS = [
-        "https://" + os.environ["WEBSITE_HOSTNAME"],
+        "https://" + os.environ["CONTAINER_APP_NAME"] + "." + os.environ["CONTAINER_APP_ENV_DNS_SUFFIX"],
     ]
 
 SECRET_KEY = os.environ.get("SECRET_KEY", DEFAULT_SECRET)
@@ -67,9 +67,6 @@
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 
-if prod:
-    MIDDLEWARE.append("opencensus.ext.django.middleware.OpencensusMiddleware")
-
 ROOT_URLCONF = "project.urls"
 
 TEMPLATES = [
@@ -91,16 +88,6 @@
 WSGI_APPLICATION = "project.wsgi.application"
 
 
-OPENCENSUS = {
-    "TRACE": {
-        "SAMPLER": "opencensus.trace.samplers.ProbabilitySampler(rate=1)",
-        "EXPORTER": f"""opencensus.ext.azure.trace_exporter.AzureExporter(
-            connection_string="{os.environ.get('APPLICATIONINSIGHTS_CONNECTION_STRING')}"
-        )""",
-    }
-}
-
-# Database
 # https://docs.djangoproject.com/en/3.1/ref/settings/#databases
 
 db_options = {"ssl_mode": "REQUIRED"}

src/project/wsgi.py

@@ -9,8 +9,12 @@
 
 import os
 
+from azure.monitor.opentelemetry import configure_azure_monitor
 from django.core.wsgi import get_wsgi_application
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "project.settings")
 
+if os.getenv("APPLICATIONINSIGHTS_CONNECTION_STRING"):
+    configure_azure_monitor()
+
 application = get_wsgi_application()

src/requirements.txt

@@ -6,6 +6,5 @@ django
 django-crispy-forms
 crispy-bootstrap4
 whitenoise
-opencensus-ext-azure
-opencensus-ext-django
+azure-monitor-opentelemetry
 mysqlclient

src/templates/base.html

@@ -24,7 +24,7 @@
      <link rel="apple-touch-icon" sizes="120x120" href="{% static 'res/img/favicon-120-precomposed.png' %}">
 
      <!-- Chrome for Android -->
-     <link rel="manifest" href="{% static 'manifest.json' %}}}">
+     <link rel="manifest" href="{% static 'manifest.json' %}">
      <link rel="icon" sizes="192x192" href="{% static 'res/img/favicon-192.png' %}">
 
     <title>