Merge pull request #1144 from zinuzoid/new-label-cmd

feat(label-cmd): support new label cmd

Author: kmala

rootfs/api/migrations/0021_appsettings_label.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.2 on 2016-11-19 16:11
+from __future__ import unicode_literals
+
+from django.db import migrations
+import jsonfield.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0020_release_failed'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='appsettings',
+            name='label',
+            field=jsonfield.fields.JSONField(blank=True, default={}),
+        ),
+    ]

rootfs/api/models/appsettings.py

@@ -23,6 +23,7 @@ class AppSettings(UuidAuditedModel):
     # and user just updating other fields meaning the values needs to be copied from prev release
     whitelist = ArrayField(models.CharField(max_length=50), default=None)
     autoscale = JSONField(default={}, blank=True)
+    label = JSONField(default={}, blank=True)
 
     class Meta:
         get_latest_by = 'created'
@@ -133,6 +134,38 @@ def update_autoscale(self, previous_settings):
             if changes:
                 self.summary += ["{} {}".format(self.owner, changes)]
 
+    def update_label(self, previous_settings):
+        data = getattr(previous_settings, 'label', {}).copy()
+        new = getattr(self, 'label', {}).copy()
+        if not previous_settings:
+            return
+
+        # if nothing changed copy the settings from previous
+        if not new and data:
+            setattr(self, 'label', data)
+        elif data != new:
+            for k, v in new.items():
+                if v is not None:
+                    data[k] = v
+                else:
+                    if k not in data:
+                        raise UnprocessableEntity('{} does not exist under {}'.format(k, 'label'))  # noqa
+                    del data[k]
+            setattr(self, 'label', data)
+
+            diff = dict_diff(self.label, getattr(previous_settings, 'label', {}))
+            added = ', '.join(list(map(lambda x: 'default' if x == '' else x, [k for k in diff.get('added', {})])))  # noqa
+            added = 'added label ' + added if added else ''
+            changed = ', '.join(list(map(lambda x: 'default' if x == '' else x, [k for k in diff.get('changed', {})])))  # noqa
+            changed = 'changed label ' + changed if changed else ''
+            deleted = ', '.join(list(map(lambda x: 'default' if x == '' else x, [k for k in diff.get('deleted', {})])))  # noqa
+            deleted = 'deleted label ' + deleted if deleted else ''
+            changes = ', '.join(i for i in (added, changed, deleted) if i)
+            if changes:
+                if self.summary:
+                    self.summary += ' and '
+                self.summary += ["{} {}".format(self.owner, changes)]
+
     def save(self, *args, **kwargs):
         self.summary = []
         previous_settings = None
@@ -146,6 +179,7 @@ def save(self, *args, **kwargs):
             self.update_routable(previous_settings)
             self.update_whitelist(previous_settings)
             self.update_autoscale(previous_settings)
+            self.update_label(previous_settings)
         except (UnprocessableEntity, NotFound):
             raise
         except Exception as e:

rootfs/api/serializers.py

@@ -489,6 +489,7 @@ class AppSettingsSerializer(serializers.ModelSerializer):
     app = serializers.SlugRelatedField(slug_field='id', queryset=models.App.objects.all())
     owner = serializers.ReadOnlyField(source='owner.username')
     autoscale = JSONFieldSerializer(convert_to_str=False, required=False, binary=True)
+    label = JSONFieldSerializer(convert_to_str=False, required=False, binary=True)
 
     class Meta:
         """Metadata options for a :class:`AppSettingsSerializer`."""

rootfs/api/tests/test_app_settings.py

@@ -265,3 +265,55 @@ def test_autoscale_validations(self, mock_requests):
             {'autoscale': {'cmd': {'min': 4, 'cpu_percent': 45}}}
         )
         self.assertEqual(response.status_code, 400, response.data)
+
+    def test_settings_labels(self, mock_requests):
+        """
+        Test that labels can be applied
+        """
+        app_id = self.create_app()
+
+        # create
+        base_labels = {
+            'label':
+                {
+                    'git_repo': 'https://github.com/deis/controller',
+                    'team': 'frontend',
+                    'empty': ''
+                }
+        }
+        response = self.client.post(
+            '/v2/apps/{app_id}/settings'.format(**locals()),
+            base_labels
+        )
+        self.assertEqual(response.status_code, 201, response.data)
+        self.assertEqual(response.data['label'], base_labels['label'])
+
+        # update
+        labels = {'label': {'team': 'backend'}}
+        response = self.client.post(
+            '/v2/apps/{app_id}/settings'.format(**locals()),
+            labels
+        )
+        self.assertEqual(response.status_code, 201, response.data)
+        self.assertEqual(response.data['label']['team'], labels['label']['team'])
+        self.assertEqual(response.data['label']['git_repo'], base_labels['label']['git_repo'])
+        self.assertEqual(response.data['label']['empty'], base_labels['label']['empty'])
+
+        # remove
+        labels = {'label': {'git_repo': None}}
+        response = self.client.post(
+            '/v2/apps/{app_id}/settings'.format(**locals()),
+            labels
+        )
+        self.assertEqual(response.status_code, 201, response.data)
+        self.assertEqual(response.data['label']['team'], 'backend')
+        self.assertFalse('git_repo' in response.data['label'])
+        self.assertEqual(response.data['label']['empty'], base_labels['label']['empty'])
+
+        # error on remove non-exist label
+        labels = {'label': {'git_repo': None}}
+        response = self.client.post(
+            '/v2/apps/{app_id}/settings'.format(**locals()),
+            labels
+        )
+        self.assertEqual(response.status_code, 422, response.data)