@datadog/datadog-ci 2.42.0 → 2.43.0

package/dist/commands/sbom/renderer.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderSuccessfulCommand = exports.renderUploading = exports.renderFailedUpload = exports.renderDuplicateUpload = exports.renderMissingSpan = exports.renderInvalidPayload = exports.renderInvalidFile = void 0;
+exports.renderSuccessfulCommand = exports.renderUploading = exports.renderFailedUpload = exports.renderNoDefaultBranch = exports.renderDuplicateUpload = exports.renderMissingSpan = exports.renderInvalidPayload = exports.renderInvalidFile = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const utils_1 = require("../junit/utils");
 const ICONS = {
@@ -22,7 +22,10 @@ const renderInvalidFile = (sbomReport) => {
 exports.renderInvalidFile = renderInvalidFile;
 const renderInvalidPayload = (sbomReport) => {
     const reportPath = `[${chalk_1.default.bold.dim(sbomReport)}]`;
-    return chalk_1.default.red(`Cannot generate payload for file ${reportPath}.\n`);
+    let fullStr = '';
+    fullStr += chalk_1.default.red(`Cannot generate payload for file ${reportPath}.\n`);
+    fullStr += chalk_1.default.red(`Make sure you run the command inside a git repository and the SBOM file is valid\n`);
+    return fullStr;
 };
 exports.renderInvalidPayload = renderInvalidPayload;
 const renderMissingSpan = (errorMessage) => {
@@ -43,6 +46,16 @@ const renderDuplicateUpload = (sha, env, service) => {
     return fullStr;
 };
 exports.renderDuplicateUpload = renderDuplicateUpload;
+const renderNoDefaultBranch = (repositoryUrl) => {
+    let fullStr = '';
+    fullStr += chalk_1.default.red(`Default branch not found for repository ${repositoryUrl}\n`);
+    fullStr += chalk_1.default.red(`Fix this issue by either:\n`);
+    fullStr += chalk_1.default.red(` - define a default branch in the repository settings on Datadog\n`);
+    fullStr += chalk_1.default.red(` - push result from your default branch first\n\n`);
+    fullStr += chalk_1.default.red(`Run an analysis once the issue is resolved\n`);
+    return fullStr;
+};
+exports.renderNoDefaultBranch = renderNoDefaultBranch;
 const renderFailedUpload = (sbomReport, error) => {
     var _a;
     const reportPath = `[${chalk_1.default.bold.dim(sbomReport)}]`;
@@ -56,9 +69,9 @@ const renderFailedUpload = (sbomReport, error) => {
 exports.renderFailedUpload = renderFailedUpload;
 const renderUploading = (sbomReport) => `Uploading SBOM report in ${sbomReport}\n`;
 exports.renderUploading = renderUploading;
-const renderSuccessfulCommand = (fileCount, duration) => {
+const renderSuccessfulCommand = (duration) => {
     let fullStr = '';
-    fullStr += chalk_1.default.green(`${ICONS.SUCCESS} Uploaded ${fileCount} files in ${duration} seconds.\n`);
+    fullStr += chalk_1.default.green(`${ICONS.SUCCESS} Uploaded file in ${duration} seconds.\n`);
     fullStr += chalk_1.default.green(`${ICONS.INFO}  Results available on ${(0, utils_1.getBaseUrl)()}ci/code-analysis\n`);
     fullStr += chalk_1.default.green('=================================================================================================\n');
     return fullStr;

package/dist/commands/sbom/renderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sbom/renderer.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AAEzB,0CAAyC;AAEzC,MAAM,KAAK,GAAG;IACZ,MAAM,EAAE,GAAG;IACX,OAAO,EAAE,GAAG;IACZ,OAAO,EAAE,IAAI;IACb,IAAI,EAAE,IAAI;CACX,CAAA;AAEM,MAAM,iBAAiB,GAAG,CAAC,UAAkB,EAAE,EAAE;IACtD,MAAM,UAAU,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAA;IAEpD,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,6BAA6B,UAAU,KAAK,CAAC,CAAA;IACjF,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,4EAA4E,CAAC,CAAA;IAElG,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AARY,QAAA,iBAAiB,qBAQ7B;AAEM,MAAM,oBAAoB,GAAG,CAAC,UAAkB,EAAE,EAAE;IACzD,MAAM,UAAU,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAA;IAEpD,OAAO,eAAK,CAAC,GAAG,CAAC,oCAAoC,UAAU,KAAK,CAAC,CAAA;AACvE,CAAC,CAAA;AAJY,QAAA,oBAAoB,wBAIhC;AAEM,MAAM,iBAAiB,GAAG,CAAC,YAAoB,EAAE,EAAE;IACxD,MAAM,WAAW,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,GAAG,CAAA;IAExD,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,OAAO,wBAAwB,YAAY,KAAK,CAAC,CAAA;IAClF,OAAO,IAAI,eAAK,CAAC,MAAM,CACrB,yBAAyB,WAAW,4DAA4D,CACjG,CAAA;IACD,OAAO,IAAI,eAAK,CAAC,MAAM,CAAC,kEAAkE,CAAC,CAAA;IAE3F,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAXY,QAAA,iBAAiB,qBAW7B;AAEM,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAE,GAAW,EAAE,OAAe,EAAE,EAAE;IACjF,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,OAAO,oCAAoC,CAAC,CAAA;IAC1E,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,kDAAkD,GAAG,QAAQ,GAAG,YAAY,OAAO,IAAI,CAAC,CAAA;IAC7G,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,oEAAoE,CAAC,CAAA;IAC1F,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;IAE7C,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AARY,QAAA,qBAAqB,yBAQjC;AAEM,MAAM,kBAAkB,GAAG,CAAC,UAAkB,EAAE,KAAU,EAAE,EAAE;;IACnE,MAAM,UAAU,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAA;IAEpD,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,6BAA6B,UAAU,KAAK,KAAK,CAAC,OAAO,IAAI,CAAC,CAAA;IAClG,IAAI,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,0CAAE,MAAM,EAAE;QAC3B,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,oBAAoB,KAAK,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAA;KACpE;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAVY,QAAA,kBAAkB,sBAU9B;AAEM,MAAM,eAAe,GAAG,CAAC,UAAkB,EAAU,EAAE,CAAC,4BAA4B,UAAU,IAAI,CAAA;AAA5F,QAAA,eAAe,mBAA6E;AAElG,MAAM,uBAAuB,GAAG,CAAC,SAAiB,EAAE,QAAgB,EAAE,EAAE;IAC7E,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,OAAO,aAAa,SAAS,aAAa,QAAQ,aAAa,CAAC,CAAA;IAChG,OAAO,IAAI,eAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,0BAA0B,IAAA,kBAAU,GAAE,oBAAoB,CAAC,CAAA;IAC/F,OAAO,IAAI,eAAK,CAAC,KAAK,CACpB,qGAAqG,CACtG,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AATY,QAAA,uBAAuB,2BASnC"}
+{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sbom/renderer.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AAEzB,0CAAyC;AAEzC,MAAM,KAAK,GAAG;IACZ,MAAM,EAAE,GAAG;IACX,OAAO,EAAE,GAAG;IACZ,OAAO,EAAE,IAAI;IACb,IAAI,EAAE,IAAI;CACX,CAAA;AAEM,MAAM,iBAAiB,GAAG,CAAC,UAAkB,EAAE,EAAE;IACtD,MAAM,UAAU,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAA;IAEpD,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,6BAA6B,UAAU,KAAK,CAAC,CAAA;IACjF,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,4EAA4E,CAAC,CAAA;IAElG,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AARY,QAAA,iBAAiB,qBAQ7B;AAEM,MAAM,oBAAoB,GAAG,CAAC,UAAkB,EAAE,EAAE;IACzD,MAAM,UAAU,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAA;IACpD,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,oCAAoC,UAAU,KAAK,CAAC,CAAA;IACzE,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,oFAAoF,CAAC,CAAA;IAE1G,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAPY,QAAA,oBAAoB,wBAOhC;AAEM,MAAM,iBAAiB,GAAG,CAAC,YAAoB,EAAE,EAAE;IACxD,MAAM,WAAW,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,GAAG,CAAA;IAExD,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,OAAO,wBAAwB,YAAY,KAAK,CAAC,CAAA;IAClF,OAAO,IAAI,eAAK,CAAC,MAAM,CACrB,yBAAyB,WAAW,4DAA4D,CACjG,CAAA;IACD,OAAO,IAAI,eAAK,CAAC,MAAM,CAAC,kEAAkE,CAAC,CAAA;IAE3F,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAXY,QAAA,iBAAiB,qBAW7B;AAEM,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAE,GAAW,EAAE,OAAe,EAAE,EAAE;IACjF,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,OAAO,oCAAoC,CAAC,CAAA;IAC1E,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,kDAAkD,GAAG,QAAQ,GAAG,YAAY,OAAO,IAAI,CAAC,CAAA;IAC7G,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,oEAAoE,CAAC,CAAA;IAC1F,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;IAE7C,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AARY,QAAA,qBAAqB,yBAQjC;AAEM,MAAM,qBAAqB,GAAG,CAAC,aAAqB,EAAE,EAAE;IAC7D,IAAI,OAAO,GAAG,EAAE,CAAA;IAEhB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,2CAA2C,aAAa,IAAI,CAAC,CAAA;IAClF,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAA;IACnD,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,oEAAoE,CAAC,CAAA;IAC1F,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAA;IACzE,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAA;IAEpE,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAVY,QAAA,qBAAqB,yBAUjC;AAEM,MAAM,kBAAkB,GAAG,CAAC,UAAkB,EAAE,KAAU,EAAE,EAAE;;IACnE,MAAM,UAAU,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAA;IAEpD,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,6BAA6B,UAAU,KAAK,KAAK,CAAC,OAAO,IAAI,CAAC,CAAA;IAClG,IAAI,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,0CAAE,MAAM,EAAE;QAC3B,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,oBAAoB,KAAK,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAA;KACpE;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAVY,QAAA,kBAAkB,sBAU9B;AAEM,MAAM,eAAe,GAAG,CAAC,UAAkB,EAAU,EAAE,CAAC,4BAA4B,UAAU,IAAI,CAAA;AAA5F,QAAA,eAAe,mBAA6E;AAElG,MAAM,uBAAuB,GAAG,CAAC,QAAgB,EAAE,EAAE;IAC1D,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,OAAO,qBAAqB,QAAQ,aAAa,CAAC,CAAA;IAClF,OAAO,IAAI,eAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,0BAA0B,IAAA,kBAAU,GAAE,oBAAoB,CAAC,CAAA;IAC/F,OAAO,IAAI,eAAK,CAAC,KAAK,CACpB,qGAAqG,CACtG,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AATY,QAAA,uBAAuB,2BASnC"}

package/dist/commands/sbom/types.d.ts

@@ -80,6 +80,8 @@ export interface Dependency {
 export interface CommitInformation {
     author_name: string;
     author_email: string;
+    committer_name: string;
+    committer_email: string;
     sha: string;
     branch: string;
 }

package/dist/commands/sbom/upload.d.ts

@@ -2,7 +2,7 @@ import { Command } from 'clipanion';
 export declare class UploadSbomCommand extends Command {
     static paths: string[][];
     static usage: import("clipanion").Usage;
-    private basePaths;
+    private basePath;
     private service;
     private env;
     private tags;

package/dist/commands/sbom/upload.js

@@ -25,7 +25,7 @@ const validation_1 = require("./validation");
 class UploadSbomCommand extends clipanion_1.Command {
     constructor() {
         super(...arguments);
-        this.basePaths = clipanion_1.Option.Rest({ required: 1 });
+        this.basePath = clipanion_1.Option.String();
         this.service = clipanion_1.Option.String('--service', 'datadog-ci');
         this.env = clipanion_1.Option.String('--env', 'ci');
         this.tags = clipanion_1.Option.Array('--tags');
@@ -43,11 +43,11 @@ class UploadSbomCommand extends clipanion_1.Command {
      * compliant with their schema and upload them to datadog.
      */
     execute() {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const service = this.service;
             const environment = this.env;
-            if (!this.basePaths || !this.basePaths.length) {
+            if (!this.basePath || !this.basePath.length) {
                 this.context.stderr.write('Missing basePath\n');
                 return 1;
             }
@@ -71,47 +71,51 @@ class UploadSbomCommand extends clipanion_1.Command {
             }
             const validator = (0, validation_1.getValidator)();
             const startTimeMs = Date.now();
-            for (const basePath of this.basePaths) {
-                if (this.debug) {
-                    this.context.stdout.write(`Processing file ${basePath}\n`);
+            const basePath = this.basePath;
+            if (this.debug) {
+                this.context.stdout.write(`Processing file ${basePath}\n`);
+            }
+            if (!(0, validation_1.validateSbomFileAgainstSchema)(basePath, validator, !!this.debug)) {
+                if (!(0, validation_1.validateFileAgainstToolRequirements)(basePath, !!this.debug)) {
+                    this.context.stdout.write((0, renderer_1.renderInvalidFile)(basePath));
+                    return 1;
                 }
-                if (!(0, validation_1.validateSbomFileAgainstSchema)(basePath, validator, !!this.debug)) {
-                    if (!(0, validation_1.validateFileAgainstToolRequirements)(basePath, !!this.debug)) {
-                        this.context.stdout.write((0, renderer_1.renderInvalidFile)(basePath));
-                        return 1;
-                    }
-                    else {
-                        this.context.stdout.write('Invalid SBOM file but enough data to be processed (use --debug to get validation error)\n');
-                    }
+                else {
+                    this.context.stdout.write('Invalid SBOM file but enough data to be processed (use --debug to get validation error)\n');
                 }
-                const jsonContent = JSON.parse(fs_1.default.readFileSync(basePath).toString('utf8'));
-                // Upload content
-                try {
-                    const scaPayload = (0, payload_1.generatePayload)(jsonContent, tags, service, environment);
-                    if (!scaPayload) {
-                        this.context.stdout.write((0, renderer_1.renderInvalidPayload)(basePath));
-                        continue;
-                    }
-                    this.context.stdout.write((0, renderer_1.renderUploading)(basePath));
-                    yield api(scaPayload);
-                    if (this.debug) {
-                        this.context.stdout.write(`Upload done for ${basePath}.\n`);
-                    }
+            }
+            const jsonContent = JSON.parse(fs_1.default.readFileSync(basePath).toString('utf8'));
+            // Upload content
+            try {
+                const scaPayload = (0, payload_1.generatePayload)(jsonContent, tags, service, environment);
+                if (!scaPayload) {
+                    this.context.stdout.write((0, renderer_1.renderInvalidPayload)(basePath));
+                    return 1;
+                }
+                this.context.stdout.write((0, renderer_1.renderUploading)(basePath));
+                yield api(scaPayload);
+                if (this.debug) {
+                    this.context.stdout.write(`Upload done for ${basePath}.\n`);
                 }
-                catch (error) {
-                    if ((0, axios_1.isAxiosError)(error)) {
-                        if (((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 409) {
-                            const sha = tags[tags_1.GIT_SHA] || 'sha-not-found';
-                            this.context.stderr.write((0, renderer_1.renderDuplicateUpload)(sha, environment, service));
-                            return 0;
-                        }
+            }
+            catch (error) {
+                if ((0, axios_1.isAxiosError)(error)) {
+                    if (((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 409) {
+                        const sha = tags[tags_1.GIT_SHA] || 'sha-not-found';
+                        this.context.stderr.write((0, renderer_1.renderDuplicateUpload)(sha, environment, service));
+                        return 0;
+                    }
+                    if (((_b = error.response) === null || _b === void 0 ? void 0 : _b.status) === 412) {
+                        const repositoryUrl = tags[tags_1.GIT_REPOSITORY_URL] || 'url-not-found';
+                        this.context.stderr.write((0, renderer_1.renderNoDefaultBranch)(repositoryUrl));
+                        return 1;
                     }
-                    this.context.stderr.write((0, renderer_1.renderFailedUpload)(basePath, error));
-                    return 1;
                 }
+                this.context.stderr.write((0, renderer_1.renderFailedUpload)(basePath, error));
+                return 1;
             }
             const uploadTimeMs = (Date.now() - startTimeMs) / 1000;
-            this.context.stdout.write((0, renderer_1.renderSuccessfulCommand)(this.basePaths.length, uploadTimeMs));
+            this.context.stdout.write((0, renderer_1.renderSuccessfulCommand)(uploadTimeMs));
             return 0;
         });
     }

package/dist/commands/sbom/upload.js.map

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

package/dist/commands/stepfunctions/awsCommands.js

@@ -133,7 +133,12 @@ const createLogsAccessPolicy = (iamClient, describeStateMachineCommandOutput, st
 exports.createLogsAccessPolicy = createLogsAccessPolicy;
 const attachPolicyToStateMachineIamRole = (iamClient, describeStateMachineCommandOutput, accountId, stepFunctionArn, context, dryRun) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    const roleName = (_a = describeStateMachineCommandOutput === null || describeStateMachineCommandOutput === void 0 ? void 0 : describeStateMachineCommandOutput.roleArn) === null || _a === void 0 ? void 0 : _a.split('/')[1];
+    const splitRoleArnList = (_a = describeStateMachineCommandOutput === null || describeStateMachineCommandOutput === void 0 ? void 0 : describeStateMachineCommandOutput.roleArn) === null || _a === void 0 ? void 0 : _a.split('/');
+    if (splitRoleArnList === undefined) {
+        throw Error(`Unexpected roleArn ${describeStateMachineCommandOutput === null || describeStateMachineCommandOutput === void 0 ? void 0 : describeStateMachineCommandOutput.roleArn} for the describeStateMachineCommandOutput ${describeStateMachineCommandOutput}`);
+    }
+    // `arn:aws:iam::<accountId>:role/<name>` or `arn:aws:iam::<accountId>:role/service-role/<name>`
+    const roleName = splitRoleArnList[splitRoleArnList.length - 1];
     const policyArn = `arn:aws:iam::${accountId}:policy/${(0, helpers_1.buildLogAccessPolicyName)(describeStateMachineCommandOutput)}`;
     const input = {
         PolicyArn: policyArn,

package/dist/commands/stepfunctions/awsCommands.js.map

@@ -1 +1 @@
-{"version":3,"file":"awsCommands.js","sourceRoot":"","sources":["../../../src/commands/stepfunctions/awsCommands.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4EAUwC;AACxC,oDAM4B;AAC5B,oDAa4B;AAI5B,uCAA8F;AAEvF,MAAM,oBAAoB,GAAG,CAClC,mBAA8B,EAC9B,eAAuB,EACqB,EAAE;IAC9C,MAAM,KAAK,GAAG,EAAC,eAAe,EAAE,eAAe,EAAC,CAAA;IAChD,MAAM,OAAO,GAAG,IAAI,wCAA2B,CAAC,KAAK,CAAC,CAAA;IACtD,MAAM,IAAI,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAEpD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA,CAAA;AATY,QAAA,oBAAoB,wBAShC;AAEM,MAAM,mBAAmB,GAAG,CACjC,mBAA8B,EAC9B,eAAuB,EACoB,EAAE;IAC7C,MAAM,KAAK,GAAG,EAAC,WAAW,EAAE,eAAe,EAAC,CAAA;IAC5C,MAAM,OAAO,GAAG,IAAI,uCAA0B,CAAC,KAAK,CAAC,CAAA;IACrD,MAAM,IAAI,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAEpD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA,CAAA;AATY,QAAA,mBAAmB,uBAS/B;AAEM,MAAM,qBAAqB,GAAG,CACnC,oBAA0C,EAC1C,YAAoB,EACpB,UAAkB,EAClB,YAAoB,EACpB,eAAuB,EACvB,OAAoB,EACpB,MAAe,EAC0C,EAAE;IAC3D,gIAAgI;IAChI,0GAA0G;IAE1G,MAAM,KAAK,GAAG;QACZ,cAAc,EAAE,YAAY;QAC5B,UAAU;QACV,aAAa,EAAE,EAAE;QACjB,YAAY;KACb,CAAA;IACD,MAAM,OAAO,GAAG,IAAI,qDAA4B,CAAC,KAAK,CAAC,CAAA;IACvD,MAAM,WAAW,GAAG,uBAAuB,CAAA;IAC3C,IAAA,wBAAc,EAAC,eAAe,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;IACpE,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACrD,6EAA6E;QAC7E,2BAA2B;QAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,uBAAuB,UAAU,sCAAsC,UAAU,sBAAsB,CACxG,CAAA;QAED,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA,CAAA;AA/BY,QAAA,qBAAqB,yBA+BjC;AAEM,MAAM,WAAW,GAAG,CACzB,mBAA8B,EAC9B,eAAuB,EACvB,IAAW,EACX,OAAoB,EACpB,MAAe,EACgC,EAAE;IACjD,MAAM,KAAK,GAAG;QACZ,WAAW,EAAE,eAAe;QAC5B,IAAI;KACL,CAAA;IAED,MAAM,OAAO,GAAG,IAAI,+BAAkB,CAAC,KAAK,CAAC,CAAA;IAC7C,MAAM,WAAW,GAAG,aAAa,CAAA;IACjC,IAAA,wBAAc,EAAC,eAAe,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;IACpE,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACpD,sBAAsB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;QAE5C,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA,CAAA;AArBY,QAAA,WAAW,eAqBvB;AAEM,MAAM,cAAc,GAAG,CAC5B,oBAA0C,EAC1C,YAAoB,EACpB,eAAuB,EACvB,OAAoB,EACpB,MAAe,EACmC,EAAE;IACpD,MAAM,KAAK,GAAG;QACZ,YAAY;KACb,CAAA;IACD,MAAM,OAAO,GAAG,IAAI,8CAAqB,CAAC,KAAK,CAAC,CAAA;IAChD,MAAM,WAAW,GAAG,gBAAgB,CAAA;IACpC,IAAA,wBAAc,EAAC,eAAe,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;IACpE,IAAI;QACF,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACrD,sBAAsB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;YAE5C,OAAO,IAAI,CAAA;SACZ;KACF;IAAC,OAAO,GAAG,EAAE;QACZ,oGAAoG;QACpG,IAAI,GAAG,YAAY,KAAK,IAAI,GAAG,CAAC,IAAI,KAAK,gCAAgC,EAAE;YACzE,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,cAAc,GAAG,CAAC,OAAO,qEAAqE,CAC/F,CAAA;SACF;KACF;AACH,CAAC,CAAA,CAAA;AA5BY,QAAA,cAAc,kBA4B1B;AAEM,MAAM,sBAAsB,GAAG,CACpC,SAAoB,EACpB,iCAAoE,EACpE,eAAuB,EACvB,OAAoB,EACpB,MAAe,EACiC,EAAE;IAClD,uGAAuG;IACvG,MAAM,gBAAgB,GAAG;QACvB,OAAO,EAAE,YAAY;QACrB,SAAS,EAAE;YACT;gBACE,MAAM,EAAE,OAAO;gBACf,MAAM,EAAE;oBACN,wBAAwB;oBACxB,sBAAsB;oBACtB,qBAAqB;oBACrB,wBAAwB;oBACxB,wBAAwB;oBACxB,wBAAwB;oBACxB,mBAAmB;oBACnB,wBAAwB;oBACxB,+BAA+B;oBAC/B,wBAAwB;iBACzB;gBACD,QAAQ,EAAE,GAAG;aACd;SACF;KACF,CAAA;IAED,MAAM,KAAK,GAAG;QACZ,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC;QAChD,UAAU,EAAE,IAAA,kCAAwB,EAAC,iCAAiC,CAAC;KACxE,CAAA;IACD,MAAM,OAAO,GAAG,IAAI,gCAAmB,CAAC,KAAK,CAAC,CAAA;IAC9C,MAAM,WAAW,GAAG,cAAc,CAAA;IAClC,IAAA,wBAAc,EAAC,eAAe,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;IACpE,IAAI;QACF,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAC1C,sBAAsB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;YAE5C,OAAO,IAAI,CAAA;SACZ;KACF;IAAC,OAAO,GAAG,EAAE;QACZ,oGAAoG;QACpG,IAAI,GAAG,YAAY,KAAK,IAAI,GAAG,CAAC,IAAI,KAAK,gCAAgC,EAAE;YACzE,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,cAAc,GAAG,CAAC,OAAO,qEAAqE,CAC/F,CAAA;SACF;KACF;AACH,CAAC,CAAA,CAAA;AApDY,QAAA,sBAAsB,0BAoDlC;AAEM,MAAM,iCAAiC,GAAG,CAC/C,SAAoB,EACpB,iCAAoE,EACpE,SAAiB,EACjB,eAAuB,EACvB,OAAoB,EACpB,MAAe,EACqC,EAAE;;IACtD,MAAM,QAAQ,GAAG,MAAA,iCAAiC,aAAjC,iCAAiC,uBAAjC,iCAAiC,CAAE,OAAO,0CAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IAC1E,MAAM,SAAS,GAAG,gBAAgB,SAAS,WAAW,IAAA,kCAAwB,EAAC,iCAAiC,CAAC,EAAE,CAAA;IAEnH,MAAM,KAAK,GAAG;QACZ,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,QAAQ;KACnB,CAAA;IAED,MAAM,OAAO,GAAG,IAAI,oCAAuB,CAAC,KAAK,CAAC,CAAA;IAClD,MAAM,WAAW,GAAG,kBAAkB,CAAA;IACtC,IAAA,wBAAc,EAAC,eAAe,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;IACpE,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC1C,sBAAsB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;QAE5C,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA,CAAA;AAzBY,QAAA,iCAAiC,qCAyB7C;AAEM,MAAM,sBAAsB,GAAG,CACpC,mBAA8B,EAC9B,YAA+C,EAC/C,WAAmB,EACnB,eAAuB,EACvB,OAAoB,EACpB,MAAe,EACuC,EAAE;IACxD,MAAM,KAAK,GAAG;QACZ,eAAe,EAAE,YAAY,CAAC,eAAe;QAC7C,oBAAoB,EAAE;YACpB,YAAY,EAAE,CAAC,EAAC,sBAAsB,EAAE,EAAC,WAAW,EAAC,EAAC,CAAC;YACvD,KAAK,EAAE,qBAAQ,CAAC,GAAG;YACnB,oBAAoB,EAAE,IAAI;SAC3B;KACF,CAAA;IAED,MAAM,cAAc,GAAG;QACrB,eAAe,EAAE,YAAY,CAAC,eAAe;QAC7C,oBAAoB,EAAE,YAAY,CAAC,oBAAoB;KACxD,CAAA;IAED,MAAM,OAAO,GAAG,IAAI,sCAAyB,CAAC,KAAK,CAAC,CAAA;IACpD,MAAM,WAAW,GAAG,oBAAoB,CAAA;IACxC,IAAA,wBAAc,EAAC,eAAe,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,CAAC,CAAA;IACpF,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACpD,sBAAsB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;QAE5C,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA,CAAA;AA/BY,QAAA,sBAAsB,0BA+BlC;AAEM,MAAM,4BAA4B,GAAG,CAC1C,mBAA8B,EAC9B,YAA+C,EAC/C,aAAyC,EACzC,OAAoB,EACpB,MAAe,EACuC,EAAE;IACxD,IAAI,YAAY,KAAK,SAAS,EAAE;QAC9B,OAAM;KACP;IACD,MAAM,KAAK,GAAG;QACZ,eAAe,EAAE,YAAY,CAAC,eAAe;QAC7C,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC;KAC1C,CAAA;IAED,MAAM,OAAO,GAAG,IAAI,sCAAyB,CAAC,KAAK,CAAC,CAAA;IACpD,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,yEAAyE,YAAY,CAAC,eAAe,OAAO,CAC7G,CAAA;IACD,IAAI,CAAC,MAAM,EAAE;QACX,IAAI;YACF,MAAM,IAAI,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACpD,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,qEAAqE,YAAY,CAAC,eAAe,MAAM,CACxG,CAAA;YAED,OAAO,IAAI,CAAA;SACZ;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,GAAG,YAAY,KAAK,EAAE;gBACxB,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,aAAa,GAAG,CAAC,OAAO,gEAAgE,YAAY,CAAC,eAAe,KAAK,CAC1H,CAAA;aACF;SACF;KACF;AACH,CAAC,CAAA,CAAA;AAnCY,QAAA,4BAA4B,gCAmCxC;AAEM,MAAM,wBAAwB,GAAG,CACtC,oBAA0C,EAC1C,UAAkB,EAClB,YAAoB,EACpB,eAAuB,EACvB,OAAoB,EACpB,MAAe,EAC6C,EAAE;IAC9D,MAAM,KAAK,GAAG;QACZ,UAAU;QACV,YAAY;KACb,CAAA;IAED,MAAM,OAAO,GAAG,IAAI,wDAA+B,CAAC,KAAK,CAAC,CAAA;IAC1D,MAAM,WAAW,GAAG,0BAA0B,CAAA;IAC9C,IAAA,wBAAc,EAAC,eAAe,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;IACpE,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACrD,sBAAsB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;QAE5C,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA,CAAA;AAtBY,QAAA,wBAAwB,4BAsBpC;AAEM,MAAM,2BAA2B,GAAG,CACzC,oBAA0C,EAC1C,YAAoB,EAC+B,EAAE;IACrD,MAAM,KAAK,GAAG,EAAC,YAAY,EAAC,CAAA;IAC5B,MAAM,OAAO,GAAG,IAAI,2DAAkC,CAAC,KAAK,CAAC,CAAA;IAC7D,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAErD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA,CAAA;AATY,QAAA,2BAA2B,+BASvC;AAED,MAAM,sBAAsB,GAAG,CAAC,WAAmB,EAAE,OAAoB,EAAQ,EAAE;IACjF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,WAAW,6BAA6B,CAAC,CAAA;AACnE,CAAC,CAAA;AAEM,MAAM,aAAa,GAAG,CAC3B,mBAA8B,EAC9B,OAAiB,EACjB,eAAuB,EACvB,OAAoB,EACpB,MAAe,EACkC,EAAE;IACnD,MAAM,KAAK,GAAG;QACZ,WAAW,EAAE,eAAe;QAC5B,OAAO;KACR,CAAA;IACD,MAAM,OAAO,GAAG,IAAI,iCAAoB,CAAC,KAAK,CAAC,CAAA;IAC/C,MAAM,WAAW,GAAG,eAAe,CAAA;IACnC,IAAA,wBAAc,EAAC,eAAe,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;IACpE,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACpD,sBAAsB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;QAE5C,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA,CAAA;AApBY,QAAA,aAAa,iBAoBzB"}
+{"version":3,"file":"awsCommands.js","sourceRoot":"","sources":["../../../src/commands/stepfunctions/awsCommands.ts"],"names":[],"mappings":"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"}

package/dist/commands/stepfunctions/helpers.d.ts

@@ -15,10 +15,8 @@ export declare const parseArn: (arn: string) => {
 };
 export declare const buildLogAccessPolicyName: (stepFunction: DescribeStateMachineCommandOutput) => string;
 export declare const injectContextIntoTasks: (describeStateMachineCommandOutput: DescribeStateMachineCommandOutput, stepFunctionsClient: SFNClient, context: BaseContext, dryRun: boolean) => Promise<void>;
-export declare const addTraceContextToLambdaParameters: ({ Parameters }: StepType) => void;
 export declare const addTraceContextToStepFunctionParameters: ({ Parameters }: StepType) => void;
-export declare const shouldUpdateStepForTracesMerging: (step: StepType) => boolean;
-export declare const shouldUpdateStepForStepFunctionContextInjection: (step: StepType) => boolean;
+export declare const shouldUpdateStepForStepFunctionContextInjection: (step: StepType, context: BaseContext, stepName: string) => boolean;
 export type StateMachineDefinitionType = {
     Comment?: string;
     StartAt?: string;
@@ -32,13 +30,24 @@ export type StepType = {
     Next?: string;
     End?: boolean;
 };
+export type PayloadObject = {
+    'Execution.$'?: any;
+    Execution?: any;
+    'State.$'?: any;
+    State?: any;
+    'StateMachine.$'?: any;
+    StateMachine?: any;
+};
 export type ParametersType = {
     'Payload.$'?: string;
+    Payload?: string | PayloadObject;
     FunctionName?: string;
     StateMachineArn?: string;
     TableName?: string;
     Input?: {
         'CONTEXT.$'?: string;
+        CONTEXT?: string;
     };
 };
-export declare const injectContextForStepFunctions: (step: StepType) => boolean;
+export declare const injectContextForLambdaFunctions: (step: StepType, context: BaseContext, stepName: string) => boolean;
+export declare const injectContextForStepFunctions: (step: StepType, context: BaseContext, stepName: string) => boolean;

package/dist/commands/stepfunctions/helpers.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.injectContextForStepFunctions = exports.shouldUpdateStepForStepFunctionContextInjection = exports.shouldUpdateStepForTracesMerging = exports.addTraceContextToStepFunctionParameters = exports.addTraceContextToLambdaParameters = exports.injectContextIntoTasks = exports.buildLogAccessPolicyName = exports.parseArn = exports.getStepFunctionLogGroupArn = exports.isValidArn = exports.buildSubscriptionFilterName = exports.buildLogGroupName = exports.buildArn = exports.displayChanges = void 0;
+exports.injectContextForStepFunctions = exports.injectContextForLambdaFunctions = exports.shouldUpdateStepForStepFunctionContextInjection = exports.addTraceContextToStepFunctionParameters = exports.injectContextIntoTasks = exports.buildLogAccessPolicyName = exports.parseArn = exports.getStepFunctionLogGroupArn = exports.isValidArn = exports.buildSubscriptionFilterName = exports.buildLogGroupName = exports.buildArn = exports.displayChanges = void 0;
 const deep_object_diff_1 = require("deep-object-diff");
 const awsCommands_1 = require("./awsCommands");
 const constants_1 = require("./constants");
@@ -69,8 +69,9 @@ const injectContextIntoTasks = (describeStateMachineCommandOutput, stepFunctions
     for (const stepName in definitionObj.States) {
         if (definitionObj.States.hasOwnProperty(stepName)) {
             const step = definitionObj.States[stepName];
-            definitionHasBeenUpdated = injectContextForLambdaFunctions(step, context, stepName);
-            definitionHasBeenUpdated = (0, exports.injectContextForStepFunctions)(step);
+            const lambdaUpdated = (0, exports.injectContextForLambdaFunctions)(step, context, stepName);
+            const stepUpdated = (0, exports.injectContextForStepFunctions)(step, context, stepName);
+            definitionHasBeenUpdated = definitionHasBeenUpdated || lambdaUpdated || stepUpdated;
         }
     }
     if (definitionHasBeenUpdated) {
@@ -78,12 +79,6 @@ const injectContextIntoTasks = (describeStateMachineCommandOutput, stepFunctions
     }
 });
 exports.injectContextIntoTasks = injectContextIntoTasks;
-const addTraceContextToLambdaParameters = ({ Parameters }) => {
-    if (Parameters) {
-        Parameters[`Payload.$`] = 'States.JsonMerge($$, $, false)';
-    }
-};
-exports.addTraceContextToLambdaParameters = addTraceContextToLambdaParameters;
 const addTraceContextToStepFunctionParameters = ({ Parameters }) => {
     if (Parameters) {
         if (!Parameters.Input) {
@@ -93,24 +88,6 @@ const addTraceContextToStepFunctionParameters = ({ Parameters }) => {
     }
 };
 exports.addTraceContextToStepFunctionParameters = addTraceContextToStepFunctionParameters;
-const shouldUpdateStepForTracesMerging = (step) => {
-    // is default lambda api
-    if (step.Resource === 'arn:aws:states:::lambda:invoke') {
-        if (!step.Parameters) {
-            return false;
-        }
-        // payload field not set
-        if (!step.Parameters.hasOwnProperty('Payload.$')) {
-            return true;
-        }
-        // default payload
-        if (step.Parameters['Payload.$'] === '$') {
-            return true;
-        }
-    }
-    return false;
-};
-exports.shouldUpdateStepForTracesMerging = shouldUpdateStepForTracesMerging;
 // Truth table
 // Input                    | Expected
 // -------------------------|---------
@@ -119,41 +96,140 @@ exports.shouldUpdateStepForTracesMerging = shouldUpdateStepForTracesMerging;
 // not object               | false
 // object without CONTEXT.$ | true
 // object with CONTEXT.$    | false
-const shouldUpdateStepForStepFunctionContextInjection = (step) => {
+const shouldUpdateStepForStepFunctionContextInjection = (step, context, stepName) => {
     var _a;
-    // is default lambda api
-    if ((_a = step.Resource) === null || _a === void 0 ? void 0 : _a.startsWith('arn:aws:states:::states:startExecution')) {
-        if (!step.Parameters) {
-            return false;
-        }
-        if (!step.Parameters.Input) {
-            return true;
-        }
-        if (typeof step.Parameters.Input !== 'object') {
-            return false;
-        }
-        if (!step.Parameters.Input['CONTEXT.$']) {
-            return true;
-        }
+    // not default lambda api
+    if (!((_a = step.Resource) === null || _a === void 0 ? void 0 : _a.startsWith('arn:aws:states:::states:startExecution'))) {
+        return false;
     }
+    if (!step.Parameters) {
+        context.stdout
+            .write(`[Warn] Step ${stepName} does not have a Parameters field. Step Functions Context Object injection \
+skipped. Your Step Functions trace will not be merged with downstream Step Function traces. To manually merge these \
+traces, check out https://docs.datadoghq.com/serverless/step_functions/troubleshooting/\n`);
+        return false;
+    }
+    if (!step.Parameters.Input) {
+        return true;
+    }
+    if (typeof step.Parameters.Input !== 'object') {
+        context.stdout
+            .write(`[Warn] Step ${stepName}'s Parameters.Input field is not a JSON object. Step Functions Context Object \
+injection skipped. Your Step Functions trace will not be merged with downstream Step Function traces. To manually \
+merge these traces, check out https://docs.datadoghq.com/serverless/step_functions/troubleshooting/\n`);
+        return false;
+    }
+    if (!step.Parameters.Input['CONTEXT.$'] && !step.Parameters.Input['CONTEXT']) {
+        return true;
+    }
+    // context injection is already set up
+    if (step.Parameters.Input['CONTEXT.$'] === 'States.JsonMerge($$, $, false)') {
+        context.stdout.write(` Step ${stepName}: Context injection is already set up. Skipping context injection.\n`);
+        return false;
+    }
+    context.stdout
+        .write(`[Warn] Step ${stepName}'s Parameters.Input field has a custom CONTEXT field. Step Functions Context \
+Object injection skipped. Your Step Functions trace will not be merged with downstream Step Function traces. To \
+manually merge these traces, check out https://docs.datadoghq.com/serverless/step_functions/troubleshooting/\n`);
     return false;
 };
 exports.shouldUpdateStepForStepFunctionContextInjection = shouldUpdateStepForStepFunctionContextInjection;
+// Truth table
+// Case | Input                                                    | Expected
+// -----|----------------------------------------------------------|---------
+//   1  | No "Payload" or "Payload.$"                              | true
+//  2.1 | "Payload" is object, already injected                    | false
+//  2.2 | "Payload" object has Execution, State or StateMachine    | false
+//  2.3 | "Payload" object has no Execution, State or StateMachine | true
+//   3  | "Payload" is not object                                  | false
+//  4.1 | "Payload.$": "$" (default payload)                       | true
+//  4.2 | "Payload.$": "States.JsonMerge($$, $, false)"            | false
+//  4.3 | Custom "Payload.$"                                       | false
 const injectContextForLambdaFunctions = (step, context, stepName) => {
     var _a;
-    if ((0, exports.shouldUpdateStepForTracesMerging)(step)) {
-        (0, exports.addTraceContextToLambdaParameters)(step);
+    if ((_a = step.Resource) === null || _a === void 0 ? void 0 : _a.startsWith('arn:aws:lambda')) {
+        context.stdout.write(`[Warn] Step ${stepName} may be using the basic legacy integration, which does not support merging lambda trace(s) with Step Functions trace.
+          To merge lambda trace(s) with Step Functions trace, please consider using the latest integration.
+          More details can be found on https://docs.aws.amazon.com/step-functions/latest/dg/connect-lambda.html \n`);
+        return false;
+    }
+    // not default lambda api
+    if (step.Resource !== 'arn:aws:states:::lambda:invoke') {
+        return false;
+    }
+    if (!step.Parameters) {
+        context.stdout
+            .write(`[Warn] Step ${stepName} does not have a Parameters field. Step Functions Context Object injection \
+skipped. Your Step Functions trace will not be merged with downstream Lambda traces. To manually merge these traces, \
+check out https://docs.datadoghq.com/serverless/step_functions/troubleshooting/\n`);
+        return false;
+    }
+    // Case 1: payload field not set
+    if (!step.Parameters.hasOwnProperty('Payload.$') && !step.Parameters.hasOwnProperty('Payload')) {
+        step.Parameters[`Payload.$`] = `$$['Execution', 'State', 'StateMachine']`;
         return true;
     }
-    else if ((_a = step.Resource) === null || _a === void 0 ? void 0 : _a.startsWith('arn:aws:lambda')) {
-        context.stdout.write(`[Warn] Step ${stepName} may be using the basic legacy integration, which does not support merging lambda trace(s) with Step Functions trace. 
-          To merge lambda trace(s) with Step Functions trace, please consider using the latest integration. 
-          More details can be found on https://docs.aws.amazon.com/step-functions/latest/dg/connect-lambda.html \n`);
+    if (step.Parameters.hasOwnProperty('Payload')) {
+        if (typeof step.Parameters['Payload'] !== 'object') {
+            // Case 3: payload is not a JSON object
+            context.stdout
+                .write(`[Warn] Step ${stepName}'s Payload field is not a JSON object. Step Functions Context Object \
+injection skipped. Your Step Functions trace will not be merged with downstream Lambda traces. To manually \
+merge these traces, check out https://docs.datadoghq.com/serverless/step_functions/troubleshooting/\n`);
+            return false;
+        }
+        else {
+            // Case 2: payload is not a JSON object
+            const payload = step.Parameters.Payload;
+            if (payload['Execution.$'] === '$$.Execution' &&
+                payload['State.$'] === '$$.State' &&
+                payload['StateMachine.$'] === '$$.StateMachine') {
+                // Case 2.1: already injected into "Payload"
+                context.stdout.write(`Step ${stepName}: Context injection is already set up. Skipping context injection.\n`);
+                return false;
+            }
+            else if (payload.hasOwnProperty('Execution.$') ||
+                payload.hasOwnProperty('Execution') ||
+                payload.hasOwnProperty('State.$') ||
+                payload.hasOwnProperty('State') ||
+                payload.hasOwnProperty('StateMachine.$') ||
+                payload.hasOwnProperty('StateMachine')) {
+                // Case 2.2: "Payload" object has Execution, State or StateMachine
+                context.stdout
+                    .write(`[Warn] Step ${stepName} may be using custom Execution, State or StateMachine field. Step Functions Context Object \
+injection skipped. Your Step Functions trace will not be merged with downstream Lambda traces. To manually \
+merge these traces, check out https://docs.datadoghq.com/serverless/step_functions/troubleshooting/\n`);
+                return false;
+            }
+            else {
+                // Case 2.3: "Payload" object has no Execution, State or StateMachine
+                payload['Execution.$'] = '$$.Execution';
+                payload['State.$'] = '$$.State';
+                payload['StateMachine.$'] = '$$.StateMachine';
+                return true;
+            }
+        }
+    }
+    // Case 4.1: default payload
+    if (step.Parameters['Payload.$'] === '$') {
+        step.Parameters[`Payload.$`] = 'States.JsonMerge($$, $, false)';
+        return true;
+    }
+    // Case 4.2: context injection is already set up using "Payload.$"
+    if (step.Parameters['Payload.$'] === 'States.JsonMerge($$, $, false)') {
+        context.stdout.write(` Step ${stepName}: Context injection is already set up. Skipping context injection.\n`);
+        return false;
     }
+    // Case 4.3: custom "Payload.$"
+    context.stdout
+        .write(`[Warn] Step ${stepName} has a custom Payload field. Step Functions Context Object injection skipped. \
+Your Step Functions trace will not be merged with downstream Lambda traces. To manually merge these traces, \
+check out https://docs.datadoghq.com/serverless/step_functions/troubleshooting/\n`);
     return false;
 };
-const injectContextForStepFunctions = (step) => {
-    if ((0, exports.shouldUpdateStepForStepFunctionContextInjection)(step)) {
+exports.injectContextForLambdaFunctions = injectContextForLambdaFunctions;
+const injectContextForStepFunctions = (step, context, stepName) => {
+    if ((0, exports.shouldUpdateStepForStepFunctionContextInjection)(step, context, stepName)) {
         (0, exports.addTraceContextToStepFunctionParameters)(step);
         return true;
     }

package/dist/commands/stepfunctions/helpers.js.map

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

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

@@ -1,3 +1,5 @@
 import { APIHelper } from './api';
-import { MainReporter, Result, ResultDisplayInfo } from './interfaces';
+import { Batch, MainReporter, Result, ResultDisplayInfo, ResultInBatch } from './interfaces';
 export declare const waitForBatchToFinish: (api: APIHelper, batchId: string, batchTimeout: number, resultDisplayInfo: ResultDisplayInfo, reporter: MainReporter) => Promise<Result[]>;
+export declare const getResultsToReport: (shouldContinuePolling: boolean, batch: Batch, newlyReceivedResults: ResultInBatch[], emittedResultIds: Set<string>, oldIncompleteResultIds: Set<string>, incompleteResultIds: Set<string>, reporter: MainReporter) => ResultInBatch[];
+export declare const reportReceivedResults: (batch: Batch, emittedResultIds: Set<string>, reporter: MainReporter) => ResultInBatch[];