Merge pull request #161 from overture-stack/rc/1.14.0

rc/1.14.0

Author: ciaranschutte

Jenkinsfile.groovy

@@ -10,7 +10,7 @@ kind: Pod
 spec:
   containers:
   - name: node
-    image: node:8.16.0-jessie
+    image: node:16-alpine3.14
     tty: true
     env: 
     - name: DOCKER_HOST 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "lectern",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "description": "Data Dictionary Management",
   "scripts": {
     "start": "npm run serve",
@@ -30,49 +30,49 @@
   "homepage": "https://github.com/overture-stack/lectern#readme",
   "devDependencies": {
     "@types/axios": "^0.14.0",
-    "@types/body-parser": "^1.17.0",
+    "@types/body-parser": "^1.19.2",
     "@types/chai": "^4.1.7",
     "@types/chai-http": "^4.2.0",
     "@types/dotenv": "^6.1.1",
     "@types/errorhandler": "0.0.32",
-    "@types/express": "^4.17.0",
+    "@types/express": "^4.17.13",
     "@types/jsonwebtoken": "^8.3.2",
     "@types/lodash": "^4.14.136",
-    "@types/memoizee": "^0.4.2",
+    "@types/memoizee": "^0.4.7",
     "@types/mocha": "^5.2.7",
-    "@types/mongoose": "^5.5.7",
-    "@types/ms": "^0.7.30",
-    "@types/node-vault": "^0.9.0",
+    "@types/mongoose": "^5.11.97",
+    "@types/ms": "^0.7.31",
+    "@types/node-vault": "^0.9.13",
     "@types/swagger-ui-express": "^3.0.1",
     "@types/winston": "^2.4.4",
-    "chai": "^4.2.0",
+    "chai": "^4.3.6",
     "chai-http": "^4.3.0",
     "concurrently": "^5.3.0",
-    "gitmoji-cli": "^3.2.18",
-    "husky": "^3.0.5",
-    "mocha": "^6.2.3",
-    "nodemon": "^2.0.7",
-    "prettier": "1.17.0",
+    "gitmoji-cli": "^4.8.0",
+    "husky": "^3.1.0",
+    "mocha": "^9.2.0",
+    "nodemon": "^2.0.15",
+    "prettier": "^2.5.1",
     "testcontainers": "^1.1.19",
     "ts-node": "^8.3.0",
     "tslint": "^5.18.0",
     "typescript": "^3.5.3"
   },
   "dependencies": {
-    "ajv": "^6.10.2",
-    "axios": "^0.21.1",
-    "body-parser": "^1.19.0",
+    "ajv": "^6.12.6",
+    "axios": "^0.26.0",
+    "body-parser": "^1.19.2",
     "dotenv": "^8.0.0",
     "errorhandler": "^1.5.1",
-    "express": "^4.17.1",
+    "express": "^4.17.3",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.21",
-    "memoizee": "^0.4.14",
-    "mongoose": "^5.7.5",
-    "ms": "^2.1.2",
-    "node-vault": "^0.9.11",
-    "swagger-ui-express": "^4.0.7",
-    "winston": "^3.2.1"
+    "memoizee": "^0.4.15",
+    "mongoose": "^5.13.14",
+    "ms": "^2.1.3",
+    "node-vault": "^0.9.22",
+    "swagger-ui-express": "^4.3.0",
+    "winston": "^3.6.0"
   },
   "prettier": {
     "printWidth": 100,

package.json

@@ -31,9 +31,9 @@ import { dbHealth, Status } from './app-health';
 /**
  * Decorator to handle errors from async express route handlers
  */
-const wrapAsync = (fn: RequestHandler): RequestHandler => {
+const wrapAsync = (fn: RequestHandler<any, any, any, any>): RequestHandler => {
   return (req, res, next) => {
-    const routePromise = fn(req, res, next);
+    const routePromise: any = fn(req, res, next);
     if (routePromise.catch) {
       routePromise.catch(next);
     }
@@ -53,7 +53,7 @@ const App = (config: AppConfig): Express => {
 
   app.set('port', serverPort);
 
-  app.use(bodyParser.json({limit: '10mb'}));
+  app.use(bodyParser.json({ limit: '10mb' }));
   app.use(
     bodyParser.urlencoded({
       extended: true,
@@ -75,7 +75,7 @@ const App = (config: AppConfig): Express => {
     } else {
       const resBody = {
         appStatus: 'Error/Unknown',
-        dbStatus: dbHealth.status
+        dbStatus: dbHealth.status,
       };
       return res.status(500).send(resBody);
     }

src/app.ts

@@ -23,9 +23,13 @@ import { BadRequestError } from '../utils/errors';
 import { replaceReferences } from '../utils/references';
 import { diff as diffUtil } from '../diff/DictionaryDiff';
 import logger from '../config/logger';
+import { DictionaryDocument } from '../models/Dictionary';
 
-export const listDictionaries = async (req: Request, res: Response) => {
-  const name = req.query.name;
+export const listDictionaries = async (
+  req: Request<{}, {}, {}, { name: string; version: string; references: boolean }>,
+  res: Response,
+) => {
+  const name = req.query.name as string;
   const version = req.query.version;
   const showReferences = req.query.references || false;
 
@@ -36,11 +40,13 @@ export const listDictionaries = async (req: Request, res: Response) => {
       res.status(404).send(`Dictionary Not Found: ${name} ${version}`);
       return;
     }
-    const response = showReferences ? dict.toObject() : replaceReferences(dict.toObject());
+    const response = showReferences
+      ? dict.toObject()
+      : replaceReferences(dict.toObject() as DictionaryDocument);
     res.status(200).send([response]);
   } else {
     const dicts = await dictionaryService.listAll();
-    const response = name !== undefined ? dicts.filter(dict => dict.name === name) : dicts;
+    const response = name !== undefined ? dicts.filter((dict) => dict.name === name) : dicts;
     res.status(200).send(response);
   }
 };
@@ -50,7 +56,9 @@ export const getDictionary = async (req: Request, res: Response) => {
   const id = req.params.dictId;
 
   const dict = await dictionaryService.getOne(id);
-  const response = showReferences ? dict.toObject() : replaceReferences(dict.toObject());
+  const response = showReferences
+    ? dict.toObject()
+    : replaceReferences(dict.toObject() as DictionaryDocument);
   res.status(200).send(response);
 };
 
@@ -71,7 +79,15 @@ export const updateSchema = async (req: Request, res: Response) => {
   res.status(200).send(dict.toObject());
 };
 
-export const diffDictionaries = async (req: Request, res: Response) => {
+export const diffDictionaries = async (
+  req: Request<
+    {},
+    {},
+    {},
+    Partial<{ name: string; left: string; right: string; references: boolean }>
+  >,
+  res: Response,
+) => {
   const showReferences = req.query.references || false;
   const name = req.query.name;
   const leftVersion = req.query.left;
@@ -80,8 +96,16 @@ export const diffDictionaries = async (req: Request, res: Response) => {
   if (name && leftVersion && rightVersion) {
     const dict1Doc = await dictionaryService.findOne(name, leftVersion);
     const dict2Doc = await dictionaryService.findOne(name, rightVersion);
-    const dict1 = showReferences ? dict1Doc.toObject() : replaceReferences(dict1Doc.toObject());
-    const dict2 = showReferences ? dict2Doc.toObject() : replaceReferences(dict2Doc.toObject());
+    const dict1 = (
+      showReferences
+        ? dict1Doc.toObject()
+        : replaceReferences(dict1Doc.toObject() as DictionaryDocument)
+    ) as DictionaryDocument;
+    const dict2 = (
+      showReferences
+        ? dict2Doc.toObject()
+        : replaceReferences(dict2Doc.toObject() as DictionaryDocument)
+    ) as DictionaryDocument;
     const diff = diffUtil(dict1, dict2);
     res.status(200).send(Array.from(diff.entries()));
   } else {

src/controllers/dictionaryController.ts

@@ -73,7 +73,7 @@ export default function(egoURL: string = process.env.EGO_API, scope: string = pr
         try {
           const scopes = authToken['context']['scope'] as Array<string>;
           if (scopes.includes(scope)) {
-            const routePromise = fn(req, res, next);
+            const routePromise: any = fn(req, res, next);
             if (routePromise.catch) {
               routePromise.catch(next);
             }

src/services/egoTokenService.ts

@@ -21,7 +21,7 @@ import vault from 'node-vault';
 import { promises } from 'fs';
 import logger from '../config/logger';
 
-let vaultClient: vault.Client;
+let vaultClient: vault.client;
 
 async function login() {
   logger.info('Creating vault client');

src/vault/index.ts

@@ -1,23 +1,19 @@
 {
-    "compilerOptions": {
-        "module": "commonjs",
-        "esModuleInterop": true,
-        "allowSyntheticDefaultImports": true,
-        "target": "es6",
-        "noImplicitAny": true,
-        "moduleResolution": "node",
-        "resolveJsonModule": true,
-        "sourceMap": true,
-        "outDir": "dist",
-        "baseUrl": ".",
-        "paths": {
-            "*": [
-                "node_modules/*",
-                "src/types/*"
-            ]
-        }
-    },
-    "include": [
-        "src/**/*"
-    ]
-}
+  "compilerOptions": {
+    "module": "commonjs",
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "target": "es6",
+    "noImplicitAny": true,
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "sourceMap": true,
+    "outDir": "dist",
+    "baseUrl": ".",
+    "skipLibCheck": true,
+    "paths": {
+      "*": ["node_modules/*", "src/types/*"]
+    }
+  },
+  "include": ["src/**/*"]
+}