IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-25 18:45:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

cleanup from resource state mods

Browse Source
This commit is contained in:
James Bardin 2020-03-13 16:09:28 -04:00
parent ea51b790bc
commit a7de3d07b8
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
terraform/context_refresh_test.go
View File

@ -1422,7 +1422,7 @@ func TestContext2Refresh_vars(t *testing.T) {
} }
for _, r := range mod.Resources { for _, r := range mod.Resources {
if r.Addr.Type == "" { if r.Addr.Resource.Type == "" {
t.Fatalf("no type: %#v", r) t.Fatalf("no type: %#v", r)
} }
} }

2
terraform/eval_count.go
View File

@ -113,7 +113,7 @@ func evaluateResourceCountExpressionKnown(expr hcl.Expression, ctx EvalContext)
// or this function will block forever awaiting the lock. // or this function will block forever awaiting the lock.
func fixResourceCountSetTransition(ctx EvalContext, addr addrs.AbsResource, countEnabled bool) { func fixResourceCountSetTransition(ctx EvalContext, addr addrs.AbsResource, countEnabled bool) {
state := ctx.State() state := ctx.State()
changed := state.MaybeFixUpResourceInstanceAddressForCount(addr, countEnabled) changed := state.MaybeFixUpResourceInstanceAddressForCount(addr.Config(), countEnabled)
if changed { if changed {
log.Printf("[TRACE] renamed first %s instance in transient state due to count argument change", addr) log.Printf("[TRACE] renamed first %s instance in transient state due to count argument change", addr)
} }

7
terraform/eval_count_boundary.go
View File

@ -63,14 +63,13 @@ func (n *EvalCountFixZeroOneBoundaryGlobal) fixModule(ctx EvalContext, moduleAdd
} }
for _, r := range ms.Resources { for _, r := range ms.Resources {
addr := r.Addr.Absolute(moduleAddr) rCfg := cfg.Module.ResourceByAddr(r.Addr.Resource)
rCfg := cfg.Module.ResourceByAddr(r.Addr)
if rCfg == nil { if rCfg == nil {
log.Printf("[WARN] Not fixing up EachModes for %s because it has no config", addr) log.Printf("[WARN] Not fixing up EachModes for %s because it has no config", r.Addr)
continue continue
} }
hasCount := rCfg.Count != nil hasCount := rCfg.Count != nil
fixResourceCountSetTransition(ctx, addr, hasCount) fixResourceCountSetTransition(ctx, r.Addr, hasCount)
} }
return nil return nil

8
terraform/transform_orphan_resource.go
View File

@ -74,13 +74,13 @@ func (t *OrphanResourceInstanceTransformer) transform(g *Graph, ms *states.Modul
// pseudo-arguments here. They are handled by OrphanResourceCountTransformer. // pseudo-arguments here. They are handled by OrphanResourceCountTransformer.
for _, rs := range ms.Resources { for _, rs := range ms.Resources {
if m != nil { if m != nil {
if r := m.ResourceByAddr(rs.Addr); r != nil { if r := m.ResourceByAddr(rs.Addr.Resource); r != nil {
continue continue
} }
} }
for key := range rs.Instances { for key := range rs.Instances {
addr := rs.Addr.Instance(key).Absolute(moduleAddr) addr := rs.Addr.Instance(key)
abstract := NewNodeAbstractResourceInstance(addr) abstract := NewNodeAbstractResourceInstance(addr)
var node dag.Vertex = abstract var node dag.Vertex = abstract
if f := t.Concrete; f != nil { if f := t.Concrete; f != nil {
@ -153,13 +153,13 @@ func (t *OrphanResourceTransformer) Transform(g *Graph) error {
for _, rs := range ms.Resources { for _, rs := range ms.Resources {
if mc != nil { if mc != nil {
if r := mc.Module.ResourceByAddr(rs.Addr); r != nil { if r := mc.Module.ResourceByAddr(rs.Addr.Resource); r != nil {
// It's in the config, so nothing to do for this one. // It's in the config, so nothing to do for this one.
continue continue
} }
} }
addr := rs.Addr.Absolute(moduleAddr) addr := rs.Addr
abstract := NewNodeAbstractResource(addr) abstract := NewNodeAbstractResource(addr)
var node dag.Vertex = abstract var node dag.Vertex = abstract
if f := t.Concrete; f != nil { if f := t.Concrete; f != nil {

4
terraform/transform_state.go
View File

@ -43,10 +43,8 @@ func (t *StateTransformer) Transform(g *Graph) error {
} }
for _, ms := range t.State.Modules { for _, ms := range t.State.Modules {
moduleAddr := ms.Addr
for _, rs := range ms.Resources { for _, rs := range ms.Resources {
resourceAddr := rs.Addr.Absolute(moduleAddr) resourceAddr := rs.Addr
for key, is := range rs.Instances { for key, is := range rs.Instances {
addr := resourceAddr.Instance(key) addr := resourceAddr.Instance(key)