@datadog/datadog-ci 0.17.9 → 0.17.13

package/dist/helpers/interfaces.d.ts

@@ -2,16 +2,42 @@ import { AxiosPromise, AxiosRequestConfig, AxiosResponse } from 'axios';
 import { 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: {
+        job: {
+            name?: string;
+            url?: string;
+        };
         pipeline: {
+            id?: string;
+            name?: string;
+            number?: number;
             url?: string;
         };
         provider: {
-            name: string;
+            name?: string;
         };
+        stage: {
+            name?: string;
+        };
+        workspace_path?: string;
     };
     git: {
         branch?: string;
-        commitSha?: string;
+        commit: {
+            author: {
+                date?: string;
+                email?: string;
+                name?: string;
+            };
+            committer: {
+                date?: string;
+                email?: string;
+                name?: string;
+            };
+            message?: string;
+            sha?: string;
+        };
+        repository_url?: string;
+        tag?: string;
     };
 }
 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;

package/dist/helpers/user-provided-git.d.ts

@@ -1 +1,2 @@
-export declare const getUserGitMetadata: () => {};
+export declare const getUserGitSpanTags: () => {};
+export declare const getUserCISpanTags: () => {};

package/dist/helpers/user-provided-git.js

@@ -1,15 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserGitMetadata = void 0;
+exports.getUserCISpanTags = exports.getUserGitSpanTags = void 0;
 const tags_1 = require("./tags");
 const utils_1 = require("./utils");
