chore(controller): use get_user_model replace auth.User

Author: duanhongyi

rootfs/api/models/blocklist.py

@@ -1,7 +1,9 @@
 from django.db import models
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
 from api.models import UuidAuditedModel, App
 
+User = get_user_model()
+
 
 class Blocklist(UuidAuditedModel):
     """

rootfs/api/models/resource.py

@@ -54,7 +54,6 @@ def plans(cls, serviceclass_name):
             if service["name"] == serviceclass_name:
                 serviceclass_id = service["id"]
                 break
-    
         plans = []
         if serviceclass_id is not None:
             for serviceplan in cls._scheduler.svcat.get_serviceplans().json()["items"]:

rootfs/api/serializers.py

@@ -12,7 +12,7 @@
 from urllib.parse import urlparse
 
 from django.conf import settings
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
 from django.utils import timezone
 from rest_framework import serializers
 
@@ -23,6 +23,7 @@
 from api.exceptions import DryccException
 
 
+User = get_user_model()
 logger = logging.getLogger(__name__)
 
 PROCTYPE_MATCH = re.compile(r'^(?P<type>[a-z0-9]+(\-[a-z0-9]+)*)$')

rootfs/api/settings/production.py

@@ -112,7 +112,7 @@
     'api'
 )
 
-DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
 AUTHENTICATION_BACKENDS = (
     "django.contrib.auth.backends.ModelBackend",

rootfs/api/tests/test_api_middleware.py

@@ -4,12 +4,14 @@
 Run the tests with "./manage.py test api"
 """
 
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
 from rest_framework.authtoken.models import Token
 from api.tests import DryccTestCase
 
 from api import __version__
 
+User = get_user_model()
+
 
 class APIMiddlewareTest(DryccTestCase):
 

rootfs/api/tests/test_app.py

@@ -11,7 +11,7 @@
 import requests
 
 from django.conf import settings
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
 from django.core.cache import cache
 from django.test.utils import override_settings
 from rest_framework.authtoken.models import Token
@@ -23,6 +23,8 @@
 from api.tests import adapter, DryccTestCase
 import requests_mock
 
+User = get_user_model()
+
 
 def mock_none(*args, **kwargs):
     return None

rootfs/api/tests/test_app_settings.py

@@ -1,14 +1,16 @@
 import requests_mock
 
 from django.core.cache import cache
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
 from rest_framework.authtoken.models import Token
 
 from api.models import App
 from unittest import mock
 from scheduler import KubeException
 from api.tests import adapter, DryccTransactionTestCase
 
+User = get_user_model()
+
 
 @requests_mock.Mocker(real_http=True, adapter=adapter)
 class TestAppSettings(DryccTransactionTestCase):

rootfs/api/tests/test_build.py

@@ -5,7 +5,7 @@
 """
 import json
 
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
 from django.core.cache import cache
 from django.conf import settings
 from django.test.utils import override_settings
@@ -18,6 +18,8 @@
 from api.tests import adapter, DryccTransactionTestCase
 import requests_mock
 
+User = get_user_model()
+
 
 @requests_mock.Mocker(real_http=True, adapter=adapter)
 class BuildTest(DryccTransactionTestCase):

rootfs/api/tests/test_certificate.py

@@ -1,11 +1,13 @@
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
 from django.core.cache import cache
 from rest_framework.authtoken.models import Token
 from django.core.exceptions import SuspiciousOperation
 
 from api.models import Certificate
 from api.tests import TEST_ROOT, DryccTestCase
 
+User = get_user_model()
+
 
 class CertificateTest(DryccTestCase):
 

rootfs/api/tests/test_certificate_use_case_1.py

@@ -1,10 +1,12 @@
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
 from django.core.cache import cache
 from rest_framework.authtoken.models import Token
 
 from api.models import App, Certificate, Domain
 from api.tests import TEST_ROOT, DryccTestCase
 
+User = get_user_model()
+
 
 class CertificateUseCase1Test(DryccTestCase):