Merge branch 'release/3.2.0'

CHANGES.rst

@@ -1,5 +1,9 @@
 CHANGELOG
 =========
+3.2.0
+-----
+- add marathon info to health check
+
 3.1.4
 -----
 - redirect to 'next' GET parameter when changing language

VERSION

@@ -1 +1 @@
-3.1.4
+3.2.0

springboard/tests/test_views.py

@@ -1,4 +1,7 @@
 import mock
+import json
+
+from os import environ
 
 from datetime import datetime
 
@@ -40,7 +43,16 @@ def test_index_view(self):
 
     def test_health(self):
         app = self.mk_app(self.workspace, settings=self.settings)
-        app.get('/health/', status=200)
+        environ['MARATHON_APP_ID'] = 'marathon-app-id'
+        environ['MARATHON_APP_VERSION'] = 'marathon-app-version'
+        resp = app.get('/health/', status=200)
+        data = json.loads(resp.body)
+        self.assertEqual(data, {
+            'id': 'marathon-app-id',
+            'version': 'marathon-app-version',
+        })
+        environ.pop('MARATHON_APP_ID')
+        environ.pop('MARATHON_APP_VERSION')
 
     def test_category(self):
         [category] = self.mk_categories(self.workspace, count=1)

springboard/views/core.py

@@ -1,3 +1,5 @@
+from os import environ
+
 from pyramid.view import view_config
 from pyramid.view import notfound_view_config
 from pyramid.httpexceptions import HTTPFound
@@ -21,7 +23,9 @@ def index_view(self):
 
     @view_config(route_name='health', renderer='json')
     def health(self):
-        return {}
+        app_id = environ.get('MARATHON_APP_ID', None)
+        ver = environ.get('MARATHON_APP_VERSION', None)
+        return {'id': app_id, 'version': ver}
 
     @ga_context(lambda context: {'dt': context['category'].title, })
     @view_config(route_name='category',