Fail ImportStateVerify if no new resources are imported

Author: bbasata

helper/resource/importstate/import_block_as_first_step_test.go

@@ -38,12 +38,10 @@ func Test_ImportBlock_AsFirstStep(t *testing.T) {
 				ImportStateId:   "examplecloud_container.test",
 				ImportState:     true,
 				ImportStateKind: r.ImportBlockWithID,
-				// ImportStateVerify: true,
 				Config: `resource "examplecloud_container" "test" {
 					name = "somevalue"
 					location = "westeurope"
 				}`,
-				ImportStatePersist: true,
 				ImportPlanChecks: r.ImportPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction("examplecloud_container.test", plancheck.ResourceActionNoop),

helper/resource/importstate/import_block_with_id_test.go

@@ -200,6 +200,11 @@ func TestTest_TestStep_ImportBlockId_ImportStateVerifyIgnore_Real_Example(t *tes
 			I also need to omit the `password` in the import config, otherwise the value in the config is used when importing the
 		    with an import block and the test ends up passing regardless of whether `ImportStateVerifyIgnore` has been specified or not
 	*/
+
+	// Skipped while we decide whether ImportBlockWithID will perform an apply; else, it will not produce a new state,
+	// and there is no new state for ImportStateVerify to do anything meaningful with.
+	t.Skip()
+
 	t.Parallel()
 
 	r.UnitTest(t, r.TestCase{
@@ -301,6 +306,10 @@ func TestTest_TestStep_ImportBlockId_ImportStateVerifyIgnore_Real_Example(t *tes
 }
 
 func TestTest_TestStep_ImportBlockId_ImportStateVerifyIgnore(t *testing.T) {
+	// Skipped while we decide whether ImportBlockWithID will perform an apply; else, it will not produce a new state,
+	// and there is no new state for ImportStateVerify to do anything meaningful with.
+	t.Skip()
+
 	t.Parallel()
 
 	r.UnitTest(t, r.TestCase{

helper/resource/importstate/import_command_with_id_test.go

@@ -20,7 +20,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
-func Test_TestStep_ImportStateCheck_SkipDataSourceState(t *testing.T) {
+func Test_ImportCommmandWithId_SkipDataSourceState(t *testing.T) {
 	t.Parallel()
 
 	r.UnitTest(t, r.TestCase{
@@ -123,7 +123,7 @@ func Test_TestStep_ImportStateCheck_SkipDataSourceState(t *testing.T) {
 	})
 }
 
-func Test_TestStep_ImportStateVerify(t *testing.T) {
+func Test_ImportCommandWithId_ImportStateVerify(t *testing.T) {
 	t.Parallel()
 
 	r.UnitTest(t, r.TestCase{

helper/resource/testing_new_import_state.go

@@ -254,6 +254,10 @@ func testStepNewImportState(ctx context.Context, t testing.T, helper *plugintest
 			identifierAttribute = "id"
 		}
 
+		if len(newResources) == 0 {
+			return fmt.Errorf("ImportStateVerify: no new resources imported")
+		}
+
 		for _, r := range newResources {
 			rIdentifier, ok := r.Primary.Attributes[identifierAttribute]