@datadog/datadog-ci 2.5.2-alpha → 2.6.0

package/dist/commands/sarif/renderer.d.ts

@@ -0,0 +1,9 @@
+import { SpanTags } from '../../helpers/interfaces';
+import { Payload } from './interfaces';
+export declare const renderInvalidFile: (sarifReport: string, errorMessage: string) => string;
+export declare const renderFailedUpload: (sarifReport: Payload, errorMessage: string) => string;
+export declare const renderRetriedUpload: (sarifReport: Payload, errorMessage: string, attempt: number) => string;
+export declare const renderSuccessfulCommand: (fileCount: number, duration: number, spanTags: SpanTags, service: string, env?: string | undefined) => string;
+export declare const renderDryRunUpload: (payload: Payload) => string;
+export declare const renderUpload: (payload: Payload) => string;
+export declare const renderCommandInfo: (basePaths: string[], service: string, concurrency: number, dryRun: boolean, noVerify: boolean) => string;

package/dist/commands/sarif/renderer.js

@@ -0,0 +1,60 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.renderCommandInfo = exports.renderUpload = exports.renderDryRunUpload = exports.renderSuccessfulCommand = exports.renderRetriedUpload = exports.renderFailedUpload = exports.renderInvalidFile = void 0;
+const path_1 = __importDefault(require("path"));
+const chalk_1 = __importDefault(require("chalk"));
+const ICONS = {
+    FAILED: '❌',
+    SUCCESS: '✅',
+    WARNING: '⚠️',
+    INFO: 'ℹ️',
+};
+const renderInvalidFile = (sarifReport, errorMessage) => {
+    const reportPath = `[${chalk_1.default.bold.dim(sarifReport)}]`;
+    return chalk_1.default.red(`${ICONS.FAILED} Invalid SARIF report file ${reportPath}: ${errorMessage}\n`);
+};
+exports.renderInvalidFile = renderInvalidFile;
+const renderFailedUpload = (sarifReport, errorMessage) => {
+    const reportPath = `[${chalk_1.default.bold.dim(sarifReport.reportPath)}]`;
+    return chalk_1.default.red(`${ICONS.FAILED} Failed upload SARIF report file ${reportPath}: ${errorMessage}\n`);
+};
+exports.renderFailedUpload = renderFailedUpload;
+const renderRetriedUpload = (sarifReport, errorMessage, attempt) => {
+    const sarifReportPath = `[${chalk_1.default.bold.dim(sarifReport.reportPath)}]`;
+    return chalk_1.default.yellow(`[attempt ${attempt}] Retrying SARIF report upload ${sarifReportPath}: ${errorMessage}\n`);
+};
+exports.renderRetriedUpload = renderRetriedUpload;
+const renderSuccessfulCommand = (fileCount, duration, spanTags, service, env) => {
+    let fullStr = '';
+    fullStr += chalk_1.default.green(`${ICONS.SUCCESS} Uploaded ${fileCount} files in ${duration} seconds.\n`);
+    fullStr += chalk_1.default.green('=================================================================================================\n');
+    return fullStr;
+};
+exports.renderSuccessfulCommand = renderSuccessfulCommand;
+const renderDryRunUpload = (payload) => `[DRYRUN] ${exports.renderUpload(payload)}`;
+exports.renderDryRunUpload = renderDryRunUpload;
+const renderUpload = (payload) => `Uploading SARIF report in ${payload.reportPath}\n`;
+exports.renderUpload = renderUpload;
+const renderCommandInfo = (basePaths, service, concurrency, dryRun, noVerify) => {
+    let fullStr = '';
+    if (dryRun) {
+        fullStr += chalk_1.default.yellow(`${ICONS.WARNING} DRY-RUN MODE ENABLED. WILL NOT UPLOAD SARIF REPORT\n`);
+    }
+    if (noVerify) {
+        fullStr += chalk_1.default.yellow(`${ICONS.INFO} --no-verify enabled. The reports will be uploaded without client validation.\n`);
+    }
+    fullStr += chalk_1.default.green(`Starting upload with concurrency ${concurrency}. \n`);
+    if (basePaths.length === 1 && !!path_1.default.extname(basePaths[0])) {
+        fullStr += chalk_1.default.green(`Will upload SARIF report file ${basePaths[0]}\n`);
+    }
+    else {
+        fullStr += chalk_1.default.green(`Will look for SARIF report files in ${basePaths.join(', ')}\n`);
+    }
+    fullStr += chalk_1.default.green(`service: ${service}\n`);
+    return fullStr;
+};
+exports.renderCommandInfo = renderCommandInfo;
+//# sourceMappingURL=renderer.js.map

package/dist/commands/sarif/renderer.js.map

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

package/dist/commands/sarif/upload.d.ts

