Use an environment variable

Author: bbasata

helper/resource/compatibility.go

@@ -32,4 +32,14 @@ const (
 	// type Config field includes a provider source, such as the terraform
 	// configuration block required_providers attribute.
 	EnvTfAccProviderNamespace = "TF_ACC_PROVIDER_NAMESPACE"
+
+	// This is an undocumented compatibility flag. When this is set, a
+	// `Config`-mode test step will invoke a refresh before successful
+	// completion.
+	//
+	// This is a compatibility measure for test cases that have different --
+	// but semantically-equal -- state representations in their test steps.
+	// When comparing two states, the testing framework is not aware of
+	// semantic equality or set equality.
+	EnvTfAccRefreshAfterApply = "TF_ACC_REFRESH_AFTER_APPLY"
 )

helper/resource/environment_variables.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"os"
 
 	"github.com/hashicorp/terraform-exec/tfexec"
 	tfjson "github.com/hashicorp/terraform-json"
@@ -29,6 +30,13 @@ var expectNonEmptyPlanOutputChangesMinTFVersion = tfversion.Version0_14_0
 func testStepNewConfig(ctx context.Context, t testing.T, c TestCase, wd *plugintest.WorkingDir, step TestStep, providers *providerFactories, stepIndex int, helper *plugintest.Helper) error {
 	t.Helper()
 
+	// When `refreshAfterApply` is true, a `Config`-mode test step will invoke
+	// a refresh before successful completion. This is a compatibility measure
+	// for test cases that have different -- but semantically-equal -- state
+	// representations in their test steps. When comparing two states, the
+	// testing framework is not aware of semantic equality or set equality.
+	_, refreshAfterApply := os.LookupEnv(EnvTfAccRefreshAfterApply)
+
 	configRequest := teststep.PrepareConfigurationRequest{
 		Directory: step.ConfigDirectory,
 		File:      step.ConfigFile,
@@ -442,13 +450,12 @@ func testStepNewConfig(ctx context.Context, t testing.T, c TestCase, wd *plugint
 		}
 	}
 
-	// I'm sorry, I'm afraid I can't do that. With one exception.
-	if RefreshAfterApply == "unlocked" && !step.Destroy && !step.PlanOnly {
+	if refreshAfterApply && !step.Destroy && !step.PlanOnly {
 		if len(c.Steps) > stepIndex+1 {
 			// If the next step is a refresh, then we have no need to refresh here
 			if !c.Steps[stepIndex+1].RefreshState {
 				// Echo a searchable message to easily determine when this is no longer being used
-				fmt.Println("RefreshAfterApply: running apply -refresh-only -refresh=true")
+				fmt.Println(EnvTfAccRefreshAfterApply+":", "running apply -refresh-only -refresh=true")
 				err := runProviderCommandApplyRefreshOnly(ctx, t, wd, providers)
 				if err != nil {
 					return fmt.Errorf("Error running apply refresh-only: %w", err)