Merge pull request #2888 from coreos-inc/joseph.schorr/QS-31/healthcheck-exc

Small healthcheck fixes

data/model/health.py

@@ -12,10 +12,10 @@ def check_health(app_config):
   try:
     validate_database_url(app_config['DB_URI'], {}, connect_timeout=3)
   except Exception as ex:
-    return (False, 'Could not connect to the database: %s', ex.message)
+    return (False, 'Could not connect to the database: %s' % ex.message)
 
   # We will connect to the db, check that it contains some team role kinds
   try:
     return (bool(list(TeamRole.select().limit(1))), 'Could not connect to the database')
   except Exception as ex:
-    return (False, 'Could not connect to the database: %s', ex.message)
+    return (False, 'Could not connect to the database: %s' % ex.message)

data/users/oidc.py

@@ -81,3 +81,7 @@ class OIDCInternalAuth(object):
 
   def service_metadata(self):
     return {}
+
+  def ping(self):
+    """ Always assumed to be working. If the DB is broken, other checks will handle it. """
+    return (True, None)

data/users/test/test_users.py

@@ -1,9 +1,11 @@
 import pytest
 
+from contextlib import contextmanager
 from mock import patch
 
 from data.database import model
 from data.users.federated import DISABLED_MESSAGE
+from data.users.oidc import OIDCInternalAuth
 from test.test_ldap import mock_ldap
 from test.test_keystone_auth import fake_keystone
 from test.test_external_jwt_authn import fake_jwt
@@ -36,12 +38,18 @@ def test_auth_createuser(auth_system_builder, user1, user2, config, app):
       assert new_user is None
       assert err == DISABLED_MESSAGE
 
+@contextmanager
+def fake_oidc(app_config):
+  yield OIDCInternalAuth(app_config, 'someoidc', False)
 
 @pytest.mark.parametrize('auth_system_builder,auth_kwargs', [
   (mock_ldap, {}),
   (fake_keystone, {'version': 3}),
   (fake_keystone, {'version': 2}),
   (fake_jwt, {}),
+  (fake_oidc, {'app_config': {
+    'SOMEOIDC_LOGIN_CONFIG': {},
+  }}),
 ])
 def test_ping(auth_system_builder, auth_kwargs, app):
   with auth_system_builder(**auth_kwargs) as auth: