Backport #555

Ignore data sources when verifying imported state.

helper/resource/testing_new_import_state.go

@@ -108,7 +108,15 @@ func testStepNewImportState(t *testing.T, c TestCase, wd *tftest.WorkingDir, ste
 		for _, r := range new {
 			// Find the existing resource
 			var oldR *terraform.ResourceState
-			for _, r2 := range old {
+			for r2Key, r2 := range old {
+				// Ensure that we do not match against data sources as they
+				// cannot be imported and are not what we want to verify.
+				// Mode is not present in ResourceState so we use the
+				// stringified ResourceStateKey for comparison.
+				if strings.HasPrefix(r2Key, "data.") {
+					continue
+				}
+
 				if r2.Primary != nil && r2.Primary.ID == r.Primary.ID && r2.Type == r.Type && r2.Provider == r.Provider {
 					oldR = r2
 					break