@datadog/datadog-ci 2.32.0 → 2.32.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/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/git-metadata/api.js +1 -1
- package/dist/commands/git-metadata/api.js.map +1 -1
- package/dist/commands/git-metadata/upload.js +1 -1
- package/dist/commands/git-metadata/upload.js.map +1 -1
- package/dist/commands/junit/upload.js +4 -1
- package/dist/commands/junit/upload.js.map +1 -1
- package/dist/commands/react-native/xcode.d.ts +1 -0
- package/dist/commands/react-native/xcode.js +38 -5
- package/dist/commands/react-native/xcode.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 +4 -1
- package/dist/commands/sbom/language.js.map +1 -1
- package/dist/commands/sbom/license.js +0 -4
- package/dist/commands/sbom/license.js.map +1 -1
- package/dist/commands/sbom/payload.js +76 -0
- package/dist/commands/sbom/payload.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 +24 -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/api.d.ts +9 -3
- package/dist/commands/synthetics/api.js +28 -17
- package/dist/commands/synthetics/api.js.map +1 -1
- package/dist/commands/synthetics/batch.d.ts +3 -0
- package/dist/commands/synthetics/batch.js +172 -0
- package/dist/commands/synthetics/batch.js.map +1 -0
- package/dist/commands/synthetics/interfaces.d.ts +6 -6
- package/dist/commands/synthetics/reporters/default.d.ts +2 -2
- 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/commands/synthetics/utils/public.js +8 -130
- package/dist/commands/synthetics/utils/public.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
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getBaseIntakeUrl = exports.apiHost = exports.datadogSite = void 0;
|
|
4
|
-
exports.datadogSite = process.env.DATADOG_SITE || 'datadoghq.com';
|
|
4
|
+
exports.datadogSite = process.env.DATADOG_SITE || process.env.DD_SITE || 'datadoghq.com';
|
|
5
5
|
exports.apiHost = 'api.' + exports.datadogSite;
|
|
6
6
|
const getBaseIntakeUrl = () => {
|
|
7
7
|
if (process.env.DATADOG_SOURCEMAP_INTAKE_URL) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/api.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/api.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,eAAe,CAAA;AAEhF,QAAA,OAAO,GAAG,MAAM,GAAG,mBAAW,CAAA;AAEpC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,IAAI,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE;QAC5C,OAAO,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAA;KAChD;IAED,OAAO,2BAA2B,GAAG,mBAAW,CAAA;AAClD,CAAC,CAAA;AANY,QAAA,gBAAgB,oBAM5B"}
|
|
@@ -70,7 +70,7 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
70
70
|
this.logger.warn('Option --git-sync is deprecated as it is now the default behavior');
|
|
71
71
|
}
|
|
72
72
|
const metricsLogger = (0, metrics_1.getMetricsLogger)({
|
|
73
|
-
datadogSite: process.env.DATADOG_SITE,
|
|
73
|
+
datadogSite: process.env.DATADOG_SITE || process.env.DD_SITE,
|
|
74
74
|
defaultTags: [`cli_version:${this.cliVersion}`],
|
|
75
75
|
prefix: 'datadog.ci.report_commits.',
|
|
76
76
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAyB;AACzB,yCAAyC;AAEzC,+CAAgD;AAChD,iDAAwE;AACxE,iDAA8D;AAC9D,yDAA8C;AAE9C,iDAAqD;AACrD,mDAAqE;AACrE,iDAAiD;AACjD,+CAAqE;AACrE,mDAA6C;AAE7C,+BAA4D;AAC5D,+BAAiD;AACjD,mCAAqC;AAErC,uCAA0C;AAC1C,yCAOmB;AAEnB,MAAa,aAAc,SAAQ,mBAAO;IAA1C;;;QAeU,kBAAa,GAAG,kBAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAA;QACjD,WAAM,GAAG,kBAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;QAC3C,YAAO,GAAG,kBAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;QAC5C,YAAO,GAAG,kBAAM,CAAC,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC,CAAA;QAC7C,cAAS,GAAG,kBAAM,CAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;QACjD,cAAS,GAAG,kBAAM,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,CAAC,CAAA;QAE5C,eAAU,GAAG,iBAAO,CAAA;QACpB,WAAM,GAAG;YACf,MAAM,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,eAAe,mCAAI,OAAO,CAAC,GAAG,CAAC,UAAU;SAC9D,CAAA;QAEO,WAAM,GAAW,IAAI,eAAM,CAAC,CAAC,CAAS,EAAE,EAAE;YAChD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAC9B,CAAC,EAAE,iBAAQ,CAAC,IAAI,CAAC,CAAA;IAwKnB,CAAC;IAtKc,OAAO;;YAClB,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YAC9B,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,IAAI,CAAC,MAAM,GAAG,IAAI,eAAM,CAAC,CAAC,CAAS,EAAE,EAAE;oBACrC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;gBAC9B,CAAC,EAAE,iBAAQ,CAAC,KAAK,CAAC,CAAA;aACnB;YACD,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,8BAAmB,GAAE,CAAC,CAAA;aACxC;YAED,IAAI,IAAI,CAAC,SAAS,EAAE;gBAClB,qBAAqB;gBACrB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;aAC9B;YAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,IAAA,mCAAwB,EACtB,IAAI,kCAAyB,CAAC,WAAW,eAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,CAC9F,CACF,CAAA;gBAED,OAAO,CAAC,CAAA;aACT;YAED,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mEAAmE,CAAC,CAAA;aACtF;YAED,MAAM,aAAa,GAAG,IAAA,0BAAgB,EAAC;gBACrC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAyB;AACzB,yCAAyC;AAEzC,+CAAgD;AAChD,iDAAwE;AACxE,iDAA8D;AAC9D,yDAA8C;AAE9C,iDAAqD;AACrD,mDAAqE;AACrE,iDAAiD;AACjD,+CAAqE;AACrE,mDAA6C;AAE7C,+BAA4D;AAC5D,+BAAiD;AACjD,mCAAqC;AAErC,uCAA0C;AAC1C,yCAOmB;AAEnB,MAAa,aAAc,SAAQ,mBAAO;IAA1C;;;QAeU,kBAAa,GAAG,kBAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAA;QACjD,WAAM,GAAG,kBAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;QAC3C,YAAO,GAAG,kBAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;QAC5C,YAAO,GAAG,kBAAM,CAAC,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC,CAAA;QAC7C,cAAS,GAAG,kBAAM,CAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;QACjD,cAAS,GAAG,kBAAM,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,CAAC,CAAA;QAE5C,eAAU,GAAG,iBAAO,CAAA;QACpB,WAAM,GAAG;YACf,MAAM,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,eAAe,mCAAI,OAAO,CAAC,GAAG,CAAC,UAAU;SAC9D,CAAA;QAEO,WAAM,GAAW,IAAI,eAAM,CAAC,CAAC,CAAS,EAAE,EAAE;YAChD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAC9B,CAAC,EAAE,iBAAQ,CAAC,IAAI,CAAC,CAAA;IAwKnB,CAAC;IAtKc,OAAO;;YAClB,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YAC9B,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,IAAI,CAAC,MAAM,GAAG,IAAI,eAAM,CAAC,CAAC,CAAS,EAAE,EAAE;oBACrC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;gBAC9B,CAAC,EAAE,iBAAQ,CAAC,KAAK,CAAC,CAAA;aACnB;YACD,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,8BAAmB,GAAE,CAAC,CAAA;aACxC;YAED,IAAI,IAAI,CAAC,SAAS,EAAE;gBAClB,qBAAqB;gBACrB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;aAC9B;YAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,IAAA,mCAAwB,EACtB,IAAI,kCAAyB,CAAC,WAAW,eAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,CAC9F,CACF,CAAA;gBAED,OAAO,CAAC,CAAA;aACT;YAED,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mEAAmE,CAAC,CAAA;aACtF;YAED,MAAM,aAAa,GAAG,IAAA,0BAAgB,EAAC;gBACrC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO;gBAC5D,WAAW,EAAE,CAAC,eAAe,IAAI,CAAC,UAAU,EAAE,CAAC;gBAC/C,MAAM,EAAE,4BAA4B;aACrC,CAAC,CAAA;YACF,MAAM,eAAe,GAAG,IAAA,2BAAkB,EAAC;gBACzC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM;gBAC1B,WAAW,EAAX,iBAAW;gBACX,aAAa,EAAE,aAAa,CAAC,MAAM;aACpC,CAAC,CAAA;YAEF,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YACvE,MAAM,oBAAoB,GAAG,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YAE7E,IAAI,OAAO,GAAG,KAAK,CAAA;YACnB,IAAI;gBACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAA;gBACtD,MAAM,OAAO,GAAG,MAAM,IAAA,sBAAc,EAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBACxE,cAAc,EAAE,oBAAoB;oBACpC,eAAe;oBACf,aAAa;iBACd,CAAC,CAAA;gBACF,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC,CAAC,CAAA;gBAChD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,0CAA0C,OAAO,WAAW,CAAC,CAAA;aAChH;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,GAAG,EAAE,CAAC,CAAA;gBAC3D,OAAO,GAAG,IAAI,CAAA;aACf;YAED,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;gBACnB,IAAI;oBACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;oBACpC,MAAM,OAAO,GAAG,MAAM,IAAA,sBAAc,EAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;wBAClE,cAAc,EAAE,iBAAiB;qBAClC,CAAC,CAAA;oBACF,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,EAAE,CAAC,CAAC,CAAA;oBAClD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,iCAAiC,OAAO,WAAW,CAAC,CAAA;iBACvG;gBAAC,OAAO,GAAG,EAAE;oBACZ,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE;wBAC1B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6BAA6B,GAAG,EAAE,CAAC,CAAA;qBACrD;yBAAM;wBACL,yEAAyE;wBACzE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAA;qBAChE;iBACF;aACF;YAED,IAAI;gBACF,MAAM,aAAa,CAAC,KAAK,EAAE,CAAA;aAC5B;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC,CAAA;aACjC;YACD,IAAI,OAAO,EAAE;gBACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAA;gBAEzE,OAAO,CAAC,CAAA;aACT;YACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,kCAAuB,EAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC,GAAG,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;YAEzF,OAAO,CAAC,CAAA;QACV,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,aAAa,CAAC,CAAA;QAC9G,CAAC;KAAA;IAEa,mBAAmB,CAAC,IAIjC;;YACC,MAAM,eAAe,GAAG,GAAS,EAAE;gBACjC,IAAI;oBACF,OAAO,MAAM,IAAA,mBAAa,EAAC,MAAM,IAAA,kBAAY,GAAE,EAAE,IAAI,CAAC,aAAa,CAAC,CAAA;iBACrE;gBAAC,OAAO,CAAC,EAAE;oBACV,IAAI,CAAC,YAAY,KAAK,EAAE;wBACtB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,6BAAkB,EAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;qBACjD;oBACD,MAAM,CAAC,CAAA;iBACR;YACH,CAAC,CAAA,CAAA;YAED,MAAM,WAAW,GAAG,CAAO,MAAkB,EAAE,EAAE;gBAC/C,IAAI,MAAM,CAAA;gBACV,IAAI,IAAI,CAAC,MAAM,EAAE;oBACf,MAAM,GAAG,qBAAY,CAAC,OAAO,CAAA;iBAC9B;qBAAM;oBACL,MAAM,GAAG,MAAM,IAAA,0BAAgB,EAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,EAAE;wBAC5E,eAAe,EAAE,IAAI,CAAC,eAAe;wBACrC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;4BACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,6BAAkB,EAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;4BAChD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,CAAC,CAAA;wBACtD,CAAC;wBACD,OAAO,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE;4BACtB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,8BAAmB,EAAC,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAA;4BACzD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC,CAAC,CAAA;wBACvD,CAAC;wBACD,QAAQ,EAAE,GAAG,EAAE;4BACb,OAAM;wBACR,CAAC;wBACD,OAAO,EAAE,CAAC;qBACX,CAAC,CAAA;iBACH;gBACD,IAAI,MAAM,KAAK,qBAAY,CAAC,OAAO,EAAE;oBACnC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,kBAAK,CAAC,MAAM,sCAAsC,CAAC,CAAA;oBACxE,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAA;iBACvD;YACH,CAAC,CAAA,CAAA;YAED,MAAM,OAAO,GAAG,MAAM,eAAe,EAAE,CAAA;YACvC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,4BAAiB,EAAC,OAAO,CAAC,CAAC,CAAA;YAC5C,MAAM,WAAW,CAAC,OAAO,CAAC,CAAA;QAC5B,CAAC;KAAA;IAEO,uBAAuB,CAAC,MAAc;QAC5C,OAAO,IAAA,yBAAiB,EAAC;YACvB,MAAM;YACN,OAAO,EAAE,IAAA,sBAAgB,GAAE;YAC3B,OAAO,EAAE,IAAI,GAAG,CAAC;gBACf,CAAC,eAAe,EAAE,yBAAyB,CAAC;gBAC5C,CAAC,uBAAuB,EAAE,IAAI,CAAC,UAAU,CAAC;aAC3C,CAAC;YACF,WAAW,EAAE,eAAe;SAC7B,CAAC,CAAA;IACJ,CAAC;IAEO,oBAAoB,CAAC,MAAc;QACzC,OAAO,IAAA,yBAAiB,EAAC;YACvB,MAAM;YACN,OAAO,EAAE,UAAU,GAAG,aAAO;SAC9B,CAAC,CAAA;IACJ,CAAC;IAEO,cAAc;QACpB,OAAO,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,4BAAgB,CAAA;IACtD,CAAC;;AApMH,sCAqMC;AApMe,mBAAK,GAAG,CAAC,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC,AAA/B,CAA+B;AAEpC,mBAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,yBAAyB;IACnC,WAAW,EAAE,+CAA+C;IAC5D,OAAO,EAAE;;;;;KAKR;IACD,QAAQ,EAAE,CAAC,CAAC,mCAAmC,EAAE,kCAAkC,CAAC,CAAC;CACtF,CAAC,AAViB,CAUjB"}
|
|
@@ -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":"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"}
|
|
@@ -235,7 +235,36 @@ class XCodeCommand extends clipanion_1.Command {
|
|
|
235
235
|
const podfileLockContent = (0, fs_1.readFileSync)(podfileLockPath).toString();
|
|
236
236
|
return !!podfileLockContent.match('hermes-engine');
|
|
237
237
|
};
|
|
238
|
-
this.shouldUploadSourcemaps = () =>
|
|
238
|
+
this.shouldUploadSourcemaps = () => {
|
|
239
|
+
var _a;
|
|
240
|
+
// If we did not bundle the RN code, we won't have anything to upload.
|
|
241
|
+
if (!this.shouldBundleRNCode()) {
|
|
242
|
+
return false;
|
|
243
|
+
}
|
|
244
|
+
if (this.force) {
|
|
245
|
+
return true;
|
|
246
|
+
}
|
|
247
|
+
// We don't upload sourcemaps if the configuration is "Debug"
|
|
248
|
+
return !((_a = process.env.CONFIGURATION) === null || _a === void 0 ? void 0 : _a.includes('Debug'));
|
|
249
|
+
};
|
|
250
|
+
this.shouldBundleRNCode = () => {
|
|
251
|
+
var _a, _b;
|
|
252
|
+
if (this.force) {
|
|
253
|
+
return true;
|
|
254
|
+
}
|
|
255
|
+
// We keep the same logic and order than react-native-xcode.sh script from RN.
|
|
256
|
+
if (!!process.env.SKIP_BUNDLING) {
|
|
257
|
+
return false;
|
|
258
|
+
}
|
|
259
|
+
if ((_a = process.env.CONFIGURATION) === null || _a === void 0 ? void 0 : _a.includes('Debug')) {
|
|
260
|
+
// We don't build for simulators in debug mode but we do for real devices.
|
|
261
|
+
// See https://github.com/DataDog/expo-datadog/issues/31
|
|
262
|
+
if ((_b = process.env.PLATFORM_NAME) === null || _b === void 0 ? void 0 : _b.includes('simulator')) {
|
|
263
|
+
return !!process.env.FORCE_BUNDLING;
|
|
264
|
+
}
|
|
265
|
+
}
|
|
266
|
+
return true;
|
|
267
|
+
};
|
|
239
268
|
}
|
|
240
269
|
execute() {
|
|
241
270
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -273,13 +302,17 @@ class XCodeCommand extends clipanion_1.Command {
|
|
|
273
302
|
if (releaseVersion === null || buildVersion === null) {
|
|
274
303
|
return 1;
|
|
275
304
|
}
|
|
276
|
-
if (!this.shouldUploadSourcemaps()) {
|
|
277
|
-
this.context.stdout.write(`Build configuration ${process.env.CONFIGURATION} is not Release, skipping sourcemaps upload`);
|
|
278
|
-
return 0;
|
|
279
|
-
}
|
|
280
305
|
// Run bundle script
|
|
281
306
|
try {
|
|
307
|
+
if (!this.shouldBundleRNCode()) {
|
|
308
|
+
this.context.stdout.write(`Skipping bundling and sourcemaps upload.`);
|
|
309
|
+
return 0;
|
|
310
|
+
}
|
|
282
311
|
yield this.bundleReactNativeCodeAndImages();
|
|
312
|
+
if (!this.shouldUploadSourcemaps()) {
|
|
313
|
+
this.context.stdout.write(`Build configuration ${process.env.CONFIGURATION} is not Release, skipping sourcemaps upload.`);
|
|
314
|
+
return 0;
|
|
315
|
+
}
|
|
283
316
|
/**
|
|
284
317
|
* Because of a bug in React Native (https://github.com/facebook/react-native/issues/34212), the composition
|
|
285
318
|
* of the 2 Hermes sourcemaps is not done correctly. Therefore we need to do the composition ourselves to
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xcode.js","sourceRoot":"","sources":["../../../src/commands/react-native/xcode.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"xcode.js","sourceRoot":"","sources":["../../../src/commands/react-native/xcode.ts"],"names":[],"mappings":"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"}
|
|
@@ -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"}
|
|
@@ -7,7 +7,7 @@ const types_1 = require("./types");
|
|
|
7
7
|
const getLanguageFromComponent = (component) => {
|
|
8
8
|
const componentName = component['name'];
|
|
9
9
|
if (component['bom-ref']) {
|
|
10
|
-
if (component['bom-ref'].includes('pkg:npm')) {
|
|
10
|
+
if (component['bom-ref'].includes('pkg:npm') || component['purl'].includes('pkg:npm')) {
|
|
11
11
|
return types_1.DependencyLanguage.NPM;
|
|
12
12
|
}
|
|
13
13
|
if (component['purl'].includes('pkg:composer')) {
|
|
@@ -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;
|
|
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,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACrF,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"}
|
|
@@ -87,7 +87,6 @@ exports.getLicensesFromString = getLicensesFromString;
|
|
|
87
87
|
const getLicensesFromComponent = (component) => {
|
|
88
88
|
var _a;
|
|
89
89
|
const elementsForLicense = ['id', 'name'];
|
|
90
|
-
const componentName = component['name'];
|
|
91
90
|
const licensesSet = new Set();
|
|
92
91
|
// Get the "licenses" attribute of the SBOM component.
|
|
93
92
|
if (component['licenses']) {
|
|
@@ -108,9 +107,6 @@ const getLicensesFromComponent = (component) => {
|
|
|
108
107
|
}
|
|
109
108
|
}
|
|
110
109
|
}
|
|
111
|
-
if (licensesSet.size === 0) {
|
|
112
|
-
console.log(`license for component ${componentName} not found`);
|
|
113
|
-
}
|
|
114
110
|
return Array.from(licensesSet);
|
|
115
111
|
};
|
|
116
112
|
exports.getLicensesFromComponent = getLicensesFromComponent;
|