synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-15 22:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: rewrite onlyDataResources (#9263)

Browse Source
This commit is contained in:
Marcin Tojek
2023-08-23 12:17:16 +02:00
committed by GitHub
parent d37f6d80f7
commit e6d90bd4fe
2 changed files with 144 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
provisioner/terraform/executor.go
View File

@ -264,18 +264,21 @@ func (e *executor) plan(ctx, killCtx context.Context, env, vars []string, logr l
}, nil
}
func onlyDataResources(sm *tfjson.StateModule) *tfjson.StateModule {
sm2 := *sm
sm2.Resources = make([]*tfjson.StateResource, 0, len(sm.Resources))
func onlyDataResources(sm tfjson.StateModule) tfjson.StateModule {
filtered := sm
filtered.Resources = []*tfjson.StateResource{}
for _, r := range sm.Resources {
if r.Mode == "data" {
sm2.Resources = append(sm2.Resources, r)
filtered.Resources = append(filtered.Resources, r)
}
}
filtered.ChildModules = []*tfjson.StateModule{}
for _, c := range sm.ChildModules {
sm2.ChildModules = append(sm2.ChildModules, onlyDataResources(c))
filteredChild := onlyDataResources(*c)
filtered.ChildModules = append(filtered.ChildModules, &filteredChild)
}
return &sm2
return filtered
}
// planResources must only be called while the lock is held.
@ -300,10 +303,9 @@ func (e *executor) planResources(ctx, killCtx context.Context, planfilePath stri
// We don't want all prior resources, because Quotas (and
// future features) would never know which resources are getting
// deleted by a stop.
modules = append(
modules,
onlyDataResources(plan.PriorState.Values.RootModule),
)
filtered := onlyDataResources(*plan.PriorState.Values.RootModule)
modules = append(modules, &filtered)
}
modules = append(modules, plan.PlannedValues.RootModule)