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(integ-tests): cannot make two or more identical assertions #27380

Merged
merged 10 commits into from
Oct 10, 2023

Conversation

misterjoshua
Copy link
Contributor

@misterjoshua misterjoshua commented Oct 2, 2023

This PR resolves errors in the integration test library when users run identical assertions multiple times.

This change ensures that each use of awsApiCall, httpApiCall, and invokeFunction has a unique identifier, even when multiple identical assertions are used in the same context. We introduced a uniqueAssertionId function in the DeployAssert construct that maintains backward compatibility with the old id rendering scheme, but prevents the use of conflicting construct ids by tracking the usage of ids and differentiating them where there's a conflict.

Closes #22043, #23049


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

@aws-cdk-automation aws-cdk-automation requested a review from a team October 2, 2023 23:49
@github-actions github-actions bot added p2 admired-contributor [Pilot] contributed between 13-24 PRs to the CDK labels Oct 2, 2023
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.

@github-actions github-actions bot added bug This issue is a bug. effort/small Small work item – less than a day of effort labels Oct 2, 2023
@aws-cdk-automation aws-cdk-automation dismissed their stale review October 3, 2023 00:23

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

@misterjoshua misterjoshua marked this pull request as ready for review October 3, 2023 01:02
@aws-cdk-automation aws-cdk-automation added the pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. label Oct 3, 2023
Copy link
Contributor

@lpizzinidev lpizzinidev left a comment

Choose a reason for hiding this comment

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

Looks good overall, thanks! 💪
Just a typo and a missing test case and it will be good to go for me.

@misterjoshua
Copy link
Contributor Author

@lpizzinidev Thanks for your review! I believe I've made all the requested adjustments.

Copy link
Contributor

@lpizzinidev lpizzinidev left a comment

Choose a reason for hiding this comment

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

Looks good to me, thanks 👍

@aws-cdk-automation aws-cdk-automation added pr/needs-maintainer-review This PR needs a review from a Core Team Member and removed pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. labels Oct 4, 2023
SankyRed
SankyRed previously approved these changes Oct 10, 2023
@mergify mergify bot dismissed SankyRed’s stale review October 10, 2023 17:33

Pull request has been modified.

@scanlonp scanlonp changed the title fix(integ-tests): allow multiple identical assertions fix(integ-tests): cannot make two or more identical assertions Oct 10, 2023
@mergify
Copy link
Contributor

mergify bot commented Oct 10, 2023

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).

@aws-cdk-automation aws-cdk-automation removed the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Oct 10, 2023
@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

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

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

@mergify mergify bot merged commit ea06f7d into aws:main Oct 10, 2023
12 checks passed
@mergify
Copy link
Contributor

mergify bot commented Oct 10, 2023

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).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
admired-contributor [Pilot] contributed between 13-24 PRs to the CDK bug This issue is a bug. effort/small Small work item – less than a day of effort p2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

(integ-tests): Can't make two awsApiCall for the same service and api in a given context
4 participants