ElaborateFromConfigBody handles deeply nested paths more precisely

DanielMSchmidt · DanielMSchmidt · commit 0219ba05dbed · 2026-02-03T13:26:57.000+01:00
diff --git a/internal/deprecation/deprecation.go b/internal/deprecation/deprecation.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/terraform/internal/addrs"
+	"github.com/hashicorp/terraform/internal/configs/configschema"
 	"github.com/hashicorp/terraform/internal/lang/marks"
 	"github.com/hashicorp/terraform/internal/tfdiags"
 	"github.com/zclconf/go-cty/cty"
@@ -85,7 +86,7 @@ func (d *Deprecations) deprecationMarksToDiagnostics(deprecationMarks []marks.De
 // ValidateAsConfig checks the given value for deprecation marks and returns diagnostics
 // for each deprecation found, unless deprecation warnings are suppressed for the given module.
 // It checks for deeply nested deprecation marks as well.
-func (d *Deprecations) ValidateAsConfig(value cty.Value, module addrs.Module) tfdiags.Diagnostics {
+func (d *Deprecations) ValidateAsConfig(value cty.Value, schema *configschema.Block, module addrs.Module) tfdiags.Diagnostics {
 	var diags tfdiags.Diagnostics
 	_, pvms := value.UnmarkDeepWithPaths()
 
diff --git a/internal/terraform/node_action_instance.go b/internal/terraform/node_action_instance.go
@@ -71,7 +71,7 @@ func (n *NodeActionDeclarationInstance) Execute(ctx EvalContext, _ walkOperation
 		valDiags := validateResourceForbiddenEphemeralValues(ctx, configVal, n.Schema.ConfigSchema)
 		diags = diags.Append(valDiags.InConfigBody(n.Config.Config, n.Addr.String()))
 
-		deprecationDiags := ctx.Deprecations().ValidateAsConfig(configVal, n.ModulePath())
+		deprecationDiags := ctx.Deprecations().ValidateAsConfig(configVal, n.Schema.ConfigSchema, n.ModulePath())
 		diags = diags.Append(deprecationDiags.InConfigBody(n.Config.Config, n.Addr.String()))
 
 		if diags.HasErrors() {
diff --git a/internal/terraform/node_action_partialexp.go b/internal/terraform/node_action_partialexp.go
@@ -69,7 +69,7 @@ func (n *NodeActionDeclarationPartialExpanded) Execute(ctx EvalContext, op walkO
 			return diags
 		}
 
-		deprecationDiags := ctx.Deprecations().ValidateAsConfig(configVal, n.ActionAddr().Module)
+		deprecationDiags := ctx.Deprecations().ValidateAsConfig(configVal, n.Schema.ConfigSchema, n.ActionAddr().Module)
 		diags = diags.Append(deprecationDiags)
 		if diags.HasErrors() {
 			return diags
diff --git a/internal/terraform/node_action_validate.go b/internal/terraform/node_action_validate.go
@@ -102,7 +102,7 @@ func (n *NodeValidatableAction) Execute(ctx EvalContext, _ walkOperation) tfdiag
 		}
 	}
 
-	diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, n.ModulePath()).InConfigBody(n.Config.Config, n.Addr.String()))
+	diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, schema.ConfigSchema, n.ModulePath()).InConfigBody(n.Config.Config, n.Addr.String()))
 
 	valDiags = validateResourceForbiddenEphemeralValues(ctx, configVal, schema.ConfigSchema)
 	diags = diags.Append(valDiags.InConfigBody(config, n.Addr.String()))
diff --git a/internal/terraform/node_provider.go b/internal/terraform/node_provider.go
@@ -83,7 +83,7 @@ func (n *NodeApplyableProvider) ValidateProvider(ctx EvalContext, provider provi
 		return diags
 	}
 