@@ -0,0 +1,17 @@
+import { Command } from 'clipanion';
+export declare class UploadSarifReportCommand extends Command {
+    static usage: import("clipanion").Usage;
+    private basePaths?;
+    private config;
+    private dryRun;
+    private env?;
+    private maxConcurrency;
+    private service?;
+    private tags?;
+    private noVerify;
+    execute(): Promise<1 | undefined>;
+    private getSpanTags;
+    private uploadSarifReport;
+    private getApiHelper;
+    private getMatchingSarifReports;
+}

package/dist/commands/sarif/upload.js

@@ -0,0 +1,197 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UploadSarifReportCommand = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const ajv_1 = __importDefault(require("ajv"));
+const ajv_formats_1 = __importDefault(require("ajv-formats"));
+const chalk_1 = __importDefault(require("chalk"));
+const clipanion_1 = require("clipanion");
+const glob_1 = __importDefault(require("glob"));
+const tiny_async_pool_1 = __importDefault(require("tiny-async-pool"));
+const ci_1 = require("../../helpers/ci");
+const format_git_span_data_1 = require("../../helpers/git/format-git-span-data");
+const retry_1 = require("../../helpers/retry");
+const tags_1 = require("../../helpers/tags");
+const user_provided_git_1 = require("../../helpers/user-provided-git");
+const utils_1 = require("../../helpers/utils");
+const api_1 = require("./api");
+const sarif_schema_2_1_0_json_1 = __importDefault(require("./json-schema/sarif-schema-2.1.0.json"));
+const renderer_1 = require("./renderer");
+const utils_2 = require("./utils");
+const errorCodesStopUpload = [400, 403];
+const validateSarif = (sarifReportPath) => {
+    const ajv = new ajv_1.default();
+    ajv_formats_1.default(ajv);
+    const sarifJsonSchemaValidate = ajv.compile(sarif_schema_2_1_0_json_1.default);
+    try {
+        const sarifReportContent = JSON.parse(String(fs_1.default.readFileSync(sarifReportPath)));
+        const valid = sarifJsonSchemaValidate(sarifReportContent);
+        if (!valid) {
+            const errors = sarifJsonSchemaValidate.errors || [];
+            return errors.toString();
+        }
+    }
+    catch (error) {
+        return error.message;
+    }
+    return undefined;
+};
+class UploadSarifReportCommand extends clipanion_1.Command {
+    constructor() {
+        super(...arguments);
+        this.config = {
+            apiKey: process.env.DATADOG_API_KEY || process.env.DD_API_KEY,
+            env: process.env.DD_ENV,
+            envVarTags: process.env.DD_TAGS,
+        };
+        this.dryRun = false;
+        this.maxConcurrency = 20;
+        this.noVerify = false;
+    }
+    execute() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.service) {
+                this.service = process.env.DD_SERVICE;
+            }
+            if (!this.service) {
+                this.context.stderr.write('Missing service\n');
+                return 1;
+            }
+            if (!this.basePaths || !this.basePaths.length) {
+                this.context.stderr.write('Missing basePath\n');
+                return 1;
+            }
+            if (!this.config.env) {
+                this.config.env = this.env;
+            }
+            const api = this.getApiHelper();
+            // Normalizing the basePath to resolve .. and .
+            // Always using the posix version to avoid \ on Windows.
+            this.basePaths = this.basePaths.map((basePath) => path_1.default.posix.normalize(basePath));
+            this.context.stdout.write(renderer_1.renderCommandInfo(this.basePaths, this.service, this.maxConcurrency, this.dryRun, this.noVerify));
+            const spanTags = yield this.getSpanTags();
+            const payloads = yield this.getMatchingSarifReports(spanTags);
+            const upload = (p) => this.uploadSarifReport(api, p);
+            const initialTime = new Date().getTime();
+            yield tiny_async_pool_1.default(this.maxConcurrency, payloads, upload);
+            const totalTimeSeconds = (Date.now() - initialTime) / 1000;
+            this.context.stdout.write(renderer_1.renderSuccessfulCommand(payloads.length, totalTimeSeconds, spanTags, this.service, this.config.env));
+        });
+    }
+    getSpanTags() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ciSpanTags = ci_1.getCISpanTags();
+            const gitSpanTags = yield format_git_span_data_1.getGitMetadata();
+            const userGitSpanTags = user_provided_git_1.getUserGitSpanTags();
+            const envVarTags = this.config.envVarTags ? tags_1.parseTags(this.config.envVarTags.split(',')) : {};
+            const cliTags = this.tags ? tags_1.parseTags(this.tags) : {};
+            return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, gitSpanTags), ciSpanTags), userGitSpanTags), cliTags), envVarTags), (this.config.env ? { env: this.config.env } : {}));
+        });
+    }
+    uploadSarifReport(api, sarifReport) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.dryRun) {
+                this.context.stdout.write(renderer_1.renderDryRunUpload(sarifReport));
+                return;
+            }
+            try {
+                yield retry_1.retryRequest(() => api.uploadSarifReport(sarifReport, this.context.stdout.write.bind(this.context.stdout)), {
+                    onRetry: (e, attempt) => {
+                        this.context.stderr.write(renderer_1.renderRetriedUpload(sarifReport, e.message, attempt));
+                    },
+                    retries: 5,
+                });
+            }
+            catch (error) {
+                this.context.stderr.write(renderer_1.renderFailedUpload(sarifReport, error));
+                if (error.message) {
+                    // If it's an axios error
+                    if (!errorCodesStopUpload.includes(error.response.status)) {
+                        // And a status code that should not stop the whole upload, just return
+                        return;
+                    }
+                }
+                throw error;
+            }
+        });
+    }
+    getApiHelper() {
+        if (!this.config.apiKey) {
+            this.context.stdout.write(`Neither ${chalk_1.default.red.bold('DATADOG_API_KEY')} nor ${chalk_1.default.red.bold('DD_API_KEY')} is in your environment.\n`);
+            throw new Error('API key is missing');
+        }
+        return api_1.apiConstructor(utils_2.getBaseIntakeUrl(), this.config.apiKey);
+    }
+    getMatchingSarifReports(spanTags) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const sarifReports = (this.basePaths || []).reduce((acc, basePath) => {
+                const isFile = !!path_1.default.extname(basePath);
+                if (isFile) {
+                    return acc.concat(fs_1.default.existsSync(basePath) ? [basePath] : []);
+                }
+                return acc.concat(glob_1.default.sync(utils_1.buildPath(basePath, '*.sarif')));
+            }, []);
+            const validUniqueFiles = [...new Set(sarifReports)].filter((sarifReport) => {
+                if (this.noVerify) {
+                    return true;
+                }
+                const validationErrorMessage = validateSarif(sarifReport);
+                if (validationErrorMessage) {
+                    this.context.stdout.write(renderer_1.renderInvalidFile(sarifReport, validationErrorMessage));
+                    return false;
+                }
+                return true;
+            });
+            return validUniqueFiles.map((sarifReport) => ({
+                service: this.service,
+                reportPath: sarifReport,
+                spanTags,
+            }));
+        });
+    }
+}
+exports.UploadSarifReportCommand = UploadSarifReportCommand;
+UploadSarifReportCommand.usage = clipanion_1.Command.Usage({
+    description: 'Upload SARIF reports files to Datadog.',
+    details: `
+      This command will upload SARIF reports files to Datadog.\n
+      See README for details.
+    `,
+    examples: [
+        ['Upload all SARIF report files in current directory', 'datadog-ci sarif upload --service my-service .'],
+        [
+            'Upload all SARIF report files in src/sarif-go-reports and src/sarif-java-reports',
+            'datadog-ci sarif upload --service my-service src/sarif-go-reports src/sarif-java-reports',
+        ],
+        [
+            'Upload all SARIF report files in current directory and add extra tags globally',
+            'datadog-ci sarif upload --service my-service --tags key1:value1 --tags key2:value2 .',
+        ],
+        [
+            'Upload all SARIF report files in current directory to the datadoghq.eu site',
+            'DATADOG_SITE=datadoghq.eu datadog-ci sarif upload --service my-service .',
+        ],
+    ],
+});
+UploadSarifReportCommand.addPath('sarif', 'upload');
+UploadSarifReportCommand.addOption('service', clipanion_1.Command.String('--service'));
+UploadSarifReportCommand.addOption('env', clipanion_1.Command.String('--env'));
+UploadSarifReportCommand.addOption('dryRun', clipanion_1.Command.Boolean('--dry-run'));
+UploadSarifReportCommand.addOption('noVerify', clipanion_1.Command.Boolean('--no-verify'));
+UploadSarifReportCommand.addOption('tags', clipanion_1.Command.Array('--tags'));
+UploadSarifReportCommand.addOption('basePaths', clipanion_1.Command.Rest({ required: 1 }));
+UploadSarifReportCommand.addOption('maxConcurrency', clipanion_1.Command.String('--max-concurrency'));
+//# sourceMappingURL=upload.js.map

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

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

