fix(core): update

This commit is contained in:
Philipp Kunz 2021-07-07 01:05:16 +02:00
parent c71cff4011
commit 1308f16699
8 changed files with 53 additions and 43 deletions

View File

@ -19,23 +19,35 @@ mirror:
stage: security stage: security
script: script:
- npmci git mirror - npmci git mirror
only:
- tags
tags: tags:
- lossless - lossless
- docker - docker
- notpriv - 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 image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
stage: security stage: security
script: script:
- npmci npm prepare - npmci npm prepare
- npmci command npm install --ignore-scripts - npmci command npm install --ignore-scripts
- npmci command npm config set registry https://registry.npmjs.org - 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: tags:
- lossless
- docker - docker
- notpriv allow_failure: true
# ==================== # ====================
# test stage # test stage
@ -50,9 +62,7 @@ testStable:
- npmci npm test - npmci npm test
coverage: /\d+.?\d+?\%\s*coverage/ coverage: /\d+.?\d+?\%\s*coverage/
tags: tags:
- lossless
- docker - docker
- priv
testBuild: testBuild:
stage: test stage: test
@ -63,9 +73,7 @@ testBuild:
- npmci command npm run build - npmci command npm run build
coverage: /\d+.?\d+?\%\s*coverage/ coverage: /\d+.?\d+?\%\s*coverage/
tags: tags:
- lossless
- docker - docker
- notpriv
release: release:
stage: release stage: release
@ -85,6 +93,8 @@ release:
codequality: codequality:
stage: metadata stage: metadata
allow_failure: true allow_failure: true
only:
- tags
script: script:
- npmci command npm install -g tslint typescript - npmci command npm install -g tslint typescript
- npmci npm prepare - npmci npm prepare

View File

@ -15,7 +15,7 @@
"properties": { "properties": {
"projectType": { "projectType": {
"type": "string", "type": "string",
"enum": ["website", "element", "service", "npm"] "enum": ["website", "element", "service", "npm", "wcc"]
} }
} }
} }

View File

@ -39,5 +39,8 @@
"cli.js", "cli.js",
"npmextra.json", "npmextra.json",
"readme.md" "readme.md"
],
"browserslist": [
"last 1 chrome versions"
] ]
} }

View File

@ -53,9 +53,9 @@ const smartlogPackage: ILogPackage = {
containerName: 'ci-mojoio-logdna', containerName: 'ci-mojoio-logdna',
environment: 'test', environment: 'test',
runtime: 'node', 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); const logdnaMessage = LogdnaMessage.fromSmartLogPackage(smartlogPackage);

View File

