fix: Append Terraform module resources to list (coder#1539)

kylecarbs · web-flow · commit ba818b3a10aa · 2022-05-17T19:07:20.000-05:00
This was causing module resources to be skipped!
diff --git a/provisioner/terraform/provision.go b/provisioner/terraform/provision.go
@@ -290,14 +290,15 @@ func parseTerraformPlan(ctx context.Context, terraform *tfexec.Terraform, planfi
 	resources := make([]*proto.Resource, 0)
 	agents := map[string]*proto.Agent{}
 
-	tfResources := plan.Config.RootModule.Resources
+	tfResources := make([]*tfjson.ConfigResource, 0)
 	var appendResources func(mod *tfjson.ConfigModule)
 	appendResources = func(mod *tfjson.ConfigModule) {
 		for _, module := range mod.ModuleCalls {
 			appendResources(module.Module)
 		}
 		tfResources = append(tfResources, mod.Resources...)
 	}
+	appendResources(plan.Config.RootModule)
 
 	// Store all agents inside the maps!
 	for _, resource := range tfResources {
@@ -416,14 +417,15 @@ func parseTerraformApply(ctx context.Context, terraform *tfexec.Terraform, state
 		}
 		agents := map[string]*proto.Agent{}
 
-		tfResources := state.Values.RootModule.Resources
+		tfResources := make([]*tfjson.StateResource, 0)
 		var appendResources func(resource *tfjson.StateModule)
 		appendResources = func(mod *tfjson.StateModule) {
 			for _, module := range mod.ChildModules {
 				appendResources(module)
 			}
 			tfResources = append(tfResources, mod.Resources...)
 		}
+		appendResources(state.Values.RootModule)
 
 		// Store all agents inside the maps!
 		for _, resource := range tfResources {

Original file line number	Diff line number	Diff line change
`@@ -290,14 +290,15 @@ func parseTerraformPlan(ctx context.Context, terraform *tfexec.Terraform, planfi`
`290`	`290`	`resources := make([]*proto.Resource, 0)`
`291`	`291`	`agents := map[string]*proto.Agent{}`
`292`	`292`
`293`		`- tfResources := plan.Config.RootModule.Resources`
	`293`	`+ tfResources := make([]*tfjson.ConfigResource, 0)`
`294`	`294`	`var appendResources func(mod *tfjson.ConfigModule)`
`295`	`295`	`appendResources = func(mod *tfjson.ConfigModule) {`
`296`	`296`	`for _, module := range mod.ModuleCalls {`
`297`	`297`	`appendResources(module.Module)`
`298`	`298`	`}`
`299`	`299`	`tfResources = append(tfResources, mod.Resources...)`
`300`	`300`	`}`
	`301`	`+ appendResources(plan.Config.RootModule)`
`301`	`302`
`302`	`303`	`// Store all agents inside the maps!`
`303`	`304`	`for _, resource := range tfResources {`
`@@ -416,14 +417,15 @@ func parseTerraformApply(ctx context.Context, terraform *tfexec.Terraform, state`
`416`	`417`	`}`
`417`	`418`	`agents := map[string]*proto.Agent{}`
`418`	`419`
`419`		`- tfResources := state.Values.RootModule.Resources`
	`420`	`+ tfResources := make([]*tfjson.StateResource, 0)`
`420`	`421`	`var appendResources func(resource *tfjson.StateModule)`
`421`	`422`	`appendResources = func(mod *tfjson.StateModule) {`
`422`	`423`	`for _, module := range mod.ChildModules {`
`423`	`424`	`appendResources(module)`
`424`	`425`	`}`
`425`	`426`	`tfResources = append(tfResources, mod.Resources...)`
`426`	`427`	`}`
	`428`	`+ appendResources(state.Values.RootModule)`
`427`	`429`
`428`	`430`	`// Store all agents inside the maps!`
`429`	`431`	`for _, resource := range tfResources {`