fix(scheduler): deis run can fail under some conditions when DEBUG is set

Fixes #583

Author: helgi

rootfs/api/tests/test_app.py

@@ -22,6 +22,10 @@ def mock_none(*args, **kwargs):
     return None
 
 
+def _mock_run(*args, **kwargs):
+    return [0, 'mock']
+
+
 @requests_mock.Mocker(real_http=True, adapter=adapter)
 class AppTest(APITestCase):
     """Tests creation of applications"""
@@ -251,9 +255,6 @@ def test_run_without_release_should_error(self, mock_requests):
         self.assertEqual(response.data, {'detail': 'No build associated with this '
                                                    'release to run this command'})
 
-    def _mock_run(*args, **kwargs):
-        return [0, 'mock']
-
     @mock.patch('api.models.App.run', _mock_run)
     @mock.patch('api.models.App.deploy', mock_none)
     @mock.patch('api.models.Release.publish', mock_none)

rootfs/api/tests/test_pods.py

@@ -12,6 +12,7 @@
 from rest_framework.test import APITransactionTestCase
 from unittest import mock
 from rest_framework.authtoken.models import Token
+from test.support import EnvironmentVarGuard
 
 from api.models import App, Build, Release
 
@@ -571,7 +572,7 @@ def test_run_command_good(self, mock_requests):
         entrypoint = json.loads(response.data['output'])['spec']['containers'][0]['command'][0]
         self.assertEqual(entrypoint, '/bin/bash')
 
-        # # docker image workflow
+        # docker image workflow
         build.dockerfile = ''
         build.sha = ''
         build.save()
@@ -582,7 +583,7 @@ def test_run_command_good(self, mock_requests):
         entrypoint = json.loads(response.data['output'])['spec']['containers'][0]['command'][0]
         self.assertEqual(entrypoint, '/bin/bash')
 
-        # # procfile workflow
+        # procfile workflow
         build.sha = 'somereallylongsha'
         build.save()
         url = "/v2/apps/{app_id}/run".format(**locals())
@@ -592,6 +593,49 @@ def test_run_command_good(self, mock_requests):
         entrypoint = json.loads(response.data['output'])['spec']['containers'][0]['command'][0]
         self.assertEqual(entrypoint, '/runner/init')
 
+    def test_run_not_fail_on_debug(self, mock_requests):
+        """
+        do a run with DEBUG on - https://github.com/deis/controller/issues/583
+        """
+        env = EnvironmentVarGuard()
+        env['DEBUG'] = 'true'
+
+        url = '/v2/apps'
+        response = self.client.post(url)
+        self.assertEqual(response.status_code, 201)
+        app_id = response.data['id']
+        app = App.objects.get(id=app_id)
+
+        # dockerfile + procfile worflow
+        build = Build.objects.create(
+            owner=self.user,
+            app=app,
+            image="qwerty",
+            procfile={
+                'web': 'node server.js',
+                'worker': 'node worker.js'
+            },
+            dockerfile='foo',
+            sha='somereallylongsha'
+        )
+
+        # create an initial release
+        Release.objects.create(
+            version=2,
+            owner=self.user,
+            app=app,
+            config=app.config_set.latest(),
+            build=build
+        )
+
+        # create a run pod
+        url = "/v2/apps/{app_id}/run".format(**locals())
+        body = {'command': 'echo hi'}
+        response = self.client.post(url, body)
+        self.assertEqual(response.status_code, 200)
+        entrypoint = json.loads(response.data['output'])['spec']['containers'][0]['command'][0]
+        self.assertEqual(entrypoint, '/bin/bash')
+
     def test_scaling_does_not_add_run_proctypes_to_structure(self, mock_requests):
         """Test that app info doesn't show transient "run" proctypes."""
         url = '/v2/apps'

rootfs/scheduler/__init__.py

@@ -86,7 +86,8 @@
     "containers": [
       {
         "name": "$id",
-        "image": "$image"
+        "image": "$image",
+        "env": []
       }
     ],
     "restartPolicy": "Never"
@@ -564,6 +565,10 @@ def _set_environment(self, data, **kwargs):
         cpu = kwargs.get('cpu', {}).get(app_type)
         env = kwargs.get('envs', {})
 
+        # create env list if missing
+        if 'env' not in data:
+            data['env'] = []
+
         if env:
             for key, value in env.items():
                 data["env"].append({