opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-09-24 15:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This was causing module resources to be skipped!
This commit is contained in:
Kyle Carberry
2022-05-17 19:07:20 -05:00
committed by GitHub
parent 72c2bf80aa
commit ba818b3a10
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
provisioner/terraform/provision.go
+4 -2
View File
@@ -290,7 +290,7 @@ 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 {
@@ -298,6 +298,7 @@ func parseTerraformPlan(ctx context.Context, terraform *tfexec.Terraform, planfi
}
tfResources = append(tfResources, mod.Resources...)
}
appendResources(plan.Config.RootModule)
// Store all agents inside the maps!
for _, resource := range tfResources {
@@ -416,7 +417,7 @@ 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 {
@@ -424,6 +425,7 @@ func parseTerraformApply(ctx context.Context, terraform *tfexec.Terraform, state
}
tfResources = append(tfResources, mod.Resources...)
}
appendResources(state.Values.RootModule)
// Store all agents inside the maps!
for _, resource := range tfResources {