chore(controller): use JSONField replace ArrayField

Author: duanhongyi

rootfs/api/migrations/0001_initial.py

@@ -67,7 +67,7 @@ class Migration(migrations.Migration):
                 ('certificate', models.TextField(validators=[api.models.certificate.validate_certificate])),
                 ('key', models.TextField(validators=[api.models.certificate.validate_private_key])),
                 ('common_name', models.TextField(editable=False, null=True)),
-                ('san', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=253), null=True, size=None)),
+                ('san', models.JSONField(default=None, null=True)),
                 ('fingerprint', models.CharField(editable=False, max_length=96)),
                 ('expires', models.DateTimeField(editable=False)),
                 ('starts', models.DateTimeField(editable=False)),
@@ -236,7 +236,7 @@ class Migration(migrations.Migration):
                 ('created', models.DateTimeField(auto_now_add=True)),
                 ('updated', models.DateTimeField(auto_now=True)),
                 ('routable', models.BooleanField(null=True)),
-                ('allowlist', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=50), default=None, size=None)),
+                ('allowlist', models.JSONField(default=None, null=True)),
                 ('autoscale', models.JSONField(blank=True, default=dict)),
                 ('label', models.JSONField(blank=True, default=dict)),
                 ('app', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api.app')),

rootfs/api/models/appsettings.py

@@ -2,7 +2,6 @@
 from django.db import models
 from django.db import transaction
 
-from django.contrib.postgres.fields import ArrayField
 from rest_framework.exceptions import NotFound
 from django.contrib.auth import get_user_model
 from api.utils import dict_diff
@@ -22,7 +21,7 @@ class AppSettings(UuidAuditedModel):
     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)
+    allowlist = models.JSONField(default=None, null=True)
     autoscale = models.JSONField(default=dict, blank=True)
     label = models.JSONField(default=dict, blank=True)
 

rootfs/api/models/certificate.py

@@ -10,7 +10,6 @@
 from django.shortcuts import get_object_or_404
 from django.db import models
 from django.core.exceptions import SuspiciousOperation
-from django.contrib.postgres.fields import ArrayField
 from django.contrib.auth import get_user_model
 from rest_framework.exceptions import ValidationError
 from api.models import AuditedModel, validate_label, AlreadyExists, ServiceUnavailable
@@ -89,7 +88,7 @@ class Certificate(AuditedModel):
     # X.509 certificates allow any string of information as the common name.
     common_name = models.TextField(editable=False, unique=False, null=True)
     # A list of DNS records if certificate has SubjectAltName
-    san = ArrayField(models.CharField(max_length=253), null=True)
+    san = models.JSONField(default=None, null=True)
     # SHA256 fingerprint
     fingerprint = models.CharField(max_length=96, editable=False)
     # Expires and Start time of cert

rootfs/api/tests/test_app_settings.py

@@ -97,7 +97,6 @@ def test_settings_allowlist(self, mock_requests):
         self.assertEqual(set(response.data['addresses']),
                          set(app.appsettings_set.latest().allowlist), response.data)
         self.assertEqual(set(response.data['addresses']), set(addresses), response.data)
-
         # add exisitng addresses to allowlist
         response = self.client.post(
             '/v2/apps/{app_id}/allowlist'.format(**locals()),
@@ -109,6 +108,7 @@ def test_settings_allowlist(self, mock_requests):
             '/v2/apps/{app_id}/allowlist'.format(**locals()),
             allowlist)
         self.assertEqual(response.status_code, 422)
+
         # pass invalid address
         allowlist = {'addresses': ["2.3.4.6.7"]}
         response = self.client.post(