-	deprecationDiags := ctx.Deprecations().ValidateAsConfig(configVal, n.Addr.Module)
+	deprecationDiags := ctx.Deprecations().ValidateAsConfig(configVal, configSchema, n.Addr.Module)
 	diags = diags.Append(deprecationDiags.InConfigBody(configBody, n.Addr.String()))
 	if diags.HasErrors() {
 		return diags
diff --git a/internal/terraform/node_resource_abstract_instance.go b/internal/terraform/node_resource_abstract_instance.go
@@ -869,7 +869,7 @@ func (n *NodeAbstractResourceInstance) plan(
 	diags = diags.Append(
 		validateResourceForbiddenEphemeralValues(ctx, origConfigVal, schema.Body).InConfigBody(n.Config.Config, n.Addr.String()),
 	)
-	diags = diags.Append(ctx.Deprecations().ValidateAsConfig(origConfigVal, n.ModulePath()).InConfigBody(n.Config.Config, n.Addr.String()))
+	diags = diags.Append(ctx.Deprecations().ValidateAsConfig(origConfigVal, schema.Body, n.ModulePath()).InConfigBody(n.Config.Config, n.Addr.String()))
 	if diags.HasErrors() {
 		return nil, nil, deferred, keyData, diags
 	}
@@ -1788,7 +1788,7 @@ func (n *NodeAbstractResourceInstance) providerMetas(ctx EvalContext) (cty.Value
 				metaConfigVal, _, configDiags = ctx.EvaluateBlock(m.Config, providerSchema.ProviderMeta.Body, nil, EvalDataForNoInstanceKey)
 				diags = diags.Append(configDiags)
 				diags = diags.Append(
-					ctx.Deprecations().ValidateAsConfig(metaConfigVal, ctx.Path().Module()).InConfigBody(m.Config, n.Addr.String()),
+					ctx.Deprecations().ValidateAsConfig(metaConfigVal, providerSchema.ProviderMeta.Body, ctx.Path().Module()).InConfigBody(m.Config, n.Addr.String()),
 				)
 				metaConfigVal = marks.RemoveDeprecationMarks(metaConfigVal)
 			}
@@ -1868,7 +1868,7 @@ func (n *NodeAbstractResourceInstance) planDataSource(ctx EvalContext, checkRule
 		validateResourceForbiddenEphemeralValues(ctx, configVal, schema.Body).InConfigBody(n.Config.Config, n.Addr.String()),
 	)
 	diags = diags.Append(
-		ctx.Deprecations().ValidateAsConfig(configVal, ctx.Path().Module()).InConfigBody(n.Config.Config, n.Addr.String()),
+		ctx.Deprecations().ValidateAsConfig(configVal, schema.Body, ctx.Path().Module()).InConfigBody(n.Config.Config, n.Addr.String()),
 	)
 	configVal = marks.RemoveDeprecationMarks(configVal)
 	if diags.HasErrors() {
@@ -2209,7 +2209,7 @@ func (n *NodeAbstractResourceInstance) applyDataSource(ctx EvalContext, planned
 	}
 
 	diags = diags.Append(
-		ctx.Deprecations().ValidateAsConfig(configVal, n.ModulePath()).InConfigBody(n.Config.Config, n.Addr.String()),
+		ctx.Deprecations().ValidateAsConfig(configVal, schema.Body, n.ModulePath()).InConfigBody(n.Config.Config, n.Addr.String()),
 	)
 	if diags.HasErrors() {
 		return nil, keyData, diags
@@ -2527,7 +2527,7 @@ func (n *NodeAbstractResourceInstance) evalProvisionerConfig(ctx EvalContext, bo
 
 	config, _, configDiags := ctx.EvaluateBlock(body, schema, n.ResourceInstanceAddr().Resource, keyData)
 	diags = diags.Append(configDiags)
-	diags = diags.Append(ctx.Deprecations().ValidateAsConfig(config, n.ModulePath()).InConfigBody(body, n.Addr.String()))
+	diags = diags.Append(ctx.Deprecations().ValidateAsConfig(config, schema, n.ModulePath()).InConfigBody(body, n.Addr.String()))
 	config = marks.RemoveDeprecationMarks(config)
 
 	return config, diags
@@ -2546,7 +2546,7 @@ func (n *NodeAbstractResourceInstance) evalDestroyProvisionerConfig(ctx EvalCont
 	evalScope := ctx.EvaluationScope(n.ResourceInstanceAddr().Resource, nil, keyData)
 	config, evalDiags := evalScope.EvalSelfBlock(body, self, schema, keyData)
 	diags = diags.Append(evalDiags)
-	diags = diags.Append(ctx.Deprecations().ValidateAsConfig(config, n.ModulePath()).InConfigBody(body, n.Addr.String()))
+	diags = diags.Append(ctx.Deprecations().ValidateAsConfig(config, schema, n.ModulePath()).InConfigBody(body, n.Addr.String()))
 	config = marks.RemoveDeprecationMarks(config)
 	return config, diags
 }
diff --git a/internal/terraform/node_resource_ephemeral.go b/internal/terraform/node_resource_ephemeral.go
@@ -76,7 +76,7 @@ func ephemeralResourceOpen(ctx EvalContext, inp ephemeralResourceInput) (*provid
 	if diags.HasErrors() {
 		return nil, diags
 	}
-	diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, ctx.Path().Module()).InConfigBody(config.Config, inp.addr.String()))
+	diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, schema.Body, ctx.Path().Module()).InConfigBody(config.Config, inp.addr.String()))
 	if diags.HasErrors() {
 		return nil, diags
 	}
diff --git a/internal/terraform/node_resource_plan_instance.go b/internal/terraform/node_resource_plan_instance.go
@@ -662,7 +662,7 @@ func (n *NodePlannableResourceInstance) importState(ctx EvalContext, addr addrs.
 			diags = diags.Append(configDiags)
 			return nil, deferred, diags
 		}
-		diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, n.ModulePath()).InConfigBody(n.Config.Config, absAddr.String()))
+		diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, schema.Body, n.ModulePath()).InConfigBody(n.Config.Config, absAddr.String()))
 		if diags.HasErrors() {
 			return nil, deferred, diags
 		}
