Adding initial changes to the api

Author: Cryptophobia

Makefile

@@ -33,7 +33,7 @@ docker-build: check-docker
 docker-build-test: check-docker
 	docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE}.test -f rootfs/Dockerfile.test rootfs
 
-deploy: check-kubectl docker-build docker-push
+deploy: docker-build docker-push
 	kubectl --namespace=deis patch deployment deis-$(COMPONENT) --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"$(IMAGE)"}]'
 
 clean: check-docker

rootfs/api/migrations/0001_initial.py

@@ -73,6 +73,8 @@ class Migration(migrations.Migration):
                 ('updated', models.DateTimeField(auto_now=True)),
                 ('values', jsonfield.fields.JSONField(default={}, blank=True)),
                 ('memory', jsonfield.fields.JSONField(default={}, blank=True)),
+                ('lifecycle_post_start', jsonfield.fields.JSONField(default={}, blank=True)),
+                ('lifecycle_pre_stop', jsonfield.fields.JSONField(default={}, blank=True)),
                 ('cpu', jsonfield.fields.JSONField(default={}, blank=True)),
                 ('tags', jsonfield.fields.JSONField(default={}, blank=True)),
                 ('app', models.ForeignKey(to='api.App')),

rootfs/api/models/app.py

@@ -1082,6 +1082,8 @@ def _gather_app_settings(self, release, app_settings, process_type, replicas):
             'app_type': process_type,
             'build_type': release.build.type,
             'healthcheck': healthcheck,
+            'lifecycle_post_start': config.lifecycle_post_start,
+            'lifecycle_pre_stop': config.lifecycle_pre_stop,
             'routable': routable,
             'deploy_batches': batches,
             'deploy_timeout': deploy_timeout,

rootfs/api/models/config.py

@@ -18,6 +18,8 @@ class Config(UuidAuditedModel):
     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)
@@ -162,7 +164,7 @@ def save(self, **kwargs):
                 # usually means a totally new app
                 previous_config = self.app.config_set.latest()
 
-            for attr in ['cpu', 'memory', 'tags', 'registry', 'values']:
+            for attr in ['cpu', 'memory', 'tags', 'registry', 'values', 'lifecycle_post_start', 'lifecycle_pre_stop']:
                 data = getattr(previous_config, attr, {}).copy()
                 new_data = getattr(self, attr, {}).copy()
 

rootfs/api/models/release.py

@@ -424,6 +424,40 @@ def save(self, *args, **kwargs):  # noqa
                     changes = 'changed limits for '+', '.join(changes)
                     self.summary += "{} {}".format(self.config.owner, changes)
 
+                # if the lifecycle_post_start hooks changed, log the dict diff
+                changes = []
+                old_lifecycle_post_start = old_config.lifecycle_post_start if old_config else {}
+                diff = dict_diff(self.config.lifecycle_post_start, old_lifecycle_post_start)
+                # try to be as succinct as possible
+                added = ', '.join(k for k in diff.get('added', {}))
+                added = 'added lifecycle_post_start  ' + added if added else ''
+                changed = ', '.join(k for k in diff.get('changed', {}))
+                changed = 'changed lifecycle_post_start ' + changed if changed else ''
+                deleted = ', '.join(k for k in diff.get('deleted', {}))
+                deleted = 'deleted lifecycle_post_start ' + 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.config.owner, changes)
+
+                # if the lifecycle_post_start hooks changed, log the dict diff
+                changes = []
+                old_lifecycle_post_start = old_config.lifecycle_post_start if old_config else {}
+                diff = dict_diff(self.config.lifecycle_post_start, old_lifecycle_post_start)
+                # try to be as succinct as possible
+                added = ', '.join(k for k in diff.get('added', {}))
+                added = 'added lifecycle_post_start  ' + added if added else ''
+                changed = ', '.join(k for k in diff.get('changed', {}))
+                changed = 'changed lifecycle_post_start ' + changed if changed else ''
+                deleted = ', '.join(k for k in diff.get('deleted', {}))
+                deleted = 'deleted lifecycle_post_start ' + 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.config.owner, changes)
+
                 # if the tags changed, log the dict diff
                 changes = []
                 old_tags = old_config.tags if old_config else {}

rootfs/api/serializers.py

@@ -210,6 +210,8 @@ class ConfigSerializer(serializers.ModelSerializer):
     owner = serializers.ReadOnlyField(source='owner.username')
     values = JSONFieldSerializer(required=False, binary=True)
     memory = JSONFieldSerializer(required=False, binary=True)
+    lifecycle_post_start = JSONFieldSerializer(required=False, binary=True)
+    lifecycle_pre_stop = JSONFieldSerializer(required=False, binary=True)
     cpu = JSONFieldSerializer(required=False, binary=True)
     tags = JSONFieldSerializer(required=False, binary=True)
     registry = JSONFieldSerializer(required=False, binary=True)