upstream/terraform
1
0
Fork 0
mirror of https://github.com/hashicorp/terraform.git synced 2026-05-28 04:03:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add component address to ComponentInstance under AppliedChanges (#34418)

Browse source
This commit is contained in:
Matej Risek 2023-12-15 15:30:11 +01:00 committed by GitHub
parent 2973d070b3
commit 039cced8ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 556 additions and 541 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1093
internal/rpcapi/terraform1/terraform1.pb.go
View file

File diff suppressed because it is too large Load diff

1
internal/rpcapi/terraform1/terraform1.proto
View file

@ -906,6 +906,7 @@ message AppliedChange {
bool interim = 3;
}
message ComponentInstance {
string component_addr = 3;
string component_instance_addr = 1;
map<string,DynamicValue> output_values = 2;
}

1
internal/stacks/stackruntime/internal/stackeval/component_instance.go
View file

@ -1156,6 +1156,7 @@ func (c *ComponentInstance) CheckApply(ctx context.Context) ([]stackstate.Applie
newState := applyResult.FinalState
ourChange := &stackstate.AppliedChangeComponentInstance{
ComponentAddr: c.call.Addr(),
ComponentInstanceAddr: c.Addr(),
OutputValues: make(map[addrs.OutputValue]cty.Value, len(newState.RootOutputValues)),
}

2
internal/stacks/stackstate/applied_change.go
View file

@ -166,6 +166,7 @@ func (ac *AppliedChangeResourceInstanceObject) protosForObject() ([]*terraform1.
// does not directly track any resource instances inside. Those are tracked
// using individual [AppliedChangeResourceInstanceObject] objects for each.
type AppliedChangeComponentInstance struct {
ComponentAddr stackaddrs.AbsComponent
ComponentInstanceAddr stackaddrs.AbsComponentInstance
// OutputValues "remembers" the output values from the most recent
@ -221,6 +222,7 @@ func (ac *AppliedChangeComponentInstance) AppliedChangeProto() (*terraform1.Appl
Key: statekeys.String(stateKey),
Description: &terraform1.AppliedChange_ChangeDescription_ComponentInstance{
ComponentInstance: &terraform1.AppliedChange_ComponentInstance{
ComponentAddr: ac.ComponentAddr.String(),
ComponentInstanceAddr: ac.ComponentInstanceAddr.String(),
},
},