package/dist/commands/sarif/utils.d.ts

@@ -0,0 +1 @@
+export declare const getBaseIntakeUrl: () => string;

package/dist/commands/sarif/utils.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBaseIntakeUrl = void 0;
+const getBaseIntakeUrl = () => {
+    if (process.env.DATADOG_SITE || process.env.DD_SITE) {
+        return `https://cicodescan-intake.${process.env.DATADOG_SITE || process.env.DD_SITE}`;
+    }
+    return 'https://cicodescan-intake.datadoghq.com';
+};
+exports.getBaseIntakeUrl = getBaseIntakeUrl;
+//# sourceMappingURL=utils.js.map

package/dist/commands/sarif/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/sarif/utils.ts"],"names":[],"mappings":";;;AAAO,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE;QACnD,OAAO,6BAA6B,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,CAAA;KACtF;IAED,OAAO,yCAAyC,CAAA;AAClD,CAAC,CAAA;AANY,QAAA,gBAAgB,oBAM5B"}

package/dist/helpers/file.d.ts

@@ -0,0 +1 @@
+export declare const getSafeFileName: (unsafeFileName: string) => string;

package/dist/helpers/file.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSafeFileName = void 0;
+// 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;
+//# sourceMappingURL=file.js.map

package/dist/helpers/file.js.map

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

