chore(controller): using django native JSONFiled

Author: duanhongyi

rootfs/api/migrations/0001_initial.py

@@ -18,7 +18,6 @@
 from django.conf import settings
 from django.db import models
 from rest_framework.exceptions import ValidationError, NotFound
-from jsonfield import JSONField
 
 from api.models import get_session
 from api.models import UuidAuditedModel, AlreadyExists, DryccException, ServiceUnavailable
@@ -73,8 +72,10 @@ class App(UuidAuditedModel):
     id = models.SlugField(max_length=63, unique=True, null=True,
                           validators=[validate_app_id,
                                       validate_reserved_names])
-    structure = JSONField(default={}, blank=True, validators=[validate_app_structure])
-    procfile_structure = JSONField(default={}, blank=True, validators=[validate_app_structure])
+    structure = models.JSONField(
+        default=dict, blank=True, validators=[validate_app_structure])
+    procfile_structure = models.JSONField(
+        default=dict, blank=True, validators=[validate_app_structure])
 
     class Meta:
         verbose_name = 'Application'

rootfs/api/models/app.py

@@ -3,7 +3,6 @@
 from django.db import models
 from django.db import transaction
 from django.contrib.postgres.fields import ArrayField
-from jsonfield import JSONField
 from rest_framework.exceptions import NotFound
 
 from api.utils import dict_diff
@@ -22,8 +21,8 @@ class AppSettings(UuidAuditedModel):
     # 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)
-    autoscale = JSONField(default={}, blank=True)
-    label = JSONField(default={}, blank=True)
+    autoscale = models.JSONField(default=dict, blank=True)
+    label = models.JSONField(default=dict, blank=True)
 
     class Meta:
         get_latest_by = 'created'

rootfs/api/models/appsettings.py

@@ -1,6 +1,5 @@
 from django.conf import settings
 from django.db import models
-from jsonfield import JSONField
 
 from api.models import UuidAuditedModel
 from api.exceptions import DryccException, Conflict
@@ -21,7 +20,7 @@ class Build(UuidAuditedModel):
 
     # optional fields populated by builder
     sha = models.CharField(max_length=40, blank=True)
-    procfile = JSONField(default={}, blank=True)
+    procfile = models.JSONField(default=dict, blank=True)
     dockerfile = models.TextField(blank=True)
 
     class Meta:

rootfs/api/models/build.py

@@ -2,7 +2,6 @@
 import logging
 from django.conf import settings
 from django.db import models
-from jsonfield import JSONField
 from api.models.release import Release
 from api.models import UuidAuditedModel
 from api.utils import unit_to_bytes, unit_to_millicpu
@@ -20,15 +19,15 @@ class Config(UuidAuditedModel):
 
     owner = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.PROTECT)
     app = models.ForeignKey('App', on_delete=models.CASCADE)
-    values = JSONField(default={}, blank=True)
-    memory = JSONField(default={}, blank=True)
-    lifecycle_post_start = JSONField(default={}, blank=True)
-    lifecycle_pre_stop = JSONField(default={}, blank=True)
-    cpu = JSONField(default={}, blank=True)
-    tags = JSONField(default={}, blank=True)
-    registry = JSONField(default={}, blank=True)
-    healthcheck = JSONField(default={}, blank=True)
-    termination_grace_period = JSONField(default={}, blank=True)
+    values = models.JSONField(default=dict, blank=True)
+    memory = models.JSONField(default=dict, blank=True)
+    lifecycle_post_start = models.JSONField(default=dict, blank=True)
+    lifecycle_pre_stop = models.JSONField(default=dict, blank=True)
+    cpu = models.JSONField(default=dict, blank=True)
+    tags = models.JSONField(default=dict, blank=True)
+    registry = models.JSONField(default=dict, blank=True)
+    healthcheck = models.JSONField(default=dict, blank=True)
+    termination_grace_period = models.JSONField(default=dict, blank=True)
 
     class Meta:
         get_latest_by = 'created'

rootfs/api/models/config.py

@@ -1,7 +1,6 @@
 import logging
 from django.conf import settings
 from django.db import models, transaction
-from jsonfield import JSONField
 from api.exceptions import DryccException, AlreadyExists, ServiceUnavailable
 from api.models import UuidAuditedModel, validate_label
 from scheduler import KubeException
@@ -15,10 +14,10 @@ class Resource(UuidAuditedModel):
     app = models.ForeignKey('App', on_delete=models.CASCADE)
     name = models.CharField(max_length=63, validators=[validate_label])
     plan = models.CharField(max_length=128)
-    data = JSONField(default={}, blank=True)
+    data = models.JSONField(default=dict, blank=True)
     status = models.TextField(blank=True, null=True)
     binding = models.TextField(blank=True, null=True)
-    options = JSONField(default={}, blank=True)
+    options = models.JSONField(default=dict, blank=True)
 
     class Meta:
         get_latest_by = 'created'

rootfs/api/models/resource.py

@@ -1,7 +1,6 @@
 import logging
 from django.db import models, transaction
 from django.conf import settings
-from jsonfield import JSONField
 from api.utils import unit_to_bytes
 from api.exceptions import DryccException, ServiceUnavailable, AlreadyExists
 from api.models import UuidAuditedModel, validate_label
@@ -16,7 +15,7 @@ class Volume(UuidAuditedModel):
     app = models.ForeignKey('App', on_delete=models.CASCADE)
     name = models.CharField(max_length=63, validators=[validate_label])
     size = models.CharField(max_length=128)
-    path = JSONField(default={}, blank=True)
+    path = models.JSONField(default=dict, blank=True)
 
     class Meta:
         get_latest_by = 'created'

rootfs/api/models/volume.py

@@ -104,7 +104,6 @@
     'corsheaders',
     'guardian',
     'gunicorn',
-    'jsonfield',
     'rest_framework',
     'rest_framework.authtoken',
     'social_django',
@@ -420,7 +419,7 @@
 MINIO_PORT = os.environ.get('DRYCC_MINIO_SERVICE_PORT', 80)
 APP_STORAGE = os.environ.get('APP_STORAGE')
 
-DRYCC_DATABASE_URL = os.environ.get('DRYCC_DATABASE_URL', 'postgres://:@:5432/drycc')
+DRYCC_DATABASE_URL = os.environ.get('DRYCC_DATABASE_URL', 'postgres://postgres:@:5432/drycc')
 DATABASES = {
     'default': dj_database_url.config(default=DRYCC_DATABASE_URL, conn_max_age=600)
 }

rootfs/api/settings/production.py

@@ -8,7 +8,6 @@ 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