@datadog/datadog-ci 2.18.1 → 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/flare.d.ts +38 -7
- package/dist/commands/cloud-run/flare.js +304 -39
- package/dist/commands/cloud-run/flare.js.map +1 -1
- package/dist/commands/cloud-run/renderer.js +5 -1
- package/dist/commands/cloud-run/renderer.js.map +1 -1
- 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 +3 -3
- package/dist/commands/lambda/constants.js +4 -49
- package/dist/commands/lambda/constants.js.map +1 -1
- package/dist/commands/lambda/flare.d.ts +16 -30
- package/dist/commands/lambda/flare.js +90 -146
- package/dist/commands/lambda/flare.js.map +1 -1
- package/dist/commands/lambda/functions/commons.d.ts +3 -3
- package/dist/commands/lambda/functions/commons.js +19 -14
- package/dist/commands/lambda/functions/commons.js.map +1 -1
- package/dist/commands/lambda/functions/instrument.js +28 -28
- package/dist/commands/lambda/functions/instrument.js.map +1 -1
- package/dist/commands/lambda/functions/uninstrument.js +9 -9
- 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 +66 -60
- 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 -2
- package/dist/commands/lambda/prompt.js +20 -38
- 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.js +2 -2
- 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 +50 -42
- 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 +53 -45
- 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 +5 -5
- 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 +6 -6
- 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 +14 -14
- 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 +51 -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 +7 -0
- package/dist/constants.js +52 -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 +22 -0
- package/dist/helpers/flare.js +118 -8
- package/dist/helpers/flare.js.map +1 -1
- 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 +1 -0
- package/dist/helpers/prompt.js +20 -2
- package/dist/helpers/prompt.js.map +1 -1
- package/dist/helpers/renderer.d.ts +24 -0
- package/dist/helpers/renderer.js +60 -9
- package/dist/helpers/renderer.js.map +1 -1
- 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 +4 -5
- package/dist/helpers/utils.js +18 -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 +22 -13
package/dist/helpers/prompt.js
CHANGED
|
@@ -15,7 +15,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
15
15
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
16
16
|
};
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
exports.requestConfirmation = exports.confirmationQuestion = void 0;
|
|
18
|
+
exports.requestFilePath = exports.requestConfirmation = exports.confirmationQuestion = void 0;
|
|
19
19
|
const inquirer_1 = __importDefault(require("inquirer"));
|
|
20
20
|
const confirmationQuestion = (message, defaultValue = true) => ({
|
|
21
21
|
message,
|
|
@@ -26,7 +26,7 @@ const confirmationQuestion = (message, defaultValue = true) => ({
|
|
|
26
26
|
exports.confirmationQuestion = confirmationQuestion;
|
|
27
27
|
const requestConfirmation = (message, defaultValue = true) => __awaiter(void 0, void 0, void 0, function* () {
|
|
28
28
|
try {
|
|
29
|
-
const confirmationAnswer = yield inquirer_1.default.prompt(exports.confirmationQuestion(message, defaultValue));
|
|
29
|
+
const confirmationAnswer = yield inquirer_1.default.prompt((0, exports.confirmationQuestion)(message, defaultValue));
|
|
30
30
|
return confirmationAnswer.confirmation;
|
|
31
31
|
}
|
|
32
32
|
catch (e) {
|
|
@@ -36,4 +36,22 @@ const requestConfirmation = (message, defaultValue = true) => __awaiter(void 0,
|
|
|
36
36
|
}
|
|
37
37
|
});
|
|
38
38
|
exports.requestConfirmation = requestConfirmation;
|
|
39
|
+
const requestFilePath = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
40
|
+
try {
|
|
41
|
+
const filePathAnswer = yield inquirer_1.default.prompt([
|
|
42
|
+
{
|
|
43
|
+
type: 'input',
|
|
44
|
+
name: 'filePath',
|
|
45
|
+
message: 'Please enter a file path, or press Enter to finish:',
|
|
46
|
+
},
|
|
47
|
+
]);
|
|
48
|
+
return filePathAnswer.filePath;
|
|
49
|
+
}
|
|
50
|
+
catch (e) {
|
|
51
|
+
if (e instanceof Error) {
|
|
52
|
+
throw Error(`Couldn't receive file path. ${e.message}`);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
});
|
|
56
|
+
exports.requestFilePath = requestFilePath;
|
|
39
57
|
//# sourceMappingURL=prompt.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../src/helpers/prompt.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;AAEH,wDAA+B;AAExB,MAAM,oBAAoB,GAAG,CAAC,OAAe,EAAE,YAAY,GAAG,IAAI,EAA4B,EAAE,CAAC,CAAC;IACvG,OAAO;IACP,IAAI,EAAE,cAAc;IACpB,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,YAAY;CACtB,CAAC,CAAA;AALW,QAAA,oBAAoB,wBAK/B;AAEK,MAAM,mBAAmB,GAAG,CAAO,OAAe,EAAE,YAAY,GAAG,IAAI,EAAE,EAAE;IAChF,IAAI;QACF,MAAM,kBAAkB,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC,4BAAoB,
|
|
1
|
+
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../src/helpers/prompt.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;AAEH,wDAA+B;AAExB,MAAM,oBAAoB,GAAG,CAAC,OAAe,EAAE,YAAY,GAAG,IAAI,EAA4B,EAAE,CAAC,CAAC;IACvG,OAAO;IACP,IAAI,EAAE,cAAc;IACpB,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,YAAY;CACtB,CAAC,CAAA;AALW,QAAA,oBAAoB,wBAK/B;AAEK,MAAM,mBAAmB,GAAG,CAAO,OAAe,EAAE,YAAY,GAAG,IAAI,EAAE,EAAE;IAChF,IAAI;QACF,MAAM,kBAAkB,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC,IAAA,4BAAoB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAA;QAE7F,OAAO,kBAAkB,CAAC,YAAY,CAAA;KACvC;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,CAAC,YAAY,KAAK,EAAE;YACtB,MAAM,KAAK,CAAC,kCAAkC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;SAC3D;KACF;AACH,CAAC,CAAA,CAAA;AAVY,QAAA,mBAAmB,uBAU/B;AAEM,MAAM,eAAe,GAAG,GAAS,EAAE;IACxC,IAAI;QACF,MAAM,cAAc,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;YAC3C;gBACE,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,qDAAqD;aAC/D;SACF,CAAC,CAAA;QAEF,OAAO,cAAc,CAAC,QAAQ,CAAA;KAC/B;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,CAAC,YAAY,KAAK,EAAE;YACtB,MAAM,KAAK,CAAC,+BAA+B,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;SACxD;KACF;AACH,CAAC,CAAA,CAAA;AAhBY,QAAA,eAAe,mBAgB3B"}
|
|
@@ -34,3 +34,27 @@ export declare const renderSoftWarning: (warning: string) => string;
|
|
|
34
34
|
* ```
|
|
35
35
|
*/
|
|
36
36
|
export declare const renderFlareHeader: (platformName: string, isDryRun: boolean) => string;
|
|
37
|
+
/**
|
|
38
|
+
* @returns a message indicating which project files were found, or a different
|
|
39
|
+
* message if no project files were found.
|
|
40
|
+
* @param projectFilePaths list of project file paths that were discovered
|
|
41
|
+
*
|
|
42
|
+
* ```txt
|
|
43
|
+
* ✅ Found project file(s) in /Users/current-directory:
|
|
44
|
+
* • package.json
|
|
45
|
+
* • tsconfig.json
|
|
46
|
+
* ```
|
|
47
|
+
*/
|
|
48
|
+
export declare const renderProjectFiles: (projectFilePaths: Set<string>) => string;
|
|
49
|
+
/**
|
|
50
|
+
* @returns a message indicating which additional files were added, or a different
|
|
51
|
+
* message if no additional files were added.
|
|
52
|
+
* @param additionalFilePaths list of additional file paths that were added
|
|
53
|
+
*
|
|
54
|
+
* ```txt
|
|
55
|
+
* ✅ Found project file(s) in /Users/current-directory:
|
|
56
|
+
* • package.json
|
|
57
|
+
* • tsconfig.json
|
|
58
|
+
* ```
|
|
59
|
+
*/
|
|
60
|
+
export declare const renderAdditionalFiles: (additionalFilePaths: Set<string>) => string;
|
package/dist/helpers/renderer.js
CHANGED
|
@@ -1,13 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.renderFlareHeader = exports.renderSoftWarning = exports.renderError = exports.failCrossTag = exports.successCheckmarkTag = exports.warningExclamationSignTag = exports.warningTag = exports.errorTag = exports.dryRunTag = void 0;
|
|
4
|
-
const
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
exports.
|
|
8
|
-
exports.
|
|
9
|
-
exports.
|
|
10
|
-
exports.
|
|
6
|
+
exports.renderAdditionalFiles = exports.renderProjectFiles = exports.renderFlareHeader = exports.renderSoftWarning = exports.renderError = exports.failCrossTag = exports.successCheckmarkTag = exports.warningExclamationSignTag = exports.warningTag = exports.errorTag = exports.dryRunTag = void 0;
|
|
7
|
+
const path_1 = __importDefault(require("path"));
|
|
8
|
+
const process_1 = __importDefault(require("process"));
|
|
9
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
10
|
+
exports.dryRunTag = chalk_1.default.bold(chalk_1.default.cyan('[Dry Run]'));
|
|
11
|
+
exports.errorTag = chalk_1.default.bold(chalk_1.default.red('[Error]'));
|
|
12
|
+
exports.warningTag = chalk_1.default.bold(chalk_1.default.yellow('[Warning]'));
|
|
13
|
+
exports.warningExclamationSignTag = chalk_1.default.bold(chalk_1.default.yellow('[!]'));
|
|
14
|
+
exports.successCheckmarkTag = chalk_1.default.bold(chalk_1.default.green('✔'));
|
|
15
|
+
exports.failCrossTag = chalk_1.default.bold(chalk_1.default.red('✖'));
|
|
11
16
|
/**
|
|
12
17
|
* @param error an error message or an object of type `unknown`*.
|
|
13
18
|
* @returns the provided error prefixed by {@link errorTag}.
|
|
@@ -41,7 +46,53 @@ exports.renderSoftWarning = renderSoftWarning;
|
|
|
41
46
|
*/
|
|
42
47
|
const renderFlareHeader = (platformName, isDryRun) => {
|
|
43
48
|
const prefix = isDryRun ? `${exports.dryRunTag} ` : '';
|
|
44
|
-
return chalk_1.bold(`\n${prefix}🐶 Generating ${platformName} flare to send your configuration to Datadog...\n`);
|
|
49
|
+
return chalk_1.default.bold(`\n${prefix}🐶 Generating ${platformName} flare to send your configuration to Datadog...\n`);
|
|
45
50
|
};
|
|
46
51
|
exports.renderFlareHeader = renderFlareHeader;
|
|
52
|
+
/**
|
|
53
|
+
* @returns a message indicating which project files were found, or a different
|
|
54
|
+
* message if no project files were found.
|
|
55
|
+
* @param projectFilePaths list of project file paths that were discovered
|
|
56
|
+
*
|
|
57
|
+
* ```txt
|
|
58
|
+
* ✅ Found project file(s) in /Users/current-directory:
|
|
59
|
+
* • package.json
|
|
60
|
+
* • tsconfig.json
|
|
61
|
+
* ```
|
|
62
|
+
*/
|
|
63
|
+
const renderProjectFiles = (projectFilePaths) => {
|
|
64
|
+
if (projectFilePaths.size === 0) {
|
|
65
|
+
return (0, exports.renderSoftWarning)('No project files found.');
|
|
66
|
+
}
|
|
67
|
+
let msg = chalk_1.default.bold(`\n✅ Found project file(s) in ${process_1.default.cwd()}:\n`);
|
|
68
|
+
for (const filePath of projectFilePaths) {
|
|
69
|
+
const fileName = path_1.default.basename(filePath);
|
|
70
|
+
msg += `• ${fileName}\n`;
|
|
71
|
+
}
|
|
72
|
+
return msg;
|
|
73
|
+
};
|
|
74
|
+
exports.renderProjectFiles = renderProjectFiles;
|
|
75
|
+
/**
|
|
76
|
+
* @returns a message indicating which additional files were added, or a different
|
|
77
|
+
* message if no additional files were added.
|
|
78
|
+
* @param additionalFilePaths list of additional file paths that were added
|
|
79
|
+
*
|
|
80
|
+
* ```txt
|
|
81
|
+
* ✅ Found project file(s) in /Users/current-directory:
|
|
82
|
+
* • package.json
|
|
83
|
+
* • tsconfig.json
|
|
84
|
+
* ```
|
|
85
|
+
*/
|
|
86
|
+
const renderAdditionalFiles = (additionalFilePaths) => {
|
|
87
|
+
if (additionalFilePaths.size === 0) {
|
|
88
|
+
return (0, exports.renderSoftWarning)('No additional files specified.');
|
|
89
|
+
}
|
|
90
|
+
let msg = chalk_1.default.bold(`\nAdded ${additionalFilePaths.size} custom file(s):\n`);
|
|
91
|
+
for (const filePath of additionalFilePaths) {
|
|
92
|
+
const fileName = path_1.default.basename(filePath);
|
|
93
|
+
msg += `• ${fileName}\n`;
|
|
94
|
+
}
|
|
95
|
+
return msg;
|
|
96
|
+
};
|
|
97
|
+
exports.renderAdditionalFiles = renderAdditionalFiles;
|
|
47
98
|
//# sourceMappingURL=renderer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../src/helpers/renderer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../src/helpers/renderer.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AACvB,sDAA6B;AAE7B,kDAAyB;AAEZ,QAAA,SAAS,GAAG,eAAK,CAAC,IAAI,CAAC,eAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAA;AAC/C,QAAA,QAAQ,GAAG,eAAK,CAAC,IAAI,CAAC,eAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAA;AAC3C,QAAA,UAAU,GAAG,eAAK,CAAC,IAAI,CAAC,eAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAA;AAElD,QAAA,yBAAyB,GAAG,eAAK,CAAC,IAAI,CAAC,eAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;AAC3D,QAAA,mBAAmB,GAAG,eAAK,CAAC,IAAI,CAAC,eAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;AAClD,QAAA,YAAY,GAAG,eAAK,CAAC,IAAI,CAAC,eAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;AAEtD;;;;;;;;;GASG;AACI,MAAM,WAAW,GAAG,CAAC,KAAc,EAAE,EAAE,CAAC,GAAG,gBAAQ,IAAI,KAAK,IAAI,CAAA;AAA1D,QAAA,WAAW,eAA+C;AAEvE;;;;;;;GAOG;AACI,MAAM,iBAAiB,GAAG,CAAC,OAAe,EAAE,EAAE,CAAC,GAAG,iCAAyB,IAAI,OAAO,IAAI,CAAA;AAApF,QAAA,iBAAiB,qBAAmE;AAEjG;;;;;;;;GAQG;AACI,MAAM,iBAAiB,GAAG,CAAC,YAAoB,EAAE,QAAiB,EAAE,EAAE;IAC3E,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,iBAAS,GAAG,CAAC,CAAC,CAAC,EAAE,CAAA;IAE9C,OAAO,eAAK,CAAC,IAAI,CAAC,KAAK,MAAM,iBAAiB,YAAY,mDAAmD,CAAC,CAAA;AAChH,CAAC,CAAA;AAJY,QAAA,iBAAiB,qBAI7B;AAED;;;;;;;;;;GAUG;AACI,MAAM,kBAAkB,GAAG,CAAC,gBAA6B,EAAE,EAAE;IAClE,IAAI,gBAAgB,CAAC,IAAI,KAAK,CAAC,EAAE;QAC/B,OAAO,IAAA,yBAAiB,EAAC,yBAAyB,CAAC,CAAA;KACpD;IACD,IAAI,GAAG,GAAG,eAAK,CAAC,IAAI,CAAC,gCAAgC,iBAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IACxE,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE;QACvC,MAAM,QAAQ,GAAG,cAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;QACxC,GAAG,IAAI,KAAK,QAAQ,IAAI,CAAA;KACzB;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAXY,QAAA,kBAAkB,sBAW9B;AAED;;;;;;;;;;GAUG;AACI,MAAM,qBAAqB,GAAG,CAAC,mBAAgC,EAAE,EAAE;IACxE,IAAI,mBAAmB,CAAC,IAAI,KAAK,CAAC,EAAE;QAClC,OAAO,IAAA,yBAAiB,EAAC,gCAAgC,CAAC,CAAA;KAC3D;IACD,IAAI,GAAG,GAAG,eAAK,CAAC,IAAI,CAAC,WAAW,mBAAmB,CAAC,IAAI,oBAAoB,CAAC,CAAA;IAC7E,KAAK,MAAM,QAAQ,IAAI,mBAAmB,EAAE;QAC1C,MAAM,QAAQ,GAAG,cAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;QACxC,GAAG,IAAI,KAAK,QAAQ,IAAI,CAAA;KACzB;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAXY,QAAA,qBAAqB,yBAWjC"}
|
package/dist/helpers/retry.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import retry from 'async-retry';
|
|
2
|
-
export declare const retryRequest: <T>(requestPerformer: () => Promise<T>, retryOpts: retry.Options) => Promise<T>;
|
|
2
|
+
export declare const retryRequest: <T>(requestPerformer: (bail?: ((e: Error) => void) | undefined, attempt?: number) => Promise<T>, retryOpts: retry.Options) => Promise<T>;
|
package/dist/helpers/retry.js
CHANGED
|
@@ -17,9 +17,9 @@ const async_retry_1 = __importDefault(require("async-retry"));
|
|
|
17
17
|
const errorCodesNoRetry = [400, 403, 413];
|
|
18
18
|
const retryRequest = (requestPerformer, retryOpts) => __awaiter(void 0, void 0, void 0, function* () {
|
|
19
19
|
// Request function, passed to async-retry
|
|
20
|
-
const doRequest = (bail) => __awaiter(void 0, void 0, void 0, function* () {
|
|
20
|
+
const doRequest = (bail, attempt) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
21
|
try {
|
|
22
|
-
return yield requestPerformer();
|
|
22
|
+
return yield requestPerformer(bail, attempt);
|
|
23
23
|
}
|
|
24
24
|
catch (error) {
|
|
25
25
|
if (error.response && errorCodesNoRetry.includes(error.response.status)) {
|
|
@@ -34,7 +34,7 @@ const retryRequest = (requestPerformer, retryOpts) => __awaiter(void 0, void 0,
|
|
|
34
34
|
}
|
|
35
35
|
});
|
|
36
36
|
// Do the actual call
|
|
37
|
-
return async_retry_1.default(doRequest, retryOpts);
|
|
37
|
+
return (0, async_retry_1.default)(doRequest, retryOpts);
|
|
38
38
|
});
|
|
39
39
|
exports.retryRequest = retryRequest;
|
|
40
40
|
//# sourceMappingURL=retry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../src/helpers/retry.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8DAA+B;AAE/B,MAAM,iBAAiB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AAElC,MAAM,YAAY,GAAG,
|
|
1
|
+
{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../src/helpers/retry.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8DAA+B;AAE/B,MAAM,iBAAiB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AAElC,MAAM,YAAY,GAAG,CAC1B,gBAA6E,EAC7E,SAAwB,EACZ,EAAE;IACd,0CAA0C;IAC1C,MAAM,SAAS,GAAG,CAAO,IAAwB,EAAE,OAAe,EAAE,EAAE;QACpE,IAAI;YACF,OAAO,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;SAC7C;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,CAAC,QAAQ,IAAI,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;gBACvE,qGAAqG;gBACrG,IAAI,CAAC,KAAK,CAAC,CAAA;gBAEX,mFAAmF;gBACnF,OAAO,EAAO,CAAA;aACf;YACD,8DAA8D;YAC9D,yEAAyE;YACzE,MAAM,KAAK,CAAA;SACZ;IACH,CAAC,CAAA,CAAA;IAED,qBAAqB;IACrB,OAAO,IAAA,qBAAK,EAAC,SAAS,EAAE,SAAS,CAAC,CAAA;AACpC,CAAC,CAAA,CAAA;AAxBY,QAAA,YAAY,gBAwBxB"}
|
package/dist/helpers/tags.d.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { DatadogCiConfig } from './config';
|
|
2
|
+
import { SpanTags } from './interfaces';
|
|
1
3
|
export declare const CI_PIPELINE_URL = "ci.pipeline.url";
|
|
2
4
|
export declare const CI_PROVIDER_NAME = "ci.provider.name";
|
|
3
5
|
export declare const CI_PIPELINE_ID = "ci.pipeline.id";
|
|
@@ -36,3 +38,9 @@ export declare const parseTags: (tags: string[]) => {};
|
|
|
36
38
|
* and returns an object of the form {key: 123, key2: 321}
|
|
37
39
|
*/
|
|
38
40
|
export declare const parseMetrics: (tags: string[]) => {};
|
|
41
|
+
/**
|
|
42
|
+
* Get the tags to upload results in CI for the following commands: sarif and sbom.
|
|
43
|
+
* @param config - the configuration of the CLI
|
|
44
|
+
* @param additionalTags - additional tags passed, generally from the command line.
|
|
45
|
+
*/
|
|
46
|
+
export declare const getSpanTags: (config: DatadogCiConfig, additionalTags: string[] | undefined) => Promise<SpanTags>;
|
package/dist/helpers/tags.js
CHANGED
|
@@ -1,7 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
2
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.parseMetrics = exports.parseTags = exports.SERVICE = exports.SPAN_TYPE = exports.GIT_TAG = exports.GIT_SHA = exports.GIT_COMMIT_MESSAGE = exports.GIT_COMMIT_COMMITTER_NAME = exports.GIT_COMMIT_COMMITTER_EMAIL = exports.GIT_COMMIT_COMMITTER_DATE = exports.GIT_COMMIT_AUTHOR_NAME = exports.GIT_COMMIT_AUTHOR_EMAIL = exports.GIT_COMMIT_AUTHOR_DATE = exports.GIT_BRANCH = exports.CI_NODE_LABELS = exports.CI_NODE_NAME = exports.CI_ENV_VARS = exports.CI_BUILD_LEVEL = exports.CI_LEVEL = exports.CI_STAGE_NAME = exports.CI_JOB_NAME = exports.CI_JOB_URL = exports.GIT_REPOSITORY_URL = exports.CI_WORKSPACE_PATH = exports.CI_PIPELINE_NUMBER = exports.CI_PIPELINE_NAME = exports.CI_PIPELINE_ID = exports.CI_PROVIDER_NAME = exports.CI_PIPELINE_URL = void 0;
|
|
12
|
+
exports.getSpanTags = exports.parseMetrics = exports.parseTags = exports.SERVICE = exports.SPAN_TYPE = exports.GIT_TAG = exports.GIT_SHA = exports.GIT_COMMIT_MESSAGE = exports.GIT_COMMIT_COMMITTER_NAME = exports.GIT_COMMIT_COMMITTER_EMAIL = exports.GIT_COMMIT_COMMITTER_DATE = exports.GIT_COMMIT_AUTHOR_NAME = exports.GIT_COMMIT_AUTHOR_EMAIL = exports.GIT_COMMIT_AUTHOR_DATE = exports.GIT_BRANCH = exports.CI_NODE_LABELS = exports.CI_NODE_NAME = exports.CI_ENV_VARS = exports.CI_BUILD_LEVEL = exports.CI_LEVEL = exports.CI_STAGE_NAME = exports.CI_JOB_NAME = exports.CI_JOB_URL = exports.GIT_REPOSITORY_URL = exports.CI_WORKSPACE_PATH = exports.CI_PIPELINE_NUMBER = exports.CI_PIPELINE_NAME = exports.CI_PIPELINE_ID = exports.CI_PROVIDER_NAME = exports.CI_PIPELINE_URL = void 0;
|
|
4
13
|
// Build
|
|
14
|
+
const ci_1 = require("./ci");
|
|
15
|
+
const format_git_span_data_1 = require("./git/format-git-span-data");
|
|
16
|
+
const user_provided_git_1 = require("./user-provided-git");
|
|
5
17
|
exports.CI_PIPELINE_URL = 'ci.pipeline.url';
|
|
6
18
|
exports.CI_PROVIDER_NAME = 'ci.provider.name';
|
|
7
19
|
exports.CI_PIPELINE_ID = 'ci.pipeline.id';
|
|
@@ -85,4 +97,18 @@ const parseMetrics = (tags) => {
|
|
|
85
97
|
}
|
|
86
98
|
};
|
|
87
99
|
exports.parseMetrics = parseMetrics;
|
|
100
|
+
/**
|
|
101
|
+
* Get the tags to upload results in CI for the following commands: sarif and sbom.
|
|
102
|
+
* @param config - the configuration of the CLI
|
|
103
|
+
* @param additionalTags - additional tags passed, generally from the command line.
|
|
104
|
+
*/
|
|
105
|
+
const getSpanTags = (config, additionalTags) => __awaiter(void 0, void 0, void 0, function* () {
|
|
106
|
+
const ciSpanTags = (0, ci_1.getCISpanTags)();
|
|
107
|
+
const gitSpanTags = yield (0, format_git_span_data_1.getGitMetadata)();
|
|
108
|
+
const userGitSpanTags = (0, user_provided_git_1.getUserGitSpanTags)();
|
|
109
|
+
const envVarTags = config.envVarTags ? (0, exports.parseTags)(config.envVarTags.split(',')) : {};
|
|
110
|
+
const cliTags = additionalTags ? (0, exports.parseTags)(additionalTags) : {};
|
|
111
|
+
return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, gitSpanTags), ciSpanTags), userGitSpanTags), cliTags), envVarTags), (config.env ? { env: config.env } : {}));
|
|
112
|
+
});
|
|
113
|
+
exports.getSpanTags = getSpanTags;
|
|
88
114
|
//# sourceMappingURL=tags.js.map
|
package/dist/helpers/tags.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tags.js","sourceRoot":"","sources":["../../src/helpers/tags.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tags.js","sourceRoot":"","sources":["../../src/helpers/tags.ts"],"names":[],"mappings":"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"}
|
package/dist/helpers/upload.js
CHANGED
|
@@ -21,7 +21,7 @@ var UploadStatus;
|
|
|
21
21
|
UploadStatus[UploadStatus["Success"] = 0] = "Success";
|
|
22
22
|
UploadStatus[UploadStatus["Failure"] = 1] = "Failure";
|
|
23
23
|
UploadStatus[UploadStatus["Skipped"] = 2] = "Skipped";
|
|
24
|
-
})(UploadStatus
|
|
24
|
+
})(UploadStatus || (exports.UploadStatus = UploadStatus = {}));
|
|
25
25
|
/** Upload a MultipartPayload to Datadog's API using the provided RequestBuilder.
|
|
26
26
|
* This handles retries as well as logging information about upload if a logger is provided in
|
|
27
27
|
* the options
|
|
@@ -29,7 +29,7 @@ var UploadStatus;
|
|
|
29
29
|
const upload = (requestBuilder) => (payload, opts) => __awaiter(void 0, void 0, void 0, function* () {
|
|
30
30
|
opts.onUpload();
|
|
31
31
|
try {
|
|
32
|
-
yield retry_1.retryRequest(() => { var _a; return uploadMultipart(requestBuilder, payload, (_a = opts.useGzip) !== null && _a !== void 0 ? _a : false); }, {
|
|
32
|
+
yield (0, retry_1.retryRequest)(() => { var _a; return uploadMultipart(requestBuilder, payload, (_a = opts.useGzip) !== null && _a !== void 0 ? _a : false); }, {
|
|
33
33
|
onRetry: opts.onRetry,
|
|
34
34
|
retries: opts.retries,
|
|
35
35
|
});
|
|
@@ -63,7 +63,7 @@ const uploadMultipart = (request, payload, useGzip) => __awaiter(void 0, void 0,
|
|
|
63
63
|
let data = form;
|
|
64
64
|
let headers = form.getHeaders();
|
|
65
65
|
if (useGzip) {
|
|
66
|
-
const gz = zlib_1.createGzip();
|
|
66
|
+
const gz = (0, zlib_1.createGzip)();
|
|
67
67
|
data = data.pipe(gz);
|
|
68
68
|
headers = Object.assign({ 'Content-Encoding': 'gzip' }, headers);
|
|
69
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../src/helpers/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,+BAA+B;AAE/B,0DAAgC;AAIhC,mCAAoC;AAyCpC,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,qDAAO,CAAA;IACP,qDAAO,CAAA;IACP,qDAAO,CAAA;AACT,CAAC,EAJW,YAAY,
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../src/helpers/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,+BAA+B;AAE/B,0DAAgC;AAIhC,mCAAoC;AAyCpC,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,qDAAO,CAAA;IACP,qDAAO,CAAA;IACP,qDAAO,CAAA;AACT,CAAC,EAJW,YAAY,4BAAZ,YAAY,QAIvB;AAED;;;GAGG;AACI,MAAM,MAAM,GAAG,CAAC,cAA8B,EAAE,EAAE,CAAC,CACxD,OAAyB,EACzB,IAAmB,EACI,EAAE;IACzB,IAAI,CAAC,QAAQ,EAAE,CAAA;IACf,IAAI;QACF,MAAM,IAAA,oBAAY,EAAC,GAAG,EAAE,WAAC,OAAA,eAAe,CAAC,cAAc,EAAE,OAAO,EAAE,MAAA,IAAI,CAAC,OAAO,mCAAI,KAAK,CAAC,CAAA,EAAA,EAAE;YACxF,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAA;QAEF,OAAO,YAAY,CAAC,OAAO,CAAA;KAC5B;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,gDAAgD;YAChD,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;SAC/C;QACD,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE;YAC/C,+CAA+C;YAC/C,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,GAAG,KAAK,CAAC,OAAO,KAAK,KAAK,CAAC,QAAQ,CAAC,UAAU,GAAG,CAAC,CAAC,CAAA;SAC3E;aAAM;YACL,yBAAyB;YACzB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;SACpB;QAED,OAAO,YAAY,CAAC,OAAO,CAAA;KAC5B;AACH,CAAC,CAAA,CAAA;AA3BY,QAAA,MAAM,UA2BlB;AAED,sLAAsL;AACtL,iHAAiH;AACjH,MAAM,aAAa,GAAG,QAAQ,CAAA;AAE9B,MAAM,eAAe,GAAG,CAAO,OAAuB,EAAE,OAAyB,EAAE,OAAgB,EAAE,EAAE;IACrG,MAAM,IAAI,GAAG,IAAI,mBAAQ,EAAE,CAAA;IAC3B,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAqB,EAAE,GAAW,EAAE,EAAE;QAC7D,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;IAC9C,CAAC,CAAC,CAAA;IAEF,IAAI,IAAI,GAAQ,IAAI,CAAA;IACpB,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;IAC/B,IAAI,OAAO,EAAE;QACX,MAAM,EAAE,GAAG,IAAA,iBAAU,GAAE,CAAA;QACvB,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACpB,OAAO,mBACL,kBAAkB,EAAE,MAAM,IACvB,OAAO,CACX,CAAA;KACF;IAED,OAAO,OAAO,CAAC;QACb,IAAI;QACJ,OAAO;QACP,aAAa;QACb,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,UAAU;KAChB,CAAC,CAAA;AACJ,CAAC,CAAA,CAAA"}
|
|
@@ -5,14 +5,14 @@ const tags_1 = require("./tags");
|
|
|
5
5
|
const utils_1 = require("./utils");
|
|
6
6
|
const getUserGitSpanTags = () => {
|
|
7
7
|
const { DD_GIT_REPOSITORY_URL, DD_GIT_COMMIT_SHA, DD_GIT_BRANCH, DD_GIT_TAG, DD_GIT_COMMIT_MESSAGE, DD_GIT_COMMIT_AUTHOR_NAME, DD_GIT_COMMIT_AUTHOR_EMAIL, DD_GIT_COMMIT_AUTHOR_DATE, DD_GIT_COMMIT_COMMITTER_NAME, DD_GIT_COMMIT_COMMITTER_EMAIL, DD_GIT_COMMIT_COMMITTER_DATE, } = process.env;
|
|
8
|
-
let branch = utils_1.normalizeRef(DD_GIT_BRANCH);
|
|
9
|
-
let tag = utils_1.normalizeRef(DD_GIT_TAG);
|
|
8
|
+
let branch = (0, utils_1.normalizeRef)(DD_GIT_BRANCH);
|
|
9
|
+
let tag = (0, utils_1.normalizeRef)(DD_GIT_TAG);
|
|
10
10
|
if ((DD_GIT_BRANCH === null || DD_GIT_BRANCH === void 0 ? void 0 : DD_GIT_BRANCH.includes('origin/tags')) || (DD_GIT_BRANCH === null || DD_GIT_BRANCH === void 0 ? void 0 : DD_GIT_BRANCH.includes('refs/heads/tags'))) {
|
|
11
11
|
branch = undefined;
|
|
12
|
-
tag = utils_1.normalizeRef(DD_GIT_BRANCH);
|
|
12
|
+
tag = (0, utils_1.normalizeRef)(DD_GIT_BRANCH);
|
|
13
13
|
}
|
|
14
|
-
return utils_1.removeEmptyValues({
|
|
15
|
-
[tags_1.GIT_REPOSITORY_URL]: utils_1.filterSensitiveInfoFromRepository(DD_GIT_REPOSITORY_URL),
|
|
14
|
+
return (0, utils_1.removeEmptyValues)({
|
|
15
|
+
[tags_1.GIT_REPOSITORY_URL]: (0, utils_1.filterSensitiveInfoFromRepository)(DD_GIT_REPOSITORY_URL),
|
|
16
16
|
[tags_1.GIT_BRANCH]: branch,
|
|
17
17
|
[tags_1.GIT_SHA]: DD_GIT_COMMIT_SHA,
|
|
18
18
|
[tags_1.GIT_TAG]: tag,
|
|
@@ -28,7 +28,7 @@ const getUserGitSpanTags = () => {
|
|
|
28
28
|
exports.getUserGitSpanTags = getUserGitSpanTags;
|
|
29
29
|
const getUserCISpanTags = () => {
|
|
30
30
|
const { DD_CI_JOB_NAME, DD_CI_JOB_URL, DD_CI_PIPELINE_ID, DD_CI_PIPELINE_NAME, DD_CI_PIPELINE_NUMBER, DD_CI_PIPELINE_URL, DD_CI_PROVIDER_NAME, DD_CI_STAGE_NAME, DD_CI_WORKSPACE_PATH, } = process.env;
|
|
31
|
-
return utils_1.removeEmptyValues({
|
|
31
|
+
return (0, utils_1.removeEmptyValues)({
|
|
32
32
|
[tags_1.CI_JOB_NAME]: DD_CI_JOB_NAME,
|
|
33
33
|
[tags_1.CI_JOB_URL]: DD_CI_JOB_URL,
|
|
34
34
|
[tags_1.CI_PIPELINE_ID]: DD_CI_PIPELINE_ID,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-provided-git.js","sourceRoot":"","sources":["../../src/helpers/user-provided-git.ts"],"names":[],"mappings":";;;AAAA,iCAqBe;AACf,mCAA0F;AAEnF,MAAM,kBAAkB,GAAG,GAAG,EAAE;IACrC,MAAM,EACJ,qBAAqB,EACrB,iBAAiB,EACjB,aAAa,EACb,UAAU,EACV,qBAAqB,EACrB,yBAAyB,EACzB,0BAA0B,EAC1B,yBAAyB,EACzB,4BAA4B,EAC5B,6BAA6B,EAC7B,4BAA4B,GAC7B,GAAG,OAAO,CAAC,GAAG,CAAA;IAEf,IAAI,MAAM,GAAG,oBAAY,
|
|
1
|
+
{"version":3,"file":"user-provided-git.js","sourceRoot":"","sources":["../../src/helpers/user-provided-git.ts"],"names":[],"mappings":";;;AAAA,iCAqBe;AACf,mCAA0F;AAEnF,MAAM,kBAAkB,GAAG,GAAG,EAAE;IACrC,MAAM,EACJ,qBAAqB,EACrB,iBAAiB,EACjB,aAAa,EACb,UAAU,EACV,qBAAqB,EACrB,yBAAyB,EACzB,0BAA0B,EAC1B,yBAAyB,EACzB,4BAA4B,EAC5B,6BAA6B,EAC7B,4BAA4B,GAC7B,GAAG,OAAO,CAAC,GAAG,CAAA;IAEf,IAAI,MAAM,GAAG,IAAA,oBAAY,EAAC,aAAa,CAAC,CAAA;IACxC,IAAI,GAAG,GAAG,IAAA,oBAAY,EAAC,UAAU,CAAC,CAAA;IAElC,IAAI,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,CAAC,aAAa,CAAC,MAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAA,EAAE;QACxF,MAAM,GAAG,SAAS,CAAA;QAClB,GAAG,GAAG,IAAA,oBAAY,EAAC,aAAa,CAAC,CAAA;KAClC;IAED,OAAO,IAAA,yBAAiB,EAAC;QACvB,CAAC,yBAAkB,CAAC,EAAE,IAAA,yCAAiC,EAAC,qBAAqB,CAAC;QAC9E,CAAC,iBAAU,CAAC,EAAE,MAAM;QACpB,CAAC,cAAO,CAAC,EAAE,iBAAiB;QAC5B,CAAC,cAAO,CAAC,EAAE,GAAG;QACd,CAAC,yBAAkB,CAAC,EAAE,qBAAqB;QAC3C,CAAC,gCAAyB,CAAC,EAAE,4BAA4B;QACzD,CAAC,iCAA0B,CAAC,EAAE,6BAA6B;QAC3D,CAAC,gCAAyB,CAAC,EAAE,4BAA4B;QACzD,CAAC,6BAAsB,CAAC,EAAE,yBAAyB;QACnD,CAAC,8BAAuB,CAAC,EAAE,0BAA0B;QACrD,CAAC,6BAAsB,CAAC,EAAE,yBAAyB;KACpD,CAAC,CAAA;AACJ,CAAC,CAAA;AApCY,QAAA,kBAAkB,sBAoC9B;AAEM,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,MAAM,EACJ,cAAc,EACd,aAAa,EACb,iBAAiB,EACjB,mBAAmB,EACnB,qBAAqB,EACrB,kBAAkB,EAClB,mBAAmB,EACnB,gBAAgB,EAChB,oBAAoB,GACrB,GAAG,OAAO,CAAC,GAAG,CAAA;IAEf,OAAO,IAAA,yBAAiB,EAAC;QACvB,CAAC,kBAAW,CAAC,EAAE,cAAc;QAC7B,CAAC,iBAAU,CAAC,EAAE,aAAa;QAC3B,CAAC,qBAAc,CAAC,EAAE,iBAAiB;QACnC,CAAC,uBAAgB,CAAC,EAAE,mBAAmB;QACvC,CAAC,yBAAkB,CAAC,EAAE,qBAAqB;QAC3C,CAAC,sBAAe,CAAC,EAAE,kBAAkB;QACrC,CAAC,uBAAgB,CAAC,EAAE,mBAAmB;QACvC,CAAC,oBAAa,CAAC,EAAE,gBAAgB;QACjC,CAAC,wBAAiB,CAAC,EAAE,oBAAoB;KAC1C,CAAC,CAAA;AACJ,CAAC,CAAA;AAxBY,QAAA,iBAAiB,qBAwB7B"}
|
package/dist/helpers/utils.d.ts
CHANGED
|
@@ -5,7 +5,6 @@ import { ProxyAgent } from 'proxy-agent';
|
|
|
5
5
|
export declare const DEFAULT_CONFIG_PATHS: string[];
|
|
6
6
|
export declare const pick: <T extends Record<any, any>, K extends keyof T>(base: T, keys: K[]) => Partial<T>;
|
|
7
7
|
export declare const getConfig: (configPath: string) => Promise<any>;
|
|
8
|
-
export declare const parseOptionalInteger: (value: string | undefined) => number | undefined;
|
|
9
8
|
/**
|
|
10
9
|
* Applies configurations in this order of priority:
|
|
11
10
|
* environment > config file > base config
|
|
@@ -22,8 +21,8 @@ export declare const resolveConfigFromFile: <T>(baseConfig: T, params: {
|
|
|
22
21
|
/**
|
|
23
22
|
* @deprecated Use resolveConfigFromFile instead for better error management
|
|
24
23
|
*/
|
|
25
|
-
export declare const parseConfigFile: <T>(baseConfig: T, configPath?: string
|
|
26
|
-
|
|
24
|
+
export declare const parseConfigFile: <T>(baseConfig: T, configPath?: string) => Promise<T>;
|
|
25
|
+
type ProxyType = 'http' | 'https' | 'socks' | 'socks4' | 'socks4a' | 'socks5' | 'socks5h' | 'pac+data' | 'pac+file' | 'pac+ftp' | 'pac+http' | 'pac+https';
|
|
27
26
|
export interface ProxyConfiguration {
|
|
28
27
|
auth?: {
|
|
29
28
|
password: string;
|
|
@@ -33,7 +32,7 @@ export interface ProxyConfiguration {
|
|
|
33
32
|
port?: number;
|
|
34
33
|
protocol: ProxyType;
|
|
35
34
|
}
|
|
36
|
-
export declare const getProxyUrl: (options?: ProxyConfiguration
|
|
35
|
+
export declare const getProxyUrl: (options?: ProxyConfiguration) => string;
|
|
37
36
|
export interface RequestOptions {
|
|
38
37
|
apiKey: string;
|
|
39
38
|
appKey?: string;
|
|
@@ -43,7 +42,7 @@ export interface RequestOptions {
|
|
|
43
42
|
proxyOpts?: ProxyConfiguration;
|
|
44
43
|
}
|
|
45
44
|
export declare const getRequestBuilder: (options: RequestOptions) => (args: AxiosRequestConfig) => import("axios").AxiosPromise<any>;
|
|
46
|
-
export declare const getProxyAgent: (proxyOpts?: ProxyConfiguration
|
|
45
|
+
export declare const getProxyAgent: (proxyOpts?: ProxyConfiguration) => ProxyAgent;
|
|
47
46
|
export declare const getApiHostForSite: (site: string) => string;
|
|
48
47
|
export declare const buildPath: (...args: string[]) => string;
|
|
49
48
|
export declare const removeEmptyValues: (tags: SpanTags) => {};
|
package/dist/helpers/utils.js
CHANGED
|
@@ -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];
|
|
@@ -31,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
31
35
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
32
36
|
};
|
|
33
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
34
|
-
exports.maskString = exports.formatBytes = exports.timedExecAsync = exports.filterAndFormatGithubRemote = exports.filterSensitiveInfoFromRepository = exports.performSubCommand = exports.pluralize = exports.normalizeRef = exports.removeUndefinedValues = exports.removeEmptyValues = exports.buildPath = exports.getApiHostForSite = exports.getProxyAgent = exports.getRequestBuilder = exports.getProxyUrl = exports.parseConfigFile = exports.resolveConfigFromFile = exports.resolveConfigFromFileAndEnvironment = exports.
|
|
38
|
+
exports.maskString = exports.formatBytes = exports.timedExecAsync = exports.filterAndFormatGithubRemote = exports.filterSensitiveInfoFromRepository = exports.performSubCommand = exports.pluralize = exports.normalizeRef = exports.removeUndefinedValues = exports.removeEmptyValues = exports.buildPath = exports.getApiHostForSite = exports.getProxyAgent = exports.getRequestBuilder = exports.getProxyUrl = exports.parseConfigFile = exports.resolveConfigFromFile = exports.resolveConfigFromFileAndEnvironment = exports.getConfig = exports.pick = exports.DEFAULT_CONFIG_PATHS = void 0;
|
|
35
39
|
const fs_1 = __importStar(require("fs"));
|
|
36
40
|
const util_1 = require("util");
|
|
37
41
|
const axios_1 = __importDefault(require("axios"));
|
|
@@ -50,7 +54,7 @@ const pick = (base, keys) => {
|
|
|
50
54
|
exports.pick = pick;
|
|
51
55
|
const getConfig = (configPath) => __awaiter(void 0, void 0, void 0, function* () {
|
|
52
56
|
try {
|
|
53
|
-
const configFile = yield util_1.promisify(fs_1.default.readFile)(configPath, 'utf-8');
|
|
57
|
+
const configFile = yield (0, util_1.promisify)(fs_1.default.readFile)(configPath, 'utf-8');
|
|
54
58
|
return JSON.parse(configFile);
|
|
55
59
|
}
|
|
56
60
|
catch (error) {
|
|
@@ -62,41 +66,30 @@ const getConfig = (configPath) => __awaiter(void 0, void 0, void 0, function* ()
|
|
|
62
66
|
exports.getConfig = getConfig;
|
|
63
67
|
const resolveConfigPath = ({ configPath, defaultConfigPaths, }) => {
|
|
64
68
|
if (configPath) {
|
|
65
|
-
if (fs_1.existsSync(configPath)) {
|
|
69
|
+
if ((0, fs_1.existsSync)(configPath)) {
|
|
66
70
|
return configPath;
|
|
67
71
|
}
|
|
68
72
|
throw new Error('Config file not found');
|
|
69
73
|
}
|
|
70
74
|
if (defaultConfigPaths) {
|
|
71
75
|
for (const path of defaultConfigPaths) {
|
|
72
|
-
if (fs_1.existsSync(path)) {
|
|
76
|
+
if ((0, fs_1.existsSync)(path)) {
|
|
73
77
|
return path;
|
|
74
78
|
}
|
|
75
79
|
}
|
|
76
80
|
}
|
|
77
81
|
return undefined;
|
|
78
82
|
};
|
|
79
|
-
const parseOptionalInteger = (value) => {
|
|
80
|
-
if (!value) {
|
|
81
|
-
return undefined;
|
|
82
|
-
}
|
|
83
|
-
const number = parseFloat(value);
|
|
84
|
-
if (!Number.isInteger(number)) {
|
|
85
|
-
throw new Error(`${number} is not an integer`);
|
|
86
|
-
}
|
|
87
|
-
return number;
|
|
88
|
-
};
|
|
89
|
-
exports.parseOptionalInteger = parseOptionalInteger;
|
|
90
83
|
/**
|
|
91
84
|
* Applies configurations in this order of priority:
|
|
92
85
|
* environment > config file > base config
|
|
93
86
|
*/
|
|
94
87
|
const resolveConfigFromFileAndEnvironment = (baseConfig, environment, params) => __awaiter(void 0, void 0, void 0, function* () {
|
|
95
|
-
const configFromFile = yield exports.resolveConfigFromFile(baseConfig, params);
|
|
88
|
+
const configFromFile = yield (0, exports.resolveConfigFromFile)(baseConfig, params);
|
|
96
89
|
if (params.configFromFileCallback) {
|
|
97
90
|
params.configFromFileCallback(configFromFile);
|
|
98
91
|
}
|
|
99
|
-
return deep_extend_1.default(configFromFile, exports.removeUndefinedValues(environment));
|
|
92
|
+
return (0, deep_extend_1.default)(configFromFile, (0, exports.removeUndefinedValues)(environment));
|
|
100
93
|
});
|
|
101
94
|
exports.resolveConfigFromFileAndEnvironment = resolveConfigFromFileAndEnvironment;
|
|
102
95
|
const resolveConfigFromFile = (baseConfig, params) => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -104,8 +97,8 @@ const resolveConfigFromFile = (baseConfig, params) => __awaiter(void 0, void 0,
|
|
|
104
97
|
if (!resolvedConfigPath) {
|
|
105
98
|
return baseConfig;
|
|
106
99
|
}
|
|
107
|
-
const parsedConfig = yield exports.getConfig(resolvedConfigPath);
|
|
108
|
-
return deep_extend_1.default(baseConfig, parsedConfig);
|
|
100
|
+
const parsedConfig = yield (0, exports.getConfig)(resolvedConfigPath);
|
|
101
|
+
return (0, deep_extend_1.default)(baseConfig, parsedConfig);
|
|
109
102
|
});
|
|
110
103
|
exports.resolveConfigFromFile = resolveConfigFromFile;
|
|
111
104
|
/**
|
|
@@ -114,8 +107,8 @@ exports.resolveConfigFromFile = resolveConfigFromFile;
|
|
|
114
107
|
const parseConfigFile = (baseConfig, configPath) => __awaiter(void 0, void 0, void 0, function* () {
|
|
115
108
|
try {
|
|
116
109
|
const resolvedConfigPath = configPath !== null && configPath !== void 0 ? configPath : 'datadog-ci.json';
|
|
117
|
-
const parsedConfig = yield exports.getConfig(resolvedConfigPath);
|
|
118
|
-
return deep_extend_1.default(baseConfig, parsedConfig);
|
|
110
|
+
const parsedConfig = yield (0, exports.getConfig)(resolvedConfigPath);
|
|
111
|
+
return (0, deep_extend_1.default)(baseConfig, parsedConfig);
|
|
119
112
|
}
|
|
120
113
|
catch (e) {
|
|
121
114
|
if (e.code === 'ENOENT' && configPath) {
|
|
@@ -147,7 +140,7 @@ const getRequestBuilder = (options) => {
|
|
|
147
140
|
if (overrideUrl !== undefined) {
|
|
148
141
|
newArguments.url = overrideUrl;
|
|
149
142
|
}
|
|
150
|
-
const proxyAgent = exports.getProxyAgent(proxyOpts);
|
|
143
|
+
const proxyAgent = (0, exports.getProxyAgent)(proxyOpts);
|
|
151
144
|
if (proxyAgent) {
|
|
152
145
|
newArguments.httpAgent = proxyAgent;
|
|
153
146
|
newArguments.httpsAgent = proxyAgent;
|
|
@@ -169,7 +162,7 @@ const getRequestBuilder = (options) => {
|
|
|
169
162
|
};
|
|
170
163
|
exports.getRequestBuilder = getRequestBuilder;
|
|
171
164
|
const getProxyAgent = (proxyOpts) => {
|
|
172
|
-
const proxyUrlFromConfiguration = exports.getProxyUrl(proxyOpts);
|
|
165
|
+
const proxyUrlFromConfiguration = (0, exports.getProxyUrl)(proxyOpts);
|
|
173
166
|
if (!proxyOpts || proxyUrlFromConfiguration === '') {
|
|
174
167
|
// Let the default proxy agent discover environment variables.
|
|
175
168
|
return new proxy_agent_1.ProxyAgent();
|
|
@@ -273,7 +266,7 @@ exports.filterSensitiveInfoFromRepository = filterSensitiveInfoFromRepository;
|
|
|
273
266
|
// Removes sensitive info from the given git remote url and normalizes the url prefix.
|
|
274
267
|
// "git@github.com:" and "https://github.com/" prefixes will be normalized into "github.com/"
|
|
275
268
|
const filterAndFormatGithubRemote = (rawRemote) => {
|
|
276
|
-
rawRemote = exports.filterSensitiveInfoFromRepository(rawRemote);
|
|
269
|
+
rawRemote = (0, exports.filterSensitiveInfoFromRepository)(rawRemote);
|
|
277
270
|
if (!rawRemote) {
|
|
278
271
|
return rawRemote;
|
|
279
272
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/helpers/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/helpers/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import * as t from 'typanion';
|
|
1
2
|
export declare const checkFile: (path: string) => {
|
|
2
3
|
empty: boolean;
|
|
3
4
|
exists: boolean;
|
|
@@ -11,7 +12,8 @@ export declare const checkFile: (path: string) => {
|
|
|
11
12
|
* @param site an optional string.
|
|
12
13
|
* @returns a boolean indicating if the provided site is valid a Datadog site.
|
|
13
14
|
*/
|
|
14
|
-
export declare const isValidDatadogSite: (site?: string
|
|
15
|
+
export declare const isValidDatadogSite: (site?: string) => boolean;
|
|
15
16
|
export declare const checkAPIKeyOverride: (environmentAPIKey: string | undefined, configFileAPIKey: string | undefined, stdout: {
|
|
16
17
|
write: (message: string) => void;
|
|
17
18
|
}) => void;
|
|
19
|
+
export declare const isInteger: () => t.StrictValidator<unknown, number>;
|
|
@@ -1,10 +1,34 @@
|
|
|
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 __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
27
|
};
|
|
5
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.checkAPIKeyOverride = exports.isValidDatadogSite = exports.checkFile = void 0;
|
|
29
|
+
exports.isInteger = exports.checkAPIKeyOverride = exports.isValidDatadogSite = exports.checkFile = void 0;
|
|
7
30
|
const fs_1 = __importDefault(require("fs"));
|
|
31
|
+
const t = __importStar(require("typanion"));
|
|
8
32
|
const constants_1 = require("../constants");
|
|
9
33
|
const checkFile = (path) => {
|
|
10
34
|
try {
|
|
@@ -48,4 +72,6 @@ const checkAPIKeyOverride = (environmentAPIKey, configFileAPIKey, stdout) => {
|
|
|
48
72
|
}
|
|
49
73
|
};
|
|
50
74
|
exports.checkAPIKeyOverride = checkAPIKeyOverride;
|
|
75
|
+
const isInteger = () => t.cascade(t.isNumber(), t.isInteger());
|
|
76
|
+
exports.isInteger = isInteger;
|
|
51
77
|
//# sourceMappingURL=validation.js.map
|