@datadog/datadog-ci-plugin-synthetics 5.17.0 → 5.19.0

package/dist/bundle.d.ts

@@ -2388,17 +2388,30 @@ declare enum LogLevel {
   WARN = 3,
   ERROR = 4
 }
+interface LoggerOptions {
+  shouldIncludeTimestamp?: boolean;
+  /**
+   * When `true`, every log call emits a single-line JSON object instead of
+   * ANSI-coloured text. Useful when Datadog itself (or any other log
+   * pipeline) ingests CLI output: each line parses cleanly and `level` is
+   * preserved instead of every `error` showing up as `info`.
+   */
+  jsonOutput?: boolean;
+}
 declare class Logger {
   private loglevel;
-  private writeMessage;
+  private rawWriteMessage;
   private shouldIncludeTimestamp;
-  constructor(writeMessage: (s: string) => void, loglevel: LogLevel, shouldIncludeTimestamp?: boolean);
+  private jsonOutput;
+  constructor(writeMessage: (s: string) => void, loglevel: LogLevel, shouldIncludeTimestampOrOptions?: boolean | LoggerOptions);
   setLogLevel(newLogLevel: LogLevel): void;
   setShouldIncludeTime(newShouldIncludeTimestamp: boolean): void;
+  setJsonOutput(newJsonOutput: boolean): void;
   error(s: string): void;
   warn(s: string): void;
   info(s: string): void;
   debug(s: string): void;
+  private emit;
 }
 //#endregion
 //#region src/commands/upload-application.d.ts

package/dist/bundle.js

