mirror of
https://github.com/opentofu/opentofu.git
synced 2024-12-30 10:47:14 -06:00
d2e9c35007
Fixes #9840 The new apply graph wasn't properly nesting provisioners. This resulted in reading the provisioners being nil on apply in the shadow graph which caused the crash in the above issue. The actual cause of this is that the new graphs we're moving towards do not have any "flattening" (they are flat to begin with): all modules are in the root graph from the beginning of construction versus building a number of different graphs and flattening them. The transform that adds the provisioners wasn't modified to handle already-flat graphs and so was only adding provisioners to the root module, not children. The change modifies the `MissingProvisionerTransformer` (primarily) to support already-flat graphs and add provisioners for all module levels. Tests are there to cover this as well. **NOTE:** This PR focuses on fixing that specific issue. I'm going to follow up this PR with another PR that is more focused on being robust against crashing (more nil checks, recover() for shadow graph, etc.). In the interest of focus and keeping a PR reviewable this focuses only on the issue itself.
262 lines
6.9 KiB
Go
262 lines
6.9 KiB
Go
package terraform
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/hashicorp/go-multierror"
|
|
"github.com/hashicorp/terraform/dag"
|
|
)
|
|
|
|
// GraphNodeProvisioner is an interface that nodes that can be a provisioner
|
|
// must implement. The ProvisionerName returned is the name of the provisioner
|
|
// they satisfy.
|
|
type GraphNodeProvisioner interface {
|
|
ProvisionerName() string
|
|
}
|
|
|
|
// GraphNodeCloseProvisioner is an interface that nodes that can be a close
|
|
// provisioner must implement. The CloseProvisionerName returned is the name
|
|
// of the provisioner they satisfy.
|
|
type GraphNodeCloseProvisioner interface {
|
|
CloseProvisionerName() string
|
|
}
|
|
|
|
// GraphNodeProvisionerConsumer is an interface that nodes that require
|
|
// a provisioner must implement. ProvisionedBy must return the name of the
|
|
// provisioner to use.
|
|
type GraphNodeProvisionerConsumer interface {
|
|
ProvisionedBy() []string
|
|
}
|
|
|
|
// ProvisionerTransformer is a GraphTransformer that maps resources to
|
|
// provisioners within the graph. This will error if there are any resources
|
|
// that don't map to proper resources.
|
|
type ProvisionerTransformer struct{}
|
|
|
|
func (t *ProvisionerTransformer) Transform(g *Graph) error {
|
|
// Go through the other nodes and match them to provisioners they need
|
|
var err error
|
|
m := provisionerVertexMap(g)
|
|
for _, v := range g.Vertices() {
|
|
if pv, ok := v.(GraphNodeProvisionerConsumer); ok {
|
|
for _, p := range pv.ProvisionedBy() {
|
|
key := provisionerMapKey(p, pv)
|
|
if m[key] == nil {
|
|
err = multierror.Append(err, fmt.Errorf(
|
|
"%s: provisioner %s couldn't be found",
|
|
dag.VertexName(v), p))
|
|
continue
|
|
}
|
|
|
|
g.Connect(dag.BasicEdge(v, m[key]))
|
|
}
|
|
}
|
|
}
|
|
|
|
return err
|
|
}
|
|
|
|
// MissingProvisionerTransformer is a GraphTransformer that adds nodes
|
|
// for missing provisioners into the graph.
|
|
type MissingProvisionerTransformer struct {
|
|
// Provisioners is the list of provisioners we support.
|
|
Provisioners []string
|
|
}
|
|
|
|
func (t *MissingProvisionerTransformer) Transform(g *Graph) error {
|
|
// Create a set of our supported provisioners
|
|
supported := make(map[string]struct{}, len(t.Provisioners))
|
|
for _, v := range t.Provisioners {
|
|
supported[v] = struct{}{}
|
|
}
|
|
|
|
// Get the map of provisioners we already have in our graph
|
|
m := provisionerVertexMap(g)
|
|
|
|
// Go through all the provisioner consumers and make sure we add
|
|
// that provisioner if it is missing.
|
|
for _, v := range g.Vertices() {
|
|
pv, ok := v.(GraphNodeProvisionerConsumer)
|
|
if !ok {
|
|
continue
|
|
}
|
|
|
|
// If this node has a subpath, then we use that as a prefix
|
|
// into our map to check for an existing provider.
|
|
var path []string
|
|
if sp, ok := pv.(GraphNodeSubPath); ok {
|
|
raw := normalizeModulePath(sp.Path())
|
|
if len(raw) > len(rootModulePath) {
|
|
path = raw
|
|
}
|
|
}
|
|
|
|
for _, p := range pv.ProvisionedBy() {
|
|
// Build the key for storing in the map
|
|
key := provisionerMapKey(p, pv)
|
|
|
|
if _, ok := m[key]; ok {
|
|
// This provisioner already exists as a configure node
|
|
continue
|
|
}
|
|
|
|
if _, ok := supported[p]; !ok {
|
|
// If we don't support the provisioner type, skip it.
|
|
// Validation later will catch this as an error.
|
|
continue
|
|
}
|
|
|
|
// Build the vertex
|
|
var newV dag.Vertex = &graphNodeProvisioner{ProvisionerNameValue: p}
|
|
if len(path) > 0 {
|
|
// If we have a path, we do the flattening immediately. This
|
|
// is to support new-style graph nodes that are already
|
|
// flattened.
|
|
if fn, ok := newV.(GraphNodeFlattenable); ok {
|
|
var err error
|
|
newV, err = fn.Flatten(path)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
|
|
// Add the missing provisioner node to the graph
|
|
m[key] = g.Add(newV)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// CloseProvisionerTransformer is a GraphTransformer that adds nodes to the
|
|
// graph that will close open provisioner connections that aren't needed
|
|
// anymore. A provisioner connection is not needed anymore once all depended
|
|
// resources in the graph are evaluated.
|
|
type CloseProvisionerTransformer struct{}
|
|
|
|
func (t *CloseProvisionerTransformer) Transform(g *Graph) error {
|
|
m := closeProvisionerVertexMap(g)
|
|
for _, v := range g.Vertices() {
|
|
if pv, ok := v.(GraphNodeProvisionerConsumer); ok {
|
|
for _, p := range pv.ProvisionedBy() {
|
|
source := m[p]
|
|
|
|
if source == nil {
|
|
// Create a new graphNodeCloseProvisioner and add it to the graph
|
|
source = &graphNodeCloseProvisioner{ProvisionerNameValue: p}
|
|
g.Add(source)
|
|
|
|
// Make sure we also add the new graphNodeCloseProvisioner to the map
|
|
// so we don't create and add any duplicate graphNodeCloseProvisioners.
|
|
m[p] = source
|
|
}
|
|
|
|
g.Connect(dag.BasicEdge(source, v))
|
|
}
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// provisionerMapKey is a helper that gives us the key to use for the
|
|
// maps returned by things such as provisionerVertexMap.
|
|
func provisionerMapKey(k string, v dag.Vertex) string {
|
|
pathPrefix := ""
|
|
if sp, ok := v.(GraphNodeSubPath); ok {
|
|
raw := normalizeModulePath(sp.Path())
|
|
if len(raw) > len(rootModulePath) {
|
|
pathPrefix = modulePrefixStr(raw) + "."
|
|
}
|
|
}
|
|
|
|
return pathPrefix + k
|
|
}
|
|
|
|
func provisionerVertexMap(g *Graph) map[string]dag.Vertex {
|
|
m := make(map[string]dag.Vertex)
|
|
for _, v := range g.Vertices() {
|
|
if pv, ok := v.(GraphNodeProvisioner); ok {
|
|
m[pv.ProvisionerName()] = v
|
|
}
|
|
}
|
|
|
|
return m
|
|
}
|
|
|
|
func closeProvisionerVertexMap(g *Graph) map[string]dag.Vertex {
|
|
m := make(map[string]dag.Vertex)
|
|
for _, v := range g.Vertices() {
|
|
if pv, ok := v.(GraphNodeCloseProvisioner); ok {
|
|
m[pv.CloseProvisionerName()] = v
|
|
}
|
|
}
|
|
|
|
return m
|
|
}
|
|
|
|
type graphNodeCloseProvisioner struct {
|
|
ProvisionerNameValue string
|
|
}
|
|
|
|
func (n *graphNodeCloseProvisioner) Name() string {
|
|
return fmt.Sprintf("provisioner.%s (close)", n.ProvisionerNameValue)
|
|
}
|
|
|
|
// GraphNodeEvalable impl.
|
|
func (n *graphNodeCloseProvisioner) EvalTree() EvalNode {
|
|
return &EvalCloseProvisioner{Name: n.ProvisionerNameValue}
|
|
}
|
|
|
|
func (n *graphNodeCloseProvisioner) CloseProvisionerName() string {
|
|
return n.ProvisionerNameValue
|
|
}
|
|
|
|
type graphNodeProvisioner struct {
|
|
ProvisionerNameValue string
|
|
}
|
|
|
|
func (n *graphNodeProvisioner) Name() string {
|
|
return fmt.Sprintf("provisioner.%s", n.ProvisionerNameValue)
|
|
}
|
|
|
|
// GraphNodeEvalable impl.
|
|
func (n *graphNodeProvisioner) EvalTree() EvalNode {
|
|
return &EvalInitProvisioner{Name: n.ProvisionerNameValue}
|
|
}
|
|
|
|
func (n *graphNodeProvisioner) ProvisionerName() string {
|
|
return n.ProvisionerNameValue
|
|
}
|
|
|
|
// GraphNodeFlattenable impl.
|
|
func (n *graphNodeProvisioner) Flatten(p []string) (dag.Vertex, error) {
|
|
return &graphNodeProvisionerFlat{
|
|
graphNodeProvisioner: n,
|
|
PathValue: p,
|
|
}, nil
|
|
}
|
|
|
|
// Same as graphNodeMissingProvisioner, but for flattening
|
|
type graphNodeProvisionerFlat struct {
|
|
*graphNodeProvisioner
|
|
|
|
PathValue []string
|
|
}
|
|
|
|
func (n *graphNodeProvisionerFlat) Name() string {
|
|
return fmt.Sprintf(
|
|
"%s.%s", modulePrefixStr(n.PathValue), n.graphNodeProvisioner.Name())
|
|
}
|
|
|
|
func (n *graphNodeProvisionerFlat) Path() []string {
|
|
return n.PathValue
|
|
}
|
|
|
|
func (n *graphNodeProvisionerFlat) ProvisionerName() string {
|
|
return fmt.Sprintf(
|
|
"%s.%s", modulePrefixStr(n.PathValue),
|
|
n.graphNodeProvisioner.ProvisionerName())
|
|
}
|