feat(release): add ptypes filter

Author: duanhongyi

rootfs/api/migrations/0016_remove_route_port_remove_route_ptype_and_more.py

@@ -0,0 +1,26 @@
+# Generated by Django 4.2.16 on 2024-10-21 04:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0015_alter_appsettings_autodeploy_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='route',
+            name='port',
+        ),
+        migrations.RemoveField(
+            model_name='route',
+            name='ptype',
+        ),
+        migrations.AddField(
+            model_name='release',
+            name='deployed_ptypes',
+            field=models.JSONField(default=list),
+        ),
+    ]

rootfs/api/migrations/0017_migration_deployed_ptypes.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.15 on 2024-09-06 03:58
+
+from django.db import migrations
+from api.models.release import Release
+
+
+def migration_deployed_ptypes(apps, schema_editor):
+    for release in Release.objects.all():
+        deployed_ptypes = set()
+        for condition in release.conditions:
+            if condition["ptypes"] is None:
+                deployed_ptypes = release.ptypes
+                break
+            else:
+                deployed_ptypes = deployed_ptypes.union(condition["ptypes"])
+        release.deployed_ptypes = list(deployed_ptypes)
+        release.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0016_remove_route_port_remove_route_ptype_and_more'),
+    ]
+
+    operations = [
+        migrations.RunPython(migration_deployed_ptypes),
+    ]

rootfs/api/models/release.py

@@ -12,7 +12,7 @@
 from scheduler import KubeHTTPException
 from scheduler.resources.pod import DEFAULT_CONTAINER_PORT
 
-from ..utils import DeployLock
+from ..utils import CacheLock, DeployLock
 
 from .base import UuidAuditedModel
 from .appsettings import AppSettings
@@ -41,6 +41,7 @@ class Release(UuidAuditedModel):
     failed = models.BooleanField(default=False)
     exception = models.TextField(blank=True, null=True)
     conditions = models.JSONField(default=list)
+    deployed_ptypes = models.JSONField(default=list)
 
     config = models.ForeignKey('Config', on_delete=models.CASCADE)
     build = models.ForeignKey('Build', null=True, on_delete=models.CASCADE)
@@ -163,9 +164,23 @@ def get_port(self, ptype):
                 'PORT', self.config.values.get('PORT', DEFAULT_CONTAINER_PORT)))
 
     def deploy(self, ptypes=None, force_deploy=False):
-        lock = DeployLock(self.app.pk)
-        if not lock.acquire(ptypes, force=force_deploy):
-            raise DryccException('there is an executing pipeline, please wait or force deploy')
+        msg = 'there is an executing pipeline, please wait or force deploy'
+        # change deployed_ptypes lock
+        lock = CacheLock("release:%s" % self.pk)
+        try:
+            if lock.acquire() or force_deploy:
+                if ptypes is None:
+                    deployed_ptypes = self.ptypes
+                else:
+                    deployed_ptypes = list(set(self.deployed_ptypes).union(ptypes))
+                type(self).objects.filter(pk=self.pk).update(deployed_ptypes=deployed_ptypes)
+            else:
+                raise DryccException(msg)
+        finally:
+            lock.release()
+        # deploy lock
+        if not DeployLock(self.app.pk).acquire(ptypes, force=force_deploy):
+            raise DryccException(msg)
         run_pipeline.delay(self, ptypes, force_deploy)
 
     def previous(self):

rootfs/api/tests/test_release.py

@@ -220,7 +220,7 @@ def test_response_data(self, mock_requests):
         for key in response.data.keys():
             self.assertIn(key, ['uuid', 'owner', 'created', 'updated', 'app', 'build', 'config',
                                 'summary', 'version', 'state', 'failed', 'conditions',
-                                'exception'])
+                                'exception', 'deployed_ptypes'])
         expected = {
             'owner': self.user.username,
             'app': app_id,
@@ -260,6 +260,16 @@ def test_release_deploy(self, mock_requests):
             response = self.client.post(url, {"ptypes": "web"})
             self.assertEqual(response.status_code, 204)
 
+        url = f'/v2/apps/{app_id}/releases/?ptypes=web'
+        response = self.client.get(url)
+        self.assertEqual(response.data['count'], 1)
+        url = f'/v2/apps/{app_id}/releases/?ptypes=web,worker'
+        response = self.client.get(url)
+        self.assertEqual(response.data['count'], 1)
+        url = f'/v2/apps/{app_id}/releases/?ptypes=web,worker,noexists'
+        response = self.client.get(url)
+        self.assertEqual(response.data['count'], 0)
+
     def test_release_rollback(self, mock_requests):
         app_id = self.create_app()
         app = App.objects.get(id=app_id)

rootfs/api/views.py

@@ -621,6 +621,15 @@ def get_object(self, **kwargs):
         qs = self.get_queryset(**kwargs)
         return get_object_or_404(qs, version=self.kwargs['version'])
 
+    def get_queryset(self, **kwargs):
+        ptypes = self.request.query_params.get('ptypes', '').strip()
+        queryset = super(ReleaseViewSet, self).get_queryset(**kwargs)
+        if ptypes:
+            queryset = queryset.filter(Q(
+                deployed_ptypes__contains=[
+                    ptype.lower() for ptype in re.split(r"\W+", ptypes)]))
+        return queryset
+
     def deploy(self, request, **kwargs):
         """Deploy the latest release"""
         latest_release = self.get_app().release_set.latest()