shishantbiswas/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-06-02 20:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Parse resources from Terraform Modules (#1501)

Browse Source 
Fixes when Terraform modules are used to primariy provision
infrastructure!
This commit is contained in:
Kyle Carberry
2022-05-16 20:56:50 -05:00
committed by GitHub
parent 9b1ef29694
commit a2ba69dd28
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
provisioner/terraform/provision.go
+23 -5
View File
@@ -290,8 +290,17 @@ func parseTerraformPlan(ctx context.Context, terraform *tfexec.Terraform, planfi
resources := make([]*proto.Resource, 0)
agents := map[string]*proto.Agent{}
tfResources := plan.Config.RootModule.Resources
var appendResources func(mod *tfjson.ConfigModule)
appendResources = func(mod *tfjson.ConfigModule) {
for _, module := range mod.ModuleCalls {
appendResources(module.Module)
}
tfResources = append(tfResources, mod.Resources...)
}
// Store all agents inside the maps!
for _, resource := range plan.Config.RootModule.Resources {
for _, resource := range tfResources {
if resource.Type != "coder_agent" {
continue
}
@@ -340,7 +349,7 @@ func parseTerraformPlan(ctx context.Context, terraform *tfexec.Terraform, planfi
agents[resource.Address] = agent
}
for _, resource := range plan.PlannedValues.RootModule.Resources {
for _, resource := range tfResources {
if resource.Mode == tfjson.DataResourceMode {
continue
}
@@ -407,8 +416,17 @@ func parseTerraformApply(ctx context.Context, terraform *tfexec.Terraform, state
}
agents := map[string]*proto.Agent{}
tfResources := state.Values.RootModule.Resources
var appendResources func(resource *tfjson.StateModule)
appendResources = func(mod *tfjson.StateModule) {
for _, module := range mod.ChildModules {
appendResources(module)
}
tfResources = append(tfResources, mod.Resources...)
}
// Store all agents inside the maps!
for _, resource := range state.Values.RootModule.Resources {
for _, resource := range tfResources {
if resource.Type != "coder_agent" {
continue
}
@@ -439,7 +457,7 @@ func parseTerraformApply(ctx context.Context, terraform *tfexec.Terraform, state
}
// Manually associate agents with instance IDs.
for _, resource := range state.Values.RootModule.Resources {
for _, resource := range tfResources {
if resource.Type != "coder_agent_instance" {
continue
}
@@ -471,7 +489,7 @@ func parseTerraformApply(ctx context.Context, terraform *tfexec.Terraform, state
}
}
for _, resource := range state.Values.RootModule.Resources {
for _, resource := range tfResources {
if resource.Mode == tfjson.DataResourceMode {
continue
}