fix: correctly assess quota for stopped resources

ammario · ammario · commit 4bee8435570b · 2023-08-18T20:14:49.000Z
#5710 introduced a bug whereby old resources were included in the Terraform provisioner's plan, even when transition was set to stop.
diff --git a/cli/server.go b/cli/server.go
@@ -1339,7 +1339,7 @@ func newProvisionerDaemon(
 					Listener: terraformServer,
 				},
 				CachePath: tfDir,
-				Logger:    logger,
+				Logger:    logger.Named("terraform"),
 				Tracer:    tracer,
 			})
 			if err != nil && !xerrors.Is(err, context.Canceled) {
diff --git a/provisioner/terraform/executor.go b/provisioner/terraform/executor.go
@@ -84,6 +84,10 @@ func (e *executor) execWriteOutput(ctx, killCtx context.Context, args, env []str
 	cmd.Stdout = syncWriter{mut, stdOutWriter}
 	cmd.Stderr = syncWriter{mut, stdErrWriter}
 
+	e.server.logger.Debug(ctx, "executing terraform command",
+		slog.F("binary_path", e.binaryPath),
+		slog.F("args", args),
+	)
 	err = cmd.Start()
 	if err != nil {
 		return err
@@ -276,6 +280,7 @@ func (e *executor) planResources(ctx, killCtx context.Context, planfilePath stri
 	}
 	modules := []*tfjson.StateModule{}
 	if plan.PriorState != nil {
+		// mod := plan.PriorState.Values.RootModule
 		modules = append(modules, plan.PriorState.Values.RootModule)
 	}
 	modules = append(modules, plan.PlannedValues.RootModule)
