aherman
/
terraform
mirror of https://github.com/hashicorp/terraform
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Send ActionInvocation counts in component report

Browse Source
pull/38245/head
Mutahhir Hayat 3 months ago committed by Daniel Schmidt
parent 8f137435b7
commit a876afb6ca
3 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File

34
internal/rpcapi/stacks.go
Unescape View File

@ -1241,14 +1241,15 @@ func stackChangeHooks(send func(*stacks.StackChangeProgress) error, mainStackSou
ComponentAddr: stackaddrs.ConfigComponentForAbsInstance(cic.Addr).String(), ComponentAddr: stackaddrs.ConfigComponentForAbsInstance(cic.Addr).String(),
ComponentInstanceAddr: cic.Addr.String(), ComponentInstanceAddr: cic.Addr.String(),
}, },
Total: int32(cic.Total()), Total: int32(cic.Total()),
Add: int32(cic.Add), Add: int32(cic.Add),
Change: int32(cic.Change), Change: int32(cic.Change),
Import: int32(cic.Import), Import: int32(cic.Import),
Remove: int32(cic.Remove), Remove: int32(cic.Remove),
Defer: int32(cic.Defer), Defer: int32(cic.Defer),
Move: int32(cic.Move), Move: int32(cic.Move),
Forget: int32(cic.Forget), Forget: int32(cic.Forget),
ActionInvocation: int32(cic.ActionInvocation),
}, },
}, },
}) })
@ -1268,14 +1269,15 @@ func stackChangeHooks(send func(*stacks.StackChangeProgress) error, mainStackSou
ComponentAddr: stackaddrs.ConfigComponentForAbsInstance(cic.Addr).String(), ComponentAddr: stackaddrs.ConfigComponentForAbsInstance(cic.Addr).String(),
ComponentInstanceAddr: cic.Addr.String(), ComponentInstanceAddr: cic.Addr.String(),
}, },
Total: int32(cic.Total()), Total: int32(cic.Total()),
Add: int32(cic.Add), Add: int32(cic.Add),
Change: int32(cic.Change), Change: int32(cic.Change),
Import: int32(cic.Import), Import: int32(cic.Import),
Remove: int32(cic.Remove), Remove: int32(cic.Remove),
Defer: int32(cic.Defer), Defer: int32(cic.Defer),
Move: int32(cic.Move), Move: int32(cic.Move),
Forget: int32(cic.Forget), Forget: int32(cic.Forget),
ActionInvocation: int32(cic.ActionInvocation),
}, },
}, },
}) })

21
internal/rpcapi/stacks_test.go
Unescape View File

@ -640,7 +640,6 @@ func TestStackChangeProgressDuringPlanNormal(t *testing.T) {
}, },
want: []*stacks.StackChangeProgress{ want: []*stacks.StackChangeProgress{
{ {
Event: &stacks.StackChangeProgress_ComponentInstanceChanges_{ Event: &stacks.StackChangeProgress_ComponentInstanceChanges_{
ComponentInstanceChanges: &stacks.StackChangeProgress_ComponentInstanceChanges{ ComponentInstanceChanges: &stacks.StackChangeProgress_ComponentInstanceChanges{
Addr: &stacks.ComponentInstanceInStackAddr{ Addr: &stacks.ComponentInstanceInStackAddr{
@ -695,7 +694,8 @@ func TestStackChangeProgressDuringPlanNormal(t *testing.T) {
ProviderAddr: "registry.terraform.io/hashicorp/testing", ProviderAddr: "registry.terraform.io/hashicorp/testing",
}, },
}, },
}, { },
{
Event: &stacks.StackChangeProgress_ComponentInstanceChanges_{ Event: &stacks.StackChangeProgress_ComponentInstanceChanges_{
ComponentInstanceChanges: &stacks.StackChangeProgress_ComponentInstanceChanges{ ComponentInstanceChanges: &stacks.StackChangeProgress_ComponentInstanceChanges{
Addr: &stacks.ComponentInstanceInStackAddr{ Addr: &stacks.ComponentInstanceInStackAddr{
@ -977,6 +977,22 @@ func TestStackChangeProgressDuringPlanNormal(t *testing.T) {
ComponentInstanceAddr: "component.self", ComponentInstanceAddr: "component.self",
}, },
Status: stacks.StackChangeProgress_ComponentInstanceStatus_PLANNED, Status: stacks.StackChangeProgress_ComponentInstanceStatus_PLANNED,
"action_invocations": {
// This test verifies that the ActionInvocation field exists in ComponentInstanceChanges
// and is included in the total count. Once we implement action invocation tracking logic,
// this field will have a value > 0 for components with actions.
source: "git::https://example.com/action_invocations.git",
want: []*stacks.StackChangeProgress{
{
Event: &stacks.StackChangeProgress_ComponentInstanceChanges_{
ComponentInstanceChanges: &stacks.StackChangeProgress_ComponentInstanceChanges{
Addr: &stacks.ComponentInstanceInStackAddr{
ComponentAddr: "component.self",
ComponentInstanceAddr: "component.self",
},
Total: 2,
Add: 1,
ActionInvocation: 1,
}, },
}, },
}, },
@ -1896,7 +1912,6 @@ func TestStacksMigrateTerraformState(t *testing.T) {
}, },
}, },
}) })
if err != nil { if err != nil {
t.Fatalf("unexpected error: %s", err) t.Fatalf("unexpected error: %s", err)
} }

19
internal/stacks/stackruntime/hooks/component_instance.go
Unescape View File

@ -53,14 +53,15 @@ func (s ComponentInstanceStatus) ForProtobuf() stacks.StackChangeProgress_Compon
// ComponentInstanceChange is the argument type for hook callbacks which // ComponentInstanceChange is the argument type for hook callbacks which
// signal a set of planned or applied changes for a component instance. // signal a set of planned or applied changes for a component instance.
type ComponentInstanceChange struct { type ComponentInstanceChange struct {
Addr stackaddrs.AbsComponentInstance Addr stackaddrs.AbsComponentInstance
Add int Add int
Change int Change int
Import int Import int
Remove int Remove int
Defer int Defer int
Move int Move int
Forget int Forget int
ActionInvocation int
} }
// Total sums all of the change counts as a forwards-compatibility measure. If // Total sums all of the change counts as a forwards-compatibility measure. If
@ -68,7 +69,7 @@ type ComponentInstanceChange struct {
// that the component instance has some unknown changes, rather than falsely // that the component instance has some unknown changes, rather than falsely
// stating that there are no changes at all. // stating that there are no changes at all.
func (cic ComponentInstanceChange) Total() int { func (cic ComponentInstanceChange) Total() int {
return cic.Add + cic.Change + cic.Import + cic.Remove + cic.Defer + cic.Move + cic.Forget return cic.Add + cic.Change + cic.Import + cic.Remove + cic.Defer + cic.Move + cic.Forget + cic.ActionInvocation
} }
// CountNewAction increments zero or more of the count fields based on the // CountNewAction increments zero or more of the count fields based on the

Write Preview
Loading…
Cancel
Save