package/dist/helpers/interfaces.d.ts

@@ -1,4 +1,4 @@
-import { AxiosPromise, AxiosRequestConfig } from 'axios';
+import { AxiosPromise, AxiosRequestConfig, AxiosResponse } from 'axios';
 import { CI_ENV_VARS, CI_JOB_NAME, CI_JOB_URL, CI_PIPELINE_ID, CI_PIPELINE_NAME, CI_PIPELINE_NUMBER, CI_PIPELINE_URL, CI_PROVIDER_NAME, CI_STAGE_NAME, CI_WORKSPACE_PATH, GIT_BRANCH, GIT_COMMIT_AUTHOR_DATE, GIT_COMMIT_AUTHOR_EMAIL, GIT_COMMIT_AUTHOR_NAME, GIT_COMMIT_COMMITTER_DATE, GIT_COMMIT_COMMITTER_EMAIL, GIT_COMMIT_COMMITTER_NAME, GIT_COMMIT_MESSAGE, GIT_REPOSITORY_URL, GIT_SHA, GIT_TAG } from './tags';
 export interface Metadata {
     ci: {
@@ -42,4 +42,4 @@ export interface Metadata {
 }
 export declare type SpanTag = typeof CI_JOB_NAME | typeof CI_JOB_URL | typeof CI_PIPELINE_ID | typeof CI_PIPELINE_NAME | typeof CI_PIPELINE_NUMBER | typeof CI_PIPELINE_URL | typeof CI_PROVIDER_NAME | typeof CI_STAGE_NAME | typeof CI_WORKSPACE_PATH | typeof GIT_BRANCH | typeof GIT_REPOSITORY_URL | typeof GIT_SHA | typeof GIT_TAG | typeof GIT_COMMIT_AUTHOR_EMAIL | typeof GIT_COMMIT_AUTHOR_NAME | typeof GIT_COMMIT_AUTHOR_DATE | typeof GIT_COMMIT_MESSAGE | typeof GIT_COMMIT_COMMITTER_DATE | typeof GIT_COMMIT_COMMITTER_EMAIL | typeof GIT_COMMIT_COMMITTER_NAME | typeof CI_ENV_VARS;
 export declare type SpanTags = Partial<Record<SpanTag, string>>;
-export declare type RequestBuilder = (args: AxiosRequestConfig) => AxiosPromise;
+export declare type RequestBuilder = (args: AxiosRequestConfig) => AxiosPromise<AxiosResponse>;

package/dist/helpers/retry.d.ts

@@ -1,2 +1,2 @@
 import retry from 'async-retry';
-export declare const retryRequest: <T>(requestPerformer: () => Promise<T>, retryOpts: retry.Options) => Promise<T>;
+export declare const retryRequest: (requestPerformer: () => Promise<any>, retryOpts: retry.Options) => Promise<void>;

package/dist/helpers/retry.js

@@ -19,14 +19,13 @@ const retryRequest = (requestPerformer, retryOpts) => __awaiter(void 0, void 0,
     // Request function, passed to async-retry
     const doRequest = (bail) => __awaiter(void 0, void 0, void 0, function* () {
         try {
-            return yield requestPerformer();
+            yield requestPerformer();
         }
         catch (error) {
             if (error.response && errorCodesNoRetry.includes(error.response.status)) {
                 // If it's an axios error with a status code that is excluded from retries, we bail to avoid retrying
                 bail(error);
-                // bail interrupt the flow by throwing an exception, the code below is not executed
-                return {};
+                return;
             }
             // Other cases are retried: other axios HTTP errors as well as
             // non-axios errors such as DNS resolution errors and connection timeouts

package/dist/helpers/retry.js.map

@@ -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,CAAU,gBAAkC,EAAE,SAAwB,EAAc,EAAE;IAChH,0CAA0C;IAC1C,MAAM,SAAS,GAAG,CAAO,IAAwB,EAAE,EAAE;QACnD,IAAI;YACF,OAAO,MAAM,gBAAgB,EAAE,CAAA;SAChC;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,qBAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;AACpC,CAAC,CAAA,CAAA;AArBY,QAAA,YAAY,gBAqBxB"}
+{"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,CAAO,gBAAoC,EAAE,SAAwB,EAAiB,EAAE;IAClH,0CAA0C;IAC1C,MAAM,SAAS,GAAG,CAAO,IAAwB,EAAE,EAAE;QACnD,IAAI;YACF,MAAM,gBAAgB,EAAE,CAAA;SACzB;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,OAAM;aACP;YACD,8DAA8D;YAC9D,yEAAyE;YACzE,MAAM,KAAK,CAAA;SACZ;IACH,CAAC,CAAA,CAAA;IAED,qBAAqB;IACrB,OAAO,qBAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;AACpC,CAAC,CAAA,CAAA;AApBY,QAAA,YAAY,gBAoBxB"}

package/dist/helpers/utils.d.ts

@@ -5,6 +5,15 @@ import ProxyAgent from 'proxy-agent';
 export declare const DEFAULT_CONFIG_PATHS: string[];
 export declare const pick: <T extends Record<any, any>, K extends keyof T>(base: T, keys: K[]) => Partial<T>;
 export declare const getConfig: (configPath: string) => Promise<any>;
+/**
+ * Applies configurations in this order of priority:
+ * environment > config file > base config
+ */
+export declare const resolveConfigFromFileAndEnvironment: <T extends Record<string, unknown>, U extends Record<string, unknown>>(baseConfig: T, environment: U, params: {
+    configPath?: string | undefined;
+    defaultConfigPaths?: string[] | undefined;
+    configFromFileCallback?: ((configFromFile: any) => void) | undefined;
+}) => Promise<T & U>;
 export declare const resolveConfigFromFile: <T>(baseConfig: T, params: {
     configPath?: string;
     defaultConfigPaths?: string[];

package/dist/helpers/utils.js

@@ -31,7 +31,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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.getConfig = exports.pick = exports.DEFAULT_CONFIG_PATHS = void 0;
+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;
 const fs_1 = __importStar(require("fs"));
 const util_1 = require("util");
 const axios_1 = __importDefault(require("axios"));
@@ -76,6 +76,18 @@ const resolveConfigPath = ({ configPath, defaultConfigPaths, }) => {
     }
     return undefined;
 };
+/**
+ * Applies configurations in this order of priority:
+ * environment > config file > base config
+ */
+const resolveConfigFromFileAndEnvironment = (baseConfig, environment, params) => __awaiter(void 0, void 0, void 0, function* () {
+    const configFromFile = yield exports.resolveConfigFromFile(baseConfig, params);
+    if (params.configFromFileCallback) {
+        params.configFromFileCallback(configFromFile);
+    }
+    return deep_extend_1.default(configFromFile, exports.removeUndefinedValues(environment));
+});
+exports.resolveConfigFromFileAndEnvironment = resolveConfigFromFileAndEnvironment;
 const resolveConfigFromFile = (baseConfig, params) => __awaiter(void 0, void 0, void 0, function* () {
     const resolvedConfigPath = resolveConfigPath(params);
     if (!resolvedConfigPath) {

package/dist/helpers/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/helpers/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/helpers/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAAiC;AACjC,+BAA8B;AAI9B,kDAA0D;AAC1D,yCAAwD;AACxD,8DAAoC;AACpC,8DAAoC;AAEvB,QAAA,oBAAoB,GAAG,CAAC,iBAAiB,CAAC,CAAA;AAEhD,MAAM,IAAI,GAAG,CAAgD,IAAO,EAAE,IAAS,EAAE,EAAE;IACxF,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;IACrD,MAAM,YAAY,GAAe,EAAE,CAAA;IAEnC,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE;QAC7B,YAAY,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;KAC9B;IAED,OAAO,YAAY,CAAA;AACrB,CAAC,CAAA;AATY,QAAA,IAAI,QAShB;AAEM,MAAM,SAAS,GAAG,CAAO,UAAkB,EAAE,EAAE;IACpD,IAAI;QACF,MAAM,UAAU,GAAG,MAAM,gBAAS,CAAC,YAAE,CAAC,QAAQ,CAAC,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;QAEpE,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;KAC9B;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,KAAK,YAAY,WAAW,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;SACnD;KACF;AACH,CAAC,CAAA,CAAA;AAVY,QAAA,SAAS,aAUrB;AAED,MAAM,iBAAiB,GAAG,CAAC,EACzB,UAAU,EACV,kBAAkB,GAInB,EAAsB,EAAE;IACvB,IAAI,UAAU,EAAE;QACd,IAAI,eAAU,CAAC,UAAU,CAAC,EAAE;YAC1B,OAAO,UAAU,CAAA;SAClB;QACD,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;KACzC;IAED,IAAI,kBAAkB,EAAE;QACtB,KAAK,MAAM,IAAI,IAAI,kBAAkB,EAAE;YACrC,IAAI,eAAU,CAAC,IAAI,CAAC,EAAE;gBACpB,OAAO,IAAI,CAAA;aACZ;SACF;KACF;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAED;;;GAGG;AACI,MAAM,mCAAmC,GAAG,CAIjD,UAAa,EACb,WAAc,EACd,MAIC,EACe,EAAE;IAClB,MAAM,cAAc,GAAG,MAAM,6BAAqB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;IAEtE,IAAI,MAAM,CAAC,sBAAsB,EAAE;QACjC,MAAM,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAAA;KAC9C;IAED,OAAO,qBAAU,CAAC,cAAc,EAAE,6BAAqB,CAAC,WAAW,CAAC,CAAC,CAAA;AACvE,CAAC,CAAA,CAAA;AAnBY,QAAA,mCAAmC,uCAmB/C;AAEM,MAAM,qBAAqB,GAAG,CACnC,UAAa,EACb,MAA4D,EAChD,EAAE;IACd,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAA;IACpD,IAAI,CAAC,kBAAkB,EAAE;QACvB,OAAO,UAAU,CAAA;KAClB;IACD,MAAM,YAAY,GAAG,MAAM,iBAAS,CAAC,kBAAkB,CAAC,CAAA;IAExD,OAAO,qBAAU,CAAC,UAAU,EAAE,YAAY,CAAC,CAAA;AAC7C,CAAC,CAAA,CAAA;AAXY,QAAA,qBAAqB,yBAWjC;AAED;;GAEG;AACI,MAAM,eAAe,GAAG,CAAU,UAAa,EAAE,UAAmB,EAAc,EAAE;IACzF,IAAI;QACF,MAAM,kBAAkB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,iBAAiB,CAAA;QAC1D,MAAM,YAAY,GAAG,MAAM,iBAAS,CAAC,kBAAkB,CAAC,CAAA;QAExD,OAAO,qBAAU,CAAC,UAAU,EAAE,YAAY,CAAC,CAAA;KAC5C;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,UAAU,EAAE;YACrC,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;SACzC;QAED,IAAI,CAAC,YAAY,WAAW,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;SACnD;KACF;IAED,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA,CAAA;AAjBY,QAAA,eAAe,mBAiB3B;AA0BM,MAAM,WAAW,GAAG,CAAC,OAA4B,EAAU,EAAE;IAClE,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,EAAE,CAAA;KACV;IAED,MAAM,EAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAC,GAAG,OAAO,CAAA;IAE5C,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE;QAClB,OAAO,EAAE,CAAA;KACV;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAA;IAErE,OAAO,GAAG,QAAQ,MAAM,YAAY,GAAG,IAAI,IAAI,IAAI,EAAE,CAAA;AACvD,CAAC,CAAA;AAdY,QAAA,WAAW,eAcvB;AAWM,MAAM,iBAAiB,GAAG,CAAC,OAAuB,EAAE,EAAE;IAC3D,MAAM,EAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAC,GAAG,OAAO,CAAA;IACjE,MAAM,YAAY,GAAG,CAAC,IAAwB,EAAE,EAAE;QAChD,MAAM,YAAY,mCACb,IAAI,KACP,OAAO,gCACL,YAAY,EAAE,MAAM,IACjB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAC,oBAAoB,EAAE,MAAM,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAC9C,IAAI,CAAC,OAAO,IAElB,CAAA;QAED,IAAI,WAAW,KAAK,SAAS,EAAE;YAC7B,YAAY,CAAC,GAAG,GAAG,WAAW,CAAA;SAC/B;QAED,MAAM,UAAU,GAAG,qBAAa,CAAC,SAAS,CAAC,CAAA;QAC3C,IAAI,UAAU,EAAE;YACd,YAAY,CAAC,SAAS,GAAG,UAAU,CAAA;YACnC,YAAY,CAAC,UAAU,GAAG,UAAU,CAAA;SACrC;QAED,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE;YACjC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;gBACrC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;YACnC,CAAC,CAAC,CAAA;SACH;QAED,OAAO,YAAY,CAAA;IACrB,CAAC,CAAA;IAED,MAAM,iBAAiB,GAAuB;QAC5C,OAAO,EAAE,OAAO;QAChB,+DAA+D;QAC/D,kEAAkE;QAClE,KAAK,EAAE,KAAK;KACb,CAAA;IAED,OAAO,CAAC,IAAwB,EAAE,EAAE,CAAC,eAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAA;AAC1F,CAAC,CAAA;AAvCY,QAAA,iBAAiB,qBAuC7B;AAEM,MAAM,aAAa,GAAG,CAAC,SAA8B,EAAiC,EAAE;IAC7F,MAAM,yBAAyB,GAAG,mBAAW,CAAC,SAAS,CAAC,CAAA;IAExD,OAAO,IAAI,qBAAU,CAAC,yBAAyB,CAAC,CAAA;AAClD,CAAC,CAAA;AAJY,QAAA,aAAa,iBAIzB;AAEM,MAAM,iBAAiB,GAAG,CAAC,IAAY,EAAE,EAAE;IAChD,QAAQ,IAAI,EAAE;QACZ,KAAK,aAAa;YAChB,OAAO,OAAO,IAAI,EAAE,CAAA;QACtB,KAAK,eAAe,CAAC;QACrB,KAAK,cAAc,CAAC;QACpB;YACE,OAAO,OAAO,IAAI,EAAE,CAAA;KACvB;AACH,CAAC,CAAA;AATY,QAAA,iBAAiB,qBAS7B;AAED,oHAAoH;AACpH,oEAAoE;AAC7D,MAAM,SAAS,GAAG,CAAC,GAAG,IAAc,EAAE,EAAE,CAC7C,IAAI;KACD,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;IACf,IAAI,CAAC,KAAK,CAAC,EAAE;QACX,wDAAwD;QACxD,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;KAC1C;SAAM;QACL,wEAAwE;QACxE,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAA;KACnD;AACH,CAAC,CAAC;IACF,yBAAyB;KACxB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IACxB,8BAA8B;KAC7B,IAAI,CAAC,GAAG,CAAC,CAAA;AAdD,QAAA,SAAS,aAcR;AAEP,MAAM,iBAAiB,GAAG,CAAC,IAAc,EAAE,EAAE,CACjD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAe,CAAC,MAAM,CAAC,CAAC,YAAY,EAAE,GAAG,EAAE,EAAE;IAC5D,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACd,OAAO,YAAY,CAAA;KACpB;IAED,uCACK,YAAY,KACf,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,IACjB;AACH,CAAC,EAAE,EAAE,CAAC,CAAA;AAVK,QAAA,iBAAiB,qBAUtB;AAED,MAAM,qBAAqB,GAAG,CAAqC,MAAS,EAAK,EAAE;IACxF,MAAM,SAAS,qBAAO,MAAM,CAAC,CAAA;IAC7B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QACpD,IAAI,KAAK,KAAK,SAAS,EAAE;YACvB,OAAO,SAAS,CAAC,GAAG,CAAC,CAAA;SACtB;KACF;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AATY,QAAA,qBAAqB,yBASjC;AAEM,MAAM,YAAY,GAAG,CAAC,GAAuB,EAAE,EAAE;IACtD,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,GAAG,CAAA;KACX;IAED,OAAO,GAAG,CAAC,OAAO,CAAC,iCAAiC,EAAE,EAAE,CAAC,CAAA;AAC3D,CAAC,CAAA;AANY,QAAA,YAAY,gBAMxB;AAEM,MAAM,SAAS,GAAG,CAAC,EAAU,EAAE,QAAgB,EAAE,MAAc,EAAE,EAAE;IACxE,IAAI,EAAE,IAAI,CAAC,EAAE;QACX,OAAO,GAAG,EAAE,IAAI,MAAM,EAAE,CAAA;KACzB;IAED,OAAO,GAAG,EAAE,IAAI,QAAQ,EAAE,CAAA;AAC5B,CAAC,CAAA;AANY,QAAA,SAAS,aAMrB;AAEM,MAAM,iBAAiB,GAAG,CAAC,OAAkC,EAAE,WAAqB,EAAE,OAAoB,EAAE,EAAE;IACnH,MAAM,GAAG,GAAG,IAAI,eAAG,EAAE,CAAA;IACrB,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;IAErB,OAAO,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;AACtC,CAAC,CAAA;AALY,QAAA,iBAAiB,qBAK7B;AAEM,MAAM,iCAAiC,GAAG,CAAC,aAAiC,EAAE,EAAE;IACrF,IAAI;QACF,IAAI,CAAC,aAAa,EAAE;YAClB,OAAO,aAAa,CAAA;SACrB;QACD,IAAI,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YACpC,OAAO,aAAa,CAAA;SACrB;QACD,MAAM,EAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAC,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,CAAA;QAC7D,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,EAAE;YAC1B,OAAO,aAAa,CAAA;SACrB;QAED,OAAO,GAAG,QAAQ,KAAK,QAAQ,GAAG,QAAQ,EAAE,CAAA;KAC7C;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,aAAa,CAAA;KACrB;AACH,CAAC,CAAA;AAjBY,QAAA,iCAAiC,qCAiB7C;AAED,sFAAsF;AACtF,6FAA6F;AACtF,MAAM,2BAA2B,GAAG,CAAC,SAA6B,EAAsB,EAAE;IAC/F,SAAS,GAAG,yCAAiC,CAAC,SAAS,CAAC,CAAA;IACxD,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,SAAS,CAAA;KACjB;IACD,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,0CAA0C,EAAE,aAAa,CAAC,CAAA;IAExF,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AARY,QAAA,2BAA2B,+BAQvC"}

package/dist/helpers/validation.d.ts

@@ -12,3 +12,6 @@ export declare const checkFile: (path: string) => {
  * @returns a boolean indicating if the provided site is valid a Datadog site.
  */
 export declare const isValidDatadogSite: (site?: string | undefined) => boolean;
+export declare const checkAPIKeyOverride: (environmentAPIKey: string | undefined, configFileAPIKey: string | undefined, stdout: {
+    write: (message: string) => void;
+}) => void;

package/dist/helpers/validation.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isValidDatadogSite = exports.checkFile = void 0;
+exports.checkAPIKeyOverride = exports.isValidDatadogSite = exports.checkFile = void 0;
 const fs_1 = __importDefault(require("fs"));
 const constants_1 = require("../constants");
 const checkFile = (path) => {
@@ -39,4 +39,13 @@ const isValidDatadogSite = (site) => {
     return !!process.env.DD_CI_BYPASS_SITE_VALIDATION || constants_1.DATADOG_SITES.includes(site.toLowerCase());
 };
 exports.isValidDatadogSite = isValidDatadogSite;
+const renderDuplicateAPIKey = (environmentAPIKey) => {
+    return `API keys were specified both in a configuration file and in the environment.\nThe environment API key ending in ${environmentAPIKey.slice(-4)} will be used.\n`;
+};
+const checkAPIKeyOverride = (environmentAPIKey, configFileAPIKey, stdout) => {
+    if (configFileAPIKey && environmentAPIKey && configFileAPIKey !== environmentAPIKey) {
+        stdout.write(renderDuplicateAPIKey(environmentAPIKey));
+    }
+};
+exports.checkAPIKeyOverride = checkAPIKeyOverride;
 //# sourceMappingURL=validation.js.map

package/dist/helpers/validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/helpers/validation.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AAEnB,4CAA0C;AAEnC,MAAM,SAAS,GAAwD,CAAC,IAAY,EAAE,EAAE;IAC7F,IAAI;QACF,MAAM,KAAK,GAAG,YAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAC/B,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE;YACpB,OAAO,EAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC,CAAA;SACnC;KACF;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC3B,OAAO,EAAC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAC,CAAA;SACrC;QACD,sBAAsB;QACtB,MAAM,KAAK,CAAA;KACZ;IAED,OAAO,EAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAC,CAAA;AACrC,CAAC,CAAA;AAfY,QAAA,SAAS,aAerB;AAED;;;;;;;;GAQG;AACI,MAAM,kBAAkB,GAAG,CAAC,IAAa,EAAW,EAAE;IAC3D,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,OAAO,KAAK,CAAA;KACb;IAED,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,4BAA4B,IAAI,yBAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;AACjG,CAAC,CAAA;AANY,QAAA,kBAAkB,sBAM9B"}
+{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/helpers/validation.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AAEnB,4CAA0C;AAEnC,MAAM,SAAS,GAAwD,CAAC,IAAY,EAAE,EAAE;IAC7F,IAAI;QACF,MAAM,KAAK,GAAG,YAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAC/B,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE;YACpB,OAAO,EAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC,CAAA;SACnC;KACF;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC3B,OAAO,EAAC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAC,CAAA;SACrC;QACD,sBAAsB;QACtB,MAAM,KAAK,CAAA;KACZ;IAED,OAAO,EAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAC,CAAA;AACrC,CAAC,CAAA;AAfY,QAAA,SAAS,aAerB;AAED;;;;;;;;GAQG;AACI,MAAM,kBAAkB,GAAG,CAAC,IAAa,EAAW,EAAE;IAC3D,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,OAAO,KAAK,CAAA;KACb;IAED,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,4BAA4B,IAAI,yBAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;AACjG,CAAC,CAAA;AANY,QAAA,kBAAkB,sBAM9B;AAED,MAAM,qBAAqB,GAAG,CAAC,iBAAyB,EAAE,EAAE;IAC1D,OAAO,mHAAmH,iBAAiB,CAAC,KAAK,CAC/I,CAAC,CAAC,CACH,kBAAkB,CAAA;AACrB,CAAC,CAAA;AAEM,MAAM,mBAAmB,GAAG,CACjC,iBAAqC,EACrC,gBAAoC,EACpC,MAA0C,EACpC,EAAE;IACR,IAAI,gBAAgB,IAAI,iBAAiB,IAAI,gBAAgB,KAAK,iBAAiB,EAAE;QACnF,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,CAAC,CAAA;KACvD;AACH,CAAC,CAAA;AARY,QAAA,mBAAmB,uBAQ/B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datadog/datadog-ci",
-  "version": "2.5.2-alpha",
+  "version": "2.6.0",
   "description": "Run datadog actions from the CI.",
   "repository": "https://github.com/DataDog/datadog-ci",
   "license": "Apache-2.0",
@@ -57,6 +57,8 @@
   },
   "dependencies": {
     "@types/datadog-metrics": "0.6.1",
+    "ajv": "^8.12.0",
+    "ajv-formats": "^2.1.1",
     "async-retry": "1.3.1",
     "aws-sdk": "^2.1012.0",
     "axios": "0.21.4",

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

@@ -1,7 +0,0 @@
-import { AxiosResponse } from 'axios';
-import * as simpleGit from 'simple-git';
-import { RequestBuilder } from '../../helpers/interfaces';
-import { Logger } from './utils';
-export declare const uploadToGitDB: (log: Logger, request: RequestBuilder, git: simpleGit.SimpleGit, dryRun: boolean) => Promise<void>;
-export declare const uploadPackfiles: (log: Logger, request: RequestBuilder, repoURL: string, headCommit: string, packfilePaths: string[]) => Promise<void>;
-export declare const uploadPackfile: (log: Logger, request: RequestBuilder, repoURL: string, headCommit: string, packfilePath: string) => Promise<AxiosResponse<any>>;