Skip to content

fix: Append Terraform module resources to list #1539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 18, 2022
Merged

fix: Append Terraform module resources to list #1539

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix: Append Terraform module resources to list 
This was causing module resources to be skipped!
  • Loading branch information
@kylecarbs
kylecarbs committed May 17, 2022
commit 75110d3d5ffceebb1a418717364c6b08001aef10
6 changes: 4 additions & 2 deletions provisioner/terraform/provision.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down