connect references from config nodes during apply #33403
Merged
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
jbardin
commented
Jun 20, 2023
| @@ -6463,7 +6463,7 @@ func TestContext2Apply_errorCreateInvalidNew(t *testing.T) { | |||
| if got, want := diags.Err().Error(), "forced error"; !strings.Contains(got, want) { | |||
| t.Errorf("returned error does not contain %q, but it should\n%s", want, diags.Err()) | |||
| } | |||
| if got, want := len(state.RootModule().Resources), 2; got != want { | |||
| if got, want := len(state.RootModule().Resources), 1; got != want { | |||
There was a problem hiding this comment.
this change is because there is no empty resource record in state now that the expand node is part of the instance ordering
bateller
approved these changes
Jun 28, 2023
apparentlymart
approved these changes
Jun 28, 2023
In order to ensure that transitive dependencies are connected even when
there are no instances for a resource, we need to route the references
through the config ("expand") node. This happens naturally by having the
expand node report its config references, however legacy configs can
contain self-referenced without the "self" identifier, so those need to
be filtered out.
Move the logic for NodeApplyableResource into nodeExpandApplyableResource to remove an unnecessary level of expansion.
jbardin
force-pushed
the
jbardin/deps-with-no-instances
branch
from
e320507
to
bb0bb7a
Compare
|
Reminder for the merging maintainer: if this is a user-visible change, please update the changelog on the appropriate release branch. |
|
I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
In order to ensure that transitive dependencies are connected even when there are no instances for a resource, we need to route the references through the config ("expand") node. This happens naturally by having the expand node report its config references, however legacy configs can contain self-references without the "self" identifier, so those need to be filtered out.
We can also remove the old
NodeApplyableResourcetype, which was only there to callwriteResourceStateand can be done bynodeExpandApplyableResourcewithout the expansion (the "Expand" node name in this context refers to the setting of theinstances.Expander, notDynamicExpand)Fixes #33370