Merge pull request #1285 from deis/hotfix-app-announcers

fix(controller): format command before creating container

Author: mboersma

controller/api/models.py

@@ -298,7 +298,7 @@ def _get_command(self):
             if c_type == 'cmd':
                 return ''
             else:
-                return 'start {c_type}'
+                return "start {}".format(c_type)
         else:
             return ''
 
@@ -311,10 +311,9 @@ def _command_announceable(self):
     @transition(field=state, source=INITIALIZED, target=CREATED)
     def create(self):
         image = self.release.image
-        c_type = self.type
         self._scheduler.create(name=self._job_id,
                                image=image,
-                               command=self._command.format(**locals()),
+                               command=self._command,
                                use_announcer=self._command_announceable())
 
     @close_db_connections

controller/api/tests/test_container.py

@@ -325,3 +325,30 @@ def test_container_str(self):
                          "{}.{}.{}".format(container.app, container.type, container.num))
         self.assertEqual(str(container),
                          "{}.{}.{}".format(container.app, container.type, container.num))
+
+    def test_container_command_format(self):
+        # regression test for https://github.com/deis/deis/pull/1285
+        url = '/api/apps'
+        body = {'cluster': 'autotest'}
+        response = self.client.post(url, json.dumps(body), content_type='application/json')
+        self.assertEqual(response.status_code, 201)
+        app_id = response.data['id']
+        # post a new build
+        url = "/api/apps/{app_id}/builds".format(**locals())
+        body = {'image': 'autotest/example', 'sha': 'a'*40,
+                'procfile': json.dumps({'web': 'node server.js', 'worker': 'node worker.js'})}
+        response = self.client.post(url, json.dumps(body), content_type='application/json')
+        self.assertEqual(response.status_code, 201)
+        # scale up
+        url = "/api/apps/{app_id}/scale".format(**locals())
+        body = {'web': 1}
+        response = self.client.post(url, json.dumps(body), content_type='application/json')
+        self.assertEqual(response.status_code, 204)
+        url = "/api/apps/{app_id}/containers".format(**locals())
+        response = self.client.get(url)
+        # verify that the container._command property got formatted
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.data['results']), 1)
+        uuid = response.data['results'][0]['uuid']
+        container = Container.objects.get(uuid=uuid)
+        self.assertNotIn('{c_type}', container._command)