From 427242c608446ab3030731630c820e88739f1cb2 Mon Sep 17 00:00:00 2001 From: Bryn Ryans Date: Wed, 14 Oct 2020 22:55:49 -0700 Subject: [PATCH] Add versions call to status (#362) --- .../access-token-server/src/routes/status.ts | 3 +++ .../src/services/looker_auth.ts | 20 +++++++++++++++++++ .../test/test_access_token_server.test.ts | 2 ++ 3 files changed, 25 insertions(+) diff --git a/examples/access-token-server/src/routes/status.ts b/examples/access-token-server/src/routes/status.ts index 9079d558e..4c8a8711d 100644 --- a/examples/access-token-server/src/routes/status.ts +++ b/examples/access-token-server/src/routes/status.ts @@ -27,6 +27,7 @@ import { readFileSync } from 'fs' import { cwd } from 'process' import { Router } from 'express' +import { verifyLookerServer } from '../services/looker_auth' const router = Router() @@ -47,6 +48,8 @@ router.get('/status', async (req, res) => { statusCode = 542 status.errors.push('failed to read or parse status.json file') } + const serverStatus = await verifyLookerServer() + status = { ...status, ...serverStatus } res.setHeader('Content-Type', 'application/json') res.status(statusCode).send(JSON.stringify(status)) }) diff --git a/examples/access-token-server/src/services/looker_auth.ts b/examples/access-token-server/src/services/looker_auth.ts index 355b1e3ad..1dd42cef9 100644 --- a/examples/access-token-server/src/services/looker_auth.ts +++ b/examples/access-token-server/src/services/looker_auth.ts @@ -53,3 +53,23 @@ export const validateLookerCredentials = async ( return false } } + +export const verifyLookerServer = async () => { + const lookerSettings = DefaultSettings() + const settings = getSettings() + lookerSettings.base_url = settings.lookerServerUrl + lookerSettings.verify_ssl = settings.lookerServerVerifySsl + const session = new NodeSession(lookerSettings) + try { + const result = await session.transport.rawRequest('GET', '/versions') + return { + looker_server_url: settings.lookerServerUrl, + looker_server_reachable: true, + } + } catch (error) { + return { + looker_server_url: settings.lookerServerUrl, + looker_server_reachable: false, + } + } +} diff --git a/examples/access-token-server/test/test_access_token_server.test.ts b/examples/access-token-server/test/test_access_token_server.test.ts index dc6483ca1..ee6a01aac 100644 --- a/examples/access-token-server/test/test_access_token_server.test.ts +++ b/examples/access-token-server/test/test_access_token_server.test.ts @@ -42,6 +42,8 @@ describe('access_token_server', () => { expect(json.build_date).toBeDefined() expect(json.git_commit).toBeDefined() expect(json.access_token_server_provider_label).toBeDefined() + expect(json.looker_server_url).toBeDefined() + expect(json.looker_server_reachable).toBeTruthy() }) test.each([