@@ -5761,11 +5761,12 @@ var require_glob = /* @__PURE__ */ __commonJSMin(((exports) => {
 var require_package$2 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = {
 		"name": "@datadog/datadog-ci-base",
-		"version": "5.17.0",
+		"version": "5.19.0",
 		"description": "Base package for Datadog CI",
 		"license": "Apache-2.0",
 		"keywords": ["datadog", "datadog-ci"],
 		"homepage": "https://github.com/DataDog/datadog-ci/tree/master/packages/base",
+		"bugs": { "url": "https://github.com/DataDog/datadog-ci/issues" },
 		"repository": {
 			"type": "git",
 			"url": "https://github.com/DataDog/datadog-ci.git",
@@ -65363,8 +65364,6 @@ var require_datadog_route = /* @__PURE__ */ __commonJSMin(((exports) => {
 	exports.DATADOG_ROUTE_PATHS = [
 		"/api/intake/ci/custom_spans",
 		"/api/ui/support/serverless/flare",
-		"/api/unstable/deployments/gates/evaluation",
-		"/api/unstable/deployments/gates/evaluation/:evaluationId",
 		"/api/v1/validate",
 		"/api/v2/ci/deployments/correlate-image",
 		"/api/v2/ci/deployments/correlate",
@@ -65374,6 +65373,8 @@ var require_datadog_route = /* @__PURE__ */ __commonJSMin(((exports) => {
 		"/api/v2/cicovreprt",
 		"/api/v2/ciiac",
 		"/api/v2/cireport",
+		"/api/v2/deployments/gates/evaluation",
+		"/api/v2/deployments/gates/evaluation/:evaluationId",
 		"/api/v2/dora/deployment",
 		"/api/v2/git/repository/packfile",
 		"/api/v2/git/repository/search_commits",
@@ -137482,6 +137483,7 @@ var require_is_standalone_binary = /* @__PURE__ */ __commonJSMin(((exports) => {
 			const { isSea } = yield import("node:sea");
 			return isSea();
 		} catch (_a) {
+			if (process.pkg !== void 0) return true;
 			return false;
 		}
 	});
@@ -138376,7 +138378,7 @@ var require_plugin = /* @__PURE__ */ __commonJSMin(((exports) => {
 		return mod && mod.__esModule ? mod : { "default": mod };
 	};
 	Object.defineProperty(exports, "__esModule", { value: true });
-	exports.getTempPath = exports.VERSION_OVERRIDE_REGEX = exports.scopeToPackageName = exports.importInstallPkg = exports.installPlugin = exports.checkPlugin = exports.listAllPlugins = exports.executePluginCommand = void 0;
+	exports.getTempPath = exports.VERSION_OVERRIDE_REGEX = exports.scopeToPackageName = exports.importInstallPkg = exports.installPlugin = exports.checkPlugin = exports.listAllPlugins = exports.normalizePluginSubmodule = exports.executePluginCommand = void 0;
 	const node_child_process_1 = require("node:child_process");
 	const node_path_1 = __importDefault(require("node:path"));
 	const node_url_1 = __importDefault(require("node:url"));
@@ -138417,6 +138419,15 @@ var require_plugin = /* @__PURE__ */ __commonJSMin(((exports) => {
 		}
 	});
 	exports.executePluginCommand = executePluginCommand;
+	const normalizePluginSubmodule = (submodule) => {
+		if (isPluginSubmodule(submodule)) return submodule;
+		if (typeof submodule === "object" && submodule && "default" in submodule) {
+			const defaultExport = submodule.default;
+			if (isPluginSubmodule(defaultExport)) return defaultExport;
+		}
+		return submodule;
+	};
+	exports.normalizePluginSubmodule = normalizePluginSubmodule;
 	const listAllPlugins = () => {
 		return Object.keys(package_json_1.peerDependencies);
 	};
@@ -138579,6 +138590,21 @@ var require_plugin = /* @__PURE__ */ __commonJSMin(((exports) => {
 		}
 		patchModulePaths();
 		yield handlePluginAutoInstall(scope);
+		const submoduleName = `@datadog/datadog-ci-plugin-${scope}/commands/${command}`;
+		debug("Resolving submodule:", submoduleName);
+		let submoduleResolveError;
+		let resolvedSubmodulePath;
+		try {
+			resolvedSubmodulePath = require.resolve(submoduleName);
+		} catch (error) {
+			debug(`Could not require.resolve() the ${submoduleName} submodule: ${error}`);
+			submoduleResolveError = error;
+		}
+		if (resolvedSubmodulePath) {
+			const submodulePath = node_url_1.default.pathToFileURL(resolvedSubmodulePath).href;
+			debug("Importing submodule:", submodulePath);
+			return (0, exports.normalizePluginSubmodule)(yield import(submodulePath));
+		}
 		const pluginPackage = `@datadog/datadog-ci-plugin-${scope}`;
 		try {
 			const submodule = (_b = require(pluginPackage).commands) === null || _b === void 0 ? void 0 : _b[command];
@@ -138587,19 +138613,9 @@ var require_plugin = /* @__PURE__ */ __commonJSMin(((exports) => {
 				return submodule;
 			}
 		} catch (error) {
-			debug("Plugin bundle load failed, trying submodule path:", error);
+			debug("Plugin bundle load failed:", error);
 		}
-		const submoduleName = `@datadog/datadog-ci-plugin-${scope}/commands/${command}`;
-		debug("Resolving submodule:", submoduleName);
-		let submodulePath = submoduleName;
-		try {
-			const resolvedPath = require.resolve(submoduleName);
-			submodulePath = node_url_1.default.pathToFileURL(resolvedPath).href;
-		} catch (error) {
-			debug(`Could not require.resolve() the ${submoduleName} submodule: ${error}`);
-		}
-		debug("Importing submodule:", submodulePath);
-		return yield import(submodulePath);
+		throw submoduleResolveError;
 	});
 	const scopeToPackageName = (scope) => {
 		if (scope.match(/^@datadog\/datadog-ci-plugin-[a-z-]+$/)) return scope;
@@ -138619,6 +138635,9 @@ var require_plugin = /* @__PURE__ */ __commonJSMin(((exports) => {
 	const isValidScope = (scope) => {
 		return (0, exports.scopeToPackageName)(scope) in package_json_1.peerDependencies;
 	};
+	const isPluginSubmodule = (submodule) => {
+		return typeof submodule === "object" && !!submodule && "PluginCommand" in submodule && typeof submodule.PluginCommand === "function";
+	};
 	/**
 	* @example "1.2.3"
 	* @example "file:./artifacts/@datadog-datadog-ci-base-20.tgz"
@@ -140105,12 +140124,19 @@ var require_logger = /* @__PURE__ */ __commonJSMin(((exports) => {
 		LogLevel[LogLevel["WARN"] = 3] = "WARN";
 		LogLevel[LogLevel["ERROR"] = 4] = "ERROR";
 	})(LogLevel || (exports.LogLevel = LogLevel = {}));
+	const LEVEL_NAMES = {
+		[LogLevel.DEBUG]: "debug",
+		[LogLevel.INFO]: "info",
+		[LogLevel.WARN]: "warn",
+		[LogLevel.ERROR]: "error"
+	};
 	var Logger = class {
-		constructor(writeMessage, loglevel, shouldIncludeTimestamp) {
-			this.shouldIncludeTimestamp = shouldIncludeTimestamp !== null && shouldIncludeTimestamp !== void 0 ? shouldIncludeTimestamp : false;
-			this.writeMessage = (s) => {
-				return writeMessage(this.shouldIncludeTimestamp ? `${(/* @__PURE__ */ new Date()).toISOString()}: ${s}` : s);
-			};
+		constructor(writeMessage, loglevel, shouldIncludeTimestampOrOptions) {
+			var _a, _b;
+			const options = typeof shouldIncludeTimestampOrOptions === "boolean" ? { shouldIncludeTimestamp: shouldIncludeTimestampOrOptions } : shouldIncludeTimestampOrOptions !== null && shouldIncludeTimestampOrOptions !== void 0 ? shouldIncludeTimestampOrOptions : {};
+			this.rawWriteMessage = writeMessage;
+			this.shouldIncludeTimestamp = (_a = options.shouldIncludeTimestamp) !== null && _a !== void 0 ? _a : false;
+			this.jsonOutput = (_b = options.jsonOutput) !== null && _b !== void 0 ? _b : false;
 			this.loglevel = loglevel;
 		}
 		setLogLevel(newLogLevel) {
@@ -140119,17 +140145,34 @@ var require_logger = /* @__PURE__ */ __commonJSMin(((exports) => {
 		setShouldIncludeTime(newShouldIncludeTimestamp) {
 			this.shouldIncludeTimestamp = newShouldIncludeTimestamp;
 		}
+		setJsonOutput(newJsonOutput) {
+			this.jsonOutput = newJsonOutput;
+		}
 		error(s) {
-			if (this.loglevel <= LogLevel.ERROR) this.writeMessage(chalk_1.default.red(s) + "\n");
+			if (this.loglevel <= LogLevel.ERROR) this.emit(LogLevel.ERROR, s, chalk_1.default.red);
 		}
 		warn(s) {
-			if (this.loglevel <= LogLevel.WARN) this.writeMessage(chalk_1.default.yellow(s) + "\n");
+			if (this.loglevel <= LogLevel.WARN) this.emit(LogLevel.WARN, s, chalk_1.default.yellow);
 		}
 		info(s) {
-			if (this.loglevel <= LogLevel.INFO) this.writeMessage(s + "\n");
+			if (this.loglevel <= LogLevel.INFO) this.emit(LogLevel.INFO, s);
 		}
 		debug(s) {
-			if (this.loglevel <= LogLevel.DEBUG) this.writeMessage(s + "\n");
+			if (this.loglevel <= LogLevel.DEBUG) this.emit(LogLevel.DEBUG, s);
+		}
+		emit(level, message, colorize) {
+			if (this.jsonOutput) {
+				const payload = {
+					level: LEVEL_NAMES[level],
+					message
+				};
+				if (this.shouldIncludeTimestamp) payload.timestamp = (/* @__PURE__ */ new Date()).toISOString();
+				this.rawWriteMessage(JSON.stringify(payload) + "\n");
+				return;
+			}
+			const prefix = this.shouldIncludeTimestamp ? `${(/* @__PURE__ */ new Date()).toISOString()}: ` : "";
+			const body = colorize ? colorize(message) : message;
+			this.rawWriteMessage(prefix + body + "\n");
 		}
 	};
 	exports.Logger = Logger;