From 75110d3d5ffceebb1a418717364c6b08001aef10 Mon Sep 17 00:00:00 2001 From: kylecarbs Date: Tue, 17 May 2022 23:40:10 +0000 Subject: [PATCH] fix: Append Terraform module resources to list This was causing module resources to be skipped! --- provisioner/terraform/provision.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/provisioner/terraform/provision.go b/provisioner/terraform/provision.go index 9bcaaf2e513a7..ecc493b991c56 100644 --- a/provisioner/terraform/provision.go +++ b/provisioner/terraform/provision.go @@ -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 {