fix(api): check if release.build is NoneType (#1078)

Author: Matthew Fisher

rootfs/api/models/app.py

@@ -23,9 +23,9 @@
 from api.models import UuidAuditedModel, AlreadyExists, DeisException, ServiceUnavailable
 
 from api.utils import generate_app_name, async_run
-from api.models.release import Release
 from api.models.config import Config
 from api.models.domain import Domain
+from api.models.release import Release
 from api.models.tls import TLS
 from api.models.appsettings import AppSettings
 
@@ -786,6 +786,8 @@ def _build_env_vars(self, release):
         Build a dict of env vars, setting default vars based on app type
         and then combining with the user set ones
         """
+        if release.build is None:
+            raise DeisException('No build associated with this release to run this command')
 
         # mix in default environment information deis may require
         default_env = {
@@ -803,8 +805,7 @@ def _build_env_vars(self, release):
 
         # fetch application port and inject into ENV vars as needed
         port = release.get_port()
-        if port:
-            default_env['PORT'] = port
+        default_env['PORT'] = port
 
         # merge envs on top of default to make envs win
         default_env.update(release.config.values)

rootfs/api/tests/test_app.py

@@ -19,6 +19,7 @@
 from api.models import App
 from scheduler import KubeException
 
+from api.exceptions import DeisException
 from api.tests import adapter, mock_port, DeisTestCase
 import requests_mock
 
@@ -572,6 +573,37 @@ def test_get_private_registry_config_bad_registry_location(self, mock_requests):
         self.assertEqual(name, None)
         self.assertEqual(create, None)
 
+    def test_build_env_vars(self, mock_requests):
+        app = App.objects.create(owner=self.user)
+        # Make sure an exception is raised when calling without a build available
+        with self.assertRaises(DeisException):
+            app._build_env_vars(app.release_set.latest())
+        data = {'image': 'autotest/example'}
+        url = "/v2/apps/{app.id}/builds".format(**locals())
+        response = self.client.post(url, data)
+        self.assertEqual(response.status_code, 201, response.data)
+        self.assertEqual(
+            app._build_env_vars(app.release_set.latest()),
+            {
+                'DEIS_APP': app.id,
+                'WORKFLOW_RELEASE': 'v2',
+                'PORT': 5000
+            })
+        data['sha'] = 'abc1234'
+        response = self.client.post(url, data)
+        self.assertEqual(response.status_code, 201, response.data)
+        self.assertEqual(
+            app._build_env_vars(app.release_set.latest()),
+            {
+                'DEIS_APP': app.id,
+                'WORKFLOW_RELEASE': 'v3',
+                'PORT': 5000,
+                'SLUG_URL': 'autotest/example',
+                'BUILDER_STORAGE': None,
+                'DEIS_MINIO_SERVICE_HOST': '127.0.0.1',
+                'DEIS_MINIO_SERVICE_PORT': 80
+            })
+
 
 FAKE_LOG_DATA = bytes("""
 2013-08-15 12:41:25 [33454] [INFO] Starting gunicorn 17.5