From 1308f166997b2643fa93efff763e368c6171e9d3 Mon Sep 17 00:00:00 2001 From: Philipp Kunz Date: Wed, 7 Jul 2021 01:05:16 +0200 Subject: [PATCH] fix(core): update --- .gitlab-ci.yml | 26 ++++++++++++++++++-------- .vscode/settings.json | 2 +- package.json | 5 ++++- readme.md | 4 ++-- test/test.ts | 24 ++++++++++++------------ ts/logdna.aggregator.ts | 23 ++++++++++------------- ts/logdna.classes.logmessage.ts | 4 ++-- ts/logdna.logdnaaccount.ts | 8 ++++---- 8 files changed, 53 insertions(+), 43 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ebc8b5..9a4467e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,23 +19,35 @@ mirror: stage: security script: - npmci git mirror + only: + - tags tags: - lossless - docker - notpriv -audit: +auditProductionDependencies: + image: registry.gitlab.com/hosttoday/ht-docker-node:npmci + stage: security + script: + - npmci npm prepare + - npmci command npm install --production --ignore-scripts + - npmci command npm config set registry https://registry.npmjs.org + - npmci command npm audit --audit-level=high --only=prod --production + tags: + - docker + +auditDevDependencies: image: registry.gitlab.com/hosttoday/ht-docker-node:npmci stage: security script: - npmci npm prepare - npmci command npm install --ignore-scripts - npmci command npm config set registry https://registry.npmjs.org - - npmci command npm audit --audit-level=high + - npmci command npm audit --audit-level=high --only=dev tags: - - lossless - docker - - notpriv + allow_failure: true # ==================== # test stage @@ -50,9 +62,7 @@ testStable: - npmci npm test coverage: /\d+.?\d+?\%\s*coverage/ tags: - - lossless - docker - - priv testBuild: stage: test @@ -63,9 +73,7 @@ testBuild: - npmci command npm run build coverage: /\d+.?\d+?\%\s*coverage/ tags: - - lossless - docker - - notpriv release: stage: release @@ -85,6 +93,8 @@ release: codequality: stage: metadata allow_failure: true + only: + - tags script: - npmci command npm install -g tslint typescript - npmci npm prepare diff --git a/.vscode/settings.json b/.vscode/settings.json index 01d2b8d..3648eaa 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -15,7 +15,7 @@ "properties": { "projectType": { "type": "string", - "enum": ["website", "element", "service", "npm"] + "enum": ["website", "element", "service", "npm", "wcc"] } } } diff --git a/package.json b/package.json index d527033..e327f4f 100644 --- a/package.json +++ b/package.json @@ -39,5 +39,8 @@ "cli.js", "npmextra.json", "readme.md" + ], + "browserslist": [ + "last 1 chrome versions" ] -} +} \ No newline at end of file diff --git a/readme.md b/readme.md index 743ffe3..237cc4d 100644 --- a/readme.md +++ b/readme.md @@ -53,9 +53,9 @@ const smartlogPackage: ILogPackage = { containerName: 'ci-mojoio-logdna', environment: 'test', runtime: 'node', - zone: 'shipzone' + zone: 'shipzone', }, - message: 'this is an awesome log message sent by the tapbundle test' + message: 'this is an awesome log message sent by the tapbundle test', }; const logdnaMessage = LogdnaMessage.fromSmartLogPackage(smartlogPackage); diff --git a/test/test.ts b/test/test.ts index c469526..750b1a6 100644 --- a/test/test.ts +++ b/test/test.ts @@ -24,13 +24,13 @@ tap.test('should create a standard log message', async () => { containerName: 'ci-mojoio-logdna', environment: 'test', runtime: 'node', - zone: 'shipzone' + zone: 'shipzone', }, correlation: { id: '123', - type: 'none' + type: 'none', }, - message: 'this is an awesome log message sent by the tapbundle test' + message: 'this is an awesome log message sent by the tapbundle test', }); }); @@ -51,13 +51,13 @@ tap.test('should send in order', async () => { containerName: 'ci-mojoio-logdna', environment: 'test', runtime: 'node', - zone: 'shipzone' + zone: 'shipzone', }, message: `this is an awesome log message sent by the tapbundle test #${i}`, correlation: { id: '123', - type: 'none' - } + type: 'none', + }, }; testLogDnaAccount.sendSmartlogPackage(testSmartlogMessage); i++; @@ -73,13 +73,13 @@ tap.test('should send in order', async () => { containerName: 'ci-mojoio-logdna', environment: 'test', runtime: 'node', - zone: 'shipzone' + zone: 'shipzone', }, correlation: { id: '123', - type: 'none' + type: 'none', }, - message: `this is an awesome log message sent by the tapbundle test #${i}` + message: `this is an awesome log message sent by the tapbundle test #${i}`, }; testLogDnaAccount.sendSmartlogPackage(testSmartlogMessage2); @@ -93,13 +93,13 @@ tap.test('should send in order', async () => { containerName: 'ci-mojoio-logdna', environment: 'test', runtime: 'node', - zone: 'shipzone' + zone: 'shipzone', }, correlation: { id: '123', - type: 'none' + type: 'none', }, - message: `this is an awesome log message sent by the tapbundle test #${i}` + message: `this is an awesome log message sent by the tapbundle test #${i}`, }; testLogDnaAccount.sendSmartlogPackage(testSmartlogMessage3); }); diff --git a/ts/logdna.aggregator.ts b/ts/logdna.aggregator.ts index 4916bab..ef11112 100644 --- a/ts/logdna.aggregator.ts +++ b/ts/logdna.aggregator.ts @@ -25,7 +25,7 @@ export class LogAggregator { } public addLog(urlIdentifierArg: string, logLineArg: any) { - let existinglogCandidate = this.logObjectMap.find(logCandidate => { + let existinglogCandidate = this.logObjectMap.find((logCandidate) => { return logCandidate.urlIdentifier === urlIdentifierArg; }); if (!existinglogCandidate) { @@ -42,18 +42,15 @@ export class LogAggregator { this.logObjectMap.remove(logCandidate); // lets post the message to logdna const url = `${this.baseUrl}${logCandidate.urlIdentifier}&now=${Date.now()}`; - const response = await plugins.smartrequest.postJson( - url, - { - headers: { - Authorization: this.createBasicAuth(), - charset: 'UTF-8' - }, - requestBody: { - lines: logCandidate.logLines - } - } - ); + const response = await plugins.smartrequest.postJson(url, { + headers: { + Authorization: this.createBasicAuth(), + charset: 'UTF-8', + }, + requestBody: { + lines: logCandidate.logLines, + }, + }); if (response.statusCode !== 200) { console.log(response.body); } diff --git a/ts/logdna.classes.logmessage.ts b/ts/logdna.classes.logmessage.ts index d077ffe..75a89ee 100644 --- a/ts/logdna.classes.logmessage.ts +++ b/ts/logdna.classes.logmessage.ts @@ -73,7 +73,7 @@ export class LogdnaMessage { ...smartlogPackageArg.context, logType: smartlogPackageArg.type, correlation: smartlogPackageArg.correlation, - data: smartlogPackageArg.data || {} + data: smartlogPackageArg.data || {}, }, env: smartlogPackageArg.context.environment, hostname: smartlogPackageArg.context.zone, @@ -86,7 +86,7 @@ export class LogdnaMessage { return tagArray; })(), ip: '0.0.0.0', - mac: 'aa:aa:aa:aa:aa:aa' + mac: 'aa:aa:aa:aa:aa:aa', }); } diff --git a/ts/logdna.logdnaaccount.ts b/ts/logdna.logdnaaccount.ts index c1ab9b7..b95ff94 100644 --- a/ts/logdna.logdnaaccount.ts +++ b/ts/logdna.logdnaaccount.ts @@ -40,7 +40,7 @@ export class LogdnaAccount { return `${reduced},${euc(newItem)}`; }); })() - ) + ); // let construct the request uri const requestUrlWithParams = `?hostname=${uriHostname}&mac=${uriMac}&ip=1${uriIp}&tags=${uriTags}`; @@ -51,7 +51,7 @@ export class LogdnaAccount { app: lm.options.app, level: lm.options.level, env: lm.options.env, - meta: lm.options.meta + meta: lm.options.meta, }; this.logAggregator.addLog(requestUrlWithParams, logLine); @@ -69,9 +69,9 @@ export class LogdnaAccount { */ public get smartlogDestination(): ILogDestination { return { - handleLog: async logPackageArg => { + handleLog: async (logPackageArg) => { this.sendSmartlogPackage(logPackageArg); - } + }, }; } }