diff --git a/internal/terraform/node_resource_plan_instance_query.go b/internal/terraform/node_resource_plan_instance_query.go
@@ -51,7 +51,7 @@ func (n *NodePlannableResourceInstance) listResourceExecute(ctx EvalContext) (di
 		return diags
 	}
 
-	diags = diags.Append(ctx.Deprecations().ValidateAsConfig(blockVal, n.ModulePath()).InConfigBody(config.Config, n.Addr.String()))
+	diags = diags.Append(ctx.Deprecations().ValidateAsConfig(blockVal, schema.FullSchema, n.ModulePath()).InConfigBody(config.Config, n.Addr.String()))
 	if diags.HasErrors() {
 		return diags
 	}
diff --git a/internal/terraform/node_resource_plan_partialexp.go b/internal/terraform/node_resource_plan_partialexp.go
@@ -200,7 +200,7 @@ func (n *nodePlannablePartialExpandedResource) managedResourceExecute(ctx EvalCo
 		return &change, diags
 	}
 
-	diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, n.ResourceAddr().Module).InConfigBody(n.config.Config, n.addr.String()))
+	diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, schema.Body, n.ResourceAddr().Module).InConfigBody(n.config.Config, n.addr.String()))
 	if diags.HasErrors() {
 		return &change, diags
 	}
@@ -359,7 +359,7 @@ func (n *nodePlannablePartialExpandedResource) dataResourceExecute(ctx EvalConte
 		return &change, diags
 	}
 
-	diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, n.ResourceAddr().Module).InConfigBody(n.config.Config, n.addr.String()))
+	diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, schema.Body, n.ResourceAddr().Module).InConfigBody(n.config.Config, n.addr.String()))
 	if diags.HasErrors() {
 		return &change, diags
 	}
diff --git a/internal/terraform/node_resource_validate.go b/internal/terraform/node_resource_validate.go
@@ -144,7 +144,7 @@ func (n *NodeValidatableResource) evaluateBlock(ctx EvalContext, body hcl.Body,
 	keyData, selfAddr := n.stubRepetitionData(n.Config.Count != nil, n.Config.ForEach != nil)
 
 	val, hclBody, diags := ctx.EvaluateBlock(body, schema, selfAddr, keyData)
-	diags = diags.Append(ctx.Deprecations().ValidateAsConfig(val, n.Addr.Module).InConfigBody(body, n.Addr.String()))
+	diags = diags.Append(ctx.Deprecations().ValidateAsConfig(val, schema, n.Addr.Module).InConfigBody(body, n.Addr.String()))
 
 	return marks.RemoveDeprecationMarks(val), hclBody, diags
 }
@@ -360,7 +360,7 @@ func (n *NodeValidatableResource) validateResource(ctx EvalContext) tfdiags.Diag
 		diags = diags.Append(
 			validateResourceForbiddenEphemeralValues(ctx, configVal, schema.Body).InConfigBody(n.Config.Config, n.Addr.String()),
 		)
