@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
|
@@ -14,16 +14,20 @@ const client_cloudwatch_logs_1 = require("@aws-sdk/client-cloudwatch-logs");
|
|
|
14
14
|
const client_iam_1 = require("@aws-sdk/client-iam");
|
|
15
15
|
const client_sfn_1 = require("@aws-sdk/client-sfn");
|
|
16
16
|
const clipanion_1 = require("clipanion");
|
|
17
|
+
const version_1 = require("../../helpers/version");
|
|
17
18
|
const awsCommands_1 = require("./awsCommands");
|
|
18
19
|
const constants_1 = require("./constants");
|
|
19
20
|
const helpers_1 = require("./helpers");
|
|
20
|
-
const cliVersion =
|
|
21
|
+
const cliVersion = version_1.version;
|
|
21
22
|
class InstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
22
23
|
constructor() {
|
|
23
24
|
super(...arguments);
|
|
24
|
-
this.dryRun = false;
|
|
25
|
-
this.
|
|
26
|
-
this.
|
|
25
|
+
this.dryRun = clipanion_1.Option.Boolean('-d,--dry-run', false);
|
|
26
|
+
this.environment = clipanion_1.Option.String('-e,--env');
|
|
27
|
+
this.forwarderArn = clipanion_1.Option.String('--forwarder');
|
|
28
|
+
this.service = clipanion_1.Option.String('--service');
|
|
29
|
+
this.stepFunctionArns = clipanion_1.Option.Array('-s,--step-function');
|
|
30
|
+
this.mergeStepFunctionAndLambdaTraces = clipanion_1.Option.Boolean('-mlt,--merge-lambda-traces,--merge-step-function-and-lambda-traces', false);
|
|
27
31
|
}
|
|
28
32
|
execute() {
|
|
29
33
|
var _a, _b, _c, _d, _e, _f;
|
|
@@ -33,7 +37,7 @@ class InstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
33
37
|
this.context.stdout.write('[Error] `--forwarder` is required\n');
|
|
34
38
|
validationError = true;
|
|
35
39
|
}
|
|
36
|
-
else if (!helpers_1.isValidArn(this.forwarderArn)) {
|
|
40
|
+
else if (!(0, helpers_1.isValidArn)(this.forwarderArn)) {
|
|
37
41
|
this.context.stdout.write(`[Error] Invalid arn format for \`--forwarder\` ${this.forwarderArn}\n`);
|
|
38
42
|
validationError = true;
|
|
39
43
|
}
|
|
@@ -47,7 +51,7 @@ class InstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
47
51
|
validationError = true;
|
|
48
52
|
}
|
|
49
53
|
for (const stepFunctionArn of stepFunctionArns) {
|
|
50
|
-
if (!helpers_1.isValidArn(stepFunctionArn)) {
|
|
54
|
+
if (!(0, helpers_1.isValidArn)(stepFunctionArn)) {
|
|
51
55
|
this.context.stdout.write(`[Error] Invalid arn format for \`--step-function\` ${stepFunctionArn}\n`);
|
|
52
56
|
validationError = true;
|
|
53
57
|
}
|
|
@@ -60,14 +64,14 @@ class InstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
60
64
|
for (const stepFunctionArn of stepFunctionArns) {
|
|
61
65
|
this.context.stdout.write(`\n======= ${this.dryRun ? '[Dry Run] Planning for' : 'For'} ${stepFunctionArn} =========\n`);
|
|
62
66
|
// use region from the step function arn to make requests to AWS
|
|
63
|
-
const arnObject = helpers_1.parseArn(stepFunctionArn);
|
|
67
|
+
const arnObject = (0, helpers_1.parseArn)(stepFunctionArn);
|
|
64
68
|
const region = arnObject.region;
|
|
65
69
|
const cloudWatchLogsClient = new client_cloudwatch_logs_1.CloudWatchLogsClient({ region });
|
|
66
70
|
const stepFunctionsClient = new client_sfn_1.SFNClient({ region });
|
|
67
71
|
const iamClient = new client_iam_1.IAMClient({ region });
|
|
68
72
|
let describeStateMachineCommandOutput;
|
|
69
73
|
try {
|
|
70
|
-
describeStateMachineCommandOutput = yield awsCommands_1.describeStateMachine(stepFunctionsClient, stepFunctionArn);
|
|
74
|
+
describeStateMachineCommandOutput = yield (0, awsCommands_1.describeStateMachine)(stepFunctionsClient, stepFunctionArn);
|
|
71
75
|
}
|
|
72
76
|
catch (err) {
|
|
73
77
|
if (err instanceof Error) {
|
|
@@ -77,7 +81,7 @@ class InstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
77
81
|
}
|
|
78
82
|
let listStepFunctionTagsResponse;
|
|
79
83
|
try {
|
|
80
|
-
listStepFunctionTagsResponse = yield awsCommands_1.listTagsForResource(stepFunctionsClient, stepFunctionArn);
|
|
84
|
+
listStepFunctionTagsResponse = yield (0, awsCommands_1.listTagsForResource)(stepFunctionsClient, stepFunctionArn);
|
|
81
85
|
}
|
|
82
86
|
catch (err) {
|
|
83
87
|
if (err instanceof Error) {
|
|
@@ -111,7 +115,7 @@ class InstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
111
115
|
}
|
|
112
116
|
if (stepFunctionTagsToAdd.length > 0) {
|
|
113
117
|
try {
|
|
114
|
-
yield awsCommands_1.tagResource(stepFunctionsClient, stepFunctionArn, stepFunctionTagsToAdd, this.context, this.dryRun);
|
|
118
|
+
yield (0, awsCommands_1.tagResource)(stepFunctionsClient, stepFunctionArn, stepFunctionTagsToAdd, this.context, this.dryRun);
|
|
115
119
|
}
|
|
116
120
|
catch (err) {
|
|
117
121
|
if (err instanceof Error) {
|
|
@@ -122,13 +126,13 @@ class InstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
122
126
|
hasChanges = true;
|
|
123
127
|
}
|
|
124
128
|
const stateMachineName = describeStateMachineCommandOutput.name;
|
|
125
|
-
const subscriptionFilterName = helpers_1.buildSubscriptionFilterName(stateMachineName);
|
|
129
|
+
const subscriptionFilterName = (0, helpers_1.buildSubscriptionFilterName)(stateMachineName);
|
|
126
130
|
const logLevel = (_e = describeStateMachineCommandOutput.loggingConfiguration) === null || _e === void 0 ? void 0 : _e.level;
|
|
127
131
|
if (logLevel === 'OFF') {
|
|
128
132
|
// if step function logging is disabled, create a log group, subscribe the forwarder to it, and enable step function logging to the created log group
|
|
129
|
-
const logGroupName = helpers_1.buildLogGroupName(stateMachineName, this.environment);
|
|
133
|
+
const logGroupName = (0, helpers_1.buildLogGroupName)(stateMachineName, this.environment);
|
|
130
134
|
try {
|
|
131
|
-
yield awsCommands_1.createLogGroup(cloudWatchLogsClient, logGroupName, stepFunctionArn, this.context, this.dryRun);
|
|
135
|
+
yield (0, awsCommands_1.createLogGroup)(cloudWatchLogsClient, logGroupName, stepFunctionArn, this.context, this.dryRun);
|
|
132
136
|
}
|
|
133
137
|
catch (err) {
|
|
134
138
|
if (err instanceof Error) {
|
|
@@ -137,7 +141,7 @@ class InstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
137
141
|
return 1;
|
|
138
142
|
}
|
|
139
143
|
try {
|
|
140
|
-
yield awsCommands_1.putSubscriptionFilter(cloudWatchLogsClient, this.forwarderArn, subscriptionFilterName, logGroupName, stepFunctionArn, this.context, this.dryRun);
|
|
144
|
+
yield (0, awsCommands_1.putSubscriptionFilter)(cloudWatchLogsClient, this.forwarderArn, subscriptionFilterName, logGroupName, stepFunctionArn, this.context, this.dryRun);
|
|
141
145
|
}
|
|
142
146
|
catch (err) {
|
|
143
147
|
if (err instanceof Error) {
|
|
@@ -145,10 +149,10 @@ class InstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
145
149
|
}
|
|
146
150
|
return 1;
|
|
147
151
|
}
|
|
148
|
-
const logGroupArn = helpers_1.buildArn(arnObject.partition, 'logs', arnObject.region, arnObject.accountId, 'log-group', `${logGroupName}:*`);
|
|
152
|
+
const logGroupArn = (0, helpers_1.buildArn)(arnObject.partition, 'logs', arnObject.region, arnObject.accountId, 'log-group', `${logGroupName}:*`);
|
|
149
153
|
// Create Logs Access policy
|
|
150
154
|
try {
|
|
151
|
-
yield awsCommands_1.createLogsAccessPolicy(iamClient, describeStateMachineCommandOutput, stepFunctionArn, this.context, this.dryRun);
|
|
155
|
+
yield (0, awsCommands_1.createLogsAccessPolicy)(iamClient, describeStateMachineCommandOutput, stepFunctionArn, this.context, this.dryRun);
|
|
152
156
|
}
|
|
153
157
|
catch (err) {
|
|
154
158
|
if (err instanceof Error) {
|
|
@@ -158,7 +162,7 @@ class InstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
158
162
|
}
|
|
159
163
|
// Attach policy to state machine IAM role
|
|
160
164
|
try {
|
|
161
|
-
yield awsCommands_1.attachPolicyToStateMachineIamRole(iamClient, describeStateMachineCommandOutput, arnObject.accountId, stepFunctionArn, this.context, this.dryRun);
|
|
165
|
+
yield (0, awsCommands_1.attachPolicyToStateMachineIamRole)(iamClient, describeStateMachineCommandOutput, arnObject.accountId, stepFunctionArn, this.context, this.dryRun);
|
|
162
166
|
}
|
|
163
167
|
catch (err) {
|
|
164
168
|
if (err instanceof Error) {
|
|
@@ -168,7 +172,7 @@ class InstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
168
172
|
}
|
|
169
173
|
// IAM policy on step function role should include log permissions now
|
|
170
174
|
try {
|
|
171
|
-
yield awsCommands_1.enableStepFunctionLogs(stepFunctionsClient, describeStateMachineCommandOutput, logGroupArn, stepFunctionArn, this.context, this.dryRun);
|
|
175
|
+
yield (0, awsCommands_1.enableStepFunctionLogs)(stepFunctionsClient, describeStateMachineCommandOutput, logGroupArn, stepFunctionArn, this.context, this.dryRun);
|
|
172
176
|
}
|
|
173
177
|
catch (err) {
|
|
174
178
|
if (err instanceof Error) {
|
|
@@ -180,17 +184,17 @@ class InstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
180
184
|
}
|
|
181
185
|
else {
|
|
182
186
|
// if step function logging is enabled, subscribe the forwarder to the log group in the step function logging config
|
|
183
|
-
const logGroupArn = helpers_1.getStepFunctionLogGroupArn(describeStateMachineCommandOutput);
|
|
187
|
+
const logGroupArn = (0, helpers_1.getStepFunctionLogGroupArn)(describeStateMachineCommandOutput);
|
|
184
188
|
if (logGroupArn === undefined) {
|
|
185
189
|
this.context.stdout.write('\n[Error] Unable to get Log Group arn from Step Function logging configuration\n');
|
|
186
190
|
return 1;
|
|
187
191
|
}
|
|
188
|
-
const logGroupName = helpers_1.parseArn(logGroupArn).resourceName;
|
|
192
|
+
const logGroupName = (0, helpers_1.parseArn)(logGroupArn).resourceName;
|
|
189
193
|
// update step function logging config to have logLevel `ALL` and includeExecutionData `true` if not already configured
|
|
190
194
|
const includeExecutionData = (_f = describeStateMachineCommandOutput.loggingConfiguration) === null || _f === void 0 ? void 0 : _f.includeExecutionData;
|
|
191
195
|
if (logLevel !== 'ALL' || !includeExecutionData) {
|
|
192
196
|
try {
|
|
193
|
-
yield awsCommands_1.enableStepFunctionLogs(stepFunctionsClient, describeStateMachineCommandOutput, logGroupArn, stepFunctionArn, this.context, this.dryRun);
|
|
197
|
+
yield (0, awsCommands_1.enableStepFunctionLogs)(stepFunctionsClient, describeStateMachineCommandOutput, logGroupArn, stepFunctionArn, this.context, this.dryRun);
|
|
194
198
|
}
|
|
195
199
|
catch (err) {
|
|
196
200
|
if (err instanceof Error) {
|
|
@@ -201,7 +205,7 @@ class InstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
201
205
|
hasChanges = true;
|
|
202
206
|
}
|
|
203
207
|
try {
|
|
204
|
-
yield awsCommands_1.putSubscriptionFilter(cloudWatchLogsClient, this.forwarderArn, subscriptionFilterName, logGroupName, stepFunctionArn, this.context, this.dryRun);
|
|
208
|
+
yield (0, awsCommands_1.putSubscriptionFilter)(cloudWatchLogsClient, this.forwarderArn, subscriptionFilterName, logGroupName, stepFunctionArn, this.context, this.dryRun);
|
|
205
209
|
}
|
|
206
210
|
catch (err) {
|
|
207
211
|
if (err instanceof Error) {
|
|
@@ -214,7 +218,7 @@ class InstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
214
218
|
if (this.mergeStepFunctionAndLambdaTraces) {
|
|
215
219
|
// Not putting the update operation into the business logic of logs subscription. This will
|
|
216
220
|
// add additional API call, but it would also allow easier testing and cleaner code.
|
|
217
|
-
yield helpers_1.injectContextIntoLambdaPayload(describeStateMachineCommandOutput, stepFunctionsClient, this.context, this.dryRun);
|
|
221
|
+
yield (0, helpers_1.injectContextIntoLambdaPayload)(describeStateMachineCommandOutput, stepFunctionsClient, this.context, this.dryRun);
|
|
218
222
|
}
|
|
219
223
|
}
|
|
220
224
|
if (!hasChanges) {
|
|
@@ -225,8 +229,10 @@ class InstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
225
229
|
}
|
|
226
230
|
}
|
|
227
231
|
exports.InstrumentStepFunctionsCommand = InstrumentStepFunctionsCommand;
|
|
232
|
+
InstrumentStepFunctionsCommand.paths = [['stepfunctions', 'instrument']];
|
|
228
233
|
InstrumentStepFunctionsCommand.usage = clipanion_1.Command.Usage({
|
|
229
|
-
|
|
234
|
+
category: 'Serverless',
|
|
235
|
+
description: 'Subscribe Step Function Log Groups to a Datadog Forwarder.',
|
|
230
236
|
details: '--step-function expects a Step Function ARN\n--forwarder expects a Lambda ARN',
|
|
231
237
|
examples: [
|
|
232
238
|
[
|
|
@@ -243,11 +249,4 @@ InstrumentStepFunctionsCommand.usage = clipanion_1.Command.Usage({
|
|
|
243
249
|
],
|
|
244
250
|
],
|
|
245
251
|
});
|
|
246
|
-
InstrumentStepFunctionsCommand.addPath('stepfunctions', 'instrument');
|
|
247
|
-
InstrumentStepFunctionsCommand.addOption('dryRun', clipanion_1.Command.Boolean('-d,--dry-run'));
|
|
248
|
-
InstrumentStepFunctionsCommand.addOption('environment', clipanion_1.Command.String('-e,--env'));
|
|
249
|
-
InstrumentStepFunctionsCommand.addOption('forwarderArn', clipanion_1.Command.String('--forwarder'));
|
|
250
|
-
InstrumentStepFunctionsCommand.addOption('mergeStepFunctionAndLambdaTraces', clipanion_1.Command.Boolean('-mlt,--merge-lambda-traces,--merge-step-function-and-lambda-traces'));
|
|
251
|
-
InstrumentStepFunctionsCommand.addOption('service', clipanion_1.Command.String('--service'));
|
|
252
|
-
InstrumentStepFunctionsCommand.addOption('stepFunctionArns', clipanion_1.Command.Array('-s,--step-function'));
|
|
253
252
|
//# sourceMappingURL=instrument.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/commands/stepfunctions/instrument.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4EAAoE;AACpE,oDAA6C;AAC7C,oDAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/commands/stepfunctions/instrument.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
import { Command } from 'clipanion';
|
|
2
2
|
export declare class UninstrumentStepFunctionsCommand extends Command {
|
|
3
|
+
static paths: string[][];
|
|
3
4
|
static usage: import("clipanion").Usage;
|
|
4
5
|
private dryRun;
|
|
5
6
|
private stepFunctionArns;
|
|
6
|
-
|
|
7
|
+
private environment;
|
|
8
|
+
private forwarderArn;
|
|
9
|
+
private service;
|
|
10
|
+
private mergeStepFunctionAndLambdaTraces;
|
|
11
|
+
execute(): Promise<0 | 1>;
|
|
7
12
|
}
|
|
@@ -19,8 +19,14 @@ const helpers_1 = require("./helpers");
|
|
|
19
19
|
class UninstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
20
20
|
constructor() {
|
|
21
21
|
super(...arguments);
|
|
22
|
-
this.dryRun = false;
|
|
23
|
-
this.stepFunctionArns =
|
|
22
|
+
this.dryRun = clipanion_1.Option.Boolean('-d,--dry-run', false);
|
|
23
|
+
this.stepFunctionArns = clipanion_1.Option.Array('-s,--step-function');
|
|
24
|
+
// The options below are to match what InstrumentStepFunctionsCommand has so that customers can switch from instrument to uninstrument.
|
|
25
|
+
// Lambda command adopts the same approach as well.
|
|
26
|
+
this.environment = clipanion_1.Option.String('-e,--env', { hidden: true });
|
|
27
|
+
this.forwarderArn = clipanion_1.Option.String('--forwarder', { hidden: true });
|
|
28
|
+
this.service = clipanion_1.Option.String('--service', { hidden: true });
|
|
29
|
+
this.mergeStepFunctionAndLambdaTraces = clipanion_1.Option.Boolean('-mlt,--merge-lambda-traces,--merge-step-function-and-lambda-traces', false, { hidden: true });
|
|
24
30
|
}
|
|
25
31
|
execute() {
|
|
26
32
|
var _a, _b;
|
|
@@ -34,7 +40,7 @@ class UninstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
34
40
|
validationError = true;
|
|
35
41
|
}
|
|
36
42
|
for (const stepFunctionArn of stepFunctionArns) {
|
|
37
|
-
if (!helpers_1.isValidArn(stepFunctionArn)) {
|
|
43
|
+
if (!(0, helpers_1.isValidArn)(stepFunctionArn)) {
|
|
38
44
|
this.context.stdout.write(`[Error] invalid arn format for \`--step-function\` ${stepFunctionArn}\n`);
|
|
39
45
|
validationError = true;
|
|
40
46
|
}
|
|
@@ -45,13 +51,13 @@ class UninstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
45
51
|
// loop over step functions passed as parameters and generate a list of requests to make to AWS for each step function
|
|
46
52
|
for (const stepFunctionArn of stepFunctionArns) {
|
|
47
53
|
// use region from the step function arn to make requests to AWS
|
|
48
|
-
const arnObject = helpers_1.parseArn(stepFunctionArn);
|
|
54
|
+
const arnObject = (0, helpers_1.parseArn)(stepFunctionArn);
|
|
49
55
|
const region = arnObject.region;
|
|
50
56
|
const cloudWatchLogsClient = new client_cloudwatch_logs_1.CloudWatchLogsClient({ region });
|
|
51
57
|
const stepFunctionsClient = new client_sfn_1.SFNClient({ region });
|
|
52
58
|
let describeStateMachineCommandOutput;
|
|
53
59
|
try {
|
|
54
|
-
describeStateMachineCommandOutput = yield awsCommands_1.describeStateMachine(stepFunctionsClient, stepFunctionArn);
|
|
60
|
+
describeStateMachineCommandOutput = yield (0, awsCommands_1.describeStateMachine)(stepFunctionsClient, stepFunctionArn);
|
|
55
61
|
}
|
|
56
62
|
catch (err) {
|
|
57
63
|
if (err instanceof Error) {
|
|
@@ -59,16 +65,16 @@ class UninstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
59
65
|
}
|
|
60
66
|
return 1;
|
|
61
67
|
}
|
|
62
|
-
const logGroupArn = helpers_1.getStepFunctionLogGroupArn(describeStateMachineCommandOutput);
|
|
68
|
+
const logGroupArn = (0, helpers_1.getStepFunctionLogGroupArn)(describeStateMachineCommandOutput);
|
|
63
69
|
if (logGroupArn === undefined) {
|
|
64
70
|
this.context.stdout.write('\n[Error] Unable to get Log Group arn from Step Function logging configuration\n');
|
|
65
71
|
return 1;
|
|
66
72
|
}
|
|
67
|
-
const logGroupName = helpers_1.parseArn(logGroupArn).resourceName;
|
|
68
|
-
// delete subscription filters that are created by
|
|
73
|
+
const logGroupName = (0, helpers_1.parseArn)(logGroupArn).resourceName;
|
|
74
|
+
// delete subscription filters that are created by datadog-ci
|
|
69
75
|
let describeSubscriptionFiltersResponse;
|
|
70
76
|
try {
|
|
71
|
-
describeSubscriptionFiltersResponse = yield awsCommands_1.describeSubscriptionFilters(cloudWatchLogsClient, logGroupName);
|
|
77
|
+
describeSubscriptionFiltersResponse = yield (0, awsCommands_1.describeSubscriptionFilters)(cloudWatchLogsClient, logGroupName);
|
|
72
78
|
}
|
|
73
79
|
catch (err) {
|
|
74
80
|
if (err instanceof Error) {
|
|
@@ -80,7 +86,7 @@ class UninstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
80
86
|
for (const subscriptionFilter of subscriptionFilters) {
|
|
81
87
|
if (typeof subscriptionFilter.filterName === 'string') {
|
|
82
88
|
try {
|
|
83
|
-
yield awsCommands_1.deleteSubscriptionFilter(cloudWatchLogsClient, subscriptionFilter.filterName, logGroupName, stepFunctionArn, this.context, this.dryRun);
|
|
89
|
+
yield (0, awsCommands_1.deleteSubscriptionFilter)(cloudWatchLogsClient, subscriptionFilter.filterName, logGroupName, stepFunctionArn, this.context, this.dryRun);
|
|
84
90
|
}
|
|
85
91
|
catch (err) {
|
|
86
92
|
if (err instanceof Error) {
|
|
@@ -94,7 +100,7 @@ class UninstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
94
100
|
const tagKeysToRemove = [constants_1.TAG_VERSION_NAME];
|
|
95
101
|
// Untag resource command is idempotent, no need to verify if the tag exist by making an additional api call to get tags
|
|
96
102
|
try {
|
|
97
|
-
yield awsCommands_1.untagResource(stepFunctionsClient, tagKeysToRemove, stepFunctionArn, this.context, this.dryRun);
|
|
103
|
+
yield (0, awsCommands_1.untagResource)(stepFunctionsClient, tagKeysToRemove, stepFunctionArn, this.context, this.dryRun);
|
|
98
104
|
}
|
|
99
105
|
catch (err) {
|
|
100
106
|
if (err instanceof Error) {
|
|
@@ -111,30 +117,24 @@ class UninstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
111
117
|
}
|
|
112
118
|
}
|
|
113
119
|
exports.UninstrumentStepFunctionsCommand = UninstrumentStepFunctionsCommand;
|
|
120
|
+
UninstrumentStepFunctionsCommand.paths = [['stepfunctions', 'uninstrument']];
|
|
114
121
|
UninstrumentStepFunctionsCommand.usage = clipanion_1.Command.Usage({
|
|
115
|
-
|
|
122
|
+
category: 'Serverless',
|
|
123
|
+
description: 'Remove Step Functions log groups subscription filter created by datadog-ci.',
|
|
116
124
|
details: '--stepfunction expects a Step Function ARN',
|
|
117
125
|
examples: [
|
|
118
126
|
[
|
|
119
|
-
'View and apply changes to remove Step Functions log groups subscription filters created by
|
|
127
|
+
'View and apply changes to remove Step Functions log groups subscription filters created by datadog-ci',
|
|
120
128
|
'datadog-ci stepfunctions uninstrument --step-function arn:aws:states:us-east-1:000000000000:stateMachine:ExampleStepFunction',
|
|
121
129
|
],
|
|
122
130
|
[
|
|
123
|
-
'View changes to remove Step Functions log groups subscription filters created by
|
|
131
|
+
'View changes to remove Step Functions log groups subscription filters created by datadog-ci',
|
|
124
132
|
'datadog-ci stepfunctions uninstrument --step-function arn:aws:states:us-east-1:000000000000:stateMachine:ExampleStepFunction --dry-run',
|
|
125
133
|
],
|
|
126
134
|
[
|
|
127
|
-
'View and apply changes to remove Step Functions log groups subscription filters created by
|
|
135
|
+
'View and apply changes to remove Step Functions log groups subscription filters created by datadog-ci',
|
|
128
136
|
'datadog-ci stepfunctions uninstrument --step-function arn:aws:states:us-east-1:000000000000:stateMachine:ExampleStepFunction1 --step-function arn:aws:states:us-east-1:000000000000:stateMachine:ExampleStepFunction2',
|
|
129
137
|
],
|
|
130
138
|
],
|
|
131
139
|
});
|
|
132
|
-
UninstrumentStepFunctionsCommand.addPath('stepfunctions', 'uninstrument');
|
|
133
|
-
UninstrumentStepFunctionsCommand.addOption('dryRun', clipanion_1.Command.Boolean('-d,--dry-run'));
|
|
134
|
-
UninstrumentStepFunctionsCommand.addOption('stepFunctionArns', clipanion_1.Command.Array('-s,--step-function'));
|
|
135
|
-
// The options below is to match what InstrumentStepFunctionsCommand has so that customers can switch from instrument to uninstrument.
|
|
136
|
-
// Lambda command adopts the same approach as well.
|
|
137
|
-
UninstrumentStepFunctionsCommand.addOption('environment', clipanion_1.Command.String('-e,--env', { hidden: true }));
|
|
138
|
-
UninstrumentStepFunctionsCommand.addOption('forwarderArn', clipanion_1.Command.String('--forwarder', { hidden: true }));
|
|
139
|
-
UninstrumentStepFunctionsCommand.addOption('service', clipanion_1.Command.String('--service', { hidden: true }));
|
|
140
140
|
//# sourceMappingURL=uninstrument.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uninstrument.js","sourceRoot":"","sources":["../../../src/commands/stepfunctions/uninstrument.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4EAA8G;AAC9G,oDAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"uninstrument.js","sourceRoot":"","sources":["../../../src/commands/stepfunctions/uninstrument.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,6 @@ export declare const apiConstructor: (configuration: APIConfiguration) => {
|
|
|
27
27
|
uploadMobileApplication: (fileBuffer: Buffer, presignedUrlParams: PresignedUrlResponse['presigned_url_params']) => Promise<void>;
|
|
28
28
|
createMobileVersion: (version: MobileApplicationVersion) => Promise<MobileApplicationVersion>;
|
|
29
29
|
};
|
|
30
|
-
export
|
|
30
|
+
export type APIHelper = ReturnType<typeof apiConstructor>;
|
|
31
31
|
export declare const getApiHelper: (config: APIHelperConfig) => APIHelper;
|
|
32
32
|
export {};
|
|
@@ -103,7 +103,7 @@ const getTunnelPresignedURL = (request) => (testIds) => __awaiter(void 0, void 0
|
|
|
103
103
|
params: {
|
|
104
104
|
test_id: testIds,
|
|
105
105
|
},
|
|
106
|
-
paramsSerializer: (params) => querystring_1.stringify(params),
|
|
106
|
+
paramsSerializer: (params) => (0, querystring_1.stringify)(params),
|
|
107
107
|
url: '/synthetics/ci/tunnel',
|
|
108
108
|
}, request);
|
|
109
109
|
return resp.data;
|
|
@@ -140,7 +140,7 @@ const createMobileVersion = (request) => (version) => __awaiter(void 0, void 0,
|
|
|
140
140
|
return resp.data;
|
|
141
141
|
});
|
|
142
142
|
const retryOn5xxErrors = (retries, error) => {
|
|
143
|
-
if (retries < MAX_RETRIES && exports.is5xxError(error)) {
|
|
143
|
+
if (retries < MAX_RETRIES && (0, exports.is5xxError)(error)) {
|
|
144
144
|
return DELAY_BETWEEN_RETRIES;
|
|
145
145
|
}
|
|
146
146
|
};
|
|
@@ -149,7 +149,7 @@ const retryOn5xxOr404Errors = (retries, error) => {
|
|
|
149
149
|
if (retryOn5xxDelay) {
|
|
150
150
|
return retryOn5xxDelay;
|
|
151
151
|
}
|
|
152
|
-
if (retries < MAX_RETRIES && exports.isNotFoundError(error)) {
|
|
152
|
+
if (retries < MAX_RETRIES && (0, exports.isNotFoundError)(error)) {
|
|
153
153
|
return DELAY_BETWEEN_RETRIES;
|
|
154
154
|
}
|
|
155
155
|
};
|
|
@@ -163,13 +163,13 @@ const is5xxError = (error) => {
|
|
|
163
163
|
return statusCode && statusCode >= 500 && statusCode <= 599;
|
|
164
164
|
};
|
|
165
165
|
exports.is5xxError = is5xxError;
|
|
166
|
-
const retryRequest = (args, request, retryPolicy = retryOn5xxErrors) => utils_2.retry(() => request(args), retryPolicy);
|
|
166
|
+
const retryRequest = (args, request, retryPolicy = retryOn5xxErrors) => (0, utils_2.retry)(() => request(args), retryPolicy);
|
|
167
167
|
const apiConstructor = (configuration) => {
|
|
168
168
|
const { baseUrl, baseIntakeUrl, baseUnstableUrl, apiKey, appKey, proxyOpts } = configuration;
|
|
169
169
|
const baseOptions = { apiKey, appKey, proxyOpts };
|
|
170
|
-
const request = utils_1.getRequestBuilder(Object.assign(Object.assign({}, baseOptions), { baseUrl }));
|
|
171
|
-
const requestUnstable = utils_1.getRequestBuilder(Object.assign(Object.assign({}, baseOptions), { baseUrl: baseUnstableUrl }));
|
|
172
|
-
const requestIntake = utils_1.getRequestBuilder(Object.assign(Object.assign({}, baseOptions), { baseUrl: baseIntakeUrl }));
|
|
170
|
+
const request = (0, utils_1.getRequestBuilder)(Object.assign(Object.assign({}, baseOptions), { baseUrl }));
|
|
171
|
+
const requestUnstable = (0, utils_1.getRequestBuilder)(Object.assign(Object.assign({}, baseOptions), { baseUrl: baseUnstableUrl }));
|
|
172
|
+
const requestIntake = (0, utils_1.getRequestBuilder)(Object.assign(Object.assign({}, baseOptions), { baseUrl: baseIntakeUrl }));
|
|
173
173
|
return {
|
|
174
174
|
getBatch: getBatch(request),
|
|
175
175
|
getMobileApplicationPresignedURL: getMobileApplicationPresignedURL(requestUnstable),
|
|
@@ -191,12 +191,12 @@ const getApiHelper = (config) => {
|
|
|
191
191
|
if (!config.apiKey) {
|
|
192
192
|
throw new errors_1.CriticalError('MISSING_API_KEY', 'API key is required');
|
|
193
193
|
}
|
|
194
|
-
return exports.apiConstructor({
|
|
194
|
+
return (0, exports.apiConstructor)({
|
|
195
195
|
apiKey: config.apiKey,
|
|
196
196
|
appKey: config.appKey,
|
|
197
|
-
baseIntakeUrl: utils_2.getDatadogHost({ useIntake: true, apiVersion: 'v1', config }),
|
|
198
|
-
baseUnstableUrl: utils_2.getDatadogHost({ useIntake: false, apiVersion: 'unstable', config }),
|
|
199
|
-
baseUrl: utils_2.getDatadogHost({ useIntake: false, apiVersion: 'v1', config }),
|
|
197
|
+
baseIntakeUrl: (0, utils_2.getDatadogHost)({ useIntake: true, apiVersion: 'v1', config }),
|
|
198
|
+
baseUnstableUrl: (0, utils_2.getDatadogHost)({ useIntake: false, apiVersion: 'unstable', config }),
|
|
199
|
+
baseUrl: (0, utils_2.getDatadogHost)({ useIntake: false, apiVersion: 'v1', config }),
|
|
200
200
|
proxyOpts: config.proxy,
|
|
201
201
|
});
|
|
202
202
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/synthetics/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAqC;AAGrC,0DAAgC;AAEhC,+CAAqD;AAErD,qCAAsC;AAetC,2DAAwD;AACxD,mCAA2D;AAE3D,MAAM,WAAW,GAAG,CAAC,CAAA;AACrB,MAAM,qBAAqB,GAAG,GAAG,CAAA,CAAC,QAAQ;AAM1C,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,YAAY,CAAC,MAAM,CAAC,OAAO,GAAG,YAAY,CAAC,MAAM,CAAC,GAAG,YAAY,CAAA;QAChG,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,YAAY,CAAC,MAAM,CAAC,OAAO,GAAG,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,CAAA;SACjF;KACF;IAED,OAAO,mBAAmB,YAAY,CAAC,MAAM,CAAC,OAAO,GAAG,YAAY,CAAC,MAAM,CAAC,GAAG,KAAK,YAAY,CAAC,OAAO,EAAE,CAAA;AAC5G,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,oBAAY,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;QACtF,MAAM,EAAE,WAAW,CAAC,MAAM;KAC3B,CAAA;AACH,CAAC,CAAA,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,OAA4E,EAAE,EAAE,CAAC,CACpG,SAAmB,EACnB,EAAE;IACF,MAAM,IAAI,GAAG,MAAM,YAAY,CAC7B;QACE,MAAM,EAAE;YACN,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;SACtC;QACD,GAAG,EAAE,gCAAgC;KACtC,EACD,OAAO,EACP,qBAAqB,CACtB,CAAA;IAED,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAA;AAC1B,CAAC,CAAA,CAAA;AAED,MAAM,qBAAqB,GAAG,CAAC,OAAkE,EAAE,EAAE,CAAC,CACpG,OAAiB,EACjB,EAAE;IACF,MAAM,IAAI,GAAG,MAAM,YAAY,CAC7B;QACE,MAAM,EAAE;YACN,OAAO,EAAE,OAAO;SACjB;QACD,gBAAgB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,uBAAS,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/synthetics/api.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
declare const nonCriticalErrorCodes: readonly ["NO_TESTS_TO_RUN", "MISSING_TESTS"];
|
|
2
|
-
export
|
|
2
|
+
export type NonCriticalCiErrorCode = typeof nonCriticalErrorCodes[number];
|
|
3
3
|
declare const criticalErrorCodes: readonly ["AUTHORIZATION_ERROR", "INVALID_CONFIG", "MISSING_API_KEY", "MISSING_APP_KEY", "POLL_RESULTS_FAILED", "TOO_MANY_TESTS_TO_TRIGGER", "TRIGGER_TESTS_FAILED", "TUNNEL_START_FAILED", "TUNNEL_NOT_SUPPORTED", "UNAVAILABLE_TEST_CONFIG", "UNAVAILABLE_TUNNEL_CONFIG", "UPLOAD_MOBILE_APPLICATION_TESTS_FAILED", "MISSING_MOBILE_APPLICATION_PATH", "MISSING_MOBILE_APPLICATION_ID", "MISSING_MOBILE_VERSION_NAME"];
|
|
4
|
-
export
|
|
5
|
-
export
|
|
4
|
+
export type CriticalCiErrorCode = typeof criticalErrorCodes[number];
|
|
5
|
+
export type CiErrorCode = NonCriticalCiErrorCode | CriticalCiErrorCode;
|
|
6
6
|
export declare class CiError extends Error {
|
|
7
7
|
code: CiErrorCode;
|
|
8
8
|
constructor(code: CiErrorCode, message?: string);
|
|
@@ -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];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/synthetics/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/synthetics/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAA+C;AAAvC,iGAAA,OAAO,OAAA;AAAE,uGAAA,aAAa,OAAA;AAC9B,+CAA4B;AAC5B,+CAAmD;AAA3C,0GAAA,eAAe,OAAA;AACvB,2CAA+C;AAAvC,sGAAA,aAAa,OAAA;AACrB,iDAAqD;AAA7C,6GAAA,YAAY,OAAA;AAAE,wGAAA,OAAO,OAAA;AAC7B,yDAA0D;AAAlD,2HAAA,sBAAsB,OAAA;AAC9B,iDAAgC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Metadata } from '../../helpers/interfaces';
|
|
2
2
|
import { ProxyConfiguration } from '../../helpers/utils';
|
|
3
3
|
import { TunnelInfo } from './tunnel';
|
|
4
|
-
export
|
|
4
|
+
export type SupportedReporter = 'junit' | 'default';
|
|
5
5
|
export interface MainReporter {
|
|
6
6
|
error(error: string): void;
|
|
7
7
|
initErrors(errors: string[]): void;
|
|
@@ -16,7 +16,7 @@ export interface MainReporter {
|
|
|
16
16
|
testTrigger(test: Test, testId: string, executionRule: ExecutionRule, config: UserConfigOverride): void;
|
|
17
17
|
testWait(test: Test): void;
|
|
18
18
|
}
|
|
19
|
-
export
|
|
19
|
+
export type Reporter = Partial<MainReporter>;
|
|
20
20
|
export interface BaseServerResult {
|
|
21
21
|
failure?: {
|
|
22
22
|
code: string;
|
|
@@ -66,7 +66,7 @@ export interface MultiStepsServerResult extends BaseServerResult {
|
|
|
66
66
|
duration: number;
|
|
67
67
|
steps: MultiStep[];
|
|
68
68
|
}
|
|
69
|
-
export
|
|
69
|
+
export type ServerResult = BrowserServerResult | ApiServerResult | MultiStepsServerResult;
|
|
70
70
|
export interface PollResult {
|
|
71
71
|
check: Pick<Test, 'config' | 'subtype' | 'type'>;
|
|
72
72
|
result: ServerResult;
|
|
@@ -83,7 +83,7 @@ export interface Result {
|
|
|
83
83
|
timedOut: boolean;
|
|
84
84
|
timestamp: number;
|
|
85
85
|
}
|
|
86
|
-
|
|
86
|
+
type Status = 'passed' | 'failed' | 'in_progress';
|
|
87
87
|
export interface ResultInBatch {
|
|
88
88
|
execution_rule: ExecutionRule;
|
|
89
89
|
location: string;
|
|
@@ -99,7 +99,7 @@ export interface Batch {
|
|
|
99
99
|
interface SkippedResultInBatch extends Omit<ResultInBatch, 'result_id' | 'status'> {
|
|
100
100
|
status: 'skipped';
|
|
101
101
|
}
|
|
102
|
-
|
|
102
|
+
type ServerResultInBatch = SkippedResultInBatch | ResultInBatch;
|
|
103
103
|
export interface ServerBatch {
|
|
104
104
|
results: ServerResultInBatch[];
|
|
105
105
|
status: Status;
|
|
@@ -262,6 +262,7 @@ export interface BaseConfigOverride {
|
|
|
262
262
|
retry?: RetryConfig;
|
|
263
263
|
startUrl?: string;
|
|
264
264
|
startUrlSubstitutionRegex?: string;
|
|
265
|
+
testTimeout?: number;
|
|
265
266
|
tunnel?: TunnelInfo;
|
|
266
267
|
variables?: {
|
|
267
268
|
[key: string]: string;
|
|
@@ -348,7 +349,7 @@ export interface RunTestsCommandConfig extends SyntheticsCIConfig {
|
|
|
348
349
|
tunnel: boolean;
|
|
349
350
|
variableStrings: string[];
|
|
350
351
|
}
|
|
351
|
-
export
|
|
352
|
+
export type WrapperConfig = Partial<RunTestsCommandConfig>;
|
|
352
353
|
export interface UploadApplicationCommandConfig extends SyntheticsCIConfig {
|
|
353
354
|
configPath: string;
|
|
354
355
|
mobileApplicationVersionFilePath?: string;
|
|
@@ -366,7 +367,7 @@ export interface PresignedUrlResponse {
|
|
|
366
367
|
};
|
|
367
368
|
}
|
|
368
369
|
export interface SyntheticsOrgSettings {
|
|
369
|
-
|
|
370
|
+
onDemandConcurrencyCap: number;
|
|
370
371
|
}
|
|
371
372
|
export interface MobileApplicationVersion {
|
|
372
373
|
id?: string;
|
|
@@ -17,11 +17,11 @@ var Operator;
|
|
|
17
17
|
Operator["doesNotMatch"] = "doesNotMatch";
|
|
18
18
|
Operator["validatesJSONPath"] = "validatesJSONPath";
|
|
19
19
|
Operator["validatesXPath"] = "validatesXPath";
|
|
20
|
-
})(Operator
|
|
20
|
+
})(Operator || (exports.Operator = Operator = {}));
|
|
21
21
|
var ExecutionRule;
|
|
22
22
|
(function (ExecutionRule) {
|
|
23
23
|
ExecutionRule["BLOCKING"] = "blocking";
|
|
24
24
|
ExecutionRule["NON_BLOCKING"] = "non_blocking";
|
|
25
25
|
ExecutionRule["SKIPPED"] = "skipped";
|
|
26
|
-
})(ExecutionRule
|
|
26
|
+
})(ExecutionRule || (exports.ExecutionRule = ExecutionRule = {}));
|
|
27
27
|
//# sourceMappingURL=interfaces.js.map
|