@datadog/datadog-ci 2.32.2 → 2.33.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/deployment/mark.js +2 -0
- package/dist/commands/deployment/mark.js.map +1 -1
- package/dist/commands/dora/renderer.js +1 -1
- package/dist/commands/dora/renderer.js.map +1 -1
- package/dist/commands/git-metadata/upload.js +3 -2
- package/dist/commands/git-metadata/upload.js.map +1 -1
- package/dist/commands/lambda/constants.d.ts +2 -0
- package/dist/commands/lambda/constants.js +5 -0
- package/dist/commands/lambda/constants.js.map +1 -1
- package/dist/commands/lambda/functions/commons.d.ts +2 -2
- package/dist/commands/lambda/functions/commons.js.map +1 -1
- package/dist/commands/sarif/renderer.d.ts +1 -1
- package/dist/commands/sarif/renderer.js +3 -2
- package/dist/commands/sarif/renderer.js.map +1 -1
- package/dist/commands/sarif/upload.js +3 -1
- package/dist/commands/sarif/upload.js.map +1 -1
- package/dist/commands/sbom/renderer.d.ts +1 -0
- package/dist/commands/sbom/renderer.js +11 -2
- package/dist/commands/sbom/renderer.js.map +1 -1
- package/dist/commands/sbom/upload.js +9 -0
- package/dist/commands/sbom/upload.js.map +1 -1
- package/dist/commands/synthetics/batch.d.ts +2 -2
- package/dist/commands/synthetics/batch.js +36 -19
- package/dist/commands/synthetics/batch.js.map +1 -1
- package/dist/commands/synthetics/errors.d.ts +8 -1
- package/dist/commands/synthetics/errors.js +14 -1
- package/dist/commands/synthetics/errors.js.map +1 -1
- package/dist/commands/synthetics/interfaces.d.ts +1 -1
- package/dist/commands/synthetics/reporters/default.d.ts +1 -1
- package/dist/commands/synthetics/reporters/default.js +12 -10
- package/dist/commands/synthetics/reporters/default.js.map +1 -1
- package/dist/commands/synthetics/reporters/junit.d.ts +1 -1
- package/dist/commands/synthetics/reporters/junit.js +4 -4
- package/dist/commands/synthetics/reporters/junit.js.map +1 -1
- package/dist/commands/synthetics/run-tests-lib.js +8 -39
- package/dist/commands/synthetics/run-tests-lib.js.map +1 -1
- package/dist/commands/synthetics/test.d.ts +14 -0
- package/dist/commands/synthetics/test.js +66 -0
- package/dist/commands/synthetics/test.js.map +1 -0
- package/dist/commands/synthetics/utils/public.d.ts +1 -1
- package/dist/commands/synthetics/utils/public.js +17 -26
- package/dist/commands/synthetics/utils/public.js.map +1 -1
- package/dist/commands/tag/tag.d.ts +2 -0
- package/dist/commands/tag/tag.js +12 -0
- package/dist/commands/tag/tag.js.map +1 -1
- package/package.json +9 -7
|
@@ -39,10 +39,12 @@ class DeploymentMarkCommand extends clipanion_1.Command {
|
|
|
39
39
|
tagJobCommand.setLevel('job');
|
|
40
40
|
tagJobCommand.setTags(this.createJobDeploymentTags());
|
|
41
41
|
tagJobCommand.context = this.context;
|
|
42
|
+
tagJobCommand.setSilent(false);
|
|
42
43
|
const tagPipelineCommand = new tag_1.TagCommand();
|
|
43
44
|
tagPipelineCommand.setLevel('pipeline');
|
|
44
45
|
tagPipelineCommand.setTags(this.createPipelineDeploymentTags());
|
|
45
46
|
tagPipelineCommand.context = this.context;
|
|
47
|
+
tagPipelineCommand.setSilent(true);
|
|
46
48
|
if (this.noFail) {
|
|
47
49
|
tagJobCommand.setNoFail(true);
|
|
48
50
|
tagPipelineCommand.setNoFail(true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mark.js","sourceRoot":"","sources":["../../../src/commands/deployment/mark.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,oCAAqC;AAErC,2CAQoB;AAEpB;;;GAGG;AACH,MAAa,qBAAsB,SAAQ,mBAAO;IAAlD;;QAsBU,WAAM,GAAG,kBAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;QAC3C,eAAU,GAAG,kBAAM,CAAC,OAAO,CAAC,eAAe,EAAE,KAAK,CAAC,CAAA;QACnD,QAAG,GAAG,kBAAM,CAAC,MAAM,CAAC,OAAO,EAAE;YACnC,WAAW,EAAE,eAAe;SAC7B,CAAC,CAAA;QACM,aAAQ,GAAG,kBAAM,CAAC,MAAM,CAAC,YAAY,EAAE;YAC7C,WAAW,EAAE,gBAAgB;SAC9B,CAAC,CAAA;QACM,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,WAAW,EAAE;YAC3C,WAAW,EAAE,0BAA0B;SACxC,CAAC,CAAA;QACM,SAAI,GAAG,kBAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"mark.js","sourceRoot":"","sources":["../../../src/commands/deployment/mark.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ const renderFailedRequest = (service, error) => `${ICONS.FAILED} Failed to send
|
|
|
11
11
|
exports.renderFailedRequest = renderFailedRequest;
|
|
12
12
|
const renderRetriedRequest = (service, error, attempt) => `[attempt ${attempt}] Retrying to send DORA deployment event for service: ${service}: ${error.message}`;
|
|
13
13
|
exports.renderRetriedRequest = renderRetriedRequest;
|
|
14
|
-
const renderSuccessfulRequest = (service) => `${ICONS.SUCCESS}
|
|
14
|
+
const renderSuccessfulRequest = (service) => `${ICONS.SUCCESS} Successfully sent DORA deployment event for service: ${service}`;
|
|
15
15
|
exports.renderSuccessfulRequest = renderSuccessfulRequest;
|
|
16
16
|
const renderDryRun = (deployment) => `[DRYRUN] ${(0, exports.renderRequest)(deployment.service)}\n data: ` + JSON.stringify(deployment, undefined, 2);
|
|
17
17
|
exports.renderDryRun = renderDryRun;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/dora/renderer.ts"],"names":[],"mappings":";;;AAIA,MAAM,KAAK,GAAG;IACZ,MAAM,EAAE,GAAG;IACX,OAAO,EAAE,GAAG;IACZ,OAAO,EAAE,IAAI;CACd,CAAA;AAEM,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAE,KAAiB,EAAE,EAAE,CACxE,GAAG,KAAK,CAAC,MAAM,sDAAsD,OAAO,IAAI;IAChF,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;AAF9D,QAAA,mBAAmB,uBAE2C;AAEpE,MAAM,oBAAoB,GAAG,CAAC,OAAe,EAAE,KAAY,EAAE,OAAe,EAAE,EAAE,CACrF,YAAY,OAAO,yDAAyD,OAAO,KAAK,KAAK,CAAC,OAAO,EAAE,CAAA;AAD5F,QAAA,oBAAoB,wBACwE;AAElG,MAAM,uBAAuB,GAAG,CAAC,OAAe,EAAE,EAAE,CACzD,GAAG,KAAK,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/dora/renderer.ts"],"names":[],"mappings":";;;AAIA,MAAM,KAAK,GAAG;IACZ,MAAM,EAAE,GAAG;IACX,OAAO,EAAE,GAAG;IACZ,OAAO,EAAE,IAAI;CACd,CAAA;AAEM,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAE,KAAiB,EAAE,EAAE,CACxE,GAAG,KAAK,CAAC,MAAM,sDAAsD,OAAO,IAAI;IAChF,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;AAF9D,QAAA,mBAAmB,uBAE2C;AAEpE,MAAM,oBAAoB,GAAG,CAAC,OAAe,EAAE,KAAY,EAAE,OAAe,EAAE,EAAE,CACrF,YAAY,OAAO,yDAAyD,OAAO,KAAK,KAAK,CAAC,OAAO,EAAE,CAAA;AAD5F,QAAA,oBAAoB,wBACwE;AAElG,MAAM,uBAAuB,GAAG,CAAC,OAAe,EAAE,EAAE,CACzD,GAAG,KAAK,CAAC,OAAO,yDAAyD,OAAO,EAAE,CAAA;AADvE,QAAA,uBAAuB,2BACgD;AAE7E,MAAM,YAAY,GAAG,CAAC,UAA2B,EAAU,EAAE,CAClE,YAAY,IAAA,qBAAa,EAAC,UAAU,CAAC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;AADxF,QAAA,YAAY,gBAC4E;AAE9F,MAAM,aAAa,GAAG,CAAC,OAAe,EAAU,EAAE,CAAC,8CAA8C,OAAO,EAAE,CAAA;AAApG,QAAA,aAAa,iBAAuF;AAE1G,MAAM,gBAAgB,GAAG,CAAC,GAAY,EAAU,EAAE,CACvD,GAAG,KAAK,CAAC,OAAO,2DAA2D;IAC3E,mDAAmD,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,SAAS,IAAI;IACnF,6FAA6F,CAAA;AAHlF,QAAA,gBAAgB,oBAGkE"}
|
|
@@ -70,7 +70,8 @@ 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
|
-
|
|
73
|
+
apiKey: this.config.apiKey,
|
|
74
|
+
datadogSite: api_1.datadogSite,
|
|
74
75
|
defaultTags: [`cli_version:${this.cliVersion}`],
|
|
75
76
|
prefix: 'datadog.ci.report_commits.',
|
|
76
77
|
});
|
|
@@ -197,7 +198,7 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
197
198
|
});
|
|
198
199
|
}
|
|
199
200
|
isTargetingGov() {
|
|
200
|
-
return
|
|
201
|
+
return api_1.datadogSite === constants_1.DATADOG_SITE_GOV;
|
|
201
202
|
}
|
|
202
203
|
}
|
|
203
204
|
exports.UploadCommand = UploadCommand;
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,8 +5,10 @@ export declare const EXTENSION_LAYER_KEY = "extension";
|
|
|
5
5
|
export declare const LAYER_LOOKUP: {
|
|
6
6
|
readonly extension: "Datadog-Extension";
|
|
7
7
|
readonly dotnet6: "dd-trace-dotnet";
|
|
8
|
+
readonly dotnet8: "dd-trace-dotnet";
|
|
8
9
|
readonly java11: "dd-trace-java";
|
|
9
10
|
readonly java17: "dd-trace-java";
|
|
11
|
+
readonly java21: "dd-trace-java";
|
|
10
12
|
readonly 'java8.al2': "dd-trace-java";
|
|
11
13
|
readonly 'nodejs16.x': "Datadog-Node16-x";
|
|
12
14
|
readonly 'nodejs18.x': "Datadog-Node18-x";
|
|
@@ -9,8 +9,10 @@ exports.EXTENSION_LAYER_KEY = 'extension';
|
|
|
9
9
|
exports.LAYER_LOOKUP = {
|
|
10
10
|
[exports.EXTENSION_LAYER_KEY]: exports.DD_LAMBDA_EXTENSION_LAYER_NAME,
|
|
11
11
|
dotnet6: 'dd-trace-dotnet',
|
|
12
|
+
dotnet8: 'dd-trace-dotnet',
|
|
12
13
|
java11: 'dd-trace-java',
|
|
13
14
|
java17: 'dd-trace-java',
|
|
15
|
+
java21: 'dd-trace-java',
|
|
14
16
|
'java8.al2': 'dd-trace-java',
|
|
15
17
|
'nodejs16.x': 'Datadog-Node16-x',
|
|
16
18
|
'nodejs18.x': 'Datadog-Node18-x',
|
|
@@ -34,8 +36,10 @@ var RuntimeType;
|
|
|
34
36
|
// Lookup table for runtimes that are currently supported by the CLI
|
|
35
37
|
exports.RUNTIME_LOOKUP = {
|
|
36
38
|
dotnet6: RuntimeType.DOTNET,
|
|
39
|
+
dotnet8: RuntimeType.DOTNET,
|
|
37
40
|
java11: RuntimeType.JAVA,
|
|
38
41
|
java17: RuntimeType.JAVA,
|
|
42
|
+
java21: RuntimeType.JAVA,
|
|
39
43
|
'java8.al2': RuntimeType.JAVA,
|
|
40
44
|
'nodejs16.x': RuntimeType.NODE,
|
|
41
45
|
'nodejs18.x': RuntimeType.NODE,
|
|
@@ -51,6 +55,7 @@ exports.RUNTIME_LOOKUP = {
|
|
|
51
55
|
exports.ARM_LAYERS = [
|
|
52
56
|
exports.EXTENSION_LAYER_KEY,
|
|
53
57
|
'dotnet6',
|
|
58
|
+
'dotnet8',
|
|
54
59
|
'python3.8',
|
|
55
60
|
'python3.9',
|
|
56
61
|
'python3.10',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/commands/lambda/constants.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/commands/lambda/constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Writable } from 'stream';
|
|
2
2
|
import { CloudWatchLogsClient } from '@aws-sdk/client-cloudwatch-logs';
|
|
3
3
|
import { LambdaClient, FunctionConfiguration as LFunctionConfiguration, UpdateFunctionConfigurationCommandInput, Runtime } from '@aws-sdk/client-lambda';
|
|
4
|
-
import { FromIniInit } from '@aws-sdk/credential-
|
|
4
|
+
import { FromIniInit } from '@aws-sdk/credential-provider-ini';
|
|
5
5
|
import { AwsCredentialIdentity } from '@aws-sdk/types';
|
|
6
6
|
import { LayerKey } from '../constants';
|
|
7
7
|
import { FunctionConfiguration, InstrumentationSettings, InstrumentedConfigurationGroup } from '../interfaces';
|
|
@@ -115,7 +115,7 @@ export declare const getRegion: (functionARN: string) => string | undefined;
|
|
|
115
115
|
* @returns if a runtime is supported.
|
|
116
116
|
*/
|
|
117
117
|
export declare const isSupportedRuntime: (runtime?: string) => runtime is Runtime;
|
|
118
|
-
export declare const isLayerRuntime: (runtime: string) => runtime is "dotnet6" | "java11" | "java17" | "java8.al2" | "nodejs16.x" | "nodejs18.x" | "nodejs20.x" | "python3.10" | "python3.11" | "python3.12" | "python3.8" | "python3.9" | "ruby3.2" | "extension";
|
|
118
|
+
export declare const isLayerRuntime: (runtime: string) => runtime is "dotnet6" | "dotnet8" | "java11" | "java17" | "java21" | "java8.al2" | "nodejs16.x" | "nodejs18.x" | "nodejs20.x" | "python3.10" | "python3.11" | "python3.12" | "python3.8" | "python3.9" | "ruby3.2" | "extension";
|
|
119
119
|
export declare const sentenceMatchesRegEx: (sentence: string, regex: RegExp) => RegExpMatchArray | null;
|
|
120
120
|
export declare const updateLambdaFunctionConfig: (lambdaClient: LambdaClient, cloudWatchLogsClient: CloudWatchLogsClient, config: FunctionConfiguration) => Promise<void>;
|
|
121
121
|
export declare const updateFunctionConfiguration: (client: LambdaClient, input: UpdateFunctionConfigurationCommandInput) => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commons.js","sourceRoot":"","sources":["../../../../src/commands/lambda/functions/commons.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"commons.js","sourceRoot":"","sources":["../../../../src/commands/lambda/functions/commons.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,5 +6,5 @@ export declare const renderRetriedUpload: (sarifReport: Payload, errorMessage: s
|
|
|
6
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
|
-
export declare const renderCommandInfo: (basePaths: string[], service: string, concurrency: number, dryRun: boolean, noVerify: boolean) => string;
|
|
9
|
+
export declare const renderCommandInfo: (basePaths: string[], service: string, env: string, sha: string, concurrency: number, dryRun: boolean, noVerify: boolean) => string;
|
|
10
10
|
export declare const renderFilesNotFound: (basePaths: string[], service: string) => string;
|
|
@@ -59,7 +59,7 @@ const renderDryRunUpload = (payload) => `[DRYRUN] ${(0, exports.renderUpload)(pa
|
|
|
59
59
|
exports.renderDryRunUpload = renderDryRunUpload;
|
|
60
60
|
const renderUpload = (payload) => `Uploading SARIF report in ${payload.reportPath}\n`;
|
|
61
61
|
exports.renderUpload = renderUpload;
|
|
62
|
-
const renderCommandInfo = (basePaths, service, concurrency, dryRun, noVerify) => {
|
|
62
|
+
const renderCommandInfo = (basePaths, service, env, sha, concurrency, dryRun, noVerify) => {
|
|
63
63
|
let fullStr = '';
|
|
64
64
|
if (dryRun) {
|
|
65
65
|
fullStr += chalk_1.default.yellow(`${ICONS.WARNING} DRY-RUN MODE ENABLED. WILL NOT UPLOAD SARIF REPORT\n`);
|
|
@@ -74,7 +74,8 @@ const renderCommandInfo = (basePaths, service, concurrency, dryRun, noVerify) =>
|
|
|
74
74
|
else {
|
|
75
75
|
fullStr += chalk_1.default.green(`Will look for SARIF report files in ${basePaths.join(', ')}\n`);
|
|
76
76
|
}
|
|
77
|
-
fullStr +=
|
|
77
|
+
fullStr += `Only one upload per commit, env, service and tool\n`;
|
|
78
|
+
fullStr += `Preparing upload for sha:${sha} env:${env} service:${service}\n`;
|
|
78
79
|
return fullStr;
|
|
79
80
|
};
|
|
80
81
|
exports.renderCommandInfo = renderCommandInfo;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sarif/renderer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sarif/renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -121,7 +121,9 @@ class UploadSarifReportCommand extends clipanion_1.Command {
|
|
|
121
121
|
this.context.stdout.write((0, renderer_1.renderFilesNotFound)(this.basePaths, this.service));
|
|
122
122
|
return 1;
|
|
123
123
|
}
|
|
124
|
-
|
|
124
|
+
const sha = spanTags[tags_1.GIT_SHA] || 'sha-not-found';
|
|
125
|
+
const env = this.config.env || 'env-not-set';
|
|
126
|
+
this.context.stdout.write((0, renderer_1.renderCommandInfo)(this.basePaths, this.service, env, sha, this.maxConcurrency, this.dryRun, this.noVerify));
|
|
125
127
|
const upload = (p) => this.uploadSarifReport(api, p);
|
|
126
128
|
const initialTime = new Date().getTime();
|
|
127
129
|
yield (0, concurrency_1.doWithMaxConcurrency)(this.maxConcurrency, payloads, upload);
|
|
@@ -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,6 +1,7 @@
|
|
|
1
1
|
export declare const renderInvalidFile: (sbomReport: string) => string;
|
|
2
2
|
export declare const renderInvalidPayload: (sbomReport: string) => string;
|
|
3
3
|
export declare const renderMissingSpan: (errorMessage: string) => string;
|
|
4
|
+
export declare const renderDuplicateUpload: (sha: string, env: string, service: string) => string;
|
|
4
5
|
export declare const renderFailedUpload: (sbomReport: string, error: any) => string;
|
|
5
6
|
export declare const renderUploading: (sbomReport: string) => string;
|
|
6
7
|
export declare const renderSuccessfulCommand: (fileCount: number, duration: number) => 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.renderSuccessfulCommand = exports.renderUploading = exports.renderFailedUpload = exports.renderMissingSpan = exports.renderInvalidPayload = exports.renderInvalidFile = void 0;
|
|
6
|
+
exports.renderSuccessfulCommand = exports.renderUploading = exports.renderFailedUpload = exports.renderDuplicateUpload = exports.renderMissingSpan = exports.renderInvalidPayload = exports.renderInvalidFile = void 0;
|
|
7
7
|
const chalk_1 = __importDefault(require("chalk"));
|
|
8
8
|
const utils_1 = require("../junit/utils");
|
|
9
9
|
const ICONS = {
|
|
@@ -34,11 +34,20 @@ const renderMissingSpan = (errorMessage) => {
|
|
|
34
34
|
return fullStr;
|
|
35
35
|
};
|
|
36
36
|
exports.renderMissingSpan = renderMissingSpan;
|
|
37
|
+
const renderDuplicateUpload = (sha, env, service) => {
|
|
38
|
+
let fullStr = '';
|
|
39
|
+
fullStr += chalk_1.default.red(`${ICONS.WARNING} Duplicate SBOM upload detected\n`);
|
|
40
|
+
fullStr += chalk_1.default.red(`An analysis has already been processed for sha:${sha} env:${env} service:${service}\n`);
|
|
41
|
+
fullStr += chalk_1.default.red(`Push a new commit or specify a different env or service variable\n`);
|
|
42
|
+
fullStr += chalk_1.default.red(`Exiting with code 0\n`);
|
|
43
|
+
return fullStr;
|
|
44
|
+
};
|
|
45
|
+
exports.renderDuplicateUpload = renderDuplicateUpload;
|
|
37
46
|
const renderFailedUpload = (sbomReport, error) => {
|
|
38
47
|
var _a;
|
|
39
48
|
const reportPath = `[${chalk_1.default.bold.dim(sbomReport)}]`;
|
|
40
49
|
let fullStr = '';
|
|
41
|
-
fullStr += chalk_1.default.red(`${ICONS.FAILED}
|
|
50
|
+
fullStr += chalk_1.default.red(`${ICONS.FAILED} Failed upload SBOM file ${reportPath}: ${error.message}\n`);
|
|
42
51
|
if ((_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status) {
|
|
43
52
|
fullStr += chalk_1.default.red(`API status code: ${error.response.status}\n`);
|
|
44
53
|
}
|
|
@@ -1 +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,6BAA6B,UAAU,KAAK,CAAC,CAAA;IACjF,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,
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sbom/renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ 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 axios_1 = require("axios");
|
|
18
19
|
const clipanion_1 = require("clipanion");
|
|
19
20
|
const tags_1 = require("../../helpers/tags");
|
|
20
21
|
const api_1 = require("./api");
|
|
@@ -41,6 +42,7 @@ class UploadSbomCommand extends clipanion_1.Command {
|
|
|
41
42
|
* compliant with their schema and upload them to datadog.
|
|
42
43
|
*/
|
|
43
44
|
execute() {
|
|
45
|
+
var _a;
|
|
44
46
|
return __awaiter(this, void 0, void 0, function* () {
|
|
45
47
|
const service = this.service || process_1.default.env.DD_SERVICE;
|
|
46
48
|
if (!service) {
|
|
@@ -100,6 +102,13 @@ class UploadSbomCommand extends clipanion_1.Command {
|
|
|
100
102
|
}
|
|
101
103
|
}
|
|
102
104
|
catch (error) {
|
|
105
|
+
if ((0, axios_1.isAxiosError)(error)) {
|
|
106
|
+
if (((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 409) {
|
|
107
|
+
const sha = tags[tags_1.GIT_SHA] || 'sha-not-found';
|
|
108
|
+
this.context.stderr.write((0, renderer_1.renderDuplicateUpload)(sha, environment, service));
|
|
109
|
+
return 0;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
103
112
|
this.context.stderr.write((0, renderer_1.renderFailedUpload)(basePath, error));
|
|
104
113
|
return 1;
|
|
105
114
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAAmB;AACnB,sDAA6B;
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { APIHelper } from './api';
|
|
2
|
-
import { MainReporter, Result, ResultDisplayInfo
|
|
3
|
-
export declare const waitForBatchToFinish: (api: APIHelper,
|
|
2
|
+
import { MainReporter, Result, ResultDisplayInfo } from './interfaces';
|
|
3
|
+
export declare const waitForBatchToFinish: (api: APIHelper, batchId: string, maxPollingTimeout: number, resultDisplayInfo: ResultDisplayInfo, reporter: MainReporter) => Promise<Result[]>;
|
|
@@ -15,29 +15,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.waitForBatchToFinish = void 0;
|
|
16
16
|
const deep_extend_1 = __importDefault(require("deep-extend"));
|
|
17
17
|
const api_1 = require("./api");
|
|
18
|
+
const errors_1 = require("./errors");
|
|
18
19
|
const internal_1 = require("./utils/internal");
|
|
19
20
|
const public_1 = require("./utils/public");
|
|
20
21
|
const POLLING_INTERVAL = 5000; // In ms
|
|
21
|
-
const waitForBatchToFinish = (api,
|
|
22
|
-
const
|
|
22
|
+
const waitForBatchToFinish = (api, batchId, maxPollingTimeout, resultDisplayInfo, reporter) => __awaiter(void 0, void 0, void 0, function* () {
|
|
23
|
+
const safeDeadline = Date.now() + maxPollingTimeout + 3 * POLLING_INTERVAL;
|
|
23
24
|
const emittedResultIndexes = new Set();
|
|
24
25
|
let oldIncompleteResultIds = new Set();
|
|
25
26
|
while (true) {
|
|
26
|
-
const batch = yield getBatch(api,
|
|
27
|
-
const
|
|
27
|
+
const batch = yield getBatch(api, batchId);
|
|
28
|
+
const safeDeadlineReached = Date.now() >= safeDeadline;
|
|
28
29
|
// The backend is expected to handle the time out of the batch by eventually changing its status to `failed`.
|
|
29
|
-
// But `
|
|
30
|
-
const shouldContinuePolling = batch.status === 'in_progress' && !
|
|
30
|
+
// But `safeDeadlineReached` is a safety in case it fails to do that on time.
|
|
31
|
+
const shouldContinuePolling = batch.status === 'in_progress' && !safeDeadlineReached;
|
|
31
32
|
const newlyReceivedResults = reportReceivedResults(batch, emittedResultIndexes, reporter);
|
|
32
33
|
const resultIdsToFetch = getResultIdsToFetch(shouldContinuePolling, batch, newlyReceivedResults, oldIncompleteResultIds);
|
|
33
34
|
const { pollResultMap, incompleteResultIds } = yield getPollResultMap(api, resultIdsToFetch);
|
|
34
35
|
const resultsToReport = getResultsToReport(shouldContinuePolling, batch, newlyReceivedResults, emittedResultIndexes, oldIncompleteResultIds, incompleteResultIds, reporter);
|
|
35
|
-
reportResults(resultsToReport, pollResultMap, resultDisplayInfo,
|
|
36
|
+
reportResults(batchId, resultsToReport, pollResultMap, resultDisplayInfo, safeDeadlineReached, reporter);
|
|
36
37
|
oldIncompleteResultIds = incompleteResultIds;
|
|
38
|
+
if (safeDeadlineReached) {
|
|
39
|
+
throw new errors_1.BatchTimeoutRunawayError();
|
|
40
|
+
}
|
|
37
41
|
if (!shouldContinuePolling) {
|
|
38
|
-
return batch.results.map((r) => getResultFromBatch(r, pollResultMap, resultDisplayInfo
|
|
42
|
+
return batch.results.map((r) => getResultFromBatch(r, pollResultMap, resultDisplayInfo));
|
|
39
43
|
}
|
|
40
|
-
reportWaitingTests(
|
|
44
|
+
reportWaitingTests(batchId, batch, resultDisplayInfo, reporter);
|
|
41
45
|
yield (0, public_1.wait)(POLLING_INTERVAL);
|
|
42
46
|
}
|
|
43
47
|
});
|
|
@@ -57,9 +61,18 @@ const getResultsToReport = (shouldContinuePolling, batch, newlyReceivedResults,
|
|
|
57
61
|
if (shouldContinuePolling) {
|
|
58
62
|
return resultsToReport;
|
|
59
63
|
}
|
|
64
|
+
// Residual results are either:
|
|
65
|
+
// - Still in progress (from the batch POV): they were never emitted.
|
|
66
|
+
// - Or still incomplete (from the poll results POV): report them with their incomplete data and a warning.
|
|
60
67
|
const residualResults = excludeSkipped(batch.results).filter((r, index) => !emittedResultIndexes.has(index) || incompleteResultIds.has(r.result_id));
|
|
68
|
+
const errors = [];
|
|
61
69
|
for (const result of residualResults) {
|
|
62
|
-
|
|
70
|
+
if (!result.timed_out) {
|
|
71
|
+
errors.push(`The full information for result ${result.result_id} was incomplete at the end of the batch.`);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
if (errors.length > 0) {
|
|
75
|
+
reporter.error(errors.join('\n') + '\n\n');
|
|
63
76
|
}
|
|
64
77
|
return resultsToReport.concat(residualResults);
|
|
65
78
|
};
|
|
@@ -74,13 +87,13 @@ const reportReceivedResults = (batch, emittedResultIndexes, reporter) => {
|
|
|
74
87
|
}
|
|
75
88
|
return receivedResults;
|
|
76
89
|
};
|
|
77
|
-
const reportResults = (results, pollResultMap, resultDisplayInfo,
|
|
90
|
+
const reportResults = (batchId, results, pollResultMap, resultDisplayInfo, safeDeadlineReached, reporter) => {
|
|
78
91
|
const baseUrl = (0, public_1.getAppBaseURL)(resultDisplayInfo.options);
|
|
79
92
|
for (const result of results) {
|
|
80
|
-
reporter.resultEnd(getResultFromBatch(result, pollResultMap, resultDisplayInfo,
|
|
93
|
+
reporter.resultEnd(getResultFromBatch(result, pollResultMap, resultDisplayInfo, safeDeadlineReached), baseUrl, batchId);
|
|
81
94
|
}
|
|
82
95
|
};
|
|
83
|
-
const reportWaitingTests = (
|
|
96
|
+
const reportWaitingTests = (batchId, batch, resultDisplayInfo, reporter) => {
|
|
84
97
|
const baseUrl = (0, public_1.getAppBaseURL)(resultDisplayInfo.options);
|
|
85
98
|
const { tests } = resultDisplayInfo;
|
|
86
99
|
const inProgressPublicIds = new Set();
|
|
@@ -103,12 +116,12 @@ const reportWaitingTests = (trigger, batch, resultDisplayInfo, reporter) => {
|
|
|
103
116
|
skippedCount++;
|
|
104
117
|
}
|
|
105
118
|
}
|
|
106
|
-
reporter.testsWait(remainingTests, baseUrl,
|
|
119
|
+
reporter.testsWait(remainingTests, baseUrl, batchId, skippedCount);
|
|
107
120
|
};
|
|
108
|
-
const getResultFromBatch = (resultInBatch, pollResultMap, resultDisplayInfo,
|
|
121
|
+
const getResultFromBatch = (resultInBatch, pollResultMap, resultDisplayInfo, safeDeadlineReached = false) => {
|
|
109
122
|
var _a, _b, _c;
|
|
110
123
|
const { getLocation, options, tests } = resultDisplayInfo;
|
|
111
|
-
const hasTimedOut = (_a = resultInBatch.timed_out) !== null && _a !== void 0 ? _a :
|
|
124
|
+
const hasTimedOut = (_a = resultInBatch.timed_out) !== null && _a !== void 0 ? _a : safeDeadlineReached;
|
|
112
125
|
const test = getTestByPublicId(resultInBatch.test_public_id, tests);
|
|
113
126
|
if ((0, internal_1.isResultInBatchSkippedBySelectiveRerun)(resultInBatch)) {
|
|
114
127
|
return {
|
|
@@ -121,7 +134,11 @@ const getResultFromBatch = (resultInBatch, pollResultMap, resultDisplayInfo, has
|
|
|
121
134
|
};
|
|
122
135
|
}
|
|
123
136
|
const pollResult = pollResultMap[resultInBatch.result_id];
|
|
124
|
-
if (
|
|
137
|
+
if (safeDeadlineReached) {
|
|
138
|
+
pollResult.result.failure = new errors_1.BatchTimeoutRunawayError().toJson();
|
|
139
|
+
pollResult.result.passed = false;
|
|
140
|
+
}
|
|
141
|
+
else if (hasTimedOut) {
|
|
125
142
|
pollResult.result.failure = { code: 'TIMEOUT', message: 'The batch timed out before receiving the result.' };
|
|
126
143
|
pollResult.result.passed = false;
|
|
127
144
|
}
|
|
@@ -137,10 +154,10 @@ const getResultFromBatch = (resultInBatch, pollResultMap, resultDisplayInfo, has
|
|
|
137
154
|
timestamp: pollResult.timestamp,
|
|
138
155
|
};
|
|
139
156
|
};
|
|
140
|
-
const getBatch = (api,
|
|
157
|
+
const getBatch = (api, batchId) => __awaiter(void 0, void 0, void 0, function* () {
|
|
141
158
|
var _a;
|
|
142
159
|
try {
|
|
143
|
-
const batch = yield api.getBatch(
|
|
160
|
+
const batch = yield api.getBatch(batchId);
|
|
144
161
|
return batch;
|
|
145
162
|
}
|
|
146
163
|
catch (e) {
|