minor fixes

Author: shuyama1

mmv1/api/resource/step.go

@@ -146,7 +146,7 @@ func validateRegexForContents(r *regexp.Regexp, contents string, configPath stri
 // Executes step configuration templates for documentation and tests
 func (s *Step) SetHCLText(sysfs fs.FS) {
 	originalPrefixedVars := s.PrefixedVars
-	// originalVars := s.Vars
+	originalVars := s.Vars
 	originalTestEnvVars := s.TestEnvVars
 	docTestEnvVars := make(map[string]string)
 	docs_defaults := map[string]string{
@@ -216,6 +216,7 @@ func (s *Step) SetHCLText(sysfs fs.FS) {
 
 	s.PrefixedVars = testPrefixedVars
 	s.TestEnvVars = testTestEnvVars
+	s.Vars = testVars
 	s.TestHCLText = s.ExecuteTemplate(sysfs)
 	s.TestHCLText = regexp.MustCompile(`\n\n$`).ReplaceAllString(s.TestHCLText, "\n")
 	// Remove region tags
@@ -225,6 +226,7 @@ func (s *Step) SetHCLText(sysfs fs.FS) {
 
 	// Reset the step
 	s.PrefixedVars = originalPrefixedVars
+	s.Vars = originalVars
 	s.TestEnvVars = originalTestEnvVars
 }
 

mmv1/templates/terraform/iam/iam_test_setup.go.tmpl

@@ -1,7 +1,7 @@
 {{- define "IamTestSetupSample" }}
-{{ $config := $.FirstTestConfig }}
-{{ $sample := $config.Sample }}
-{{ $step := $config.Step }}
+{{- $config := $.FirstTestConfig }}
+{{- $sample := $config.Sample }}
+{{- $step := $config.Step }}
 {{- if $sample.BootstrapIam }}
 	acctest.BootstrapIamMembers(t, []acctest.IamMember{
 {{- range $iam := $sample.BootstrapIam }}

mmv1/templates/terraform/samples/base_configs/test_file.go.tmpl

@@ -17,6 +17,13 @@
 
 package {{ $.Res.PackageName }}_test
 
+{{- $needsPlancheck := false -}}
+{{- range $s := $.Res.TestSamples -}}
+  {{- if gt (len $s.TestSteps) 1 -}}
+    {{- $needsPlancheck = true -}}
+  {{- end -}}
+{{- end -}}
+
 import (
 	"fmt"
 	"log"
@@ -26,7 +33,9 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+{{- if $needsPlancheck }}
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
+{{- end }}
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 
 	"{{ $.ImportPath }}/acctest"