add a way for action apply and resource instance nodes to announce the providers they need

Author: DanielMSchmidt

internal/terraform/node_action_apply.go

@@ -21,9 +21,10 @@ type nodeActionApply struct {
 }
 
 var (
-	_ GraphNodeExecutable = (*nodeActionApply)(nil)
-	_ GraphNodeReferencer = (*nodeActionApply)(nil)
-	_ dag.GraphNodeDotter = (*nodeActionApply)(nil)
+	_ GraphNodeExecutable      = (*nodeActionApply)(nil)
+	_ GraphNodeReferencer      = (*nodeActionApply)(nil)
+	_ dag.GraphNodeDotter      = (*nodeActionApply)(nil)
+	_ GraphNodeActionProviders = (*nodeActionApply)(nil)
 )
 
 func (n *nodeActionApply) Name() string {
@@ -154,3 +155,11 @@ func (n *nodeActionApply) References() []*addrs.Reference {
 
 	return refs
 }
+
+func (n *nodeActionApply) ActionProviders() []addrs.AbsProviderConfig {
+	ret := []addrs.AbsProviderConfig{}
+	for _, invocation := range n.ActionInvocations {
+		ret = append(ret, invocation.ProviderAddr)
+	}
+	return ret
+}

internal/terraform/node_resource_apply_instance.go

@@ -49,6 +49,7 @@ var (
 	_ GraphNodeExecutable          = (*NodeApplyableResourceInstance)(nil)
 	_ GraphNodeAttachDependencies  = (*NodeApplyableResourceInstance)(nil)
 	_ GraphNodeAttachBeforeActions = (*NodeApplyableResourceInstance)(nil)
+	_ GraphNodeActionProviders     = (*NodeApplyableResourceInstance)(nil)
 )
 
 // GraphNodeCreator
@@ -479,6 +480,14 @@ func (n *NodeApplyableResourceInstance) AttachBeforeActions(ais []*plans.ActionI
 	n.beforeActionInvocations = ais
 }
 
+func (n *NodeApplyableResourceInstance) ActionProviders() []addrs.AbsProviderConfig {
+	ret := []addrs.AbsProviderConfig{}
+	for _, ai := range n.beforeActionInvocations {
+		ret = append(ret, ai.ProviderAddr)
+	}
+	return ret
+}
+
 // maybeTainted takes the resource addr, new value, planned change, and possible
 // error from an apply operation and return a new instance object marked as
 // tainted if it appears that a create operation has failed.

internal/terraform/transform_provider.go

@@ -87,6 +87,10 @@ type GraphNodeProviderConsumer interface {
 	SetProvider(addrs.AbsProviderConfig)
 }
 
+type GraphNodeActionProviders interface {
+	ActionProviders() []addrs.AbsProviderConfig
+}
+
 // ProviderTransformer is a GraphTransformer that maps resources to providers
 // within the graph. This will error if there are any resources that don't map
 // to proper resources.
@@ -306,6 +310,22 @@ func (t *CloseProviderTransformer) Transform(g *Graph) error {
 		g.Connect(dag.BasicEdge(closer, v))
 	}
 
+	// Now look at all action provider consumers and connect them to the appropriate closers.
+	for _, v := range g.Vertices() {
+		apc, ok := v.(GraphNodeActionProviders)
+		if !ok {
+			continue
+		}
+
+		for _, provider := range apc.ActionProviders() {
+			closer, ok := cpm[provider.String()]
+			if !ok {
+				return fmt.Errorf("no graphNodeCloseProvider for %s", provider)
+			}
+			g.Connect(dag.BasicEdge(closer, v))
+		}
+	}
+
 	return err
 }