@datadog/datadog-ci 2.9.1 → 2.10.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/commands/git-metadata/upload.d.ts +2 -0
- package/dist/commands/git-metadata/upload.js +20 -4
- package/dist/commands/git-metadata/upload.js.map +1 -1
- package/dist/constants.d.ts +6 -0
- package/dist/constants.js +13 -7
- package/dist/constants.js.map +1 -1
- package/dist/helpers/plist.js +19 -1
- package/dist/helpers/plist.js.map +1 -1
- package/package.json +1 -1
|
@@ -7,6 +7,7 @@ export declare class UploadCommand extends Command {
|
|
|
7
7
|
private dryRun;
|
|
8
8
|
private verbose;
|
|
9
9
|
private gitSync;
|
|
10
|
+
private noGitSync;
|
|
10
11
|
private directory;
|
|
11
12
|
private logger;
|
|
12
13
|
constructor();
|
|
@@ -15,4 +16,5 @@ export declare class UploadCommand extends Command {
|
|
|
15
16
|
private uploadToSrcmapTrack;
|
|
16
17
|
private getSrcmapRequestBuilder;
|
|
17
18
|
private getApiRequestBuilder;
|
|
19
|
+
private isTargetingGov;
|
|
18
20
|
}
|
|
@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.UploadCommand = void 0;
|
|
16
16
|
const chalk_1 = __importDefault(require("chalk"));
|
|
17
17
|
const clipanion_1 = require("clipanion");
|
|
18
|
+
const constants_1 = require("../../constants");
|
|
18
19
|
const apikey_1 = require("../../helpers/apikey");
|
|
19
20
|
const errors_1 = require("../../helpers/errors");
|
|
20
21
|
const formatting_1 = require("../../helpers/formatting");
|
|
@@ -36,6 +37,7 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
36
37
|
this.dryRun = false;
|
|
37
38
|
this.verbose = false;
|
|
38
39
|
this.gitSync = false;
|
|
40
|
+
this.noGitSync = false;
|
|
39
41
|
this.directory = '';
|
|
40
42
|
this.logger = new logger_1.Logger((s) => {
|
|
41
43
|
this.context.stdout.write(s);
|
|
@@ -61,6 +63,9 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
61
63
|
this.logger.error(renderer_1.renderConfigurationError(new errors_1.InvalidConfigurationError(`Missing ${chalk_1.default.bold('DATADOG_API_KEY')} in your environment`)));
|
|
62
64
|
return 1;
|
|
63
65
|
}
|
|
66
|
+
if (this.gitSync) {
|
|
67
|
+
this.logger.warn('Option --git-sync is deprecated as it is now the default behavior');
|
|
68
|
+
}
|
|
64
69
|
const metricsLogger = metrics_1.getMetricsLogger({
|
|
65
70
|
datadogSite: process.env.DATADOG_SITE,
|
|
66
71
|
defaultTags: [`cli_version:${this.cliVersion}`],
|
|
@@ -88,7 +93,7 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
88
93
|
this.logger.error(`Failed upload of tracked files: ${err}`);
|
|
89
94
|
inError = true;
|
|
90
95
|
}
|
|
91
|
-
if (this.
|
|
96
|
+
if (!this.noGitSync) {
|
|
92
97
|
try {
|
|
93
98
|
this.logger.info('Syncing GitDB...');
|
|
94
99
|
const elapsed = yield utils_1.timedExecAsync(this.uploadToGitDB.bind(this), {
|
|
@@ -98,8 +103,13 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
98
103
|
this.logger.info(`${this.dryRun ? '[DRYRUN] ' : ''}Successfully synced git DB in ${elapsed} seconds.`);
|
|
99
104
|
}
|
|
100
105
|
catch (err) {
|
|
101
|
-
|
|
102
|
-
|
|
106
|
+
if (!this.isTargetingGov()) {
|
|
107
|
+
this.logger.warn(`Could not write to GitDB: ${err}`);
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
// Skip the warning for Gov DC since git sync is not available there yet.
|
|
111
|
+
this.logger.warn(`Not writing to GitDB: not available for gov`);
|
|
112
|
+
}
|
|
103
113
|
}
|
|
104
114
|
}
|
|
105
115
|
try {
|
|
@@ -183,6 +193,9 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
183
193
|
baseUrl: 'https://' + api_1.apiHost,
|
|
184
194
|
});
|
|
185
195
|
}
|
|
196
|
+
isTargetingGov() {
|
|
197
|
+
return process.env.DATADOG_SITE === constants_1.DATADOG_SITE_GOV;
|
|
198
|
+
}
|
|
186
199
|
}
|
|
187
200
|
exports.UploadCommand = UploadCommand;
|
|
188
201
|
UploadCommand.usage = clipanion_1.Command.Usage({
|
|
@@ -190,13 +203,16 @@ UploadCommand.usage = clipanion_1.Command.Usage({
|
|
|
190
203
|
details: `
|
|
191
204
|
This command will upload the commit details to Datadog in order to create links to your repositories inside Datadog's UI.\n
|
|
192
205
|
See README for details.
|
|
206
|
+
|
|
207
|
+
Option --git-sync is DEPRECATED and will be removed in a future version.
|
|
193
208
|
`,
|
|
194
209
|
examples: [['Upload the current commit details', 'datadog-ci report-commits upload']],
|
|
195
210
|
});
|
|
196
211
|
UploadCommand.addPath('git-metadata', 'upload');
|
|
197
212
|
UploadCommand.addOption('dryRun', clipanion_1.Command.Boolean('--dry-run'));
|
|
198
213
|
UploadCommand.addOption('verbose', clipanion_1.Command.Boolean('--verbose'));
|
|
199
|
-
UploadCommand.addOption('directory', clipanion_1.Command.String('--directory'));
|
|
200
214
|
UploadCommand.addOption('gitSync', clipanion_1.Command.Boolean('--git-sync'));
|
|
215
|
+
UploadCommand.addOption('noGitSync', clipanion_1.Command.Boolean('--no-gitsync'));
|
|
216
|
+
UploadCommand.addOption('directory', clipanion_1.Command.String('--directory'));
|
|
201
217
|
UploadCommand.addOption('repositoryURL', clipanion_1.Command.String('--repository-url'));
|
|
202
218
|
//# sourceMappingURL=upload.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAyB;AACzB,yCAAiC;AAEjC,iDAAwE;AACxE,iDAA8D;AAC9D,yDAA8C;AAE9C,iDAAqD;AACrD,mDAAqE;AACrE,iDAAiD;AACjD,+CAAqE;AAErE,+BAA4D;AAC5D,+BAAiD;AACjD,mCAAqC;AAErC,uCAA0C;AAC1C,yCAOmB;AAEnB,MAAa,aAAc,SAAQ,mBAAO;
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/upload.ts"],"names":[],"mappings":"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"}
|
package/dist/constants.d.ts
CHANGED
|
@@ -1 +1,7 @@
|
|
|
1
|
+
export declare const DATADOG_SITE_US1 = "datadoghq.com";
|
|
2
|
+
export declare const DATADOG_SITE_EU1 = "datadoghq.eu";
|
|
3
|
+
export declare const DATADOG_SITE_US3 = "us3.datadoghq.com";
|
|
4
|
+
export declare const DATADOG_SITE_US5 = "us5.datadoghq.com";
|
|
5
|
+
export declare const DATADOG_SITE_AP1 = "ap1.datadoghq.com";
|
|
6
|
+
export declare const DATADOG_SITE_GOV = "ddog-gov.com";
|
|
1
7
|
export declare const DATADOG_SITES: string[];
|
package/dist/constants.js
CHANGED
|
@@ -1,12 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.DATADOG_SITES = void 0;
|
|
3
|
+
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;
|
|
4
|
+
exports.DATADOG_SITE_US1 = 'datadoghq.com';
|
|
5
|
+
exports.DATADOG_SITE_EU1 = 'datadoghq.eu';
|
|
6
|
+
exports.DATADOG_SITE_US3 = 'us3.datadoghq.com';
|
|
7
|
+
exports.DATADOG_SITE_US5 = 'us5.datadoghq.com';
|
|
8
|
+
exports.DATADOG_SITE_AP1 = 'ap1.datadoghq.com';
|
|
9
|
+
exports.DATADOG_SITE_GOV = 'ddog-gov.com';
|
|
4
10
|
exports.DATADOG_SITES = [
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
+
exports.DATADOG_SITE_US1,
|
|
12
|
+
exports.DATADOG_SITE_EU1,
|
|
13
|
+
exports.DATADOG_SITE_US3,
|
|
14
|
+
exports.DATADOG_SITE_US5,
|
|
15
|
+
exports.DATADOG_SITE_AP1,
|
|
16
|
+
exports.DATADOG_SITE_GOV,
|
|
11
17
|
];
|
|
12
18
|
//# sourceMappingURL=constants.js.map
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,
|
|
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"}
|
package/dist/helpers/plist.js
CHANGED
|
@@ -3,6 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.parsePlist = void 0;
|
|
4
4
|
const fs_1 = require("fs");
|
|
5
5
|
const fast_xml_parser_1 = require("fast-xml-parser");
|
|
6
|
+
const parseIfEnvVariable = (propertyValue, metadata) => {
|
|
7
|
+
if (typeof propertyValue !== 'string') {
|
|
8
|
+
return propertyValue;
|
|
9
|
+
}
|
|
10
|
+
// Matches "$(ANY_VARIABLE_NAME)", capturing "ANY_VARIABLE_NAME"
|
|
11
|
+
const matchedEnvVariable = propertyValue.match(/^\$\((.*)\)$/);
|
|
12
|
+
if (!matchedEnvVariable) {
|
|
13
|
+
return propertyValue;
|
|
14
|
+
}
|
|
15
|
+
// matchedEnvVariable[0] is the matched string, i.e. "$(VARIABLE_NAME)"
|
|
16
|
+
// matchedEnvVariable[1] is the captured group, i.e. "VARIABLE_NAME"
|
|
17
|
+
const value = process.env[matchedEnvVariable[1]];
|
|
18
|
+
// If we haven't captured, the value is not an env variable and we should return it directly
|
|
19
|
+
if (value !== undefined) {
|
|
20
|
+
return value;
|
|
21
|
+
}
|
|
22
|
+
throw new Error(`Environment variable ${matchedEnvVariable[0]} for key ${metadata.propertyName} wasn't found.`);
|
|
23
|
+
};
|
|
6
24
|
class PlistContent {
|
|
7
25
|
constructor(content) {
|
|
8
26
|
this.getContent = () => this.content;
|
|
@@ -25,7 +43,7 @@ class PlistContent {
|
|
|
25
43
|
if (!this.isStringNode(valueNode)) {
|
|
26
44
|
throw new Error('Property is not a string, this is not supported yet');
|
|
27
45
|
}
|
|
28
|
-
return valueNode.string[0]['#text'];
|
|
46
|
+
return parseIfEnvVariable(valueNode.string[0]['#text'], { propertyName });
|
|
29
47
|
};
|
|
30
48
|
/**
|
|
31
49
|
* A key entry will be turned into element of the content looking like this:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plist.js","sourceRoot":"","sources":["../../src/helpers/plist.ts"],"names":[],"mappings":";;;AAAA,2BAA+B;AAE/B,qDAAuD;AAIvD,MAAM,YAAY;IAEhB,YAAY,OAAoB;QAIzB,eAAU,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAA;QAEtC;;;;WAIG;QACI,qBAAgB,GAAG,CAAC,YAAoB,EAAmB,EAAE;YAClE,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE;gBACxD,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;oBACzB,OAAO,KAAK,CAAA;iBACb;gBAED,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,YAAY,CAAA;YAC9C,CAAC,CAAC,CAAA;YAEF,IAAI,iBAAiB,KAAK,CAAC,CAAC,EAAE;gBAC5B,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;aACtC;YAED,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,CAAC,CAAC,CAAA;YACrD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE;gBACjC,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAA;aACvE;YAED,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"plist.js","sourceRoot":"","sources":["../../src/helpers/plist.ts"],"names":[],"mappings":";;;AAAA,2BAA+B;AAE/B,qDAAuD;AAIvD,MAAM,kBAAkB,GAAG,CAAC,aAA8B,EAAE,QAAgC,EAAmB,EAAE;IAC/G,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;QACrC,OAAO,aAAa,CAAA;KACrB;IAED,gEAAgE;IAChE,MAAM,kBAAkB,GAAG,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;IAC9D,IAAI,CAAC,kBAAkB,EAAE;QACvB,OAAO,aAAa,CAAA;KACrB;IAED,uEAAuE;IACvE,oEAAoE;IACpE,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAA;IAChD,4FAA4F;IAC5F,IAAI,KAAK,KAAK,SAAS,EAAE;QACvB,OAAO,KAAK,CAAA;KACb;IAED,MAAM,IAAI,KAAK,CAAC,wBAAwB,kBAAkB,CAAC,CAAC,CAAC,YAAY,QAAQ,CAAC,YAAY,gBAAgB,CAAC,CAAA;AACjH,CAAC,CAAA;AAED,MAAM,YAAY;IAEhB,YAAY,OAAoB;QAIzB,eAAU,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAA;QAEtC;;;;WAIG;QACI,qBAAgB,GAAG,CAAC,YAAoB,EAAmB,EAAE;YAClE,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE;gBACxD,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;oBACzB,OAAO,KAAK,CAAA;iBACb;gBAED,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,YAAY,CAAA;YAC9C,CAAC,CAAC,CAAA;YAEF,IAAI,iBAAiB,KAAK,CAAC,CAAC,EAAE;gBAC5B,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;aACtC;YAED,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,CAAC,CAAC,CAAA;YACrD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE;gBACjC,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAA;aACvE;YAED,OAAO,kBAAkB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,EAAC,YAAY,EAAC,CAAC,CAAA;QACzE,CAAC,CAAA;QAED;;;;;;;;;;;WAWG;QACK,cAAS,GAAG,CAAC,IAAe,EAAsC,EAAE;YAC1E,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAA;QACnB,CAAC,CAAA;QAED;;;;;;;;;;;WAWG;QACK,iBAAY,GAAG,CAAC,IAAe,EAAkD,EAAE;YACzF,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAA;QACtB,CAAC,CAAA;QA7DC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;CA6DF;AAEM,MAAM,UAAU,GAAG,CAAC,SAAiB,EAAgB,EAAE;IAC5D,MAAM,oBAAoB,GAAG,iBAAY,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAA;IAC/D,MAAM,gBAAgB,GAAG,8BAAY,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAA;IAEpE,IAAI,gBAAgB,KAAK,IAAI,EAAE;QAC7B,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;KAC1C;IAED,MAAM,SAAS,GAAG,IAAI,2BAAS,CAAC,EAAC,aAAa,EAAE,IAAI,EAAC,CAAC,CAAA;IACtD,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAA;IAE5E,MAAM,YAAY,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAmB,CAAA;IAElE,OAAO,IAAI,YAAY,CAAC,YAAY,CAAC,CAAA;AACvC,CAAC,CAAA;AAdY,QAAA,UAAU,cActB"}
|