Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(stepfunctions): the catch field in CustomState is not rendered #29654

Merged
merged 7 commits into from Apr 11, 2024

Conversation

jormello
Copy link
Contributor

Issue # (if applicable)

N/A

Reason for this change

Customers that specify Catch fields in their CustomState's stateJson do not have Catchers defined in the rendered state definition. The reason for this is that the Catch fields from the stateJson is overridden by Catchers added through addCatch().

Description of changes

This change updates the way the state's Catch field is rendered to merge Catchers provided inline with those provided through addCatch(). Catchers from addCatch() will be rendered first, followed by those provided inline. This is consistent with the merge behaviour for Retriers.

Description of how you validated changes

Unit test coverage for Catchers provided just inline, just through addCatch(), and a combination of both.

Checklist


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

@github-actions github-actions bot added the p2 label Mar 29, 2024
@aws-cdk-automation aws-cdk-automation requested a review from a team March 29, 2024 15:28
@github-actions github-actions bot added the beginning-contributor [Pilot] contributed between 0-2 PRs to the CDK label Mar 29, 2024
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The pull request linter has failed. See the aws-cdk-automation comment below for failure reasons. If you believe this pull request should receive an exemption, please comment and provide a justification.

A comment requesting an exemption should contain the text Exemption Request. Additionally, if clarification is needed add Clarification Request to a comment.

This was referenced Apr 1, 2024

describe('Custom State', () => {
describe.only('Custom State', () => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should not skip other tests

@aws-cdk-automation aws-cdk-automation dismissed their stale review April 3, 2024 20:11

✅ Updated pull request passes all PRLinter validations. Dismissing previous PRLinter review.

@@ -309,4 +310,145 @@ describe('Custom State', () => {
},
);
});

test('expect retry to merge when specifying strategy inline and through construct', () => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(non-blocking) this is already covered as part of this test:

test('respect the Retry field in the stateJson', () => {

Copy link
Contributor

@aaythapa aaythapa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for making this change!

aaythapa
aaythapa previously approved these changes Apr 11, 2024
Copy link
Contributor

mergify bot commented Apr 11, 2024

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot dismissed aaythapa’s stale review April 11, 2024 20:31

Pull request has been modified.

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: 17d0c81
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

Copy link
Contributor

mergify bot commented Apr 11, 2024

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot merged commit 77e9fc6 into aws:main Apr 11, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beginning-contributor [Pilot] contributed between 0-2 PRs to the CDK p2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants