Merge pull request #61 from srevinsaju/fix/path-module-fix

Fix regression on path.module

CHANGELOG.md

@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+- Fix `path.module` incorrectly being populated for togomak modules
+
+## [v2.0.0-alpha.9]
 - Add support for `modules`
 - Add JSON logger
 - Add `for_each` to modules

examples/module-local/calculator/togomak.hcl

@@ -20,3 +20,11 @@ stage "add" {
   if = var.operation == "add"
   script = "echo ${var.a} + ${var.b} is ${var.a + var.b}"
 }
+
+stage "paths" {
+  script = <<-EOT
+  echo path.module: ${path.module}
+  echo path.cwd: ${path.cwd}
+  echo path.root: ${path.root}
+  EOT
+}

examples/module-local/togomak.hcl

@@ -7,6 +7,14 @@ locals {
   b = 1
 }
 
+stage "paths" {
+  script = <<-EOT
+  echo path.module: ${path.module}
+  echo path.cwd: ${path.cwd}
+  echo path.root: ${path.root}
+  EOT
+}
+
 module "add" {
   source = "./calculator"
   a = local.a

internal/ci/conductor.go

@@ -281,10 +281,6 @@ func NewConductor(cfg ConductorConfig, opts ...ConductorOption) *Conductor {
 		Process:    process,
 		RootLogger: logger,
 		Config:     cfg,
-		eval: &Eval{
-			context: CreateEvalContext(cfg, process),
-			mu:      &sync.RWMutex{},
-		},
 	}
 	for _, v := range cfg.Variables {
 		c.variables = append(c.variables, v)
@@ -293,6 +289,10 @@ func NewConductor(cfg ConductorConfig, opts ...ConductorOption) *Conductor {
 	for _, opt := range opts {
 		opt(c)
 	}
+	c.eval = &Eval{
+		context: CreateEvalContext(c.Config, process),
+		mu:      &sync.RWMutex{},
+	}
 
 	if !c.Config.Behavior.Child.Enabled {
 		logger.Infof("%s (version=%s)", meta.AppName, meta.AppVersion)