Remove status services custom healthcheck

Add version fetching in front-end

docker/docker-compose.yml

@@ -247,6 +247,25 @@ services:
 
   # nginx
   nginx:
+    build:
+      context: ../src/web
+      dockerfile: Dockerfile
+      cache_from:
+        - docker.cdot.systems/nginx:buildcache
+      # next.js needs build-time access to a number of API URL values, forward as ARGs
+      args:
+        # Web front-end URL
+        - WEB_URL=${WEB_URL}
+        # Telescope 1.0 API URL
+        - API_URL=${API_URL}
+        # Telescope 2.0 Microservice URLs
+        - IMAGE_URL=${IMAGE_URL}
+        - SSO_URL=${SSO_URL}
+        - POSTS_URL=${POSTS_URL}
+        - SEARCH_URL=${SEARCH_URL}
+        - FEED_DISCOVERY_URL=${FEED_DISCOVERY_URL}
+        - STATUS_URL=${STATUS_URL}
+        - GIT_COMMIT=${GIT_COMMIT}
     container_name: 'nginx'
     environment:
       - TELESCOPE_HOST

src/api/status/package.json

@@ -30,7 +30,6 @@
     "bootstrap": "5.1.3",
     "express": "4.17.3",
     "express-handlebars": "6.0.3",
-    "get-repo-package-json": "2.0.0",
     "npm-run-all": "4.1.5",
     "perfect-scrollbar": "1.5.5",
     "sass": "1.49.9",

src/api/status/src/server.js

@@ -3,13 +3,12 @@ const { static: serveStatic } = require('express');
 const path = require('path');
 const { engine } = require('express-handlebars');
 const fs = require('fs/promises');
-const getPackage = require('get-repo-package-json');
 const { check } = require('./services.js');
 const getGitHubData = require('./js/github-stats.js');
 const getFeedCount = require('./js/feed-stats.js');
 const getPostsCount = require('./js/posts-stats.js');
 const getJobCount = require('./js/queue-stats.js');
-
+// github commit bug
 // We need to be able to talk to the autodeployment server
 const autodeploymentHost = process.env.WEB_URL || 'localhost';
 
@@ -49,19 +48,6 @@ const satelliteOptions = {
       },
     },
   },
-  healthCheck: async (req, res) => {
-    const sha = process.env.GIT_COMMIT || 'master';
-    const gitHubUrl = `https://github.com/Seneca-CDOT/telescope/commit/${sha}`;
-    const { version } = await getPackage('https://github.com/Seneca-CDOT/telescope/blob/master/');
-
-    res.set('Cache-Control', 'public, max-age=300');
-
-    return {
-      version,
-      sha,
-      gitHubUrl,
-    };
-  },
 };
 
 const service = new Satellite(satelliteOptions);

src/web/Dockerfile

@@ -46,11 +46,14 @@ ARG FEED_DISCOVERY_URL
 ENV NEXT_PUBLIC_FEED_DISCOVERY_URL ${FEED_DISCOVERY_URL}
 
 ARG STATUS_URL
-ENV NEXT_PUBLIC_STATUS_URL ${STATUS_URL}}
+ENV NEXT_PUBLIC_STATUS_URL ${STATUS_URL}
 
 ARG WEB_URL
 ENV NEXT_PUBLIC_WEB_URL ${WEB_URL}
 
+ARG GIT_COMMIT
+ENV NEXT_PUBLIC_GIT_COMMIT ${GIT_COMMIT}
+
 RUN npm install --no-package-lock
 
 RUN npm run build

src/web/next.config.js

@@ -27,6 +27,7 @@ const envVarsToForward = [
   'SEARCH_URL',
   'FEED_DISCOVERY_URL',
   'STATUS_URL',
+  'GIT_COMMIT',
 ];
 
 // Copy an existing ENV Var so it's visible to next: API_URL -> NEXT_PUBLIC_API_URL

src/web/src/components/Banner.tsx

@@ -3,7 +3,7 @@ import { BsInfoCircle } from 'react-icons/bs';
 import { makeStyles, Theme, createStyles, Typography, Fab } from '@material-ui/core';
 import smoothscroll from 'smoothscroll-polyfill';
 import KeyboardArrowDownIcon from '@material-ui/icons/KeyboardArrowDown';
-import { telescopeUrl, webUrl, statusUrl } from '../config';
+import { gitCommitSha, webUrl, statusUrl } from '../config';
 import BannerDynamicItems from './BannerDynamicItems';
 import BannerButtons from './BannerButtons';
 import ScrollAction from './ScrollAction';
@@ -142,15 +142,21 @@ export default function Banner({ onVisibilityChange, bannerVisible }: BannerProp
   useEffect(() => {
     async function getGitData() {
       try {
-        const res = await fetch(`${telescopeUrl}/health`);
+        const sha = gitCommitSha || 'master';
+        const gitHubUrl = `https://github.com/Seneca-CDOT/telescope/commit/${sha}`;
+
+        const response = await fetch(
+          `https://raw.githubusercontent.com/Seneca-CDOT/telescope/${sha}/package.json`
+        );
 
         // Fetch failure
-        if (!res.ok) {
-          throw new Error(res.statusText);
+        if (!response.ok) {
+          throw new Error(response.statusText);
         }
 
-        const data = await res.json();
-        setGitInfo(data.info);
+        const { version } = await response.json();
+
+        setGitInfo({ gitHubUrl, sha, version });
       } catch (error) {
         console.error(`Error retrieving site's health info`, error);
       }

src/web/src/config.ts

@@ -15,6 +15,9 @@ const searchServiceUrl = process.env.NEXT_PUBLIC_SEARCH_URL;
 const feedDiscoveryServiceUrl = process.env.NEXT_PUBLIC_FEED_DISCOVERY_URL;
 const statusUrl = process.env.NEXT_PUBLIC_STATUS_URL;
 
+// Github sha commit
+const gitCommitSha = process.env.NEXT_PUBLIC_GIT_COMMIT;
+
 const title = `Telescope`;
 const description = `A tool for tracking blogs in orbit around Seneca's open source involvement`;
 const author = `SDDS Students and Professors`;
@@ -46,4 +49,5 @@ export {
   searchServiceUrl,
   feedDiscoveryServiceUrl,
   statusUrl,
+  gitCommitSha,
 };