fix tests and cleanup

diggerhq · Sep 16, 2024 · b182294 · b182294
1 parent 898c124
commit b182294
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/libs/execution/execution.go b/libs/execution/execution.go
@@ -341,15 +341,17 @@ func (d DiggerExecutor) Apply() (*terraform_utils.TerraformSummary, bool, string
  applyArgs = append(applyArgs, step.ExtraArgs...)
  stdout, stderr, err := d.TerraformExecutor.Apply(applyArgs, plansFilename, d.CommandEnvVars)
  applyOutput = cleanupTerraformApply(true, err, stdout, stderr)
- summary, err = terraform_utils.GetSummaryFromTerraformApplyOutput(stdout)
- if err != nil {
- log.Printf("Warning: get summary from apply output failed: %v", err)
- }
+
  reportTerraformApplyOutput(d.Reporter, d.projectId(), applyOutput)
  if err != nil {
  reportApplyError(d.Reporter, err)
  return nil, false, stdout, fmt.Errorf("error executing apply: %v", err)
  }
+
+ summary, err = terraform_utils.GetSummaryFromTerraformApplyOutput(stdout)
+ if err != nil {
+ log.Printf("Warning: get summary from apply output failed: %v", err)
+ }
  }
  if step.Action == "run" {
  var commands []string

diff --git a/libs/terraform_utils/plan_summary.go b/libs/terraform_utils/plan_summary.go
@@ -5,7 +5,6 @@ import (
  "bytes"
  "encoding/json"
  "fmt"
- "log"
  "regexp"
  "sort"
  "strings"
@@ -114,7 +113,6 @@ func GetSummaryFromTerraformApplyOutput(applyOutput string) (TerraformSummary, e
  for scanner.Scan() {
  line := scanner.Text()
  if matches := summaryRegex.FindStringSubmatch(line); matches != nil {
- log.Printf("matches found: %v", matches)
  foundResourcesLine = true
  fmt.Sscanf(matches[1], "%d", &added)
  fmt.Sscanf(matches[2], "%d", &changed)
@@ -126,8 +124,6 @@ func GetSummaryFromTerraformApplyOutput(applyOutput string) (TerraformSummary, e
  return TerraformSummary{}, fmt.Errorf("could not find resources line in terraform apply output")
  }
 
- log.Printf("finished scan of terraform output: %v", applyOutput)
- log.Printf("values found: %v %v %v", added, changed, destroyed)
  return TerraformSummary{
  ResourcesCreated: added,
  ResourcesUpdated: changed,