@datadog/datadog-ci 3.7.1 → 3.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli.js +1 -1
- package/dist/cli.js.map +1 -1
- package/dist/commands/aas/cli.d.ts +1 -0
- package/dist/commands/aas/cli.js +5 -0
- package/dist/commands/aas/cli.js.map +1 -0
- package/dist/commands/aas/common.d.ts +24 -0
- package/dist/commands/aas/common.js +128 -0
- package/dist/commands/aas/common.js.map +1 -0
- package/dist/commands/aas/instrument.d.ts +11 -0
- package/dist/commands/aas/instrument.js +158 -0
- package/dist/commands/aas/instrument.js.map +1 -0
- package/dist/commands/aas/interfaces.d.ts +16 -0
- package/dist/commands/aas/interfaces.js +3 -0
- package/dist/commands/aas/interfaces.js.map +1 -0
- package/dist/commands/cloud-run/constants.js +12 -12
- package/dist/commands/cloud-run/constants.js.map +1 -1
- package/dist/commands/coverage/renderer.d.ts +2 -0
- package/dist/commands/coverage/renderer.js +9 -1
- package/dist/commands/coverage/renderer.js.map +1 -1
- package/dist/commands/coverage/upload.d.ts +6 -1
- package/dist/commands/coverage/upload.js +108 -66
- package/dist/commands/coverage/upload.js.map +1 -1
- package/dist/commands/coverage/utils.d.ts +6 -2
- package/dist/commands/coverage/utils.js +72 -24
- package/dist/commands/coverage/utils.js.map +1 -1
- package/dist/commands/gate/evaluate.js +1 -1
- package/dist/commands/gate/evaluate.js.map +1 -1
- package/dist/commands/git-metadata/git.d.ts +1 -0
- package/dist/commands/git-metadata/git.js +19 -5
- package/dist/commands/git-metadata/git.js.map +1 -1
- package/dist/commands/lambda/functions/instrument.js +1 -1
- package/dist/commands/lambda/functions/instrument.js.map +1 -1
- package/dist/commands/sbom/payload.js +9 -6
- package/dist/commands/sbom/payload.js.map +1 -1
- package/dist/commands/sbom/renderer.d.ts +1 -1
- package/dist/commands/sbom/renderer.js +16 -6
- package/dist/commands/sbom/renderer.js.map +1 -1
- package/dist/commands/sbom/upload.js +1 -1
- package/dist/commands/sbom/upload.js.map +1 -1
- package/dist/commands/synthetics/deploy-tests-command.d.ts +1 -0
- package/dist/commands/synthetics/deploy-tests-command.js +7 -4
- package/dist/commands/synthetics/deploy-tests-command.js.map +1 -1
- package/dist/commands/synthetics/deploy-tests-lib.js +23 -3
- package/dist/commands/synthetics/deploy-tests-lib.js.map +1 -1
- package/dist/commands/synthetics/interfaces.d.ts +1 -0
- package/dist/commands/synthetics/tunnel/tunnel.js +3 -4
- package/dist/commands/synthetics/tunnel/tunnel.js.map +1 -1
- package/dist/constants.d.ts +1 -0
- package/dist/constants.js +3 -1
- package/dist/constants.js.map +1 -1
- package/dist/helpers/apikey.d.ts +1 -0
- package/dist/helpers/apikey.js +15 -11
- package/dist/helpers/apikey.js.map +1 -1
- package/dist/helpers/ci.d.ts +0 -1
- package/dist/helpers/ci.js +85 -36
- package/dist/helpers/ci.js.map +1 -1
- package/dist/helpers/file-finder.d.ts +3 -0
- package/dist/helpers/file-finder.js +49 -2
- package/dist/helpers/file-finder.js.map +1 -1
- package/dist/helpers/interfaces.d.ts +2 -2
- package/dist/helpers/tags.d.ts +0 -1
- package/dist/helpers/tags.js +1 -2
- package/dist/helpers/tags.js.map +1 -1
- package/dist/helpers/user-provided-git.js +5 -1
- package/dist/helpers/user-provided-git.js.map +1 -1
- package/dist/helpers/utils.d.ts +2 -1
- package/package.json +8 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../../src/commands/lambda/functions/instrument.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../../src/commands/lambda/functions/instrument.ts"],"names":[],"mappings":"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"}
|
|
@@ -137,13 +137,16 @@ const generatePayload = (jsonContent, tags, service, env) => {
|
|
|
137
137
|
continue;
|
|
138
138
|
}
|
|
139
139
|
const affects = [];
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
140
|
+
// Iterate over the affects of the vulnerability when it exists
|
|
141
|
+
if (vulnerability['affects']) {
|
|
142
|
+
for (const affected of vulnerability['affects']) {
|
|
143
|
+
if (!affected['ref']) {
|
|
144
|
+
continue;
|
|
145
|
+
}
|
|
146
|
+
affects.push({
|
|
147
|
+
ref: affected['ref'],
|
|
148
|
+
});
|
|
143
149
|
}
|
|
144
|
-
affects.push({
|
|
145
|
-
ref: affected['ref'],
|
|
146
|
-
});
|
|
147
150
|
}
|
|
148
151
|
vulnerabilities.push({
|
|
149
152
|
id: vulnerability['id'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payload.js","sourceRoot":"","sources":["../../../src/commands/sbom/payload.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"payload.js","sourceRoot":"","sources":["../../../src/commands/sbom/payload.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ export declare const renderInvalidFile: (sbomReport: string) => string;
|
|
|
3
3
|
export declare const renderInvalidPayload: (sbomReport: string) => string;
|
|
4
4
|
export declare const renderDuplicateUpload: (branch: string, sha: string) => string;
|
|
5
5
|
export declare const renderNoDefaultBranch: (repositoryUrl: string) => string;
|
|
6
|
-
export declare const renderFailedUpload: (sbomReport: string, error: any) => string;
|
|
6
|
+
export declare const renderFailedUpload: (sbomReport: string, error: any, debug: boolean) => string;
|
|
7
7
|
export declare const renderUploading: (sbomReport: string, scaRequest: ScaRequest) => string;
|
|
8
8
|
export declare const renderSuccessfulCommand: (duration: number) => string;
|
|
9
9
|
export declare const renderPayloadWarning: (dependencies: Dependency[]) => string;
|
|
@@ -49,13 +49,23 @@ const renderNoDefaultBranch = (repositoryUrl) => {
|
|
|
49
49
|
return fullStr;
|
|
50
50
|
};
|
|
51
51
|
exports.renderNoDefaultBranch = renderNoDefaultBranch;
|
|
52
|
-
const renderFailedUpload = (sbomReport, error) => {
|
|
53
|
-
var _a;
|
|
52
|
+
const renderFailedUpload = (sbomReport, error, debug) => {
|
|
53
|
+
var _a, _b, _c, _d;
|
|
54
54
|
const reportPath = `[${chalk_1.default.bold.dim(sbomReport)}]`;
|
|
55
55
|
let fullStr = '';
|
|
56
56
|
fullStr += chalk_1.default.red(`${ICONS.FAILED} Failed upload SBOM file ${reportPath}: ${error.message}\n`);
|
|
57
|
-
|
|
58
|
-
|
|
57
|
+
const status = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status;
|
|
58
|
+
const errors = (_c = (_b = error === null || error === void 0 ? void 0 : error.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.errors;
|
|
59
|
+
if (status) {
|
|
60
|
+
let str = `API status code: ${status}`;
|
|
61
|
+
// Always show the first error detail if present
|
|
62
|
+
if (Array.isArray(errors) && errors.length > 0 && errors[0].detail) {
|
|
63
|
+
str += `, Detail: ${errors[0].detail}`;
|
|
64
|
+
}
|
|
65
|
+
fullStr += chalk_1.default.red(`${str}\n`);
|
|
66
|
+
}
|
|
67
|
+
if (debug && Array.isArray(errors)) {
|
|
68
|
+
fullStr += chalk_1.default.red(`API full error response:\n${JSON.stringify((_d = error === null || error === void 0 ? void 0 : error.response) === null || _d === void 0 ? void 0 : _d.data, undefined, 2)}\n`);
|
|
59
69
|
}
|
|
60
70
|
return fullStr;
|
|
61
71
|
};
|
|
@@ -65,12 +75,12 @@ const renderUploading = (sbomReport, scaRequest) => {
|
|
|
65
75
|
for (const dep of scaRequest.dependencies) {
|
|
66
76
|
languages.add(dep.language.toString());
|
|
67
77
|
}
|
|
68
|
-
return `Uploading SBOM report in ${sbomReport} (${scaRequest.dependencies.length} dependencies detected for languages ${Array.from(languages).join(',')})\nUpload for repository ${scaRequest.repository.url}, branch ${scaRequest.commit.branch}\n`;
|
|
78
|
+
return `Uploading SBOM report in ${sbomReport} (${scaRequest.dependencies.length} dependencies detected for languages ${Array.from(languages).join(',')})\nUpload for repository ${scaRequest.repository.url}, branch ${scaRequest.commit.branch}, sha ${scaRequest.commit.sha}\n`;
|
|
69
79
|
};
|
|
70
80
|
exports.renderUploading = renderUploading;
|
|
71
81
|
const renderSuccessfulCommand = (duration) => {
|
|
72
82
|
let fullStr = '';
|
|
73
|
-
fullStr += chalk_1.default.green(`${ICONS.SUCCESS} Uploaded file in ${duration} seconds.\n`);
|
|
83
|
+
fullStr += chalk_1.default.green(`${ICONS.SUCCESS} Uploaded SBOM file in ${duration} seconds.\n`);
|
|
74
84
|
fullStr += chalk_1.default.green(`${ICONS.INFO} Results available on ${(0, utils_1.getBaseUrl)()}ci/code-analysis\n`);
|
|
75
85
|
fullStr += chalk_1.default.green('=================================================================================================\n');
|
|
76
86
|
return fullStr;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sbom/renderer.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AAEzB,0CAAyC;AAGzC,6CAAmD;AAEnD,MAAM,KAAK,GAAG;IACZ,MAAM,EAAE,GAAG;IACX,OAAO,EAAE,GAAG;IACZ,OAAO,EAAE,IAAI;IACb,IAAI,EAAE,IAAI;CACX,CAAA;AAEM,MAAM,iBAAiB,GAAG,CAAC,UAAkB,EAAE,EAAE;IACtD,MAAM,UAAU,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAA;IAEpD,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,6BAA6B,UAAU,KAAK,CAAC,CAAA;IACjF,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,4EAA4E,CAAC,CAAA;IAElG,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AARY,QAAA,iBAAiB,qBAQ7B;AAEM,MAAM,oBAAoB,GAAG,CAAC,UAAkB,EAAE,EAAE;IACzD,MAAM,UAAU,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAA;IACpD,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,oCAAoC,UAAU,KAAK,CAAC,CAAA;IACzE,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,oFAAoF,CAAC,CAAA;IAE1G,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAPY,QAAA,oBAAoB,wBAOhC;AAEM,MAAM,qBAAqB,GAAG,CAAC,MAAc,EAAE,GAAW,EAAE,EAAE;IACnE,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,OAAO,+BAA+B,CAAC,CAAA;IACrE,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,iDAAiD,MAAM,YAAY,GAAG,IAAI,CAAC,CAAA;IAChG,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAA;IAClE,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,6EAA6E,CAAC,CAAA;IACnG,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;IAE7C,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AATY,QAAA,qBAAqB,yBASjC;AAEM,MAAM,qBAAqB,GAAG,CAAC,aAAqB,EAAE,EAAE;IAC7D,IAAI,OAAO,GAAG,EAAE,CAAA;IAEhB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,OAAO,4CAA4C,aAAa,IAAI,CAAC,CAAA;IACnG,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAA;IACnE,OAAO,IAAI,eAAK,CAAC,GAAG,CAClB,sHAAsH,CACvH,CAAA;IACD,OAAO,IAAI,eAAK,CAAC,GAAG,CAClB,eAAe,IAAA,kBAAU,GAAE,wFAAwF,CACpH,CAAA;IACD,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,mFAAmF,CAAC,CAAA;IAEzG,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAdY,QAAA,qBAAqB,yBAcjC;AAEM,MAAM,kBAAkB,GAAG,CAAC,UAAkB,EAAE,KAAU,EAAE,EAAE;;
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sbom/renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -131,7 +131,7 @@ class UploadSbomCommand extends clipanion_1.Command {
|
|
|
131
131
|
return 1;
|
|
132
132
|
}
|
|
133
133
|
}
|
|
134
|
-
this.context.stderr.write((0, renderer_2.renderFailedUpload)(basePath, error));
|
|
134
|
+
this.context.stderr.write((0, renderer_2.renderFailedUpload)(basePath, error, !!this.debug));
|
|
135
135
|
return 1;
|
|
136
136
|
}
|
|
137
137
|
const uploadTimeMs = (Date.now() - startTimeMs) / 1000;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ export declare class DeployTestsCommand extends BaseCommand {
|
|
|
7
7
|
private files;
|
|
8
8
|
private publicIds;
|
|
9
9
|
private subdomain;
|
|
10
|
+
private excludeFields;
|
|
10
11
|
static getDefaultConfig(): DeployTestsCommandConfig;
|
|
11
12
|
execute(): Promise<0 | 1>;
|
|
12
13
|
protected resolveConfigFromEnv(): RecursivePartial<DeployTestsCommandConfig>;
|
|
@@ -27,9 +27,12 @@ class DeployTestsCommand extends base_command_1.BaseCommand {
|
|
|
27
27
|
this.subdomain = clipanion_1.Option.String('--subdomain', {
|
|
28
28
|
description: 'The custom subdomain to access your Datadog organization. If your URL is `myorg.datadoghq.com`, the custom subdomain is `myorg`.',
|
|
29
29
|
});
|
|
30
|
+
this.excludeFields = clipanion_1.Option.Array('--exclude-field', {
|
|
31
|
+
description: 'Fields to exclude from partial updates, to avoid breaking Main Test Definitions with data specific to Local Test Definitions, like the Start URL. By default, all fields inside `config` are excluded.',
|
|
32
|
+
});
|
|
30
33
|
}
|
|
31
34
|
static getDefaultConfig() {
|
|
32
|
-
return Object.assign(Object.assign({}, super.getDefaultConfig()), { files: [], publicIds: [], subdomain: 'app' });
|
|
35
|
+
return Object.assign(Object.assign({}, super.getDefaultConfig()), { files: [], publicIds: [], subdomain: 'app', excludeFields: ['config'] });
|
|
33
36
|
}
|
|
34
37
|
execute() {
|
|
35
38
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -46,11 +49,11 @@ class DeployTestsCommand extends base_command_1.BaseCommand {
|
|
|
46
49
|
});
|
|
47
50
|
}
|
|
48
51
|
resolveConfigFromEnv() {
|
|
49
|
-
var _a, _b;
|
|
50
|
-
return Object.assign(Object.assign({}, super.resolveConfigFromEnv()), { files: (_a = process.env.DATADOG_SYNTHETICS_FILES) === null || _a === void 0 ? void 0 : _a.split(';'), publicIds: (_b = process.env.DATADOG_SYNTHETICS_PUBLIC_IDS) === null || _b === void 0 ? void 0 : _b.split(';'), subdomain: process.env.DATADOG_SUBDOMAIN });
|
|
52
|
+
var _a, _b, _c;
|
|
53
|
+
return Object.assign(Object.assign({}, super.resolveConfigFromEnv()), { files: (_a = process.env.DATADOG_SYNTHETICS_FILES) === null || _a === void 0 ? void 0 : _a.split(';'), publicIds: (_b = process.env.DATADOG_SYNTHETICS_PUBLIC_IDS) === null || _b === void 0 ? void 0 : _b.split(';'), subdomain: process.env.DATADOG_SUBDOMAIN, excludeFields: (_c = process.env.DATADOG_SYNTHETICS_EXCLUDE_FIELDS) === null || _c === void 0 ? void 0 : _c.split(';') });
|
|
51
54
|
}
|
|
52
55
|
resolveConfigFromCli() {
|
|
53
|
-
return Object.assign(Object.assign({}, super.resolveConfigFromCli()), { files: this.files, publicIds: this.publicIds, subdomain: this.subdomain });
|
|
56
|
+
return Object.assign(Object.assign({}, super.resolveConfigFromCli()), { files: this.files, publicIds: this.publicIds, subdomain: this.subdomain, excludeFields: this.excludeFields });
|
|
54
57
|
}
|
|
55
58
|
}
|
|
56
59
|
exports.DeployTestsCommand = DeployTestsCommand;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-tests-command.js","sourceRoot":"","sources":["../../../src/commands/synthetics/deploy-tests-command.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,+CAAoD;AAEpD,iDAA4D;AAC5D,yDAA8C;AAG9C,MAAM,kBAAkB,GAAG,4BAA4B,CAAA;AAEvD,MAAM,EAAE,GAAG,IAAA,wBAAgB,EAAC,GAAG,kBAAkB,gEAAgE,CAAC,CAAA;AAElH,MAAa,kBAAmB,SAAQ,0BAAW;IAAnD;;QAqBY,WAAM,GAA6B,kBAAkB,CAAC,gBAAgB,EAAE,CAAA;QAE1E,UAAK,GAAG,kBAAM,CAAC,KAAK,CAAC,YAAY,EAAE;YACzC,WAAW,EAAE,qCAAqC,EAAE,CAAA,0BAA0B,IAAI;SACnF,CAAC,CAAA;QACM,cAAS,GAAG,kBAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAC,WAAW,EAAE,0CAA0C,EAAC,CAAC,CAAA;QACrG,cAAS,GAAG,kBAAM,CAAC,MAAM,CAAC,aAAa,EAAE;YAC/C,WAAW,EACT,kIAAkI;SACrI,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"deploy-tests-command.js","sourceRoot":"","sources":["../../../src/commands/synthetics/deploy-tests-command.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,+CAAoD;AAEpD,iDAA4D;AAC5D,yDAA8C;AAG9C,MAAM,kBAAkB,GAAG,4BAA4B,CAAA;AAEvD,MAAM,EAAE,GAAG,IAAA,wBAAgB,EAAC,GAAG,kBAAkB,gEAAgE,CAAC,CAAA;AAElH,MAAa,kBAAmB,SAAQ,0BAAW;IAAnD;;QAqBY,WAAM,GAA6B,kBAAkB,CAAC,gBAAgB,EAAE,CAAA;QAE1E,UAAK,GAAG,kBAAM,CAAC,KAAK,CAAC,YAAY,EAAE;YACzC,WAAW,EAAE,qCAAqC,EAAE,CAAA,0BAA0B,IAAI;SACnF,CAAC,CAAA;QACM,cAAS,GAAG,kBAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAC,WAAW,EAAE,0CAA0C,EAAC,CAAC,CAAA;QACrG,cAAS,GAAG,kBAAM,CAAC,MAAM,CAAC,aAAa,EAAE;YAC/C,WAAW,EACT,kIAAkI;SACrI,CAAC,CAAA;QACM,kBAAa,GAAG,kBAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE;YACtD,WAAW,EACT,wMAAwM;SAC3M,CAAC,CAAA;IA8CJ,CAAC;IA5CQ,MAAM,CAAC,gBAAgB;QAC5B,uCACK,KAAK,CAAC,gBAAgB,EAAE,KAC3B,KAAK,EAAE,EAAE,EACT,SAAS,EAAE,EAAE,EACb,SAAS,EAAE,KAAK,EAChB,aAAa,EAAE,CAAC,QAAQ,CAAC,IAC1B;IACH,CAAC;IAEY,OAAO;;YAClB,sBAAsB;YACtB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;YAElB,IAAI;gBACF,MAAM,IAAA,8BAAW,EAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;aAC9C;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;gBAE5C,OAAO,CAAC,CAAA;aACT;YAED,OAAO,CAAC,CAAA;QACV,CAAC;KAAA;IAES,oBAAoB;;QAC5B,uCACK,KAAK,CAAC,oBAAoB,EAAE,KAC/B,KAAK,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,wBAAwB,0CAAE,KAAK,CAAC,GAAG,CAAC,EACvD,SAAS,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,6BAA6B,0CAAE,KAAK,CAAC,GAAG,CAAC,EAChE,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,EACxC,aAAa,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,iCAAiC,0CAAE,KAAK,CAAC,GAAG,CAAC,IACzE;IACH,CAAC;IAES,oBAAoB;QAC5B,uCACK,KAAK,CAAC,oBAAoB,EAAE,KAC/B,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,SAAS,EAAE,IAAI,CAAC,SAAS,EACzB,SAAS,EAAE,IAAI,CAAC,SAAS,EACzB,aAAa,EAAE,IAAI,CAAC,aAAa,IAClC;IACH,CAAC;;AA/EH,gDAgFC;AA/Ee,wBAAK,GAAG,CAAC,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC,AAAnC,CAAmC;AAExC,wBAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,YAAY;IACtB,WAAW,EAAE,oEAAoE;IACjF,OAAO,EAAE;;KAER;IACD,QAAQ,EAAE;QACR;YACE,yDAAyD;YACzD,oFAAoF;SACrF;QACD;YACE,mCAAmC;YACnC,gHAAgH;SACjH;KACF;CACF,CAAC,AAhBiB,CAgBjB"}
|
|
@@ -8,12 +8,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.deployTests = void 0;
|
|
16
|
+
const get_value_1 = __importDefault(require("get-value"));
|
|
17
|
+
const set_value_1 = __importDefault(require("set-value"));
|
|
13
18
|
const app_1 = require("../../helpers/app");
|
|
14
19
|
const api_1 = require("./api");
|
|
15
20
|
const test_1 = require("./test");
|
|
16
21
|
const internal_1 = require("./utils/internal");
|
|
22
|
+
const removeExcludedFields = (existingRemoteTest, excludeFields, test) => {
|
|
23
|
+
if (!excludeFields || excludeFields.length === 0) {
|
|
24
|
+
return test;
|
|
25
|
+
}
|
|
26
|
+
const newTest = Object.assign({}, test);
|
|
27
|
+
for (const path of excludeFields) {
|
|
28
|
+
const existingValue = (0, get_value_1.default)(existingRemoteTest, path);
|
|
29
|
+
if (existingValue) {
|
|
30
|
+
(0, set_value_1.default)(newTest, path, existingValue);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
return newTest;
|
|
34
|
+
};
|
|
17
35
|
const deployTests = (reporter, config) => __awaiter(void 0, void 0, void 0, function* () {
|
|
18
36
|
var _a;
|
|
19
37
|
const api = (0, api_1.getApiHelper)(config);
|
|
@@ -35,7 +53,7 @@ const deployTests = (reporter, config) => __awaiter(void 0, void 0, void 0, func
|
|
|
35
53
|
// SYNTH-18434: public ID should be made required
|
|
36
54
|
const publicId = localTestDefinition.localTestDefinition.public_id;
|
|
37
55
|
try {
|
|
38
|
-
yield deployLocalTestDefinition(api, localTestDefinition);
|
|
56
|
+
yield deployLocalTestDefinition(api, localTestDefinition, config.excludeFields);
|
|
39
57
|
// SYNTH-18527: the edit test endpoint should return a version in the response, so we can print it in the logs and see it in version history
|
|
40
58
|
const baseUrl = (0, app_1.getCommonAppBaseURL)(config.datadogSite, config.subdomain);
|
|
41
59
|
const testLink = `${baseUrl}synthetics/details/${publicId}`;
|
|
@@ -48,13 +66,15 @@ const deployTests = (reporter, config) => __awaiter(void 0, void 0, void 0, func
|
|
|
48
66
|
}
|
|
49
67
|
});
|
|
50
68
|
exports.deployTests = deployTests;
|
|
51
|
-
const deployLocalTestDefinition = (api, test) => __awaiter(void 0, void 0, void 0, function* () {
|
|
69
|
+
const deployLocalTestDefinition = (api, test, excludeFields) => __awaiter(void 0, void 0, void 0, function* () {
|
|
52
70
|
// SYNTH-18434: public ID should be made required
|
|
53
71
|
const publicId = test.localTestDefinition.public_id;
|
|
54
72
|
const existingRemoteTest = yield api.getTest(publicId);
|
|
55
73
|
// SYNTH-18528: the client should not have to handle the merge for partial update
|
|
56
74
|
const newRemoteTest = removeUnsupportedEditTestFields(Object.assign(Object.assign(Object.assign({}, existingRemoteTest), test.localTestDefinition), { config: Object.assign(Object.assign({}, existingRemoteTest.config), test.localTestDefinition.config), options: Object.assign(Object.assign({}, existingRemoteTest.options), test.localTestDefinition.options) }));
|
|
57
|
-
|
|
75
|
+
// Replace excluded fields with values from the existing remote test
|
|
76
|
+
const finalTest = removeExcludedFields(existingRemoteTest, excludeFields || [], newRemoteTest);
|
|
77
|
+
yield api.editTest(publicId, finalTest);
|
|
58
78
|
});
|
|
59
79
|
const removeUnsupportedEditTestFields = (testConfig) => {
|
|
60
80
|
const editTestPayload = Object.assign({}, testConfig);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-tests-lib.js","sourceRoot":"","sources":["../../../src/commands/synthetics/deploy-tests-lib.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"deploy-tests-lib.js","sourceRoot":"","sources":["../../../src/commands/synthetics/deploy-tests-lib.ts"],"names":[],"mappings":"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"}
|
|
@@ -611,6 +611,7 @@ export interface ImportTestsCommandConfig extends SyntheticsCIConfig {
|
|
|
611
611
|
}
|
|
612
612
|
export interface DeployTestsCommandConfig extends SyntheticsCIConfig {
|
|
613
613
|
configPath: string;
|
|
614
|
+
excludeFields?: string[];
|
|
614
615
|
files: string[];
|
|
615
616
|
publicIds: string[];
|
|
616
617
|
subdomain: string;
|
|
@@ -93,9 +93,6 @@ class Tunnel {
|
|
|
93
93
|
socket.destroy();
|
|
94
94
|
}
|
|
95
95
|
});
|
|
96
|
-
if (this.multiplexer) {
|
|
97
|
-
this.multiplexer.close();
|
|
98
|
-
}
|
|
99
96
|
yield this.ws.close();
|
|
100
97
|
});
|
|
101
98
|
}
|
|
@@ -174,7 +171,9 @@ class Tunnel {
|
|
|
174
171
|
dest.on('error', (error) => {
|
|
175
172
|
var _a, _b, _c;
|
|
176
173
|
if (src) {
|
|
177
|
-
(
|
|
174
|
+
if (error.code !== 'ERR_STREAM_PREMATURE_CLOSE') {
|
|
175
|
+
(_a = this.reporter) === null || _a === void 0 ? void 0 : _a.warn(`Error on opened connection (${destIP}): ${error.code}`);
|
|
176
|
+
}
|
|
178
177
|
src.close();
|
|
179
178
|
}
|
|
180
179
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/tunnel/tunnel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAsC;AACtC,6BAA0B;AAC1B,mCAAuC;AAIvC,+BAOa;AACb,uCAA2E;AAE3E,qCAAyD;AACzD,2CAAqC;AAErC,kHAAkH;AAClH,MAAM,aAAa,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAC5D,kHAAkH;AAClH,MAAM,EAAC,OAAO,EAAC,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAclD,MAAa,MAAM;IAYjB,YACU,GAAW,EACX,OAAiB,EACzB,UAAuB,EACf,QAAyB;QAHzB,QAAG,GAAH,GAAG,CAAQ;QACX,YAAO,GAAP,OAAO,CAAU;QAEjB,aAAQ,GAAR,QAAQ,CAAiB;QAf3B,uBAAkB,GAAG,KAAc,CAAA;QAMnC,cAAS,GAAG,KAAK,CAAA;QAGjB,qBAAgB,GAAgB,IAAI,GAAG,EAAE,CAAA;QAQ/C,YAAY;QACZ,MAAM,EAAC,UAAU,EAAE,cAAc,EAAC,GAAG,IAAA,4BAAmB,GAAE,CAAA;QAC1D,MAAM,oBAAoB,GAAG,IAAA,oBAAW,EAAC,cAAc,CAAC,CAAA;QAExD,MAAM,EAAC,SAAS,EAAE,UAAU,EAAC,GAAG,IAAA,4BAAmB,GAAE,CAAA;QACrD,IAAI,CAAC,SAAS,GAAG,IAAA,oBAAW,EAAC,SAAS,CAAC,CAAA;QACvC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAE5B,IAAI,CAAC,SAAS,GAAG;YACf,UAAU,EAAE;gBACV,aAAa,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC;aAC3C;YACD,sFAAsF;YACtF,aAAa,EAAE,GAAG,GAAG,IAAI;YACzB,QAAQ,EAAE,CAAC,cAAc,CAAC;SAC3B,CAAA;QAED,IAAI,CAAC,EAAE,GAAG,IAAI,qBAAS,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,CAAA;IAC/C,CAAC;IAED;;OAEG;IACU,SAAS;;YACpB,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;aAC3C;YAED,OAAO,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,CAAA;QAC5B,CAAC;KAAA;IAED;;;;;OAKG;IACU,KAAK;;;YAChB,MAAA,IAAI,CAAC,QAAQ,0CAAE,GAAG,CAAC,sBAAsB,IAAI,CAAC,OAAO,CAAC,MAAM,SAAS,CAAC,CAAA;YAEtE,MAAA,IAAI,CAAC,QAAQ,0CAAE,GAAG,CAAC,6EAA6E,CAAC,CAAA;YACjG,IAAI;gBACF,yDAAyD;gBACzD,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAA;gBACvB,gHAAgH;gBAEhH,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAA;gBAEzD,OAAO,cAAc,CAAA;aACtB;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAA,IAAI,CAAC,QAAQ,0CAAE,KAAK,CAAC,+CAA+C,CAAC,CAAA;gBACrE,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA,CAAC,WAAW;gBAC7B,MAAM,GAAG,CAAA;aACV;;KACF;IAED;;OAEG;IACU,IAAI;;;YACf,MAAA,IAAI,CAAC,QAAQ,0CAAE,GAAG,CAAC,uBAAuB,CAAC,CAAA;YAE3C,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;gBACvC,IAAI,CAAC,CAAC,MAAM,EAAE;oBACZ,MAAM,CAAC,OAAO,EAAE,CAAA;iBACjB;YACH,CAAC,CAAC,CAAA;YAEF,
|
|
1
|
+
{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/tunnel/tunnel.ts"],"names":[],"mappings":"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"}
|
package/dist/constants.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ export declare const DATADOG_SITE_EU1 = "datadoghq.eu";
|
|
|
3
3
|
export declare const DATADOG_SITE_US3 = "us3.datadoghq.com";
|
|
4
4
|
export declare const DATADOG_SITE_US5 = "us5.datadoghq.com";
|
|
5
5
|
export declare const DATADOG_SITE_AP1 = "ap1.datadoghq.com";
|
|
6
|
+
export declare const DATADOG_SITE_AP2 = "ap2.datadoghq.com";
|
|
6
7
|
export declare const DATADOG_SITE_GOV = "ddog-gov.com";
|
|
7
8
|
export declare const DATADOG_SITES: string[];
|
|
8
9
|
export declare const FIPS_ENV_VAR = "DATADOG_FIPS";
|
package/dist/constants.js
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.FLARE_PROJECT_FILES = exports.FLARE_ENDPOINT_PATH = exports.INSIGHTS_FILE_NAME = exports.ADDITIONAL_FILES_DIRECTORY = exports.PROJECT_FILES_DIRECTORY = exports.LOGS_DIRECTORY = exports.FLARE_OUTPUT_DIRECTORY = exports.SITE_ENV_VAR = exports.CI_SITE_ENV_VAR = exports.CI_API_KEY_ENV_VAR = exports.API_KEY_ENV_VAR = exports.VERSION_ENV_VAR = exports.ENVIRONMENT_ENV_VAR = exports.SERVICE_ENV_VAR = exports.METHOD_POST = exports.CONTENT_TYPE_VALUE_JSON = exports.CONTENT_TYPE_VALUE_PROTOBUF = exports.CONTENT_TYPE_HEADER = exports.FIPS_IGNORE_ERROR_ENV_VAR = exports.FIPS_ENV_VAR = exports.DATADOG_SITES = exports.DATADOG_SITE_GOV = exports.DATADOG_SITE_AP1 = exports.DATADOG_SITE_US5 = exports.DATADOG_SITE_US3 = exports.DATADOG_SITE_EU1 = exports.DATADOG_SITE_US1 = void 0;
|
|
3
|
+
exports.FLARE_PROJECT_FILES = exports.FLARE_ENDPOINT_PATH = exports.INSIGHTS_FILE_NAME = exports.ADDITIONAL_FILES_DIRECTORY = exports.PROJECT_FILES_DIRECTORY = exports.LOGS_DIRECTORY = exports.FLARE_OUTPUT_DIRECTORY = exports.SITE_ENV_VAR = exports.CI_SITE_ENV_VAR = exports.CI_API_KEY_ENV_VAR = exports.API_KEY_ENV_VAR = exports.VERSION_ENV_VAR = exports.ENVIRONMENT_ENV_VAR = exports.SERVICE_ENV_VAR = exports.METHOD_POST = exports.CONTENT_TYPE_VALUE_JSON = exports.CONTENT_TYPE_VALUE_PROTOBUF = exports.CONTENT_TYPE_HEADER = exports.FIPS_IGNORE_ERROR_ENV_VAR = exports.FIPS_ENV_VAR = exports.DATADOG_SITES = exports.DATADOG_SITE_GOV = exports.DATADOG_SITE_AP2 = exports.DATADOG_SITE_AP1 = exports.DATADOG_SITE_US5 = exports.DATADOG_SITE_US3 = exports.DATADOG_SITE_EU1 = exports.DATADOG_SITE_US1 = void 0;
|
|
4
4
|
exports.DATADOG_SITE_US1 = 'datadoghq.com';
|
|
5
5
|
exports.DATADOG_SITE_EU1 = 'datadoghq.eu';
|
|
6
6
|
exports.DATADOG_SITE_US3 = 'us3.datadoghq.com';
|
|
7
7
|
exports.DATADOG_SITE_US5 = 'us5.datadoghq.com';
|
|
8
8
|
exports.DATADOG_SITE_AP1 = 'ap1.datadoghq.com';
|
|
9
|
+
exports.DATADOG_SITE_AP2 = 'ap2.datadoghq.com';
|
|
9
10
|
exports.DATADOG_SITE_GOV = 'ddog-gov.com';
|
|
10
11
|
exports.DATADOG_SITES = [
|
|
11
12
|
exports.DATADOG_SITE_US1,
|
|
@@ -13,6 +14,7 @@ exports.DATADOG_SITES = [
|
|
|
13
14
|
exports.DATADOG_SITE_US3,
|
|
14
15
|
exports.DATADOG_SITE_US5,
|
|
15
16
|
exports.DATADOG_SITE_AP1,
|
|
17
|
+
exports.DATADOG_SITE_AP2,
|
|
16
18
|
exports.DATADOG_SITE_GOV,
|
|
17
19
|
];
|
|
18
20
|
// Common env vars
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG,eAAe,CAAA;AAClC,QAAA,gBAAgB,GAAG,cAAc,CAAA;AACjC,QAAA,gBAAgB,GAAG,mBAAmB,CAAA;AACtC,QAAA,gBAAgB,GAAG,mBAAmB,CAAA;AACtC,QAAA,gBAAgB,GAAG,mBAAmB,CAAA;AACtC,QAAA,gBAAgB,GAAG,cAAc,CAAA;AAEjC,QAAA,aAAa,GAAa;IACrC,wBAAgB;IAChB,wBAAgB;IAChB,wBAAgB;IAChB,wBAAgB;IAChB,wBAAgB;IAChB,wBAAgB;CACjB,CAAA;AAED,kBAAkB;AACL,QAAA,YAAY,GAAG,cAAc,CAAA;AAC7B,QAAA,yBAAyB,GAAG,2BAA2B,CAAA;AAEvD,QAAA,mBAAmB,GAAG,cAAc,CAAA;AACpC,QAAA,2BAA2B,GAAG,wBAAwB,CAAA;AACtD,QAAA,uBAAuB,GAAG,kBAAkB,CAAA;AAE5C,QAAA,WAAW,GAAG,MAAM,CAAA;AAEjC,mBAAmB;AACN,QAAA,eAAe,GAAG,YAAY,CAAA;AAC9B,QAAA,mBAAmB,GAAG,QAAQ,CAAA;AAC9B,QAAA,eAAe,GAAG,YAAY,CAAA;AAE3C,iDAAiD;AACpC,QAAA,eAAe,GAAG,YAAY,CAAA;AAC9B,QAAA,kBAAkB,GAAG,iBAAiB,CAAA;AACtC,QAAA,eAAe,GAAG,cAAc,CAAA;AAChC,QAAA,YAAY,GAAG,SAAS,CAAA;AAErC,kBAAkB;AACL,QAAA,sBAAsB,GAAG,aAAa,CAAA;AACtC,QAAA,cAAc,GAAG,MAAM,CAAA;AACvB,QAAA,uBAAuB,GAAG,eAAe,CAAA;AACzC,QAAA,0BAA0B,GAAG,kBAAkB,CAAA;AAC/C,QAAA,kBAAkB,GAAG,aAAa,CAAA;AAClC,QAAA,mBAAmB,GAAG,kCAAkC,CAAA;AAErE,uCAAuC;AAC1B,QAAA,mBAAmB,GAAG;IACjC,kCAAkC;IAClC,kCAAkC;IAClC,iCAAiC;IACjC,mCAAmC;IACnC,UAAU;IACV,cAAc;IACd,mBAAmB;IACnB,WAAW;IACX,QAAQ;IACR,SAAS;IACT,kBAAkB;IAClB,SAAS;IACT,cAAc;IACd,gBAAgB;IAChB,OAAO;IACP,SAAS;IACT,cAAc;IACd,SAAS;IACT,aAAa;IACb,KAAK;IACL,UAAU;IACV,QAAQ;IACR,QAAQ;IACR,YAAY;IACZ,UAAU;IACV,OAAO;IACP,SAAS;IACT,cAAc;IACd,OAAO;IACP,cAAc;IACd,iBAAiB;IACjB,kBAAkB;IAClB,aAAa;IACb,SAAS;IACT,YAAY;IACZ,qBAAqB;IACrB,oBAAoB;IACpB,oBAAoB;IACpB,mBAAmB;IACnB,UAAU;IACV,eAAe;IACf,mBAAmB;CACpB,CAAA"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG,eAAe,CAAA;AAClC,QAAA,gBAAgB,GAAG,cAAc,CAAA;AACjC,QAAA,gBAAgB,GAAG,mBAAmB,CAAA;AACtC,QAAA,gBAAgB,GAAG,mBAAmB,CAAA;AACtC,QAAA,gBAAgB,GAAG,mBAAmB,CAAA;AACtC,QAAA,gBAAgB,GAAG,mBAAmB,CAAA;AACtC,QAAA,gBAAgB,GAAG,cAAc,CAAA;AAEjC,QAAA,aAAa,GAAa;IACrC,wBAAgB;IAChB,wBAAgB;IAChB,wBAAgB;IAChB,wBAAgB;IAChB,wBAAgB;IAChB,wBAAgB;IAChB,wBAAgB;CACjB,CAAA;AAED,kBAAkB;AACL,QAAA,YAAY,GAAG,cAAc,CAAA;AAC7B,QAAA,yBAAyB,GAAG,2BAA2B,CAAA;AAEvD,QAAA,mBAAmB,GAAG,cAAc,CAAA;AACpC,QAAA,2BAA2B,GAAG,wBAAwB,CAAA;AACtD,QAAA,uBAAuB,GAAG,kBAAkB,CAAA;AAE5C,QAAA,WAAW,GAAG,MAAM,CAAA;AAEjC,mBAAmB;AACN,QAAA,eAAe,GAAG,YAAY,CAAA;AAC9B,QAAA,mBAAmB,GAAG,QAAQ,CAAA;AAC9B,QAAA,eAAe,GAAG,YAAY,CAAA;AAE3C,iDAAiD;AACpC,QAAA,eAAe,GAAG,YAAY,CAAA;AAC9B,QAAA,kBAAkB,GAAG,iBAAiB,CAAA;AACtC,QAAA,eAAe,GAAG,cAAc,CAAA;AAChC,QAAA,YAAY,GAAG,SAAS,CAAA;AAErC,kBAAkB;AACL,QAAA,sBAAsB,GAAG,aAAa,CAAA;AACtC,QAAA,cAAc,GAAG,MAAM,CAAA;AACvB,QAAA,uBAAuB,GAAG,eAAe,CAAA;AACzC,QAAA,0BAA0B,GAAG,kBAAkB,CAAA;AAC/C,QAAA,kBAAkB,GAAG,aAAa,CAAA;AAClC,QAAA,mBAAmB,GAAG,kCAAkC,CAAA;AAErE,uCAAuC;AAC1B,QAAA,mBAAmB,GAAG;IACjC,kCAAkC;IAClC,kCAAkC;IAClC,iCAAiC;IACjC,mCAAmC;IACnC,UAAU;IACV,cAAc;IACd,mBAAmB;IACnB,WAAW;IACX,QAAQ;IACR,SAAS;IACT,kBAAkB;IAClB,SAAS;IACT,cAAc;IACd,gBAAgB;IAChB,OAAO;IACP,SAAS;IACT,cAAc;IACd,SAAS;IACT,aAAa;IACb,KAAK;IACL,UAAU;IACV,QAAQ;IACR,QAAQ;IACR,YAAY;IACZ,UAAU;IACV,OAAO;IACP,SAAS;IACT,cAAc;IACd,OAAO;IACP,cAAc;IACd,iBAAiB;IACjB,kBAAkB;IAClB,aAAa;IACb,SAAS;IACT,YAAY;IACZ,qBAAqB;IACrB,oBAAoB;IACpB,oBAAoB;IACpB,mBAAmB;IACnB,UAAU;IACV,eAAe;IACf,mBAAmB;CACpB,CAAA"}
|
package/dist/helpers/apikey.d.ts
CHANGED
package/dist/helpers/apikey.js
CHANGED
|
@@ -45,17 +45,10 @@ class ApiKeyValidatorImplem {
|
|
|
45
45
|
}
|
|
46
46
|
});
|
|
47
47
|
}
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
53
|
-
if (this.isValid === undefined) {
|
|
54
|
-
this.isValid = yield this.validateApiKey();
|
|
55
|
-
}
|
|
56
|
-
return this.isValid;
|
|
57
|
-
});
|
|
58
|
-
}
|
|
48
|
+
/**
|
|
49
|
+
* Check if the API key is valid by making a request to the Datadog validate API.
|
|
50
|
+
* @returns `true` if the API key is valid, `false` otherwise.
|
|
51
|
+
*/
|
|
59
52
|
validateApiKey() {
|
|
60
53
|
return __awaiter(this, void 0, void 0, function* () {
|
|
61
54
|
try {
|
|
@@ -74,5 +67,16 @@ class ApiKeyValidatorImplem {
|
|
|
74
67
|
}
|
|
75
68
|
});
|
|
76
69
|
}
|
|
70
|
+
getApiKeyValidationURL() {
|
|
71
|
+
return `https://api.${this.datadogSite}/api/v1/validate`;
|
|
72
|
+
}
|
|
73
|
+
isApiKeyValid() {
|
|
74
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
75
|
+
if (this.isValid === undefined) {
|
|
76
|
+
this.isValid = yield this.validateApiKey();
|
|
77
|
+
}
|
|
78
|
+
return this.isValid;
|
|
79
|
+
});
|
|
80
|
+
}
|
|
77
81
|
}
|
|
78
82
|
//# sourceMappingURL=apikey.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apikey.js","sourceRoot":"","sources":["../../src/helpers/apikey.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAkD;AAClD,kDAAyB;AAGzB,qCAAkD;
|
|
1
|
+
{"version":3,"file":"apikey.js","sourceRoot":"","sources":["../../src/helpers/apikey.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAkD;AAClD,kDAAyB;AAGzB,qCAAkD;AAgB3C,MAAM,kBAAkB,GAAG,CAAC,MAA6B,EAAmB,EAAE,CACnF,IAAI,qBAAqB,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,aAAa,CAAC,CAAA;AADvE,QAAA,kBAAkB,sBACqD;AAEpF;;GAEG;AACH,MAAM,qBAAqB;IAOzB,YAAY,MAA0B,EAAE,WAAmB,EAAE,aAAqC;QAChG,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;IACpC,CAAC;IAED;;;;OAIG;IACU,YAAY,CAAC,KAAiB;;YACzC,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS,EAAE;gBAChC,OAAM;aACP;YACD,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE;gBACrG,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE;oBACpC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC,CAAC,CAAA;iBAChD;gBACD,MAAM,IAAI,kCAAyB,CACjC,GAAG,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,sDAAsD,IAAI,CAAC,WAAW,EAAE,CAC7G,CAAA;aACF;QACH,CAAC;KAAA;IAED;;;OAGG;IACU,cAAc;;YACzB,IAAI;gBACF,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE;oBAC9D,OAAO,EAAE;wBACP,YAAY,EAAE,IAAI,CAAC,MAAM;qBAC1B;iBACF,CAAC,CAAA;gBAEF,OAAO,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAA;aAC3B;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;oBACnD,OAAO,KAAK,CAAA;iBACb;gBACD,MAAM,KAAK,CAAA;aACZ;QACH,CAAC;KAAA;IAEO,sBAAsB;QAC5B,OAAO,eAAe,IAAI,CAAC,WAAW,kBAAkB,CAAA;IAC1D,CAAC;IAEa,aAAa;;YACzB,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;gBAC9B,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;aAC3C;YAED,OAAO,IAAI,CAAC,OAAO,CAAA;QACrB,CAAC;KAAA;CACF"}
|
package/dist/helpers/ci.d.ts
CHANGED
|
@@ -53,7 +53,6 @@ export declare const getCIMetadata: (tagSizeLimits?: {
|
|
|
53
53
|
"ci.node.labels"?: number | undefined;
|
|
54
54
|
service?: number | undefined;
|
|
55
55
|
"git.commit.head_sha"?: number | undefined;
|
|
56
|
-
"git.commit.base_ref"?: number | undefined;
|
|
57
56
|
"git.pull_request.base_branch"?: number | undefined;
|
|
58
57
|
"git.pull_request.base_branch_sha"?: number | undefined;
|
|
59
58
|
"tool.generator.name"?: number | undefined;
|