@datadog/datadog-ci 2.25.0 → 2.27.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/cli.js +1 -1
- package/dist/cli.js.map +1 -1
- package/dist/commands/deployment/cli.d.ts +1 -0
- package/dist/commands/deployment/cli.js +5 -0
- package/dist/commands/deployment/cli.js.map +1 -0
- package/dist/commands/deployment/constants.d.ts +6 -0
- package/dist/commands/deployment/constants.js +10 -0
- package/dist/commands/deployment/constants.js.map +1 -0
- package/dist/commands/deployment/mark.d.ts +16 -0
- package/dist/commands/deployment/mark.js +78 -0
- package/dist/commands/deployment/mark.js.map +1 -0
- package/dist/commands/gate/renderer.d.ts +1 -0
- package/dist/commands/gate/renderer.js +6 -3
- package/dist/commands/gate/renderer.js.map +1 -1
- package/dist/commands/gate/utils.d.ts +1 -0
- package/dist/commands/gate/utils.js +8 -1
- package/dist/commands/gate/utils.js.map +1 -1
- package/dist/commands/lambda/constants.d.ts +1 -0
- package/dist/commands/lambda/constants.js +3 -0
- package/dist/commands/lambda/constants.js.map +1 -1
- package/dist/commands/lambda/functions/commons.d.ts +1 -1
- package/dist/commands/sbom/license.js +20 -1
- package/dist/commands/sbom/license.js.map +1 -1
- package/dist/commands/synthetics/api.js +1 -1
- package/dist/commands/synthetics/api.js.map +1 -1
- package/dist/commands/synthetics/interfaces.d.ts +44 -8
- package/dist/commands/synthetics/interfaces.js.map +1 -1
- package/dist/commands/synthetics/reporters/default.d.ts +1 -1
- package/dist/commands/synthetics/reporters/default.js +58 -26
- package/dist/commands/synthetics/reporters/default.js.map +1 -1
- package/dist/commands/synthetics/reporters/junit.js +46 -15
- package/dist/commands/synthetics/reporters/junit.js.map +1 -1
- package/dist/commands/synthetics/utils/internal.d.ts +4 -1
- package/dist/commands/synthetics/utils/internal.js +17 -1
- package/dist/commands/synthetics/utils/internal.js.map +1 -1
- package/dist/commands/synthetics/utils/public.d.ts +5 -2
- package/dist/commands/synthetics/utils/public.js +81 -33
- package/dist/commands/synthetics/utils/public.js.map +1 -1
- package/dist/commands/tag/tag.d.ts +3 -0
- package/dist/commands/tag/tag.js +9 -0
- package/dist/commands/tag/tag.js.map +1 -1
- package/package.json +1 -1
package/dist/cli.js
CHANGED
|
@@ -8,7 +8,7 @@ exports.cli = void 0;
|
|
|
8
8
|
const fs_1 = __importDefault(require("fs"));
|
|
9
9
|
const clipanion_1 = require("clipanion");
|
|
10
10
|
const version_1 = require("./helpers/version");
|
|
11
|
-
const BETA_COMMANDS = ['
|
|
11
|
+
const BETA_COMMANDS = ['sbom', 'dora', 'deployment'];
|
|
12
12
|
const onError = (err) => {
|
|
13
13
|
console.log(err);
|
|
14
14
|
process.exitCode = 1;
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AAEnB,yCAAuC;AAGvC,+CAAyC;AAEzC,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AAEnB,yCAAuC;AAGvC,+CAAyC;AAEzC,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,CAAA;AAEpD,MAAM,OAAO,GAAG,CAAC,GAAQ,EAAE,EAAE;IAC3B,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAChB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;AACtB,CAAC,CAAA;AAED,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAA;AACxC,OAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAA;AAEzC,MAAM,GAAG,GAAG,IAAI,eAAG,CAAC;IAClB,WAAW,EAAE,YAAY;IACzB,UAAU,EAAE,YAAY;IACxB,aAAa,EAAE,iBAAO;CACvB,CAAC,CAAA;AA2BM,kBAAG;AAzBX,GAAG,CAAC,QAAQ,CAAC,oBAAQ,CAAC,WAAW,CAAC,CAAA;AAClC,GAAG,CAAC,QAAQ,CAAC,oBAAQ,CAAC,cAAc,CAAC,CAAA;AAErC,MAAM,YAAY,GAAG,GAAG,SAAS,WAAW,CAAA;AAC5C,KAAK,MAAM,aAAa,IAAI,YAAE,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE;IACxD,MAAM,mBAAmB,GACvB,OAAO,CAAC,GAAG,CAAC,wBAAwB,KAAK,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,wBAAwB,KAAK,MAAM,CAAA;IACjG,IAAI,aAAa,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,mBAAmB,EAAE;QACjE,SAAQ;KACT;IACD,MAAM,WAAW,GAAG,GAAG,YAAY,IAAI,aAAa,EAAE,CAAA;IACtD,IAAI,YAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,WAAW,EAAE,EAAE;QAC1C,8DAA8D;QAC9D,CAAC;QAAC,OAAO,CAAC,GAAG,WAAW,MAAM,CAAoB,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAA;KAC/F;CACF;AAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE;IAC3B,KAAK,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;QACtC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAA;CACH"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/commands/deployment/cli.ts"],"names":[],"mappings":";;AAAA,iCAA4C;AAE5C,MAAM,CAAC,OAAO,GAAG,CAAC,4BAAqB,CAAC,CAAA"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export declare const CD_VIS_PREFIX = "datadog_cd_visibility.";
|
|
2
|
+
export declare const IS_DEPLOYMENT_TAG: string;
|
|
3
|
+
export declare const ENV_TAG: string;
|
|
4
|
+
export declare const REVISION_TAG: string;
|
|
5
|
+
export declare const IS_ROLLBACK_TAG: string;
|
|
6
|
+
export declare const CUSTOM_TAGS_TAG: string;
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CUSTOM_TAGS_TAG = exports.IS_ROLLBACK_TAG = exports.REVISION_TAG = exports.ENV_TAG = exports.IS_DEPLOYMENT_TAG = exports.CD_VIS_PREFIX = void 0;
|
|
4
|
+
exports.CD_VIS_PREFIX = 'datadog_cd_visibility.';
|
|
5
|
+
exports.IS_DEPLOYMENT_TAG = exports.CD_VIS_PREFIX + 'is_deployment:true';
|
|
6
|
+
exports.ENV_TAG = exports.CD_VIS_PREFIX + 'env:';
|
|
7
|
+
exports.REVISION_TAG = exports.CD_VIS_PREFIX + 'revision:';
|
|
8
|
+
exports.IS_ROLLBACK_TAG = exports.CD_VIS_PREFIX + 'is_rollback:true';
|
|
9
|
+
exports.CUSTOM_TAGS_TAG = exports.CD_VIS_PREFIX + 'custom_tags:';
|
|
10
|
+
//# sourceMappingURL=constants.js.map
|
|
@@ -0,0 +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,eAAe,GAAG,qBAAa,GAAG,kBAAkB,CAAA;AACpD,QAAA,eAAe,GAAG,qBAAa,GAAG,cAAc,CAAA"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { Command } from 'clipanion';
|
|
2
|
+
/**
|
|
3
|
+
* This command is a wrapper around the datadog-ci tag command, allowing customers to mark CI jobs
|
|
4
|
+
* as deployments and setting specific properties, like the environment or the revision in a simple way.
|
|
5
|
+
*/
|
|
6
|
+
export declare class DeploymentMarkCommand extends Command {
|
|
7
|
+
static paths: string[][];
|
|
8
|
+
static usage: import("clipanion").Usage;
|
|
9
|
+
private noFail;
|
|
10
|
+
private isRollback;
|
|
11
|
+
private env;
|
|
12
|
+
private revision;
|
|
13
|
+
private tags;
|
|
14
|
+
execute(): Promise<number>;
|
|
15
|
+
createDeploymentTags(): string[];
|
|
16
|
+
}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.DeploymentMarkCommand = void 0;
|
|
13
|
+
const clipanion_1 = require("clipanion");
|
|
14
|
+
const tag_1 = require("../tag/tag");
|
|
15
|
+
const constants_1 = require("./constants");
|
|
16
|
+
/**
|
|
17
|
+
* This command is a wrapper around the datadog-ci tag command, allowing customers to mark CI jobs
|
|
18
|
+
* as deployments and setting specific properties, like the environment or the revision in a simple way.
|
|
19
|
+
*/
|
|
20
|
+
class DeploymentMarkCommand extends clipanion_1.Command {
|
|
21
|
+
constructor() {
|
|
22
|
+
super(...arguments);
|
|
23
|
+
this.noFail = clipanion_1.Option.Boolean('--no-fail', false);
|
|
24
|
+
this.isRollback = clipanion_1.Option.Boolean('--is-rollback', false);
|
|
25
|
+
this.env = clipanion_1.Option.String('--env', {
|
|
26
|
+
description: 'Example: prod',
|
|
27
|
+
});
|
|
28
|
+
this.revision = clipanion_1.Option.String('--revision', {
|
|
29
|
+
description: 'Example: 1.0.0',
|
|
30
|
+
});
|
|
31
|
+
this.tags = clipanion_1.Option.Array('--tags');
|
|
32
|
+
}
|
|
33
|
+
execute() {
|
|
34
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
35
|
+
const tagCommand = new tag_1.TagCommand();
|
|
36
|
+
tagCommand.setLevel('job');
|
|
37
|
+
tagCommand.setTags(this.createDeploymentTags());
|
|
38
|
+
tagCommand.context = this.context;
|
|
39
|
+
if (this.noFail) {
|
|
40
|
+
tagCommand.setNoFail(true);
|
|
41
|
+
}
|
|
42
|
+
return tagCommand.execute();
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
createDeploymentTags() {
|
|
46
|
+
const tags = [constants_1.IS_DEPLOYMENT_TAG];
|
|
47
|
+
if (this.env) {
|
|
48
|
+
tags.push(constants_1.ENV_TAG + this.env);
|
|
49
|
+
}
|
|
50
|
+
if (this.revision) {
|
|
51
|
+
tags.push(constants_1.REVISION_TAG + this.revision);
|
|
52
|
+
}
|
|
53
|
+
if (this.isRollback) {
|
|
54
|
+
tags.push(constants_1.IS_ROLLBACK_TAG);
|
|
55
|
+
}
|
|
56
|
+
if (this.tags) {
|
|
57
|
+
tags.push(constants_1.CUSTOM_TAGS_TAG + this.tags.join(','));
|
|
58
|
+
}
|
|
59
|
+
return tags;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
exports.DeploymentMarkCommand = DeploymentMarkCommand;
|
|
63
|
+
DeploymentMarkCommand.paths = [['deployment', 'mark']];
|
|
64
|
+
DeploymentMarkCommand.usage = clipanion_1.Command.Usage({
|
|
65
|
+
category: 'CI Visibility',
|
|
66
|
+
description: 'Mark a job as a deployment',
|
|
67
|
+
details: `
|
|
68
|
+
This command will mark a job as a deployment.\n
|
|
69
|
+
See README for details.
|
|
70
|
+
`,
|
|
71
|
+
examples: [
|
|
72
|
+
['Mark a job as a deployment', 'datadog-ci deployment mark'],
|
|
73
|
+
['Mark a job as a deployment to the staging environment', 'datadog-ci deployment mark --env:staging'],
|
|
74
|
+
['Mark a job as a rollback deployment', 'datadog-ci deployment mark --is-rollback'],
|
|
75
|
+
['Mark a job as a deployment of the v123-456 version', 'datadog-ci deployment mark --revision:v123-456'],
|
|
76
|
+
],
|
|
77
|
+
});
|
|
78
|
+
//# sourceMappingURL=mark.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mark.js","sourceRoot":"","sources":["../../../src/commands/deployment/mark.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,oCAAqC;AAErC,2CAAsG;AAEtG;;;GAGG;AACH,MAAa,qBAAsB,SAAQ,mBAAO;IAAlD;;QAkBU,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,SAAI,GAAG,kBAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IAoCvC,CAAC;IAlCc,OAAO;;YAClB,MAAM,UAAU,GAAG,IAAI,gBAAU,EAAE,CAAA;YACnC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YAC1B,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAA;YAC/C,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;YAEjC,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;aAC3B;YAED,OAAO,UAAU,CAAC,OAAO,EAAE,CAAA;QAC7B,CAAC;KAAA;IAEM,oBAAoB;QACzB,MAAM,IAAI,GAAG,CAAC,6BAAiB,CAAC,CAAA;QAEhC,IAAI,IAAI,CAAC,GAAG,EAAE;YACZ,IAAI,CAAC,IAAI,CAAC,mBAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;SAC9B;QAED,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,IAAI,CAAC,IAAI,CAAC,wBAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAA;SACxC;QAED,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,IAAI,CAAC,IAAI,CAAC,2BAAe,CAAC,CAAA;SAC3B;QAED,IAAI,IAAI,CAAC,IAAI,EAAE;YACb,IAAI,CAAC,IAAI,CAAC,2BAAe,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;SACjD;QAED,OAAO,IAAI,CAAA;IACb,CAAC;;AA7DH,sDA8DC;AA7De,2BAAK,GAAG,CAAC,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,AAA3B,CAA2B;AAEhC,2BAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,eAAe;IACzB,WAAW,EAAE,4BAA4B;IACzC,OAAO,EAAE;;;KAGR;IACD,QAAQ,EAAE;QACR,CAAC,4BAA4B,EAAE,4BAA4B,CAAC;QAC5D,CAAC,uDAAuD,EAAE,0CAA0C,CAAC;QACrG,CAAC,qCAAqC,EAAE,0CAA0C,CAAC;QACnF,CAAC,oDAAoD,EAAE,gDAAgD,CAAC;KACzG;CACF,CAAC,AAbiB,CAajB"}
|
|
@@ -2,6 +2,7 @@ import { EvaluationResponse, Payload, RuleEvaluation } from './interfaces';
|
|
|
2
2
|
export declare const renderEvaluationResponse: (evaluationResponse: EvaluationResponse) => string;
|
|
3
3
|
export declare const renderEmptyEvaluation: () => string;
|
|
4
4
|
export declare const renderStatus: (result: string) => string;
|
|
5
|
+
export declare const renderRuleUrl: (ruleId: string) => string;
|
|
5
6
|
export declare const renderRuleEvaluation: (ruleEvaluation: RuleEvaluation) => string;
|
|
6
7
|
export declare const renderDryRunEvaluation: (evaluationResponse: EvaluationResponse) => string;
|
|
7
8
|
export declare const renderGateEvaluationInput: (evaluateRequest: Payload) => 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.renderWaiting = exports.renderEvaluationRetry = exports.renderGateEvaluationError = exports.renderGateEvaluationInput = exports.renderDryRunEvaluation = exports.renderRuleEvaluation = exports.renderStatus = exports.renderEmptyEvaluation = exports.renderEvaluationResponse = void 0;
|
|
6
|
+
exports.renderWaiting = exports.renderEvaluationRetry = exports.renderGateEvaluationError = exports.renderGateEvaluationInput = exports.renderDryRunEvaluation = exports.renderRuleEvaluation = exports.renderRuleUrl = exports.renderStatus = exports.renderEmptyEvaluation = exports.renderEvaluationResponse = void 0;
|
|
7
7
|
const chalk_1 = __importDefault(require("chalk"));
|
|
8
8
|
const tags_1 = require("../../helpers/tags");
|
|
9
9
|
const utils_1 = require("./utils");
|
|
@@ -48,11 +48,14 @@ const renderStatus = (result) => {
|
|
|
48
48
|
return result.toLowerCase();
|
|
49
49
|
};
|
|
50
50
|
exports.renderStatus = renderStatus;
|
|
51
|
+
const renderRuleUrl = (ruleId) => {
|
|
52
|
+
return `${(0, utils_1.getBaseUrl)()}ci/quality-gates/rule/${ruleId}`;
|
|
53
|
+
};
|
|
54
|
+
exports.renderRuleUrl = renderRuleUrl;
|
|
51
55
|
const renderRuleEvaluation = (ruleEvaluation) => {
|
|
52
|
-
// TODO add URL here once we have it
|
|
53
56
|
let fullStr = '';
|
|
54
|
-
fullStr += `Rule ID: ${ruleEvaluation.rule_id}\n`;
|
|
55
57
|
fullStr += `Rule Name: ${ruleEvaluation.rule_name}\n`;
|
|
58
|
+
fullStr += `Rule URL: ${(0, exports.renderRuleUrl)(ruleEvaluation.rule_id)}\n`;
|
|
56
59
|
fullStr += `Status: ${(0, exports.renderStatus)(ruleEvaluation.status)}\n`;
|
|
57
60
|
if (ruleEvaluation.status.toLowerCase() === 'failed') {
|
|
58
61
|
fullStr += `${chalk_1.default.red.bold('Failure reason')}: ${ruleEvaluation.failure_reason}\n`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/gate/renderer.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AAEzB,6CAAiE;AAGjE,
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/gate/renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isTimeout = exports.is5xxError = exports.isBadRequestError = exports.is4xxError = exports.getStatus = exports.parseScope = exports.getBaseIntakeUrl = void 0;
|
|
3
|
+
exports.isTimeout = exports.is5xxError = exports.isBadRequestError = exports.is4xxError = exports.getStatus = exports.parseScope = exports.getBaseIntakeUrl = exports.getBaseUrl = void 0;
|
|
4
|
+
const app_1 = require("../../helpers/app");
|
|
5
|
+
const getBaseUrl = () => {
|
|
6
|
+
const site = process.env.DD_SITE || 'datadoghq.com';
|
|
7
|
+
const subdomain = process.env.DD_SUBDOMAIN || '';
|
|
8
|
+
return (0, app_1.getCommonAppBaseURL)(site, subdomain);
|
|
9
|
+
};
|
|
10
|
+
exports.getBaseUrl = getBaseUrl;
|
|
4
11
|
const getBaseIntakeUrl = () => {
|
|
5
12
|
if (process.env.DD_SITE) {
|
|
6
13
|
return `https://quality-gates.${process.env.DD_SITE}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/gate/utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/gate/utils.ts"],"names":[],"mappings":";;;AAAA,2CAAqD;AAE9C,MAAM,UAAU,GAAG,GAAG,EAAE;IAC7B,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,eAAe,CAAA;IACnD,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE,CAAA;IAEhD,OAAO,IAAA,yBAAmB,EAAC,IAAI,EAAE,SAAS,CAAC,CAAA;AAC7C,CAAC,CAAA;AALY,QAAA,UAAU,cAKtB;AAEM,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE;QACvB,OAAO,yBAAyB,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,CAAA;KACtD;IAED,OAAO,qCAAqC,CAAA;AAC9C,CAAC,CAAA;AANY,QAAA,gBAAgB,oBAM5B;AAED;;;GAGG;AACI,MAAM,UAAU,GAAG,CAAC,KAAe,EAAE,EAAE;IAC5C,IAAI;QACF,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,GAA8B,EAAE,YAAY,EAAE,EAAE;YACnE,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC/B,OAAO,GAAG,CAAA;aACX;YAED,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;YAC5C,MAAM,GAAG,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,CAAC,CAAA;YACjD,MAAM,KAAK,GAAG,YAAY,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,CAAC,CAAA;YAEpD,IAAI,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;gBAC3B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;oBAC7B,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;iBACrB;aACF;iBAAM;gBACL,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;aACnB;YAED,OAAO,GAAG,CAAA;QACZ,CAAC,EAAE,EAAE,CAAC,CAAA;KACP;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,EAAE,CAAA;KACV;AACH,CAAC,CAAA;AAxBY,QAAA,UAAU,cAwBtB;AAEM,MAAM,SAAS,GAAG,CAAC,KAAU,EAAE,EAAE;;IACtC,OAAO,MAAA,KAAK,CAAC,QAAQ,0CAAE,MAAM,CAAA;AAC/B,CAAC,CAAA;AAFY,QAAA,SAAS,aAErB;AAEM,MAAM,UAAU,GAAG,CAAC,KAAU,EAAE,EAAE;IACvC,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,KAAK,CAAC,CAAA;IAE/B,OAAO,MAAM,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,IAAI,GAAG,CAAA;AACjD,CAAC,CAAA;AAJY,QAAA,UAAU,cAItB;AAEM,MAAM,iBAAiB,GAAG,CAAC,KAAU,EAAE,EAAE;IAC9C,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,KAAK,CAAC,CAAA;IAE/B,OAAO,MAAM,IAAI,MAAM,KAAK,GAAG,CAAA;AACjC,CAAC,CAAA;AAJY,QAAA,iBAAiB,qBAI7B;AAEM,MAAM,UAAU,GAAG,CAAC,KAAU,EAAE,EAAE;IACvC,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,KAAK,CAAC,CAAA;IAE/B,OAAO,MAAM,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,IAAI,GAAG,CAAA;AACjD,CAAC,CAAA;AAJY,QAAA,UAAU,cAItB;AAEM,MAAM,SAAS,GAAG,CAAC,KAAU,EAAE,EAAE;IACtC,OAAO,KAAK,CAAC,OAAO,KAAK,MAAM,CAAA;AACjC,CAAC,CAAA;AAFY,QAAA,SAAS,aAErB"}
|
|
@@ -19,6 +19,7 @@ export declare const LAYER_LOOKUP: {
|
|
|
19
19
|
readonly 'python3.9': "Datadog-Python39";
|
|
20
20
|
readonly 'python3.10': "Datadog-Python310";
|
|
21
21
|
readonly 'python3.11': "Datadog-Python311";
|
|
22
|
+
readonly 'python3.12': "Datadog-Python312";
|
|
22
23
|
readonly 'ruby2.7': "Datadog-Ruby2-7";
|
|
23
24
|
readonly 'ruby3.2': "Datadog-Ruby3-2";
|
|
24
25
|
};
|
|
@@ -23,6 +23,7 @@ exports.LAYER_LOOKUP = {
|
|
|
23
23
|
'python3.9': 'Datadog-Python39',
|
|
24
24
|
'python3.10': 'Datadog-Python310',
|
|
25
25
|
'python3.11': 'Datadog-Python311',
|
|
26
|
+
'python3.12': 'Datadog-Python312',
|
|
26
27
|
'ruby2.7': 'Datadog-Ruby2-7',
|
|
27
28
|
'ruby3.2': 'Datadog-Ruby3-2',
|
|
28
29
|
};
|
|
@@ -53,6 +54,7 @@ exports.RUNTIME_LOOKUP = {
|
|
|
53
54
|
'python3.9': RuntimeType.PYTHON,
|
|
54
55
|
'python3.10': RuntimeType.PYTHON,
|
|
55
56
|
'python3.11': RuntimeType.PYTHON,
|
|
57
|
+
'python3.12': RuntimeType.PYTHON,
|
|
56
58
|
'ruby2.7': RuntimeType.RUBY,
|
|
57
59
|
'ruby3.2': RuntimeType.RUBY,
|
|
58
60
|
};
|
|
@@ -63,6 +65,7 @@ exports.ARM_LAYERS = [
|
|
|
63
65
|
'python3.9',
|
|
64
66
|
'python3.10',
|
|
65
67
|
'python3.11',
|
|
68
|
+
'python3.12',
|
|
66
69
|
'ruby2.7',
|
|
67
70
|
'ruby3.2',
|
|
68
71
|
];
|
|
@@ -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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"}
|
|
@@ -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" | "dotnetcore3.1" | "java11" | "java17" | "java8.al2" | "nodejs12.x" | "nodejs14.x" | "nodejs16.x" | "nodejs18.x" | "nodejs20.x" | "python3.10" | "python3.11" | "python3.7" | "python3.8" | "python3.9" | "ruby2.7" | "ruby3.2" | "extension";
|
|
118
|
+
export declare const isLayerRuntime: (runtime: string) => runtime is "dotnet6" | "dotnetcore3.1" | "java11" | "java17" | "java8.al2" | "nodejs12.x" | "nodejs14.x" | "nodejs16.x" | "nodejs18.x" | "nodejs20.x" | "python3.10" | "python3.11" | "python3.12" | "python3.7" | "python3.8" | "python3.9" | "ruby2.7" | "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>;
|
|
@@ -12,8 +12,13 @@ const getLicenseFromString = (s) => {
|
|
|
12
12
|
case '0bsd':
|
|
13
13
|
return types_1.DependencyLicense.ZEROBSD;
|
|
14
14
|
case 'apache-2.0':
|
|
15
|
+
case 'apache 2':
|
|
15
16
|
case 'apache license, version 2.0':
|
|
16
17
|
case 'the apache software license, version 2.0':
|
|
18
|
+
case 'apache license 2.0':
|
|
19
|
+
case 'apache public license 2.0':
|
|
20
|
+
case 'the apache license, version 2.0':
|
|
21
|
+
case 'apache license version 2.0':
|
|
17
22
|
return types_1.DependencyLicense.APACHE2;
|
|
18
23
|
case 'bsd-2-clause':
|
|
19
24
|
return types_1.DependencyLicense.BSD2CLAUSE;
|
|
@@ -21,7 +26,17 @@ const getLicenseFromString = (s) => {
|
|
|
21
26
|
return types_1.DependencyLicense.BSD3CLAUSE;
|
|
22
27
|
case 'bsl-1.0':
|
|
23
28
|
return types_1.DependencyLicense.BSL1;
|
|
29
|
+
case 'cc0':
|
|
30
|
+
return types_1.DependencyLicense.CC0_1_0;
|
|
31
|
+
case 'epl 1.0':
|
|
32
|
+
case 'eclipse public license 1.0':
|
|
33
|
+
case 'eclipse public license, version 1.0':
|
|
34
|
+
return types_1.DependencyLicense.EPL1_0;
|
|
35
|
+
case 'eclipse public license - v 2.0':
|
|
36
|
+
case 'eclipse public license v2.0':
|
|
37
|
+
return types_1.DependencyLicense.EPL2_0;
|
|
24
38
|
case 'gpl v2':
|
|
39
|
+
case 'gnu general public license, version 2 (gpl2)':
|
|
25
40
|
return types_1.DependencyLicense.GPL2_0;
|
|
26
41
|
case 'gpl v3':
|
|
27
42
|
return types_1.DependencyLicense.GPL3_0;
|
|
@@ -29,13 +44,17 @@ const getLicenseFromString = (s) => {
|
|
|
29
44
|
return types_1.DependencyLicense.ISC;
|
|
30
45
|
case 'mit':
|
|
31
46
|
case 'the mit license':
|
|
47
|
+
case 'mit license':
|
|
32
48
|
return types_1.DependencyLicense.MIT;
|
|
49
|
+
case 'mpl-2.0':
|
|
50
|
+
case 'mozilla public license, version 2.0':
|
|
51
|
+
return types_1.DependencyLicense.MPL_2_0;
|
|
33
52
|
case 'unlicense':
|
|
34
53
|
return types_1.DependencyLicense.UNLICENSE;
|
|
35
54
|
case 'zlib':
|
|
36
55
|
return types_1.DependencyLicense.ZLIB;
|
|
37
56
|
}
|
|
38
|
-
console.debug(`license
|
|
57
|
+
console.debug(`license |${s}| not recognized`);
|
|
39
58
|
return undefined;
|
|
40
59
|
};
|
|
41
60
|
// Get all the licenses from a string. Sometimes, there are two licenses in one string
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"license.js","sourceRoot":"","sources":["../../../src/commands/sbom/license.ts"],"names":[],"mappings":";;;AAAA,mCAAyC;AAEzC,uGAAuG;AACvG,+JAA+J;AAC/J,MAAM,oBAAoB,GAAG,CAAC,CAAS,EAAiC,EAAE;IACxE,IAAI,CAAC,CAAC,EAAE;QACN,OAAO,SAAS,CAAA;KACjB;IAED,QAAQ,CAAC,CAAC,WAAW,EAAE,EAAE;QACvB,KAAK,MAAM;YACT,OAAO,yBAAiB,CAAC,OAAO,CAAA;QAClC,KAAK,YAAY,CAAC;QAClB,KAAK,6BAA6B,CAAC;QACnC,KAAK,0CAA0C;
|
|
1
|
+
{"version":3,"file":"license.js","sourceRoot":"","sources":["../../../src/commands/sbom/license.ts"],"names":[],"mappings":"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"}
|
|
@@ -82,7 +82,7 @@ const getBatch = (request) => (batchId) => __awaiter(void 0, void 0, void 0, fun
|
|
|
82
82
|
const resp = yield retryRequest({ url: `/synthetics/ci/batch/${batchId}` }, request, retryOn5xxOr404Errors);
|
|
83
83
|
const serverBatch = resp.data.data;
|
|
84
84
|
return {
|
|
85
|
-
results: serverBatch.results.filter((r) => r.status !== 'skipped'),
|
|
85
|
+
results: serverBatch.results.filter((r) => r.status !== 'skipped' || r.selective_rerun),
|
|
86
86
|
status: serverBatch.status,
|
|
87
87
|
};
|
|
88
88
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/synthetics/api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAqC;AAIrC,+CAAqD;AAErD,qCAAsC;AAiBtC,2DAAwD;AACxD,2CAAkE;AAElE,MAAM,WAAW,GAAG,CAAC,CAAA;AACrB,MAAM,qBAAqB,GAAG,GAAG,CAAA,CAAC,QAAQ;AAC1C,MAAM,2BAA2B,GAAG,IAAI,CAAA,CAAC,QAAQ;AAMjD,MAAa,aAAc,SAAQ,KAAK;IACtC,YAAmB,OAAe,EAAS,MAAc;QACvD,KAAK,CAAC,OAAO,CAAC,CAAA;QADG,YAAO,GAAP,OAAO,CAAQ;QAAS,WAAM,GAAN,MAAM,CAAQ;QAEvD,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,aAAa,CAAC,SAAS,CAAC,CAAA;IACtD,CAAC;CACF;AALD,sCAKC;AAEM,MAAM,mBAAmB,GAAG,CAAC,YAAsC,EAAE,EAAE;;IAC5E,IAAI,MAAA,MAAA,YAAY,CAAC,QAAQ,0CAAE,IAAI,0CAAE,MAAM,EAAE;QACvC,MAAM,UAAU,GAAG,YAAY,MAAA,YAAY,CAAC,MAAM,0CAAE,OAAO,GAAG,MAAA,YAAY,CAAC,MAAM,0CAAE,GAAG,YAAY,CAAA;QAClG,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAA;QAChD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACrB,MAAM,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,OAAe,EAAE,EAAE,CAAC,OAAO,OAAO,EAAE,CAAC,CAAA;YAEzE,OAAO,GAAG,UAAU,KAAK,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAA;SACtD;aAAM,IAAI,MAAM,CAAC,MAAM,EAAE;YACxB,OAAO,GAAG,UAAU,KAAK,MAAM,CAAC,CAAC,CAAC,GAAG,CAAA;SACtC;aAAM;YACL,OAAO,kBAAkB,MAAA,YAAY,CAAC,MAAM,0CAAE,OAAO,GAAG,MAAA,YAAY,CAAC,MAAM,0CAAE,GAAG,EAAE,CAAA;SACnF;KACF;IAED,OAAO,mBAAmB,MAAA,YAAY,CAAC,MAAM,0CAAE,OAAO,GAAG,MAAA,YAAY,CAAC,MAAM,0CAAE,GAAG,KAAK,YAAY,CAAC,OAAO,EAAE,CAAA;AAC9G,CAAC,CAAA;AAhBY,QAAA,mBAAmB,uBAgB/B;AAED,MAAM,YAAY,GAAG,CAAC,OAA4D,EAAE,EAAE,CAAC,CAAO,IAAa,EAAE,EAAE;IAC7G,MAAM,IAAI,GAAG,MAAM,YAAY,CAC7B;QACE,IAAI;QACJ,OAAO,EAAE,EAAC,eAAe,EAAE,qBAAY,EAAC;QACxC,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,8BAA8B;KACpC,EACD,OAAO,CACR,CAAA;IAED,OAAO,IAAI,CAAC,IAAI,CAAA;AAClB,CAAC,CAAA,CAAA;AAED,MAAM,OAAO,GAAG,CAAC,OAA+D,EAAE,EAAE,CAAC,CAAO,MAAc,EAAE,EAAE;IAC5G,MAAM,IAAI,GAAG,MAAM,YAAY,CAC7B;QACE,GAAG,EAAE,qBAAqB,MAAM,EAAE;KACnC,EACD,OAAO,CACR,CAAA;IAED,OAAO,IAAI,CAAC,IAAI,CAAA;AAClB,CAAC,CAAA,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,OAAqE,EAAE,EAAE,CAAC,CAC7F,KAAa,EACb,EAAE;IACF,MAAM,IAAI,GAAG,MAAM,YAAY,CAC7B;QACE,MAAM,EAAE;YACN,+EAA+E;YAC/E,KAAK,EAAE,wCAAoB,GAAG,CAAC;YAC/B,IAAI,EAAE,KAAK;SACZ;QACD,GAAG,EAAE,0BAA0B;KAChC,EACD,OAAO,CACR,CAAA;IAED,OAAO,IAAI,CAAC,IAAI,CAAA;AAClB,CAAC,CAAA,CAAA;AAED,MAAM,wBAAwB,GAAG,CAC/B,OAA0E,EAC1E,EAAE,CAAC,GAAS,EAAE;IACd,MAAM,IAAI,GAAG,MAAM,YAAY,CAC7B;QACE,GAAG,EAAE,sBAAsB;KAC5B,EACD,OAAO,CACR,CAAA;IAED,OAAO,IAAI,CAAC,IAAI,CAAA;AAClB,CAAC,CAAA,CAAA;AAED,MAAM,QAAQ,GAAG,CAAC,OAAwE,EAAE,EAAE,CAAC,CAC7F,OAAe,EACC,EAAE;IAClB,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,EAAC,GAAG,EAAE,wBAAwB,OAAO,EAAE,EAAC,EAAE,OAAO,EAAE,qBAAqB,CAAC,CAAA;IAEzG,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAA;IAElC,OAAO;QACL,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,SAAS,CAAqB;
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/synthetics/api.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ export interface MainReporter {
|
|
|
13
13
|
resultEnd(result: Result, baseUrl: string): void;
|
|
14
14
|
resultReceived(result: Batch['results'][0]): void;
|
|
15
15
|
runEnd(summary: Summary, baseUrl: string, orgSettings?: SyntheticsOrgSettings): void;
|
|
16
|
-
testsWait(tests: Test[], baseUrl: string, batchId: string): void;
|
|
16
|
+
testsWait(tests: Test[], baseUrl: string, batchId: string, skippedCount?: number): void;
|
|
17
17
|
testTrigger(test: Test, testId: string, executionRule: ExecutionRule, config: UserConfigOverride): void;
|
|
18
18
|
testWait(test: Test): void;
|
|
19
19
|
}
|
|
@@ -91,33 +91,67 @@ export type ResultDisplayInfo = {
|
|
|
91
91
|
};
|
|
92
92
|
tests: Test[];
|
|
93
93
|
};
|
|
94
|
-
export
|
|
94
|
+
export type SelectiveRerunDecision = {
|
|
95
|
+
decision: 'run';
|
|
96
|
+
reason: 'in_progress';
|
|
97
|
+
} | {
|
|
98
|
+
decision: 'run';
|
|
99
|
+
reason: 'failed';
|
|
100
|
+
linked_result_id: string;
|
|
101
|
+
} | {
|
|
102
|
+
decision: 'run';
|
|
103
|
+
reason: 'edited';
|
|
104
|
+
} | {
|
|
105
|
+
decision: 'run';
|
|
106
|
+
reason: 'new';
|
|
107
|
+
} | {
|
|
108
|
+
decision: 'skip';
|
|
109
|
+
reason: 'passed';
|
|
110
|
+
linked_result_id: string;
|
|
111
|
+
};
|
|
112
|
+
export interface BaseResult {
|
|
95
113
|
executionRule: ExecutionRule;
|
|
96
114
|
location: string;
|
|
97
115
|
passed: boolean;
|
|
98
116
|
result: ServerResult;
|
|
99
117
|
resultId: string;
|
|
118
|
+
selectiveRerun?: SelectiveRerunDecision;
|
|
100
119
|
test: Test;
|
|
101
120
|
timedOut: boolean;
|
|
102
121
|
timestamp: number;
|
|
103
122
|
}
|
|
104
|
-
type
|
|
105
|
-
|
|
123
|
+
export type ResultSkippedBySelectiveRerun = Omit<BaseResult, 'location' | 'result' | 'timestamp'> & {
|
|
124
|
+
executionRule: ExecutionRule.SKIPPED;
|
|
125
|
+
selectiveRerun: Extract<SelectiveRerunDecision, {
|
|
126
|
+
decision: 'skip';
|
|
127
|
+
}>;
|
|
128
|
+
};
|
|
129
|
+
export type Result = BaseResult | ResultSkippedBySelectiveRerun;
|
|
130
|
+
type Status = 'passed' | 'failed' | 'in_progress' | 'skipped';
|
|
131
|
+
export interface BaseResultInBatch {
|
|
106
132
|
execution_rule: ExecutionRule;
|
|
107
133
|
location: string;
|
|
108
134
|
result_id: string;
|
|
135
|
+
selective_rerun?: SelectiveRerunDecision;
|
|
109
136
|
status: Status;
|
|
110
137
|
test_public_id: string;
|
|
111
138
|
timed_out: boolean | null;
|
|
112
139
|
}
|
|
140
|
+
type SkippedResultInBatch = Omit<BaseResultInBatch, 'location' | 'result_id'> & {
|
|
141
|
+
execution_rule: ExecutionRule.SKIPPED;
|
|
142
|
+
status: 'skipped';
|
|
143
|
+
};
|
|
144
|
+
export type ResultInBatchSkippedBySelectiveRerun = SkippedResultInBatch & {
|
|
145
|
+
selective_rerun: Extract<SelectiveRerunDecision, {
|
|
146
|
+
decision: 'skip';
|
|
147
|
+
}>;
|
|
148
|
+
};
|
|
149
|
+
export type ResultInBatch = BaseResultInBatch | ResultInBatchSkippedBySelectiveRerun;
|
|
113
150
|
export interface Batch {
|
|
114
151
|
results: ResultInBatch[];
|
|
115
152
|
status: Status;
|
|
116
153
|
}
|
|
117
|
-
|
|
118
|
-
status: 'skipped';
|
|
119
|
-
}
|
|
120
|
-
type ServerResultInBatch = SkippedResultInBatch | ResultInBatch;
|
|
154
|
+
type ServerResultInBatch = BaseResultInBatch | SkippedResultInBatch;
|
|
121
155
|
export interface ServerBatch {
|
|
122
156
|
results: ServerResultInBatch[];
|
|
123
157
|
status: Status;
|
|
@@ -329,9 +363,11 @@ export interface Suite {
|
|
|
329
363
|
export interface Summary {
|
|
330
364
|
batchId: string;
|
|
331
365
|
criticalErrors: number;
|
|
366
|
+
expected: number;
|
|
332
367
|
failed: number;
|
|
333
368
|
failedNonBlocking: number;
|
|
334
369
|
passed: number;
|
|
370
|
+
previouslyPassed: number;
|
|
335
371
|
skipped: number;
|
|
336
372
|
testsNotFound: Set<string>;
|
|
337
373
|
timedOut: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/commands/synthetics/interfaces.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/commands/synthetics/interfaces.ts"],"names":[],"mappings":";;;AAqRA,IAAY,QAeX;AAfD,WAAY,QAAQ;IAClB,iCAAqB,CAAA;IACrB,6CAAiC,CAAA;IACjC,qBAAS,CAAA;IACT,2BAAe,CAAA;IACf,yCAA6B,CAAA;IAC7B,yCAA6B,CAAA;IAC7B,iCAAqB,CAAA;IACrB,+CAAmC,CAAA;IACnC,iCAAqB,CAAA;IACrB,+CAAmC,CAAA;IACnC,+BAAmB,CAAA;IACnB,yCAA6B,CAAA;IAC7B,mDAAuC,CAAA;IACvC,6CAAiC,CAAA;AACnC,CAAC,EAfW,QAAQ,wBAAR,QAAQ,QAenB;AA6FD,IAAY,aAIX;AAJD,WAAY,aAAa;IACvB,sCAAqB,CAAA;IACrB,8CAA6B,CAAA;IAC7B,oCAAmB,CAAA;AACrB,CAAC,EAJW,aAAa,6BAAb,aAAa,QAIxB"}
|
|
@@ -18,7 +18,7 @@ export declare class DefaultReporter implements MainReporter {
|
|
|
18
18
|
resultEnd(result: Result, baseUrl: string): void;
|
|
19
19
|
resultReceived(result: Batch['results'][0]): void;
|
|
20
20
|
runEnd(summary: Summary, baseUrl: string, orgSettings?: SyntheticsOrgSettings): void;
|
|
21
|
-
testsWait(tests: Test[], baseUrl: string, batchId: string): void;
|
|
21
|
+
testsWait(tests: Test[], baseUrl: string, batchId: string, skippedCount?: number): void;
|
|
22
22
|
testTrigger(test: Pick<Test, 'name'>, testId: string, executionRule: ExecutionRule, config: UserConfigOverride): void;
|
|
23
23
|
testWait(test: Test): void;
|
|
24
24
|
private removeSpinner;
|