a passing ImportBlockWithResourceIdentity test that really uses an ID

Author: bbasata

helper/resource/testing_new.go

@@ -134,6 +134,7 @@ func runNewTest(ctx context.Context, t testing.T, c TestCase, helper *plugintest
 	// use this to track last step successfully applied
 	// acts as default for import tests
 	var appliedCfg teststep.Config
+	var appliedMergedCfg string
 	var stepNumber int
 
 	for stepIndex, step := range c.Steps {
@@ -289,7 +290,7 @@ func runNewTest(ctx context.Context, t testing.T, c TestCase, helper *plugintest
 		if step.ImportState {
 			logging.HelperResourceTrace(ctx, "TestStep is ImportState mode")
 
-			err := testStepNewImportState(ctx, t, helper, wd, step, appliedCfg, providers, stepIndex)
+			err := testStepNewImportState(ctx, t, helper, wd, step, appliedCfg, appliedMergedCfg, providers, stepIndex)
 			if step.ExpectError != nil {
 				logging.HelperResourceDebug(ctx, "Checking TestStep ExpectError")
 				if err == nil {
@@ -446,7 +447,8 @@ func runNewTest(ctx context.Context, t testing.T, c TestCase, helper *plugintest
 				},
 			}.Exec()
 
-			appliedCfg = teststep.Configuration(confRequest)
+			appliedCfg = teststep.Configuration(confRequest) // magical
+			appliedMergedCfg = mergedConfig
 
 			logging.HelperResourceDebug(ctx, "Finished TestStep")
 

helper/resource/testing_new_import_block_test.go

@@ -39,9 +39,11 @@ func TestTest_TestStep_ImportBlockVerify(t *testing.T) {
 				}`,
 			},
 			{
-				ImportState:     true,
-				ImportStateKind: ImportBlockWithResourceIdentity,
-				ResourceName:    "examplecloud_bucket.storage",
+				ImportState:                          true,
+				ImportStateKind:                      ImportBlockWithResourceIdentity,
+				ImportStateVerify:                    true,
+				ImportStateVerifyIdentifierAttribute: "bucket", // upgrade to resource identity
+				ResourceName:                         "examplecloud_bucket.storage",
 			},
 		},
 	})
@@ -77,7 +79,20 @@ func exampleCloudBucketResource(t *testing.T) testprovider.Resource {
 				},
 			),
 		},
-		ImportStateResponse: &resource.ImportStateResponse{},
+		ImportStateResponse: &resource.ImportStateResponse{
+			State: tftypes.NewValue(
+				tftypes.Object{
+					AttributeTypes: map[string]tftypes.Type{
+						"bucket":      tftypes.String,
+						"description": tftypes.String,
+					},
+				},
+				map[string]tftypes.Value{
+					"bucket":      tftypes.NewValue(tftypes.String, "test-bucket"),
+					"description": tftypes.NewValue(tftypes.String, "A bucket for testing."),
+				},
+			),
+		},
 		SchemaResponse: &resource.SchemaResponse{
 			Schema: &tfprotov6.Schema{
 				Block: &tfprotov6.SchemaBlock{

helper/resource/testing_new_import_state.go

@@ -20,7 +20,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/internal/plugintest"
 )
 
-func testStepNewImportState(ctx context.Context, t testing.T, helper *plugintest.Helper, wd *plugintest.WorkingDir, step TestStep, cfg teststep.Config, providers *providerFactories, stepIndex int) error {
+func testStepNewImportState(ctx context.Context, t testing.T, helper *plugintest.Helper, wd *plugintest.WorkingDir, step TestStep, cfg teststep.Config, cfgHcl string, providers *providerFactories, stepIndex int) error {
 	t.Helper()
 
 	configRequest := teststep.PrepareConfigurationRequest{
@@ -31,9 +31,7 @@ func testStepNewImportState(ctx context.Context, t testing.T, helper *plugintest
 			StepNumber: stepIndex + 1,
 			TestName:   t.Name(),
 		},
-	}.Exec()
-
-	testStepConfig := teststep.Configuration(configRequest)
+	}
 
 	if step.ResourceName == "" {
 		t.Fatal("ResourceName is required for an import state test")
@@ -93,13 +91,24 @@ func testStepNewImportState(ctx context.Context, t testing.T, helper *plugintest
 
 	logging.HelperResourceTrace(ctx, fmt.Sprintf("Using import identifier: %s", importId))
 
-	// Create working directory for import tests
-	if testStepConfig == nil {
-		logging.HelperResourceTrace(ctx, "Using prior TestStep Config for import")
-
-		testStepConfig = cfg
+	var testStepConfig teststep.Config
+	if step.ImportStateKind == ImportBlockWithResourceIdentity {
+		cfgHcl += `
+                   import {
+		      to = examplecloud_bucket.storage
+		      id = "test-bucket" // to be replaced with identity
+		   }`
+		configRequest.Raw = cfgHcl
+		testStepConfig = teststep.Configuration(configRequest.Exec())
+	} else {
+		// Create working directory for import tests
 		if testStepConfig == nil {
-			t.Fatal("Cannot import state with no specified config")
+			logging.HelperResourceTrace(ctx, "Using prior TestStep Config for import")
+
+			testStepConfig = cfg
+			if testStepConfig == nil {
+				t.Fatal("Cannot import state with no specified config")
+			}
 		}
 	}
 
@@ -140,7 +149,26 @@ func testStepNewImportState(ctx context.Context, t testing.T, helper *plugintest
 	case ImportBlockWithId:
 		t.Fatalf("not yet implemented")
 	case ImportBlockWithResourceIdentity:
-		t.Fatalf("not yet implemented")
+		if !step.ImportStatePersist {
+			err = runProviderCommand(ctx, t, func() error {
+				return importWd.Init(ctx)
+			}, importWd, providers)
+			if err != nil {
+				t.Fatalf("Error running init: %s", err)
+			}
+		}
+		err = runProviderCommand(ctx, t, func() error {
+			return importWd.CreatePlan(ctx)
+		}, importWd, providers)
+		if err != nil {
+			t.Fatalf("Error running plan: %s", err)
+		}
+		err = runProviderCommand(ctx, t, func() error {
+			return importWd.Apply(ctx)
+		}, importWd, providers)
+		if err != nil {
+			t.Fatalf("Error running apply: %s", err)
+		}
 	default:
 		t.Fatalf(`\o/`)
 	}