Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP Refactor (breaking?): replace Express with Fastify and other #559

Closed
wants to merge 24 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
60b2662
refactor: 💡 updated deps, some changes to Dockerfile
ozonep Jan 8, 2021
b03643e
feat: 🎸 Major refactoring. Express => Fastify + code cleanup
ozonep Jan 11, 2021
0045e6a
fix: 🐛 Fixed some routes + updated Dockerfile
ozonep Jan 11, 2021
bef7d79
refactor: 💡 Beautified app.js (imports mostly)
ozonep Jan 12, 2021
09b5583
refactor: 💡 Be more consistent with naming (reply => res)
ozonep Jan 12, 2021
38a5777
fix: 🐛 Fixed swaggerValidator crash because of bad YAML
ozonep Jan 12, 2021
214af8a
refactor: 💡 replaced "request" with "got" because deprecation
ozonep Feb 2, 2021
b6705b4
fix: 🐛 Fixed "preventOverflow modifier is required" warning
ozonep Feb 4, 2021
b7d8c1f
refactor: 💡 Unified code style for controllers
ozonep Feb 4, 2021
364f8e4
chore: 🤖 updated dependencies & Dockerfile
ozonep Feb 4, 2021
840e033
chore: 🤖 Added updated package-lock files
ozonep Feb 4, 2021
b294f3f
fix: 🐛 Fix for Fastify failure + style fixes and other stuff
ozonep Feb 4, 2021
5075943
chore: 🤖 Merged latest changes from master
ozonep Feb 4, 2021
71047c0
fix: 🐛 Fixed validation by removing extra slash
ozonep Feb 5, 2021
45c5bd6
chore: 🤖 added package-lock files
ozonep Feb 5, 2021
a065c4a
refactor: 💡 Refactored my context logic based on pkg test
ozonep Feb 5, 2021
825c4ea
fix: 🐛 Reworked report controler
ozonep Feb 5, 2021
a604840
fix: 🐛 More fixes for "got" requests/responses
ozonep Feb 8, 2021
5bede74
fix: 🐛 Fixed jobVerifier tests
ozonep Feb 9, 2021
9e90d8c
fix: 🐛 Health test also fixed
ozonep Feb 9, 2021
6ee3e11
fix: 🐛 More tests fixes
ozonep Feb 9, 2021
746624f
fix: 🐛 Remove obsolete async await
ozonep Feb 9, 2021
a1ef857
fix: 🐛 Fixed all unit tests (hopefully)
ozonep Feb 9, 2021
a9582c6
fix: 🐛 Fix for "key" params error
ozonep Feb 16, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# NODE container which runs this service
FROM node:12.16-slim
FROM node:14-buster

RUN mkdir -p /usr/src
WORKDIR /usr
# Install app dependencies
COPY package*.json /usr/
EXPOSE 80 3000

RUN npm ci --production --silent

## Bundle app source
COPY /src /usr/src
COPY /docs /usr/docs
Expand Down
1 change: 0 additions & 1 deletion deployment/helm/README.txt

This file was deleted.

5 changes: 2 additions & 3 deletions docs/openapi3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1332,7 +1332,7 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/error_response"
/v1/config/{config_key}:
/v1/config/{key}:
parameters:
- $ref: '#/components/parameters/context_id'
delete:
Expand All @@ -1345,7 +1345,7 @@ paths:
environment variable.
parameters:
- in: path
name: config_key
name: key
required: true
description: They key to delete.
schema:
Expand Down Expand Up @@ -1761,7 +1761,6 @@ paths:
- Webhooks
summary: Tests that the webhook is configure correctly
description: Tests that the webhook is configure correctly by sending a message to the target webhook url.
parameters:
responses:
'200':
description: Success
Expand Down
8,130 changes: 4,109 additions & 4,021 deletions package-lock.json

Large diffs are not rendered by default.

55 changes: 27 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"main": "server.js",
"engines": {
"node": ">=12.x",
"npm": "6.x"
"npm": ">=6.x"
},
"directories": {
"test": "tests"
Expand Down Expand Up @@ -42,35 +42,34 @@
},
"homepage": "https://github.com/Zooz/predator#readme",
"dependencies": {
"artillery": "^1.6.0-29",
"artillery": "^1.6.1",
"aws-sdk": "^2.814.0",
"body-parser": "^1.19.0",
"cron": "^1.8.1",
"cron": "^1.8.2",
"dockerode": "^2.5.8",
"express": "^4.17.1",
"express-ajv-swagger-validation": "^1.1.1",
"express-easy-zip": "^1.1.4",
"express-fileupload": "^1.1.10",
"express-http-context": "^1.2.4",
"express-requests-logger": "^3.0.2",
"graceful-shutdown-express": "^2.0.1",
"fastify": "^3.11.0",
"fastify-compress": "^3.4.1",
"fastify-file-upload": "^3.0.0",
"fastify-formbody": "^5.0.0",
"fastify-graceful-shutdown": "^3.1.0",
"fastify-request-context": "^2.1.3",
"fastify-static": "^3.4.0",
"got": "^11.8.1",
"jsck": "^0.3.2",
"kafkajs": "^1.15.0",
"lodash": "^4.17.20",
"mariadb": "^2.4.2",
"mathjs": "^7.5.1",
"mariadb": "^2.5.2",
"mathjs": "^7.6.0",
"mysql2": "^2.2.5",
"nodemailer": "^6.4.16",
"pg": "^8.4.1",
"nodemailer": "^6.4.17",
"openapi-validator-middleware": "^3.2.1",
"pg": "^8.5.1",
"pg-hstore": "^2.3.3",
"pino": "^6.3.2",
"request": "^2.88.2",
"request-promise-native": "^1.0.8",
"semver": "^7.3.2",
"pino": "^6.11.0",
"semver": "^7.3.4",
"sequelize": "^5.22.3",
"slack-emojis": "^1.1.1",
"sqlite3": "^5.0.1",
"tedious": "^9.2.1",
"tedious": "^9.2.3",
"umzug": "^2.3.0",
"uuid": "^3.4.0"
},
Expand All @@ -81,23 +80,23 @@
"async-retry": "^1.3.1",
"chai": "^4.2.0",
"commitlint": "^10.0.0",
"cz-conventional-changelog": "^3.2.0",
"cz-conventional-changelog": "^3.3.0",
"dotenv": "^8.2.0",
"eslint": "^7.9.0",
"eslint": "^7.19.0",
"eslint-config-standard": "^14.1.1",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.1",
"husky": "^1.3.1",
"mocha": "^7.1.1",
"eslint-plugin-standard": "^4.1.0",
"husky": "^4.3.8",
"mocha": "^7.2.0",
"mochawesome": "^4.1.0",
"nock": "^10.0.6",
"nyc": "^14.1.1",
"rewire": "^5.0.0",
"should": "^13.2.1",
"should": "^13.2.3",
"sinon": "^4.5.0",
"standard-version": "^9.0.0",
"standard-version": "^9.1.0",
"supertest": "^3.4.2",
"yaml": "^1.10.0"
},
Expand Down
Loading