stacks: include moved and removed in API (#35360)

* stacks: include moved and removed in API

* fix race test

Author: Liam Cervante

internal/plans/deferring/deferred.go

@@ -197,6 +197,9 @@ func (d *Deferred) GetDeferredResourceInstanceValue(addr addrs.AbsResourceInstan
 		return cty.NilVal, false
 	}
 
+	d.mu.Lock()
+	defer d.mu.Unlock()
+
 	configAddr := addr.ConfigResource()
 	var instancesMap addrs.Map[addrs.ConfigResource, addrs.Map[addrs.AbsResourceInstance, *plans.DeferredResourceInstanceChange]]
 

internal/rpcapi/grpc_testing.go

@@ -5,6 +5,7 @@ package rpcapi
 
 import (
 	"context"
+	"encoding/json"
 	"net"
 	"testing"
 
@@ -13,6 +14,10 @@ import (
 	"google.golang.org/grpc/test/bufconn"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/anypb"
+
+	"github.com/hashicorp/terraform/internal/addrs"
+	"github.com/hashicorp/terraform/internal/stacks/stackaddrs"
+	"github.com/hashicorp/terraform/internal/stacks/stackstate"
 )
 
 // grpcClientForTesting creates an in-memory-only gRPC server, offers the
@@ -63,6 +68,57 @@ func grpcClientForTesting(ctx context.Context, t *testing.T, registerServices fu
 	}
 }
 
+func appliedChangeToRawState(t *testing.T, changes []stackstate.AppliedChange) map[string]*anypb.Any {
+	ret := make(map[string]*anypb.Any)
+	for _, change := range changes {
+		raw, err := change.AppliedChangeProto()
+		if err != nil {
+			t.Fatalf("failed to marshal change to proto: %s", err)
+		}
+		for _, raw := range raw.Raw {
+			ret[raw.Key] = raw.Value
+		}
+	}
+	return ret
+}
+
+func mustDefaultRootProvider(provider string) addrs.AbsProviderConfig {
+	return addrs.AbsProviderConfig{
+		Module:   addrs.RootModule,
+		Provider: addrs.NewDefaultProvider(provider),
+	}
+}
+
+func mustAbsComponentInstance(t *testing.T, addr string) stackaddrs.AbsComponentInstance {
+	ret, diags := stackaddrs.ParseAbsComponentInstanceStr(addr)
+	if len(diags) > 0 {
+		t.Fatalf("failed to parse component instance address %q: %s", addr, diags)
+	}
+	return ret
+}
+
+func mustAbsComponent(t *testing.T, addr string) stackaddrs.AbsComponent {
+	ret, diags := stackaddrs.ParseAbsComponentInstanceStr(addr)
+	if len(diags) > 0 {
+		t.Fatalf("failed to parse component instance address %q: %s", addr, diags)
+	}
+	if ret.Item.Key != addrs.NoKey {
+		t.Fatalf("expected component address %q to have no key, but got %q", addr, ret.Item.Key)
+	}
+	return stackaddrs.AbsComponent{
+		Stack: ret.Stack,
+		Item:  ret.Item.Component,
+	}
+}
+
+func mustAbsResourceInstanceObject(t *testing.T, addr string) stackaddrs.AbsResourceInstanceObject {
+	ret, diags := stackaddrs.ParseAbsResourceInstanceObjectStr(addr)
+	if len(diags) > 0 {
+		t.Fatalf("failed to parse resource instance object address %q: %s", addr, diags)
+	}
+	return ret
+}
+
 func mustMarshalAnyPb(msg proto.Message) *anypb.Any {
 	var ret anypb.Any
 	err := anypb.MarshalFrom(&ret, msg, proto.MarshalOptions{})
@@ -71,3 +127,11 @@ func mustMarshalAnyPb(msg proto.Message) *anypb.Any {
 	}
 	return &ret
 }
+
+func mustMarshalJSONAttrs(attrs map[string]interface{}) []byte {
+	jsonAttrs, err := json.Marshal(attrs)
+	if err != nil {
+		panic(err)
+	}
+	return jsonAttrs
+}

internal/rpcapi/stacks.go

@@ -856,6 +856,8 @@ func stackChangeHooks(send func(*terraform1.StackChangeProgress) error, mainStac
 						Import: int32(cic.Import),
 						Remove: int32(cic.Remove),
 						Defer:  int32(cic.Defer),
+						Move:   int32(cic.Move),
+						Forget: int32(cic.Forget),
 					},
 				},
 			})
@@ -881,6 +883,8 @@ func stackChangeHooks(send func(*terraform1.StackChangeProgress) error, mainStac
 						Import: int32(cic.Import),
 						Remove: int32(cic.Remove),
 						Defer:  int32(cic.Defer),
+						Move:   int32(cic.Move),
+						Forget: int32(cic.Forget),
 					},
 				},
 			})