Fix identity values comparison when using ConfigFile

Author: bbasata

helper/resource/importstate/import_block_in_config_file_test.go

@@ -43,3 +43,31 @@ func TestImportBlock_InConfigFile(t *testing.T) {
 		},
 	})
 }
+
+func TestImportBlock_WithResourceIdentity_InConfigFile(t *testing.T) {
+	t.Parallel()
+
+	r.UnitTest(t, r.TestCase{
+		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
+			tfversion.SkipBelow(tfversion.Version1_5_0), // ImportBlockWithID requires Terraform 1.5.0 or later
+		},
+		ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
+			"examplecloud": providerserver.NewProviderServer(testprovider.Provider{
+				Resources: map[string]testprovider.Resource{
+					"examplecloud_container": examplecloudResource(),
+				},
+			}),
+		},
+		Steps: []r.TestStep{
+			{
+				ConfigFile: config.StaticFile(`testdata/1/examplecloud_container.tf`),
+			},
+			{
+				ResourceName:    "examplecloud_container.test",
+				ImportState:     true,
+				ImportStateKind: r.ImportBlockWithResourceIdentity,
+				ConfigFile:      config.StaticFile(`testdata/examplecloud_container_import_with_identity.tf`),
+			},
+		},
+	})
+}

helper/resource/importstate/testdata/examplecloud_container_import_with_identity.tf

@@ -0,0 +1,14 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+resource "examplecloud_container" "test" {
+  name     = "somevalue"
+  location = "westeurope"
+}
+
+import {
+  to = examplecloud_container.test
+  identity = {
+    id = "examplecloud_container.test"
+  }
+}

helper/resource/testing_new_import_state.go

@@ -110,16 +110,19 @@ func testStepNewImportState(ctx context.Context, t testing.T, helper *plugintest
 
 	var priorIdentityValues map[string]any
 
+	if kind.plannable() && kind.resourceIdentity() {
+		priorIdentityValues = identityValuesFromState(stateJSON, resourceName)
+		if len(priorIdentityValues) == 0 {
+			return fmt.Errorf("importing resource %s: expected prior state to have resource identity values, got none", resourceName)
+		}
+	}
+
 	// Append to previous step config unless using explicit inline Config, or ConfigFile, or ConfigDirectory
 	if testStepConfig == nil && step.ConfigFile == nil && step.ConfigDirectory == nil {
 		logging.HelperResourceTrace(ctx, "Using prior TestStep Config for import")
 		importConfig := cfgRaw
 
 		if kind.plannable() && kind.resourceIdentity() {
-			priorIdentityValues = identityValuesFromState(stateJSON, resourceName)
-			if len(priorIdentityValues) == 0 {
-				return fmt.Errorf("importing resource %s: expected prior state to have resource identity values, got none", resourceName)
-			}
 			importConfig = appendImportBlockWithIdentity(importConfig, resourceName, priorIdentityValues)
 		} else if kind.plannable() {
 			importConfig = appendImportBlock(importConfig, resourceName, importId)