@datadog/datadog-ci 2.18.0 → 2.19.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.d.ts +3 -1
- package/dist/cli.js +9 -2
- package/dist/cli.js.map +1 -1
- package/dist/commands/cloud-run/cli.d.ts +1 -0
- package/dist/commands/cloud-run/cli.js +5 -0
- package/dist/commands/cloud-run/cli.js.map +1 -0
- package/dist/commands/cloud-run/constants.d.ts +1 -0
- package/dist/commands/cloud-run/constants.js +22 -0
- package/dist/commands/cloud-run/constants.js.map +1 -0
- package/dist/commands/cloud-run/flare.d.ts +91 -0
- package/dist/commands/cloud-run/flare.js +634 -0
- package/dist/commands/cloud-run/flare.js.map +1 -0
- package/dist/commands/cloud-run/interfaces.d.ts +27 -0
- package/dist/commands/cloud-run/interfaces.js +3 -0
- package/dist/commands/cloud-run/interfaces.js.map +1 -0
- package/dist/commands/cloud-run/renderer.d.ts +4 -0
- package/dist/commands/cloud-run/renderer.js +42 -0
- package/dist/commands/cloud-run/renderer.js.map +1 -0
- package/dist/commands/dsyms/renderer.js +6 -6
- package/dist/commands/dsyms/renderer.js.map +1 -1
- package/dist/commands/dsyms/upload.d.ts +5 -5
- package/dist/commands/dsyms/upload.js +66 -42
- package/dist/commands/dsyms/upload.js.map +1 -1
- package/dist/commands/dsyms/utils.d.ts +1 -1
- package/dist/commands/dsyms/utils.js +3 -3
- package/dist/commands/dsyms/utils.js.map +1 -1
- package/dist/commands/flutter-symbols/helpers.js +8 -4
- package/dist/commands/flutter-symbols/helpers.js.map +1 -1
- package/dist/commands/flutter-symbols/renderer.js +2 -2
- package/dist/commands/flutter-symbols/renderer.js.map +1 -1
- package/dist/commands/flutter-symbols/upload.d.ts +13 -13
- package/dist/commands/flutter-symbols/upload.js +66 -66
- package/dist/commands/flutter-symbols/upload.js.map +1 -1
- package/dist/commands/gate/api.js +4 -2
- package/dist/commands/gate/api.js.map +1 -1
- package/dist/commands/gate/evaluate.d.ts +18 -6
- package/dist/commands/gate/evaluate.js +116 -40
- package/dist/commands/gate/evaluate.js.map +1 -1
- package/dist/commands/gate/interfaces.d.ts +5 -0
- package/dist/commands/gate/renderer.js +16 -14
- 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 -4
- package/dist/commands/gate/utils.js.map +1 -1
- package/dist/commands/git-metadata/git.d.ts +1 -1
- package/dist/commands/git-metadata/git.js +7 -3
- package/dist/commands/git-metadata/git.js.map +1 -1
- package/dist/commands/git-metadata/gitdb.d.ts +1 -1
- package/dist/commands/git-metadata/gitdb.js +7 -7
- package/dist/commands/git-metadata/gitdb.js.map +1 -1
- package/dist/commands/git-metadata/index.js +5 -1
- package/dist/commands/git-metadata/index.js.map +1 -1
- package/dist/commands/git-metadata/library.d.ts +1 -1
- package/dist/commands/git-metadata/library.js +13 -13
- package/dist/commands/git-metadata/library.js.map +1 -1
- package/dist/commands/git-metadata/upload.d.ts +5 -5
- package/dist/commands/git-metadata/upload.js +30 -32
- package/dist/commands/git-metadata/upload.js.map +1 -1
- package/dist/commands/junit/api.js +4 -4
- package/dist/commands/junit/api.js.map +1 -1
- package/dist/commands/junit/id.js +1 -1
- package/dist/commands/junit/id.js.map +1 -1
- package/dist/commands/junit/renderer.d.ts +1 -1
- package/dist/commands/junit/renderer.js +3 -3
- package/dist/commands/junit/renderer.js.map +1 -1
- package/dist/commands/junit/upload.d.ts +12 -11
- package/dist/commands/junit/upload.js +74 -63
- package/dist/commands/junit/upload.js.map +1 -1
- package/dist/commands/junit/utils.d.ts +1 -2
- package/dist/commands/junit/utils.js +5 -10
- package/dist/commands/junit/utils.js.map +1 -1
- package/dist/commands/lambda/constants.d.ts +13 -11
- package/dist/commands/lambda/constants.js +41 -70
- package/dist/commands/lambda/constants.js.map +1 -1
- package/dist/commands/lambda/flare.d.ts +25 -74
- package/dist/commands/lambda/flare.js +182 -332
- package/dist/commands/lambda/flare.js.map +1 -1
- package/dist/commands/lambda/functions/commons.d.ts +8 -14
- package/dist/commands/lambda/functions/commons.js +57 -69
- package/dist/commands/lambda/functions/commons.js.map +1 -1
- package/dist/commands/lambda/functions/instrument.js +66 -65
- package/dist/commands/lambda/functions/instrument.js.map +1 -1
- package/dist/commands/lambda/functions/uninstrument.js +38 -37
- package/dist/commands/lambda/functions/uninstrument.js.map +1 -1
- package/dist/commands/lambda/functions/versionChecker.d.ts +2 -2
- package/dist/commands/lambda/instrument.d.ts +22 -20
- package/dist/commands/lambda/instrument.js +78 -69
- package/dist/commands/lambda/instrument.js.map +1 -1
- package/dist/commands/lambda/loggroup.js +8 -8
- package/dist/commands/lambda/loggroup.js.map +1 -1
- package/dist/commands/lambda/prompt.d.ts +1 -4
- package/dist/commands/lambda/prompt.js +34 -71
- package/dist/commands/lambda/prompt.js.map +1 -1
- package/dist/commands/lambda/renderers/__mocks__/instrument-uninstrument-renderer.d.ts +2 -0
- package/dist/commands/lambda/renderers/__mocks__/instrument-uninstrument-renderer.js +11 -0
- package/dist/commands/lambda/renderers/__mocks__/instrument-uninstrument-renderer.js.map +1 -0
- package/dist/commands/lambda/renderers/common-renderer.d.ts +0 -26
- package/dist/commands/lambda/renderers/common-renderer.js +4 -32
- package/dist/commands/lambda/renderers/common-renderer.js.map +1 -1
- package/dist/commands/lambda/renderers/instrument-uninstrument-renderer.d.ts +2 -2
- package/dist/commands/lambda/renderers/instrument-uninstrument-renderer.js +57 -49
- package/dist/commands/lambda/renderers/instrument-uninstrument-renderer.js.map +1 -1
- package/dist/commands/lambda/tags.js +7 -7
- package/dist/commands/lambda/tags.js.map +1 -1
- package/dist/commands/lambda/uninstrument.d.ts +25 -7
- package/dist/commands/lambda/uninstrument.js +59 -49
- package/dist/commands/lambda/uninstrument.js.map +1 -1
- package/dist/commands/metric/metric.d.ts +4 -3
- package/dist/commands/metric/metric.js +10 -9
- package/dist/commands/metric/metric.js.map +1 -1
- package/dist/commands/react-native/codepush.d.ts +11 -10
- package/dist/commands/react-native/codepush.js +17 -19
- package/dist/commands/react-native/codepush.js.map +1 -1
- package/dist/commands/react-native/interfaces.d.ts +1 -1
- package/dist/commands/react-native/renderer.js +6 -6
- package/dist/commands/react-native/renderer.js.map +1 -1
- package/dist/commands/react-native/upload.d.ts +12 -12
- package/dist/commands/react-native/upload.js +67 -45
- package/dist/commands/react-native/upload.js.map +1 -1
- package/dist/commands/react-native/utils.js +2 -1
- package/dist/commands/react-native/utils.js.map +1 -1
- package/dist/commands/react-native/validation.js +1 -1
- package/dist/commands/react-native/validation.js.map +1 -1
- package/dist/commands/react-native/xcode.d.ts +6 -6
- package/dist/commands/react-native/xcode.js +25 -29
- package/dist/commands/react-native/xcode.js.map +1 -1
- package/dist/commands/sarif/api.js +6 -22
- package/dist/commands/sarif/api.js.map +1 -1
- package/dist/commands/sarif/renderer.d.ts +1 -1
- package/dist/commands/sarif/renderer.js +1 -1
- package/dist/commands/sarif/renderer.js.map +1 -1
- package/dist/commands/sarif/upload.d.ts +6 -6
- package/dist/commands/sarif/upload.js +46 -37
- package/dist/commands/sarif/upload.js.map +1 -1
- package/dist/commands/sbom/api.d.ts +7 -0
- package/dist/commands/sbom/api.js +49 -0
- package/dist/commands/sbom/api.js.map +1 -0
- package/dist/commands/sbom/cli.d.ts +1 -0
- package/dist/commands/sbom/cli.js +5 -0
- package/dist/commands/sbom/cli.js.map +1 -0
- package/dist/commands/sbom/constants.d.ts +2 -0
- package/dist/commands/sbom/constants.js +6 -0
- package/dist/commands/sbom/constants.js.map +1 -0
- package/dist/commands/sbom/json-schema/cyclonedx/bom-1.4.schema.json +1687 -0
- package/dist/commands/sbom/json-schema/jsf/jsf-0.82.schema.json +244 -0
- package/dist/commands/sbom/json-schema/spdx/spdx.schema.json +507 -0
- package/dist/commands/sbom/protobuf/bom-1.4.d.ts +11788 -0
- package/dist/commands/sbom/protobuf/bom-1.4.js +5161 -0
- package/dist/commands/sbom/protobuf/bom-1.4.js.map +1 -0
- package/dist/commands/sbom/protobuf/custom_message.d.ts +11 -0
- package/dist/commands/sbom/protobuf/custom_message.js +3 -0
- package/dist/commands/sbom/protobuf/custom_message.js.map +1 -0
- package/dist/commands/sbom/protobuf/google/protobuf/duration.d.ts +110 -0
- package/dist/commands/sbom/protobuf/google/protobuf/duration.js +126 -0
- package/dist/commands/sbom/protobuf/google/protobuf/duration.js.map +1 -0
- package/dist/commands/sbom/protobuf/google/protobuf/timestamp.d.ts +139 -0
- package/dist/commands/sbom/protobuf/google/protobuf/timestamp.js +126 -0
- package/dist/commands/sbom/protobuf/google/protobuf/timestamp.js.map +1 -0
- package/dist/commands/sbom/protobuf/sbom_intake.d.ts +53 -0
- package/dist/commands/sbom/protobuf/sbom_intake.js +383 -0
- package/dist/commands/sbom/protobuf/sbom_intake.js.map +1 -0
- package/dist/commands/sbom/types.d.ts +4 -0
- package/dist/commands/sbom/types.js +3 -0
- package/dist/commands/sbom/types.js.map +1 -0
- package/dist/commands/sbom/upload.d.ts +16 -0
- package/dist/commands/sbom/upload.js +134 -0
- package/dist/commands/sbom/upload.js.map +1 -0
- package/dist/commands/sbom/validation.d.ts +12 -0
- package/dist/commands/sbom/validation.js +51 -0
- package/dist/commands/sbom/validation.js.map +1 -0
- package/dist/commands/sourcemaps/renderer.js +6 -6
- package/dist/commands/sourcemaps/renderer.js.map +1 -1
- package/dist/commands/sourcemaps/upload.d.ts +10 -10
- package/dist/commands/sourcemaps/upload.js +61 -38
- package/dist/commands/sourcemaps/upload.js.map +1 -1
- package/dist/commands/sourcemaps/validation.js +4 -4
- package/dist/commands/sourcemaps/validation.js.map +1 -1
- package/dist/commands/stepfunctions/awsCommands.js +10 -10
- package/dist/commands/stepfunctions/awsCommands.js.map +1 -1
- package/dist/commands/stepfunctions/helpers.d.ts +4 -4
- package/dist/commands/stepfunctions/helpers.js +4 -4
- package/dist/commands/stepfunctions/helpers.js.map +1 -1
- package/dist/commands/stepfunctions/instrument.d.ts +5 -4
- package/dist/commands/stepfunctions/instrument.js +30 -31
- package/dist/commands/stepfunctions/instrument.js.map +1 -1
- package/dist/commands/stepfunctions/uninstrument.d.ts +6 -1
- package/dist/commands/stepfunctions/uninstrument.js +23 -23
- package/dist/commands/stepfunctions/uninstrument.js.map +1 -1
- package/dist/commands/synthetics/api.d.ts +1 -1
- package/dist/commands/synthetics/api.js +11 -11
- package/dist/commands/synthetics/api.js.map +1 -1
- package/dist/commands/synthetics/errors.d.ts +3 -3
- package/dist/commands/synthetics/index.js +5 -1
- package/dist/commands/synthetics/index.js.map +1 -1
- package/dist/commands/synthetics/interfaces.d.ts +8 -7
- package/dist/commands/synthetics/interfaces.js +2 -2
- package/dist/commands/synthetics/interfaces.js.map +1 -1
- package/dist/commands/synthetics/mobile.d.ts +1 -1
- package/dist/commands/synthetics/mobile.js +26 -20
- package/dist/commands/synthetics/mobile.js.map +1 -1
- package/dist/commands/synthetics/reporters/default.d.ts +2 -2
- package/dist/commands/synthetics/reporters/default.js +17 -19
- package/dist/commands/synthetics/reporters/default.js.map +1 -1
- package/dist/commands/synthetics/reporters/junit.d.ts +2 -2
- package/dist/commands/synthetics/reporters/junit.js +11 -11
- package/dist/commands/synthetics/reporters/junit.js.map +1 -1
- package/dist/commands/synthetics/run-tests-command.d.ts +21 -19
- package/dist/commands/synthetics/run-tests-command.js +108 -42
- package/dist/commands/synthetics/run-tests-command.js.map +1 -1
- package/dist/commands/synthetics/run-tests-lib.d.ts +1 -1
- package/dist/commands/synthetics/run-tests-lib.js +16 -16
- package/dist/commands/synthetics/run-tests-lib.js.map +1 -1
- package/dist/commands/synthetics/tunnel/crypto.js +3 -3
- package/dist/commands/synthetics/tunnel/crypto.js.map +1 -1
- package/dist/commands/synthetics/tunnel/tunnel.js +11 -11
- package/dist/commands/synthetics/tunnel/tunnel.js.map +1 -1
- package/dist/commands/synthetics/tunnel/websocket.d.ts +1 -0
- package/dist/commands/synthetics/tunnel/websocket.js +7 -3
- package/dist/commands/synthetics/tunnel/websocket.js.map +1 -1
- package/dist/commands/synthetics/upload-application-command.d.ts +10 -8
- package/dist/commands/synthetics/upload-application-command.js +36 -13
- package/dist/commands/synthetics/upload-application-command.js.map +1 -1
- package/dist/commands/synthetics/utils.d.ts +12 -12
- package/dist/commands/synthetics/utils.js +52 -47
- package/dist/commands/synthetics/utils.js.map +1 -1
- package/dist/commands/tag/tag.d.ts +4 -3
- package/dist/commands/tag/tag.js +10 -9
- package/dist/commands/tag/tag.js.map +1 -1
- package/dist/commands/trace/api.js +4 -4
- package/dist/commands/trace/api.js.map +1 -1
- package/dist/commands/trace/interfaces.d.ts +1 -1
- package/dist/commands/trace/trace.d.ts +5 -4
- package/dist/commands/trace/trace.js +11 -10
- package/dist/commands/trace/trace.js.map +1 -1
- package/dist/commands/version/cli.js +6 -5
- package/dist/commands/version/cli.js.map +1 -1
- package/dist/constants.d.ts +17 -0
- package/dist/constants.js +65 -1
- package/dist/constants.js.map +1 -1
- package/dist/helpers/api.d.ts +5 -0
- package/dist/helpers/api.js +16 -0
- package/dist/helpers/api.js.map +1 -0
- package/dist/helpers/base-intake-url.d.ts +1 -1
- package/dist/helpers/ci.d.ts +13 -13
- package/dist/helpers/ci.js +17 -17
- package/dist/helpers/ci.js.map +1 -1
- package/dist/helpers/config.d.ts +5 -0
- package/dist/helpers/config.js +3 -0
- package/dist/helpers/config.js.map +1 -0
- package/dist/helpers/flare.d.ts +41 -0
- package/dist/helpers/flare.js +191 -0
- package/dist/helpers/flare.js.map +1 -0
- package/dist/helpers/fs.d.ts +31 -0
- package/dist/helpers/fs.js +117 -0
- package/dist/helpers/fs.js.map +1 -0
- package/dist/helpers/git/format-git-sourcemaps-data.js +7 -3
- package/dist/helpers/git/format-git-sourcemaps-data.js.map +1 -1
- package/dist/helpers/git/format-git-span-data.js +6 -6
- package/dist/helpers/git/format-git-span-data.js.map +1 -1
- package/dist/helpers/git/get-git-data.js +3 -3
- package/dist/helpers/git/get-git-data.js.map +1 -1
- package/dist/helpers/interfaces.d.ts +9 -3
- package/dist/helpers/logger.js +1 -1
- package/dist/helpers/logger.js.map +1 -1
- package/dist/helpers/plist.d.ts +1 -1
- package/dist/helpers/plist.js +1 -1
- package/dist/helpers/plist.js.map +1 -1
- package/dist/helpers/prompt.d.ts +7 -0
- package/dist/helpers/prompt.js +57 -0
- package/dist/helpers/prompt.js.map +1 -0
- package/dist/helpers/renderer.d.ts +60 -0
- package/dist/helpers/renderer.js +98 -0
- package/dist/helpers/renderer.js.map +1 -0
- package/dist/helpers/retry.d.ts +1 -1
- package/dist/helpers/retry.js +3 -3
- package/dist/helpers/retry.js.map +1 -1
- package/dist/helpers/tags.d.ts +8 -0
- package/dist/helpers/tags.js +27 -1
- package/dist/helpers/tags.js.map +1 -1
- package/dist/helpers/upload.js +3 -3
- package/dist/helpers/upload.js.map +1 -1
- package/dist/helpers/user-provided-git.js +6 -6
- package/dist/helpers/user-provided-git.js.map +1 -1
- package/dist/helpers/utils.d.ts +12 -5
- package/dist/helpers/utils.js +57 -25
- package/dist/helpers/utils.js.map +1 -1
- package/dist/helpers/validation.d.ts +3 -1
- package/dist/helpers/validation.js +27 -1
- package/dist/helpers/validation.js.map +1 -1
- package/dist/helpers/version.d.ts +4 -0
- package/dist/helpers/version.js +9 -0
- package/dist/helpers/version.js.map +1 -0
- package/dist/index.d.ts +4 -4
- package/dist/index.js +11 -8
- package/dist/index.js.map +1 -1
- package/package.json +28 -13
- package/dist/commands/lambda/renderers/flare-renderer.d.ts +0 -9
- package/dist/commands/lambda/renderers/flare-renderer.js +0 -22
- package/dist/commands/lambda/renderers/flare-renderer.js.map +0 -1
- package/dist/helpers/file.d.ts +0 -1
- package/dist/helpers/file.js +0 -9
- package/dist/helpers/file.js.map +0 -1
|
@@ -1,4 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
26
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
27
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -15,7 +38,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
38
|
exports.RunTestsCommand = exports.DEFAULT_COMMAND_CONFIG = exports.DEFAULT_POLLING_TIMEOUT = exports.MAX_TESTS_TO_TRIGGER = void 0;
|
|
16
39
|
const clipanion_1 = require("clipanion");
|
|
17
40
|
const deep_extend_1 = __importDefault(require("deep-extend"));
|
|
41
|
+
const terminal_link_1 = __importDefault(require("terminal-link"));
|
|
18
42
|
const utils_1 = require("../../helpers/utils");
|
|
43
|
+
const validation = __importStar(require("../../helpers/validation"));
|
|
19
44
|
const validation_1 = require("../../helpers/validation");
|
|
20
45
|
const errors_1 = require("./errors");
|
|
21
46
|
const default_1 = require("./reporters/default");
|
|
@@ -42,15 +67,57 @@ exports.DEFAULT_COMMAND_CONFIG = {
|
|
|
42
67
|
tunnel: false,
|
|
43
68
|
variableStrings: [],
|
|
44
69
|
};
|
|
70
|
+
const configurationLink = 'https://docs.datadoghq.com/continuous_testing/cicd_integrations/configuration';
|
|
71
|
+
const $1 = (text) => (0, terminal_link_1.default)(text, `${configurationLink}#global-configuration-file-options`);
|
|
72
|
+
const $2 = (text) => (0, terminal_link_1.default)(text, `${configurationLink}#test-files`);
|
|
73
|
+
const $3 = (text) => (0, terminal_link_1.default)(text, `${configurationLink}#use-the-testing-tunnel`);
|
|
45
74
|
class RunTestsCommand extends clipanion_1.Command {
|
|
46
75
|
constructor() {
|
|
47
76
|
super(...arguments);
|
|
77
|
+
this.configPath = clipanion_1.Option.String('--config', { description: `Pass a path to a ${$1('global configuration file')}.` });
|
|
78
|
+
this.jUnitReport = clipanion_1.Option.String('-j,--jUnitReport', { description: 'Pass a path to a JUnit report file.' });
|
|
79
|
+
this.runName = clipanion_1.Option.String('-n,--runName', {
|
|
80
|
+
description: 'A name for this run, which will be included in the JUnit report file.',
|
|
81
|
+
});
|
|
82
|
+
this.apiKey = clipanion_1.Option.String('--apiKey', { description: 'The API key used to query the Datadog API.' });
|
|
83
|
+
this.appKey = clipanion_1.Option.String('--appKey', { description: 'The application key used to query the Datadog API.' });
|
|
84
|
+
this.datadogSite = clipanion_1.Option.String('--datadogSite', { description: 'The Datadog instance to which request is sent.' });
|
|
85
|
+
this.failOnCriticalErrors = clipanion_1.Option.Boolean('--failOnCriticalErrors', {
|
|
86
|
+
description: 'A boolean flag that fails the CI job if no tests were triggered, or results could not be fetched from Datadog.',
|
|
87
|
+
});
|
|
88
|
+
this.failOnMissingTests = clipanion_1.Option.Boolean('--failOnMissingTests', {
|
|
89
|
+
description: `A boolean flag that fails the CI job if at least one specified test with a public ID (a \`--public-id\` CLI argument or listed in a ${$2('test file')} is missing in a run (for example, if it has been deleted programmatically or on the Datadog site).`,
|
|
90
|
+
});
|
|
91
|
+
this.failOnTimeout = clipanion_1.Option.Boolean('--failOnTimeout', {
|
|
92
|
+
description: 'A boolean flag that fails the CI job if at least one test exceeds the default test timeout.',
|
|
93
|
+
});
|
|
94
|
+
this.files = clipanion_1.Option.Array('-f,--files', {
|
|
95
|
+
description: `Glob pattern to detect Synthetic test ${$2('configuration files')}}.`,
|
|
96
|
+
});
|
|
97
|
+
this.mobileApplicationVersionFilePath = clipanion_1.Option.String('--mobileApp,--mobileApplicationVersionFilePath', {
|
|
98
|
+
description: 'Override the application version for all Synthetic mobile application tests.',
|
|
99
|
+
});
|
|
100
|
+
this.pollingTimeout = clipanion_1.Option.String('--pollingTimeout', {
|
|
101
|
+
description: 'The duration (in milliseconds) after which `datadog-ci` stops polling for test results. The default is 30 minutes. At the CI level, test results completed after this duration are considered failed.',
|
|
102
|
+
validator: validation.isInteger(),
|
|
103
|
+
});
|
|
104
|
+
this.publicIds = clipanion_1.Option.Array('-p,--public-id', { description: 'Specify a test to run.' });
|
|
105
|
+
this.subdomain = clipanion_1.Option.String('--subdomain', {
|
|
106
|
+
description: 'The name of the custom subdomain set to access your Datadog application. If the URL used to access Datadog is `myorg.datadoghq.com`, the `subdomain` value needs to be set to `myorg`.',
|
|
107
|
+
});
|
|
108
|
+
this.testSearchQuery = clipanion_1.Option.String('-s,--search', {
|
|
109
|
+
description: 'Pass a query to select which Synthetic tests to run.',
|
|
110
|
+
});
|
|
111
|
+
this.tunnel = clipanion_1.Option.Boolean('-t,--tunnel', {
|
|
112
|
+
description: `Use the ${$3('Continuous Testing Tunnel')} to execute your test batch.`,
|
|
113
|
+
});
|
|
114
|
+
this.variableStrings = clipanion_1.Option.Array('-v,--variable', { description: 'Pass a variable override.' });
|
|
48
115
|
this.config = JSON.parse(JSON.stringify(exports.DEFAULT_COMMAND_CONFIG)); // Deep copy to avoid mutation during unit tests
|
|
49
116
|
}
|
|
50
117
|
execute() {
|
|
51
118
|
return __awaiter(this, void 0, void 0, function* () {
|
|
52
119
|
const reporters = [new default_1.DefaultReporter(this)];
|
|
53
|
-
this.reporter = utils_2.getReporter(reporters);
|
|
120
|
+
this.reporter = (0, utils_2.getReporter)(reporters);
|
|
54
121
|
if (this.jUnitReport) {
|
|
55
122
|
reporters.push(new junit_1.JUnitReporter(this));
|
|
56
123
|
}
|
|
@@ -59,7 +126,7 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
59
126
|
}
|
|
60
127
|
catch (error) {
|
|
61
128
|
if (error instanceof errors_1.CiError) {
|
|
62
|
-
utils_2.reportCiError(error, this.reporter);
|
|
129
|
+
(0, utils_2.reportCiError)(error, this.reporter);
|
|
63
130
|
}
|
|
64
131
|
return 1;
|
|
65
132
|
}
|
|
@@ -71,14 +138,14 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
71
138
|
let summary;
|
|
72
139
|
try {
|
|
73
140
|
;
|
|
74
|
-
({ results, summary } = yield run_tests_lib_1.executeTests(this.reporter, this.config));
|
|
141
|
+
({ results, summary } = yield (0, run_tests_lib_1.executeTests)(this.reporter, this.config));
|
|
75
142
|
}
|
|
76
143
|
catch (error) {
|
|
77
|
-
utils_2.reportExitLogs(this.reporter, this.config, { error });
|
|
78
|
-
return utils_2.toExitCode(utils_2.getExitReason(this.config, { error }));
|
|
144
|
+
(0, utils_2.reportExitLogs)(this.reporter, this.config, { error });
|
|
145
|
+
return (0, utils_2.toExitCode)((0, utils_2.getExitReason)(this.config, { error }));
|
|
79
146
|
}
|
|
80
|
-
const orgSettings = yield utils_2.getOrgSettings(this.reporter, this.config);
|
|
81
|
-
utils_2.renderResults({
|
|
147
|
+
const orgSettings = yield (0, utils_2.getOrgSettings)(this.reporter, this.config);
|
|
148
|
+
(0, utils_2.renderResults)({
|
|
82
149
|
config: this.config,
|
|
83
150
|
orgSettings,
|
|
84
151
|
reporter: this.reporter,
|
|
@@ -86,17 +153,17 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
86
153
|
startTime,
|
|
87
154
|
summary,
|
|
88
155
|
});
|
|
89
|
-
utils_2.reportExitLogs(this.reporter, this.config, { results });
|
|
90
|
-
return utils_2.toExitCode(utils_2.getExitReason(this.config, { results }));
|
|
156
|
+
(0, utils_2.reportExitLogs)(this.reporter, this.config, { results });
|
|
157
|
+
return (0, utils_2.toExitCode)((0, utils_2.getExitReason)(this.config, { results }));
|
|
91
158
|
});
|
|
92
159
|
}
|
|
93
160
|
resolveConfig() {
|
|
94
|
-
var _a, _b;
|
|
161
|
+
var _a, _b, _c;
|
|
95
162
|
return __awaiter(this, void 0, void 0, function* () {
|
|
96
163
|
// Defaults < file < ENV < CLI
|
|
97
164
|
// Override with config file variables (e.g. datadog-ci.json)
|
|
98
165
|
try {
|
|
99
|
-
this.config = yield utils_1.resolveConfigFromFile(this.config, {
|
|
166
|
+
this.config = yield (0, utils_1.resolveConfigFromFile)(this.config, {
|
|
100
167
|
configPath: this.configPath,
|
|
101
168
|
defaultConfigPaths: [this.config.configPath],
|
|
102
169
|
});
|
|
@@ -107,7 +174,7 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
107
174
|
}
|
|
108
175
|
}
|
|
109
176
|
// Override with ENV variables
|
|
110
|
-
this.config = deep_extend_1.default(this.config, utils_1.removeUndefinedValues({
|
|
177
|
+
this.config = (0, deep_extend_1.default)(this.config, (0, utils_1.removeUndefinedValues)({
|
|
111
178
|
apiKey: process.env.DATADOG_API_KEY,
|
|
112
179
|
appKey: process.env.DATADOG_APP_KEY,
|
|
113
180
|
datadogSite: process.env.DATADOG_SITE,
|
|
@@ -115,7 +182,7 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
115
182
|
subdomain: process.env.DATADOG_SUBDOMAIN,
|
|
116
183
|
}));
|
|
117
184
|
// Override with CLI parameters
|
|
118
|
-
this.config = deep_extend_1.default(this.config, utils_1.removeUndefinedValues({
|
|
185
|
+
this.config = (0, deep_extend_1.default)(this.config, (0, utils_1.removeUndefinedValues)({
|
|
119
186
|
apiKey: this.apiKey,
|
|
120
187
|
appKey: this.appKey,
|
|
121
188
|
configPath: this.configPath,
|
|
@@ -129,46 +196,45 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
129
196
|
testSearchQuery: this.testSearchQuery,
|
|
130
197
|
tunnel: this.tunnel,
|
|
131
198
|
}));
|
|
132
|
-
let pollingTimeoutCliArgument;
|
|
133
|
-
try {
|
|
134
|
-
pollingTimeoutCliArgument = utils_1.parseOptionalInteger(this.pollingTimeout);
|
|
135
|
-
}
|
|
136
|
-
catch (error) {
|
|
137
|
-
throw new errors_1.CiError('INVALID_CONFIG', `Invalid value for \`pollingTimeout\`: ${error.message}`);
|
|
138
|
-
}
|
|
139
199
|
// Override with Global CLI parameters
|
|
140
|
-
this.config.global = deep_extend_1.default(this.config.global, utils_1.removeUndefinedValues({
|
|
200
|
+
this.config.global = (0, deep_extend_1.default)(this.config.global, (0, utils_1.removeUndefinedValues)({
|
|
141
201
|
mobileApplicationVersionFilePath: this.mobileApplicationVersionFilePath,
|
|
142
|
-
variables: utils_2.parseVariablesFromCli(this.variableStrings, (log) => { var _a; return (_a = this.reporter) === null || _a === void 0 ? void 0 : _a.log(log); }),
|
|
143
|
-
pollingTimeout: (_b =
|
|
202
|
+
variables: (0, utils_2.parseVariablesFromCli)(this.variableStrings, (log) => { var _a; return (_a = this.reporter) === null || _a === void 0 ? void 0 : _a.log(log); }),
|
|
203
|
+
pollingTimeout: (_c = (_b = this.pollingTimeout) !== null && _b !== void 0 ? _b : this.config.global.pollingTimeout) !== null && _c !== void 0 ? _c : this.config.pollingTimeout,
|
|
144
204
|
}));
|
|
145
205
|
if (typeof this.config.files === 'string') {
|
|
146
206
|
this.reporter.log('[DEPRECATED] "files" should be an array of string instead of a string.\n');
|
|
147
207
|
this.config.files = [this.config.files];
|
|
148
208
|
}
|
|
149
|
-
if (!validation_1.isValidDatadogSite(this.config.datadogSite)) {
|
|
209
|
+
if (!(0, validation_1.isValidDatadogSite)(this.config.datadogSite)) {
|
|
150
210
|
throw new errors_1.CiError('INVALID_CONFIG', `The \`datadogSite\` config property (${JSON.stringify(this.config.datadogSite)}) must match one of the sites supported by Datadog.\nFor more information, see "Site parameter" in our documentation: https://docs.datadoghq.com/getting_started/site/#access-the-datadog-site`);
|
|
151
211
|
}
|
|
152
212
|
});
|
|
153
213
|
}
|
|
154
214
|
}
|
|
155
215
|
exports.RunTestsCommand = RunTestsCommand;
|
|
156
|
-
RunTestsCommand.
|
|
157
|
-
RunTestsCommand.
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
216
|
+
RunTestsCommand.paths = [['synthetics', 'run-tests']];
|
|
217
|
+
RunTestsCommand.usage = clipanion_1.Command.Usage({
|
|
218
|
+
category: 'Synthetics',
|
|
219
|
+
description: 'Run Synthetic tests with Datadog.',
|
|
220
|
+
details: `
|
|
221
|
+
This command will run Synthetic tests with Datadog, wait for the results and report a summary.\n
|
|
222
|
+
https://docs.datadoghq.com/continuous_testing/cicd_integrations
|
|
223
|
+
`,
|
|
224
|
+
examples: [
|
|
225
|
+
[
|
|
226
|
+
'Explicitly specify multiple tests to run',
|
|
227
|
+
'datadog-ci synthetics run-tests --public-id pub-lic-id1 --public-id pub-lic-id2',
|
|
228
|
+
],
|
|
229
|
+
['Discover tests with a search query', "datadog-ci synthetics run-tests --search 'tag:e2e-tests'"],
|
|
230
|
+
[
|
|
231
|
+
'Override the default glob pattern to group the tests in suites',
|
|
232
|
+
'datadog-ci synthetics run-tests -f ./component-1/**/*.synthetics.json -f ./component-2/**/*.synthetics.json',
|
|
233
|
+
],
|
|
234
|
+
[
|
|
235
|
+
'Pass variables as arguments',
|
|
236
|
+
'datadog-ci synthetics run-tests -f ./component-1/**/*.synthetics.json --variable PASSWORD=$PASSWORD',
|
|
237
|
+
],
|
|
238
|
+
],
|
|
239
|
+
});
|
|
174
240
|
//# sourceMappingURL=run-tests-command.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-tests-command.js","sourceRoot":"","sources":["../../../src/commands/synthetics/run-tests-command.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run-tests-command.js","sourceRoot":"","sources":["../../../src/commands/synthetics/run-tests-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { APIHelper } from './api';
|
|
2
2
|
import { MainReporter, Reporter, Result, RunTestsCommandConfig, Suite, Summary, SupportedReporter, UserConfigOverride, WrapperConfig } from './interfaces';
|
|
3
|
-
export declare const executeTests: (reporter: MainReporter, config: RunTestsCommandConfig, suites?: Suite[]
|
|
3
|
+
export declare const executeTests: (reporter: MainReporter, config: RunTestsCommandConfig, suites?: Suite[]) => Promise<{
|
|
4
4
|
results: Result[];
|
|
5
5
|
summary: Summary;
|
|
6
6
|
}>;
|
|
@@ -19,7 +19,7 @@ const run_tests_command_1 = require("./run-tests-command");
|
|
|
19
19
|
const tunnel_1 = require("./tunnel");
|
|
20
20
|
const utils_2 = require("./utils");
|
|
21
21
|
const executeTests = (reporter, config, suites) => __awaiter(void 0, void 0, void 0, function* () {
|
|
22
|
-
const api = api_1.getApiHelper(config);
|
|
22
|
+
const api = (0, api_1.getApiHelper)(config);
|
|
23
23
|
const publicIdsFromCli = config.publicIds.map((id) => {
|
|
24
24
|
var _a;
|
|
25
25
|
return ({
|
|
@@ -39,10 +39,10 @@ const executeTests = (reporter, config, suites) => __awaiter(void 0, void 0, voi
|
|
|
39
39
|
}
|
|
40
40
|
else {
|
|
41
41
|
try {
|
|
42
|
-
testsToTrigger = yield exports.getTestsList(api, config, reporter, suites);
|
|
42
|
+
testsToTrigger = yield (0, exports.getTestsList)(api, config, reporter, suites);
|
|
43
43
|
}
|
|
44
44
|
catch (error) {
|
|
45
|
-
throw new errors_1.CriticalError(api_1.isForbiddenError(error) ? 'AUTHORIZATION_ERROR' : 'UNAVAILABLE_TEST_CONFIG', error.message);
|
|
45
|
+
throw new errors_1.CriticalError((0, api_1.isForbiddenError)(error) ? 'AUTHORIZATION_ERROR' : 'UNAVAILABLE_TEST_CONFIG', error.message);
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
48
|
if (!testsToTrigger.length) {
|
|
@@ -51,13 +51,13 @@ const executeTests = (reporter, config, suites) => __awaiter(void 0, void 0, voi
|
|
|
51
51
|
let testsToTriggerResult;
|
|
52
52
|
try {
|
|
53
53
|
const triggerFromSearch = !!config.testSearchQuery;
|
|
54
|
-
testsToTriggerResult = yield utils_2.getTestsToTrigger(api, testsToTrigger, reporter, triggerFromSearch, config.failOnMissingTests, config.tunnel);
|
|
54
|
+
testsToTriggerResult = yield (0, utils_2.getTestsToTrigger)(api, testsToTrigger, reporter, triggerFromSearch, config.failOnMissingTests, config.tunnel);
|
|
55
55
|
}
|
|
56
56
|
catch (error) {
|
|
57
57
|
if (error instanceof errors_1.CiError) {
|
|
58
58
|
throw error;
|
|
59
59
|
}
|
|
60
|
-
throw new errors_1.CriticalError(api_1.isForbiddenError(error) ? 'AUTHORIZATION_ERROR' : 'UNAVAILABLE_TEST_CONFIG', error.message);
|
|
60
|
+
throw new errors_1.CriticalError((0, api_1.isForbiddenError)(error) ? 'AUTHORIZATION_ERROR' : 'UNAVAILABLE_TEST_CONFIG', error.message);
|
|
61
61
|
}
|
|
62
62
|
const { tests, overriddenTestsToTrigger, initialSummary } = testsToTriggerResult;
|
|
63
63
|
// All tests have been skipped or are missing.
|
|
@@ -76,8 +76,8 @@ const executeTests = (reporter, config, suites) => __awaiter(void 0, void 0, voi
|
|
|
76
76
|
}
|
|
77
77
|
// Open a tunnel to Datadog
|
|
78
78
|
try {
|
|
79
|
-
const tunnelProxyAgent = utils_1.getProxyAgent(config.proxy);
|
|
80
|
-
const tunnelReporter = default_1.getTunnelReporter(reporter);
|
|
79
|
+
const tunnelProxyAgent = (0, utils_1.getProxyAgent)(config.proxy);
|
|
80
|
+
const tunnelReporter = (0, default_1.getTunnelReporter)(reporter);
|
|
81
81
|
tunnel = new tunnel_1.Tunnel(presignedURL, publicIdsToTrigger, tunnelProxyAgent, tunnelReporter);
|
|
82
82
|
const tunnelInfo = yield tunnel.start();
|
|
83
83
|
overriddenTestsToTrigger.forEach((testToTrigger) => {
|
|
@@ -91,7 +91,7 @@ const executeTests = (reporter, config, suites) => __awaiter(void 0, void 0, voi
|
|
|
91
91
|
}
|
|
92
92
|
let trigger;
|
|
93
93
|
try {
|
|
94
|
-
trigger = yield utils_2.runTests(api, overriddenTestsToTrigger);
|
|
94
|
+
trigger = yield (0, utils_2.runTests)(api, overriddenTestsToTrigger);
|
|
95
95
|
}
|
|
96
96
|
catch (error) {
|
|
97
97
|
yield stopTunnel();
|
|
@@ -100,7 +100,7 @@ const executeTests = (reporter, config, suites) => __awaiter(void 0, void 0, voi
|
|
|
100
100
|
try {
|
|
101
101
|
const maxPollingTimeout = Math.max(...testsToTrigger.map((t) => t.config.pollingTimeout || config.pollingTimeout));
|
|
102
102
|
const { datadogSite, failOnCriticalErrors, failOnTimeout, subdomain } = config;
|
|
103
|
-
const results = yield utils_2.waitForResults(api, trigger, tests, { datadogSite, failOnCriticalErrors, failOnTimeout, subdomain, maxPollingTimeout }, reporter, tunnel);
|
|
103
|
+
const results = yield (0, utils_2.waitForResults)(api, trigger, tests, { datadogSite, failOnCriticalErrors, failOnTimeout, subdomain, maxPollingTimeout }, reporter, tunnel);
|
|
104
104
|
return {
|
|
105
105
|
results,
|
|
106
106
|
summary: Object.assign(Object.assign({}, initialSummary), { batchId: trigger.batch_id }),
|
|
@@ -132,7 +132,7 @@ const getTestsList = (api, config, reporter, suites = []) => __awaiter(void 0, v
|
|
|
132
132
|
}
|
|
133
133
|
return testsToTriggerBySearchQuery;
|
|
134
134
|
}
|
|
135
|
-
const suitesFromFiles = (yield Promise.all(config.files.map((glob) => utils_2.getSuites(glob, reporter))))
|
|
135
|
+
const suitesFromFiles = (yield Promise.all(config.files.map((glob) => (0, utils_2.getSuites)(glob, reporter))))
|
|
136
136
|
.reduce((acc, val) => acc.concat(val), [])
|
|
137
137
|
.filter((suite) => !!suite.content.tests);
|
|
138
138
|
suites.push(...suitesFromFiles);
|
|
@@ -182,10 +182,10 @@ const execute = (runConfig, { jUnitReport, reporters, runId, suites, }) => __awa
|
|
|
182
182
|
else {
|
|
183
183
|
localReporters.push(new default_1.DefaultReporter({ context: process }));
|
|
184
184
|
}
|
|
185
|
-
const mainReporter = utils_2.getReporter(localReporters);
|
|
186
|
-
const { results, summary } = yield exports.executeTests(mainReporter, localConfig, suites);
|
|
187
|
-
const orgSettings = yield utils_2.getOrgSettings(mainReporter, localConfig);
|
|
188
|
-
utils_2.renderResults({
|
|
185
|
+
const mainReporter = (0, utils_2.getReporter)(localReporters);
|
|
186
|
+
const { results, summary } = yield (0, exports.executeTests)(mainReporter, localConfig, suites);
|
|
187
|
+
const orgSettings = yield (0, utils_2.getOrgSettings)(mainReporter, localConfig);
|
|
188
|
+
(0, utils_2.renderResults)({
|
|
189
189
|
config: localConfig,
|
|
190
190
|
reporter: mainReporter,
|
|
191
191
|
results,
|
|
@@ -193,8 +193,8 @@ const execute = (runConfig, { jUnitReport, reporters, runId, suites, }) => __awa
|
|
|
193
193
|
startTime,
|
|
194
194
|
summary,
|
|
195
195
|
});
|
|
196
|
-
utils_2.reportExitLogs(mainReporter, localConfig, { results });
|
|
197
|
-
return utils_2.toExitCode(utils_2.getExitReason(localConfig, { results }));
|
|
196
|
+
(0, utils_2.reportExitLogs)(mainReporter, localConfig, { results });
|
|
197
|
+
return (0, utils_2.toExitCode)((0, utils_2.getExitReason)(localConfig, { results }));
|
|
198
198
|
});
|
|
199
199
|
exports.execute = execute;
|
|
200
200
|
//# sourceMappingURL=run-tests-lib.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-tests-lib.js","sourceRoot":"","sources":["../../../src/commands/synthetics/run-tests-lib.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAiD;AAEjD,+BAA+D;AAC/D,qCAA+C;AAgB/C,iDAAsE;AACtE,6CAA+C;AAC/C,2DAAgF;AAChF,qCAA+B;AAC/B,mCAYgB;AAET,MAAM,YAAY,GAAG,CAC1B,QAAsB,EACtB,MAA6B,EAC7B,MAAgB,EAIf,EAAE;IACH,MAAM,GAAG,GAAG,kBAAY,
|
|
1
|
+
{"version":3,"file":"run-tests-lib.js","sourceRoot":"","sources":["../../../src/commands/synthetics/run-tests-lib.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ const sshpk_1 = require("sshpk");
|
|
|
7
7
|
// Generate public/private key in OpenSSH format (used for encryption in tunnel over SSH)
|
|
8
8
|
const generateOpenSSHKeys = () => {
|
|
9
9
|
const format = 'pem';
|
|
10
|
-
const { publicKey, privateKey } = crypto_1.generateKeyPairSync('ec', {
|
|
10
|
+
const { publicKey, privateKey } = (0, crypto_1.generateKeyPairSync)('ec', {
|
|
11
11
|
namedCurve: 'P-256',
|
|
12
12
|
privateKeyEncoding: {
|
|
13
13
|
format,
|
|
@@ -18,8 +18,8 @@ const generateOpenSSHKeys = () => {
|
|
|
18
18
|
type: 'spki',
|
|
19
19
|
},
|
|
20
20
|
});
|
|
21
|
-
const openSSHPublicKey = sshpk_1.parseKey(publicKey, format).toBuffer('ssh', {}).toString('utf-8');
|
|
22
|
-
const openSSHPrivateKey = sshpk_1.parsePrivateKey(privateKey, format).toBuffer('ssh', {}).toString('utf-8');
|
|
21
|
+
const openSSHPublicKey = (0, sshpk_1.parseKey)(publicKey, format).toBuffer('ssh', {}).toString('utf-8');
|
|
22
|
+
const openSSHPrivateKey = (0, sshpk_1.parsePrivateKey)(privateKey, format).toBuffer('ssh', {}).toString('utf-8');
|
|
23
23
|
return {
|
|
24
24
|
privateKey: openSSHPrivateKey,
|
|
25
25
|
publicKey: openSSHPublicKey,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/tunnel/crypto.ts"],"names":[],"mappings":";;;AAAA,mCAA0C;AAE1C,+BAAqC;AACrC,iCAA+C;AAE/C,yFAAyF;AAClF,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,MAAM,MAAM,GAAG,KAAK,CAAA;IACpB,MAAM,EAAC,SAAS,EAAE,UAAU,EAAC,GAAG,4BAAmB,
|
|
1
|
+
{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/tunnel/crypto.ts"],"names":[],"mappings":";;;AAAA,mCAA0C;AAE1C,+BAAqC;AACrC,iCAA+C;AAE/C,yFAAyF;AAClF,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,MAAM,MAAM,GAAG,KAAK,CAAA;IACpB,MAAM,EAAC,SAAS,EAAE,UAAU,EAAC,GAAG,IAAA,4BAAmB,EAAC,IAAI,EAAE;QACxD,UAAU,EAAE,OAAO;QACnB,kBAAkB,EAAE;YAClB,MAAM;YACN,IAAI,EAAE,OAAO;SACd;QACD,iBAAiB,EAAE;YACjB,MAAM;YACN,IAAI,EAAE,MAAM;SACb;KACF,CAAC,CAAA;IACF,MAAM,gBAAgB,GAAG,IAAA,gBAAQ,EAAC,SAAS,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;IAC1F,MAAM,iBAAiB,GAAG,IAAA,uBAAe,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;IAEnG,OAAO;QACL,UAAU,EAAE,iBAAiB;QAC7B,SAAS,EAAE,gBAAgB;KAC5B,CAAA;AACH,CAAC,CAAA;AApBY,QAAA,mBAAmB,uBAoB/B;AAED,gCAAgC;AACzB,MAAM,WAAW,GAAG,CAAC,GAAW,EAAa,EAAE;IACpD,MAAM,SAAS,GAAG,YAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;IAErC,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,eAAe,GAAG,EAAE,CAAC,CAAA;KACtC;IAED,IAAI,SAAS,YAAY,KAAK,EAAE;QAC9B,MAAM,SAAS,CAAA;KAChB;IAED,IAAI,SAAS,YAAY,KAAK,EAAE;QAC9B,mFAAmF;QACnF,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,eAAe,GAAG,EAAE,CAAC,CAAA;SACtC;QAED,OAAO,SAAS,CAAC,CAAC,CAAC,CAAA;KACpB;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AArBY,QAAA,WAAW,eAqBvB"}
|
|
@@ -30,10 +30,10 @@ class Tunnel {
|
|
|
30
30
|
this.connected = false;
|
|
31
31
|
this.forwardedSockets = new Set();
|
|
32
32
|
// Setup SSH
|
|
33
|
-
const { privateKey: hostPrivateKey } = crypto_2.generateOpenSSHKeys();
|
|
34
|
-
const parsedHostPrivateKey = crypto_2.parseSSHKey(hostPrivateKey);
|
|
35
|
-
const { publicKey, privateKey } = crypto_2.generateOpenSSHKeys();
|
|
36
|
-
this.publicKey = crypto_2.parseSSHKey(publicKey);
|
|
33
|
+
const { privateKey: hostPrivateKey } = (0, crypto_2.generateOpenSSHKeys)();
|
|
34
|
+
const parsedHostPrivateKey = (0, crypto_2.parseSSHKey)(hostPrivateKey);
|
|
35
|
+
const { publicKey, privateKey } = (0, crypto_2.generateOpenSSHKeys)();
|
|
36
|
+
this.publicKey = (0, crypto_2.parseSSHKey)(publicKey);
|
|
37
37
|
this.privateKey = privateKey;
|
|
38
38
|
this.sshConfig = {
|
|
39
39
|
algorithms: {
|
|
@@ -105,7 +105,7 @@ class Tunnel {
|
|
|
105
105
|
const allowedUsers = this.testIDs.map((testId) => Buffer.from(testId));
|
|
106
106
|
// Ensure username is allowed
|
|
107
107
|
const user = Buffer.from(ctx.username);
|
|
108
|
-
if (!allowedUsers.some((allowedUser) => user.length === allowedUser.length && crypto_1.timingSafeEqual(user, allowedUser))) {
|
|
108
|
+
if (!allowedUsers.some((allowedUser) => user.length === allowedUser.length && (0, crypto_1.timingSafeEqual)(user, allowedUser))) {
|
|
109
109
|
return ctx.reject();
|
|
110
110
|
}
|
|
111
111
|
// Only allow key authentication
|
|
@@ -115,7 +115,7 @@ class Tunnel {
|
|
|
115
115
|
const allowedPubSSHKey = Buffer.from(this.publicKey.getPublicSSH());
|
|
116
116
|
if (ctx.key.algo !== this.publicKey.type ||
|
|
117
117
|
ctx.key.data.length !== allowedPubSSHKey.length ||
|
|
118
|
-
!crypto_1.timingSafeEqual(ctx.key.data, allowedPubSSHKey) ||
|
|
118
|
+
!(0, crypto_1.timingSafeEqual)(ctx.key.data, allowedPubSSHKey) ||
|
|
119
119
|
(ctx.signature && ctx.blob && !this.publicKey.verify(ctx.blob, ctx.signature))) {
|
|
120
120
|
// Invalid key authentication
|
|
121
121
|
return ctx.reject();
|
|
@@ -164,8 +164,8 @@ class Tunnel {
|
|
|
164
164
|
if (!src) {
|
|
165
165
|
return dest.end();
|
|
166
166
|
}
|
|
167
|
-
stream_1.pipeline([dest, src], () => this.forwardedSockets.delete(dest));
|
|
168
|
-
stream_1.pipeline([src, dest], () => this.forwardedSockets.delete(dest));
|
|
167
|
+
(0, stream_1.pipeline)([dest, src], () => this.forwardedSockets.delete(dest));
|
|
168
|
+
(0, stream_1.pipeline)([src, dest], () => this.forwardedSockets.delete(dest));
|
|
169
169
|
src.on('close', () => {
|
|
170
170
|
dest.end();
|
|
171
171
|
dest.destroy();
|
|
@@ -234,13 +234,13 @@ class Tunnel {
|
|
|
234
234
|
const duplex = this.ws.duplex();
|
|
235
235
|
this.multiplexer.on('error', (error) => { var _a; return (_a = this.reporter) === null || _a === void 0 ? void 0 : _a.warn(`Multiplexer error: ${error.message}`); });
|
|
236
236
|
duplex.on('error', (error) => { var _a; return (_a = this.reporter) === null || _a === void 0 ? void 0 : _a.warn(`Websocket error: ${error.message}`); });
|
|
237
|
-
stream_1.pipeline([duplex, this.multiplexer], (err) => {
|
|
237
|
+
(0, stream_1.pipeline)([duplex, this.multiplexer], (err) => {
|
|
238
238
|
var _a;
|
|
239
239
|
if (err) {
|
|
240
240
|
(_a = this.reporter) === null || _a === void 0 ? void 0 : _a.warn(`Error on duplex connection close: ${err}`);
|
|
241
241
|
}
|
|
242
242
|
});
|
|
243
|
-
stream_1.pipeline([this.multiplexer, duplex], (err) => {
|
|
243
|
+
(0, stream_1.pipeline)([this.multiplexer, duplex], (err) => {
|
|
244
244
|
var _a;
|
|
245
245
|
if (err) {
|
|
246
246
|
(_a = this.reporter) === null || _a === void 0 ? void 0 : _a.warn(`Error on Multiplexer connection close: ${err}`);
|
|
@@ -270,7 +270,7 @@ class Tunnel {
|
|
|
270
270
|
// 'connection' event listener is required otherwise connection wont proceed.
|
|
271
271
|
});
|
|
272
272
|
const { ident } = this.sshConfig;
|
|
273
|
-
const hostKeys = { 'ecdsa-sha2-nistp256': crypto_2.parseSSHKey(this.sshConfig.hostKeys[0]) };
|
|
273
|
+
const hostKeys = { 'ecdsa-sha2-nistp256': (0, crypto_2.parseSSHKey)(this.sshConfig.hostKeys[0]) };
|
|
274
274
|
const encryptionConfig = {
|
|
275
275
|
cipher: SSH_CONSTANTS.DEFAULT_CIPHER,
|
|
276
276
|
compress: SSH_CONSTANTS.DEFAULT_COMPRESSION,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/tunnel/tunnel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAsC;AACtC,6BAA0B;AAC1B,mCAAuC;AAIvC,+BAOa;AACb,uCAA2E;AAE3E,qCAAyD;AACzD,2CAAqC;AAErC,kHAAkH;AAClH,MAAM,aAAa,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAC5D,kHAAkH;AAClH,MAAM,EAAC,OAAO,EAAC,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAclD,MAAa,MAAM;IAYjB,YACU,GAAW,EACX,OAAiB,EACzB,UAAuB,EACf,QAAyB;QAHzB,QAAG,GAAH,GAAG,CAAQ;QACX,YAAO,GAAP,OAAO,CAAU;QAEjB,aAAQ,GAAR,QAAQ,CAAiB;QAf3B,uBAAkB,GAAG,KAAc,CAAA;QAMnC,cAAS,GAAG,KAAK,CAAA;QAGjB,qBAAgB,GAAgB,IAAI,GAAG,EAAE,CAAA;QAQ/C,YAAY;QACZ,MAAM,EAAC,UAAU,EAAE,cAAc,EAAC,GAAG,4BAAmB,
|
|
1
|
+
{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/tunnel/tunnel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -48,7 +52,7 @@ class WebSocket extends events_1.EventEmitter {
|
|
|
48
52
|
if (gracefullyClose) {
|
|
49
53
|
// Gracefully close the tunnel
|
|
50
54
|
this.websocket.close();
|
|
51
|
-
yield events_1.once(this.websocket, 'close');
|
|
55
|
+
yield (0, events_1.once)(this.websocket, 'close');
|
|
52
56
|
}
|
|
53
57
|
// Clean up the underlying socket
|
|
54
58
|
this.websocket.terminate();
|
|
@@ -73,7 +77,7 @@ class WebSocket extends events_1.EventEmitter {
|
|
|
73
77
|
if (!this.websocket) {
|
|
74
78
|
throw new Error('You must start the WebSocket connection before calling duplex');
|
|
75
79
|
}
|
|
76
|
-
return ws_1.createWebSocketStream(this.websocket, {
|
|
80
|
+
return (0, ws_1.createWebSocketStream)(this.websocket, {
|
|
77
81
|
// Increase websocket buffer sizes from 16kb to 64kb.
|
|
78
82
|
readableHighWaterMark: 64 * 1024,
|
|
79
83
|
writableHighWaterMark: 64 * 1024,
|