remove ImportTarget.ID field

internal/command/import.go

@@ -240,7 +240,9 @@ func (c *ImportCommand) Run(args []string) int {
 
 				// In the import block, the ID can be an arbitrary hcl.Expression,
 				// but here it's always interpreted as a literal string.
-				ID: hcl.StaticExpr(cty.StringVal(args[1]), configs.SynthBody("import", nil).MissingItemRange()),
+				Config: &configs.Import{
+					ID: hcl.StaticExpr(cty.StringVal(args[1]), configs.SynthBody("import", nil).MissingItemRange()),
+				},
 			},
 		},
 

internal/terraform/context_import.go

@@ -6,7 +6,6 @@ package terraform
 import (
 	"log"
 
-	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/terraform/internal/addrs"
 	"github.com/hashicorp/terraform/internal/configs"
 	"github.com/hashicorp/terraform/internal/states"
@@ -34,9 +33,7 @@ type ImportTarget struct {
 	// when using the import command.
 	LegacyAddr addrs.AbsResourceInstance
 
-	// ID is the ID of the resource to import. This is resource-specific.
-	// TODO: the expression is evaluated from Config.
-	ID       hcl.Expression
+	// isString stores the evaluated ID from the Config for the import process.
 	idString string
 }
 

internal/terraform/context_plan.go

@@ -561,7 +561,6 @@ func (c *Context) findImportTargets(config *configs.Config, priorState *states.S
 		// TODO: partial filtering here
 		//if priorState.ResourceInstance(ic.To) == nil {
 		importTargets = append(importTargets, &ImportTarget{
-			ID:     ic.ID,
 			Config: ic,
 		})
 		//}

internal/terraform/node_resource_plan.go

@@ -346,7 +346,7 @@ func (n nodeExpandPlannableResource) expandResourceImports(ctx EvalContext, addr
 		}
 
 		if imp.Config.ForEach == nil {
-			importID, evalDiags := evaluateImportIdExpression(imp.ID, ctx, EvalDataForNoInstanceKey)
+			importID, evalDiags := evaluateImportIdExpression(imp.Config.ID, ctx, EvalDataForNoInstanceKey)
 			diags = diags.Append(evalDiags)
 			if diags.HasErrors() {
 				return imports, diags
@@ -373,7 +373,7 @@ func (n nodeExpandPlannableResource) expandResourceImports(ctx EvalContext, addr
 				return imports, diags
 			}
 
-			importID, evalDiags := evaluateImportIdExpression(imp.ID, ctx, keyData)
+			importID, evalDiags := evaluateImportIdExpression(imp.Config.ID, ctx, keyData)
 			diags = diags.Append(evalDiags)
 			if diags.HasErrors() {
 				return imports, diags

internal/terraform/node_resource_plan_instance.go

@@ -509,7 +509,7 @@ func (n *NodePlannableResourceInstance) importState(ctx EvalContext, addr addrs.
 			"Import returned null resource",
 			fmt.Sprintf("While attempting to import with ID %s, the provider"+
 				"returned an instance with no state.",
-				n.importTarget.ID,
+				n.importTarget.idString,
 			),
 		))
 	}