@datadog/datadog-ci-plugin-sarif 3.21.3 → 3.22.0
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/dist/commands/upload.d.ts +1 -1
- package/dist/commands/upload.js +21 -8
- package/dist/commands/upload.js.map +1 -1
- package/package.json +2 -4
- package/dist/cli.d.ts +0 -1
- package/dist/cli.js +0 -5
- package/dist/cli.js.map +0 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { SarifUploadCommand } from '@datadog/datadog-ci-base/commands/sarif/upload
|
|
1
|
+
import { SarifUploadCommand } from '@datadog/datadog-ci-base/commands/sarif/upload';
|
|
2
2
|
export declare class PluginCommand extends SarifUploadCommand {
|
|
3
3
|
private config;
|
|
4
4
|
private fipsConfig;
|
package/dist/commands/upload.js
CHANGED
|
@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.PluginCommand = void 0;
|
|
16
16
|
const fs_1 = __importDefault(require("fs"));
|
|
17
|
-
const
|
|
17
|
+
const upload_1 = require("@datadog/datadog-ci-base/commands/sarif/upload");
|
|
18
18
|
const constants_1 = require("@datadog/datadog-ci-base/constants");
|
|
19
19
|
const concurrency_1 = require("@datadog/datadog-ci-base/helpers/concurrency");
|
|
20
20
|
const env_1 = require("@datadog/datadog-ci-base/helpers/env");
|
|
@@ -29,7 +29,7 @@ const api_1 = require("../api");
|
|
|
29
29
|
const renderer_1 = require("../renderer");
|
|
30
30
|
const utils_2 = require("../utils");
|
|
31
31
|
const validation_1 = require("../validation");
|
|
32
|
-
class PluginCommand extends
|
|
32
|
+
class PluginCommand extends upload_1.SarifUploadCommand {
|
|
33
33
|
constructor() {
|
|
34
34
|
var _a, _b;
|
|
35
35
|
super(...arguments);
|
|
@@ -46,11 +46,25 @@ class PluginCommand extends upload_command_1.SarifUploadCommand {
|
|
|
46
46
|
execute() {
|
|
47
47
|
return __awaiter(this, void 0, void 0, function* () {
|
|
48
48
|
(0, fips_1.enableFips)(this.fips || this.fipsConfig.fips, this.fipsIgnoreError || this.fipsConfig.fipsIgnoreError);
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
49
|
+
const githubEvent = process.env.GITHUB_EVENT_NAME;
|
|
50
|
+
const gitlabEvent = process.env.CI_PIPELINE_SOURCE;
|
|
51
|
+
const azureReason = process.env.BUILD_REASON;
|
|
52
|
+
if (githubEvent === 'pull_request') {
|
|
53
|
+
// https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-commands#example-setting-an-error-message
|
|
54
|
+
this.context.stdout.write('::error title=Unsupported Trigger::The pull_request trigger is not supported by Datadog Code Security. ' +
|
|
55
|
+
'Use the push event instead. See: https://docs.datadoghq.com/security/code_security/static_analysis/github_actions/#workflow\n');
|
|
56
|
+
return 1;
|
|
57
|
+
}
|
|
58
|
+
if (gitlabEvent === 'merge_request_event') {
|
|
59
|
+
this.context.stderr.write('The merge_request_event trigger is not supported by Datadog Code Security. ' +
|
|
60
|
+
'Use the push event instead. See: https://docs.datadoghq.com/security/code_security/static_analysis/github_actions/#workflow\n');
|
|
61
|
+
return 1;
|
|
62
|
+
}
|
|
63
|
+
if (azureReason === 'PullRequest') {
|
|
64
|
+
// https://learn.microsoft.com/en-us/azure/devops/pipelines/scripts/logging-commands?view=azure-devops&tabs=bash#logging-commands-for-build-pipelines
|
|
65
|
+
this.context.stdout.write('##vso[task.logissue type=error]The PullRequest trigger is not supported by Datadog Code Security. ' +
|
|
66
|
+
'Use the push event instead. See: https://docs.datadoghq.com/security/code_security/static_analysis/github_actions/#workflow\n');
|
|
67
|
+
return 1;
|
|
54
68
|
}
|
|
55
69
|
if (!this.basePaths || !this.basePaths.length) {
|
|
56
70
|
this.context.stderr.write('Missing basePath\n');
|
|
@@ -126,7 +140,6 @@ class PluginCommand extends upload_command_1.SarifUploadCommand {
|
|
|
126
140
|
}
|
|
127
141
|
const validationErrorMessage = (0, validation_1.validateSarif)(sarifReport);
|
|
128
142
|
if (validationErrorMessage) {
|
|
129
|
-
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
|
|
130
143
|
this.context.stdout.write((0, renderer_1.renderInvalidFile)(sarifReport, [validationErrorMessage]));
|
|
131
144
|
return false;
|
|
132
145
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../src/commands/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAAmB;AAEnB,
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../src/commands/upload.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@datadog/datadog-ci-plugin-sarif",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.22.0",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"description": "Datadog CI plugin for `sarif` commands",
|
|
6
6
|
"keywords": [
|
|
@@ -35,10 +35,9 @@
|
|
|
35
35
|
"prepack": "yarn package:clean-dist"
|
|
36
36
|
},
|
|
37
37
|
"peerDependencies": {
|
|
38
|
-
"@datadog/datadog-ci": "3.
|
|
38
|
+
"@datadog/datadog-ci-base": "3.22.0"
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@datadog/datadog-ci-base": "3.21.3",
|
|
42
41
|
"ajv": "^8.12.0",
|
|
43
42
|
"ajv-formats": "^2.1.1",
|
|
44
43
|
"axios": "^1.11.0",
|
|
@@ -50,7 +49,6 @@
|
|
|
50
49
|
},
|
|
51
50
|
"devDependencies": {
|
|
52
51
|
"@types/jest": "29.5.3",
|
|
53
|
-
"@types/node": "^18.19.76",
|
|
54
52
|
"@types/uuid": "^9.0.2"
|
|
55
53
|
}
|
|
56
54
|
}
|
package/dist/cli.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
package/dist/cli.js
DELETED
package/dist/cli.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;AAAA,8CAAqE;AAErE,MAAM,CAAC,OAAO,GAAG,CAAC,sBAAkB,CAAC,CAAA"}
|