@datadog/datadog-ci 2.5.2-alpha2 → 2.6.0

package/dist/commands/dsyms/upload.js

@@ -24,6 +24,7 @@ const errors_1 = require("../../helpers/errors");
 const metrics_1 = require("../../helpers/metrics");
 const upload_1 = require("../../helpers/upload");
 const utils_1 = require("../../helpers/utils");
+const validation_1 = require("../../helpers/validation");
 const interfaces_1 = require("./interfaces");
 const renderer_1 = require("./renderer");
 const utils_2 = require("./utils");
@@ -31,8 +32,7 @@ class UploadCommand extends clipanion_1.Command {
     constructor() {
         super();
         this.config = {
-            apiKey: process.env.DATADOG_API_KEY,
-            datadogSite: process.env.DATADOG_SITE || 'datadoghq.com',
+            datadogSite: 'datadoghq.com',
         };
         this.dryRun = false;
         this.maxConcurrency = 20;
@@ -141,9 +141,15 @@ class UploadCommand extends clipanion_1.Command {
             // Normalizing the basePath to resolve .. and .
             this.basePath = path_1.default.posix.normalize(this.basePath);
             this.context.stdout.write(renderer_1.renderCommandInfo(this.basePath, this.maxConcurrency, this.dryRun));
-            this.config = yield utils_1.resolveConfigFromFile(this.config, {
+            this.config = yield utils_1.resolveConfigFromFileAndEnvironment(this.config, {
+                apiKey: process.env.DATADOG_API_KEY,
+                datadogSite: process.env.DATADOG_SITE,
+            }, {
                 configPath: this.configPath,
                 defaultConfigPaths: ['datadog-ci.json', '../datadog-ci.json'],
+                configFromFileCallback: (configFromFile) => {
+                    validation_1.checkAPIKeyOverride(process.env.DATADOG_API_KEY, configFromFile.apiKey, this.context.stdout);
+                },
             });
             const metricsLogger = metrics_1.getMetricsLogger({
                 apiKey: this.config.apiKey,

package/dist/commands/dsyms/upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/dsyms/upload.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/dsyms/upload.ts"],"names":[],"mappings":"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"}

package/dist/commands/flutter-symbols/upload.js

@@ -43,6 +43,7 @@ const format_git_sourcemaps_data_1 = require("../../helpers/git/format-git-sourc
 const metrics_1 = require("../../helpers/metrics");
 const upload_1 = require("../../helpers/upload");
 const utils_1 = require("../../helpers/utils");
+const validation_1 = require("../../helpers/validation");
 const dsyms = __importStar(require("../dsyms/upload"));
 const git_1 = require("../git-metadata/git");
 const helpers_1 = require("./helpers");
@@ -53,8 +54,7 @@ class UploadCommand extends clipanion_1.Command {
         super();
         this.androidMapping = false;
         this.config = {
-            apiKey: process.env.DATADOG_API_KEY,
-            datadogSite: process.env.DATADOG_SITE || 'datadoghq.com',
+            datadogSite: 'datadoghq.com',
         };
         this.disableGit = false;
         this.dryRun = false;
@@ -92,9 +92,15 @@ class UploadCommand extends clipanion_1.Command {
                 });
             }
             this.context.stdout.write(renderer_1.renderCommandInfo(this.dryRun, this.version, this.serviceName, this.flavor, uploadInfo));
-            this.config = yield utils_1.resolveConfigFromFile(this.config, {
+            this.config = yield utils_1.resolveConfigFromFileAndEnvironment(this.config, {
+                apiKey: process.env.DATADOG_API_KEY,
+                datadogSite: process.env.DATADOG_SITE,
+            }, {
                 configPath: this.configPath,
                 defaultConfigPaths: utils_1.DEFAULT_CONFIG_PATHS,
+                configFromFileCallback: (configFromFile) => {
+                    validation_1.checkAPIKeyOverride(process.env.DATADOG_API_KEY, configFromFile.apiKey, this.context.stdout);
+                },
             });
             if (!this.disableGit) {
                 this.gitData = yield this.getGitMetadata();

package/dist/commands/flutter-symbols/upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/flutter-symbols/upload.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/flutter-symbols/upload.ts"],"names":[],"mappings":"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"}

package/dist/commands/git-metadata/renderer.d.ts

@@ -1,4 +1,5 @@
 import { CommitInfo } from './interfaces';
+export declare const renderGitError: (errorMessage: string) => string;
 export declare const renderConfigurationError: (error: Error) => string;
 export declare const renderFailedUpload: (errorMessage: string) => string;
 export declare const renderRetriedUpload: (errorMessage: string, attempt: number) => string;

package/dist/commands/git-metadata/renderer.js

@@ -3,27 +3,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderCommandInfo = exports.renderDryRunWarning = exports.renderSuccessfulCommand = exports.renderRetriedUpload = exports.renderFailedUpload = exports.renderConfigurationError = void 0;
+exports.renderCommandInfo = exports.renderDryRunWarning = exports.renderSuccessfulCommand = exports.renderRetriedUpload = exports.renderFailedUpload = exports.renderConfigurationError = exports.renderGitError = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const formatting_1 = require("../../helpers/formatting");
-const renderConfigurationError = (error) => `${formatting_1.ICONS.FAILED} Configuration error: ${error}.`;
+const renderGitError = (errorMessage) => chalk_1.default.red(`${formatting_1.ICONS.FAILED} An error occured while invoking git: ${errorMessage}
+Make sure the command is running within your git repository.\n`);
+exports.renderGitError = renderGitError;
+const renderConfigurationError = (error) => chalk_1.default.red(`${formatting_1.ICONS.FAILED} Configuration error: ${error}.\n`);
 exports.renderConfigurationError = renderConfigurationError;
-const renderFailedUpload = (errorMessage) => `${formatting_1.ICONS.FAILED} Failed upload: ${errorMessage}`;
+const renderFailedUpload = (errorMessage) => chalk_1.default.red(`${formatting_1.ICONS.FAILED} Failed upload: ${errorMessage}\n`);
 exports.renderFailedUpload = renderFailedUpload;
-const renderRetriedUpload = (errorMessage, attempt) => `[attempt ${attempt}] Retrying upload: ${errorMessage}`;
+const renderRetriedUpload = (errorMessage, attempt) => chalk_1.default.yellow(`[attempt ${attempt}] Retrying upload: ${errorMessage}\n`);
 exports.renderRetriedUpload = renderRetriedUpload;
 const renderSuccessfulCommand = (duration, dryRun) => {
     if (dryRun) {
-        return chalk_1.default.green(`${formatting_1.ICONS.SUCCESS} [DRYRUN] Handled in ${duration} seconds.`);
+        return chalk_1.default.green(`${formatting_1.ICONS.SUCCESS} [DRYRUN] Handled in ${duration} seconds.\n`);
     }
     else {
-        return chalk_1.default.green(`${formatting_1.ICONS.SUCCESS} Uploaded in ${duration} seconds.`);
+        return chalk_1.default.green(`${formatting_1.ICONS.SUCCESS} Uploaded in ${duration} seconds.\n`);
     }
 };
 exports.renderSuccessfulCommand = renderSuccessfulCommand;
-const renderDryRunWarning = () => `${formatting_1.ICONS.WARNING} DRY-RUN MODE ENABLED. WILL NOT UPLOAD`;
+const renderDryRunWarning = () => chalk_1.default.yellow(`${formatting_1.ICONS.WARNING} DRY-RUN MODE ENABLED. WILL NOT UPLOAD\n`);
 exports.renderDryRunWarning = renderDryRunWarning;
 const renderCommandInfo = (commit) => `Reporting commit ${commit.hash} from repository ${commit.remote}.
-${commit.trackedFiles.length} tracked file paths will be reported.`;
+${commit.trackedFiles.length} tracked file paths will be reported.\n`;
 exports.renderCommandInfo = renderCommandInfo;
 //# sourceMappingURL=renderer.js.map

package/dist/commands/git-metadata/renderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/renderer.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AAEzB,yDAA8C;AAIvC,MAAM,wBAAwB,GAAG,CAAC,KAAY,EAAE,EAAE,CAAC,GAAG,kBAAK,CAAC,MAAM,yBAAyB,KAAK,GAAG,CAAA;AAA7F,QAAA,wBAAwB,4BAAqE;AAEnG,MAAM,kBAAkB,GAAG,CAAC,YAAoB,EAAE,EAAE,CAAC,GAAG,kBAAK,CAAC,MAAM,mBAAmB,YAAY,EAAE,CAAA;AAA/F,QAAA,kBAAkB,sBAA6E;AAErG,MAAM,mBAAmB,GAAG,CAAC,YAAoB,EAAE,OAAe,EAAE,EAAE,CAC3E,YAAY,OAAO,sBAAsB,YAAY,EAAE,CAAA;AAD5C,QAAA,mBAAmB,uBACyB;AAElD,MAAM,uBAAuB,GAAG,CAAC,QAAgB,EAAE,MAAe,EAAE,EAAE;IAC3E,IAAI,MAAM,EAAE;QACV,OAAO,eAAK,CAAC,KAAK,CAAC,GAAG,kBAAK,CAAC,OAAO,wBAAwB,QAAQ,WAAW,CAAC,CAAA;KAChF;SAAM;QACL,OAAO,eAAK,CAAC,KAAK,CAAC,GAAG,kBAAK,CAAC,OAAO,gBAAgB,QAAQ,WAAW,CAAC,CAAA;KACxE;AACH,CAAC,CAAA;AANY,QAAA,uBAAuB,2BAMnC;AAEM,MAAM,mBAAmB,GAAG,GAAG,EAAE,CAAC,GAAG,kBAAK,CAAC,OAAO,wCAAwC,CAAA;AAApF,QAAA,mBAAmB,uBAAiE;AAE1F,MAAM,iBAAiB,GAAG,CAAC,MAAkB,EAAE,EAAE,CACtD,oBAAoB,MAAM,CAAC,IAAI,oBAAoB,MAAM,CAAC,MAAM;EAChE,MAAM,CAAC,YAAY,CAAC,MAAM,uCAAuC,CAAA;AAFtD,QAAA,iBAAiB,qBAEqC"}
+{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/renderer.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AAEzB,yDAA8C;AAIvC,MAAM,cAAc,GAAG,CAAC,YAAoB,EAAE,EAAE,CACrD,eAAK,CAAC,GAAG,CAAC,GAAG,kBAAK,CAAC,MAAM,yCAAyC,YAAY;+DACjB,CAAC,CAAA;AAFnD,QAAA,cAAc,kBAEqC;AAEzD,MAAM,wBAAwB,GAAG,CAAC,KAAY,EAAE,EAAE,CAAC,eAAK,CAAC,GAAG,CAAC,GAAG,kBAAK,CAAC,MAAM,yBAAyB,KAAK,KAAK,CAAC,CAAA;AAA1G,QAAA,wBAAwB,4BAAkF;AAEhH,MAAM,kBAAkB,GAAG,CAAC,YAAoB,EAAE,EAAE,CACzD,eAAK,CAAC,GAAG,CAAC,GAAG,kBAAK,CAAC,MAAM,mBAAmB,YAAY,IAAI,CAAC,CAAA;AADlD,QAAA,kBAAkB,sBACgC;AAExD,MAAM,mBAAmB,GAAG,CAAC,YAAoB,EAAE,OAAe,EAAE,EAAE,CAC3E,eAAK,CAAC,MAAM,CAAC,YAAY,OAAO,sBAAsB,YAAY,IAAI,CAAC,CAAA;AAD5D,QAAA,mBAAmB,uBACyC;AAElE,MAAM,uBAAuB,GAAG,CAAC,QAAgB,EAAE,MAAe,EAAE,EAAE;IAC3E,IAAI,MAAM,EAAE;QACV,OAAO,eAAK,CAAC,KAAK,CAAC,GAAG,kBAAK,CAAC,OAAO,wBAAwB,QAAQ,aAAa,CAAC,CAAA;KAClF;SAAM;QACL,OAAO,eAAK,CAAC,KAAK,CAAC,GAAG,kBAAK,CAAC,OAAO,gBAAgB,QAAQ,aAAa,CAAC,CAAA;KAC1E;AACH,CAAC,CAAA;AANY,QAAA,uBAAuB,2BAMnC;AAEM,MAAM,mBAAmB,GAAG,GAAG,EAAE,CAAC,eAAK,CAAC,MAAM,CAAC,GAAG,kBAAK,CAAC,OAAO,0CAA0C,CAAC,CAAA;AAApG,QAAA,mBAAmB,uBAAiF;AAE1G,MAAM,iBAAiB,GAAG,CAAC,MAAkB,EAAE,EAAE,CACtD,oBAAoB,MAAM,CAAC,IAAI,oBAAoB,MAAM,CAAC,MAAM;EAChE,MAAM,CAAC,YAAY,CAAC,MAAM,yCAAyC,CAAA;AAFxD,QAAA,iBAAiB,qBAEuC"}

package/dist/commands/git-metadata/upload.d.ts

@@ -5,14 +5,7 @@ export declare class UploadCommand extends Command {
     private cliVersion;
     private config;
     private dryRun;
-    private verbose;
-    private gitSync;
-    private directory;
-    private logger;
     constructor();
-    execute(): Promise<1 | 0>;
-    private uploadToGitDB;
-    private uploadToSrcmapTrack;
-    private getSrcmapRequestBuilder;
-    private getApiRequestBuilder;
+    execute(): Promise<1 | 0 | undefined>;
+    private getRequestBuilder;
 }

package/dist/commands/git-metadata/upload.js

@@ -23,10 +23,8 @@ const upload_1 = require("../../helpers/upload");
 const utils_1 = require("../../helpers/utils");
 const api_1 = require("./api");
 const git_1 = require("./git");
-const gitdb_1 = require("./gitdb");
 const library_1 = require("./library");
 const renderer_1 = require("./renderer");
-const utils_2 = require("./utils");
 class UploadCommand extends clipanion_1.Command {
     constructor() {
         super();
@@ -34,32 +32,13 @@ class UploadCommand extends clipanion_1.Command {
             apiKey: process.env.DATADOG_API_KEY,
         };
         this.dryRun = false;
-        this.verbose = false;
-        this.gitSync = false;
-        this.directory = '';
-        this.logger = new utils_2.Logger((s) => {
-            this.context.stdout.write(s);
-        }, utils_2.LogLevel.INFO);
         this.cliVersion = require('../../../package.json').version;
     }
     execute() {
         return __awaiter(this, void 0, void 0, function* () {
-            const initialTime = Date.now();
-            if (this.verbose) {
-                this.logger = new utils_2.Logger((s) => {
-                    this.context.stdout.write(s);
-                }, utils_2.LogLevel.DEBUG);
-            }
+            const initialTime = new Date().getTime();
             if (this.dryRun) {
-                this.logger.warn(renderer_1.renderDryRunWarning());
-            }
-            if (this.directory) {
-                // change working dir
-                process.chdir(this.directory);
-            }
-            if (!this.config.apiKey) {
-                this.logger.error(renderer_1.renderConfigurationError(new errors_1.InvalidConfigurationError(`Missing ${chalk_1.default.bold('DATADOG_API_KEY')} in your environment`)));
-                return 1;
+                this.context.stdout.write(renderer_1.renderDryRunWarning());
             }
             const metricsLogger = metrics_1.getMetricsLogger({
                 datadogSite: process.env.DATADOG_SITE,
@@ -71,86 +50,33 @@ class UploadCommand extends clipanion_1.Command {
                 datadogSite: api_1.datadogSite,
                 metricsLogger: metricsLogger.logger,
             });
-            const apiRequestBuilder = this.getApiRequestBuilder(this.config.apiKey);
-            const srcmapRequestBuilder = this.getSrcmapRequestBuilder(this.config.apiKey);
-            let inError = false;
+            let payload;
             try {
-                this.logger.info('Uploading list of tracked files...');
-                const elapsed = yield utils_2.timedExecAsync(this.uploadToSrcmapTrack.bind(this), {
-                    requestBuilder: srcmapRequestBuilder,
-                    apiKeyValidator,
-                    metricsLogger,
-                });
-                metricsLogger.logger.increment('sci.success', 1);
-                this.logger.info(`${this.dryRun ? '[DRYRUN] ' : ''}Successfully uploaded tracked files in ${elapsed} seconds.`);
+                payload = yield git_1.getCommitInfo(yield git_1.newSimpleGit(), this.repositoryURL);
             }
-            catch (err) {
-                this.logger.error(`Failed upload of tracked files: ${err}`);
-                inError = true;
-            }
-            if (this.gitSync) {
-                try {
-                    this.logger.info('Syncing GitDB...');
-                    const elapsed = yield utils_2.timedExecAsync(this.uploadToGitDB.bind(this), {
-                        requestBuilder: apiRequestBuilder,
-                        verbose: this.verbose,
-                        dryRun: this.dryRun,
-                    });
-                    metricsLogger.logger.increment('gitdb.success', 1);
-                    this.logger.info(`${this.dryRun ? '[DRYRUN] ' : ''}Successfully synced git DB in ${elapsed} seconds.`);
-                }
-                catch (err) {
-                    console.log('error writing to git db');
-                    this.logger.warn(`Could not write to GitDB: ${err}`);
+            catch (e) {
+                if (e instanceof Error) {
+                    this.context.stdout.write(renderer_1.renderFailedUpload(e.message));
                 }
+                return;
             }
+            this.context.stdout.write(renderer_1.renderCommandInfo(payload));
+            let status;
             try {
-                yield metricsLogger.flush();
-            }
-            catch (err) {
-                this.logger.warn(`WARN: ${err}`);
-            }
-            if (inError) {
-                this.logger.error('Command failed. See messages above for more details.');
-                return 1;
-            }
-            this.logger.info(renderer_1.renderSuccessfulCommand((Date.now() - initialTime) / 1000, this.dryRun));
-            return 0;
-        });
-    }
-    uploadToGitDB(opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield gitdb_1.uploadToGitDB(this.logger, opts.requestBuilder, yield git_1.newSimpleGit(), this.dryRun);
-        });
-    }
-    uploadToSrcmapTrack(opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const generatePayload = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    return yield git_1.getCommitInfo(yield git_1.newSimpleGit(), this.repositoryURL);
-                }
-                catch (e) {
-                    if (e instanceof Error) {
-                        this.logger.error(renderer_1.renderFailedUpload(e.message));
-                    }
-                    throw e;
-                }
-            });
-            const sendPayload = (commit) => __awaiter(this, void 0, void 0, function* () {
-                let status;
+                const requestBuilder = this.getRequestBuilder();
                 if (this.dryRun) {
                     status = upload_1.UploadStatus.Success;
                 }
                 else {
-                    status = yield library_1.uploadRepository(opts.requestBuilder, this.cliVersion)(commit, {
-                        apiKeyValidator: opts.apiKeyValidator,
+                    status = yield library_1.uploadRepository(requestBuilder, this.cliVersion)(payload, {
+                        apiKeyValidator,
                         onError: (e) => {
-                            this.logger.error(renderer_1.renderFailedUpload(e.message));
-                            opts.metricsLogger.logger.increment('sci.failed', 1);
+                            this.context.stdout.write(renderer_1.renderFailedUpload(e.message));
+                            metricsLogger.logger.increment('failed', 1);
                         },
                         onRetry: (e, attempt) => {
-                            this.logger.warn(renderer_1.renderRetriedUpload(e.message, attempt));
-                            opts.metricsLogger.logger.increment('sci.retries', 1);
+                            this.context.stdout.write(renderer_1.renderRetriedUpload(e.message, attempt));
+                            metricsLogger.logger.increment('retries', 1);
                         },
                         onUpload: () => {
                             return;
@@ -158,19 +84,40 @@ class UploadCommand extends clipanion_1.Command {
                         retries: 5,
                     });
                 }
+                metricsLogger.logger.increment('success', 1);
+                const totalTime = (Date.now() - initialTime) / 1000;
                 if (status !== upload_1.UploadStatus.Success) {
-                    this.logger.error(`${formatting_1.ICONS.FAILED} Error uploading commit information.`);
-                    throw new Error('Could not upload commit information');
+                    this.context.stdout.write(chalk_1.default.red(`${formatting_1.ICONS.FAILED} Error uploading commit information.`));
+                    return 1;
                 }
-            });
-            const payload = yield generatePayload();
-            this.logger.info(renderer_1.renderCommandInfo(payload));
-            yield sendPayload(payload);
+                this.context.stdout.write(renderer_1.renderSuccessfulCommand(totalTime, this.dryRun));
+                metricsLogger.logger.gauge('duration', totalTime);
+                return 0;
+            }
+            catch (error) {
+                if (error instanceof errors_1.InvalidConfigurationError) {
+                    this.context.stdout.write(renderer_1.renderConfigurationError(error));
+                    return 1;
+                }
+                // Otherwise unknown error, let's propagate the exception
+                throw error;
+            }
+            finally {
+                try {
+                    yield metricsLogger.flush();
+                }
+                catch (err) {
+                    this.context.stdout.write(`WARN: ${err}\n`);
+                }
+            }
         });
     }
-    getSrcmapRequestBuilder(apiKey) {
+    getRequestBuilder() {
+        if (!this.config.apiKey) {
+            throw new errors_1.InvalidConfigurationError(`Missing ${chalk_1.default.bold('DATADOG_API_KEY')} in your environment.`);
+        }
         return utils_1.getRequestBuilder({
-            apiKey,
+            apiKey: this.config.apiKey,
             baseUrl: api_1.getBaseIntakeUrl(),
             headers: new Map([
                 ['DD-EVP-ORIGIN', 'datadog-ci git-metadata'],
@@ -179,12 +126,6 @@ class UploadCommand extends clipanion_1.Command {
             overrideUrl: 'api/v2/srcmap',
         });
     }
-    getApiRequestBuilder(apiKey) {
-        return utils_1.getRequestBuilder({
-            apiKey,
-            baseUrl: 'https://' + api_1.apiHost,
-        });
-    }
 }
 exports.UploadCommand = UploadCommand;
 UploadCommand.usage = clipanion_1.Command.Usage({
@@ -197,8 +138,5 @@ UploadCommand.usage = clipanion_1.Command.Usage({
 });
 UploadCommand.addPath('git-metadata', 'upload');
 UploadCommand.addOption('dryRun', clipanion_1.Command.Boolean('--dry-run'));
-UploadCommand.addOption('verbose', clipanion_1.Command.Boolean('--verbose'));
-UploadCommand.addOption('directory', clipanion_1.Command.String('--directory'));
-UploadCommand.addOption('gitSync', clipanion_1.Command.Boolean('--git-sync'));
 UploadCommand.addOption('repositoryURL', clipanion_1.Command.String('--repository-url'));
 //# sourceMappingURL=upload.js.map

package/dist/commands/git-metadata/upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/upload.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/upload.ts"],"names":[],"mappings":"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"}

package/dist/commands/junit/api.d.ts

@@ -1,7 +1,6 @@
 import { Writable } from 'stream';
 import type { AxiosPromise, AxiosRequestConfig, AxiosResponse } from 'axios';
 import { Payload } from './interfaces';
-export declare const getSafeFileName: (unsafeFileName: string) => string;
 export declare const uploadJUnitXML: (request: (args: AxiosRequestConfig) => AxiosPromise<AxiosResponse>) => (jUnitXML: Payload, write: Writable['write']) => Promise<AxiosResponse<AxiosResponse<any>>>;
 export declare const apiConstructor: (baseIntakeUrl: string, apiKey: string) => {
     uploadJUnitXML: (jUnitXML: Payload, write: Writable['write']) => Promise<AxiosResponse<AxiosResponse<any>>>;

package/dist/commands/junit/api.js

@@ -12,19 +12,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.apiConstructor = exports.uploadJUnitXML = exports.getSafeFileName = void 0;
+exports.apiConstructor = exports.uploadJUnitXML = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const zlib_1 = require("zlib");
 const form_data_1 = __importDefault(require("form-data"));
+const file_1 = require("../../helpers/file");
 const tags_1 = require("../../helpers/tags");
 const utils_1 = require("../../helpers/utils");
 const renderer_1 = require("./renderer");
-// We need a unique file name so we use span tags like the pipeline URL,
-// which can contain dots and other unsafe characters for filenames.
-// We filter them out here.
-const getSafeFileName = (unsafeFileName) => unsafeFileName.replace(/[^a-z0-9]/gi, '_');
-exports.getSafeFileName = getSafeFileName;
 // Dependency follows-redirects sets a default maxBodyLength of 10 MB https://github.com/follow-redirects/follow-redirects/blob/b774a77e582b97174813b3eaeb86931becba69db/index.js#L391
 // We don't want any hard limit enforced by the CLI, the backend will enforce a max size by returning 413 errors.
 const maxBodyLength = Infinity;
@@ -54,7 +50,7 @@ const uploadJUnitXML = (request) => (jUnitXML, write) => __awaiter(void 0, void
         uniqueFileName = `${uniqueFileName}-${metadata[tags_1.CI_JOB_URL]}`;
     }
     form.append('junit_xml_report_file', fs_1.default.createReadStream(jUnitXML.xmlPath).pipe(zlib_1.createGzip()), {
-        filename: `${exports.getSafeFileName(uniqueFileName)}.xml.gz`,
+        filename: `${file_1.getSafeFileName(uniqueFileName)}.xml.gz`,
     });
     return request({
         data: form,

package/dist/commands/junit/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/junit/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAAmB;AACnB,gDAAuB;AAEvB,+BAA+B;AAI/B,0DAAgC;AAEhC,6CAAuE;AACvE,+CAAqD;AAGrD,yCAAuC;AAEvC,wEAAwE;AACxE,oEAAoE;AACpE,2BAA2B;AACpB,MAAM,eAAe,GAAG,CAAC,cAAsB,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,CAAA;AAAxF,QAAA,eAAe,mBAAyE;AAErG,sLAAsL;AACtL,iHAAiH;AACjH,MAAM,aAAa,GAAG,QAAQ,CAAA;AAEvB,MAAM,cAAc,GAAG,CAAC,OAAkE,EAAE,EAAE,CAAC,CACpG,QAAiB,EACjB,KAAwB,EACxB,EAAE;IACF,MAAM,IAAI,GAAG,IAAI,mBAAQ,EAAE,CAAA;IAC3B,KAAK,CAAC,uBAAY,CAAC,QAAQ,CAAC,CAAC,CAAA;IAE7B,IAAI,QAAQ,CAAA;IACZ,IAAI;QACF,QAAQ,GAAG,cAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAA;KAC7C;IAAC,OAAO,CAAC,EAAE;QACV,QAAQ,GAAG,mBAAmB,CAAA;KAC/B;IAED,MAAM,QAAQ,iCACZ,OAAO,EAAE,QAAQ,CAAC,OAAO,IACtB,QAAQ,CAAC,QAAQ,KACpB,sBAAsB,EAAE,GAAG,EAC3B,cAAc,EAAE,QAAQ,CAAC,QAAQ,GAClC,CAAA;IAED,IAAI,QAAQ,CAAC,WAAW,EAAE;QACxB,QAAQ,CAAC,mBAAmB,CAAC,GAAG,IAAI,CAAA;KACrC;IAED,IAAI,QAAQ,CAAC,SAAS,EAAE;QACtB,QAAQ,CAAC,yBAAyB,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAA;KACzD;IAED,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAC,QAAQ,EAAE,YAAY,EAAC,CAAC,CAAA;IAExE,IAAI,cAAc,GAAG,GAAG,QAAQ,IAAI,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,cAAO,CAAC,EAAE,CAAA;IAE3E,IAAI,QAAQ,CAAC,sBAAe,CAAC,EAAE;QAC7B,cAAc,GAAG,GAAG,cAAc,IAAI,QAAQ,CAAC,sBAAe,CAAC,EAAE,CAAA;KAClE;IACD,IAAI,QAAQ,CAAC,iBAAU,CAAC,EAAE;QACxB,cAAc,GAAG,GAAG,cAAc,IAAI,QAAQ,CAAC,iBAAU,CAAC,EAAE,CAAA;KAC7D;IAED,IAAI,CAAC,MAAM,CAAC,uBAAuB,EAAE,YAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,iBAAU,EAAE,CAAC,EAAE;QAC7F,QAAQ,EAAE,GAAG,uBAAe,CAAC,cAAc,CAAC,SAAS;KACtD,CAAC,CAAA;IAEF,OAAO,OAAO,CAAC;QACb,IAAI,EAAE,IAAI;QACV,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE;QAC1B,aAAa;QACb,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,iBAAiB;KACvB,CAAC,CAAA;AACJ,CAAC,CAAA,CAAA;AAnDY,QAAA,cAAc,kBAmD1B;AAEM,MAAM,cAAc,GAAG,CAAC,aAAqB,EAAE,MAAc,EAAE,EAAE;IACtE,MAAM,aAAa,GAAG,yBAAiB,CAAC,EAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAC,CAAC,CAAA;IAEzE,OAAO;QACL,cAAc,EAAE,sBAAc,CAAC,aAAa,CAAC;KAC9C,CAAA;AACH,CAAC,CAAA;AANY,QAAA,cAAc,kBAM1B"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/junit/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAAmB;AACnB,gDAAuB;AAEvB,+BAA+B;AAI/B,0DAAgC;AAEhC,6CAAkD;AAClD,6CAAuE;AACvE,+CAAqD;AAGrD,yCAAuC;AAEvC,sLAAsL;AACtL,iHAAiH;AACjH,MAAM,aAAa,GAAG,QAAQ,CAAA;AAEvB,MAAM,cAAc,GAAG,CAAC,OAAkE,EAAE,EAAE,CAAC,CACpG,QAAiB,EACjB,KAAwB,EACxB,EAAE;IACF,MAAM,IAAI,GAAG,IAAI,mBAAQ,EAAE,CAAA;IAC3B,KAAK,CAAC,uBAAY,CAAC,QAAQ,CAAC,CAAC,CAAA;IAE7B,IAAI,QAAQ,CAAA;IACZ,IAAI;QACF,QAAQ,GAAG,cAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAA;KAC7C;IAAC,OAAO,CAAC,EAAE;QACV,QAAQ,GAAG,mBAAmB,CAAA;KAC/B;IAED,MAAM,QAAQ,iCACZ,OAAO,EAAE,QAAQ,CAAC,OAAO,IACtB,QAAQ,CAAC,QAAQ,KACpB,sBAAsB,EAAE,GAAG,EAC3B,cAAc,EAAE,QAAQ,CAAC,QAAQ,GAClC,CAAA;IAED,IAAI,QAAQ,CAAC,WAAW,EAAE;QACxB,QAAQ,CAAC,mBAAmB,CAAC,GAAG,IAAI,CAAA;KACrC;IAED,IAAI,QAAQ,CAAC,SAAS,EAAE;QACtB,QAAQ,CAAC,yBAAyB,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAA;KACzD;IAED,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAC,QAAQ,EAAE,YAAY,EAAC,CAAC,CAAA;IAExE,IAAI,cAAc,GAAG,GAAG,QAAQ,IAAI,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,cAAO,CAAC,EAAE,CAAA;IAE3E,IAAI,QAAQ,CAAC,sBAAe,CAAC,EAAE;QAC7B,cAAc,GAAG,GAAG,cAAc,IAAI,QAAQ,CAAC,sBAAe,CAAC,EAAE,CAAA;KAClE;IACD,IAAI,QAAQ,CAAC,iBAAU,CAAC,EAAE;QACxB,cAAc,GAAG,GAAG,cAAc,IAAI,QAAQ,CAAC,iBAAU,CAAC,EAAE,CAAA;KAC7D;IAED,IAAI,CAAC,MAAM,CAAC,uBAAuB,EAAE,YAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,iBAAU,EAAE,CAAC,EAAE;QAC7F,QAAQ,EAAE,GAAG,sBAAe,CAAC,cAAc,CAAC,SAAS;KACtD,CAAC,CAAA;IAEF,OAAO,OAAO,CAAC;QACb,IAAI,EAAE,IAAI;QACV,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE;QAC1B,aAAa;QACb,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,iBAAiB;KACvB,CAAC,CAAA;AACJ,CAAC,CAAA,CAAA;AAnDY,QAAA,cAAc,kBAmD1B;AAEM,MAAM,cAAc,GAAG,CAAC,aAAqB,EAAE,MAAc,EAAE,EAAE;IACtE,MAAM,aAAa,GAAG,yBAAiB,CAAC,EAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAC,CAAC,CAAA;IAEzE,OAAO;QACL,cAAc,EAAE,sBAAc,CAAC,aAAa,CAAC;KAC9C,CAAA;AACH,CAAC,CAAA;AANY,QAAA,cAAc,kBAM1B"}

package/dist/commands/react-native/upload.js

@@ -23,15 +23,15 @@ const format_git_sourcemaps_data_1 = require("../../helpers/git/format-git-sourc
 const metrics_1 = require("../../helpers/metrics");
 const upload_1 = require("../../helpers/upload");
 const utils_1 = require("../../helpers/utils");
+const validation_1 = require("../../helpers/validation");
 const interfaces_1 = require("./interfaces");
 const renderer_1 = require("./renderer");
-const validation_1 = require("./validation");
+const validation_2 = require("./validation");
 class UploadCommand extends clipanion_1.Command {
     constructor() {
         super();
         this.config = {
-            apiKey: process.env.DATADOG_API_KEY,
-            datadogSite: process.env.DATADOG_SITE || 'datadoghq.com',
+            datadogSite: 'datadoghq.com',
         };
         this.dryRun = false;
         this.maxConcurrency = 20;
@@ -124,9 +124,15 @@ class UploadCommand extends clipanion_1.Command {
                 return 1;
             }
             this.context.stdout.write(renderer_1.renderCommandInfo(this.bundle, this.sourcemap, this.platform, this.releaseVersion, this.service, this.maxConcurrency, this.dryRun, this.projectPath, this.buildVersion));
-            this.config = yield utils_1.resolveConfigFromFile(this.config, {
+            this.config = yield utils_1.resolveConfigFromFileAndEnvironment(this.config, {
+                apiKey: process.env.DATADOG_API_KEY,
+                datadogSite: process.env.DATADOG_SITE,
+            }, {
                 configPath: this.configPath,
                 defaultConfigPaths: ['datadog-ci.json', '../datadog-ci.json'],
+                configFromFileCallback: (configFromFile) => {
+                    validation_1.checkAPIKeyOverride(process.env.DATADOG_API_KEY, configFromFile.apiKey, this.context.stdout);
+                },
             });
             const metricsLogger = metrics_1.getMetricsLogger({
                 apiKey: this.config.apiKey,
@@ -193,10 +199,10 @@ class UploadCommand extends clipanion_1.Command {
     upload(requestBuilder, metricsLogger, apiKeyValidator) {
         return (sourcemap) => __awaiter(this, void 0, void 0, function* () {
             try {
-                validation_1.validatePayload(sourcemap);
+                validation_2.validatePayload(sourcemap);
             }
             catch (error) {
-                if (error instanceof validation_1.InvalidPayload) {
+                if (error instanceof validation_2.InvalidPayload) {
                     this.context.stdout.write(renderer_1.renderFailedUpload(sourcemap, error.message));
                     metricsLogger.logger.increment('skipped_sourcemap', 1, [`reason:${error.reason}`]);
                 }