Ruff updates

.pre-commit-config.yaml

@@ -1,15 +1,15 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v4.4.0
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 23.1.0
     hooks:
     -   id: black
 -   repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.121
+    rev: v0.0.258
     hooks:
     -   id: ruff

infra/main.bicep

@@ -100,6 +100,15 @@ module appServicePlan 'core/host/appserviceplan.bicep' = {
   }
 }
 
+module webKeyVaultAccess 'core/security/keyvault-access.bicep' = {
+  name: 'web-keyvault-access'
+  scope: resourceGroup
+  params: {
+    keyVaultName: keyVault.outputs.name
+    principalId: web.outputs.identityPrincipalId
+  }
+}
+
 // Store secrets in a keyvault
 module keyVault './core/security/keyvault.bicep' = {
   name: 'keyvault'

quizsite/production.py

@@ -19,5 +19,6 @@ DATABASES = {
         "HOST": hostname + ".postgres.database.azure.com",
         "USER": os.environ["DBUSER"],
         "PASSWORD": os.environ["DBPASS"],
+        "OPTIONS": {"sslmode": "require"},
     }
 }

quizsite/settings.py

@@ -10,9 +10,8 @@ For the full list of settings and their values, see
 https://docs.djangoproject.com/en/4.1/ref/settings/
 """
 
-from pathlib import Path
 import os
-
+from pathlib import Path
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent

quizzes/admin.py

@@ -1,5 +1,6 @@
 from django.contrib import admin
-from .models import Quiz, Question, FreeTextAnswer, MultipleChoiceAnswer
+
+from .models import FreeTextAnswer, MultipleChoiceAnswer, Question, Quiz
 
 admin.site.register(Quiz)
 

quizzes/migrations/0001_initial.py

@@ -1,12 +1,11 @@
 # Generated by Django 4.1.1 on 2022-09-14 18:17
 
 import django.contrib.postgres.fields
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []
@@ -46,9 +45,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "quiz",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE, to="quizzes.quiz"
-                    ),
+                    models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to="quizzes.quiz"),
                 ),
             ],
         ),

quizzes/migrations/0002_remove_question_answer_status_and_more.py

@@ -1,11 +1,10 @@
 # Generated by Django 4.1.1 on 2022-09-15 00:57
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("quizzes", "0001_initial"),
     ]
@@ -18,15 +17,11 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="freetextanswer",
             name="question",
-            field=models.OneToOneField(
-                on_delete=django.db.models.deletion.CASCADE, to="quizzes.question"
-            ),
+            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to="quizzes.question"),
         ),
         migrations.AlterField(
             model_name="multiplechoiceanswer",
             name="question",
-            field=models.OneToOneField(
-                on_delete=django.db.models.deletion.CASCADE, to="quizzes.question"
-            ),
+            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to="quizzes.question"),
         ),
     ]

quizzes/models.py

@@ -1,5 +1,5 @@
-from django.db import models
 from django.contrib.postgres import fields
+from django.db import models
 
 
 class Quiz(models.Model):

quizzes/tests.py

@@ -1,7 +1,7 @@
 from django.test import TestCase
 from django.urls import reverse
 
-from .models import Quiz, Question, FreeTextAnswer, MultipleChoiceAnswer
+from .models import FreeTextAnswer, MultipleChoiceAnswer, Question, Quiz
 
 
 def create_quiz():

quizzes/views.py

@@ -1,8 +1,8 @@
-from django.shortcuts import get_object_or_404, render, redirect
+from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.views import generic
 
-from .models import Quiz, Question
+from .models import Question, Quiz
 
 
 class IndexView(generic.ListView):