@datadog/datadog-ci 1.16.0 → 2.0.0

package/dist/commands/synthetics/run-test.js

@@ -10,11 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTestsList = exports.executeTests = void 0;
+const utils_1 = require("../../helpers/utils");
 const api_1 = require("./api");
 const command_1 = require("./command");
 const errors_1 = require("./errors");
+const default_1 = require("./reporters/default");
 const tunnel_1 = require("./tunnel");
-const utils_1 = require("./utils");
+const utils_2 = require("./utils");
 const executeTests = (reporter, config, suites) => __awaiter(void 0, void 0, void 0, function* () {
     const api = api_1.getApiHelper(config);
     const publicIdsFromCli = config.publicIds.map((id) => {
@@ -48,7 +50,7 @@ const executeTests = (reporter, config, suites) => __awaiter(void 0, void 0, voi
     let testsToTriggerResult;
     try {
         const triggerFromSearch = !!config.testSearchQuery;
-        testsToTriggerResult = yield utils_1.getTestsToTrigger(api, testsToTrigger, reporter, triggerFromSearch, config.failOnMissingTests);
+        testsToTriggerResult = yield utils_2.getTestsToTrigger(api, testsToTrigger, reporter, triggerFromSearch, config.failOnMissingTests);
     }
     catch (error) {
         if (error instanceof errors_1.CiError) {
@@ -73,7 +75,9 @@ const executeTests = (reporter, config, suites) => __awaiter(void 0, void 0, voi
         }
         // Open a tunnel to Datadog
         try {
-            tunnel = new tunnel_1.Tunnel(presignedURL, publicIdsToTrigger, config.proxy, reporter);
+            const tunnelProxyAgent = utils_1.getProxyAgent(config.proxy);
+            const tunnelReporter = default_1.getTunnelReporter(reporter);
+            tunnel = new tunnel_1.Tunnel(presignedURL, publicIdsToTrigger, tunnelProxyAgent, tunnelReporter);
             const tunnelInfo = yield tunnel.start();
             overriddenTestsToTrigger.forEach((testToTrigger) => {
                 testToTrigger.tunnel = tunnelInfo;
@@ -86,7 +90,7 @@ const executeTests = (reporter, config, suites) => __awaiter(void 0, void 0, voi
     }
     let trigger;
     try {
-        trigger = yield utils_1.runTests(api, overriddenTestsToTrigger);
+        trigger = yield utils_2.runTests(api, overriddenTestsToTrigger);
     }
     catch (error) {
         yield stopTunnel();
@@ -94,7 +98,7 @@ const executeTests = (reporter, config, suites) => __awaiter(void 0, void 0, voi
     }
     try {
         const maxPollingTimeout = Math.max(...testsToTrigger.map((t) => t.config.pollingTimeout || config.pollingTimeout));
-        const results = yield utils_1.waitForResults(api, trigger, tests, {
+        const results = yield utils_2.waitForResults(api, trigger, tests, {
             failOnCriticalErrors: config.failOnCriticalErrors,
             failOnTimeout: config.failOnTimeout,
             maxPollingTimeout,
@@ -130,7 +134,7 @@ const getTestsList = (api, config, reporter, suites = []) => __awaiter(void 0, v
         }
         return testsToTriggerBySearchQuery;
     }
-    const suitesFromFiles = (yield Promise.all(config.files.map((glob) => utils_1.getSuites(glob, reporter))))
+    const suitesFromFiles = (yield Promise.all(config.files.map((glob) => utils_2.getSuites(glob, reporter))))
         .reduce((acc, val) => acc.concat(val), [])
         .filter((suite) => !!suite.content.tests);
     suites.push(...suitesFromFiles);

package/dist/commands/synthetics/run-test.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-test.js","sourceRoot":"","sources":["../../../src/commands/synthetics/run-test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run-test.js","sourceRoot":"","sources":["../../../src/commands/synthetics/run-test.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAiD;AAEjD,+BAA+D;AAC/D,uCAA8C;AAC9C,qCAA+C;AAc/C,iDAAqD;AACrD,qCAA+B;AAC/B,mCAA8F;AAEvF,MAAM,YAAY,GAAG,CAC1B,QAAsB,EACtB,MAAqB,EACrB,MAAgB,EAIf,EAAE;IACH,MAAM,GAAG,GAAG,kBAAY,CAAC,MAAM,CAAC,CAAA;IAEhC,MAAM,gBAAgB,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;;QAAC,OAAA,CAAC;YACrD,MAAM,kCACD,MAAM,CAAC,MAAM,GACb,CAAC,CAAA,MAAA,MAAM,CAAC,SAAS,0CAAE,MAAM,EAAC,CAAC,CAAC,EAAC,SAAS,EAAE,MAAM,CAAC,SAAS,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CACnE;YACD,EAAE;SACH,CAAC,CAAA;KAAA,CAAC,CAAA;IACH,IAAI,cAA+B,CAAA;IACnC,IAAI,MAA0B,CAAA;IAE9B,MAAM,UAAU,GAAG,GAAS,EAAE;QAC5B,IAAI,MAAM,EAAE;YACV,MAAM,MAAM,CAAC,IAAI,EAAE,CAAA;SACpB;IACH,CAAC,CAAA,CAAA;IAED,IAAI,gBAAgB,CAAC,MAAM,EAAE;QAC3B,cAAc,GAAG,gBAAgB,CAAA;KAClC;SAAM;QACL,IAAI;YACF,cAAc,GAAG,MAAM,oBAAY,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;SACnE;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,sBAAa,CACrB,sBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,yBAAyB,EAC3E,KAAK,CAAC,OAAO,CACd,CAAA;SACF;KACF;IAED,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE;QAC1B,MAAM,IAAI,gBAAO,CAAC,iBAAiB,CAAC,CAAA;KACrC;IAED,IAAI,oBAIH,CAAA;IAED,IAAI;QACF,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC,eAAe,CAAA;QAClD,oBAAoB,GAAG,MAAM,yBAAiB,CAC5C,GAAG,EACH,cAAc,EACd,QAAQ,EACR,iBAAiB,EACjB,MAAM,CAAC,kBAAkB,CAC1B,CAAA;KACF;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,KAAK,YAAY,gBAAO,EAAE;YAC5B,MAAM,KAAK,CAAA;SACZ;QAED,MAAM,IAAI,sBAAa,CAAC,sBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,yBAAyB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;KACpH;IAED,MAAM,EAAC,KAAK,EAAE,wBAAwB,EAAE,cAAc,EAAC,GAAG,oBAAoB,CAAA;IAE9E,8CAA8C;IAC9C,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;QACjB,MAAM,IAAI,gBAAO,CAAC,iBAAiB,CAAC,CAAA;KACrC;IAED,MAAM,kBAAkB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,EAAC,SAAS,EAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAA;IAEhE,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,IAAI,YAAoB,CAAA;QACxB,IAAI;YACF,0DAA0D;YAC1D,YAAY,GAAG,CAAC,MAAM,GAAG,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,CAAC,CAAC,GAAG,CAAA;SACzE;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,sBAAa,CAAC,2BAA2B,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;SACpE;QACD,2BAA2B;QAC3B,IAAI;YACF,MAAM,gBAAgB,GAAG,qBAAa,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACpD,MAAM,cAAc,GAAG,2BAAiB,CAAC,QAAQ,CAAC,CAAA;YAClD,MAAM,GAAG,IAAI,eAAM,CAAC,YAAY,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAA;YAEvF,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,KAAK,EAAE,CAAA;YACvC,wBAAwB,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;gBACjD,aAAa,CAAC,MAAM,GAAG,UAAU,CAAA;YACnC,CAAC,CAAC,CAAA;SACH;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,UAAU,EAAE,CAAA;YAClB,MAAM,IAAI,sBAAa,CAAC,qBAAqB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;SAC9D;KACF;IAED,IAAI,OAAgB,CAAA;IACpB,IAAI;QACF,OAAO,GAAG,MAAM,gBAAQ,CAAC,GAAG,EAAE,wBAAwB,CAAC,CAAA;KACxD;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,UAAU,EAAE,CAAA;QAClB,MAAM,IAAI,sBAAa,CAAC,sBAAsB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;KAC/D;IAED,IAAI;QACF,MAAM,iBAAiB,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,CAAC,CAAC,CAAA;QAClH,MAAM,OAAO,GAAG,MAAM,sBAAc,CAClC,GAAG,EACH,OAAO,EACP,KAAK,EACL;YACE,oBAAoB,EAAE,MAAM,CAAC,oBAAoB;YACjD,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,iBAAiB;SAClB,EACD,QAAQ,EACR,MAAM,CACP,CAAA;QAED,OAAO;YACL,OAAO;YACP,OAAO,kCACF,cAAc,KACjB,OAAO,EAAE,OAAO,CAAC,QAAQ,GAC1B;SACF,CAAA;KACF;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,IAAI,sBAAa,CAAC,qBAAqB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;KAC9D;YAAS;QACR,MAAM,UAAU,EAAE,CAAA;KACnB;AACH,CAAC,CAAA,CAAA;AAtIY,QAAA,YAAY,gBAsIxB;AAED,MAAM,wBAAwB,GAAG,CAC/B,GAAc,EACd,oBAAwC,EACxC,eAAuB,EACvB,EAAE;IACF,MAAM,iBAAiB,GAAG,MAAM,GAAG,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;IAEhE,OAAO,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC5C,MAAM,EAAE,oBAAoB;QAC5B,EAAE,EAAE,IAAI,CAAC,SAAS;QAClB,KAAK,EAAE,UAAU,eAAe,EAAE;KACnC,CAAC,CAAC,CAAA;AACL,CAAC,CAAA,CAAA;AAEM,MAAM,YAAY,GAAG,CAC1B,GAAc,EACd,MAA0B,EAC1B,QAAsB,EACtB,SAAkB,EAAE,EACpB,EAAE;;IACF,kEAAkE;IAClE,IAAI,MAAM,CAAC,eAAe,EAAE;QAC1B,MAAM,2BAA2B,GAAG,MAAM,wBAAwB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC,CAAA;QAE9G,IAAI,2BAA2B,CAAC,MAAM,GAAG,8BAAoB,EAAE;YAC7D,QAAQ,CAAC,KAAK,CACZ,aAAa,8BAAoB,mDAAmD,8BAAoB,qBAAqB,CAC9H,CAAA;SACF;QAED,OAAO,2BAA2B,CAAA;KACnC;IAED,MAAM,eAAe,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,iBAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;SACvG,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;SACzC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAE3C,MAAM,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,CAAA;IAE/B,MAAM,qBAAqB,GAAG,CAAA,MAAA,MAAM,CAAC,SAAS,0CAAE,MAAM,EAAC,CAAC,CAAC,EAAC,SAAS,EAAE,MAAM,CAAC,SAAS,EAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAE3F,MAAM,kBAAkB,GAAG,CAAC,IAAmB,EAAsB,EAAE;IACrE,6BAA6B;IAC7B,+CACK,MAAM,CAAC,MAAM,GACb,qBAAqB,GACrB,IAAI,CAAC,MAAM,EACd,CAAA;IAEJ,MAAM,cAAc,GAAG,MAAM;SAC1B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACb,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACjC,MAAM,EAAE,kBAAkB,CAAC,IAAI,CAAC;QAChC,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,KAAK,EAAE,KAAK,CAAC,IAAI;KAClB,CAAC,CAAC,CACJ;SACA,MAAM,CAAC,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC,CAAA;IAE1D,OAAO,cAAc,CAAA;AACvB,CAAC,CAAA,CAAA;AA9CY,QAAA,YAAY,gBA8CxB"}

package/dist/commands/synthetics/tunnel/crypto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/tunnel/crypto.ts"],"names":[],"mappings":";;;AAAA,mCAA0C;AAE1C,+BAA0B;AAE1B,iCAA+C;AAE/C,yFAAyF;AAClF,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,MAAM,MAAM,GAAG,KAAK,CAAA;IACpB,MAAM,EAAC,SAAS,EAAE,UAAU,EAAC,GAAG,4BAAmB,CAAC,IAAI,EAAE;QACxD,UAAU,EAAE,OAAO;QACnB,kBAAkB,EAAE;YAClB,MAAM;YACN,IAAI,EAAE,OAAO;SACd;QACD,iBAAiB,EAAE;YACjB,MAAM;YACN,IAAI,EAAE,MAAM;SACb;KACF,CAAC,CAAA;IACF,MAAM,gBAAgB,GAAG,gBAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;IAC1F,MAAM,iBAAiB,GAAG,uBAAe,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;IAEnG,OAAO;QACL,UAAU,EAAE,iBAAiB;QAC7B,SAAS,EAAE,gBAAgB;KAC5B,CAAA;AACH,CAAC,CAAA;AApBY,QAAA,mBAAmB,uBAoB/B;AAED,gCAAgC;AACzB,MAAM,WAAW,GAAG,CAAC,GAAW,EAAa,EAAE;IACpD,MAAM,SAAS,GAAG,YAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;IAErC,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,eAAe,GAAG,EAAE,CAAC,CAAA;KACtC;IAED,IAAI,SAAS,YAAY,KAAK,EAAE;QAC9B,MAAM,SAAS,CAAA;KAChB;IAED,IAAI,SAAS,YAAY,KAAK,EAAE;QAC9B,mFAAmF;QACnF,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,eAAe,GAAG,EAAE,CAAC,CAAA;SACtC;QAED,OAAO,SAAS,CAAC,CAAC,CAAC,CAAA;KACpB;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AArBY,QAAA,WAAW,eAqBvB"}

package/dist/commands/synthetics/tunnel/index.d.ts

@@ -0,0 +1 @@
+export { Tunnel, TunnelInfo, TunnelReporter } from './tunnel';

package/dist/commands/synthetics/tunnel/index.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Tunnel = void 0;
+var tunnel_1 = require("./tunnel");
+Object.defineProperty(exports, "Tunnel", { enumerable: true, get: function () { return tunnel_1.Tunnel; } });
+//# sourceMappingURL=index.js.map

package/dist/commands/synthetics/tunnel/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/tunnel/index.ts"],"names":[],"mappings":";;;AAAA,mCAA2D;AAAnD,gGAAA,MAAM,OAAA"}

package/dist/commands/synthetics/{tunnel.d.ts → tunnel/tunnel.d.ts}

@@ -1,25 +1,27 @@
-import { ProxyConfiguration } from '../../helpers/utils';
-import { MainReporter } from './interfaces';
+import type ProxyAgent from 'proxy-agent';
 export interface TunnelInfo {
     host: string;
     id: string;
     privateKey: string;
 }
+export interface TunnelReporter {
+    error(message: string): void;
+    log(message: string): void;
+    warn(message: string): void;
+}
 export declare class Tunnel {
     private url;
     private testIDs;
-    private connected;
-    private forwardedSockets;
+    private reporter?;
     private FORWARDING_TIMEOUT;
-    private log;
-    private logError;
-    private logWarning;
-    private multiplexer?;
+    private sshConfig;
     private privateKey;
     private publicKey;
-    private sshConfig;
+    private connected;
     private ws;
-    constructor(url: string, testIDs: string[], proxy: ProxyConfiguration, reporter: MainReporter);
+    private multiplexer?;
+    private forwardedSockets;
+    constructor(url: string, testIDs: string[], proxyAgent?: ReturnType<typeof ProxyAgent>, reporter?: TunnelReporter | undefined);
     /**
      * keepAlive will return a promise that tracks the state of the tunnel (and reject in case of error)
      */

package/dist/commands/synthetics/{tunnel.js → tunnel/tunnel.js}

@@ -8,33 +8,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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.Tunnel = void 0;
 const crypto_1 = require("crypto");
 const net_1 = require("net");
 const stream_1 = require("stream");
-const chalk_1 = __importDefault(require("chalk"));
 const ssh2_1 = require("ssh2");
 const yamux_js_1 = require("yamux-js");
-// tslint:disable-next-line:no-var-requires - SW-1310
-const { KexInit } = require('ssh2/lib/protocol/kex');
-// tslint:disable-next-line:no-var-requires - SW-1310
-const SSH_CONSTANTS = require('ssh2/lib/protocol/constants');
 const crypto_2 = require("./crypto");
 const websocket_1 = require("./websocket");
+// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires -- SW-1310
+const SSH_CONSTANTS = require('ssh2/lib/protocol/constants');
+// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires -- SW-1310
+const { KexInit } = require('ssh2/lib/protocol/kex');
 class Tunnel {
-    constructor(url, testIDs, proxy, reporter) {
+    constructor(url, testIDs, proxyAgent, reporter) {
         this.url = url;
         this.testIDs = testIDs;
+        this.reporter = reporter;
+        this.FORWARDING_TIMEOUT = 40000;
         this.connected = false;
         this.forwardedSockets = new Set();
-        this.FORWARDING_TIMEOUT = 40000;
-        this.log = (message) => reporter.log(`[${chalk_1.default.bold.blue('Tunnel')}] ${message}\n`);
-        this.logError = (message) => reporter.error(`[${chalk_1.default.bold.red('Tunnel')}] ${message}\n`);
-        this.logWarning = (message) => reporter.log(`[${chalk_1.default.bold.yellow('Tunnel')}] ${message}\n`);
         // Setup SSH
         const { privateKey: hostPrivateKey } = crypto_2.generateOpenSSHKeys();
         const parsedHostPrivateKey = crypto_2.parseSSHKey(hostPrivateKey);
@@ -49,14 +43,14 @@ class Tunnel {
             highWaterMark: 255 * 1024,
             hostKeys: [hostPrivateKey],
         };
-        this.ws = new websocket_1.WebSocket(this.url, proxy);
+        this.ws = new websocket_1.WebSocket(this.url, proxyAgent);
     }
     /**
      * keepAlive will return a promise that tracks the state of the tunnel (and reject in case of error)
      */
     keepAlive() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.ws || !this.ws.keepAlive()) {
+            if (!this.ws) {
                 throw new Error('No WebSocket connection');
             }
             return this.ws.keepAlive();
@@ -69,9 +63,10 @@ class Tunnel {
      *   - establish a WebSocket connection to the tunnel service
      */
     start() {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            this.log(`Opening tunnel for ${chalk_1.default.bold.dim(...this.testIDs)}…`);
-            this.log('Generating encryption key, setting up SSH and opening WebSocket connection…');
+            (_a = this.reporter) === null || _a === void 0 ? void 0 : _a.log(`Opening tunnel for ${this.testIDs.length} tests…`);
+            (_b = this.reporter) === null || _b === void 0 ? void 0 : _b.log('Generating encryption key, setting up SSH and opening WebSocket connection…');
             try {
                 // Establish a WebSocket connection to the tunnel service
                 yield this.ws.connect();
@@ -80,7 +75,7 @@ class Tunnel {
                 return connectionInfo;
             }
             catch (err) {
-                this.logError('Tunnel setup failed, cleaning up and exiting…');
+                (_c = this.reporter) === null || _c === void 0 ? void 0 : _c.error('Tunnel setup failed, cleaning up and exiting…');
                 yield this.stop(); // Clean up
                 throw err;
             }
@@ -90,8 +85,9 @@ class Tunnel {
      * stop the tunnel
      */
     stop() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.log('Shutting down tunnel…');
+            (_a = this.reporter) === null || _a === void 0 ? void 0 : _a.log('Shutting down tunnel…');
             this.forwardedSockets.forEach((socket) => {
                 if (!!socket) {
                     socket.destroy();
@@ -105,6 +101,7 @@ class Tunnel {
     }
     // Authenticate SSH with key authentication - username should be the test ID
     authenticateSSHConnection(ctx) {
+        var _a;
         const allowedUsers = this.testIDs.map((testId) => Buffer.from(testId));
         // Ensure username is allowed
         const user = Buffer.from(ctx.username);
@@ -131,7 +128,7 @@ class Tunnel {
         if (!this.connected) {
             // Limit to one log per tunnel
             this.connected = true;
-            this.log('Successfully connected');
+            (_a = this.reporter) === null || _a === void 0 ? void 0 : _a.log('Successfully connected');
         }
         ctx.accept();
     }
@@ -150,7 +147,8 @@ class Tunnel {
             dest.setTimeout(this.FORWARDING_TIMEOUT);
             this.forwardedSockets.add(dest);
             dest.on('timeout', () => {
-                this.logWarning(`Connection timeout (${destIP})`);
+                var _a;
+                (_a = this.reporter) === null || _a === void 0 ? void 0 : _a.warn(`Connection timeout (${destIP})`);
                 if (src) {
                     src.destroy();
                 }
@@ -174,16 +172,17 @@ class Tunnel {
                 });
             });
             dest.on('error', (error) => {
+                var _a, _b, _c;
                 if (src) {
-                    this.logWarning(`Error on opened connection (${destIP}): ${error.code}`);
+                    (_a = this.reporter) === null || _a === void 0 ? void 0 : _a.warn(`Error on opened connection (${destIP}): ${error.code}`);
                     src.close();
                 }
                 else {
                     if ('code' in error && error.code === 'ENOTFOUND') {
-                        this.logWarning(`Unable to resolve host (${destIP})`);
+                        (_b = this.reporter) === null || _b === void 0 ? void 0 : _b.warn(`Unable to resolve host (${destIP})`);
                     }
                     else {
-                        this.logWarning(`Connection error (${destIP}): ${error.code}`);
+                        (_c = this.reporter) === null || _c === void 0 ? void 0 : _c.warn(`Connection error (${destIP}): ${error.code}`);
                     }
                     reject();
                     this.forwardedSockets.delete(dest);
@@ -209,9 +208,10 @@ class Tunnel {
         });
     }
     forwardWebSocketToSSH() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const connectionInfo = yield this.getConnectionInfo();
-            this.log(`Websocket connection to tunnel ${connectionInfo.id} opened, proxy is ready!`);
+            (_a = this.reporter) === null || _a === void 0 ? void 0 : _a.log(`Websocket connection to tunnel ${connectionInfo.id} opened, proxy is ready!`);
             // Stop any existing multiplexing
             if (this.multiplexer) {
                 this.multiplexer.close();
@@ -225,22 +225,25 @@ class Tunnel {
             };
             this.multiplexer = new yamux_js_1.Server((stream) => {
                 stream.on('error', (error) => {
-                    this.logError(`Error in multiplexing: ${error}`);
+                    var _a;
+                    (_a = this.reporter) === null || _a === void 0 ? void 0 : _a.error(`Error in multiplexing: ${error}`);
                 });
-                this.processSSHStream(stream);
+                void this.processSSHStream(stream);
             }, multiplexerConfig);
             // Pipe WebSocket to multiplexing
             const duplex = this.ws.duplex();
-            this.multiplexer.on('error', (error) => this.logError(`Multiplexer error: ${error.message}`));
-            duplex.on('error', (error) => this.logError(`Websocket error: ${error.message}`));
+            this.multiplexer.on('error', (error) => { var _a; return (_a = this.reporter) === null || _a === void 0 ? void 0 : _a.error(`Multiplexer error: ${error.message}`); });
+            duplex.on('error', (error) => { var _a; return (_a = this.reporter) === null || _a === void 0 ? void 0 : _a.error(`Websocket error: ${error.message}`); });
             stream_1.pipeline([duplex, this.multiplexer], (err) => {
+                var _a;
                 if (err) {
-                    this.logWarning(`Error on duplex connection close: ${err}`);
+                    (_a = this.reporter) === null || _a === void 0 ? void 0 : _a.warn(`Error on duplex connection close: ${err}`);
                 }
             });
             stream_1.pipeline([this.multiplexer, duplex], (err) => {
+                var _a;
                 if (err) {
-                    this.logWarning(`Error on Multiplexer connection close: ${err}`);
+                    (_a = this.reporter) === null || _a === void 0 ? void 0 : _a.warn(`Error on Multiplexer connection close: ${err}`);
                 }
             });
             return connectionInfo;
@@ -291,7 +294,8 @@ class Tunnel {
                 server.close();
             })
                 .on('error', (err) => {
-                this.logError(`SSH error in proxy: ${err.message}`);
+                var _a;
+                (_a = this.reporter) === null || _a === void 0 ? void 0 : _a.error(`SSH error in proxy: ${err.message}`);
             });
         });
     }

package/dist/commands/synthetics/tunnel/tunnel.js.map

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

package/dist/commands/synthetics/{websocket.d.ts → tunnel/websocket.d.ts}

@@ -1,14 +1,14 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
+import type ProxyAgent from 'proxy-agent';
 import { default as WebSocketModule } from 'ws';
-import { ProxyConfiguration } from '../../helpers/utils';
 export declare class WebSocket extends EventEmitter {
     private url;
-    private proxyOpts;
+    private proxyAgent;
     private firstMessage?;
     private keepAliveWebsocket?;
     private websocket?;
-    constructor(url: string, proxyOpts: ProxyConfiguration);
+    constructor(url: string, proxyAgent: ReturnType<typeof ProxyAgent> | undefined);
     /**
      * close will terminate the WebSocket connection
      */

package/dist/commands/synthetics/{websocket.js → tunnel/websocket.js}

@@ -31,12 +31,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocket = void 0;
 const events_1 = require("events");
 const ws_1 = __importStar(require("ws"));
-const utils_1 = require("../../helpers/utils");
 class WebSocket extends events_1.EventEmitter {
-    constructor(url, proxyOpts) {
+    constructor(url, proxyAgent) {
         super();
         this.url = url;
-        this.proxyOpts = proxyOpts;
+        this.proxyAgent = proxyAgent;
     }
     /**
      * close will terminate the WebSocket connection
@@ -118,11 +117,9 @@ class WebSocket extends events_1.EventEmitter {
     }
     establishWebsocketConnection(resolve, reject) {
         if (!this.websocket) {
-            const options = {};
-            const proxyAgent = utils_1.getProxyAgent(this.proxyOpts);
-            if (proxyAgent) {
-                options.agent = proxyAgent;
-            }
+            const options = {
+                agent: this.proxyAgent,
+            };
             this.websocket = new ws_1.default(this.url, options);
         }
         this.firstMessage = new Promise((firstMessageResolve, firstMessageReject) => {

package/dist/commands/synthetics/tunnel/websocket.js.map

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

package/dist/commands/synthetics/utils.js

@@ -33,14 +33,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluralize = exports.getDatadogHost = exports.renderResults = exports.sortResultsByOutcome = exports.getResultUrl = exports.getBatchUrl = exports.getAppBaseURL = exports.parseVariablesFromCli = exports.retry = exports.fetchTest = exports.runTests = exports.getTestsToTrigger = exports.isDeviceIdSet = exports.getTestAndOverrideConfig = exports.getReporter = exports.getResultDuration = exports.createInitialSummary = exports.waitForResults = exports.wait = exports.getFilePathRelativeToRepo = exports.getSuites = exports.getResultOutcome = exports.hasResultPassed = exports.getStrictestExecutionRule = exports.getExecutionRule = exports.setCiTriggerApp = exports.getOverriddenConfig = exports.ciTriggerApp = exports.readableOperation = void 0;
 const child_process_1 = require("child_process");
-const deep_extend_1 = __importDefault(require("deep-extend"));
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const url_1 = require("url");
+const process_1 = __importDefault(require("process"));
 const util_1 = require("util");
 const chalk_1 = __importDefault(require("chalk"));
+const deep_extend_1 = __importDefault(require("deep-extend"));
 const glob_1 = __importDefault(require("glob"));
-const process_1 = __importDefault(require("process"));
 const ci_1 = require("../../helpers/ci");
 const tags_1 = require("../../helpers/tags");
 const utils_1 = require("../../helpers/utils");
@@ -51,7 +50,6 @@ const interfaces_1 = require("./interfaces");
 const mobile_1 = require("./mobile");
 const POLLING_INTERVAL = 5000; // In ms
 const PUBLIC_ID_REGEX = /^[\d\w]{3}-[\d\w]{3}-[\d\w]{3}$/;
-const SUBDOMAIN_REGEX = /(.*?)\.(?=[^\/]*\..{2,5})/;
 const TEMPLATE_REGEX = /{{\s*([^{}]*?)\s*}}/g;
 exports.readableOperation = {
     [interfaces_1.Operator.contains]: 'should contain',
@@ -98,11 +96,7 @@ const getOverriddenConfig = (test, publicId, reporter, config) => {
         'variables',
     ]));
     if ((test.type === 'browser' || test.subtype === 'http') && config.startUrl) {
-        const context = parseUrlVariables(test.config.request.url, reporter);
-        if (URL_VARIABLES.some((v) => { var _a; return (_a = config.startUrl) === null || _a === void 0 ? void 0 : _a.includes(v); })) {
-            reporter.error('[DEPRECATION] The usage of URL variables is deprecated, see explanation in the README\n\n');
-        }
-        overriddenConfig.startUrl = template(config.startUrl, context);
+        overriddenConfig.startUrl = template(config.startUrl, Object.assign({}, process_1.default.env));
     }
     return overriddenConfig;
 };
@@ -111,56 +105,6 @@ const setCiTriggerApp = (source) => {
     exports.ciTriggerApp = source;
 };
 exports.setCiTriggerApp = setCiTriggerApp;
-const parseUrlVariables = (url, reporter) => {
-    const context = Object.assign(Object.assign({}, process_1.default.env), { URL: url });
-    let objUrl;
-    try {
-        objUrl = new url_1.URL(url);
-    }
-    catch (_a) {
-        reporter.error(`The start url ${url} contains variables, CI overrides will be ignored\n`);
-        return context;
-    }
-    warnOnReservedEnvVarNames(context, reporter);
-    const subdomainMatch = objUrl.hostname.match(SUBDOMAIN_REGEX);
-    const domain = subdomainMatch ? objUrl.hostname.replace(`${subdomainMatch[1]}.`, '') : objUrl.hostname;
-    context.DOMAIN = domain;
-    context.HASH = objUrl.hash;
-    context.HOST = objUrl.host;
-    context.HOSTNAME = objUrl.hostname;
-    context.ORIGIN = objUrl.origin;
-    context.PARAMS = objUrl.search;
-    context.PATHNAME = objUrl.pathname;
-    context.PORT = objUrl.port;
-    context.PROTOCOL = objUrl.protocol;
-    context.SUBDOMAIN = subdomainMatch ? subdomainMatch[1] : undefined;
-    return context;
-};
-const URL_VARIABLES = [
-    'DOMAIN',
-    'HASH',
-    'HOST',
-    'HOSTNAME',
-    'ORIGIN',
-    'PARAMS',
-    'PATHNAME',
-    'PORT',
-    'PROTOCOL',
-    'SUBDOMAIN',
-];
-const warnOnReservedEnvVarNames = (context, reporter) => {
-    const reservedVarNames = new Set(URL_VARIABLES);
-    const usedEnvVarNames = Object.keys(context).filter((name) => reservedVarNames.has(name));
-    if (usedEnvVarNames.length > 0) {
-        const names = usedEnvVarNames.join(', ');
-        const plural = usedEnvVarNames.length > 1;
-        reporter.log(`Detected ${names} environment variable${plural ? 's' : ''}. ${names} ${plural ? 'are' : 'is a'} Datadog ` +
-            `reserved variable${plural ? 's' : ''} used to parse your original test URL, read more about it on ` +
-            'our documentation https://docs.datadoghq.com/synthetics/ci/?tab=apitest#start-url. ' +
-            'If you want to override your startUrl parameter using environment variables, ' +
-            `use ${plural ? '' : 'a '}different namespace${plural ? 's' : ''}.\n\n`);
-    }
-};
 const getExecutionRule = (test, configOverride) => {
     var _a, _b, _c, _d;
     if (configOverride && configOverride.executionRule) {
@@ -334,7 +278,10 @@ const waitForResults = (api, trigger, tests, options, reporter, tunnel) => __awa
         return hasTunnel ? 'Tunneled' : locationNames[dcId] || dcId;
     };
     const pollResultMap = yield getPollResultMap(api, batch);
-    const results = batch.results.map((resultInBatch) => getResultFromBatch(getLocation, hasExceededMaxPollingDate, options.failOnCriticalErrors, options.failOnTimeout, pollResultMap, resultInBatch, tests));
+    const results = batch.results.map((resultInBatch) => {
+        var _a, _b;
+        return getResultFromBatch(getLocation, hasExceededMaxPollingDate, (_a = options.failOnCriticalErrors) !== null && _a !== void 0 ? _a : false, (_b = options.failOnTimeout) !== null && _b !== void 0 ? _b : false, pollResultMap, resultInBatch, tests);
+    });
     return results;
 });
 exports.waitForResults = waitForResults;
@@ -432,6 +379,7 @@ const getReporter = (reporters) => ({
 });
 exports.getReporter = getReporter;
 const getTest = (api, { id, suite }) => __awaiter(void 0, void 0, void 0, function* () {
+    var _d;
     try {
         const test = Object.assign(Object.assign({}, (yield api.getTest(id))), { suite });
         return { test };
@@ -441,7 +389,7 @@ const getTest = (api, { id, suite }) => __awaiter(void 0, void 0, void 0, functi
             const errorMessage = api_1.formatBackendErrors(error);
             return { errorMessage: `[${chalk_1.default.bold.dim(id)}] ${chalk_1.default.yellow.bold('Test not found')}: ${errorMessage}` };
         }
-        throw error;
+        throw new api_1.EndpointError(`Failed to get test: ${api_1.formatBackendErrors(error)}\n`, (_d = error.response) === null || _d === void 0 ? void 0 : _d.status);
     }
 });
 const getTestAndOverrideConfig = (api, { config, id, suite }, reporter, summary) => __awaiter(void 0, void 0, void 0, function* () {
@@ -521,7 +469,7 @@ const getTestsToTrigger = (api, triggerConfigs, reporter, triggerFromSearch, fai
 });
 exports.getTestsToTrigger = getTestsToTrigger;
 const runTests = (api, testsToTrigger) => __awaiter(void 0, void 0, void 0, function* () {
-    var _d;
+    var _e;
     const payload = { tests: testsToTrigger };
     const tagsToLimit = {
         [tags_1.GIT_COMMIT_MESSAGE]: 500,
@@ -537,7 +485,7 @@ const runTests = (api, testsToTrigger) => __awaiter(void 0, void 0, void 0, func
         const errorMessage = api_1.formatBackendErrors(e);
         const testIds = testsToTrigger.map((t) => t.public_id).join(',');
         // Rewrite error message
-        throw new api_1.EndpointError(`[${testIds}] Failed to trigger tests: ${errorMessage}\n`, (_d = e.response) === null || _d === void 0 ? void 0 : _d.status);
+        throw new api_1.EndpointError(`[${testIds}] Failed to trigger tests: ${errorMessage}\n`, (_e = e.response) === null || _e === void 0 ? void 0 : _e.status);
     }
 });
 exports.runTests = runTests;