From afc83356ca68dab333400a8a096547966dff6d99 Mon Sep 17 00:00:00 2001 From: Liam Cervante Date: Mon, 20 Nov 2023 08:56:46 +0100 Subject: [PATCH] stacks: actions for a no-op change are a concrete list (#34260) --- internal/rpcapi/terraform1/conversion.go | 5 +++-- internal/stacks/stackplan/planned_change_test.go | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/rpcapi/terraform1/conversion.go b/internal/rpcapi/terraform1/conversion.go index bb9de65f81..7e8d0c4e7d 100644 --- a/internal/rpcapi/terraform1/conversion.go +++ b/internal/rpcapi/terraform1/conversion.go @@ -7,10 +7,11 @@ import ( "fmt" "math/big" + "github.com/zclconf/go-cty/cty" + "github.com/hashicorp/terraform/internal/lang/marks" "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/stacks/stackaddrs" - "github.com/zclconf/go-cty/cty" ) // This file contains some hand-written type conversion helpers to complement @@ -21,7 +22,7 @@ import ( func ChangeTypesForPlanAction(action plans.Action) ([]ChangeType, error) { switch action { case plans.NoOp: - return nil, nil + return []ChangeType{ChangeType_NOOP}, nil case plans.Create: return []ChangeType{ChangeType_CREATE}, nil case plans.Read: diff --git a/internal/stacks/stackplan/planned_change_test.go b/internal/stacks/stackplan/planned_change_test.go index eda383d4c9..abef762f0f 100644 --- a/internal/stacks/stackplan/planned_change_test.go +++ b/internal/stacks/stackplan/planned_change_test.go @@ -146,6 +146,7 @@ func TestPlannedChangeAsProto(t *testing.T) { { Description: &terraform1.PlannedChange_ChangeDescription_ComponentInstancePlanned{ ComponentInstancePlanned: &terraform1.PlannedChange_ComponentInstance{ + Actions: []terraform1.ChangeType{terraform1.ChangeType_NOOP}, Addr: &terraform1.ComponentInstanceInStackAddr{ ComponentAddr: "component.foo", ComponentInstanceAddr: `component.foo["bar"]`,