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.

Sign up for GitHub

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

Jump to bottom

Set the RawPlan for a new terraform.InstanceState returned from an observation #317

Merged
merged 3 commits into from
Dec 22, 2023
Merged

Set the RawPlan for a new terraform.InstanceState returned from an observation #317

merged 3 commits into from
Dec 22, 2023

Conversation

ulucinar
Copy link
Collaborator

@ulucinar ulucinar commented Dec 22, 2023 •
edited
Loading

Description of your changes

This PR sets the RawPlan for a new terraform.InstanceState returned from an observation. We need this to get the registered schema.Resource.CustomizeDiff functions working in the context of crossplane-contrib/provider-upjet-aws#1037, which bumps the underlying Terraform AWS provider version to v5.31.0.

It also adds an import alias for the github.com/hashicorp/terraform-plugin-sdk/v2/diag package as the diag package name collides with some existing variable names.

I have:

  • Read and followed Upjet's contribution process.
  • Run make reviewable to ensure this PR is ready for review.
  • Added backport release-x.y labels to auto-backport this PR if necessary.

How has this code been tested

Tested via uptest in https://github.com/upbound/provider-aws/actions/runs/7300282700

@ulucinar
Alias diag import
b15649b 
Signed-off-by: Alper Rifat Ulucinar <ulucinar@users.noreply.github.com>
@ulucinar
Return the cty.Value of InstanceState from noForkExternal.fromInstanc…
74159f8 
…eStateToJSONMap

Signed-off-by: Alper Rifat Ulucinar <ulucinar@users.noreply.github.com>
@ulucinar
Set the RawPlan for a new terraform.InstanceState returned from an ob…
f0de67a 
…servation

Signed-off-by: Alper Rifat Ulucinar <ulucinar@users.noreply.github.com>
sergenyalcin
sergenyalcin approved these changes Dec 22, 2023
View reviewed changes
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 @ulucinar LGTM!

@ulucinar ulucinar merged commit 1d547af into crossplane:main Dec 22, 2023
7 checks passed
@ulucinar ulucinar deleted the fix-customize-diff branch December 22, 2023 15:54
@mbbush mbbush mentioned this pull request Jan 22, 2024
Closed
1 task
mbbush added a commit to mbbush/upjet that referenced this pull request Jan 23, 2024
@mbbush
Revert "Merge pull request crossplane#317 from ulucinar/fix-customize…
7cbf317 
…-diff"

This reverts commit 1d547af, reversing
changes made to 0bc8185.
mbbush added a commit to mbbush/upjet that referenced this pull request Jan 24, 2024
@mbbush
Revert "Merge pull request crossplane#317 from ulucinar/fix-customize…
cd53d7a 
…-diff"

This reverts commit 1d547af, reversing
changes made to 0bc8185.

Signed-off-by: Matt Bush <matt@span.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sergenyalcin sergenyalcin sergenyalcin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ulucinar @sergenyalcin