-		diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, n.ModulePath()).InConfigBody(n.Config.Config, n.Addr.String()))
+		diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, schema.Body, n.ModulePath()).InConfigBody(n.Config.Config, n.Addr.String()))
 
 		if n.Config.Managed != nil { // can be nil only in tests with poorly-configured mocks
 			for _, traversal := range n.Config.Managed.IgnoreChanges {
@@ -440,7 +440,7 @@ func (n *NodeValidatableResource) validateResource(ctx EvalContext) tfdiags.Diag
 		diags = diags.Append(
 			validateResourceForbiddenEphemeralValues(ctx, configVal, schema.Body).InConfigBody(n.Config.Config, n.Addr.String()),
 		)
-		diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, n.ModulePath()))
+		diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, schema.Body, n.ModulePath()))
 
 		// Use unmarked value for validate request
 		unmarkedConfigVal, _ := configVal.UnmarkDeep()
@@ -469,7 +469,7 @@ func (n *NodeValidatableResource) validateResource(ctx EvalContext) tfdiags.Diag
 			return diags
 		}
 		diags = diags.Append(
-			ctx.Deprecations().ValidateAsConfig(configVal, n.ModulePath()).InConfigBody(n.Config.Config, n.Addr.String()),
+			ctx.Deprecations().ValidateAsConfig(configVal, schema.Body, n.ModulePath()).InConfigBody(n.Config.Config, n.Addr.String()),
 		)
 		// Use unmarked value for validate request
 		unmarkedConfigVal, _ := configVal.UnmarkDeep()
@@ -479,7 +479,6 @@ func (n *NodeValidatableResource) validateResource(ctx EvalContext) tfdiags.Diag
 		}
 
 		resp := provider.ValidateEphemeralResourceConfig(req)
-		diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, n.ModulePath()))
 		diags = diags.Append(resp.Diagnostics.InConfigBody(n.Config.Config, n.Addr.String()))
 	case addrs.ListResourceMode:
 		schema := providerSchema.SchemaForListResourceType(n.Config.Type)
@@ -503,7 +502,8 @@ func (n *NodeValidatableResource) validateResource(ctx EvalContext) tfdiags.Diag
 			if valDiags.HasErrors() {
 				return diags
 			}
-			diags = diags.Append(ctx.Deprecations().ValidateAsConfig(blockVal, n.ModulePath()))
+			deprecationDiags := ctx.Deprecations().ValidateAsConfig(blockVal, schema.FullSchema, n.ModulePath())
+			diags = diags.Append(deprecationDiags.InConfigBody(n.Config.Config, n.Addr.String()))
 		}
 
 		if n.Config.List.Limit != nil {
diff --git a/internal/tfdiags/contextual.go b/internal/tfdiags/contextual.go
diff --git a/internal/tfdiags/contextual_test.go b/internal/tfdiags/contextual_test.go

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func (n *NodeActionDeclarationPartialExpanded) Execute(ctx EvalContext, op walkO`
`69`	`69`	`return diags`
`70`	`70`	`}`
`71`	`71`
`72`		`- deprecationDiags := ctx.Deprecations().ValidateAsConfig(configVal, n.ActionAddr().Module)`
	`72`	`+ deprecationDiags := ctx.Deprecations().ValidateAsConfig(configVal, n.Schema.ConfigSchema, n.ActionAddr().Module)`
`73`	`73`	`diags = diags.Append(deprecationDiags)`
`74`	`74`	`if diags.HasErrors() {`
`75`	`75`	`return diags`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ func (n *NodeValidatableAction) Execute(ctx EvalContext, _ walkOperation) tfdiag`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`
`105`		`- diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, n.ModulePath()).InConfigBody(n.Config.Config, n.Addr.String()))`
	`105`	`+ diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, schema.ConfigSchema, n.ModulePath()).InConfigBody(n.Config.Config, n.Addr.String()))`
`106`	`106`
`107`	`107`	`valDiags = validateResourceForbiddenEphemeralValues(ctx, configVal, schema.ConfigSchema)`
`108`	`108`	`diags = diags.Append(valDiags.InConfigBody(config, n.Addr.String()))`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ func (n *NodeApplyableProvider) ValidateProvider(ctx EvalContext, provider provi`
`83`	`83`	`return diags`
`84`	`84`	`}`
`85`	`85`
`86`		`- deprecationDiags := ctx.Deprecations().ValidateAsConfig(configVal, n.Addr.Module)`
	`86`	`+ deprecationDiags := ctx.Deprecations().ValidateAsConfig(configVal, configSchema, n.Addr.Module)`
