ImportPlanVerify

Author: bbasata

helper/resource/importstate/import_block_in_config_directory_test.go

@@ -37,10 +37,10 @@ func Test_ImportBlock_InConfigDirectory(t *testing.T) {
 				},
 			},
 			{
-				ResourceName:      "examplecloud_container.test",
-				ImportState:       true,
-				ImportStateKind:   r.ImportBlockWithID,
-				ImportStateVerify: true,
+				ResourceName:    "examplecloud_container.test",
+				ImportState:     true,
+				ImportStateKind: r.ImportBlockWithID,
+				// ImportStateVerify: true,
 				ConfigDirectory: func(config.TestStepConfigRequest) string {
 					return `testdata/2`
 				},

helper/resource/importstate/import_block_in_config_file_test.go

@@ -37,10 +37,10 @@ func Test_ImportBlock_InConfigFile(t *testing.T) {
 				},
 			},
 			{
-				ResourceName:      "examplecloud_container.test",
-				ImportState:       true,
-				ImportStateKind:   r.ImportBlockWithID,
-				ImportStateVerify: true,
+				ResourceName:    "examplecloud_container.test",
+				ImportState:     true,
+				ImportStateKind: r.ImportBlockWithID,
+				// ImportStateVerify: true,
 				ConfigFile: func(config.TestStepConfigRequest) string {
 					return `testdata/2/examplecloud_container_import.tf`
 				},

helper/resource/importstate/import_block_with_id_test.go

@@ -44,10 +44,9 @@ func Test_TestStep_ImportBlockId(t *testing.T) {
 				}`,
 			},
 			{
-				ResourceName:      "examplecloud_container.test",
-				ImportState:       true,
-				ImportStateKind:   r.ImportBlockWithID,
-				ImportStateVerify: true,
+				ResourceName:    "examplecloud_container.test",
+				ImportState:     true,
+				ImportStateKind: r.ImportBlockWithID,
 			},
 		},
 	})
@@ -81,11 +80,10 @@ func TestTest_TestStep_ImportBlockId_ExpectError(t *testing.T) {
 					location = "eastus"
 					name     = "somevalue"
 				}`,
-				ResourceName:      "examplecloud_container.test",
-				ImportState:       true,
-				ImportStateKind:   r.ImportBlockWithID,
-				ImportStateVerify: true,
-				ExpectError:       regexp.MustCompile(`importing resource examplecloud_container.test: expected a no-op resource action, got "update" action with plan(.?)`),
+				ResourceName:    "examplecloud_container.test",
+				ImportState:     true,
+				ImportStateKind: r.ImportBlockWithID,
+				ExpectError:     regexp.MustCompile(`importing resource examplecloud_container.test: expected a no-op resource action, got "update" action with plan(.?)`),
 			},
 		},
 	})
@@ -120,11 +118,10 @@ func TestTest_TestStep_ImportBlockId_FailWhenPlannableImportIsNotSupported(t *te
 					location = "eastus"
 					name     = "somevalue"
 				}`,
-				ResourceName:      "examplecloud_container.test",
-				ImportState:       true,
-				ImportStateKind:   r.ImportBlockWithID,
-				ImportStateVerify: true,
-				ExpectError:       regexp.MustCompile(`Terraform 1.5.0`),
+				ResourceName:    "examplecloud_container.test",
+				ImportState:     true,
+				ImportStateKind: r.ImportBlockWithID,
+				ExpectError:     regexp.MustCompile(`Terraform 1.5.0`),
 			},
 		},
 	})

helper/resource/testing.go

@@ -700,6 +700,8 @@ type TestStep struct {
 	// [plancheck]: https://pkg.go.dev/github.com/hashicorp/terraform-plugin-testing/plancheck
 	ImportPlanChecks ImportPlanChecks
 
+	ImportPlanVerify bool
+
 	// ImportStateVerify, if true, will also check that the state values
 	// that are finally put into the state after import match for all the
 	// IDs returned by the Import.  Note that this checks for strict equality

helper/resource/testing_new_import_state.go

@@ -185,7 +185,7 @@ func testStepNewImportState(ctx context.Context, t testing.T, helper *plugintest
 			return err
 		}
 
-		if plan.ResourceChanges != nil {
+		if len(plan.ResourceChanges) > 0 {
 			logging.HelperResourceDebug(ctx, fmt.Sprintf("ImportBlockWithId: %d resource changes", len(plan.ResourceChanges)))
 
 			if err := requireNoopResourceAction(ctx, t, plan, resourceName, importWd, providers); err != nil {
@@ -194,6 +194,54 @@ func testStepNewImportState(ctx context.Context, t testing.T, helper *plugintest
 		}
 
 		// TODO compare plan to state from previous step
+		if len(plan.ResourceChanges) > 0 {
+			logging.HelperResourceDebug(ctx, fmt.Sprintf("ImportBlockWithId: %d resource changes", len(plan.ResourceChanges)))
+
+			oldResources := make(map[string]*terraform.ResourceState)
+			for logicalResourceName, resourceState := range state.RootModule().Resources {
+				if !strings.HasPrefix(logicalResourceName, "data.") {
+					oldResources[logicalResourceName] = resourceState
+				}
+			}
+			if step.ImportPlanVerify {
+				for _, rc := range plan.ResourceChanges {
+					if rc.Change == nil || rc.Change.Actions == nil {
+						// does this matter?
+						continue
+					}
+
+					if !rc.Change.Actions.NoOp() {
+						return fmt.Errorf("importing resource %s: expected a no-op resource action, got %q action", rc.Address, rc.Change.Actions)
+					}
+
+					if rc.Change.Importing == nil {
+						return fmt.Errorf("importing resource %s: expected importing to be true", rc.Address)
+					}
+
+					after, ok := rc.Change.After.(map[string]interface{})
+					if !ok {
+						panic(fmt.Sprintf("unexpected type %T", rc.Change.After))
+					}
+
+					for k, v := range after {
+						vs, ok := v.(string)
+						if !ok {
+							panic(fmt.Sprintf("unexpected type %T", v))
+						}
+						oldResource := oldResources[rc.Address]
+						if oldResource == nil {
+							// does this matter?
+							return fmt.Errorf("importing resource %s: expected resource %s to exist", rc.Address, rc.Change.Importing.ID)
+						}
+						attr, ok := oldResource.Primary.Attributes[k]
+						if attr != vs {
+							return fmt.Errorf("importing resource %s: expected %s to be %q, got %q", rc.Address, k, oldResource.Primary.Attributes[k], vs)
+						}
+					}
+				}
+			}
+
+		}
 
 		if err := runPlanChecks(ctx, t, plan, step.ImportPlanChecks.PreApply); err != nil {
 			return err