@datadog/datadog-ci 0.18.0 → 0.18.1

package/dist/commands/git-metadata/__tests__/git.test.js

@@ -1,4 +1,23 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 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) {
@@ -9,6 +28,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const simpleGit = __importStar(require("simple-git"));
 const git_1 = require("../git");
 const createMockSimpleGit = (conf) => ({
     getRemotes: (_) => __awaiter(void 0, void 0, void 0, function* () {
@@ -84,7 +104,7 @@ describe('git', () => {
                 remotes: [{ name: 'first', refs: { push: 'https://git-repo' } }],
                 trackedFiles: ['myfile.js'],
             });
-            const commitInfo = yield git_1.getCommitInfo(mock, process.stdout);
+            const commitInfo = yield git_1.getCommitInfo(mock);
             expect(commitInfo).toBeDefined();
             expect(commitInfo.hash).toBe('abcd');
             expect(commitInfo.trackedFiles).toStrictEqual(['myfile.js']);
@@ -95,11 +115,33 @@ describe('git', () => {
                 hash: 'abcd',
                 trackedFiles: ['myfile.js'],
             });
-            const commitInfo = yield git_1.getCommitInfo(mock, process.stdout, 'https://overridden');
+            const commitInfo = yield git_1.getCommitInfo(mock, 'https://overridden');
             expect(commitInfo).toBeDefined();
             expect(commitInfo.hash).toBe('abcd');
             expect(commitInfo.trackedFiles).toStrictEqual(['myfile.js']);
             expect(commitInfo.remote).toBe('https://overridden');
         }));
     });
+    describe('newSimpleGit', () => {
+        test('should throw an error if git is not installed', () => __awaiter(void 0, void 0, void 0, function* () {
+            jest.spyOn(simpleGit, 'gitP').mockImplementation(() => {
+                throw Error('gitp error');
+            });
+            yield expect(git_1.newSimpleGit()).rejects.toThrow('gitp error');
+        }));
+        test('should throw an error if revparse throws an error', () => __awaiter(void 0, void 0, void 0, function* () {
+            const mock = createMockSimpleGit({});
+            jest.spyOn(simpleGit, 'gitP').mockReturnValue(mock);
+            jest.spyOn(mock, 'revparse').mockImplementation(() => __awaiter(void 0, void 0, void 0, function* () {
+                throw Error('revparse error');
+            }));
+            yield expect(git_1.newSimpleGit()).rejects.toThrow('revparse error');
+        }));
+        test('should not throw any errors', () => __awaiter(void 0, void 0, void 0, function* () {
+            const mock = createMockSimpleGit({});
+            jest.spyOn(simpleGit, 'gitP').mockReturnValue(mock);
+            jest.spyOn(mock, 'revparse').mockResolvedValue('1234');
+            yield expect(git_1.newSimpleGit()).resolves.not.toThrow();
+        }));
+    });
 });

package/dist/commands/git-metadata/__tests__/library.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/commands/git-metadata/__tests__/library.test.js

