chore(controller): update requirements

Author: duanhongyi

rootfs/api/models/appsettings.py

@@ -18,7 +18,7 @@ class AppSettings(UuidAuditedModel):
 
     owner = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.PROTECT)
     app = models.ForeignKey('App', on_delete=models.CASCADE)
-    routable = models.NullBooleanField(default=None)
+    routable = models.BooleanField(null=True)
     # the default values is None to differentiate from user sending an empty allowlist
     # and user just updating other fields meaning the values needs to be copied from prev release
     allowlist = ArrayField(models.CharField(max_length=50), default=None)

rootfs/api/models/tls.py

@@ -9,8 +9,8 @@
 class TLS(UuidAuditedModel):
     owner = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.PROTECT)
     app = models.ForeignKey('App', on_delete=models.CASCADE)
-    https_enforced = models.NullBooleanField(default=None)
-    certs_auto_enabled = models.NullBooleanField(default=None)
+    https_enforced = models.BooleanField(null=True)
+    certs_auto_enabled = models.BooleanField(null=True)
 
     class Meta:
         get_latest_by = 'created'

rootfs/api/settings/production.py

@@ -112,6 +112,8 @@
     'api'
 )
 
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+
 AUTHENTICATION_BACKENDS = (
     "django.contrib.auth.backends.ModelBackend",
     "guardian.backends.ObjectPermissionBackend",
@@ -435,7 +437,7 @@
 SOCIAL_AUTH_DRYCC_OIDC_ENDPOINT = os.environ.get('SOCIAL_AUTH_DRYCC_OIDC_ENDPOINT')
 SOCIAL_AUTH_DRYCC_KEY = os.environ.get('SOCIAL_AUTH_DRYCC_CONTROLLER_KEY')
 SOCIAL_AUTH_DRYCC_SECRET = os.environ.get('SOCIAL_AUTH_DRYCC_CONTROLLER_SECRET')
-SOCIAL_AUTH_POSTGRES_JSONFIELD = True
+SOCIAL_AUTH_JSONFIELD_ENABLED = True
 SOCIAL_AUTH_PIPELINE = (
     'social_core.pipeline.social_auth.social_details',
     'social_core.pipeline.social_auth.social_uid',

rootfs/api/views.py

@@ -429,7 +429,7 @@ def get_object(self, **kwargs):
 
     def attach(self, request, *args, **kwargs):
         try:
-            if kwargs['domain'] is None and not request.data.get('domain'):
+            if "domain" not in kwargs and not request.data.get('domain'):
                 raise DryccException("domain is a required field")
             elif request.data.get('domain'):
                 kwargs['domain'] = request.data['domain']

rootfs/requirements.txt

@@ -1,28 +1,28 @@
 # Drycc controller requirements
-backoff==1.10.0
-django==2.2.24
+backoff==1.11.1
+django==3.2.5
 django-cors-headers==3.7.0
-django-guardian==2.3.0
-djangorestframework==3.11.2
-docker==4.2.2
-gunicorn==20.0.4
-idna==2.10
+django-guardian==2.4.0
+djangorestframework==3.12.4
+docker==5.0.0
+gunicorn==20.1.0
+idna==3.2
 jmespath==0.10.0
 jsonfield==3.1.0
 jsonschema==3.2.0
 morph==0.1.4
 ndg-httpsclient==0.5.1
-packaging==20.4
+packaging==21.0
 pyasn1==0.4.8
-psycopg2-binary==2.8.5
-pyOpenSSL==19.1.0
-pytz==2020.1
-requests==2.24.0
+psycopg2-binary==2.9.1
+pyOpenSSL==20.0.1
+pytz==2021.1
+requests==2.26.0
 requests-toolbelt==0.9.1
-celery==5.0.2
-django_redis==4.12.1
-influxdb-client==1.13.0
-dj-database-url
-social-auth-app-django==4.0.0
-python-jose
-Authlib
+celery==5.1.2
+django_redis==5.0.0
+influxdb-client==1.19.0
+dj-database-url==0.5.0
+social-auth-app-django==5.0.0
+python-jose==3.3.0
+Authlib==0.15.4