Revert instance diff changes #333
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit adds SSA merge strategy markers that allow the API server to granularly merge lists, rather than atomically replacing them. Composition functions use SSA, so this change means that a function can return only the list elements it desires (e.g. tags) and those elements will be merged into any existing elements, without replacing them. For the moment I've only covered two cases: * Lists that we know are sets of scalar values (generated from Terraform sets) * Maps of scalar values (generated from Terraform maps) I'm hopeful that in both of these cases it _should_ be possible to allow the map or set to be granularly merged, not atomically replaced. https://kubernetes.io/docs/reference/using-api/server-side-apply/#merge-strategy Signed-off-by: Nic Cope <[email protected]>
Signed-off-by: Alper Rifat Ulucinar <[email protected]>
Signed-off-by: Mitch Connors <[email protected]>
Signed-off-by: Mitch Connors <[email protected]>
…okens - Do not add topological markers for sensitive fields Signed-off-by: Alper Rifat Ulucinar <[email protected]>
Add server-side apply merge strategy markers
…imeouts while Observe calls Signed-off-by: Sergen Yalçın <[email protected]>
…ancestate Put default and configured timeouts to InstanceState for using the timeouts while Observe calls
Signed-off-by: Mitch Connors <[email protected]>
…rm SDK-based external client Signed-off-by: Alper Rifat Ulucinar <[email protected]>
Call the registered schema.CustomizeDiffFunc functions in the Terraform SDK-based external client
Signed-off-by: Sergen Yalçın <[email protected]>
Make main-tf contents exported
…igure the server-side apply merge strategies for object lists & maps. Signed-off-by: Alper Rifat Ulucinar <[email protected]>
…error-type Ignore specific error that returned by expandWildcard function
in external-client's Create even if the returned diagnostics contain errors. - In most cases, the Terraform plugin SDK's create implementation for a resource comprises multiple steps (with the creation of the external resource being the very first step). In case, the creation succeeds but any of the subsequent steps fail, then upjet's TF plugin SDK-based external client will not record this state losing the only opportunity to associate the MR with the newly provisioned external resource in some cases. We now put this initial state into the upjet's in-memory state cache so that it's now available for the external- client's next observe call. Signed-off-by: Alper Rifat Ulucinar <[email protected]>
Cache the Terraform instance state returned from schema.Resource.Apply even if the returned diagnostics contain errors
Add config.Resource. ServerSideApplyMergeStrategies to configure the SSA Merge Strategies
Signed-off-by: Sergen Yalçın <[email protected]>
…han ID Signed-off-by: Sergen Yalçın <[email protected]>
- Move the error check to the correct place Signed-off-by: Sergen Yalçın <[email protected]>
…getexternalnamefn Pass full state to GetExternalNameFn function to access field other than ID
Signed-off-by: Alper Rifat Ulucinar <[email protected]>
…eStateToJSONMap Signed-off-by: Alper Rifat Ulucinar <[email protected]>
…servation Signed-off-by: Alper Rifat Ulucinar <[email protected]>
Set the RawPlan for a new terraform.InstanceState returned from an observation
Signed-off-by: Alper Rifat Ulucinar <[email protected]>
Set diff state's Attributes to nil if the resource does not exist
Signed-off-by: Sergen Yalçın <[email protected]>
…s-for-initprovider Add reference fields to the InitProvider
This reverts commit 81e2620, reversing changes made to 1d547af. Signed-off-by: Matt Bush <[email protected]>
…-diff" This reverts commit 1d547af, reversing changes made to 0bc8185. Signed-off-by: Matt Bush <[email protected]>
mbbush
force-pushed
the
revert-instance-diff
branch
from
7cbf317
to
cd53d7a
Compare
1 task
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of your changes
See crossplane-contrib/provider-upjet-aws#1104 for more context.
Fixes #
I have:
make reviewableto ensure this PR is ready for review.backport release-x.ylabels to auto-backport this PR if necessary.How has this code been tested
Uptest in crossplane-contrib/provider-upjet-aws#1104