Skip to content

Commit c4f129f

Browse files
refactor deferred resource encoding to use shared schema
1 parent 892fad8 commit c4f129f

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

internal/terraform/context_plan.go

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,7 @@ func (c *Context) planWalk(config *configs.Config, prevRunState *states.State, o
841841
}
842842

843843
if !schemaDiags.HasErrors() {
844-
deferredResources, deferredDiags := c.deferredResources(config, walker.Deferrals.GetDeferredChanges(), priorState)
844+
deferredResources, deferredDiags := c.deferredResources(schemas, walker.Deferrals.GetDeferredChanges())
845845
diags = diags.Append(deferredDiags)
846846
plan.DeferredResources = deferredResources
847847

@@ -890,16 +890,11 @@ func (c *Context) planWalk(config *configs.Config, prevRunState *states.State, o
890890
return plan, evalScope, diags
891891
}
892892

893-
func (c *Context) deferredResources(config *configs.Config, deferrals []*plans.DeferredResourceInstanceChange, state *states.State) ([]*plans.DeferredResourceInstanceChangeSrc, tfdiags.Diagnostics) {
893+
func (c *Context) deferredResources(schemas *Schemas, deferrals []*plans.DeferredResourceInstanceChange) ([]*plans.DeferredResourceInstanceChangeSrc, tfdiags.Diagnostics) {
894+
var diags tfdiags.Diagnostics
894895
var deferredResources []*plans.DeferredResourceInstanceChangeSrc
895896

896-
schemas, diags := c.Schemas(config, state)
897-
if diags.HasErrors() {
898-
return deferredResources, diags
899-
}
900-
901897
for _, deferral := range deferrals {
902-
903898
schema := schemas.ResourceTypeConfig(
904899
deferral.Change.ProviderAddr.Provider,
905900
deferral.Change.Addr.Resource.Resource.Mode,

0 commit comments

Comments
 (0)