@@ -0,0 +1,82 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const apikey = __importStar(require("../../../helpers/apikey"));
+const upload = __importStar(require("../../../helpers/upload"));
+const git = __importStar(require("../git"));
+const interfaces_1 = require("../interfaces");
+const library_1 = require("../library");
+describe('library', () => {
+    describe('isGitRepo', () => {
+        test('should return false if checkIsRepo fails', () => __awaiter(void 0, void 0, void 0, function* () {
+            const simpleGitClient = {
+                checkIsRepo: () => {
+                    throw Error();
+                },
+            };
+            jest.spyOn(git, 'newSimpleGit').mockResolvedValue(simpleGitClient);
+            yield expect(library_1.isGitRepo()).resolves.toEqual(false);
+        }));
+        test('should return false git is not installed', () => __awaiter(void 0, void 0, void 0, function* () {
+            jest.spyOn(git, 'newSimpleGit').mockImplementation(() => {
+                throw new Error('git is not installed');
+            });
+            yield expect(library_1.isGitRepo()).resolves.toEqual(false);
+        }));
+        test('should return true if datadog API key is set, git is installed, and we are in a repo', () => __awaiter(void 0, void 0, void 0, function* () {
+            const simpleGitClient = { checkIsRepo: () => true };
+            jest.spyOn(git, 'newSimpleGit').mockResolvedValue(simpleGitClient);
+            yield expect(library_1.isGitRepo()).resolves.toEqual(true);
+        }));
+    });
+    describe('addSourceCodeIntegration', () => {
+        test('source code integration fails if simpleGitOrFail throws an exception', () => __awaiter(void 0, void 0, void 0, function* () {
+            jest.spyOn(git, 'newSimpleGit').mockImplementation(() => {
+                throw new Error('git is not installed');
+            });
+            jest.spyOn(apikey, 'newApiKeyValidator').mockReturnValue({});
+            yield expect(library_1.uploadGitCommitHash('dummy', 'fake.site')).rejects.toThrowError('git is not installed');
+        }));
+        test('source code integration returns the correct hash', () => __awaiter(void 0, void 0, void 0, function* () {
+            const simpleGitClient = { checkIsRepo: () => true };
+            jest.spyOn(git, 'newSimpleGit').mockResolvedValue(simpleGitClient);
+            jest.spyOn(git, 'getCommitInfo').mockImplementation(() => __awaiter(void 0, void 0, void 0, function* () { return new interfaces_1.CommitInfo('hash', 'url', ['file1', 'file2']); }));
+            jest.spyOn(upload, 'upload').mockReturnValue((a, b) => {
+                {
+                    return new Promise((resolve) => {
+                        resolve(upload.UploadStatus.Success);
+                    });
+                }
+            });
+            jest.spyOn(apikey, 'newApiKeyValidator').mockReturnValue({});
+            expect(yield library_1.uploadGitCommitHash('dummy', 'fake.site')).toBe('hash');
+        }));
+    });
+});

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

@@ -1,8 +1,7 @@
 import * as simpleGit from 'simple-git';
-import { Writable } from 'stream';
 import { CommitInfo } from './interfaces';
 export declare const newSimpleGit: () => Promise<simpleGit.SimpleGit>;
 export declare const gitRemote: (git: simpleGit.SimpleGit) => Promise<string>;
 export declare const stripCredentials: (remote: string) => string;
 export declare const gitTrackedFiles: (git: simpleGit.SimpleGit) => Promise<string[]>;
-export declare const getCommitInfo: (git: simpleGit.SimpleGit, stdout: Writable, repositoryURL?: string | undefined) => Promise<CommitInfo | undefined>;
+export declare const getCommitInfo: (git: simpleGit.SimpleGit, repositoryURL?: string | undefined) => Promise<CommitInfo>;

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

@@ -31,7 +31,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCommitInfo = exports.gitTrackedFiles = exports.stripCredentials = exports.gitRemote = exports.newSimpleGit = void 0;
 const simpleGit = __importStar(require("simple-git"));
 const url_1 = require("url");
-const renderer_1 = require("./renderer");
 const interfaces_1 = require("./interfaces");
 // Returns a configured SimpleGit.
 const newSimpleGit = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -40,16 +39,11 @@ const newSimpleGit = () => __awaiter(void 0, void 0, void 0, function* () {
         binary: 'git',
         maxConcurrentProcesses: 1,
     };
-    try {
-        // Attempt to set the baseDir to the root of the repository so the 'git ls-files' command
-        // returns the tracked files paths relative to the root of the repository.
-        const git = simpleGit.gitP(options);
-        const root = yield git.revparse('--show-toplevel');
-        options.baseDir = root;
-    }
-    catch (_a) {
-        // Ignore exception as it will fail if we are not inside a git repository.
-    }
+    // Attempt to set the baseDir to the root of the repository so the 'git ls-files' command
+    // returns the tracked files paths relative to the root of the repository.
+    const git = simpleGit.gitP(options);
+    const root = yield git.revparse('--show-toplevel');
+    options.baseDir = root;
     return simpleGit.gitP(options);
 });
 exports.newSimpleGit = newSimpleGit;
@@ -91,27 +85,21 @@ const gitTrackedFiles = (git) => __awaiter(void 0, void 0, void 0, function* ()
 });
 exports.gitTrackedFiles = gitTrackedFiles;
 // Returns the current hash, remote URL and tracked files paths.
