diff --git a/helper/resource/testing_new_config.go b/helper/resource/testing_new_config.go index c75af6d8205..766de1fd6fe 100644 --- a/helper/resource/testing_new_config.go +++ b/helper/resource/testing_new_config.go @@ -144,7 +144,7 @@ func testStepNewConfig(t testing.T, c TestCase, wd *plugintest.WorkingDir, step var stdout string err = runProviderCommand(t, func() error { var err error - stdout, err = wd.SavedPlanStdout() + stdout, err = wd.SavedPlanRawStdout() return err }, wd, c.ProviderFactories) if err != nil { @@ -188,7 +188,7 @@ func testStepNewConfig(t testing.T, c TestCase, wd *plugintest.WorkingDir, step var stdout string err = runProviderCommand(t, func() error { var err error - stdout, err = wd.SavedPlanStdout() + stdout, err = wd.SavedPlanRawStdout() return err }, wd, c.ProviderFactories) if err != nil { diff --git a/internal/plugintest/working_dir.go b/internal/plugintest/working_dir.go index a4a24357c88..81b8e1ebc75 100644 --- a/internal/plugintest/working_dir.go +++ b/internal/plugintest/working_dir.go @@ -231,11 +231,11 @@ func (wd *WorkingDir) SavedPlan() (*tfjson.Plan, error) { return wd.tf.ShowPlanFile(context.Background(), wd.planFilename(), tfexec.Reattach(wd.reattachInfo)) } -// SavedPlanStdout returns a stdout capture of the current saved plan file, if any. +// SavedPlanRawStdout returns a human readable stdout capture of the current saved plan file, if any. // -// If no plan is saved or if the plan file cannot be read, SavedPlanStdout returns +// If no plan is saved or if the plan file cannot be read, SavedPlanRawStdout returns // an error. -func (wd *WorkingDir) SavedPlanStdout() (string, error) { +func (wd *WorkingDir) SavedPlanRawStdout() (string, error) { if !wd.HasSavedPlan() { return "", fmt.Errorf("there is no current saved plan") } @@ -244,7 +244,7 @@ func (wd *WorkingDir) SavedPlanStdout() (string, error) { wd.tf.SetStdout(&ret) defer wd.tf.SetStdout(ioutil.Discard) - _, err := wd.tf.ShowPlanFile(context.Background(), wd.planFilename(), tfexec.Reattach(wd.reattachInfo)) + _, err := wd.tf.ShowPlanFileRaw(context.Background(), wd.planFilename(), tfexec.Reattach(wd.reattachInfo)) if err != nil { return "", err }