Skip to content

Commit

Permalink
#1175: Upgrade to Node 12.16.0 LTS (#18)
Browse files Browse the repository at this point in the history
* #1175: Upgrade to Node 12.16.0 LTS
- Update CircleCI and docker scripts to use Node 12.16.0 LTS
- Update dependencies
- Resolve audit issue, temporarily
- Lock versions for hapi-related libraries
- Fix unit test
- Bump version
  • Loading branch information
oderayi authored Feb 20, 2020
1 parent 7bf9a62 commit b06dbe2
Show file tree
Hide file tree
Showing 7 changed files with 3,781 additions and 3,660 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ defaults_working_directory: &defaults_working_directory

defaults_docker_node: &defaults_docker_node
docker:
- image: node:10.15.3-alpine
- image: node:12.16.0-alpine

defaults_docker_helm_kube: &defaults_docker_helm_kube
docker:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:10.15.3-alpine
FROM node:12.16.0-alpine

WORKDIR /opt/transaction-requests-service

Expand Down
11 changes: 11 additions & 0 deletions audit-resolve.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"decisions": {
"1482|@hapi/hapi": {
"decision": "ignore",
"madeAt": 1582125704843,
"expiresAt": 1582730496342
}
},
"rules": {},
"version": 1
}
9 changes: 9 additions & 0 deletions ncurc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"reject": [
"@hapi/hapi",
"@hapi/inert",
"@hapi/vision",
"@hapi/joi",
"hapi-swagger"
]
}
7,388 changes: 3,744 additions & 3,644 deletions package-lock.json

Large diffs are not rendered by default.

27 changes: 14 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "transaction-requests-service",
"description": "An asynchronous pass through transaction request API for merchant payment initiated requests.",
"version": "9.1.0",
"version": "9.2.0",
"license": "Apache-2.0",
"author": "ModusBox",
"contributors": [
Expand All @@ -28,6 +28,7 @@
"main": "./server",
"scripts": {
"start": "node src/index.js api",
"test": "npm run test:unit",
"test:unit": "jest --testMatch '**/test/unit/**/*.test.js'",
"test:junit": "jest --reporters=default --reporters=jest-junit --testMatch '**/test/unit/**/*.test.js'",
"test:coverage": "jest --coverage --coverageThreshold='{}' --testMatch '**/test/unit/**/*.test.js'",
Expand All @@ -49,33 +50,33 @@
"dep:update": "npx ncu -u"
},
"dependencies": {
"@hapi/good": "8.2.4",
"@hapi/good": "9.0.0",
"@hapi/hapi": "18.4.0",
"@hapi/inert": "5.2.2",
"@hapi/vision": "5.5.4",
"@mojaloop/central-services-error-handling": "8.6.2",
"@mojaloop/central-services-health": "8.3.0",
"@mojaloop/central-services-logger": "8.6.0",
"@mojaloop/central-services-shared": "8.8.3",
"@mojaloop/central-services-error-handling": "9.1.0",
"@mojaloop/central-services-health": "9.2.0",
"@mojaloop/central-services-logger": "9.1.0",
"@mojaloop/central-services-shared": "9.1.4",
"blipp": "4.0.1",
"docdash": "1.1.1",
"docdash": "1.2.0",
"hapi-openapi": "1.2.6",
"hapi-swagger": "11.1.0",
"jsdoc": "3.6.3",
"mustache": "3.1.0",
"mustache": "4.0.0",
"parse-strings-in-object": "2.0.0",
"rc": "1.2.8",
"commander": "4.0.1"
"commander": "4.1.1"
},
"devDependencies": {
"eslint": "6.7.2",
"jest": "24.9.0",
"eslint": "6.8.0",
"jest": "25.1.0",
"jest-junit": "10.0.0",
"license-checker": "25.0.1",
"npm-audit-resolver": "2.1.0",
"npm-audit-resolver": "2.2.0",
"npm-check-updates": "4.0.1",
"pre-commit": "1.2.2",
"sinon": "7.5.0",
"sinon": "8.1.1",
"standard": "14.3.1",
"swagmock": "1.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion test/unit/lib/requestLogger.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ describe('requestLogger', () => {
// Assert
expect(stub.calledOnce).toBe(true)
const firstCallArgs = stub.getCall(0).args
expect(firstCallArgs).toEqual(['TR-Trace - Response: { itemA: \'localhost:3000\',\n nested: { response: { source: [Circular], statusCode: 404 } } } Status: 404'])
expect(firstCallArgs).toEqual(['TR-Trace - Response: {\n itemA: \'localhost:3000\',\n nested: { response: { source: [Circular], statusCode: 404 } }\n} Status: 404'])
})

it('handles an undefined response', () => {
Expand Down

0 comments on commit b06dbe2

Please sign in to comment.