-const getCommitInfo = (git, stdout, repositoryURL) => __awaiter(void 0, void 0, void 0, function* () {
+const getCommitInfo = (git, repositoryURL) => __awaiter(void 0, void 0, void 0, function* () {
     // Invoke git commands to retrieve the remote, hash and tracked files.
     // We're using Promise.all instead of Promive.allSettled since we want to fail early if
     // any of the promises fails.
     let remote;
     let hash;
     let trackedFiles;
-    try {
-        if (repositoryURL) {
-            ;
-            [hash, trackedFiles] = yield Promise.all([gitHash(git), exports.gitTrackedFiles(git)]);
-            remote = repositoryURL;
-        }
-        else {
-            ;
-            [remote, hash, trackedFiles] = yield Promise.all([exports.gitRemote(git), gitHash(git), exports.gitTrackedFiles(git)]);
-        }
+    if (repositoryURL) {
+        ;
+        [hash, trackedFiles] = yield Promise.all([gitHash(git), exports.gitTrackedFiles(git)]);
+        remote = repositoryURL;
     }
-    catch (e) {
-        stdout.write(renderer_1.renderGitError(e));
-        return;
+    else {
+        ;
+        [remote, hash, trackedFiles] = yield Promise.all([exports.gitRemote(git), gitHash(git), exports.gitTrackedFiles(git)]);
     }
     return new interfaces_1.CommitInfo(hash, remote, trackedFiles);
 });

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

@@ -0,0 +1 @@
+export * from './library';

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

@@ -0,0 +1,13 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./library"), exports);

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

@@ -0,0 +1,6 @@
+import { RequestBuilder } from '../../helpers/interfaces';
+import { UploadOptions, UploadStatus } from '../../helpers/upload';
+import { CommitInfo } from './interfaces';
+export declare const isGitRepo: () => Promise<boolean>;
+export declare const uploadGitCommitHash: (apiKey: string, datadogSite: string) => Promise<string>;
+export declare const uploadRepository: (requestBuilder: RequestBuilder, libraryVersion: string) => (commitInfo: CommitInfo, opts: UploadOptions) => Promise<UploadStatus>;

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

@@ -0,0 +1,68 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uploadRepository = exports.uploadGitCommitHash = exports.isGitRepo = void 0;
+const apikey_1 = require("../../helpers/apikey");
+const upload_1 = require("../../helpers/upload");
+const utils_1 = require("../../helpers/utils");
+const git_1 = require("./git");
+const isGitRepo = () => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const simpleGit = yield git_1.newSimpleGit();
+        const isRepo = simpleGit.checkIsRepo();
+        return isRepo;
+    }
+    catch (_a) {
+        return false;
+    }
+});
+exports.isGitRepo = isGitRepo;
+const uploadGitCommitHash = (apiKey, datadogSite) => __awaiter(void 0, void 0, void 0, function* () {
+    const apiKeyValidator = apikey_1.newApiKeyValidator({
+        apiKey,
+        datadogSite,
+    });
+    const simpleGit = yield git_1.newSimpleGit();
+    const payload = yield git_1.getCommitInfo(simpleGit);
+    const version = require('../../../package.json').version;
+    const requestBuilder = utils_1.getRequestBuilder({
+        apiKey,
+        baseUrl: 'https://sourcemap-intake.' + datadogSite,
+        headers: new Map([
+            ['DD-EVP-ORIGIN', 'datadog-ci sci'],
+            ['DD-EVP-ORIGIN-VERSION', version],
+        ]),
+        overrideUrl: 'api/v2/srcmap',
+    });
+    const status = yield exports.uploadRepository(requestBuilder, version)(payload, {
+        apiKeyValidator,
+        onError: (e) => {
+            throw e;
+        },
+        onRetry: () => {
+            // Do nothing
+        },
+        onUpload: () => {
+            return;
+        },
+        retries: 5,
+    });
+    if (status !== upload_1.UploadStatus.Success) {
+        throw new Error('Error uploading commit information.');
+    }
+    return payload.hash;
+});
+exports.uploadGitCommitHash = uploadGitCommitHash;
+const uploadRepository = (requestBuilder, libraryVersion) => (commitInfo, opts) => __awaiter(void 0, void 0, void 0, function* () {
+    const payload = commitInfo.asMultipartPayload(libraryVersion);
+    return upload_1.upload(requestBuilder)(payload, opts);
+});
+exports.uploadRepository = uploadRepository;

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

@@ -6,7 +6,6 @@ export declare class UploadCommand extends Command {
     private config;
     private dryRun;
     constructor();
-    execute(): Promise<1 | 0>;
+    execute(): Promise<1 | 0 | undefined>;
     private getRequestBuilder;
-    private uploadRepository;
 }

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

@@ -23,6 +23,7 @@ const upload_1 = require("../../helpers/upload");
 const utils_1 = require("../../helpers/utils");
 const api_1 = require("./api");
 const git_1 = require("./git");
+const library_1 = require("./library");
 const renderer_1 = require("./renderer");
 class UploadCommand extends clipanion_1.Command {
     constructor() {
@@ -49,28 +50,40 @@ class UploadCommand extends clipanion_1.Command {
                 datadogSite: api_1.datadogSite,
                 metricsLogger: metricsLogger.logger,
             });
-            const payload = yield git_1.getCommitInfo(yield git_1.newSimpleGit(), this.context.stdout, this.repositoryURL);
-            if (payload === undefined) {
-                return 1;
+            let payload;
+            try {
+                payload = yield git_1.getCommitInfo(yield git_1.newSimpleGit(), this.repositoryURL);
+            }
+            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 {
                 const requestBuilder = this.getRequestBuilder();
-                const status = yield this.uploadRepository(requestBuilder)(payload, {
-                    apiKeyValidator,
-                    onError: (e) => {
-                        this.context.stdout.write(renderer_1.renderFailedUpload(e.message));
-                        metricsLogger.logger.increment('failed', 1);
-                    },
-                    onRetry: (e, attempt) => {
-                        this.context.stdout.write(renderer_1.renderRetriedUpload(e.message, attempt));
-                        metricsLogger.logger.increment('retries', 1);
-                    },
-                    onUpload: () => {
-                        return;
-                    },
-                    retries: 5,
-                });
+                if (this.dryRun) {
+                    status = upload_1.UploadStatus.Success;
+                }
+                else {
+                    status = yield library_1.uploadRepository(requestBuilder, this.cliVersion)(payload, {
+                        apiKeyValidator,
+                        onError: (e) => {
+                            this.context.stdout.write(renderer_1.renderFailedUpload(e.message));
+                            metricsLogger.logger.increment('failed', 1);
+                        },
+                        onRetry: (e, attempt) => {
+                            this.context.stdout.write(renderer_1.renderRetriedUpload(e.message, attempt));
+                            metricsLogger.logger.increment('retries', 1);
+                        },
+                        onUpload: () => {
+                            return;
+                        },
+                        retries: 5,
+                    });
+                }
                 metricsLogger.logger.increment('success', 1);
                 const totalTime = (Date.now() - initialTime) / 1000;
                 if (status !== upload_1.UploadStatus.Success) {
@@ -113,15 +126,6 @@ class UploadCommand extends clipanion_1.Command {
             overrideUrl: 'api/v2/srcmap',
         });
     }
-    uploadRepository(requestBuilder) {
-        return (commitInfo, opts) => __awaiter(this, void 0, void 0, function* () {
-            const payload = commitInfo.asMultipartPayload(this.cliVersion);
-            if (this.dryRun) {
-                return upload_1.UploadStatus.Success;
-            }
-            return upload_1.upload(requestBuilder)(payload, opts);
-        });
-    }
 }
 exports.UploadCommand = UploadCommand;
 UploadCommand.usage = clipanion_1.Command.Usage({

package/dist/commands/lambda/__tests__/instrument.test.js

@@ -369,7 +369,7 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                     '0.1',
                 ], context);
                 const output = context.stdout.toString();
-                expect(output).toMatch(/.*Make sure the command is running within your git repository\..*/i);
+                expect(output.replace('\n', '')).toMatch(/.*Error: Couldn't get local git status.*/);
             }));
             test('instrumenting with source code integrations fails if DATADOG_API_KEY is not provided', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;

package/dist/commands/lambda/instrument.js

@@ -185,7 +185,7 @@ class InstrumentCommand extends clipanion_1.Command {
     getCurrentGitStatus() {
         return __awaiter(this, void 0, void 0, function* () {
             const simpleGit = yield git_1.newSimpleGit();
-            const gitCommitInfo = yield git_1.getCommitInfo(simpleGit, this.context.stdout);
+            const gitCommitInfo = yield git_1.getCommitInfo(simpleGit);
             if (gitCommitInfo === undefined) {
                 throw new Error('Git commit info is not defined');
             }

package/dist/commands/synthetics/__tests__/utils.test.js

@@ -36,6 +36,7 @@ jest.mock('fs');
 const fs = __importStar(require("fs"));
 const axios_1 = __importDefault(require("axios"));
 const glob_1 = __importDefault(require("glob"));
+const ciHelpers = __importStar(require("../../../helpers/ci"));
 const api_1 = require("../api");
 const interfaces_1 = require("../interfaces");
 const utils = __importStar(require("../utils"));
@@ -82,6 +83,31 @@ describe('utils', () => {
             const output = yield utils.runTests(api, [{ public_id: fakeId, executionRule: interfaces_1.ExecutionRule.NON_BLOCKING }]);
             expect(output).toEqual(fakeTrigger);
         }));
+        test('runTests sends batch metadata', () => __awaiter(void 0, void 0, void 0, function* () {
+            jest.spyOn(ciHelpers, 'getCIMetadata').mockImplementation(() => undefined);
+            const payloadMetadataSpy = jest.fn();
+            const axiosMock = jest.spyOn(axios_1.default, 'create');
+            axiosMock.mockImplementation((() => (e) => {
+                payloadMetadataSpy(e.data.metadata);
+                if (e.url === '/synthetics/tests/trigger/ci') {
+                    return { data: fakeTrigger };
+                }
+            }));
+            yield utils.runTests(api, [{ public_id: fakeId, executionRule: interfaces_1.ExecutionRule.NON_BLOCKING }]);
+            expect(payloadMetadataSpy).toHaveBeenCalledWith({
+                ci: { job: {}, pipeline: {}, provider: {}, stage: {} },
+                git: { commit: { author: {}, committer: {} } },
+                trigger_app: 'npm_package',
+            });
+            const metadata = {
+                ci: { job: { name: 'job' }, pipeline: {}, provider: { name: 'jest' }, stage: {} },
+                git: { commit: { author: {}, committer: {}, message: 'test' } },
+            };
+            jest.spyOn(ciHelpers, 'getCIMetadata').mockImplementation(() => metadata);
+            utils.setCiTriggerApp('unit_test');
+            yield utils.runTests(api, [{ public_id: fakeId, executionRule: interfaces_1.ExecutionRule.NON_BLOCKING }]);
+            expect(payloadMetadataSpy).toHaveBeenCalledWith(Object.assign(Object.assign({}, metadata), { trigger_app: 'unit_test' }));
+        }));
         test('should run test with publicId from url', () => __awaiter(void 0, void 0, void 0, function* () {
             const axiosMock = jest.spyOn(axios_1.default, 'create');
             axiosMock.mockImplementation((() => (e) => {

package/dist/commands/synthetics/crypto.d.ts

@@ -1,5 +1,6 @@
+import { ParsedKey } from 'ssh2-streams';
 export declare const generateOpenSSHKeys: () => {
     privateKey: string;
     publicKey: string;
 };
-export declare const parseSSHKey: (key: string) => import("ssh2-streams").ParsedKey;
+export declare const parseSSHKey: (key: string) => ParsedKey;

package/dist/commands/synthetics/interfaces.d.ts

@@ -252,9 +252,12 @@ export interface ConfigOverride {
     };
 }
 export interface Payload {
-    metadata?: Metadata;
+    metadata?: SyntheticsMetadata;
     tests: TestPayload[];
 }
+export declare type SyntheticsMetadata = Metadata & {
+    trigger_app: string;
+};
 export interface TestPayload extends ConfigOverride {
     executionRule: ExecutionRule;
     public_id: string;

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

@@ -1,6 +1,7 @@
 import { APIHelper, ConfigOverride, ExecutionRule, InternalTest, MainReporter, PollResult, Reporter, Result, Suite, Summary, TestPayload, Trigger, TriggerConfig, TriggerResponse, TriggerResult } from './interfaces';
 import { Tunnel } from './tunnel';
 export declare const handleConfig: (test: InternalTest, publicId: string, reporter: MainReporter, config?: ConfigOverride | undefined) => TestPayload;
+export declare const setCiTriggerApp: (source: string) => void;
 export declare const getExecutionRule: (test: InternalTest, configOverride?: ConfigOverride | undefined) => ExecutionRule;
 export declare const getStrictestExecutionRule: (configRule: ExecutionRule, testRule?: ExecutionRule | undefined) => ExecutionRule;
 export declare const isCriticalError: (result: Result) => boolean;

package/dist/commands/synthetics/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.parseVariablesFromCli = exports.retry = exports.runTests = exports.getTestsToTrigger = exports.getReporter = exports.getResultDuration = exports.createSummary = exports.createTriggerResultMap = exports.waitForResults = exports.wait = exports.getSuites = exports.hasTestSucceeded = exports.hasResultPassed = exports.isCriticalError = exports.getStrictestExecutionRule = exports.getExecutionRule = exports.handleConfig = void 0;
+exports.parseVariablesFromCli = exports.retry = exports.runTests = exports.getTestsToTrigger = exports.getReporter = exports.getResultDuration = exports.createSummary = exports.createTriggerResultMap = exports.waitForResults = exports.wait = exports.getSuites = exports.hasTestSucceeded = exports.hasResultPassed = exports.isCriticalError = exports.getStrictestExecutionRule = exports.getExecutionRule = exports.setCiTriggerApp = exports.handleConfig = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const url_1 = require("url");
@@ -47,6 +47,7 @@ const PUBLIC_ID_REGEX = /^[\d\w]{3}-[\d\w]{3}-[\d\w]{3}$/;
 const SUBDOMAIN_REGEX = /(.*?)\.(?=[^\/]*\..{2,5})/;
 const TEMPLATE_REGEX = /{{\s*([^{}]*?)\s*}}/g;
 const template = (st, context) => st.replace(TEMPLATE_REGEX, (match, p1) => (p1 in context ? context[p1] : match));
+let ciTriggerApp = 'npm_package';
 const handleConfig = (test, publicId, reporter, config) => {
     const executionRule = exports.getExecutionRule(test, config);
     let handledConfig = {
@@ -83,6 +84,10 @@ const handleConfig = (test, publicId, reporter, config) => {
     return handledConfig;
 };
 exports.handleConfig = handleConfig;
+const setCiTriggerApp = (source) => {
+    ciTriggerApp = source;
+};
+exports.setCiTriggerApp = setCiTriggerApp;
 const parseUrlVariables = (url, reporter) => {
     const context = Object.assign(Object.assign({}, process.env), { URL: url });
     let objUrl;
@@ -408,9 +413,8 @@ exports.getTestsToTrigger = getTestsToTrigger;
 const runTests = (api, testsToTrigger) => __awaiter(void 0, void 0, void 0, function* () {
     const payload = { tests: testsToTrigger };
     const ciMetadata = ci_1.getCIMetadata();
-    if (ciMetadata) {
-        payload.metadata = ciMetadata;
-    }
+    const syntheticsMetadata = Object.assign(Object.assign({ ci: { job: {}, pipeline: {}, provider: {}, stage: {} }, git: { commit: { author: {}, committer: {} } } }, ciMetadata), { trigger_app: ciTriggerApp });
+    payload.metadata = syntheticsMetadata;
     try {
         return yield api.triggerTests(payload);
     }

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+import * as gitMetadata from './commands/git-metadata';
 import * as synthetics from './commands/synthetics';
 import * as utils from './helpers/utils';
-export { utils, synthetics };
+export { utils, synthetics, gitMetadata };

package/dist/index.js

@@ -19,7 +19,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.synthetics = exports.utils = void 0;
+exports.gitMetadata = exports.synthetics = exports.utils = void 0;
+const gitMetadata = __importStar(require("./commands/git-metadata"));
+exports.gitMetadata = gitMetadata;
 const synthetics = __importStar(require("./commands/synthetics"));
 exports.synthetics = synthetics;
 const utils = __importStar(require("./helpers/utils"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datadog/datadog-ci",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "description": "Run datadog actions from the CI.",
   "repository": "https://github.com/DataDog/datadog-ci",
   "license": "Apache-2.0",