`87`	`87`	`diags = diags.Append(deprecationDiags.InConfigBody(configBody, n.Addr.String()))`
`88`	`88`	`if diags.HasErrors() {`
`89`	`89`	`return diags`
Original file line number	Diff line number	Diff line change
`@@ -869,7 +869,7 @@ func (n *NodeAbstractResourceInstance) plan(`
`869`	`869`	`diags = diags.Append(`
`870`	`870`	`validateResourceForbiddenEphemeralValues(ctx, origConfigVal, schema.Body).InConfigBody(n.Config.Config, n.Addr.String()),`
`871`	`871`	`)`
`872`		`- diags = diags.Append(ctx.Deprecations().ValidateAsConfig(origConfigVal, n.ModulePath()).InConfigBody(n.Config.Config, n.Addr.String()))`
	`872`	`+ diags = diags.Append(ctx.Deprecations().ValidateAsConfig(origConfigVal, schema.Body, n.ModulePath()).InConfigBody(n.Config.Config, n.Addr.String()))`
`873`	`873`	`if diags.HasErrors() {`
`874`	`874`	`return nil, nil, deferred, keyData, diags`
`875`	`875`	`}`
`@@ -1788,7 +1788,7 @@ func (n *NodeAbstractResourceInstance) providerMetas(ctx EvalContext) (cty.Value`
`1788`	`1788`	`metaConfigVal, _, configDiags = ctx.EvaluateBlock(m.Config, providerSchema.ProviderMeta.Body, nil, EvalDataForNoInstanceKey)`
`1789`	`1789`	`diags = diags.Append(configDiags)`
`1790`	`1790`	`diags = diags.Append(`
`1791`		`- ctx.Deprecations().ValidateAsConfig(metaConfigVal, ctx.Path().Module()).InConfigBody(m.Config, n.Addr.String()),`
	`1791`	`+ ctx.Deprecations().ValidateAsConfig(metaConfigVal, providerSchema.ProviderMeta.Body, ctx.Path().Module()).InConfigBody(m.Config, n.Addr.String()),`
`1792`	`1792`	`)`
`1793`	`1793`	`metaConfigVal = marks.RemoveDeprecationMarks(metaConfigVal)`
`1794`	`1794`	`}`
`@@ -1868,7 +1868,7 @@ func (n *NodeAbstractResourceInstance) planDataSource(ctx EvalContext, checkRule`
`1868`	`1868`	`validateResourceForbiddenEphemeralValues(ctx, configVal, schema.Body).InConfigBody(n.Config.Config, n.Addr.String()),`
`1869`	`1869`	`)`
`1870`	`1870`	`diags = diags.Append(`
`1871`		`- ctx.Deprecations().ValidateAsConfig(configVal, ctx.Path().Module()).InConfigBody(n.Config.Config, n.Addr.String()),`
	`1871`	`+ ctx.Deprecations().ValidateAsConfig(configVal, schema.Body, ctx.Path().Module()).InConfigBody(n.Config.Config, n.Addr.String()),`
`1872`	`1872`	`)`
`1873`	`1873`	`configVal = marks.RemoveDeprecationMarks(configVal)`
`1874`	`1874`	`if diags.HasErrors() {`
`@@ -2209,7 +2209,7 @@ func (n *NodeAbstractResourceInstance) applyDataSource(ctx EvalContext, planned`
`2209`	`2209`	`}`
`2210`	`2210`
`2211`	`2211`	`diags = diags.Append(`
`2212`		`- ctx.Deprecations().ValidateAsConfig(configVal, n.ModulePath()).InConfigBody(n.Config.Config, n.Addr.String()),`
	`2212`	`+ ctx.Deprecations().ValidateAsConfig(configVal, schema.Body, n.ModulePath()).InConfigBody(n.Config.Config, n.Addr.String()),`
`2213`	`2213`	`)`
`2214`	`2214`	`if diags.HasErrors() {`
`2215`	`2215`	`return nil, keyData, diags`
`@@ -2527,7 +2527,7 @@ func (n *NodeAbstractResourceInstance) evalProvisionerConfig(ctx EvalContext, bo`
`2527`	`2527`
`2528`	`2528`	`config, _, configDiags := ctx.EvaluateBlock(body, schema, n.ResourceInstanceAddr().Resource, keyData)`
`2529`	`2529`	`diags = diags.Append(configDiags)`
`2530`		`- diags = diags.Append(ctx.Deprecations().ValidateAsConfig(config, n.ModulePath()).InConfigBody(body, n.Addr.String()))`
	`2530`	`+ diags = diags.Append(ctx.Deprecations().ValidateAsConfig(config, schema, n.ModulePath()).InConfigBody(body, n.Addr.String()))`
