Only check that the import stub is non-null when importing by ID (#36990)

dbanck · web-flow · commit 49e8b56b3226 · 2025-05-07T15:16:19.000+02:00
diff --git a/internal/terraform/node_resource_plan_instance.go b/internal/terraform/node_resource_plan_instance.go
@@ -778,7 +778,7 @@ func (n *NodePlannableResourceInstance) importState(ctx EvalContext, addr addrs.
 	}
 
 	importedState := states.NewResourceInstanceObjectFromIR(imported[0])
-	if deferred == nil && importedState.Value.IsNull() {
+	if deferred == nil && !importTarget.Type().IsObjectType() && importedState.Value.IsNull() {
 		// It's actually okay for a deferred import to have returned a null.
 		diags = diags.Append(tfdiags.Sourceless(
 			tfdiags.Error,

Original file line number	Diff line number	Diff line change
`@@ -778,7 +778,7 @@ func (n *NodePlannableResourceInstance) importState(ctx EvalContext, addr addrs.`
`778`	`778`	`}`
`779`	`779`
`780`	`780`	`importedState := states.NewResourceInstanceObjectFromIR(imported[0])`
`781`		`- if deferred == nil && importedState.Value.IsNull() {`
	`781`	`+ if deferred == nil && !importTarget.Type().IsObjectType() && importedState.Value.IsNull() {`
`782`	`782`	`// It's actually okay for a deferred import to have returned a null.`
`783`	`783`	`diags = diags.Append(tfdiags.Sourceless(`
`784`	`784`	`tfdiags.Error,`