What if ... ImportBlockWithResourceIdentity

helper/resource/testing.go

@@ -454,6 +454,14 @@ type ExternalProvider struct {
 	Source            string // the provider source
 }
 
+type ImportStateKind byte
+
+const (
+	TerraformImportCommand ImportStateKind = iota
+	ImportBlockWithId
+	ImportBlockWithResourceIdentity
+)
+
 // TestStep is a single apply sequence of a test, done within the
 // context of a state.
 //
@@ -633,6 +641,12 @@ type TestStep struct {
 	// ID of that resource.
 	ImportState bool
 
+	ImportStateKind ImportStateKind // or ImportStateStrategy or ImportStateSubmode or ImportStateFlavor or ...
+
+	// ImportStateBlockConfig, if non-empty, supplies declarative import
+	// configuration. This is (?mutually exclusive of ImportStateID + ResourceName?).
+	ImportStateBlockConfig string
+
 	// ImportStateId is the ID to perform an ImportState operation with.
 	// This is optional. If it isn't set, then the resource ID is automatically
 	// determined by inspecting the state for ResourceName's ID.

helper/resource/testing_new_import_block_test.go

@@ -0,0 +1,100 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package resource
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
+	"github.com/hashicorp/terraform-plugin-go/tftypes"
+
+	"github.com/hashicorp/terraform-plugin-testing/internal/testing/testprovider"
+	"github.com/hashicorp/terraform-plugin-testing/internal/testing/testsdk/providerserver"
+	"github.com/hashicorp/terraform-plugin-testing/internal/testing/testsdk/resource"
+	"github.com/hashicorp/terraform-plugin-testing/tfversion"
+)
+
+func TestTest_TestStep_ImportBlockVerify(t *testing.T) {
+	t.Parallel()
+
+	UnitTest(t, TestCase{
+		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
+			// import blocks are only available in v1.5.0 and later
+			tfversion.SkipBelow(tfversion.Version1_5_0),
+		},
+		ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
+			"examplecloud": providerserver.NewProviderServer(testprovider.Provider{
+				Resources: map[string]testprovider.Resource{
+					"examplecloud_bucket": exampleCloudBucketResource(t),
+				},
+			}),
+		},
+		Steps: []TestStep{
+			{
+				Config: `
+				resource "examplecloud_bucket" "storage" {
+					bucket = "test-bucket"
+					description = "A bucket for testing."
+				}`,
+			},
+			{
+				ImportState:     true,
+				ImportStateKind: ImportBlockWithResourceIdentity,
+				ResourceName:    "examplecloud_bucket.storage",
+			},
+		},
+	})
+}
+
+func exampleCloudBucketResource(t *testing.T) testprovider.Resource {
+	t.Helper()
+
+	return testprovider.Resource{
+		CreateResponse: &resource.CreateResponse{
+			NewResourceIdentityData: tftypes.NewValue(
+				tftypes.Object{
+					AttributeTypes: map[string]tftypes.Type{
+						"region": tftypes.String,
+						"bucket": tftypes.String,
+					},
+				},
+				map[string]tftypes.Value{
+					"region": tftypes.NewValue(tftypes.String, "test-region"),
+					"bucket": tftypes.NewValue(tftypes.String, "test-bucket"),
+				},
+			),
+			NewState: 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."),
+				},
+			),
+		},
+		ImportStateResponse: &resource.ImportStateResponse{},
+		SchemaResponse: &resource.SchemaResponse{
+			Schema: &tfprotov6.Schema{
+				Block: &tfprotov6.SchemaBlock{
+					Attributes: []*tfprotov6.SchemaAttribute{
+						{
+							Name:     "bucket",
+							Type:     tftypes.String,
+							Required: true,
+						},
+						{
+							Name:     "description",
+							Type:     tftypes.String,
+							Optional: true,
+						},
+					},
+				},
+			},
+		},
+	}
+}

helper/resource/testing_new_import_state.go

@@ -118,23 +118,25 @@
 		t.Fatalf("Error setting test config: %s", err)
 	}
 
-	logging.HelperResourceDebug(ctx, "Running Terraform CLI init and import")
+	switch step.ImportStateKind {
+	case TerraformImportCommand:
+		logging.HelperResourceDebug(ctx, "Running Terraform CLI init and import")
+
+		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)
+			}
+		}
 
-	if !step.ImportStatePersist {
 		err = runProviderCommand(ctx, t, func() error {
-			return importWd.Init(ctx)
+			return importWd.Import(ctx, step.ResourceName, importId)
 		}, importWd, providers)
 		if err != nil {
-			t.Fatalf("Error running init: %s", err)
+			return err
 		}
-	}
-
-	err = runProviderCommand(ctx, t, func() error {
-		return importWd.Import(ctx, step.ResourceName, importId)
-	}, importWd, providers)
-	if err != nil {
-		return err
-	}
 
 	var importState *terraform.State
 	err = runProviderCommand(ctx, t, func() error {
@@ -315,4 +317,4 @@
 	}
 
 	return nil
 }

internal/testing/testsdk/resource/resource.go

@@ -27,8 +27,9 @@ type CreateRequest struct {
 }
 
 type CreateResponse struct {
-	Diagnostics []*tfprotov6.Diagnostic
-	NewState    tftypes.Value
+	Diagnostics             []*tfprotov6.Diagnostic
+	NewState                tftypes.Value
+	NewResourceIdentityData tftypes.Value
 }
 
 type DeleteRequest struct {
@@ -70,6 +71,13 @@ type ReadResponse struct {
 	NewState    tftypes.Value
 }
 
+type ResourceIdentitySchemaRequest struct{}
+
+type ResourceIdentitySchemaResponse struct {
+	Diagnostics            []*tfprotov6.Diagnostic
+	ResourceIdentitySchema tftypes.Value // *tfprotov6.Schema
+}
+
 type SchemaRequest struct{}
 
 type SchemaResponse struct {