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

chore: release #409

Merged
merged 4 commits into from
Jun 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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,5 +1,5 @@
### Build
FROM node:20.11.1-alpine3.19 as build
FROM node:22.2.0-alpine3.20 as build
ENV NO_UPDATE_NOTIFIER=true

USER node
Expand All @@ -17,7 +17,7 @@ RUN npm run build


### Deployment
FROM node:20.11.1-alpine3.19 as deployment
FROM node:22.2.0-alpine3.20 as deployment

ENV NO_UPDATE_NOTIFIER=true

Expand Down
3,986 changes: 1,587 additions & 2,399 deletions package-lock.json

Large diffs are not rendered by default.

53 changes: 26 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,51 +18,50 @@
],
"type": "module",
"dependencies": {
"@bull-board/api": "^5.16.0",
"@bull-board/express": "^5.16.0",
"@bull-board/koa": "^5.16.0",
"@restorecommerce/acs-client": "^1.6.0",
"@restorecommerce/chassis-srv": "^1.6.0",
"@restorecommerce/cluster-service": "^1.0.3",
"@restorecommerce/kafka-client": "^1.2.1",
"@restorecommerce/logger": "^1.2.10",
"@restorecommerce/rc-grpc-clients": "^5.1.23",
"@restorecommerce/scs-jobs": "^0.1.23",
"@restorecommerce/service-config": "^1.0.12",
"bullmq": "^5.7.4",
"cache-manager": "^5.5.1",
"@bull-board/api": "^5.20.2",
"@bull-board/express": "^5.20.2",
"@bull-board/koa": "^5.20.2",
"@restorecommerce/acs-client": "^1.6.9",
"@restorecommerce/chassis-srv": "^1.6.1",
"@restorecommerce/kafka-client": "^1.2.8",
"@restorecommerce/logger": "^1.2.11",
"@restorecommerce/rc-grpc-clients": "^5.1.30",
"@restorecommerce/scs-jobs": "^0.1.32",
"@restorecommerce/service-config": "^1.0.13",
"bullmq": "^5.8.2",
"cache-manager": "^5.6.1",
"cache-manager-redis": "^0.6.0",
"cron-parser": "^4.9.0",
"crypto": "^1.0.1",
"express": "^4.19.2",
"lodash-es": "^4.17.21",
"uuid": "^9.0.1"
"uuid": "^10.0.0"
},
"devDependencies": {
"@alenon/grpc-mock-server": "^3.1.10",
"@commitlint/cli": "^19.2.2",
"@alenon/grpc-mock-server": "^3.1.11",
"@commitlint/cli": "^19.3.0",
"@commitlint/config-conventional": "^19.2.2",
"@grpc/proto-loader": "^0.7.12",
"@restorecommerce/dev": "^0.0.9",
"@restorecommerce/grpc-client": "^2.2.1",
"@grpc/proto-loader": "^0.7.13",
"@restorecommerce/dev": "^0.0.12",
"@restorecommerce/grpc-client": "^2.2.2",
"@semantic-release-plus/docker": "^3.1.3",
"@types/lodash-es": "^4.17.12",
"@types/mocha": "^10.0.6",
"@types/node": "^20.12.7",
"@typescript-eslint/eslint-plugin": "^7.7.0",
"@typescript-eslint/parser": "^7.7.0",
"c8": "^9.1.0",
"@types/node": "^20.14.5",
"@typescript-eslint/eslint-plugin": "^7.13.1",
"@typescript-eslint/parser": "^7.13.1",
"c8": "^10.1.2",
"copyfiles": "^2.4.1",
"coveralls": "^3.1.1",
"cross-env": "^7.0.3",
"esbuild": "^0.20.2",
"eslint": "^8.57.0",
"esbuild": "^0.21.5",
"eslint": "^8.56.0",
"eslint-plugin-prefer-arrow-functions": "^3.3.2",
"husky": "^9.0.11",
"mocha": "^10.4.0",
"nodemon": "^3.1.0",
"nodemon": "^3.1.3",
"npm-run-all": "^4.1.5",
"rimraf": "^5.0.5",
"rimraf": "^5.0.7",
"should": "^13.2.3",
"ts-node": "^10.9.2",
"typescript": "^5.4.5"
Expand Down
3 changes: 3 additions & 0 deletions src/schedulingService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,9 @@ export class SchedulingService implements SchedulingServiceServiceImplementation
if (customArgsFilter?.length === 0) {
return [];
}
if(!Array.isArray(customArgsFilter)) {
customArgsFilter = [customArgsFilter];
}
for (let customArgObj of customArgsFilter) {
const ownerIndicatorEntity = customArgObj?.entity;
const ownerValues = customArgObj?.instance;
Expand Down
6 changes: 1 addition & 5 deletions src/start.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ import { createLogger } from '@restorecommerce/logger';
// cfg and logger
const cfg = createServiceConfig(process.cwd());
const loggerCfg = cfg?.get('logger') || {};
loggerCfg.esTransformer = (msg) => {
msg.fields = JSON.stringify(msg.fields);
return msg;
};
const logger = createLogger(loggerCfg);

const worker = new Worker();
Expand All @@ -22,4 +18,4 @@ process.on('SIGINT', () => {
logger.error('shutdown error', err);
process.exit(1);
});
});
});
4 changes: 0 additions & 4 deletions src/utilts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ const getUserServiceClient = async () => {
// identity-srv client to resolve subject ID by token
const grpcIDSConfig = cfg.get('client:user');
const loggerCfg = cfg.get('logger');
loggerCfg.esTransformer = (msg) => {
msg.fields = JSON.stringify(msg.fields);
return msg;
};
const logger = createLogger(loggerCfg);
if (grpcIDSConfig) {
idsClientInstance = createClient({
Expand Down
6 changes: 1 addition & 5 deletions src/worker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,6 @@ export class Worker {
}
// Create a new microservice Server
const loggerCfg = cfg.get('logger');
loggerCfg.esTransformer = (msg) => {
msg.fields = JSON.stringify(msg.fields);
return msg;
};
const logger = createLogger(loggerCfg);
this.logger = logger;
const server = new chassis.Server(cfg.get('server'), logger);
Expand Down Expand Up @@ -408,4 +404,4 @@ export class Worker {
await this.events.stop();
await this.offsetStore.stop();
}
}
}
Loading