-const getUserGitMetadata = () => {
+const getUserGitSpanTags = () => {
     const { DD_GIT_REPOSITORY_URL, DD_GIT_COMMIT_SHA, DD_GIT_BRANCH, DD_GIT_TAG, DD_GIT_COMMIT_MESSAGE, DD_GIT_COMMIT_AUTHOR_NAME, DD_GIT_COMMIT_AUTHOR_EMAIL, DD_GIT_COMMIT_AUTHOR_DATE, DD_GIT_COMMIT_COMMITTER_NAME, DD_GIT_COMMIT_COMMITTER_EMAIL, DD_GIT_COMMIT_COMMITTER_DATE, } = process.env;
+    let branch = utils_1.normalizeRef(DD_GIT_BRANCH);
+    let tag = utils_1.normalizeRef(DD_GIT_TAG);
+    if (DD_GIT_TAG) {
+        branch = undefined;
+    }
+    if ((DD_GIT_BRANCH === null || DD_GIT_BRANCH === void 0 ? void 0 : DD_GIT_BRANCH.includes('origin/tags')) || (DD_GIT_BRANCH === null || DD_GIT_BRANCH === void 0 ? void 0 : DD_GIT_BRANCH.includes('refs/heads/tags'))) {
+        branch = undefined;
+        tag = utils_1.normalizeRef(DD_GIT_BRANCH);
+    }
     return utils_1.removeEmptyValues({
         [tags_1.GIT_REPOSITORY_URL]: DD_GIT_REPOSITORY_URL,
-        [tags_1.GIT_BRANCH]: DD_GIT_BRANCH,
+        [tags_1.GIT_BRANCH]: branch,
         [tags_1.GIT_SHA]: DD_GIT_COMMIT_SHA,
-        [tags_1.GIT_TAG]: DD_GIT_TAG,
+        [tags_1.GIT_TAG]: tag,
         [tags_1.GIT_COMMIT_MESSAGE]: DD_GIT_COMMIT_MESSAGE,
         [tags_1.GIT_COMMIT_COMMITTER_DATE]: DD_GIT_COMMIT_COMMITTER_DATE,
         [tags_1.GIT_COMMIT_COMMITTER_EMAIL]: DD_GIT_COMMIT_COMMITTER_EMAIL,
@@ -19,4 +28,19 @@ const getUserGitMetadata = () => {
         [tags_1.GIT_COMMIT_AUTHOR_NAME]: DD_GIT_COMMIT_AUTHOR_NAME,
     });
 };
-exports.getUserGitMetadata = getUserGitMetadata;
+exports.getUserGitSpanTags = getUserGitSpanTags;
+const getUserCISpanTags = () => {
+    const { DD_CI_JOB_NAME, DD_CI_JOB_URL, DD_CI_PIPELINE_ID, DD_CI_PIPELINE_NAME, DD_CI_PIPELINE_NUMBER, DD_CI_PIPELINE_URL, DD_CI_PROVIDER_NAME, DD_CI_STAGE_NAME, DD_CI_WORKSPACE_PATH, } = process.env;
+    return utils_1.removeEmptyValues({
+        [tags_1.CI_JOB_NAME]: DD_CI_JOB_NAME,
+        [tags_1.CI_JOB_URL]: DD_CI_JOB_URL,
+        [tags_1.CI_PIPELINE_ID]: DD_CI_PIPELINE_ID,
+        [tags_1.CI_PIPELINE_NAME]: DD_CI_PIPELINE_NAME,
+        [tags_1.CI_PIPELINE_NUMBER]: DD_CI_PIPELINE_NUMBER,
+        [tags_1.CI_PIPELINE_URL]: DD_CI_PIPELINE_URL,
+        [tags_1.CI_PROVIDER_NAME]: DD_CI_PROVIDER_NAME,
+        [tags_1.CI_STAGE_NAME]: DD_CI_STAGE_NAME,
+        [tags_1.CI_WORKSPACE_PATH]: DD_CI_WORKSPACE_PATH,
+    });
+};
+exports.getUserCISpanTags = getUserCISpanTags;

package/dist/helpers/utils.d.ts

@@ -28,4 +28,8 @@ export declare const getProxyAgent: (proxyOpts?: ProxyConfiguration | undefined)
 export declare const getApiHostForSite: (site: string) => string;
 export declare const buildPath: (...args: string[]) => string;
 export declare const removeEmptyValues: (tags: SpanTags) => {};
+export declare const removeUndefinedValues: <T extends {
+    [key: string]: any;
+}>(object: T) => T;
+export declare const normalizeRef: (ref: string | undefined) => string | undefined;
 export {};

package/dist/helpers/utils.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeEmptyValues = exports.buildPath = exports.getApiHostForSite = exports.getProxyAgent = exports.getRequestBuilder = exports.getProxyUrl = exports.parseConfigFile = exports.getConfig = exports.pick = void 0;
+exports.normalizeRef = exports.removeUndefinedValues = exports.removeEmptyValues = exports.buildPath = exports.getApiHostForSite = exports.getProxyAgent = exports.getRequestBuilder = exports.getProxyUrl = exports.parseConfigFile = exports.getConfig = exports.pick = void 0;
 const fs_1 = __importDefault(require("fs"));
 const util_1 = require("util");
 const axios_1 = __importDefault(require("axios"));
@@ -130,3 +130,20 @@ const removeEmptyValues = (tags) => Object.keys(tags).reduce((filteredTags, tag)
     return Object.assign(Object.assign({}, filteredTags), { [tag]: tags[tag] });
 }, {});
 exports.removeEmptyValues = removeEmptyValues;
+const removeUndefinedValues = (object) => {
+    const newObject = Object.assign({}, object);
+    for (const [key, value] of Object.entries(newObject)) {
+        if (value === undefined) {
+            delete newObject[key];
+        }
+    }
+    return newObject;
+};
+exports.removeUndefinedValues = removeUndefinedValues;
+const normalizeRef = (ref) => {
+    if (!ref) {
+        return ref;
+    }
+    return ref.replace(/origin\/|refs\/heads\/|tags\//gm, '');
+};
+exports.normalizeRef = normalizeRef;

package/dist/index.d.ts

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

package/dist/index.js

@@ -1,34 +1,26 @@
-#!/usr/bin/env node
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+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;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const clipanion_1 = require("clipanion");
-const onError = (err) => {
-    console.log(err);
-    process.exitCode = 1;
-};
-process.on('uncaughtException', onError);
-process.on('unhandledRejection', onError);
-const cli = new clipanion_1.Cli({
-    binaryLabel: 'Datadog CI',
-    binaryName: 'datadog-ci',
-    binaryVersion: require('../package.json').version,
-});
-const commandsPath = `${__dirname}/commands`;
-for (const commandFolder of fs_1.default.readdirSync(commandsPath)) {
-    const commandPath = `${commandsPath}/${commandFolder}`;
-    if (fs_1.default.statSync(commandPath).isDirectory()) {
-        // tslint:disable-next-line: no-var-requires
-        require(commandPath).forEach((command) => cli.register(command));
-    }
-}
-if (require.main === module) {
-    cli.runExit(process.argv.slice(2), {
-        stderr: process.stderr,
-        stdin: process.stdin,
-        stdout: process.stdout,
-    });
-}
+exports.synthetics = exports.utils = void 0;
+const synthetics = __importStar(require("./commands/synthetics"));
+exports.synthetics = synthetics;
+const utils = __importStar(require("./helpers/utils"));
+exports.utils = utils;

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@datadog/datadog-ci",
-  "version": "0.17.9",
+  "version": "0.17.13",
   "description": "Run datadog actions from the CI.",
-  "main": "dist/index.js",
   "repository": "https://github.com/DataDog/datadog-ci",
   "license": "Apache-2.0",
   "bin": {
-    "datadog-ci": "dist/index.js"
+    "datadog-ci": "dist/cli.js"
   },
   "engines": {
     "node": ">=10.24.1"
@@ -16,6 +15,7 @@
     "README",
     "LICENSE"
   ],
+  "main": "dist/index.js",
   "publishConfig": {
     "access": "public"
   },
@@ -28,8 +28,8 @@
     "check-licenses": "node bin/check-licenses.js",
     "clean": "rm -rf dist/*",
     "format": "yarn tslint --fix && yarn prettier --write",
-    "launch": "ts-node --transpile-only src/index.ts",
-    "launch:debug": "node -r ts-node/register/transpile-only --inspect-brk src/index.ts",
+    "launch": "ts-node --transpile-only src/cli.ts",
+    "launch:debug": "node -r ts-node/register/transpile-only --inspect-brk src/cli.ts",
     "lint": "(yarn tslint && yarn prettier --check) || (echo \"\nYou can fix this by running ==> yarn format <==\n\" && false)",
     "prepack": "yarn build && node ./bin/make-it-executable.js",
     "prettier": "prettier \"src/**/*.{ts,js,json,yml}\" --ignore-path .gitignore",
@@ -41,16 +41,16 @@
   },
   "dependencies": {
     "async-retry": "1.3.1",
-    "aws-sdk": "2.903.0",
+    "aws-sdk": "2.1012.0",
     "axios": "0.21.2",
     "chalk": "3.0.0",
     "clipanion": "2.2.2",
     "datadog-metrics": "0.9.3",
-    "dd-trace": "0.35.1-beta.1",
     "deep-extend": "0.6.0",
     "fast-xml-parser": "3.19.0",
     "form-data": "3.0.0",
     "glob": "7.1.4",
+    "inquirer": "8.2.0",
     "proxy-agent": "5.0.0",
     "simple-git": "2.31.0",
     "ssh2": "1.4.0",
@@ -69,6 +69,7 @@
     "@types/datadog-metrics": "0.6.1",
     "@types/deep-extend": "0.4.31",
     "@types/glob": "7.1.1",
+    "@types/inquirer": "8.1.3",
     "@types/jest": "24.0.15",
     "@types/node": "10.17.57",
     "@types/ssh2": "0.5.46",
@@ -77,6 +78,7 @@
     "@types/tiny-async-pool": "1.0.0",
     "@types/ws": "7.2.9",
     "@types/xml2js": "0.4.9",
+    "dd-trace": "0.36.3",
     "jest": "27.0.5",
     "jest-environment-node": "27.0.5",
     "jest-matcher-specific-error": "1.0.0",
@@ -87,6 +89,6 @@
     "tslint": "5.18.0",
     "tslint-config-prettier": "1.18.0",
     "tslint-lines-between-class-members": "1.3.6",
-    "typescript": "4.1.3"
+    "typescript": "4.2.2"
   }
 }