fix(api): fix settings imports

api/api/urls.py

@@ -12,9 +12,9 @@ from django.urls import include, path
 # If there is no request object available, e.g. in commands, a mock object can be constructed
 # carrying all information that is necessary to construct a full URL:
 #
+#         from django.conf import settings
 #         from django.test import RequestFactory
 #         from rest_framework.versioning import NamespaceVersioning
-#         from api import settings
 #
 #         r = RequestFactory().request(HTTP_HOST=settings.ALLOWED_HOSTS[0])
 #         r.version = 'v1'

api/desecapi/management/commands/privacy-chores.py

@@ -1,9 +1,9 @@
 from datetime import timedelta
 
+from django.conf import settings
 from django.core.management import BaseCommand
 from django.utils import timezone
 
-from api import settings
 from desecapi.models import User
 
 

api/desecapi/pdns.py

@@ -2,29 +2,29 @@ import json
 import re
 import requests
 
+from django.conf import settings
 from django.core.exceptions import SuspiciousOperation
 
-from api import settings as api_settings
 from desecapi.exceptions import PDNSException
 
 NSLORD = object()
 NSMASTER = object()
 
-settings = {
+_config = {
     NSLORD: {
-        'base_url': api_settings.NSLORD_PDNS_API,
+        'base_url': settings.NSLORD_PDNS_API,
         'headers': {
             'Accept': 'application/json',
             'User-Agent': 'desecapi',
-            'X-API-Key': api_settings.NSLORD_PDNS_API_TOKEN,
+            'X-API-Key': settings.NSLORD_PDNS_API_TOKEN,
         }
     },
     NSMASTER: {
-        'base_url': api_settings.NSMASTER_PDNS_API,
+        'base_url': settings.NSMASTER_PDNS_API,
         'headers': {
             'Accept': 'application/json',
             'User-Agent': 'desecapi',
-            'X-API-Key': api_settings.NSMASTER_PDNS_API_TOKEN,
+            'X-API-Key': settings.NSMASTER_PDNS_API_TOKEN,
         }
     }
 
@@ -33,10 +33,10 @@ settings = {
 
 def _pdns_request(method, *, server, path, body=None):
     data = json.dumps(body) if body else None
-    if data is not None and len(data) > api_settings.PDNS_MAX_BODY_SIZE:
+    if data is not None and len(data) > settings.PDNS_MAX_BODY_SIZE:
         raise PDNSException(detail='Payload too large', status=413)
 
-    r = requests.request(method, settings[server]['base_url'] + path, data=data, headers=settings[server]['headers'])
+    r = requests.request(method, _config[server]['base_url'] + path, data=data, headers=_config[server]['headers'])
     if r.status_code not in range(200, 300):
         raise PDNSException(r)
 

api/desecapi/pdns_change_tracker.py

@@ -1,11 +1,11 @@
 import random
 import socket
 
+from django.conf import settings
 from django.db.models.signals import post_save, post_delete
 from django.db.transaction import atomic
 from django.utils import timezone
 
-from api import settings as api_settings
 from desecapi.models import RRset, RR, Domain
 from desecapi.pdns import _pdns_post, NSLORD, NSMASTER, _pdns_delete, _pdns_patch, _pdns_put, pdns_id
 
@@ -77,7 +77,7 @@ class PDNSChangeTracker:
                     'kind': 'MASTER',
                     'dnssec': True,
                     'nsec3param': '1 0 127 %s' % salt,
-                    'nameservers': api_settings.DEFAULT_NS
+                    'nameservers': settings.DEFAULT_NS
                 }
             )
 
@@ -94,11 +94,11 @@ class PDNSChangeTracker:
             rr_set = RRset(
                 domain=Domain.objects.get(name=self.domain_name),
                 type='NS', subname='',
-                ttl=api_settings.DEFAULT_NS_TTL,
+                ttl=settings.DEFAULT_NS_TTL,
             )
             rr_set.save()
 
-            rrs = [RR(rrset=rr_set, content=ns) for ns in api_settings.DEFAULT_NS]
+            rrs = [RR(rrset=rr_set, content=ns) for ns in settings.DEFAULT_NS]
             RR.objects.bulk_create(rrs)  # One INSERT
 
     class DeleteDomain(PDNSChange):

api/desecapi/tests/base.py

@@ -9,6 +9,7 @@ from json import JSONDecodeError
 from typing import Union, List, Dict
 from unittest import mock
 
+from django.conf import settings
 from django.db import connection
 from django.utils import timezone
 from httpretty import httpretty, core as hr_core
@@ -16,7 +17,6 @@ from rest_framework.reverse import reverse
 from rest_framework.test import APITestCase, APIClient
 from rest_framework.utils import json
 
-from api import settings
 from desecapi.models import User, Domain, Token, RRset, RR
 from desecapi.views import DomainList
 

api/desecapi/tests/test_privacy_chores.py

@@ -1,9 +1,9 @@
 from datetime import timedelta
 
+from django.conf import settings
 from django.core.management import call_command
 from django.utils import timezone
 
-from api import settings
 from desecapi.models import User
 from desecapi.tests.base import DesecTestCase
 

api/desecapi/tests/test_registration.py

@@ -1,12 +1,12 @@
 from datetime import timedelta
 
+from django.conf import settings
 from django.core import mail
 from django.test import RequestFactory
 from django.utils import timezone
 from rest_framework.reverse import reverse
 from rest_framework.versioning import NamespaceVersioning
 
-from api import settings
 from desecapi import models
 from desecapi.emails import send_account_lock_email
 from desecapi.tests.base import DesecTestCase

api/desecapi/views.py

@@ -8,6 +8,7 @@ from datetime import timedelta
 import django.core.exceptions
 import djoser.views
 import psl_dns
+from django.conf import settings
 from django.contrib.auth import user_logged_in, user_logged_out
 from django.core.mail import EmailMessage
 from django.db.models import Q
@@ -30,7 +31,6 @@ from rest_framework.views import APIView
 from rest_framework.viewsets import GenericViewSet
 
 import desecapi.authentication as auth
-from api import settings
 from desecapi.emails import send_account_lock_email, send_token_email
 from desecapi.forms import UnlockForm
 from desecapi.models import Domain, User, RRset, Token