fix: variables evaluated correctly when module expands based on anoth…

…er module

internal/hcl/block.go

@@ -160,6 +160,10 @@ func (blocks Blocks) Matching(pattern BlockMatcher) *Block {
  search = blocks.OfType(pattern.Type)
  }
 
+ if pattern.Label == "" && len(search) > 0 {
+ return search[0]
+ }
+
  for _, block := range search {
  label := block.Label()
  if pattern.StripCount {
@@ -171,10 +175,6 @@ func (blocks Blocks) Matching(pattern BlockMatcher) *Block {
  }
  }
 
- if len(search) > 0 {
- return search[0]
- }
-
  return nil
 }
 
@@ -571,7 +571,7 @@ func (b *Block) IsForEachReferencedExpanded(moduleBlocks Blocks) bool {
 
  label := r.String()
  if blockType == "module" {
- label = r.typeLabel
+ label = r.nameLabel
  }
 
  referenced := moduleBlocks.Matching(BlockMatcher{

internal/hcl/evaluator.go

@@ -352,7 +352,21 @@ func (e *Evaluator) evaluateModules() {
  if v := moduleCall.Module.Key(); v != nil {
  e.ctx.Set(outputs, "module", stripCount(moduleCall.Name), *v)
  } else if v := moduleCall.Module.Index(); v != nil {
- e.ctx.Set(outputs, "module", stripCount(moduleCall.Name), fmt.Sprintf("%d", *v))
+ existing := e.ctx.Get("module", stripCount(moduleCall.Name))
+
+ var list []cty.Value
+ if isList(existing) {
+ list = existing.AsValueSlice()
+ }
+
+ // Pad the list if the index is greater than the current length.
+ for int64(len(list)) <= *v {
+ list = append(list, cty.DynamicVal)
+ }
+
+ list[*v] = outputs
+
+ e.ctx.Set(cty.TupleVal(list), "module", stripCount(moduleCall.Name))
  } else {
  e.ctx.Set(outputs, "module", moduleCall.Name)
  }
@@ -1048,5 +1062,4 @@ func ExpFunctions(baseDir string, logger *logrus.Entry) map[string]function.Func
  "yamlencode": yaml.YAMLEncodeFunc,
  "zipmap": stdlib.ZipmapFunc,
  }
-
 }