@ -24,13 +24,13 @@ tap.test('should create a standard log message', async () => {
containerName: 'ci-mojoio-logdna', containerName: 'ci-mojoio-logdna',
environment: 'test', environment: 'test',
runtime: 'node', runtime: 'node',
zone: 'shipzone' zone: 'shipzone',
}, },
correlation: { correlation: {
id: '123', 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', containerName: 'ci-mojoio-logdna',
environment: 'test', environment: 'test',
runtime: 'node', runtime: 'node',
zone: 'shipzone' zone: 'shipzone',
}, },
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}`,
correlation: { correlation: {
id: '123', id: '123',
type: 'none' type: 'none',
} },
}; };
testLogDnaAccount.sendSmartlogPackage(testSmartlogMessage); testLogDnaAccount.sendSmartlogPackage(testSmartlogMessage);
i++; i++;
@ -73,13 +73,13 @@ tap.test('should send in order', async () => {
containerName: 'ci-mojoio-logdna', containerName: 'ci-mojoio-logdna',
environment: 'test', environment: 'test',
runtime: 'node', runtime: 'node',
zone: 'shipzone' zone: 'shipzone',
}, },
correlation: { correlation: {
id: '123', 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); testLogDnaAccount.sendSmartlogPackage(testSmartlogMessage2);
@ -93,13 +93,13 @@ tap.test('should send in order', async () => {
containerName: 'ci-mojoio-logdna', containerName: 'ci-mojoio-logdna',
environment: 'test', environment: 'test',
runtime: 'node', runtime: 'node',
zone: 'shipzone' zone: 'shipzone',
}, },
correlation: { correlation: {
id: '123', 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); testLogDnaAccount.sendSmartlogPackage(testSmartlogMessage3);
}); });

View File

@ -25,7 +25,7 @@ export class LogAggregator {
} }
public addLog(urlIdentifierArg: string, logLineArg: any) { public addLog(urlIdentifierArg: string, logLineArg: any) {
let existinglogCandidate = this.logObjectMap.find(logCandidate => { let existinglogCandidate = this.logObjectMap.find((logCandidate) => {
return logCandidate.urlIdentifier === urlIdentifierArg; return logCandidate.urlIdentifier === urlIdentifierArg;
}); });
if (!existinglogCandidate) { if (!existinglogCandidate) {
@ -42,18 +42,15 @@ export class LogAggregator {
this.logObjectMap.remove(logCandidate); this.logObjectMap.remove(logCandidate);
// lets post the message to logdna // lets post the message to logdna
const url = `${this.baseUrl}${logCandidate.urlIdentifier}&now=${Date.now()}`; const url = `${this.baseUrl}${logCandidate.urlIdentifier}&now=${Date.now()}`;
const response = await plugins.smartrequest.postJson( const response = await plugins.smartrequest.postJson(url, {
url, headers: {
{ Authorization: this.createBasicAuth(),
headers: { charset: 'UTF-8',
Authorization: this.createBasicAuth(), },
charset: 'UTF-8' requestBody: {
}, lines: logCandidate.logLines,
requestBody: { },
lines: logCandidate.logLines });
}
}
);
if (response.statusCode !== 200) { if (response.statusCode !== 200) {
console.log(response.body); console.log(response.body);
} }

View File

@ -73,7 +73,7 @@ export class LogdnaMessage {
...smartlogPackageArg.context, ...smartlogPackageArg.context,
logType: smartlogPackageArg.type, logType: smartlogPackageArg.type,
correlation: smartlogPackageArg.correlation, correlation: smartlogPackageArg.correlation,
data: smartlogPackageArg.data || {} data: smartlogPackageArg.data || {},
}, },
env: smartlogPackageArg.context.environment, env: smartlogPackageArg.context.environment,
hostname: smartlogPackageArg.context.zone, hostname: smartlogPackageArg.context.zone,
@ -86,7 +86,7 @@ export class LogdnaMessage {
return tagArray; return tagArray;
})(), })(),
ip: '0.0.0.0', ip: '0.0.0.0',
mac: 'aa:aa:aa:aa:aa:aa' mac: 'aa:aa:aa:aa:aa:aa',
}); });
} }

View File

@ -40,7 +40,7 @@ export class LogdnaAccount {
return `${reduced},${euc(newItem)}`; return `${reduced},${euc(newItem)}`;
}); });
})() })()
) );
// let construct the request uri // let construct the request uri
const requestUrlWithParams = `?hostname=${uriHostname}&mac=${uriMac}&ip=1${uriIp}&tags=${uriTags}`; const requestUrlWithParams = `?hostname=${uriHostname}&mac=${uriMac}&ip=1${uriIp}&tags=${uriTags}`;
@ -51,7 +51,7 @@ export class LogdnaAccount {
app: lm.options.app, app: lm.options.app,
level: lm.options.level, level: lm.options.level,
env: lm.options.env, env: lm.options.env,
meta: lm.options.meta meta: lm.options.meta,
}; };
this.logAggregator.addLog(requestUrlWithParams, logLine); this.logAggregator.addLog(requestUrlWithParams, logLine);
@ -69,9 +69,9 @@ export class LogdnaAccount {
*/ */
public get smartlogDestination(): ILogDestination { public get smartlogDestination(): ILogDestination {
return { return {
handleLog: async logPackageArg => { handleLog: async (logPackageArg) => {
this.sendSmartlogPackage(logPackageArg); this.sendSmartlogPackage(logPackageArg);
} },
}; };
} }
} }