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

Skip import id-check step on non-root resources #173

Merged
merged 5 commits into from
Jan 10, 2024

Conversation

mbbush
Copy link
Contributor

@mbbush mbbush commented Jan 1, 2024

Description of your changes

I expanded on @sergenyalcin's work in #170 and added the ability to place the uptest.upbound.io/disable-import: "true" on a non-root resource, which makes the import step still run, but omit that resource from the check that the new resources have the same id.

This allows the use of examples containing e.g. Object.s3.aws.upbound.io resources, for which the terraform provider returns a differently-formatted id depending on whether the resource is created or observed.

Fixes #

I have:

  • Run make reviewable test to ensure this PR is ready for review.

How has this code been tested

I used this to locally test crossplane-contrib/provider-upjet-aws#1039 successfully.

I added a new unit test, and it passes.

sergenyalcin and others added 2 commits December 15, 2023 14:03
Add defer statment to remove all test directory before completing the cases

Signed-off-by: Sergen Yalçın <yalcinsergen97@gmail.com>
@mbbush mbbush changed the title Import Skip import id-check step on non-root resources Jan 1, 2024
@sergenyalcin
Copy link
Member

@mbbush PR looks good to me. After you resolve conflicts, I will approve the PR.

@mbbush
Copy link
Contributor Author

mbbush commented Jan 10, 2024

@sergenyalcin Conflicts resolved. Thanks!

Copy link
Member

@sergenyalcin sergenyalcin left a comment

Choose a reason for hiding this comment

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

Thanks @mbbush LGTM!

@sergenyalcin sergenyalcin merged commit bde6d12 into upbound:main Jan 10, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants