From a46edc37f81c6507d824e202d3e129dcb2ee68a0 Mon Sep 17 00:00:00 2001
From: Chris Roberts <croberts@hashicorp.com>
Date: Tue, 25 May 2021 13:27:44 -0700
Subject: [PATCH] Track scope when loading to use most specific scope for
 operation

---
 internal/runner/operation.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/internal/runner/operation.go b/internal/runner/operation.go
index d0925050a..8608df932 100644
--- a/internal/runner/operation.go
+++ b/internal/runner/operation.go
@@ -105,6 +105,8 @@ func (r *Runner) executeJob(
 		core.WithJobInfo(jobInfo),
 	}
 
+	var scope Runs
+
 	// Work backwards to setup the basis
 	var ref *vagrant_plugin_sdk.Ref_Basis
 	if job.Target != nil {
@@ -123,6 +125,7 @@ func (r *Runner) executeJob(
 	}
 
 	defer b.Close()
+	scope = b
 
 	// Lets check for a project, and if we have one,
 	// load it up now
@@ -136,6 +139,7 @@ func (r *Runner) executeJob(
 			return
 		}
 		defer p.Close()
+		scope = p
 	}
 
 	// Finally, if we have a target defined, load it up
@@ -147,6 +151,7 @@ func (r *Runner) executeJob(
 			return
 		}
 		defer m.Close()
+		scope = m
 	}
 
 	// Execute the operation
@@ -168,8 +173,8 @@ func (r *Runner) executeJob(
 		return r.executeInitOp(ctx, job, b)
 
 	case *vagrant_server.Job_Run:
-		log.Warn("running a run operation against project", "project", p, "job", job)
-		return r.executeRunOp(ctx, job, p)
+		log.Warn("running a run operation", "scope", scope, "job", job)
+		return r.executeRunOp(ctx, job, scope)
 
 	case *vagrant_server.Job_Auth:
 		return r.executeAuthOp(ctx, log, job, p)