fix: path.module incorrectly populated for modules

srevinsaju · Nov 3, 2023 · 65c01c6 · 65c01c6
1 parent c8db34f
commit 65c01c6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/examples/module-local/calculator/togomak.hcl b/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
+}
diff --git a/examples/module-local/togomak.hcl b/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

diff --git a/internal/ci/conductor.go b/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)