Merge branch 'main' into tidy

Author: bbasata

.changes/unreleased/ENHANCEMENTS-20250421-145039.yaml

@@ -0,0 +1,5 @@
+kind: ENHANCEMENTS
+body: Adds `AdditionalCLIOptions.PlanOptions.NoRefresh` to test `terraform plan -refresh=false`
+time: 2025-04-21T14:50:39.764057-04:00
+custom:
+    Issue: "490"

helper/resource/additional_cli_options.go

@@ -23,4 +23,7 @@ type ApplyOptions struct {
 type PlanOptions struct {
 	// AllowDeferral will pass the experimental `-allow-deferral` flag to the plan command.
 	AllowDeferral bool
+
+	// NoRefresh will pass the `-refresh=false` flag to the plan command.
+	NoRefresh bool
 }

helper/resource/testing_new_config.go

@@ -108,8 +108,13 @@ func testStepNewConfig(ctx context.Context, t testing.T, c TestCase, wd *plugint
 				opts = append(opts, tfexec.Destroy(true))
 			}
 
-			if c.AdditionalCLIOptions != nil && c.AdditionalCLIOptions.Plan.AllowDeferral {
-				opts = append(opts, tfexec.AllowDeferral(true))
+			if c.AdditionalCLIOptions != nil {
+				if c.AdditionalCLIOptions.Plan.AllowDeferral {
+					opts = append(opts, tfexec.AllowDeferral(true))
+				}
+				if c.AdditionalCLIOptions.Plan.NoRefresh {
+					opts = append(opts, tfexec.Refresh(false))
+				}
 			}
 
 			return wd.CreatePlan(ctx, opts...)
@@ -250,8 +255,13 @@ func testStepNewConfig(ctx context.Context, t testing.T, c TestCase, wd *plugint
 			opts = append(opts, tfexec.Destroy(true))
 		}
 
-		if c.AdditionalCLIOptions != nil && c.AdditionalCLIOptions.Plan.AllowDeferral {
-			opts = append(opts, tfexec.AllowDeferral(true))
+		if c.AdditionalCLIOptions != nil {
+			if c.AdditionalCLIOptions.Plan.AllowDeferral {
+				opts = append(opts, tfexec.AllowDeferral(true))
+			}
+			if c.AdditionalCLIOptions.Plan.NoRefresh {
+				opts = append(opts, tfexec.Refresh(false))
+			}
 		}
 
 		return wd.CreatePlan(ctx, opts...)
@@ -319,8 +329,13 @@ func testStepNewConfig(ctx context.Context, t testing.T, c TestCase, wd *plugint
 			}
 		}
 
-		if c.AdditionalCLIOptions != nil && c.AdditionalCLIOptions.Plan.AllowDeferral {
-			opts = append(opts, tfexec.AllowDeferral(true))
+		if c.AdditionalCLIOptions != nil {
+			if c.AdditionalCLIOptions.Plan.AllowDeferral {
+				opts = append(opts, tfexec.AllowDeferral(true))
+			}
+			if c.AdditionalCLIOptions.Plan.NoRefresh {
+				opts = append(opts, tfexec.Refresh(false))
+			}
 		}
 
 		return wd.CreatePlan(ctx, opts...)

helper/resource/teststep_providers_test.go

@@ -3360,37 +3360,32 @@ func TestTest_TestStep_ProviderFactories_Import_External_With_Data_Source(t *tes
 
 	Test(t, TestCase{
 		ExternalProviders: map[string]ExternalProvider{
-			"http": {
-				Source: "registry.terraform.io/hashicorp/http",
+			"null": {
+				Source: "registry.terraform.io/hashicorp/null",
 			},
 			"random": {
 				Source: "registry.terraform.io/hashicorp/random",
 			},
 		},
 		Steps: []TestStep{
 			{
-				Config: `data "http" "example" {
-							url = "https://checkpoint-api.hashicorp.com/v1/check/terraform"
+				Config: `
+					data "null_data_source" "values" {
+						inputs = {
+							length = 12
 						}
+					}
 
-						resource "random_string" "example" {
-							length = length(data.http.example.response_headers)
-						}`,
+					resource "random_string" "example" {
+						length = data.null_data_source.values.outputs["length"]
+					}
+				`,
 				Check: extractResourceAttr("random_string.example", "id", &id),
 			},
 			{
-				Config: `data "http" "example" {
-							url = "https://checkpoint-api.hashicorp.com/v1/check/terraform"
-						}
-
-						resource "random_string" "example" {
-							length = length(data.http.example.response_headers)
-						}`,
-				ResourceName: "random_string.example",
-				ImportState:  true,
-				ImportStateCheck: composeImportStateCheck(
-					testCheckResourceAttrInstanceState(&id, "length", "12"),
-				),
+				ResourceName:      "random_string.example",
+				ImportState:       true,
+				ImportStateCheck:  testCheckResourceAttrInstanceState(&id, "length", "12"),
 				ImportStateVerify: true,
 			},
 		},