fix(port): Port can be made optional for non-routable apps

Author: kmala

rootfs/api/models/app.py

@@ -825,7 +825,8 @@ def _build_env_vars(self, release):
 
         # fetch application port and inject into ENV vars as needed
         port = release.get_port()
-        default_env['PORT'] = port
+        if port:
+            default_env['PORT'] = port
 
         # merge envs on top of default to make envs win
         default_env.update(release.config.values)

rootfs/api/models/release.py

@@ -153,6 +153,8 @@ def get_port(self):
             # application has registry auth - $PORT is required
             if (creds is not None) or (settings.REGISTRY_LOCATION != 'on-cluster'):
                 if envs.get('PORT', None) is None:
+                    if not self.app.appsettings_set.latest().routable:
+                        return None
                     raise DeisException(
                         'PORT needs to be set in the application config '
                         'when using a private registry'
@@ -167,7 +169,7 @@ def get_port(self):
 
             # discover port from docker image
             port = docker_get_port(self.image, deis_registry, creds)
-            if port is None:
+            if port is None and self.app.appsettings_set.latest().routable:
                 msg = "Expose a port or make the app non routable by changing the process type"
                 self.app.log(msg, logging.ERROR)
                 raise DeisException(msg)

rootfs/api/tests/test_release.py

@@ -433,3 +433,15 @@ def test_release_external_registry_no_port(self, mock_requests):
         ):
             release = app.release_set.latest()
             release.get_port()
+
+        # Set routable to false and port should be None instead of error
+        response = self.client.post(
+            '/v2/apps/{app.id}/settings'.format(**locals()),
+            {'routable': False}
+        )
+        self.assertEqual(response.status_code, 201, response.data)
+        self.assertFalse(app.appsettings_set.latest().routable)
+
+        release = app.release_set.latest()
+        port = release.get_port()
+        self.assertIsNone(port)