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

Use a copy of the conns.AWSClient with schema.Provider.Configure #1024

Merged
merged 3 commits into from
Dec 18, 2023

Conversation

ulucinar
Copy link
Collaborator

@ulucinar ulucinar commented Dec 14, 2023

Description of your changes

Fixes #1010
Fixes #1018
Depends on: crossplane/upjet#313

This PR bumps the upjet dependency to commit b674f3dd0c9f to cache the creation instance state even in case of errors. Please see crossplane/upjet#313 for more context. It also uses a copy of the Terraform provider schema with the schema.Provider.Configure call to prevent a race between the reconciliations of MRs belonging to different regions.

It also introduces the SSA merge strategy kubebuilder markers (and the associated OpenAPI extensions) for maps and scalar lists.

I have:

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

How has this code been tested

Tested manually using a custom build of the provider based on this PR:

- Generate SSA topological markers for maps and scalar lists.
- Cache the creation instance state even in case of errors.

Signed-off-by: Alper Rifat Ulucinar <ulucinar@users.noreply.github.com>
@ulucinar
Copy link
Collaborator Author

/test-examples="examples/ec2/vpc.yaml"

Signed-off-by: Alper Rifat Ulucinar <ulucinar@users.noreply.github.com>
@ulucinar
Copy link
Collaborator Author

/test-examples="examples/ec2/vpc.yaml"

@ulucinar ulucinar changed the title Use a copy of the Terraform provider schema with schema.Provider.Configure Use a copy of the conns.AWSClient with schema.Provider.Configure Dec 15, 2023
Signed-off-by: Alper Rifat Ulucinar <ulucinar@users.noreply.github.com>
@ulucinar
Copy link
Collaborator Author

/test-examples="examples/ec2/vpc.yaml"

@ulucinar ulucinar merged commit c5995e8 into crossplane-contrib:main Dec 18, 2023
10 checks passed
@ulucinar ulucinar deleted the fix-1010 branch December 18, 2023 14:09
Copy link

Backport failed for release-0.46, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin release-0.46
git worktree add -d .worktree/backport-1024-to-release-0.46 origin/release-0.46
cd .worktree/backport-1024-to-release-0.46
git checkout -b backport-1024-to-release-0.46
ancref=$(git merge-base 2849b795bdbb26de6d4d8d5b8bcde39e4a268e93 4f260ee515b26ff3ae5425c80744b811418af453)
git cherry-pick -x $ancref..4f260ee515b26ff3ae5425c80744b811418af453

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants