@fabasoad/sarif-to-slack 1.4.0 → 1.4.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.github/workflows/release.yml +18 -9
- package/.github/workflows/security.yml +1 -1
- package/.github/workflows/send-sarif-to-slack.yml +10 -2
- package/.github/workflows/unit-tests.yml +3 -3
- package/.pre-commit-config.yaml +5 -5
- package/.tool-versions +1 -1
- package/Makefile +13 -13
- package/api-extractor.json +1 -1
- package/biome.json +1 -1
- package/dist/SarifToSlackClient.d.ts.map +1 -1
- package/dist/SarifToSlackClient.js +7 -7
- package/dist/index.cjs +71 -115
- package/dist/index.d.ts +3 -7
- package/dist/model/Finding.js +4 -5
- package/dist/model/SlackMessage.d.ts.map +1 -1
- package/dist/model/SlackMessage.js +1 -1
- package/dist/model/color/Color.d.ts.map +1 -1
- package/dist/model/color/ColorIdentification.js +7 -7
- package/dist/processors/ProcessorFactory.js +1 -1
- package/dist/representations/CompactGroupByRepresentation.js +1 -1
- package/dist/representations/Representation.js +1 -1
- package/dist/representations/RepresentationFactory.js +1 -1
- package/dist/representations/TableGroupByRunPerLevelRepresentation.d.ts.map +1 -1
- package/dist/representations/TableGroupByRunPerSeverityRepresentation.d.ts.map +1 -1
- package/dist/representations/TableGroupByRunRepresentation.d.ts.map +1 -1
- package/dist/representations/TableGroupBySarifPerLevelRepresentation.d.ts.map +1 -1
- package/dist/representations/TableGroupBySarifPerSeverityRepresentation.d.ts.map +1 -1
- package/dist/representations/TableGroupBySarifRepresentation.d.ts.map +1 -1
- package/dist/representations/TableGroupByToolNamePerLevelRepresentation.d.ts.map +1 -1
- package/dist/representations/TableGroupByToolNamePerSeverityRepresentation.d.ts.map +1 -1
- package/dist/representations/TableGroupByToolNameRepresentation.d.ts.map +1 -1
- package/dist/representations/TableGroupRepresentation.d.ts.map +1 -1
- package/dist/representations/TableGroupRepresentation.js +3 -3
- package/dist/representations/table/Cell.d.ts.map +1 -1
- package/dist/representations/table/Cell.js +1 -1
- package/dist/representations/table/Column.d.ts.map +1 -1
- package/dist/representations/table/Column.js +3 -4
- package/dist/representations/table/Row.d.ts.map +1 -1
- package/dist/representations/table/Row.js +3 -3
- package/dist/representations/table/Table.d.ts.map +1 -1
- package/dist/setupLogger.d.ts +16 -0
- package/dist/setupLogger.d.ts.map +1 -0
- package/dist/setupLogger.js +43 -0
- package/dist/system.js +3 -3
- package/dist/tsdoc-metadata.json +1 -1
- package/dist/types.d.ts +3 -7
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +2 -2
- package/dist/utils/Comparators.js +1 -1
- package/dist/utils/FileUtils.js +3 -3
- package/etc/sarif-to-slack.api.md +3 -7
- package/package.json +23 -22
- package/pnpm-workspace.yaml +8 -0
- package/scripts/build.sh +1 -1
- package/src/SarifToSlackClient.ts +6 -6
- package/src/model/Finding.ts +3 -3
- package/src/model/SlackMessage.ts +6 -3
- package/src/model/color/ColorIdentification.ts +6 -6
- package/src/representations/TableGroupRepresentation.ts +2 -2
- package/src/representations/table/Column.ts +2 -2
- package/src/representations/table/Row.ts +2 -2
- package/src/setupLogger.ts +62 -0
- package/src/system.ts +2 -2
- package/src/types.ts +2 -6
- package/src/utils/FileUtils.ts +2 -2
- package/tests/tsconfig.json +8 -0
- package/tests/vitest.d.ts +1 -0
- package/tsconfig.build.json +9 -0
- package/tsconfig.json +4 -4
- package/tsconfig.test.json +8 -0
- package/vitest.config.ts +22 -0
- package/dist/Logger.d.ts +0 -2
- package/dist/Logger.d.ts.map +0 -1
- package/dist/Logger.js +0 -76
- package/jest.config.json +0 -33
- package/src/Logger.ts +0 -97
|
@@ -35,33 +35,42 @@ jobs:
|
|
|
35
35
|
private-key: ${{ secrets.GH_APP_CONTENTS_CRUD_PRIVATE_KEY }}
|
|
36
36
|
|
|
37
37
|
- name: Checkout ${{ github.repository }}
|
|
38
|
-
uses: actions/checkout@
|
|
38
|
+
uses: actions/checkout@v7
|
|
39
39
|
with:
|
|
40
40
|
token: "${{ steps.github-app.outputs.token }}"
|
|
41
|
+
persist-credentials: "true"
|
|
42
|
+
|
|
43
|
+
- name: Setup pnpm
|
|
44
|
+
uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
|
|
45
|
+
with:
|
|
46
|
+
# Intentional: actions/setup-node provides dependency caching; disable
|
|
47
|
+
# pnpm/action-setup cache to avoid duplicate/unstable cache behavior
|
|
48
|
+
cache: "false"
|
|
41
49
|
|
|
42
50
|
- name: Setup Node
|
|
43
51
|
uses: actions/setup-node@v6
|
|
44
52
|
with:
|
|
45
53
|
node-version-file: ".tool-versions"
|
|
46
|
-
cache: "
|
|
47
|
-
cache-dependency-path: "
|
|
54
|
+
cache: "pnpm"
|
|
55
|
+
cache-dependency-path: "pnpm-lock.yaml"
|
|
48
56
|
|
|
49
57
|
- name: Install dependencies
|
|
50
|
-
run:
|
|
58
|
+
run: pnpm install --frozen-lockfile
|
|
51
59
|
|
|
52
60
|
- name: Install jq
|
|
53
|
-
uses: dcarbone/install-jq-action@
|
|
61
|
+
uses: dcarbone/install-jq-action@4fcb5062d7ce9bc4382d1a352d19ba3ba2c317c1 # v4.0.1
|
|
54
62
|
|
|
55
63
|
- name: Bump version
|
|
56
64
|
env:
|
|
57
65
|
BUMP_STRATEGY: "${{ github.event.inputs.bump-strategy }}"
|
|
58
66
|
GH_TOKEN: "${{ steps.github-app.outputs.token }}"
|
|
67
|
+
GH_APP_SLUG: "${{ steps.github-app.outputs.app-slug }}"
|
|
59
68
|
run: |
|
|
60
|
-
user_name="${
|
|
69
|
+
user_name="${GH_APP_SLUG}[bot]"
|
|
61
70
|
user_id="$(gh api "/users/${user_name}" --jq .id)"
|
|
62
71
|
git config user.email "${user_id}+${user_name}@users.noreply.github.com"
|
|
63
72
|
git config user.name "${user_name}"
|
|
64
|
-
|
|
73
|
+
pnpm run version:${BUMP_STRATEGY}
|
|
65
74
|
|
|
66
75
|
- name: Get metadata
|
|
67
76
|
id: metadata
|
|
@@ -71,13 +80,13 @@ jobs:
|
|
|
71
80
|
echo "ref-name=v${version}" >> "$GITHUB_OUTPUT"
|
|
72
81
|
|
|
73
82
|
- name: Publish to npm registry
|
|
74
|
-
uses: JS-DevTools/npm-publish@v4
|
|
83
|
+
uses: JS-DevTools/npm-publish@0fd2f4369c5d6bcfcde6091a7c527d810b9b5c3f # v4.1.5
|
|
75
84
|
with:
|
|
76
85
|
token: "${{ secrets.NPM_TOKEN }}"
|
|
77
86
|
registry: "https://registry.npmjs.org"
|
|
78
87
|
|
|
79
88
|
- name: Publish to GitHub Packages
|
|
80
|
-
uses: JS-DevTools/npm-publish@v4
|
|
89
|
+
uses: JS-DevTools/npm-publish@0fd2f4369c5d6bcfcde6091a7c527d810b9b5c3f # v4.1.5
|
|
81
90
|
with:
|
|
82
91
|
token: "${{ secrets.GITHUB_TOKEN }}"
|
|
83
92
|
registry: "https://npm.pkg.github.com"
|
|
@@ -23,6 +23,6 @@ jobs:
|
|
|
23
23
|
contents: read
|
|
24
24
|
security-events: write
|
|
25
25
|
with:
|
|
26
|
+
code-scanning-languages: "actions, typescript"
|
|
26
27
|
code-scanning: ${{ contains(fromJSON('["all", "code-scanning"]'), github.event.inputs.security-type || 'all') }}
|
|
27
|
-
code-scanning-languages: "actions,typescript"
|
|
28
28
|
sca: ${{ contains(fromJSON('["all", "sca"]'), github.event.inputs.security-type || 'all') }}
|
|
@@ -185,7 +185,9 @@ jobs:
|
|
|
185
185
|
contents: read
|
|
186
186
|
steps:
|
|
187
187
|
- name: Checkout ${{ github.repository }}
|
|
188
|
-
uses: actions/checkout@
|
|
188
|
+
uses: actions/checkout@v7
|
|
189
|
+
with:
|
|
190
|
+
persist-credentials: "false"
|
|
189
191
|
- name: Determine SARIF file
|
|
190
192
|
id: sarif-file
|
|
191
193
|
env:
|
|
@@ -294,12 +296,18 @@ jobs:
|
|
|
294
296
|
value=""
|
|
295
297
|
fi
|
|
296
298
|
echo "value=${value}" >> "$GITHUB_OUTPUT"
|
|
299
|
+
- name: Setup pnpm
|
|
300
|
+
uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
|
|
301
|
+
with:
|
|
302
|
+
run_install: false
|
|
297
303
|
- name: Setup node
|
|
298
304
|
uses: actions/setup-node@v6
|
|
299
305
|
with:
|
|
300
306
|
node-version-file: ".tool-versions"
|
|
307
|
+
cache: "pnpm"
|
|
308
|
+
cache-dependency-path: "pnpm-lock.yaml"
|
|
301
309
|
- name: Install dependencies
|
|
302
|
-
run:
|
|
310
|
+
run: pnpm install --frozen-lockfile
|
|
303
311
|
- name: Send message
|
|
304
312
|
env:
|
|
305
313
|
SARIF_TO_SLACK_WEBHOOK_URL: "${{ secrets.TMP_EUGENE_SLACK_WEBHOOK }}"
|
|
@@ -6,7 +6,7 @@ on: # yamllint disable-line rule:truthy
|
|
|
6
6
|
paths:
|
|
7
7
|
- .github/workflows/unit-tests.yml
|
|
8
8
|
- .tool-versions
|
|
9
|
-
-
|
|
9
|
+
- vitest.config.ts
|
|
10
10
|
- package.json
|
|
11
11
|
- src/**
|
|
12
12
|
- tests/**
|
|
@@ -17,8 +17,8 @@ on: # yamllint disable-line rule:truthy
|
|
|
17
17
|
workflow_dispatch: {}
|
|
18
18
|
|
|
19
19
|
jobs:
|
|
20
|
-
|
|
21
|
-
name:
|
|
20
|
+
vitest:
|
|
21
|
+
name: Vitest
|
|
22
22
|
uses: fabasoad/reusable-workflows/.github/workflows/wf-js-unit-tests.yml@main
|
|
23
23
|
permissions:
|
|
24
24
|
contents: read
|
package/.pre-commit-config.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
default_install_hook_types: ["pre-commit", "pre-push"]
|
|
3
3
|
default_stages: ["pre-commit", "pre-push"]
|
|
4
|
-
exclude: ^(dist
|
|
4
|
+
exclude: ^((dist|etc|node_modules|temp|test-data)/.*|vitest-report.json|pnpm-lock.yaml)$
|
|
5
5
|
minimum_pre_commit_version: 4.4.0
|
|
6
6
|
repos:
|
|
7
7
|
- repo: local
|
|
@@ -29,7 +29,7 @@ repos:
|
|
|
29
29
|
stages: ["pre-push"]
|
|
30
30
|
# Security
|
|
31
31
|
- id: audit
|
|
32
|
-
name:
|
|
32
|
+
name: pnpm audit
|
|
33
33
|
entry: make audit
|
|
34
34
|
language: unsupported
|
|
35
35
|
pass_filenames: false
|
|
@@ -60,16 +60,16 @@ repos:
|
|
|
60
60
|
- --hook-args=--log-level debug
|
|
61
61
|
stages: ["pre-push"]
|
|
62
62
|
- repo: https://github.com/google/osv-scanner
|
|
63
|
-
rev: v2.
|
|
63
|
+
rev: v2.4.0
|
|
64
64
|
hooks:
|
|
65
65
|
- id: osv-scanner
|
|
66
66
|
args:
|
|
67
|
-
- --lockfile=
|
|
67
|
+
- --lockfile=pnpm-lock.yaml
|
|
68
68
|
verbose: true
|
|
69
69
|
stages: ["pre-push"]
|
|
70
70
|
# Markdown
|
|
71
71
|
- repo: https://github.com/igorshubovych/markdownlint-cli
|
|
72
|
-
rev: v0.
|
|
72
|
+
rev: v0.49.0
|
|
73
73
|
hooks:
|
|
74
74
|
- id: markdownlint-fix
|
|
75
75
|
stages: ["pre-commit"]
|
package/.tool-versions
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
nodejs
|
|
1
|
+
nodejs 26.4.0
|
package/Makefile
CHANGED
|
@@ -2,52 +2,52 @@
|
|
|
2
2
|
|
|
3
3
|
.PHONY: audit
|
|
4
4
|
audit:
|
|
5
|
-
@
|
|
5
|
+
@pnpm audit
|
|
6
6
|
|
|
7
7
|
.PHONY: build
|
|
8
8
|
build:
|
|
9
|
-
@
|
|
9
|
+
@pnpm run build
|
|
10
10
|
|
|
11
11
|
.PHONY: clean
|
|
12
12
|
clean:
|
|
13
|
-
@
|
|
13
|
+
@pnpm run clean
|
|
14
14
|
|
|
15
15
|
.PHONY: install
|
|
16
16
|
install:
|
|
17
|
-
@
|
|
17
|
+
@pnpm install
|
|
18
18
|
|
|
19
19
|
.PHONY: reinstall
|
|
20
20
|
reinstall:
|
|
21
21
|
@make clean
|
|
22
|
-
@
|
|
22
|
+
@pnpm run clean:unsafe
|
|
23
23
|
@make install
|
|
24
24
|
|
|
25
25
|
.PHONY: lint
|
|
26
26
|
lint:
|
|
27
|
-
@
|
|
27
|
+
@pnpm run lint
|
|
28
28
|
|
|
29
29
|
.PHONY: test/integration
|
|
30
30
|
test/integration:
|
|
31
|
-
@
|
|
31
|
+
@pnpm run test:integration
|
|
32
32
|
|
|
33
33
|
.PHONY: test/unit
|
|
34
34
|
test/unit:
|
|
35
|
-
@
|
|
35
|
+
@pnpm run test
|
|
36
36
|
|
|
37
37
|
.PHONY: test
|
|
38
38
|
test: test/unit
|
|
39
39
|
|
|
40
|
-
.PHONY:
|
|
41
|
-
|
|
42
|
-
@
|
|
40
|
+
.PHONY: pnpm/update
|
|
41
|
+
pnpm/update:
|
|
42
|
+
@pnpm update
|
|
43
43
|
|
|
44
44
|
.PHONY: pre-commit/update
|
|
45
45
|
pre-commit/update:
|
|
46
46
|
@command -v prek >/dev/null 2>&1 && prek auto-update || pre-commit autoupdate
|
|
47
47
|
|
|
48
48
|
.PHONY: update
|
|
49
|
-
update:
|
|
49
|
+
update: pnpm/update pre-commit/update
|
|
50
50
|
|
|
51
51
|
.PHONY: outdated
|
|
52
52
|
outdated:
|
|
53
|
-
@
|
|
53
|
+
@pnpm outdated
|
package/api-extractor.json
CHANGED
|
@@ -110,7 +110,7 @@
|
|
|
110
110
|
* SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
|
|
111
111
|
* DEFAULT VALUE: "<projectFolder>/tsconfig.json"
|
|
112
112
|
*/
|
|
113
|
-
|
|
113
|
+
"tsconfigFilePath": "<projectFolder>/tsconfig.build.json",
|
|
114
114
|
/**
|
|
115
115
|
* Provides a compiler configuration that will be used instead of reading the tsconfig.json file from disk.
|
|
116
116
|
* The object must conform to the TypeScript tsconfig schema:
|
package/biome.json
CHANGED
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"includes": ["src/**", "tests/**"]
|
|
32
32
|
},
|
|
33
33
|
"javascript": {
|
|
34
|
-
"globals": ["Atomics", "SharedArrayBuffer", "
|
|
34
|
+
"globals": ["Atomics", "SharedArrayBuffer", "vi", "afterEach", "beforeAll", "beforeEach", "expect", "test", "describe"]
|
|
35
35
|
},
|
|
36
36
|
"overrides": [{ "includes": ["**/*.spec.ts", "**/*.spec.tsx"] }]
|
|
37
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SarifToSlackClient.d.ts","sourceRoot":"","sources":["../src/SarifToSlackClient.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,KAAK,yBAAyB,EAG/B,MAAM,SAAS,CAAC;AAYjB;;;GAGG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,CAAe;IAChC,OAAO,CAAC,WAAW,CAAC,CAAa;IAEjC,OAAO,CAAC,OAAO,CAAyB;IAExC,OAAO;
|
|
1
|
+
{"version":3,"file":"SarifToSlackClient.d.ts","sourceRoot":"","sources":["../src/SarifToSlackClient.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,KAAK,yBAAyB,EAG/B,MAAM,SAAS,CAAC;AAYjB;;;GAGG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,CAAe;IAChC,OAAO,CAAC,WAAW,CAAC,CAAa;IAEjC,OAAO,CAAC,OAAO,CAAyB;IAExC,OAAO,eAEN;IAED,OAAO,CAAC,MAAM,CAAE,oBAAoB;IAOpC;;;;;;;;;OASG;IACH,OAAoB,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,yBAAyB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAW3G;mBAEoB,UAAU;IAoE/B;;;;;OAKG;IACU,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAcjC;IAED,OAAO,KAAK,iBAAiB,GAyD5B;CACF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { promises as fs } from 'node:fs';
|
|
2
|
-
import
|
|
2
|
+
import { getLogger } from "@logtape/logtape";
|
|
3
3
|
import { SecurityLevel, SecuritySeverity, } from './types';
|
|
4
4
|
import { logMetadata } from './system';
|
|
5
5
|
import { extractListOfFiles } from './utils/FileUtils';
|
|
@@ -10,7 +10,7 @@ import { identifyColor } from './model/color/ColorIdentification';
|
|
|
10
10
|
import FindingArray from './model/FindingArray';
|
|
11
11
|
import { createSlackMessage } from './model/SlackMessage';
|
|
12
12
|
import { SendIf, sendIfLogMessage } from './model/SendIf';
|
|
13
|
-
import {
|
|
13
|
+
import { setupLogger } from "./setupLogger";
|
|
14
14
|
/**
|
|
15
15
|
* Service to convert SARIF files to Slack messages and send them.
|
|
16
16
|
* @public
|
|
@@ -39,8 +39,8 @@ export class SarifToSlackClient {
|
|
|
39
39
|
* @public
|
|
40
40
|
*/
|
|
41
41
|
static async create(webhookUrl, opts) {
|
|
42
|
-
|
|
43
|
-
const logger =
|
|
42
|
+
setupLogger(opts.loggerOptions);
|
|
43
|
+
const logger = getLogger();
|
|
44
44
|
logger.trace(opts);
|
|
45
45
|
const instance = new SarifToSlackClient();
|
|
46
46
|
instance._sendIf = opts.sendIf ?? instance._sendIf;
|
|
@@ -118,13 +118,13 @@ export class SarifToSlackClient {
|
|
|
118
118
|
if (this._sarifModel == null) {
|
|
119
119
|
throw new Error('Could not parse SARIF file(s).');
|
|
120
120
|
}
|
|
121
|
-
const logger =
|
|
121
|
+
const logger = getLogger();
|
|
122
122
|
if (this.shouldSendMessage) {
|
|
123
123
|
if (this._message == null) {
|
|
124
124
|
throw new Error('Slack message was not prepared.');
|
|
125
125
|
}
|
|
126
126
|
const text = await this._message.send();
|
|
127
|
-
logger.info(
|
|
127
|
+
logger.info(`Message sent. Status: ${text}`);
|
|
128
128
|
}
|
|
129
129
|
else {
|
|
130
130
|
logger.info(sendIfLogMessage(this._sendIf));
|
|
@@ -188,4 +188,4 @@ export class SarifToSlackClient {
|
|
|
188
188
|
}
|
|
189
189
|
}
|
|
190
190
|
}
|
|
191
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
191
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SarifToSlackClient.js","sourceRoot":"","sources":["../src/SarifToSlackClient.ts"],"names":[],"mappings":"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"}
|