From c370e5e71d4a736c92dcf8c78d6f120f9f6a3595 Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Mon, 29 Apr 2024 16:32:59 +0200 Subject: [PATCH] stacks: use more precise name for variable --- .../internal/stackeval/component_instance.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/stacks/stackruntime/internal/stackeval/component_instance.go b/internal/stacks/stackruntime/internal/stackeval/component_instance.go index cbaa15226c..b4eba207ba 100644 --- a/internal/stacks/stackruntime/internal/stackeval/component_instance.go +++ b/internal/stacks/stackruntime/internal/stackeval/component_instance.go @@ -558,27 +558,27 @@ func (c *ComponentInstance) CheckModuleTreePlan(ctx context.Context) (*plans.Pla // If any of our upstream components have incomplete plans then // we need to force treating everything in this component as // deferred so we can preserve the correct dependency ordering. - upstreamDeferred := false + deferred := false for _, depAddr := range c.call.RequiredComponents(ctx).Elems() { depStack := c.main.Stack(ctx, depAddr.Stack, PlanPhase) if depStack == nil { - upstreamDeferred = true // to be conservative + deferred = true // to be conservative break } depComponent := depStack.Component(ctx, depAddr.Item) if depComponent == nil { - upstreamDeferred = true // to be conservative + deferred = true // to be conservative break } if !depComponent.PlanIsComplete(ctx) { - upstreamDeferred = true + deferred = true break } } // The instance is also upstream deferred if the for_each value for this instance is unknown. if c.key == addrs.WildcardKey { - upstreamDeferred = true + deferred = true } // NOTE: This ComponentInstance type only deals with component @@ -591,7 +591,7 @@ func (c *ComponentInstance) CheckModuleTreePlan(ctx context.Context) (*plans.Pla SetVariables: inputValues, ExternalProviders: providerClients, DeferralAllowed: stackPlanOpts.DeferralAllowed, - ExternalDependencyDeferred: upstreamDeferred, + ExternalDependencyDeferred: deferred, // This is set by some tests but should not be used in main code. // (nil means to use the real time when tfCtx.Plan was called.)