@datadog/datadog-ci 2.32.0 → 2.32.1
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/README.md +3 -3
- package/dist/commands/deployment/constants.d.ts +1 -0
- package/dist/commands/deployment/constants.js +2 -1
- package/dist/commands/deployment/constants.js.map +1 -1
- package/dist/commands/deployment/mark.d.ts +2 -1
- package/dist/commands/deployment/mark.js +21 -7
- package/dist/commands/deployment/mark.js.map +1 -1
- package/dist/commands/gate/evaluate.js +1 -1
- package/dist/commands/junit/upload.js +4 -1
- package/dist/commands/junit/upload.js.map +1 -1
- package/dist/commands/sarif/renderer.d.ts +3 -3
- package/dist/commands/sarif/renderer.js +19 -4
- package/dist/commands/sarif/renderer.js.map +1 -1
- package/dist/commands/sarif/upload.js +8 -9
- package/dist/commands/sarif/upload.js.map +1 -1
- package/dist/commands/sbom/api.js.map +1 -1
- package/dist/commands/sbom/language.js +3 -0
- package/dist/commands/sbom/language.js.map +1 -1
- package/dist/commands/sbom/renderer.d.ts +6 -0
- package/dist/commands/sbom/renderer.js +58 -0
- package/dist/commands/sbom/renderer.js.map +1 -0
- package/dist/commands/sbom/types.d.ts +1 -0
- package/dist/commands/sbom/types.js +1 -0
- package/dist/commands/sbom/types.js.map +1 -1
- package/dist/commands/sbom/upload.js +22 -17
- package/dist/commands/sbom/upload.js.map +1 -1
- package/dist/commands/synthetics/reporters/default.js +1 -1
- package/dist/commands/synthetics/reporters/default.js.map +1 -1
- package/dist/commands/synthetics/run-tests-lib.d.ts +2 -6
- package/dist/commands/synthetics/run-tests-lib.js +46 -38
- package/dist/commands/synthetics/run-tests-lib.js.map +1 -1
- package/dist/helpers/tags.d.ts +5 -0
- package/dist/helpers/tags.js +8 -1
- package/dist/helpers/tags.js.map +1 -1
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -76,10 +76,10 @@ See each command's linked README for more details, or click on [📚](https://do
|
|
|
76
76
|
- `xcode`: Upload [React Native sourcemaps](src/commands/react-native) for Error Tracking from the XCode bundle build phase. [📚](https://docs.datadoghq.com/real_user_monitoring/error_tracking/reactnative/)
|
|
77
77
|
|
|
78
78
|
#### `sarif`
|
|
79
|
-
- `upload`: Upload [Static Analysis Results Interchange Format (SARIF)](src/commands/sarif) reports to Datadog. [📚](https://docs.datadoghq.com/static_analysis/)
|
|
79
|
+
- `upload`: Upload [Static Analysis Results Interchange Format (SARIF)](src/commands/sarif) reports to Datadog. [📚](https://docs.datadoghq.com/code_analysis/static_analysis/)
|
|
80
80
|
|
|
81
81
|
#### `sbom`
|
|
82
|
-
- `upload`: Upload [Software Bill of Materials (SBOM)](src/commands/sbom) files to Datadog. [📚](https://docs.datadoghq.com/
|
|
82
|
+
- `upload`: Upload [Software Bill of Materials (SBOM)](src/commands/sbom) files to Datadog. [📚](https://docs.datadoghq.com/code_analysis/software_composition_analysis/)
|
|
83
83
|
|
|
84
84
|
#### `sourcemaps`
|
|
85
85
|
- `upload`: Upload [JavaScript sourcemaps](src/commands/sourcemaps) for Error Tracking. [📚](https://docs.datadoghq.com/real_user_monitoring/guide/upload-javascript-source-maps)
|
|
@@ -151,7 +151,7 @@ To run `datadog-ci` from a container, you can use the `datadog/ci` image availab
|
|
|
151
151
|
docker pull datadog/ci
|
|
152
152
|
```
|
|
153
153
|
|
|
154
|
-
This example demonstrates how to run a command using the container and passing in the API and
|
|
154
|
+
This example demonstrates how to run a command using the container and passing in the API and App keys:
|
|
155
155
|
|
|
156
156
|
```
|
|
157
157
|
export DD_API_KEY=$(cat /secret/dd_api_key)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.CUSTOM_TAGS_TAG = exports.IS_ROLLBACK_TAG = exports.SERVICE_TAG = exports.REVISION_TAG = exports.ENV_TAG = exports.IS_DEPLOYMENT_TAG = exports.CD_VIS_PREFIX = void 0;
|
|
3
|
+
exports.CONTAINS_DEPLOYMENT_TAG = exports.CUSTOM_TAGS_TAG = exports.IS_ROLLBACK_TAG = exports.SERVICE_TAG = exports.REVISION_TAG = exports.ENV_TAG = exports.IS_DEPLOYMENT_TAG = exports.CD_VIS_PREFIX = void 0;
|
|
4
4
|
exports.CD_VIS_PREFIX = 'datadog_cd_visibility.';
|
|
5
5
|
exports.IS_DEPLOYMENT_TAG = exports.CD_VIS_PREFIX + 'is_deployment:true';
|
|
6
6
|
exports.ENV_TAG = exports.CD_VIS_PREFIX + 'env:';
|
|
@@ -8,4 +8,5 @@ exports.REVISION_TAG = exports.CD_VIS_PREFIX + 'revision:';
|
|
|
8
8
|
exports.SERVICE_TAG = exports.CD_VIS_PREFIX + 'service:';
|
|
9
9
|
exports.IS_ROLLBACK_TAG = exports.CD_VIS_PREFIX + 'is_rollback:true';
|
|
10
10
|
exports.CUSTOM_TAGS_TAG = exports.CD_VIS_PREFIX + 'custom_tags:';
|
|
11
|
+
exports.CONTAINS_DEPLOYMENT_TAG = 'ci.contains_deployment:true';
|
|
11
12
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/commands/deployment/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,aAAa,GAAG,wBAAwB,CAAA;AACxC,QAAA,iBAAiB,GAAG,qBAAa,GAAG,oBAAoB,CAAA;AACxD,QAAA,OAAO,GAAG,qBAAa,GAAG,MAAM,CAAA;AAChC,QAAA,YAAY,GAAG,qBAAa,GAAG,WAAW,CAAA;AAC1C,QAAA,WAAW,GAAG,qBAAa,GAAG,UAAU,CAAA;AACxC,QAAA,eAAe,GAAG,qBAAa,GAAG,kBAAkB,CAAA;AACpD,QAAA,eAAe,GAAG,qBAAa,GAAG,cAAc,CAAA"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/commands/deployment/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,aAAa,GAAG,wBAAwB,CAAA;AACxC,QAAA,iBAAiB,GAAG,qBAAa,GAAG,oBAAoB,CAAA;AACxD,QAAA,OAAO,GAAG,qBAAa,GAAG,MAAM,CAAA;AAChC,QAAA,YAAY,GAAG,qBAAa,GAAG,WAAW,CAAA;AAC1C,QAAA,WAAW,GAAG,qBAAa,GAAG,UAAU,CAAA;AACxC,QAAA,eAAe,GAAG,qBAAa,GAAG,kBAAkB,CAAA;AACpD,QAAA,eAAe,GAAG,qBAAa,GAAG,cAAc,CAAA;AAChD,QAAA,uBAAuB,GAAG,6BAA6B,CAAA"}
|
|
@@ -35,17 +35,28 @@ class DeploymentMarkCommand extends clipanion_1.Command {
|
|
|
35
35
|
}
|
|
36
36
|
execute() {
|
|
37
37
|
return __awaiter(this, void 0, void 0, function* () {
|
|
38
|
-
const
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
38
|
+
const tagJobCommand = new tag_1.TagCommand();
|
|
39
|
+
tagJobCommand.setLevel('job');
|
|
40
|
+
tagJobCommand.setTags(this.createJobDeploymentTags());
|
|
41
|
+
tagJobCommand.context = this.context;
|
|
42
|
+
const tagPipelineCommand = new tag_1.TagCommand();
|
|
43
|
+
tagPipelineCommand.setLevel('pipeline');
|
|
44
|
+
tagPipelineCommand.setTags(this.createPipelineDeploymentTags());
|
|
45
|
+
tagPipelineCommand.context = this.context;
|
|
42
46
|
if (this.noFail) {
|
|
43
|
-
|
|
47
|
+
tagJobCommand.setNoFail(true);
|
|
48
|
+
tagPipelineCommand.setNoFail(true);
|
|
49
|
+
}
|
|
50
|
+
const tagJobCommandExitCode = yield tagJobCommand.execute();
|
|
51
|
+
if (tagJobCommandExitCode === 0) {
|
|
52
|
+
return tagPipelineCommand.execute();
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
return tagJobCommandExitCode;
|
|
44
56
|
}
|
|
45
|
-
return tagCommand.execute();
|
|
46
57
|
});
|
|
47
58
|
}
|
|
48
|
-
|
|
59
|
+
createJobDeploymentTags() {
|
|
49
60
|
const tags = [constants_1.IS_DEPLOYMENT_TAG];
|
|
50
61
|
if (this.env) {
|
|
51
62
|
tags.push(constants_1.ENV_TAG + this.env);
|
|
@@ -64,6 +75,9 @@ class DeploymentMarkCommand extends clipanion_1.Command {
|
|
|
64
75
|
}
|
|
65
76
|
return tags;
|
|
66
77
|
}
|
|
78
|
+
createPipelineDeploymentTags() {
|
|
79
|
+
return [constants_1.CONTAINS_DEPLOYMENT_TAG];
|
|
80
|
+
}
|
|
67
81
|
}
|
|
68
82
|
exports.DeploymentMarkCommand = DeploymentMarkCommand;
|
|
69
83
|
DeploymentMarkCommand.paths = [['deployment', 'mark']];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mark.js","sourceRoot":"","sources":["../../../src/commands/deployment/mark.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,oCAAqC;AAErC,
|
|
1
|
+
{"version":3,"file":"mark.js","sourceRoot":"","sources":["../../../src/commands/deployment/mark.ts"],"names":[],"mappings":"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"}
|
|
@@ -95,7 +95,7 @@ class GateEvaluateCommand extends clipanion_1.Command {
|
|
|
95
95
|
}
|
|
96
96
|
if (!this.config.appKey) {
|
|
97
97
|
this.context.stdout.write(`Missing ${chalk_1.default.red.bold('DD_APP_KEY')} in your environment.\n`);
|
|
98
|
-
throw new Error('
|
|
98
|
+
throw new Error('App key is missing');
|
|
99
99
|
}
|
|
100
100
|
return (0, api_1.apiConstructor)((0, utils_1.getBaseIntakeUrl)(), this.config.apiKey, this.config.appKey);
|
|
101
101
|
}
|
|
@@ -101,7 +101,10 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
|
|
|
101
101
|
this.reportMeasures = clipanion_1.Option.Array('--report-measures');
|
|
102
102
|
this.rawXPathTags = clipanion_1.Option.Array('--xpath-tag');
|
|
103
103
|
this.gitRepositoryURL = clipanion_1.Option.String('--git-repository-url');
|
|
104
|
-
this.skipGitMetadataUpload = clipanion_1.Option.String('--skip-git-metadata-upload', 'true', {
|
|
104
|
+
this.skipGitMetadataUpload = clipanion_1.Option.String('--skip-git-metadata-upload', 'true', {
|
|
105
|
+
validator: t.isBoolean(),
|
|
106
|
+
tolerateBoolean: true,
|
|
107
|
+
});
|
|
105
108
|
this.config = {
|
|
106
109
|
apiKey: process.env.DATADOG_API_KEY || process.env.DD_API_KEY,
|
|
107
110
|
env: process.env.DD_ENV,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/junit/upload.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/junit/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAmB;AACnB,4CAAmB;AACnB,gDAAuB;AAEvB,kDAAyB;AACzB,yCAAyC;AACzC,qDAAuD;AACvD,gDAAuB;AACvB,4CAA6B;AAE7B,yCAA8C;AAC9C,2DAA8D;AAC9D,iFAAqE;AAErE,iDAAqD;AACrD,+CAAgD;AAChD,6CAA0D;AAC1D,uEAAkE;AAClE,+CAAgF;AAChF,qEAAsD;AAEtD,6CAAgD;AAChD,iDAAmD;AACnD,qDAAiD;AAEjD,+BAAuD;AACvD,8CAAqB;AAErB,yCAYmB;AACnB,mCAA8B;AAE9B,MAAM,oBAAoB,GAAG,oBAAoB,CAAA;AACjD,MAAM,qBAAqB,GAAG,qBAAqB,CAAA;AACnD,MAAM,oBAAoB,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;AAEvC,MAAM,WAAW,GAAG,CAAC,WAAmB,EAAE,EAAE;IAC1C,MAAM,oBAAoB,GAAG,MAAM,CAAC,YAAE,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAA;IACjE,MAAM,gBAAgB,GAAG,8BAAY,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAA;IACpE,IAAI,gBAAgB,KAAK,IAAI,EAAE;QAC7B,OAAO,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAA;KAChC;IACD,MAAM,SAAS,GAAG,IAAI,2BAAS,EAAE,CAAA;IACjC,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAA;IACjE,IAAI,CAAC,CAAC,YAAY,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,WAAW,IAAI,WAAW,CAAC,EAAE;QACnE,OAAO,wDAAwD,CAAA;KAChE;SAAM,IAAI,CAAC,WAAW,CAAC,SAAS,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE;QAC5D,OAAO,mEAAmE,CAAA;KAC3E;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAED,MAAa,qBAAsB,SAAQ,mBAAO;IAAlD;;QA+CU,cAAS,GAAG,kBAAM,CAAC,IAAI,CAAC,EAAC,QAAQ,EAAE,CAAC,EAAC,CAAC,CAAA;QACtC,YAAO,GAAG,kBAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;QAC5C,WAAM,GAAG,kBAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;QAC3C,QAAG,GAAG,kBAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QAC5B,SAAI,GAAG,kBAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE;YAC9C,GAAG,EAAE,8BAA8B;YACnC,eAAe,EAAE,IAAI;YACrB,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE;SACzB,CAAC,CAAA;QACM,mBAAc,GAAG,kBAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE,IAAI,EAAE,EAAC,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,EAAC,CAAC,CAAA;QAC9F,YAAO,GAAG,kBAAM,CAAC,KAAK,CAAC,WAAW,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAA;QACnD,aAAQ,GAAG,kBAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;QACrC,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,WAAW,EAAE,EAAC,GAAG,EAAE,YAAY,EAAC,CAAC,CAAA;QACzD,SAAI,GAAG,kBAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAC7B,eAAU,GAAG,kBAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QAC1C,kBAAa,GAAG,kBAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAA;QAChE,mBAAc,GAAG,kBAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAA;QAClD,iBAAY,GAAG,kBAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;QAC1C,qBAAgB,GAAG,kBAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAA;QACxD,0BAAqB,GAAG,kBAAM,CAAC,MAAM,CAAC,4BAA4B,EAAE,MAAM,EAAE;YAClF,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE;YACxB,eAAe,EAAE,IAAI;SACtB,CAAC,CAAA;QAEM,WAAM,GAAG;YACf,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU;YAC7D,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM;YACvB,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;YAC/B,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU;YACrC,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;SACxC,CAAA;QAGO,WAAM,GAAW,IAAI,eAAM,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,iBAAQ,CAAC,IAAI,CAAC,CAAA;IA+PjG,CAAC;IA7Pc,OAAO;;YAClB,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,iBAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,iBAAQ,CAAC,IAAI,CAAC,CAAA;YACtE,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAE9C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACjB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAA;gBAE9C,OAAO,CAAC,CAAA;aACT;YACD,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;gBAC7C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAA;gBAE/C,OAAO,CAAC,CAAA;aACT;YAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;gBACpB,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAA;aAC3B;YAED,IAAI,IAAI,CAAC,YAAY,EAAE;gBACrB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;gBACvD,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;oBACnE,OAAO,CAAC,CAAA;iBACT;aACF;YAED,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,EAAE,CAAA;YAE/B,+CAA+C;YAC/C,wDAAwD;YACxD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,cAAI,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;YACjF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,4BAAiB,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;YAEnG,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAA;YACzC,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAA;YACvC,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;YAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAA;YACvC,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;YAC/C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAClD,QAAQ,EACR,UAAU,EACV,cAAc,EACd,UAAU,EACV,cAAc,CACf,CAAA;YACD,MAAM,MAAM,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;YAE1D,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAA;YAExC,MAAM,IAAA,kCAAoB,EAAC,IAAI,CAAC,cAAc,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;YAEjE,MAAM,gBAAgB,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC,GAAG,IAAI,CAAA;YAC1D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,iCAAsB,EAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAA;YAExF,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE;gBAC/B,IAAI,MAAM,IAAA,mBAAS,GAAE,EAAE;oBACrB,MAAM,OAAO,GAAG,IAAA,YAAE,GAAE,CAAA;oBAEpB,MAAM,cAAc,GAAG,IAAA,yBAAiB,EAAC;wBACvC,OAAO,EAAE,YAAM;wBACf,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAO;wBAC3B,OAAO,EAAE,IAAI,GAAG,CAAC;4BACf,CAAC,oBAAoB,EAAE,OAAO,CAAC;4BAC/B,CAAC,qBAAqB,EAAE,OAAO,CAAC;yBACjC,CAAC;qBACH,CAAC,CAAA;oBACF,IAAI;wBACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,yBAAyB,CAAC,CAAA;wBAC5E,IAAI,OAAO,GAAG,CAAC,CAAA;wBACf,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;4BAChB,OAAO,GAAG,MAAM,IAAA,sBAAc,EAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAC,cAAc,EAAC,CAAC,CAAA;yBAChF;wBACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,oCAAyB,EAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;qBAClE;oBAAC,OAAO,GAAG,EAAE;wBACZ,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,gCAAqB,EAAC,GAAG,CAAC,CAAC,CAAA;qBAC7C;iBACF;qBAAM;oBACL,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,2CAA2C,CAAC,CAAA;iBAC/F;aACF;iBAAM;gBACL,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0DAA0D,CAAC,CAAA;aAC9E;YAED,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBAChB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,kCAAuB,EAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;aAC5F;QACH,CAAC;KAAA;IAEa,aAAa,CAAC,IAAsC;;YAChE,MAAM,IAAA,qBAAa,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,MAAM,IAAA,kBAAY,GAAE,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;QACjH,CAAC;KAAA;IAEO,YAAY;QAClB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,WAAW,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,0BAA0B,CAC3G,CAAA;YACD,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;SACtC;QAED,OAAO,IAAA,oBAAc,EAAC,eAAS,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IACtD,CAAC;IAEO,cAAc,CAAC,YAAsB;QAC3C,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC,SAAiC,EAAE,aAAqB,EAAE,EAAE;YACtF,MAAM,KAAK,GAAG,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;YACxC,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;gBAChB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,wEAAwE,CAAC,CAAA;gBAEnG,OAAO,SAAS,CAAA;aACjB;YAED,MAAM,OAAO,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;YACjD,MAAM,KAAK,GAAG,aAAa,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;YAChD,SAAS,CAAC,OAAO,CAAC,GAAG,KAAK,CAAA;YAE1B,OAAO,SAAS,CAAA;QAClB,CAAC,EAAE,EAAE,CAAC,CAAA;IACR,CAAC;IAEa,wBAAwB,CACpC,QAAkB,EAClB,UAAkC,EAClC,cAAsC,EACtC,UAAkC,EAClC,cAAsC;;YAEtC,MAAM,aAAa,GAAG,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC;iBACzC,MAAM,CAAC,CAAC,GAAa,EAAE,QAAgB,EAAE,EAAE;gBAC1C,IAAI,IAAA,cAAM,EAAC,QAAQ,CAAC,EAAE;oBACpB,OAAO,GAAG,CAAC,MAAM,CAAC,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;iBAC7D;gBAED,OAAO,GAAG,CAAC,MAAM,CAAC,cAAI,CAAC,IAAI,CAAC,IAAA,iBAAS,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;YAC5D,CAAC,EAAE,EAAE,CAAC;iBACL,MAAM,CAAC,cAAM,CAAC,CAAA;YAEjB,MAAM,gBAAgB,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,gBAAgB,EAAE,EAAE;gBAC/E,MAAM,sBAAsB,GAAG,WAAW,CAAC,gBAAgB,CAAC,CAAA;gBAC5D,IAAI,sBAAsB,EAAE;oBAC1B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,4BAAiB,EAAC,gBAAgB,EAAE,sBAAsB,CAAC,CAAC,CAAA;oBAEtF,OAAO,KAAK,CAAA;iBACb;gBAED,OAAO,IAAI,CAAA;YACb,CAAC,CAAC,CAAA;YAEF,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;gBACjD,QAAQ,EAAE,YAAE,CAAC,QAAQ,EAAE;gBACvB,WAAW,EAAE,IAAI,CAAC,IAAI;gBACtB,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,QAAQ;gBACR,UAAU;gBACV,cAAc;gBACd,UAAU;gBACV,cAAc;gBACd,OAAO,EAAE,gBAAgB;aAC1B,CAAC,CAAC,CAAA;QACL,CAAC;KAAA;IAEa,WAAW;;YACvB,MAAM,UAAU,GAAG,IAAA,kBAAa,GAAE,CAAA;YAClC,MAAM,WAAW,GAAG,MAAM,IAAA,qCAAc,GAAE,CAAA;YAC1C,MAAM,eAAe,GAAG,IAAA,sCAAkB,GAAE,CAAA;YAE5C,iFACK,WAAW,GACX,UAAU,GACV,eAAe,GACf,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAClD,OAAO,EAAE,IAAI,CAAC,OAAQ,IACvB;QACH,CAAC;KAAA;IAEO,aAAa;QACnB,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,gBAAS,EAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAC7F,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,gBAAS,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAErD,uCACK,OAAO,GACP,UAAU,EACd;IACH,CAAC;IAEO,iBAAiB;QACvB,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,IAAA,mBAAY,EAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QACzG,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,IAAA,mBAAY,EAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAC5G,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,mBAAY,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QACjE,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,mBAAY,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAEpE,4FAA4F;QAC5F,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,kCAAuB,EAAC,WAAW,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAA;SACxF;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;YAC7B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,kCAAuB,EAAC,YAAY,EAAE,aAAa,EAAE,sBAAsB,CAAC,CAAC,CAAA;SACxG;QAED,mEACK,UAAU,GACV,WAAW,GACX,aAAa,GACb,cAAc,EAClB;IACH,CAAC;IAEO,aAAa;QACnB,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,gBAAS,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAC1D,CAAC;IAEO,iBAAiB;QACvB,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAA,mBAAY,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAC7E,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAA,mBAAY,EAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAEhF,4FAA4F;QAC5F,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,kCAAuB,EAAC,kBAAkB,EAAE,mBAAmB,EAAE,QAAQ,CAAC,CAAC,CAAA;SACtG;QAED,uCACK,UAAU,GACV,WAAW,EACf;IACH,CAAC;IAEa,cAAc,CAAC,GAAc,EAAE,QAAiB;;YAC5D,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,6BAAkB,EAAC,QAAQ,CAAC,CAAC,CAAA;gBAE9C,OAAM;aACP;YAED,IAAI;gBACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,uBAAY,EAAC,QAAQ,CAAC,CAAC,CAAA;gBACxC,MAAM,IAAA,oBAAY,EAAC,GAAG,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE;oBACrD,OAAO,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE;wBACtB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,8BAAmB,EAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAA;oBAC9E,CAAC;oBACD,OAAO,EAAE,CAAC;iBACX,CAAC,CAAA;aACH;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,6BAAkB,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAA;gBAC9D,IAAI,KAAK,CAAC,QAAQ,EAAE;oBAClB,yBAAyB;oBACzB,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;wBACzD,uEAAuE;wBACvE,OAAM;qBACP;iBACF;gBACD,MAAM,KAAK,CAAA;aACZ;QACH,CAAC;KAAA;;AA9UH,sDA+UC;AA9Ue,2BAAK,GAAG,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,AAAxB,CAAwB;AAE7B,2BAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,eAAe;IACzB,WAAW,EAAE,iDAAiD;IAC9D,OAAO,EAAE;;;KAGR;IACD,QAAQ,EAAE;QACR,CAAC,6DAA6D,EAAE,gDAAgD,CAAC;QACjH;YACE,iGAAiG;YACjG,gGAAgG;SACjG;QACD;YACE,yFAAyF;YACzF,sFAAsF;SACvF;QACD;YACE,6FAA6F;YAC7F,wFAAwF;SACzF;QACD;YACE,sFAAsF;YACtF,qEAAqE;SACtE;QACD;YACE,wFAAwF;YACxF,uDAAuD;SACxD;QACD;YACE,+FAA+F;YAC/F,4FAA4F;SAC7F;QACD;YACE,0GAA0G;YAC1G,qHAAqH;SACtH;QACD;YACE,kFAAkF;YAClF,0DAA0D;SAC3D;KACF;CACF,CAAC,AA1CiB,CA0CjB"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { SpanTags } from '../../helpers/interfaces';
|
|
2
1
|
import { Payload } from './interfaces';
|
|
3
2
|
export declare const renderInvalidFile: (sarifReport: string, errorMessage: string) => string;
|
|
4
|
-
export declare const
|
|
3
|
+
export declare const renderMissingSpan: (errorMessage: string) => string;
|
|
4
|
+
export declare const renderFailedUpload: (sarifReport: Payload, error: any) => string;
|
|
5
5
|
export declare const renderRetriedUpload: (sarifReport: Payload, errorMessage: string, attempt: number) => string;
|
|
6
|
-
export declare const renderSuccessfulCommand: (fileCount: number, duration: number
|
|
6
|
+
export declare const renderSuccessfulCommand: (fileCount: number, duration: number) => string;
|
|
7
7
|
export declare const renderDryRunUpload: (payload: Payload) => string;
|
|
8
8
|
export declare const renderUpload: (payload: Payload) => string;
|
|
9
9
|
export declare const renderCommandInfo: (basePaths: string[], service: string, concurrency: number, dryRun: boolean, noVerify: boolean) => string;
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.renderFilesNotFound = exports.renderCommandInfo = exports.renderUpload = exports.renderDryRunUpload = exports.renderSuccessfulCommand = exports.renderRetriedUpload = exports.renderFailedUpload = exports.renderInvalidFile = void 0;
|
|
6
|
+
exports.renderFilesNotFound = exports.renderCommandInfo = exports.renderUpload = exports.renderDryRunUpload = exports.renderSuccessfulCommand = exports.renderRetriedUpload = exports.renderFailedUpload = exports.renderMissingSpan = exports.renderInvalidFile = void 0;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const chalk_1 = __importDefault(require("chalk"));
|
|
9
9
|
const utils_1 = require("../junit/utils");
|
|
@@ -22,9 +22,24 @@ const renderInvalidFile = (sarifReport, errorMessage) => {
|
|
|
22
22
|
return fullStr;
|
|
23
23
|
};
|
|
24
24
|
exports.renderInvalidFile = renderInvalidFile;
|
|
25
|
-
const
|
|
25
|
+
const renderMissingSpan = (errorMessage) => {
|
|
26
|
+
const currentPath = `[${chalk_1.default.bold.dim(process.cwd())}]`;
|
|
27
|
+
let fullStr = '';
|
|
28
|
+
fullStr += chalk_1.default.yellow(`${ICONS.WARNING} Validation failed: ${errorMessage}.\n`);
|
|
29
|
+
fullStr += chalk_1.default.yellow(`Upload attempted from ${currentPath}. Is this the directory for which this analysis was run?\n`);
|
|
30
|
+
fullStr += chalk_1.default.yellow(`The upload must come from a directory with a ".git" directory.\n`);
|
|
31
|
+
return fullStr;
|
|
32
|
+
};
|
|
33
|
+
exports.renderMissingSpan = renderMissingSpan;
|
|
34
|
+
const renderFailedUpload = (sarifReport, error) => {
|
|
35
|
+
var _a;
|
|
26
36
|
const reportPath = `[${chalk_1.default.bold.dim(sarifReport.reportPath)}]`;
|
|
27
|
-
|
|
37
|
+
let fullStr = '';
|
|
38
|
+
fullStr += chalk_1.default.red(`${ICONS.FAILED} Failed upload SARIF report file ${reportPath}: ${error.message}\n`);
|
|
39
|
+
if ((_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status) {
|
|
40
|
+
fullStr += chalk_1.default.red(`API status code: ${error.response.status}\n`);
|
|
41
|
+
}
|
|
42
|
+
return fullStr;
|
|
28
43
|
};
|
|
29
44
|
exports.renderFailedUpload = renderFailedUpload;
|
|
30
45
|
const renderRetriedUpload = (sarifReport, errorMessage, attempt) => {
|
|
@@ -32,7 +47,7 @@ const renderRetriedUpload = (sarifReport, errorMessage, attempt) => {
|
|
|
32
47
|
return chalk_1.default.yellow(`[attempt ${attempt}] Retrying SARIF report upload ${sarifReportPath}: ${errorMessage}\n`);
|
|
33
48
|
};
|
|
34
49
|
exports.renderRetriedUpload = renderRetriedUpload;
|
|
35
|
-
const renderSuccessfulCommand = (fileCount, duration
|
|
50
|
+
const renderSuccessfulCommand = (fileCount, duration) => {
|
|
36
51
|
let fullStr = '';
|
|
37
52
|
fullStr += chalk_1.default.green(`${ICONS.SUCCESS} Uploaded ${fileCount} files in ${duration} seconds.\n`);
|
|
38
53
|
fullStr += chalk_1.default.green(`${ICONS.INFO} Results available on ${(0, utils_1.getBaseUrl)()}ci/code-analysis\n`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sarif/renderer.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AAEvB,kDAAyB;
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sarif/renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,7 +52,6 @@ const api_1 = require("./api");
|
|
|
52
52
|
const sarif_schema_2_1_0_json_1 = __importDefault(require("./json-schema/sarif-schema-2.1.0.json"));
|
|
53
53
|
const renderer_1 = require("./renderer");
|
|
54
54
|
const utils_2 = require("./utils");
|
|
55
|
-
const errorCodesStopUpload = [400, 403];
|
|
56
55
|
const validateSarif = (sarifReportPath) => {
|
|
57
56
|
const ajv = new ajv_1.default({ allErrors: true });
|
|
58
57
|
(0, ajv_formats_1.default)(ajv);
|
|
@@ -110,6 +109,13 @@ class UploadSarifReportCommand extends clipanion_1.Command {
|
|
|
110
109
|
// Always using the posix version to avoid \ on Windows.
|
|
111
110
|
this.basePaths = this.basePaths.map((basePath) => path_1.default.posix.normalize(basePath));
|
|
112
111
|
const spanTags = yield (0, tags_1.getSpanTags)(this.config, this.tags);
|
|
112
|
+
// Check if we have all the mandatory git fields
|
|
113
|
+
const spanTagsKeys = Object.keys(spanTags);
|
|
114
|
+
const filteredSpanTags = spanTagsKeys.filter((key) => tags_1.mandatoryGitFields[key]);
|
|
115
|
+
if (filteredSpanTags.length !== Object.keys(tags_1.mandatoryGitFields).length) {
|
|
116
|
+
this.context.stdout.write((0, renderer_1.renderMissingSpan)('missing span tags (CI, git, or user-provided tags)'));
|
|
117
|
+
return 1;
|
|
118
|
+
}
|
|
113
119
|
const payloads = yield this.getMatchingSarifReports(spanTags);
|
|
114
120
|
if (payloads.length === 0) {
|
|
115
121
|
this.context.stdout.write((0, renderer_1.renderFilesNotFound)(this.basePaths, this.service));
|
|
@@ -120,7 +126,7 @@ class UploadSarifReportCommand extends clipanion_1.Command {
|
|
|
120
126
|
const initialTime = new Date().getTime();
|
|
121
127
|
yield (0, concurrency_1.doWithMaxConcurrency)(this.maxConcurrency, payloads, upload);
|
|
122
128
|
const totalTimeSeconds = (Date.now() - initialTime) / 1000;
|
|
123
|
-
this.context.stdout.write((0, renderer_1.renderSuccessfulCommand)(payloads.length, totalTimeSeconds
|
|
129
|
+
this.context.stdout.write((0, renderer_1.renderSuccessfulCommand)(payloads.length, totalTimeSeconds));
|
|
124
130
|
});
|
|
125
131
|
}
|
|
126
132
|
uploadSarifReport(api, sarifReport) {
|
|
@@ -139,13 +145,6 @@ class UploadSarifReportCommand extends clipanion_1.Command {
|
|
|
139
145
|
}
|
|
140
146
|
catch (error) {
|
|
141
147
|
this.context.stderr.write((0, renderer_1.renderFailedUpload)(sarifReport, error));
|
|
142
|
-
if (error.message) {
|
|
143
|
-
// If it's an axios error
|
|
144
|
-
if (!errorCodesStopUpload.includes(error.response.status)) {
|
|
145
|
-
// And a status code that should not stop the whole upload, just return
|
|
146
|
-
return;
|
|
147
|
-
}
|
|
148
|
-
}
|
|
149
148
|
throw error;
|
|
150
149
|
}
|
|
151
150
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sarif/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAmB;AACnB,gDAAuB;AAIvB,8CAAqB;AACrB,8DAAoC;AACpC,kDAAyB;AACzB,yCAAyC;AACzC,gDAAuB;AAEvB,2DAA8D;AAG9D,+CAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sarif/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/sbom/api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,+
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/sbom/api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,+CAAyF;AACzF,+CAAqD;AAErD,0CAAyC;AAEzC,2CAAwC;AAGxC,MAAM,aAAa,GAAG,QAAQ,CAAA;AAE9B;;;GAGG;AACI,MAAM,YAAY,GAAG,CAC1B,MAAc,EACd,MAAc,EAC6C,EAAE;IAC7D;;;OAGG;IACH,MAAM,iBAAiB,GAAG,CAAC,OAAkE,EAAE,EAAE,CAAC,CAChG,UAAsB,EACtB,EAAE;QACF,wCAAwC;QACxC,MAAM,OAAO,GAAG;YACd,IAAI,EAAE;gBACJ,IAAI,EAAE,aAAa;gBACnB,UAAU,EAAE,UAAU;aACvB;SACF,CAAA;QAED,OAAO,OAAO,CAAC;YACb,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;YAC7B,OAAO,EAAE;gBACP,CAAC,+BAAmB,CAAC,EAAE,mCAAuB;gBAC9C,eAAe,EAAE,YAAY;gBAC7B,uBAAuB,EAAE,OAAO;aACjC;YACD,aAAa;YACb,MAAM,EAAE,uBAAW;YACnB,GAAG,EAAE,wBAAY;SAClB,CAAC,CAAA;IACJ,CAAC,CAAA,CAAA;IAED,sBAAsB;IACtB,MAAM,GAAG,GAAG,IAAA,kBAAU,GAAE,CAAA;IACxB,0CAA0C;IAC1C,MAAM,aAAa,GAAG,IAAA,yBAAiB,EAAC,EAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC,CAAA;IAEvE,OAAO,iBAAiB,CAAC,aAAa,CAAC,CAAA;AACzC,CAAC,CAAA;AAtCY,QAAA,YAAY,gBAsCxB"}
|
|
@@ -28,6 +28,9 @@ const getLanguageFromComponent = (component) => {
|
|
|
28
28
|
if (component['purl'].includes('pkg:pypi')) {
|
|
29
29
|
return types_1.DependencyLanguage.PYTHON;
|
|
30
30
|
}
|
|
31
|
+
if (component['purl'].includes('pkg:nuget')) {
|
|
32
|
+
return types_1.DependencyLanguage.DOTNET;
|
|
33
|
+
}
|
|
31
34
|
}
|
|
32
35
|
console.debug(`language for component ${componentName} not found`);
|
|
33
36
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"language.js","sourceRoot":"","sources":["../../../src/commands/sbom/language.ts"],"names":[],"mappings":";;;AAAA,mCAA0C;AAE1C,6FAA6F;AAC7F,gDAAgD;AACzC,MAAM,wBAAwB,GAAG,CAAC,SAAc,EAAkC,EAAE;IACzF,MAAM,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;IAEvC,IAAI,SAAS,CAAC,SAAS,CAAC,EAAE;QACxB,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YAC5C,OAAO,0BAAkB,CAAC,GAAG,CAAA;SAC9B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;YAC9C,OAAO,0BAAkB,CAAC,GAAG,CAAA;SAC9B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3C,OAAO,0BAAkB,CAAC,IAAI,CAAA;SAC/B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACzC,OAAO,0BAAkB,CAAC,IAAI,CAAA;SAC/B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3C,OAAO,0BAAkB,CAAC,GAAG,CAAA;SAC9B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YAC5C,OAAO,0BAAkB,CAAC,EAAE,CAAA;SAC7B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;YAC1C,OAAO,0BAAkB,CAAC,MAAM,CAAA;SACjC;KACF;IAED,OAAO,CAAC,KAAK,CAAC,0BAA0B,aAAa,YAAY,CAAC,CAAA;IAElE,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"language.js","sourceRoot":"","sources":["../../../src/commands/sbom/language.ts"],"names":[],"mappings":";;;AAAA,mCAA0C;AAE1C,6FAA6F;AAC7F,gDAAgD;AACzC,MAAM,wBAAwB,GAAG,CAAC,SAAc,EAAkC,EAAE;IACzF,MAAM,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;IAEvC,IAAI,SAAS,CAAC,SAAS,CAAC,EAAE;QACxB,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YAC5C,OAAO,0BAAkB,CAAC,GAAG,CAAA;SAC9B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;YAC9C,OAAO,0BAAkB,CAAC,GAAG,CAAA;SAC9B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3C,OAAO,0BAAkB,CAAC,IAAI,CAAA;SAC/B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACzC,OAAO,0BAAkB,CAAC,IAAI,CAAA;SAC/B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3C,OAAO,0BAAkB,CAAC,GAAG,CAAA;SAC9B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YAC5C,OAAO,0BAAkB,CAAC,EAAE,CAAA;SAC7B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;YAC1C,OAAO,0BAAkB,CAAC,MAAM,CAAA;SACjC;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3C,OAAO,0BAAkB,CAAC,MAAM,CAAA;SACjC;KACF;IAED,OAAO,CAAC,KAAK,CAAC,0BAA0B,aAAa,YAAY,CAAC,CAAA;IAElE,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAjCY,QAAA,wBAAwB,4BAiCpC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export declare const renderInvalidFile: (sbomReport: string) => string;
|
|
2
|
+
export declare const renderInvalidPayload: (sbomReport: string) => string;
|
|
3
|
+
export declare const renderMissingSpan: (errorMessage: string) => string;
|
|
4
|
+
export declare const renderFailedUpload: (sbomReport: string, error: any) => string;
|
|
5
|
+
export declare const renderUploading: (sbomReport: string) => string;
|
|
6
|
+
export declare const renderSuccessfulCommand: (fileCount: number, duration: number) => string;
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.renderSuccessfulCommand = exports.renderUploading = exports.renderFailedUpload = exports.renderMissingSpan = exports.renderInvalidPayload = exports.renderInvalidFile = void 0;
|
|
7
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
8
|
+
const utils_1 = require("../junit/utils");
|
|
9
|
+
const ICONS = {
|
|
10
|
+
FAILED: '❌',
|
|
11
|
+
SUCCESS: '✅',
|
|
12
|
+
WARNING: '⚠️',
|
|
13
|
+
INFO: 'ℹ️',
|
|
14
|
+
};
|
|
15
|
+
const renderInvalidFile = (sbomReport) => {
|
|
16
|
+
const reportPath = `[${chalk_1.default.bold.dim(sbomReport)}]`;
|
|
17
|
+
let fullStr = '';
|
|
18
|
+
fullStr += chalk_1.default.red(`${ICONS.FAILED} Invalid SARIF report file ${reportPath}.\n`);
|
|
19
|
+
fullStr += chalk_1.default.red(`The report is not a valid SBOM or is not compliant with our json schema.\n`);
|
|
20
|
+
return fullStr;
|
|
21
|
+
};
|
|
22
|
+
exports.renderInvalidFile = renderInvalidFile;
|
|
23
|
+
const renderInvalidPayload = (sbomReport) => {
|
|
24
|
+
const reportPath = `[${chalk_1.default.bold.dim(sbomReport)}]`;
|
|
25
|
+
return chalk_1.default.red(`Cannot generate payload for file ${reportPath}.\n`);
|
|
26
|
+
};
|
|
27
|
+
exports.renderInvalidPayload = renderInvalidPayload;
|
|
28
|
+
const renderMissingSpan = (errorMessage) => {
|
|
29
|
+
const currentPath = `[${chalk_1.default.bold.dim(process.cwd())}]`;
|
|
30
|
+
let fullStr = '';
|
|
31
|
+
fullStr += chalk_1.default.yellow(`${ICONS.WARNING} Validation failed: ${errorMessage}.\n`);
|
|
32
|
+
fullStr += chalk_1.default.yellow(`Upload attempted from ${currentPath}. Is this the directory for which this analysis was run?\n`);
|
|
33
|
+
fullStr += chalk_1.default.yellow(`The upload must come from a directory with a ".git" directory.\n`);
|
|
34
|
+
return fullStr;
|
|
35
|
+
};
|
|
36
|
+
exports.renderMissingSpan = renderMissingSpan;
|
|
37
|
+
const renderFailedUpload = (sbomReport, error) => {
|
|
38
|
+
var _a;
|
|
39
|
+
const reportPath = `[${chalk_1.default.bold.dim(sbomReport)}]`;
|
|
40
|
+
let fullStr = '';
|
|
41
|
+
fullStr += chalk_1.default.red(`${ICONS.FAILED} Failed upload SBOM file ${reportPath}: ${error.message}\n`);
|
|
42
|
+
if ((_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status) {
|
|
43
|
+
fullStr += chalk_1.default.red(`API status code: ${error.response.status}\n`);
|
|
44
|
+
}
|
|
45
|
+
return fullStr;
|
|
46
|
+
};
|
|
47
|
+
exports.renderFailedUpload = renderFailedUpload;
|
|
48
|
+
const renderUploading = (sbomReport) => `Uploading SBOM report in ${sbomReport}\n`;
|
|
49
|
+
exports.renderUploading = renderUploading;
|
|
50
|
+
const renderSuccessfulCommand = (fileCount, duration) => {
|
|
51
|
+
let fullStr = '';
|
|
52
|
+
fullStr += chalk_1.default.green(`${ICONS.SUCCESS} Uploaded ${fileCount} files in ${duration} seconds.\n`);
|
|
53
|
+
fullStr += chalk_1.default.green(`${ICONS.INFO} Results available on ${(0, utils_1.getBaseUrl)()}ci/code-analysis\n`);
|
|
54
|
+
fullStr += chalk_1.default.green('=================================================================================================\n');
|
|
55
|
+
return fullStr;
|
|
56
|
+
};
|
|
57
|
+
exports.renderSuccessfulCommand = renderSuccessfulCommand;
|
|
58
|
+
//# sourceMappingURL=renderer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sbom/renderer.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AAEzB,0CAAyC;AAEzC,MAAM,KAAK,GAAG;IACZ,MAAM,EAAE,GAAG;IACX,OAAO,EAAE,GAAG;IACZ,OAAO,EAAE,IAAI;IACb,IAAI,EAAE,IAAI;CACX,CAAA;AAEM,MAAM,iBAAiB,GAAG,CAAC,UAAkB,EAAE,EAAE;IACtD,MAAM,UAAU,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAA;IAEpD,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,8BAA8B,UAAU,KAAK,CAAC,CAAA;IAClF,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,4EAA4E,CAAC,CAAA;IAElG,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AARY,QAAA,iBAAiB,qBAQ7B;AAEM,MAAM,oBAAoB,GAAG,CAAC,UAAkB,EAAE,EAAE;IACzD,MAAM,UAAU,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAA;IAEpD,OAAO,eAAK,CAAC,GAAG,CAAC,oCAAoC,UAAU,KAAK,CAAC,CAAA;AACvE,CAAC,CAAA;AAJY,QAAA,oBAAoB,wBAIhC;AAEM,MAAM,iBAAiB,GAAG,CAAC,YAAoB,EAAE,EAAE;IACxD,MAAM,WAAW,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,GAAG,CAAA;IAExD,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,OAAO,wBAAwB,YAAY,KAAK,CAAC,CAAA;IAClF,OAAO,IAAI,eAAK,CAAC,MAAM,CACrB,yBAAyB,WAAW,4DAA4D,CACjG,CAAA;IACD,OAAO,IAAI,eAAK,CAAC,MAAM,CAAC,kEAAkE,CAAC,CAAA;IAE3F,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAXY,QAAA,iBAAiB,qBAW7B;AAEM,MAAM,kBAAkB,GAAG,CAAC,UAAkB,EAAE,KAAU,EAAE,EAAE;;IACnE,MAAM,UAAU,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAA;IAEpD,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,4BAA4B,UAAU,KAAK,KAAK,CAAC,OAAO,IAAI,CAAC,CAAA;IACjG,IAAI,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,0CAAE,MAAM,EAAE;QAC3B,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,oBAAoB,KAAK,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAA;KACpE;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAVY,QAAA,kBAAkB,sBAU9B;AAEM,MAAM,eAAe,GAAG,CAAC,UAAkB,EAAU,EAAE,CAAC,4BAA4B,UAAU,IAAI,CAAA;AAA5F,QAAA,eAAe,mBAA6E;AAElG,MAAM,uBAAuB,GAAG,CAAC,SAAiB,EAAE,QAAgB,EAAE,EAAE;IAC7E,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,OAAO,aAAa,SAAS,aAAa,QAAQ,aAAa,CAAC,CAAA;IAChG,OAAO,IAAI,eAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,0BAA0B,IAAA,kBAAU,GAAE,oBAAoB,CAAC,CAAA;IAC/F,OAAO,IAAI,eAAK,CAAC,KAAK,CACpB,qGAAqG,CACtG,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AATY,QAAA,uBAAuB,2BASnC"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.DependencyLicense = exports.DependencyLanguage = void 0;
|
|
4
4
|
var DependencyLanguage;
|
|
5
5
|
(function (DependencyLanguage) {
|
|
6
|
+
DependencyLanguage["DOTNET"] = "dotnet";
|
|
6
7
|
DependencyLanguage["NPM"] = "node";
|
|
7
8
|
DependencyLanguage["PYTHON"] = "python";
|
|
8
9
|
DependencyLanguage["PHP"] = "php";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/commands/sbom/types.ts"],"names":[],"mappings":";;;AAAA,IAAY,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/commands/sbom/types.ts"],"names":[],"mappings":";;;AAAA,IAAY,kBASX;AATD,WAAY,kBAAkB;IAC5B,uCAAiB,CAAA;IACjB,kCAAY,CAAA;IACZ,uCAAiB,CAAA;IACjB,iCAAW,CAAA;IACX,mCAAa,CAAA;IACb,mCAAa,CAAA;IACb,+BAAS,CAAA;IACT,iCAAW,CAAA;AACb,CAAC,EATW,kBAAkB,kCAAlB,kBAAkB,QAS7B;AAED,uJAAuJ;AACvJ,IAAY,iBAqCX;AArCD,WAAY,iBAAiB;IAC3B,qCAAgB,CAAA;IAChB,2CAAsB,CAAA;IACtB,+CAA0B,CAAA;IAC1B,qCAAgB,CAAA;IAChB,gDAA2B,CAAA;IAC3B,gDAA2B,CAAA;IAC3B,2DAAsC,CAAA;IACtC,gDAA2B,CAAA;IAC3B,qCAAgB,CAAA;IAChB,8BAAS,CAAA;IACT,wCAAmB,CAAA;IACnB,4CAAuB,CAAA;IACvB,kDAA6B,CAAA;IAC7B,oCAAe,CAAA;IACf,uCAAkB,CAAA;IAClB,uCAAkB,CAAA;IAClB,uCAAkB,CAAA;IAClB,yCAAoB,CAAA;IACpB,yCAAoB,CAAA;IACpB,gCAAW,CAAA;IACX,uCAAkB,CAAA;IAClB,uCAAkB,CAAA;IAClB,kCAAa,CAAA;IACb,yCAAoB,CAAA;IACpB,yCAAoB,CAAA;IACpB,gCAAW,CAAA;IACX,4CAAuB,CAAA;IACvB,oCAAe,CAAA;IACf,gCAAW,CAAA;IACX,wCAAmB,CAAA;IACnB,wCAAmB,CAAA;IACnB,8CAAyB,CAAA;IACzB,wCAAmB,CAAA;IACnB,kCAAa,CAAA;IACb,4CAAuB,CAAA;IACvB,kCAAa,CAAA;AACf,CAAC,EArCW,iBAAiB,iCAAjB,iBAAiB,QAqC5B"}
|
|
@@ -15,12 +15,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.UploadSbomCommand = void 0;
|
|
16
16
|
const fs_1 = __importDefault(require("fs"));
|
|
17
17
|
const process_1 = __importDefault(require("process"));
|
|
18
|
-
const chalk_1 = __importDefault(require("chalk"));
|
|
19
18
|
const clipanion_1 = require("clipanion");
|
|
20
19
|
const tags_1 = require("../../helpers/tags");
|
|
21
|
-
const utils_1 = require("../junit/utils");
|
|
22
20
|
const api_1 = require("./api");
|
|
23
21
|
const payload_1 = require("./payload");
|
|
22
|
+
const renderer_1 = require("./renderer");
|
|
24
23
|
const validation_1 = require("./validation");
|
|
25
24
|
class UploadSbomCommand extends clipanion_1.Command {
|
|
26
25
|
constructor() {
|
|
@@ -59,48 +58,54 @@ class UploadSbomCommand extends clipanion_1.Command {
|
|
|
59
58
|
return 1;
|
|
60
59
|
}
|
|
61
60
|
if (!this.config.apiKey) {
|
|
62
|
-
this.context.stderr.write('API key not defined
|
|
61
|
+
this.context.stderr.write('API key not defined, define the environment variable DD_API_KEY.\n');
|
|
62
|
+
return 1;
|
|
63
|
+
}
|
|
64
|
+
if (!this.config.appKey) {
|
|
65
|
+
this.context.stderr.write('APP key not defined, define the environment variable DD_APP_KEY.\n');
|
|
63
66
|
return 1;
|
|
64
67
|
}
|
|
65
68
|
// Get the API helper to send the payload
|
|
66
69
|
const api = (0, api_1.getApiHelper)(this.config.apiKey, this.config.appKey);
|
|
67
70
|
const tags = yield (0, tags_1.getSpanTags)(this.config, this.tags);
|
|
71
|
+
// Check if we have all the mandatory git fields
|
|
72
|
+
const spanTagsKeys = Object.keys(tags);
|
|
73
|
+
const filteredSpanTags = spanTagsKeys.filter((key) => tags_1.mandatoryGitFields[key]);
|
|
74
|
+
if (filteredSpanTags.length !== Object.keys(tags_1.mandatoryGitFields).length) {
|
|
75
|
+
this.context.stdout.write((0, renderer_1.renderMissingSpan)('missing span tags (CI, git, or user-provided tags)'));
|
|
76
|
+
return 1;
|
|
77
|
+
}
|
|
68
78
|
const validator = (0, validation_1.getValidator)();
|
|
79
|
+
const startTimeMs = Date.now();
|
|
69
80
|
for (const basePath of this.basePaths) {
|
|
70
81
|
if (this.debug) {
|
|
71
82
|
this.context.stdout.write(`Processing file ${basePath}\n`);
|
|
72
83
|
}
|
|
73
84
|
if (!(0, validation_1.validateSbomFile)(basePath, validator, !!this.debug)) {
|
|
74
|
-
this.context.stdout.write(
|
|
85
|
+
this.context.stdout.write((0, renderer_1.renderInvalidFile)(basePath));
|
|
75
86
|
return 1;
|
|
76
87
|
}
|
|
77
|
-
const filePath = basePath;
|
|
78
88
|
const jsonContent = JSON.parse(fs_1.default.readFileSync(basePath).toString('utf8'));
|
|
79
89
|
// Upload content
|
|
80
90
|
try {
|
|
81
91
|
const scaPayload = (0, payload_1.generatePayload)(jsonContent, tags, service, environment);
|
|
82
92
|
if (!scaPayload) {
|
|
83
|
-
|
|
93
|
+
this.context.stdout.write((0, renderer_1.renderInvalidPayload)(basePath));
|
|
84
94
|
continue;
|
|
85
95
|
}
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
const endTimeMs = Date.now();
|
|
96
|
+
this.context.stdout.write((0, renderer_1.renderUploading)(basePath));
|
|
97
|
+
yield api(scaPayload);
|
|
89
98
|
if (this.debug) {
|
|
90
|
-
this.context.stdout.write(`Upload done
|
|
99
|
+
this.context.stdout.write(`Upload done for ${basePath}.\n`);
|
|
91
100
|
}
|
|
92
|
-
const apiTimeMs = endTimeMs - startTimeMs;
|
|
93
|
-
this.context.stdout.write(`File ${basePath} successfully uploaded in ${apiTimeMs} ms\n`);
|
|
94
101
|
}
|
|
95
102
|
catch (error) {
|
|
96
|
-
|
|
97
|
-
if (error.response) {
|
|
98
|
-
process_1.default.stderr.write(`API status: ${error.response.status}\n`);
|
|
99
|
-
}
|
|
103
|
+
this.context.stderr.write((0, renderer_1.renderFailedUpload)(basePath, error));
|
|
100
104
|
return 1;
|
|
101
105
|
}
|
|
102
106
|
}
|
|
103
|
-
|
|
107
|
+
const uploadTimeMs = (Date.now() - startTimeMs) / 1000;
|
|
108
|
+
this.context.stdout.write((0, renderer_1.renderSuccessfulCommand)(this.basePaths.length, uploadTimeMs));
|
|
104
109
|
return 0;
|
|
105
110
|
});
|
|
106
111
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAAmB;AACnB,sDAA6B;AAK7B,
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -162,7 +162,7 @@ const renderExecutionResult = (test, execution, baseUrl) => {
|
|
|
162
162
|
}
|
|
163
163
|
if ((0, public_1.isResultSkippedBySelectiveRerun)(execution)) {
|
|
164
164
|
const resultUrl = (0, public_1.getResultUrl)(baseUrl, test, resultId);
|
|
165
|
-
const resultInfo = ` ${setColor('
|
|
165
|
+
const resultInfo = chalk_1.default.dim(` ${setColor('◀')} Successful result from ${setColor('previous')} CI run: ${chalk_1.default.cyan(resultUrl)}`);
|
|
166
166
|
outputLines.push(resultInfo);
|
|
167
167
|
}
|
|
168
168
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/reporters/default.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"default.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/reporters/default.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { APIHelper } from './api';
|
|
2
|
-
import { MainReporter, Reporter, Result, RunTestsCommandConfig, Suite, Summary, SupportedReporter,
|
|
2
|
+
import { MainReporter, Reporter, Result, RunTestsCommandConfig, Suite, Summary, SupportedReporter, TriggerConfig, WrapperConfig } from './interfaces';
|
|
3
3
|
type ExecuteOptions = {
|
|
4
4
|
jUnitReport?: string;
|
|
5
5
|
reporters?: (SupportedReporter | Reporter)[];
|
|
@@ -10,11 +10,7 @@ export declare const executeTests: (reporter: MainReporter, config: RunTestsComm
|
|
|
10
10
|
results: Result[];
|
|
11
11
|
summary: Summary;
|
|
12
12
|
}>;
|
|
13
|
-
export declare const
|
|
14
|
-
config: UserConfigOverride;
|
|
15
|
-
id: string;
|
|
16
|
-
suite: string | undefined;
|
|
17
|
-
}[]>;
|
|
13
|
+
export declare const getTriggerConfigs: (api: APIHelper, config: RunTestsCommandConfig, reporter: MainReporter, suites?: Suite[]) => Promise<TriggerConfig[]>;
|
|
18
14
|
export declare const executeWithDetails: (runConfig: WrapperConfig, { jUnitReport, reporters, runId, suites }: ExecuteOptions) => Promise<{
|
|
19
15
|
results: Result[];
|
|
20
16
|
summary: Summary;
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.execute = exports.executeWithDetails = exports.
|
|
12
|
+
exports.execute = exports.executeWithDetails = exports.getTriggerConfigs = exports.executeTests = void 0;
|
|
13
13
|
const utils_1 = require("../../helpers/utils");
|
|
14
14
|
const api_1 = require("./api");
|
|
15
15
|
const errors_1 = require("./errors");
|
|
@@ -20,38 +20,26 @@ const tunnel_1 = require("./tunnel");
|
|
|
20
20
|
const public_1 = require("./utils/public");
|
|
21
21
|
const executeTests = (reporter, config, suites) => __awaiter(void 0, void 0, void 0, function* () {
|
|
22
22
|
const api = (0, api_1.getApiHelper)(config);
|
|
23
|
-
const publicIdsFromCli = config.publicIds.map((id) => {
|
|
24
|
-
var _a;
|
|
25
|
-
return ({
|
|
26
|
-
config: Object.assign(Object.assign({}, config.global), (((_a = config.locations) === null || _a === void 0 ? void 0 : _a.length) ? { locations: config.locations } : {})),
|
|
27
|
-
id,
|
|
28
|
-
});
|
|
29
|
-
});
|
|
30
|
-
let testsToTrigger;
|
|
31
23
|
let tunnel;
|
|
24
|
+
let triggerConfigs = [];
|
|
32
25
|
const stopTunnel = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
33
26
|
if (tunnel) {
|
|
34
27
|
yield tunnel.stop();
|
|
35
28
|
}
|
|
36
29
|
});
|
|
37
|
-
|
|
38
|
-
|
|
30
|
+
try {
|
|
31
|
+
triggerConfigs = yield (0, exports.getTriggerConfigs)(api, config, reporter, suites);
|
|
39
32
|
}
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
testsToTrigger = yield (0, exports.getTestsList)(api, config, reporter, suites);
|
|
43
|
-
}
|
|
44
|
-
catch (error) {
|
|
45
|
-
throw new errors_1.CriticalError((0, api_1.isForbiddenError)(error) ? 'AUTHORIZATION_ERROR' : 'UNAVAILABLE_TEST_CONFIG', error.message);
|
|
46
|
-
}
|
|
33
|
+
catch (error) {
|
|
34
|
+
throw new errors_1.CriticalError((0, api_1.isForbiddenError)(error) ? 'AUTHORIZATION_ERROR' : 'UNAVAILABLE_TEST_CONFIG', error.message);
|
|
47
35
|
}
|
|
48
|
-
if (
|
|
36
|
+
if (triggerConfigs.length === 0) {
|
|
49
37
|
throw new errors_1.CiError('NO_TESTS_TO_RUN');
|
|
50
38
|
}
|
|
51
39
|
let testsToTriggerResult;
|
|
52
40
|
try {
|
|
53
41
|
const triggerFromSearch = !!config.testSearchQuery;
|
|
54
|
-
testsToTriggerResult = yield (0, public_1.getTestsToTrigger)(api,
|
|
42
|
+
testsToTriggerResult = yield (0, public_1.getTestsToTrigger)(api, triggerConfigs, reporter, triggerFromSearch, config.failOnMissingTests, config.tunnel);
|
|
55
43
|
}
|
|
56
44
|
catch (error) {
|
|
57
45
|
if (error instanceof errors_1.CiError) {
|
|
@@ -98,7 +86,7 @@ const executeTests = (reporter, config, suites) => __awaiter(void 0, void 0, voi
|
|
|
98
86
|
throw new errors_1.CriticalError('TRIGGER_TESTS_FAILED', error.message);
|
|
99
87
|
}
|
|
100
88
|
try {
|
|
101
|
-
const maxPollingTimeout = Math.max(...
|
|
89
|
+
const maxPollingTimeout = Math.max(...triggerConfigs.map((t) => t.config.pollingTimeout || config.pollingTimeout));
|
|
102
90
|
const { datadogSite, failOnCriticalErrors, failOnTimeout, subdomain } = config;
|
|
103
91
|
const results = yield (0, public_1.waitForResults)(api, trigger, tests, { datadogSite, failOnCriticalErrors, failOnTimeout, subdomain, maxPollingTimeout }, reporter, tunnel);
|
|
104
92
|
return {
|
|
@@ -122,37 +110,57 @@ const getTestListBySearchQuery = (api, globalConfigOverride, testSearchQuery) =>
|
|
|
122
110
|
suite: `Query: ${testSearchQuery}`,
|
|
123
111
|
}));
|
|
124
112
|
});
|
|
125
|
-
const
|
|
126
|
-
var _a;
|
|
127
|
-
//
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
113
|
+
const getTriggerConfigs = (api, config, reporter, suites) => __awaiter(void 0, void 0, void 0, function* () {
|
|
114
|
+
var _a, _b;
|
|
115
|
+
// Grab the test config overrides from all the sources: default test config overrides, test files containing specific test config override, env variable, and cli params
|
|
116
|
+
const defaultTestConfigOverrides = config.global;
|
|
117
|
+
// TODO: Clean up locations as part of SYNTH-12989
|
|
118
|
+
const testConfigOverridesFromEnv = ((_a = config.locations) === null || _a === void 0 ? void 0 : _a.length) ? { locations: config.locations } : {};
|
|
119
|
+
const testsFromTestConfigs = yield getTestConfigs(config, reporter, suites);
|
|
120
|
+
// Grab the test defined from the search query. Their config will contain the suite name, and the search query itself.
|
|
121
|
+
const testsFromSearchQuery = config.testSearchQuery ? yield getTestsFromSearchQuery(api, config, reporter) : [];
|
|
122
|
+
// Grab the list of publicIds of tests to trigger from config file/env variable/CLI params, search query or test config files
|
|
123
|
+
const testIdsFromCli = config.publicIds;
|
|
124
|
+
const testIdsFromSearchQuery = testsFromSearchQuery.map(({ id }) => id);
|
|
125
|
+
const testIdsFromTestConfigs = testsFromTestConfigs.map(({ id }) => id);
|
|
126
|
+
// Take the list of tests from the first source that defines it, by order of precedence
|
|
127
|
+
const testIdsToTrigger = (_b = [testIdsFromCli, testIdsFromSearchQuery, testIdsFromTestConfigs].find((ids) => ids.length > 0)) !== null && _b !== void 0 ? _b : [];
|
|
128
|
+
// Create the overrides required for the list of tests to trigger
|
|
129
|
+
const triggerConfigs = testIdsToTrigger.map((id) => {
|
|
130
|
+
const testFromSearchQuery = testsFromSearchQuery.find((test) => test.id === id);
|
|
131
|
+
const testFromTestConfigs = testsFromTestConfigs.find((test) => test.id === id);
|
|
132
|
+
return Object.assign(Object.assign(Object.assign({ id }, testFromSearchQuery), testFromTestConfigs), { config: Object.assign(Object.assign(Object.assign({}, defaultTestConfigOverrides), testConfigOverridesFromEnv), testFromTestConfigs === null || testFromTestConfigs === void 0 ? void 0 : testFromTestConfigs.config) });
|
|
133
|
+
});
|
|
134
|
+
return triggerConfigs;
|
|
135
|
+
});
|
|
136
|
+
exports.getTriggerConfigs = getTriggerConfigs;
|
|
137
|
+
const getTestsFromSearchQuery = (api, config, reporter) => __awaiter(void 0, void 0, void 0, function* () {
|
|
138
|
+
const testsToTriggerBySearchQuery = yield getTestListBySearchQuery(api, config.global, config.testSearchQuery || '');
|
|
139
|
+
if (testsToTriggerBySearchQuery.length > run_tests_command_1.MAX_TESTS_TO_TRIGGER) {
|
|
140
|
+
reporter.error(`More than ${run_tests_command_1.MAX_TESTS_TO_TRIGGER} tests returned by search query, only the first ${run_tests_command_1.MAX_TESTS_TO_TRIGGER} will be fetched.\n`);
|
|
141
|
+
}
|
|
142
|
+
if (testsToTriggerBySearchQuery.length === 0) {
|
|
143
|
+
throw new errors_1.CiError('NO_TESTS_TO_RUN');
|
|
134
144
|
}
|
|
145
|
+
return testsToTriggerBySearchQuery;
|
|
146
|
+
});
|
|
147
|
+
const getTestConfigs = (config, reporter, suites = []) => __awaiter(void 0, void 0, void 0, function* () {
|
|
135
148
|
const suitesFromFiles = (yield Promise.all(config.files.map((glob) => (0, public_1.getSuites)(glob, reporter))))
|
|
136
149
|
.reduce((acc, val) => acc.concat(val), [])
|
|
137
150
|
.filter((suite) => !!suite.content.tests);
|
|
138
151
|
suites.push(...suitesFromFiles);
|
|
139
|
-
const
|
|
140
|
-
const overrideTestConfig = (test) =>
|
|
141
|
-
// {} < global < ENV < test file
|
|
142
|
-
(Object.assign(Object.assign(Object.assign({}, config.global), configFromEnvironment), test.config));
|
|
143
|
-
const testsToTrigger = suites
|
|
152
|
+
const testConfigs = suites
|
|
144
153
|
.map((suite) => suite.content.tests.map((test) => {
|
|
145
154
|
var _a;
|
|
146
155
|
return ({
|
|
147
|
-
config:
|
|
156
|
+
config: test.config,
|
|
148
157
|
id: (_a = (0, public_1.normalizePublicId)(test.id)) !== null && _a !== void 0 ? _a : '',
|
|
149
158
|
suite: suite.name,
|
|
150
159
|
});
|
|
151
160
|
}))
|
|
152
161
|
.reduce((acc, suiteTests) => acc.concat(suiteTests), []);
|
|
153
|
-
return
|
|
162
|
+
return testConfigs;
|
|
154
163
|
});
|
|
155
|
-
exports.getTestsList = getTestsList;
|
|
156
164
|
const executeWithDetails = (runConfig, { jUnitReport, reporters, runId, suites }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
157
165
|
const startTime = Date.now();
|
|
158
166
|
const localConfig = Object.assign(Object.assign({}, run_tests_command_1.DEFAULT_COMMAND_CONFIG), runConfig);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-tests-lib.js","sourceRoot":"","sources":["../../../src/commands/synthetics/run-tests-lib.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAiD;AAEjD,+BAA+D;AAC/D,qCAA+C;AAgB/C,iDAAsE;AACtE,6CAA+C;AAC/C,2DAAgF;AAChF,qCAA+B;AAC/B,2CAauB;AAShB,MAAM,YAAY,GAAG,CAC1B,QAAsB,EACtB,MAA6B,EAC7B,MAAgB,EAIf,EAAE;IACH,MAAM,GAAG,GAAG,IAAA,kBAAY,EAAC,MAAM,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"run-tests-lib.js","sourceRoot":"","sources":["../../../src/commands/synthetics/run-tests-lib.ts"],"names":[],"mappings":"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"}
|
package/dist/helpers/tags.d.ts
CHANGED
|
@@ -38,6 +38,11 @@ export declare const parseTags: (tags: string[]) => {};
|
|
|
38
38
|
* and returns an object of the form {key: 123, key2: 321}
|
|
39
39
|
*/
|
|
40
40
|
export declare const parseMetrics: (tags: string[]) => {};
|
|
41
|
+
/**
|
|
42
|
+
* The repository URL is mandatory in processing for the following commands: sarif and sbom.
|
|
43
|
+
* Note: for sarif uploads, this will fail silent on the backend.
|
|
44
|
+
*/
|
|
45
|
+
export declare const mandatoryGitFields: Record<string, boolean>;
|
|
41
46
|
/**
|
|
42
47
|
* Get the tags to upload results in CI for the following commands: sarif and sbom.
|
|
43
48
|
* @param config - the configuration of the CLI
|
package/dist/helpers/tags.js
CHANGED
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.getSpanTags = exports.parseMetrics = exports.parseTags = exports.SERVICE = exports.SPAN_TYPE = exports.GIT_TAG = exports.GIT_SHA = exports.GIT_COMMIT_MESSAGE = exports.GIT_COMMIT_COMMITTER_NAME = exports.GIT_COMMIT_COMMITTER_EMAIL = exports.GIT_COMMIT_COMMITTER_DATE = exports.GIT_COMMIT_AUTHOR_NAME = exports.GIT_COMMIT_AUTHOR_EMAIL = exports.GIT_COMMIT_AUTHOR_DATE = exports.GIT_BRANCH = exports.CI_NODE_LABELS = exports.CI_NODE_NAME = exports.CI_ENV_VARS = exports.CI_BUILD_LEVEL = exports.CI_LEVEL = exports.CI_STAGE_NAME = exports.CI_JOB_NAME = exports.CI_JOB_URL = exports.GIT_REPOSITORY_URL = exports.CI_WORKSPACE_PATH = exports.CI_PIPELINE_NUMBER = exports.CI_PIPELINE_NAME = exports.CI_PIPELINE_ID = exports.CI_PROVIDER_NAME = exports.CI_PIPELINE_URL = void 0;
|
|
12
|
+
exports.getSpanTags = exports.mandatoryGitFields = exports.parseMetrics = exports.parseTags = exports.SERVICE = exports.SPAN_TYPE = exports.GIT_TAG = exports.GIT_SHA = exports.GIT_COMMIT_MESSAGE = exports.GIT_COMMIT_COMMITTER_NAME = exports.GIT_COMMIT_COMMITTER_EMAIL = exports.GIT_COMMIT_COMMITTER_DATE = exports.GIT_COMMIT_AUTHOR_NAME = exports.GIT_COMMIT_AUTHOR_EMAIL = exports.GIT_COMMIT_AUTHOR_DATE = exports.GIT_BRANCH = exports.CI_NODE_LABELS = exports.CI_NODE_NAME = exports.CI_ENV_VARS = exports.CI_BUILD_LEVEL = exports.CI_LEVEL = exports.CI_STAGE_NAME = exports.CI_JOB_NAME = exports.CI_JOB_URL = exports.GIT_REPOSITORY_URL = exports.CI_WORKSPACE_PATH = exports.CI_PIPELINE_NUMBER = exports.CI_PIPELINE_NAME = exports.CI_PIPELINE_ID = exports.CI_PROVIDER_NAME = exports.CI_PIPELINE_URL = void 0;
|
|
13
13
|
// Build
|
|
14
14
|
const ci_1 = require("./ci");
|
|
15
15
|
const format_git_span_data_1 = require("./git/format-git-span-data");
|
|
@@ -97,6 +97,13 @@ const parseMetrics = (tags) => {
|
|
|
97
97
|
}
|
|
98
98
|
};
|
|
99
99
|
exports.parseMetrics = parseMetrics;
|
|
100
|
+
/**
|
|
101
|
+
* The repository URL is mandatory in processing for the following commands: sarif and sbom.
|
|
102
|
+
* Note: for sarif uploads, this will fail silent on the backend.
|
|
103
|
+
*/
|
|
104
|
+
exports.mandatoryGitFields = {
|
|
105
|
+
[exports.GIT_REPOSITORY_URL]: true,
|
|
106
|
+
};
|
|
100
107
|
/**
|
|
101
108
|
* Get the tags to upload results in CI for the following commands: sarif and sbom.
|
|
102
109
|
* @param config - the configuration of the CLI
|
package/dist/helpers/tags.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tags.js","sourceRoot":"","sources":["../../src/helpers/tags.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tags.js","sourceRoot":"","sources":["../../src/helpers/tags.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@datadog/datadog-ci",
|
|
3
|
-
"version": "2.32.
|
|
3
|
+
"version": "2.32.1",
|
|
4
4
|
"description": "Run datadog actions from the CI.",
|
|
5
5
|
"repository": "https://github.com/DataDog/datadog-ci",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -79,7 +79,7 @@
|
|
|
79
79
|
"ajv": "^8.12.0",
|
|
80
80
|
"ajv-formats": "^2.1.1",
|
|
81
81
|
"async-retry": "1.3.1",
|
|
82
|
-
"axios": "^1.6.
|
|
82
|
+
"axios": "^1.6.8",
|
|
83
83
|
"chalk": "3.0.0",
|
|
84
84
|
"clipanion": "^3.2.1",
|
|
85
85
|
"datadog-metrics": "0.9.3",
|