`2531`	`2531`	`config = marks.RemoveDeprecationMarks(config)`
`2532`	`2532`
`2533`	`2533`	`return config, diags`
`@@ -2546,7 +2546,7 @@ func (n *NodeAbstractResourceInstance) evalDestroyProvisionerConfig(ctx EvalCont`
`2546`	`2546`	`evalScope := ctx.EvaluationScope(n.ResourceInstanceAddr().Resource, nil, keyData)`
`2547`	`2547`	`config, evalDiags := evalScope.EvalSelfBlock(body, self, schema, keyData)`
`2548`	`2548`	`diags = diags.Append(evalDiags)`
`2549`		`- diags = diags.Append(ctx.Deprecations().ValidateAsConfig(config, n.ModulePath()).InConfigBody(body, n.Addr.String()))`
	`2549`	`+ diags = diags.Append(ctx.Deprecations().ValidateAsConfig(config, schema, n.ModulePath()).InConfigBody(body, n.Addr.String()))`
`2550`	`2550`	`config = marks.RemoveDeprecationMarks(config)`
`2551`	`2551`	`return config, diags`
`2552`	`2552`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ func ephemeralResourceOpen(ctx EvalContext, inp ephemeralResourceInput) (*provid`
`76`	`76`	`if diags.HasErrors() {`
`77`	`77`	`return nil, diags`
`78`	`78`	`}`
`79`		`- diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, ctx.Path().Module()).InConfigBody(config.Config, inp.addr.String()))`
	`79`	`+ diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, schema.Body, ctx.Path().Module()).InConfigBody(config.Config, inp.addr.String()))`
`80`	`80`	`if diags.HasErrors() {`
`81`	`81`	`return nil, diags`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -662,7 +662,7 @@ func (n *NodePlannableResourceInstance) importState(ctx EvalContext, addr addrs.`
`662`	`662`	`diags = diags.Append(configDiags)`
`663`	`663`	`return nil, deferred, diags`
`664`	`664`	`}`
`665`		`- diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, n.ModulePath()).InConfigBody(n.Config.Config, absAddr.String()))`
	`665`	`+ diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, schema.Body, n.ModulePath()).InConfigBody(n.Config.Config, absAddr.String()))`
`666`	`666`	`if diags.HasErrors() {`
`667`	`667`	`return nil, deferred, diags`
`668`	`668`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ func (n *NodePlannableResourceInstance) listResourceExecute(ctx EvalContext) (di`
`51`	`51`	`return diags`
`52`	`52`	`}`
`53`	`53`
`54`		`- diags = diags.Append(ctx.Deprecations().ValidateAsConfig(blockVal, n.ModulePath()).InConfigBody(config.Config, n.Addr.String()))`
	`54`	`+ diags = diags.Append(ctx.Deprecations().ValidateAsConfig(blockVal, schema.FullSchema, n.ModulePath()).InConfigBody(config.Config, n.Addr.String()))`
`55`	`55`	`if diags.HasErrors() {`
`56`	`56`	`return diags`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ func (n *nodePlannablePartialExpandedResource) managedResourceExecute(ctx EvalCo`
`200`	`200`	`return &change, diags`
`201`	`201`	`}`
`202`	`202`
`203`		`- diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, n.ResourceAddr().Module).InConfigBody(n.config.Config, n.addr.String()))`
	`203`	`+ diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, schema.Body, n.ResourceAddr().Module).InConfigBody(n.config.Config, n.addr.String()))`
`204`	`204`	`if diags.HasErrors() {`
`205`	`205`	`return &change, diags`
`206`	`206`	`}`
`@@ -359,7 +359,7 @@ func (n *nodePlannablePartialExpandedResource) dataResourceExecute(ctx EvalConte`
`359`	`359`	`return &change, diags`
`360`	`360`	`}`
`361`	`361`
`362`		`- diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, n.ResourceAddr().Module).InConfigBody(n.config.Config, n.addr.String()))`
	`362`	`+ diags = diags.Append(ctx.Deprecations().ValidateAsConfig(configVal, schema.Body, n.ResourceAddr().Module).InConfigBody(n.config.Config, n.addr.String()))`
`363`	`363`	`if diags.HasErrors() {`
`364`	`364`	`return &change, diags`
`365`	`365`	`}`