Merge pull request #2669 from bacongobbler/allow-cmd-override

fix(controller): allow users to override `cmd` process types

Author: Matthew Fisher

controller/api/models.py

@@ -403,9 +403,6 @@ def _get_scheduler(self):
     _scheduler = property(_get_scheduler)
 
     def _get_command(self):
-        # handle special case for Dockerfile deployments
-        if self.type == 'cmd':
-            return ''
         try:
             # if this is not procfile-based app, ensure they cannot break out
             # and run arbitrary commands on the host
@@ -415,8 +412,9 @@ def _get_command(self):
             else:
                 return 'start {}'.format(self.type)
         # if the key is not present or if a parent attribute is None
-        except (KeyError, TypeError):
-            return 'start {}'.format(self.type)
+        except (KeyError, TypeError, AttributeError):
+            # handle special case for Dockerfile deployments
+            return '' if self.type == 'cmd' else 'start {}'.format(self.type)
 
     _command = property(_get_command)
 

controller/api/tests/test_container.py

@@ -488,13 +488,16 @@ def test_command_good(self):
         build.sha = 'european-swallow'
         build.dockerfile = 'dockerdockerdocker'
         self.assertEqual(c._command, "bash -c 'node server.js'")
+        c.type = 'cmd'
+        self.assertEqual(c._command, '')
+        # ensure we can override the cmd process type in a Procfile
+        build.procfile['cmd'] = 'node server.js'
+        self.assertEqual(c._command, "bash -c 'node server.js'")
         c.type = 'worker'
         self.assertEqual(c._command, "bash -c 'node worker.js'")
         c.release.build.procfile = None
         # for backwards compatibility if no Procfile is supplied
         self.assertEqual(c._command, 'start worker')
-        c.type = 'cmd'
-        self.assertEqual(c._command, '')
 
     def test_run_command_good(self):
         """Test the run command for each container workflow"""