From 27110a7d42f42b9d8a12a24a770b83d9ff303213 Mon Sep 17 00:00:00 2001 From: Hugh Miles Date: Tue, 7 Nov 2017 15:14:07 -0800 Subject: [PATCH 1/3] fixed mergeconflicts --- superset/views/core.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/superset/views/core.py b/superset/views/core.py index ab2e3d434e96d..fc0c829504240 100755 --- a/superset/views/core.py +++ b/superset/views/core.py @@ -582,6 +582,9 @@ class LogModelView(SupersetModelView): def health(): return "OK" +@app.route('/healthcheck') +def healthcheck(): + return "OK" @app.route('/ping') def ping(): @@ -1441,6 +1444,15 @@ def testconn(self): # the password-masked uri was passed # use the URI associated with this database uri = database.sqlalchemy_uri_decrypted +<<<<<<< HEAD +======= + + url = make_url(uri) + db_engine = models.Database.get_db_engine_spec_for_backend(url.get_backend_name()) + db_engine.patch() + uri = db_engine.get_uri_for_impersonation(uri, impersonate_user, username) + masked_url = database.get_password_masked_url_from_uri(uri) +>>>>>>> 5187dc2d... add healthcheck for envoy integrations configuration = {} From 0e4a7a601da6949f4e973b9debb4db99943bd5c7 Mon Sep 17 00:00:00 2001 From: Hugh Miles Date: Thu, 9 Nov 2017 10:41:01 -0800 Subject: [PATCH 2/3] fixed mergeconflicts forreal this time --- superset/views/core.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/superset/views/core.py b/superset/views/core.py index fc0c829504240..8fd4d74cab815 100755 --- a/superset/views/core.py +++ b/superset/views/core.py @@ -1444,15 +1444,6 @@ def testconn(self): # the password-masked uri was passed # use the URI associated with this database uri = database.sqlalchemy_uri_decrypted -<<<<<<< HEAD -======= - - url = make_url(uri) - db_engine = models.Database.get_db_engine_spec_for_backend(url.get_backend_name()) - db_engine.patch() - uri = db_engine.get_uri_for_impersonation(uri, impersonate_user, username) - masked_url = database.get_password_masked_url_from_uri(uri) ->>>>>>> 5187dc2d... add healthcheck for envoy integrations configuration = {} From d20d484b0ec4e60e757834c123ab84ddad1cd565 Mon Sep 17 00:00:00 2001 From: Hugh Miles Date: Thu, 9 Nov 2017 13:06:36 -0800 Subject: [PATCH 3/3] added healthcheck test --- tests/core_tests.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/core_tests.py b/tests/core_tests.py index c7c2ff9a1625e..75c9871adc212 100644 --- a/tests/core_tests.py +++ b/tests/core_tests.py @@ -271,6 +271,7 @@ def test_doctests(self): def test_misc(self): assert self.get_resp('/health') == "OK" + assert self.get_resp('/healthcheck') == "OK" assert self.get_resp('/ping') == "OK" def test_testconn(self, username='admin'):