@datadog/datadog-ci 3.3.1 → 3.5.0

package/dist/commands/synthetics/build-and-test.js

@@ -12,91 +12,185 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.spawnBuildPluginDevServer = exports.UnconfiguredBuildPluginError = exports.DEFAULT_BUILD_PLUGIN_PORT = void 0;
+exports.buildAssets = exports.MalformedBuildError = exports.UnconfiguredBuildPluginError = void 0;
 const child_process_1 = require("child_process");
 const events_1 = require("events");
-const axios_1 = __importDefault(require("axios"));
-const internal_1 = require("./utils/internal");
-exports.DEFAULT_BUILD_PLUGIN_PORT = 4000;
+const fs_1 = require("fs");
+const http_1 = __importDefault(require("http"));
+const upath_1 = __importDefault(require("upath"));
+const REPORT_BUILD_PATHNAME = '/_datadog-ci_/build';
 exports.UnconfiguredBuildPluginError = new Error(`
 We couldn't detect the Datadog Build plugins within your build. Did you add it?
 If not, you can learn more about it here: https://github.com/DataDog/build-plugins#readme
 `);
-const watchBuildPluginServerReadiness = (buildPluginServerUrl, abortSignal) => __awaiter(void 0, void 0, void 0, function* () {
-    return (0, internal_1.poll)(() => __awaiter(void 0, void 0, void 0, function* () {
-        try {
-            const response = yield axios_1.default.get(buildPluginServerUrl, { signal: abortSignal });
-            const { status, publicPrefix = '' } = response.data;
-            if (status === 'success') {
+exports.MalformedBuildError = new Error(`Invalid payload. Expected payload is {\"outputDirectory\": string, \"publicPath\": string}`);
+const MIME_TYPES = {
+    default: 'application/octet-stream',
+    html: 'text/html; charset=UTF-8',
+    js: 'application/javascript',
+    css: 'text/css',
+    png: 'image/png',
+    jpg: 'image/jpg',
+    gif: 'image/gif',
+    ico: 'image/x-icon',
+    svg: 'image/svg+xml',
+};
+const isMIMEType = (mime) => {
+    return Object.keys(MIME_TYPES).includes(mime);
+};
+const routeVerbs = ['get', 'post', 'put', 'patch', 'delete'];
+const isRouteVerb = (verb) => {
+    return routeVerbs.includes(verb);
+};
+const fileExists = (filePath) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        yield fs_1.promises.access(filePath);
+        return true;
+    }
+    catch (_a) {
+        return false;
+    }
+});
+const prepareFile = (root = process.cwd(), builds, requestUrl) => __awaiter(void 0, void 0, void 0, function* () {
+    const staticPath = upath_1.default.isAbsolute(root) ? root : upath_1.default.resolve(process.cwd(), root);
+    for (const build of builds) {
+        if (requestUrl.startsWith(build.publicPath)) {
+            const url = new URL(requestUrl, 'http://127.0.0.1');
+            const filePath = upath_1.default.join(upath_1.default.resolve(staticPath, build.outputDirectory), // absolute path to the assets directory
+            upath_1.default.relative(build.publicPath, url.pathname), // relative path to the file
+            url.pathname.endsWith('/') ? 'index.html' : '' // add index.html if the path ends with a slash
+            );
+            // Verify path is within the intended directory
+            const directDescendant = filePath.startsWith(upath_1.default.resolve(staticPath, build.outputDirectory));
+            // Check if the file exists (only if it's withing the intended directory)
+            const found = directDescendant && (yield fileExists(filePath));
+            if (directDescendant && found) {
                 return {
-                    readiness: 'buildCommandReady',
-                    publicPrefix,
+                    found: true,
+                    ext: upath_1.default.extname(filePath).substring(1).toLowerCase(),
+                    content: yield fs_1.promises.readFile(filePath, { encoding: 'utf-8' }),
                 };
             }
         }
-        catch (error) {
-            // If we got an http error with a response, return buildCommandErrored
-            if (axios_1.default.isAxiosError(error) && error.code !== 'ECONNREFUSED' && error.response) {
-                return {
-                    readiness: 'buildCommandErrored',
-                    error: new Error(`Dev server returned error: ${error.response.status} ${error.response.statusText}`),
-                };
+    }
+    return {
+        found: false,
+    };
+});
+const getRequestHandler = ({ builds, root, routes }) => (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+    var _b, _c;
+    try {
+        // Handle routes.
+        const route = routes === null || routes === void 0 ? void 0 : routes[req.url || '/'];
+        if (route) {
+            const verb = (_c = (_b = req.method) === null || _b === void 0 ? void 0 : _b.toLowerCase()) !== null && _c !== void 0 ? _c : '';
+            if (isRouteVerb(verb)) {
+                const handler = route[verb];
+                if (handler) {
+                    yield handler(req, res);
+                    return;
+                }
             }
-            // Otherwise ignore errors and continue polling in case the dev server is still starting
         }
-    }), abortSignal);
+        // Fallback to files.
+        const file = yield prepareFile(root, builds, req.url || '/');
+        if (file.found) {
+            const mimeType = isMIMEType(file.ext) ? MIME_TYPES[file.ext] : MIME_TYPES.default;
+            res.writeHead(200, { 'Content-Type': mimeType });
+            res.end(file.content);
+            return;
+        }
+        res.writeHead(404);
+        res.end();
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        res.writeHead(500, { 'Content-Type': MIME_TYPES.html });
+        res.end(`Internal Server Error: ${errorMessage}`);
+    }
 });
-const watchBuildCommandExit = (buildCommand) => __awaiter(void 0, void 0, void 0, function* () {
-    yield (0, events_1.once)(buildCommand, 'close');
-    return {
-        readiness: 'buildCommandExited',
-    };
+const getRequestBody = (req) => __awaiter(void 0, void 0, void 0, function* () {
+    const chunks = [];
+    req.on('data', (chunk) => chunks.push(chunk));
+    yield (0, events_1.once)(req, 'end');
+    return chunks.join('');
 });
-const spawnBuildPluginDevServer = (buildCommand, reporter) => __awaiter(void 0, void 0, void 0, function* () {
-    const buildPluginPort = exports.DEFAULT_BUILD_PLUGIN_PORT;
+const getReportedBuild = (payload) => {
+    const reportedBuild = JSON.parse(payload);
+    if ('outputDirectory' in reportedBuild &&
+        typeof reportedBuild.outputDirectory === 'string' &&
+        'publicPath' in reportedBuild &&
+        typeof reportedBuild.publicPath === 'string') {
+        return reportedBuild;
+    }
+    throw exports.MalformedBuildError;
+};
+const spawnDevServer = () => __awaiter(void 0, void 0, void 0, function* () {
+    const builds = [];
+    const requestHandler = getRequestHandler({
+        builds,
+        root: process.cwd(),
+        routes: {
+            [REPORT_BUILD_PATHNAME]: {
+                post: (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+                    const body = yield getRequestBody(req);
+                    const reportedBuild = getReportedBuild(body);
+                    builds.push(reportedBuild);
+                    res.end();
+                }),
+            },
+        },
+    });
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    const server = http_1.default.createServer(requestHandler);
+    server.listen();
+    yield (0, events_1.once)(server, 'listening');
+    return { builds, server, url: getBuildReportUrl(server) };
+});
+const buildAssets = (buildCommand, reporter) => __awaiter(void 0, void 0, void 0, function* () {
+    var _d, _e, _f, _g;
+    const { builds, server, url } = yield spawnDevServer();
     // Spawn the build command process with the BUILD_PLUGINS_S8S_PORT environment variable.
     const buildCommandProcess = (0, child_process_1.spawn)(buildCommand, [], {
-        env: { BUILD_PLUGINS_S8S_PORT: String(buildPluginPort) },
-        shell: true,
+        env: Object.assign({ DATADOG_SYNTHETICS_REPORT_BUILD_URL: url }, process.env),
+        shell: (_e = (_d = process.env.SHELL) !== null && _d !== void 0 ? _d : process.env.ComSpec) !== null && _e !== void 0 ? _e : true,
     });
-    // Wait for the build command to either exit, or provide a dev server serving the built assets.
-    const controller = new AbortController(); // used to abort the watcher and its http requests
-    const buildCommandExited = watchBuildCommandExit(buildCommandProcess);
-    const buildCommandReady = watchBuildPluginServerReadiness('http://localhost:' + String(buildPluginPort) + '/_datadog-ci_/build-status', controller.signal);
-    const buildCommandReturnValue = yield Promise.race([
-        buildCommandReady,
-        buildCommandExited,
-    ]);
-    controller.abort();
-    if (buildCommandReturnValue === undefined) {
-        yield killBuildCommand(buildCommandProcess, buildCommandExited);
-        throw new Error('Unexpected state: buildCommandReturnValue is undefined');
-    }
-    if (buildCommandReturnValue.readiness === 'buildCommandExited') {
-        reporter.error(exports.UnconfiguredBuildPluginError.message);
-        yield killBuildCommand(buildCommandProcess, buildCommandExited);
+    (_f = buildCommandProcess.stdout) === null || _f === void 0 ? void 0 : _f.pipe(process.stdout);
+    (_g = buildCommandProcess.stderr) === null || _g === void 0 ? void 0 : _g.pipe(process.stderr);
+    // Wait for the build command to finish
+    yield (0, events_1.once)(buildCommandProcess, 'close');
+    if (builds.length === 0) {
+        yield stopDevServer(server);
         throw exports.UnconfiguredBuildPluginError;
     }
-    if (buildCommandReturnValue.readiness === 'buildCommandErrored') {
-        reporter.error(buildCommandReturnValue.error.message);
-        yield killBuildCommand(buildCommandProcess, buildCommandExited);
-        throw buildCommandReturnValue.error;
-    }
-    const { publicPrefix = '' } = buildCommandReturnValue;
     // Once the build server is ready, return its URL with the advertised public prefix to run the tests against it.
     return {
-        devServerUrl: 'http://localhost:' + String(buildPluginPort),
-        publicPrefix,
-        stop: () => __awaiter(void 0, void 0, void 0, function* () { return killBuildCommand(buildCommandProcess, buildCommandExited); }),
+        builds,
+        devServerUrl: url,
+        stop: () => __awaiter(void 0, void 0, void 0, function* () { return stopDevServer(server); }),
     };
 });
-exports.spawnBuildPluginDevServer = spawnBuildPluginDevServer;
-const killBuildCommand = (buildCommandProcess, buildCommandExited) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c;
-    buildCommandProcess.kill();
-    (_a = buildCommandProcess.stdin) === null || _a === void 0 ? void 0 : _a.destroy();
-    (_b = buildCommandProcess.stdout) === null || _b === void 0 ? void 0 : _b.destroy();
-    (_c = buildCommandProcess.stderr) === null || _c === void 0 ? void 0 : _c.destroy();
-    yield buildCommandExited;
+exports.buildAssets = buildAssets;
+const getBuildReportUrl = (server) => {
+    var _a;
+    // net.Server can be listening on a named pipe, in which case the address is a string
+    // or not listening yet, in which case the address is null, which we cast to the 'undefined' string
+    // to meet the same condition as if it was a named pipe, and throw.
+    const serverAddress = (_a = server.address()) !== null && _a !== void 0 ? _a : 'undefined';
+    if (typeof serverAddress === 'string') {
+        throw new Error('Server address is not valid');
+    }
+    const url = new URL(serverAddress.family === 'IPv6'
+        ? `http://[${serverAddress.address}]:${serverAddress.port}`
+        : `http://${serverAddress.address}:${serverAddress.port}`);
+    url.pathname = REPORT_BUILD_PATHNAME;
+    return url.href;
+};
+const stopDevServer = (server) => __awaiter(void 0, void 0, void 0, function* () {
+    if (server.listening) {
+        const serverClosed = (0, events_1.once)(server, 'close');
+        server.close();
+        yield serverClosed;
+    }
 });
 //# sourceMappingURL=build-and-test.js.map

package/dist/commands/synthetics/build-and-test.js.map

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

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

@@ -2,6 +2,7 @@
 /// <reference types="node" />
 import { Metadata } from '../../helpers/interfaces';
 import { ProxyConfiguration } from '../../helpers/utils';
+import { RecursivePartial } from './base-command';
 import { TunnelInfo } from './tunnel';
 export type SupportedReporter = 'junit' | 'default';
 export interface MainReporter {
@@ -20,23 +21,26 @@ export interface MainReporter {
 }
 export type Reporter = Partial<MainReporter>;
 export interface BaseServerResult {
+    id: string;
+    status: 'passed' | 'failed' | 'skipped';
     failure?: {
         code: string;
         message: string;
     };
-    passed: boolean;
     unhealthy?: boolean;
+    finished_at: number;
 }
 export interface Device {
-    height: number;
     id: string;
-    width: number;
+    resolution: {
+        width: number;
+        height: number;
+    };
 }
 export interface BrowserServerResult extends BaseServerResult {
-    device?: Device;
     duration: number;
-    startUrl: string;
-    stepDetails: Step[];
+    start_url: string;
+    steps: Step[];
 }
 interface AssertionResult {
     actual: any;
@@ -44,21 +48,20 @@ interface AssertionResult {
     valid: boolean;
 }
 export interface ApiServerResult extends BaseServerResult {
-    assertionResults: AssertionResult[];
+    assertions: AssertionResult[];
     timings: {
         total: number;
     };
 }
 export interface MultiStep {
-    allowFailure: boolean;
-    assertionResults: AssertionResult[];
+    allow_failure: boolean;
+    assertion_results: AssertionResult[];
     failure?: {
         code: string;
         message: string;
     };
     name: string;
-    passed: boolean;
-    skipped: boolean;
+    status: 'passed' | 'failed' | 'skipped';
     subtype: string;
     timings: {
         total: number;
@@ -69,12 +72,43 @@ export interface MultiStepsServerResult extends BaseServerResult {
     steps: MultiStep[];
 }
 export type ServerResult = BrowserServerResult | ApiServerResult | MultiStepsServerResult;
-export interface PollResult {
-    check: Pick<Test, 'config' | 'subtype' | 'type'>;
+export interface RawPollResult {
+    data: {
+        id: string;
+        type: string;
+        attributes: Omit<PollResult, 'test'>;
+        relationships: {
+            test: {
+                data: {
+                    id: string;
+                    type: string;
+                };
+            };
+        };
+    }[];
+    included: {
+        type: string;
+        id: string;
+        attributes: Pick<RawPollResultTest, 'type' | 'subtype' | 'config'>;
+    }[];
+}
+export interface RawPollResultTest {
+    id: string;
+    type: 'browser' | 'api' | 'mobile';
+    subtype?: string;
+    config: {
+        request: {
+            dns_server?: string | undefined;
+        };
+    };
+}
+export type PollResult = {
+    test_type: 'api' | 'browser' | 'mobile';
+    test: RecursivePartial<Test>;
     result?: ServerResult;
     resultID: string;
-    timestamp: number;
-}
+    device?: Device;
+};
 /**
  * Information required to convert a `PollResult` to a `Result`.
  */
@@ -108,6 +142,7 @@ export type SelectiveRerunDecision = {
     linked_result_id: string;
 };
 export interface BaseResult {
+    device?: Device;
     /** Duration of the result in milliseconds. */
     duration: number;
     executionRule: ExecutionRule;
@@ -180,23 +215,26 @@ export interface BrowserError {
     type: string;
 }
 export interface Step {
-    allowFailure: boolean;
-    browserErrors: BrowserError[];
+    allow_failure: boolean;
+    browser_errors: BrowserError[];
     description: string;
     duration: number;
-    error?: string;
-    publicId?: string;
-    skipped: boolean;
-    stepId: number;
-    stepElementUpdates?: {
-        multiLocator?: MultiLocator;
+    failure?: {
+        code?: string;
+        message: string;
     };
-    subTestPublicId?: string;
-    subTestStepDetails?: Step[];
+    public_id?: string;
+    status: string;
+    step_id: number;
+    step_element_updates?: {
+        multi_locator?: MultiLocator;
+    };
+    sub_test_public_id?: string;
+    sub_test_step_details?: Step[];
     type: string;
     url: string;
     value?: string | number;
-    vitalsMetrics: Vitals[];
+    vitals_metrics: Vitals[];
     warnings?: {
         message: string;
         type: string;
@@ -238,9 +276,9 @@ export interface LocalTestDefinition {
     options: OptionsWithUnsupportedFields;
     /** Can be used to link to an existing remote test. */
     public_id?: string;
-    subtype: string;
+    subtype?: string;
     steps?: TestStepWithUnsupportedFields[];
-    type: string;
+    type: 'api' | 'browser' | 'mobile';
 }
 interface Options {
     ci?: {
@@ -363,7 +401,6 @@ export interface BaseConfigOverride {
     startUrl?: string;
     startUrlSubstitutionRegex?: string;
     testTimeout?: number;
-    tunnel?: TunnelInfo;
     variables?: {
         [key: string]: string;
     };
@@ -375,6 +412,7 @@ export interface UserConfigOverride extends BaseConfigOverride {
 export interface ServerConfigOverride extends BaseConfigOverride {
     mobileApplication?: MobileApplication;
     appExtractedMetadata?: MobileAppExtractedMetadata;
+    tunnel?: TunnelInfo;
 }
 export interface BatchOptions {
     batch_timeout?: number;
@@ -385,13 +423,10 @@ export interface Payload {
     tests: TestPayload[];
     options?: BatchOptions;
 }
-export interface BaseTestPayload extends ServerConfigOverride {
-    executionRule?: ExecutionRule;
-}
-export interface LocalTestPayload extends BaseTestPayload {
+export interface LocalTestPayload extends ServerConfigOverride {
     local_test_definition: LocalTestDefinition;
 }
-export interface RemoteTestPayload extends BaseTestPayload {
+export interface RemoteTestPayload extends ServerConfigOverride {
     public_id: string;
 }
 export type TestPayload = LocalTestPayload | RemoteTestPayload;
@@ -464,7 +499,8 @@ export interface APIConfiguration {
     appKey: string;
     baseIntakeUrl: string;
     baseUnstableUrl: string;
-    baseUrl: string;
+    baseV1Url: string;
+    baseV2Url: string;
     proxyOpts: ProxyConfiguration;
 }
 export interface APIHelperConfig {

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

@@ -1 +1 @@
-{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/commands/synthetics/interfaces.ts"],"names":[],"mappings":";;;AAoVA,IAAY,QAeX;AAfD,WAAY,QAAQ;IAClB,iCAAqB,CAAA;IACrB,6CAAiC,CAAA;IACjC,qBAAS,CAAA;IACT,2BAAe,CAAA;IACf,yCAA6B,CAAA;IAC7B,yCAA6B,CAAA;IAC7B,iCAAqB,CAAA;IACrB,+CAAmC,CAAA;IACnC,iCAAqB,CAAA;IACrB,+CAAmC,CAAA;IACnC,+BAAmB,CAAA;IACnB,yCAA6B,CAAA;IAC7B,mDAAuC,CAAA;IACvC,6CAAiC,CAAA;AACnC,CAAC,EAfW,QAAQ,wBAAR,QAAQ,QAenB;AAiID,IAAY,aAIX;AAJD,WAAY,aAAa;IACvB,sCAAqB,CAAA;IACrB,8CAA6B,CAAA;IAC7B,oCAAmB,CAAA;AACrB,CAAC,EAJW,aAAa,6BAAb,aAAa,QAIxB"}
+{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/commands/synthetics/interfaces.ts"],"names":[],"mappings":";;;AA4XA,IAAY,QAeX;AAfD,WAAY,QAAQ;IAClB,iCAAqB,CAAA;IACrB,6CAAiC,CAAA;IACjC,qBAAS,CAAA;IACT,2BAAe,CAAA;IACf,yCAA6B,CAAA;IAC7B,yCAA6B,CAAA;IAC7B,iCAAqB,CAAA;IACrB,+CAAmC,CAAA;IACnC,iCAAqB,CAAA;IACrB,+CAAmC,CAAA;IACnC,+BAAmB,CAAA;IACnB,yCAA6B,CAAA;IAC7B,mDAAuC,CAAA;IACvC,6CAAiC,CAAA;AACnC,CAAC,EAfW,QAAQ,wBAAR,QAAQ,QAenB;AA+HD,IAAY,aAIX;AAJD,WAAY,aAAa;IACvB,sCAAqB,CAAA;IACrB,8CAA6B,CAAA;IAC7B,oCAAmB,CAAA;AACrB,CAAC,EAJW,aAAa,6BAAb,aAAa,QAIxB"}

package/dist/commands/synthetics/multilocator.js

@@ -55,9 +55,9 @@ const getMultiLocatorsFromResults = (results) => {
         }
         const stepMLUpdates = [];
         if ((0, internal_1.hasDefinedResult)(result) && result.result && (0, internal_1.isBrowserServerResult)(result.result)) {
-            const steps = result.result.stepDetails.slice(1); // Skip first step (navigation)
+            const steps = result.result.steps.slice(1); // Skip first step (navigation)
             for (const step of steps) {
-                const multiLocator = (_a = step.stepElementUpdates) === null || _a === void 0 ? void 0 : _a.multiLocator;
+                const multiLocator = (_a = step.step_element_updates) === null || _a === void 0 ? void 0 : _a.multi_locator;
                 stepMLUpdates.push(multiLocator);
             }
         }

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

@@ -1 +1 @@
-{"version":3,"file":"multilocator.js","sourceRoot":"","sources":["../../../src/commands/synthetics/multilocator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"multilocator.js","sourceRoot":"","sources":["../../../src/commands/synthetics/multilocator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAqC;AAErC,yCAA8C;AAC9C,iDAAwD;AAGxD,mEAAqE;AACrE,qDAA2C;AAC3C,iCAAqC;AACrC,+CAAwE;AAIjE,MAAM,sBAAsB,GAAG,CACpC,QAAsB,EACtB,MAAgC,EAChC,OAAiB,EACjB,EAAE;IACF,QAAQ,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAA,CAAC,uBAAuB;IAC9E,MAAM,eAAe,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAA;IAE5D,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC,CAAA;IAEzG,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,QAAQ,CAAC,GAAG,CAAC,2DAA2D,CAAC,CAAA;KACjF;IAED,IAAI,CAAC,IAAA,kBAAa,GAAE,EAAE;QACpB,OAAO,QAAQ,CAAC,GAAG,CAAC,8EAA8E,CAAC,CAAA;KACpG;IAED,MAAM,aAAa,GAAG,MAAM,IAAA,4BAAmB,EAC7C,sFAAsF,EACtF,KAAK,CACN,CAAA;IACD,IAAI,CAAC,aAAa,EAAE;QAClB,OAAO,QAAQ,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAA;KACjE;IAED,QAAQ,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAA;IACtD,MAAM,kBAAkB,GAAe;QACrC,KAAK,EAAE,MAAM,IAAA,qBAAc,EAAC,MAAM,EAAE,QAAQ,CAAC;KAC9C,CAAA;IAED,MAAM,UAAU,GAAG,kCAAkC,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAA;IAE1F,IAAI;QACF,MAAM,IAAA,oBAAS,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAA;QAClF,QAAQ,CAAC,GAAG,CAAC,GAAG,iBAAK,CAAC,OAAO,2DAA2D,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;KAC7G;IAAC,OAAO,KAAK,EAAE;QACd,QAAQ,CAAC,KAAK,CAAC,GAAG,iBAAK,CAAC,MAAM,2BAA2B,KAAK,IAAI,CAAC,CAAA;KACpE;AACH,CAAC,CAAA,CAAA;AAvCY,QAAA,sBAAsB,0BAuClC;AAED,MAAM,2BAA2B,GAAG,CAAC,OAAiB,EAAmB,EAAE;;IACzE,MAAM,eAAe,GAAoB,EAAE,CAAA;IAE3C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAA;QACtC,IAAI,QAAQ,KAAK,SAAS,EAAE;YAC1B,SAAQ;SACT;QAED,MAAM,aAAa,GAAiC,EAAE,CAAA;QAEtD,IAAI,IAAA,2BAAgB,EAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,IAAI,IAAA,gCAAqB,EAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YACrF,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAW,CAAA,CAAC,+BAA+B;YACpF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACxB,MAAM,YAAY,GAAG,MAAA,IAAI,CAAC,oBAAoB,0CAAE,aAAa,CAAA;gBAC7D,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;aACjC;SACF;QAED,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,SAAS,CAAC,EAAE;YAChD,eAAe,CAAC,QAAQ,CAAC,GAAG,aAAa,CAAA;SAC1C;KACF;IAED,OAAO,eAAe,CAAA;AACxB,CAAC,CAAA;AAED,MAAM,kCAAkC,GAAG,CACzC,eAAgC,EAChC,kBAA8B,EAClB,EAAE;IACd,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;QACnD,MAAM,IAAI,GAAG,IAAA,qDAA6B,EAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAA;QAExE,IAAI,IAAI,IAAI,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE;YAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAA;YAC5C,KAAK,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE;gBAC/C,MAAM,YAAY,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAA;gBACzD,IAAI,YAAY,EAAE;oBAChB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;wBACxB,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,EAAE,CAAA;qBACzB;oBACD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,GAAG,YAAY,CAAA;iBAChD;aACF;SACF;KACF;IAED,OAAO,kBAAkB,CAAA;AAC3B,CAAC,CAAA"}

package/dist/commands/synthetics/reporters/default.js

@@ -25,10 +25,10 @@ const renderStepDuration = (duration) => {
     return `${color(duration.toString())}ms`;
 };
 const renderStepIcon = (step) => {
-    if (step.error) {
+    if (step.failure) {
         return constants_1.ICONS.FAILED;
     }
-    if (step.skipped) {
+    if (step.status === 'skipped') {
         return constants_1.ICONS.SKIPPED;
     }
     return constants_1.ICONS.SUCCESS;
@@ -37,7 +37,7 @@ const renderStep = (step) => {
     const duration = renderStepDuration(step.duration);
     const icon = renderStepIcon(step);
     const value = step.value ? `\n    ${chalk_1.default.dim(step.value)}` : '';
-    const error = step.error ? `\n    ${chalk_1.default.red.dim(step.error)}` : '';
+    const error = step.failure ? `\n    ${chalk_1.default.red.dim(step.failure.message)}` : '';
     return `    ${icon} | ${duration} - ${step.description}${value}${error}`;
 };
 const renderSkippedSteps = (steps) => {
@@ -76,7 +76,7 @@ const renderResultOutcome = (result, test, icon, color) => {
             `  ${chalk_1.default.yellow('We had an error during the execution of this test. The result will be ignored')}`,
         ].join('\n');
     }
-    if (test.type === 'api') {
+    if (test.type === 'api' && test.subtype) {
         const requestDescription = renderApiRequestDescription(test.subtype, test.config);
         if (result === null || result === void 0 ? void 0 : result.failure) {
             return [
@@ -92,10 +92,11 @@ const renderResultOutcome = (result, test, icon, color) => {
             lines.push(chalk_1.default.red(`    [${chalk_1.default.bold(result.failure.code)}] - ${chalk_1.default.dim(result.failure.message)}`));
         }
         // We render the step only if the test hasn't passed to avoid cluttering the output.
-        if (result && !result.passed && 'stepDetails' in result) {
-            const criticalFailedStepIndex = result.stepDetails.findIndex((s) => s.error && !s.allowFailure) + 1;
-            lines.push(...result.stepDetails.slice(0, criticalFailedStepIndex).map(renderStep));
-            const skippedStepDisplay = renderSkippedSteps(result.stepDetails.slice(criticalFailedStepIndex));
+        if (result && result.status !== 'passed' && 'steps' in result) {
+            const steps = result.steps;
+            const criticalFailedStepIndex = result.steps.findIndex((s) => s.failure && !s.allow_failure) + 1;
+            lines.push(...steps.slice(0, criticalFailedStepIndex).map(renderStep));
+            const skippedStepDisplay = renderSkippedSteps(steps.slice(criticalFailedStepIndex));
             if (skippedStepDisplay) {
                 lines.push(skippedStepDisplay);
             }
@@ -172,7 +173,7 @@ const getResultIdentificationSuffix = (execution, setColor) => {
     if ((0, internal_1.isBaseResult)(execution)) {
         const { result, passed, retries, maxRetries, timedOut } = execution;
         const location = execution.location ? setColor(`location: ${chalk_1.default.bold(execution.location)}`) : '';
-        const device = result && (0, public_1.isDeviceIdSet)(result) ? ` - ${setColor(`device: ${chalk_1.default.bold(result.device.id)}`)}` : '';
+        const device = result && (0, public_1.isDeviceIdSet)(execution) ? ` - ${setColor(`device: ${chalk_1.default.bold(execution.device.id)}`)}` : '';
         const attempt = getAttemptSuffix(passed, retries, maxRetries, timedOut);
         return ` - ${location}${device}${attempt}`;
     }