[core] Pass the env's defaults+vars from Consul to ObjectStack context

teo · teo · commit 91ed119db6c5 · 2023-01-09T14:51:12.000+01:00
diff --git a/configuration/template/dplutil.go b/configuration/template/dplutil.go
@@ -129,7 +129,7 @@ func generateDplSubworkflow(confSvc ConfigurationService, varStack map[string]st
 
 	// Resolve any templates as part of the DPL command
 	fields := Fields{WrapPointer(&dplCommand)}
-	err = fields.Execute(confSvc, dplCommand, varStack, nil, make(map[string]texttemplate.Template), workflowRepo)
+	err = fields.Execute(confSvc, dplCommand, varStack, nil, nil, make(map[string]texttemplate.Template), workflowRepo)
 	if err != nil {
 		return "", fmt.Errorf("JIT failed in template resolution of the dpl_command: %w", err)
 	}
@@ -157,7 +157,7 @@ func generateDplSubworkflowFromUri(confSvc ConfigurationService, varStack map[st
 
 	// Resolve any templates as part of the DPL command
 	fields := Fields{WrapPointer(&dplCommand)}
-	err = fields.Execute(confSvc, dplCommand, varStack, nil, make(map[string]texttemplate.Template), workflowRepo)
+	err = fields.Execute(confSvc, dplCommand, varStack, nil, nil, make(map[string]texttemplate.Template), workflowRepo)
 	if err != nil {
 		return "", fmt.Errorf("JIT failed in template resolution of the dpl_command: %w", err)
 	}
diff --git a/configuration/template/fields.go b/configuration/template/fields.go
@@ -82,6 +82,7 @@ func (sf Sequence) Execute(confSvc ConfigurationService,
 	parentPath string,
 	varStack VarStack,
 	buildObjectStack BuildObjectStackFunc,
+	baseConfigStack map[string]string,
 	stringTemplateCache map[string]template.Template,
 	workflowRepo repos.IRepo,
 	stageCallback StageCallbackFunc) (err error) {
@@ -110,7 +111,7 @@ func (sf Sequence) Execute(confSvc ConfigurationService,
 					}(),
 				}).Trace("about to process fields for stage")
 			}
-			err = fields.Execute(confSvc, parentPath, stagedStack, objectStack, stringTemplateCache, workflowRepo)
+			err = fields.Execute(confSvc, parentPath, stagedStack, objectStack, baseConfigStack, stringTemplateCache, workflowRepo)
 			err = stageCallback(currentStage, err)
 			if err != nil {
 				var roleDisabledErrorType *RoleDisabledError
@@ -227,7 +228,7 @@ func (vs *VarStack) consolidated(stage Stage) (consolidatedStack map[string]stri
 	return
 }
 
-func (fields Fields) Execute(confSvc ConfigurationService, parentPath string, varStack map[string]string, objStack map[string]interface{}, stringTemplateCache map[string]template.Template, workflowRepo repos.IRepo) (err error) {
+func (fields Fields) Execute(confSvc ConfigurationService, parentPath string, varStack map[string]string, objStack map[string]interface{}, baseConfigStack map[string]string, stringTemplateCache map[string]template.Template, workflowRepo repos.IRepo) (err error) {
 	environment := make(map[string]interface{}, len(varStack))
 	strOpStack := MakeUtilFuncMap(varStack)
 	for k, v := range varStack {
@@ -256,7 +257,7 @@ func (fields Fields) Execute(confSvc ConfigurationService, parentPath string, va
 		environment[k] = v
 	}
 
-	pluginObjects := MakePluginObjectStack(varStack)
+	pluginObjects := MakePluginObjectStack(varStack, baseConfigStack)
 	copyMap(pluginObjects, environment)
 
 	configAccessObj := MakeConfigAccessObject(confSvc, varStack)
diff --git a/configuration/template/stack.go b/configuration/template/stack.go
@@ -159,8 +159,8 @@ func MakeConfigAccessFuncsMultiVar(confSvc ConfigurationService, varStack map[st
 	}
 }
 
-func MakePluginObjectStack(varStack map[string]string) map[string]interface{} {
-	return integration.PluginsInstance().ObjectStack(varStack)
+func MakePluginObjectStack(varStack map[string]string, baseConfigStack map[string]string) map[string]interface{} {
+	return integration.PluginsInstance().ObjectStack(varStack, baseConfigStack)
 }
 
 func MakeConfigAndRepoAccessFuncs(confSvc ConfigurationService, varStack map[string]string, workflowRepo repos.IRepo) map[string]interface{} {
diff --git a/configuration/template/stackutil.go b/configuration/template/stackutil.go
@@ -50,7 +50,7 @@ func getConfigLegacy(confSvc ConfigurationService, varStack map[string]string, p
 	}
 
 	fields := Fields{WrapPointer(&payload)}
-	err = fields.Execute(confSvc, query.Path(), varStack, nil, make(map[string]texttemplate.Template), nil)
+	err = fields.Execute(confSvc, query.Path(), varStack, nil, nil, make(map[string]texttemplate.Template), nil)
 	log.Warn(varStack)
 	log.Warn(payload)
 	return payload
diff --git a/core/environment/manager.go b/core/environment/manager.go
@@ -219,7 +219,7 @@ func (envs *Manager) CreateEnvironment(workflowPath string, userVars map[string]
 	}
 
 	// We load the workflow (includes template processing)
-	env.workflow, err = envs.loadWorkflow(workflowPath, env.wfAdapter, workflowUserVars)
+	env.workflow, err = envs.loadWorkflow(workflowPath, env.wfAdapter, workflowUserVars, env.BaseConfigStack)
 	if err != nil {
 		err = fmt.Errorf("cannot load workflow template: %w", err)
 
@@ -507,11 +507,11 @@ func (envs *Manager) environment(environmentId uid.ID) (env *Environment, err er
 	return
 }
 
-func (envs *Manager) loadWorkflow(workflowPath string, parent workflow.Updatable, workflowUserVars map[string]string) (root workflow.Role, err error) {
+func (envs *Manager) loadWorkflow(workflowPath string, parent workflow.Updatable, workflowUserVars map[string]string, baseConfigStack map[string]string) (root workflow.Role, err error) {
 	if strings.Contains(workflowPath, "://") {
 		return nil, errors.New("workflow loading from file not implemented yet")
 	}
-	return workflow.Load(workflowPath, parent, envs.taskman, workflowUserVars)
+	return workflow.Load(workflowPath, parent, envs.taskman, workflowUserVars, baseConfigStack)
 }
 
 func (envs *Manager) handleDeviceEvent(evt event.DeviceEvent) {
@@ -665,7 +665,7 @@ func (envs *Manager) CreateAutoEnvironment(workflowPath string, userVars map[str
 			Warn("parse workflow public info failed.")
 	}
 
-	env.workflow, err = envs.loadWorkflow(workflowPath, env.wfAdapter, workflowUserVars)
+	env.workflow, err = envs.loadWorkflow(workflowPath, env.wfAdapter, workflowUserVars, env.BaseConfigStack)
 	if err != nil {
 		err = fmt.Errorf("cannot load workflow template: %w", err)
 		env.sendEnvironmentEvent(&event.EnvironmentEvent{EnvironmentID: env.Id().String(), Error: err})
diff --git a/core/integration/bookkeeping/plugin.go b/core/integration/bookkeeping/plugin.go
@@ -34,13 +34,14 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	bkpb "github.com/AliceO2Group/Control/core/integration/bookkeeping/protos"
-	"google.golang.org/grpc"
 	"net/url"
 	"strconv"
 	"strings"
 	"time"
 
+	bkpb "github.com/AliceO2Group/Control/core/integration/bookkeeping/protos"
+	"google.golang.org/grpc"
+
 	"github.com/AliceO2Group/Control/common/logger/infologger"
 	"github.com/AliceO2Group/Control/common/utils/uid"
 	"github.com/AliceO2Group/Control/core/environment"
@@ -252,7 +253,7 @@ func (p *Plugin) Init(instanceId string) error {
 	return nil
 }
 
-func (p *Plugin) ObjectStack(_ map[string]string) (stack map[string]interface{}) {
+func (p *Plugin) ObjectStack(_ map[string]string, _ map[string]string) (stack map[string]interface{}) {
 	stack = make(map[string]interface{})
 	return stack
 }
diff --git a/core/integration/ccdb/plugin.go b/core/integration/ccdb/plugin.go
@@ -29,14 +29,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/AliceO2Group/Control/core/environment"
 	"go/types"
 	"net/url"
 	"os/exec"
 	"strconv"
 	"strings"
 	"time"
 
+	"github.com/AliceO2Group/Control/core/environment"
+
 	"github.com/AliceO2Group/Control/common/logger"
 	"github.com/AliceO2Group/Control/common/runtype"
 	"github.com/AliceO2Group/Control/common/utils/uid"
@@ -289,7 +290,7 @@ func (p *Plugin) Init(instanceId string) error {
 	return nil
 }
 
-func (p *Plugin) ObjectStack(_ map[string]string) (stack map[string]interface{}) {
+func (p *Plugin) ObjectStack(_ map[string]string, _ map[string]string) (stack map[string]interface{}) {
 	stack = make(map[string]interface{})
 	return stack
 }
diff --git a/core/integration/dcs/plugin.go b/core/integration/dcs/plugin.go
@@ -174,7 +174,7 @@ func (p *Plugin) Init(instanceId string) error {
 	return nil
 }
 
-func (p *Plugin) ObjectStack(_ map[string]string) (stack map[string]interface{}) {
+func (p *Plugin) ObjectStack(_ map[string]string, _ map[string]string) (stack map[string]interface{}) {
 	stack = make(map[string]interface{})
 	return stack
 }
diff --git a/core/integration/ddsched/plugin.go b/core/integration/ddsched/plugin.go
@@ -191,7 +191,7 @@ func (p *Plugin) Init(_ string) error {
 	return nil
 }
 
-func (p *Plugin) ObjectStack(_ map[string]string) (stack map[string]interface{}) {
+func (p *Plugin) ObjectStack(_ map[string]string, _ map[string]string) (stack map[string]interface{}) {
 	stack = make(map[string]interface{})
 	return stack
 }
diff --git a/core/integration/kafka/plugin.go b/core/integration/kafka/plugin.go
@@ -157,7 +157,7 @@ func (p *Plugin) Init(_ string) error {
 	return nil
 }
 
-func (p *Plugin) ObjectStack(_ map[string]string) (stack map[string]interface{}) {
+func (p *Plugin) ObjectStack(_ map[string]string, _ map[string]string) (stack map[string]interface{}) {
 	stack = make(map[string]interface{})
 	return stack
 }
diff --git a/core/integration/odc/plugin.go b/core/integration/odc/plugin.go
@@ -41,7 +41,6 @@ import (
 	"github.com/AliceO2Group/Control/apricot"
 	"github.com/AliceO2Group/Control/common/logger/infologger"
 	"github.com/AliceO2Group/Control/common/utils/uid"
-	"github.com/AliceO2Group/Control/core/environment"
 	"github.com/AliceO2Group/Control/core/integration"
 	odc "github.com/AliceO2Group/Control/core/integration/odc/protos"
 	"github.com/AliceO2Group/Control/core/workflow/callable"
@@ -257,16 +256,21 @@ func (p *Plugin) Init(_ string) error {
 	return nil
 }
 
-func (p *Plugin) ObjectStack(varStack map[string]string) (stack map[string]interface{}) {
+func (p *Plugin) ObjectStack(varStack map[string]string, baseConfigStack map[string]string) (stack map[string]interface{}) {
+	// baseConfigStack is this environment's defaults + vars from Consul but no user input
+	// It is passed around this way because it cannot be acquired from envMan.GetEnv(id).BaseConfigStack, since during
+	// this ObjectStack call the env isn't mapped in envMan yet (we're in the middle of creating + processing it with
+	// ProcessTemplates in loadWorkflow).
+	// The only reason we need the naked defaults + vars is for the non-standard processing of the "default" keyword in
+	// the ODC plugin, so this is a break from design.
 	envId, envIdOk := varStack["environment_id"]
 	if !envIdOk {
 		log.Error("ObjectStack cannot acquire environment ID")
 		return
 	}
-	envUid, err := uid.FromString(envId)
-	if err != nil {
-		log.Error("ObjectStack cannot parse environment ID")
-		return
+
+	if baseConfigStack == nil {
+		baseConfigStack = make(map[string]string)
 	}
 
 	stack = make(map[string]interface{})
@@ -313,16 +317,7 @@ func (p *Plugin) ObjectStack(varStack map[string]string) (stack map[string]inter
 		)
 		accumulator = make([]string, 0)
 
-		envMan := environment.ManagerInstance()
-		myEnv, err := envMan.Environment(envUid)
-		if err != nil {
-			log.WithError(err).
-				WithField("partition", envId).
-				WithField("call", "GenerateEPNWorkflowScript").
-				Error("cannot acquire environment reference")
-			return
-		}
-		configStack := myEnv.BaseConfigStack
+		configStack := baseConfigStack
 
 		pdpConfigOption, ok = varStack["pdp_config_option"]
 		if !ok {
diff --git a/core/integration/plugin.go b/core/integration/plugin.go
@@ -54,8 +54,8 @@ type Plugin interface {
 	GetEnvironmentsData(envIds []uid.ID) map[uid.ID]string
 
 	Init(instanceId string) error
-	CallStack(data interface{}) map[string]interface{}             // used in hook call context
-	ObjectStack(varStack map[string]string) map[string]interface{} // all other ProcessTemplates contexts
+	CallStack(data interface{}) map[string]interface{}                                                // used in hook call context
+	ObjectStack(varStack map[string]string, baseConfigStack map[string]string) map[string]interface{} // all other ProcessTemplates contexts
 	Destroy() error
 }
 
@@ -115,7 +115,7 @@ func (p Plugins) CallStack(data interface{}) (stack map[string]interface{}) {
 	return
 }
 
-func (p Plugins) ObjectStack(varStack map[string]string) (stack map[string]interface{}) {
+func (p Plugins) ObjectStack(varStack map[string]string, baseConfigStack map[string]string) (stack map[string]interface{}) {
 	stack = make(map[string]interface{})
 
 	//HACK: this is a dummy object+function to allow odc.GenerateEPNTopologyFullname in the root role
@@ -126,7 +126,7 @@ func (p Plugins) ObjectStack(varStack map[string]string) (stack map[string]inter
 	}
 
 	for _, plugin := range p {
-		s := plugin.ObjectStack(varStack)
+		s := plugin.ObjectStack(varStack, baseConfigStack)
 		stack[plugin.GetName()] = s
 	}
 	return
diff --git a/core/integration/testplugin/plugin.go b/core/integration/testplugin/plugin.go
@@ -82,7 +82,7 @@ func (p *Plugin) Init(_ string) error {
 	return nil
 }
 
-func (p *Plugin) ObjectStack(_ map[string]string) (stack map[string]interface{}) {
+func (p *Plugin) ObjectStack(_ map[string]string, _ map[string]string) (stack map[string]interface{}) {
 	stack = make(map[string]interface{})
 	return stack
 }
diff --git a/core/integration/trg/plugin.go b/core/integration/trg/plugin.go
@@ -360,7 +360,7 @@ func (p *Plugin) reconcile() {
 
 }
 
-func (p *Plugin) ObjectStack(_ map[string]string) (stack map[string]interface{}) {
+func (p *Plugin) ObjectStack(_ map[string]string, _ map[string]string) (stack map[string]interface{}) {
 	stack = make(map[string]interface{})
 	return stack
 }
diff --git a/core/task/task.go b/core/task/task.go
@@ -293,7 +293,7 @@ func (t *Task) BuildTaskCommand(role parentRole) (err error) {
 			// We resolve any template expressions in Defaults
 			defaultFields := template.WrapMapItems(localDefaults)
 
-			err = defaultFields.Execute(the.ConfSvc(), t.name, varStack, nil, make(map[string]texttemplate.Template), nil)
+			err = defaultFields.Execute(the.ConfSvc(), t.name, varStack, nil, nil, make(map[string]texttemplate.Template), nil)
 			if err != nil {
 				t.commandInfo = &common.TaskCommandInfo{}
 				log.WithError(err).
@@ -317,7 +317,7 @@ func (t *Task) BuildTaskCommand(role parentRole) (err error) {
 			// We resolve any template expressions in Vars
 			varFields := template.WrapMapItems(localVars)
 
-			err = varFields.Execute(the.ConfSvc(), t.name, varStack, nil, make(map[string]texttemplate.Template), nil)
+			err = varFields.Execute(the.ConfSvc(), t.name, varStack, nil, nil, make(map[string]texttemplate.Template), nil)
 			if err != nil {
 				t.commandInfo = &common.TaskCommandInfo{}
 				log.WithError(err).
@@ -352,7 +352,7 @@ func (t *Task) BuildTaskCommand(role parentRole) (err error) {
 			if cmd.Log != nil { // we only template it if it's defined
 				fields = append(fields, template.WrapPointer(cmd.Log))
 			}
-			err = fields.Execute(the.ConfSvc(), t.name, varStack, nil, make(map[string]texttemplate.Template), nil)
+			err = fields.Execute(the.ConfSvc(), t.name, varStack, nil, nil, make(map[string]texttemplate.Template), nil)
 			if err != nil {
 				t.commandInfo = &common.TaskCommandInfo{}
 				log.WithError(err).
@@ -592,7 +592,7 @@ func (t *Task) BuildPropertyMap(bindMap channel.BindMap) (propMap controlcommand
 
 			fields := template.WrapMapItems(propMap)
 
-			err = fields.Execute(the.ConfSvc(), t.name, varStack, objStack, make(map[string]texttemplate.Template), nil)
+			err = fields.Execute(the.ConfSvc(), t.name, varStack, objStack, nil, make(map[string]texttemplate.Template), nil)
 			if err != nil {
 				log.WithError(err).
 					WithField("partition", t.GetParent().GetEnvironmentId().String()).
diff --git a/core/workflow/aggregatorrole.go b/core/workflow/aggregatorrole.go
@@ -102,7 +102,7 @@ func (r *aggregatorRole) GlobFilter(g glob.Glob) (rs []Role) {
 	return
 }
 
-func (r *aggregatorRole) ProcessTemplates(workflowRepo repos.IRepo, loadSubworkflow LoadSubworkflowFunc) (err error) {
+func (r *aggregatorRole) ProcessTemplates(workflowRepo repos.IRepo, loadSubworkflow LoadSubworkflowFunc, baseConfigStack map[string]string) (err error) {
 	if r == nil {
 		return errors.New("role tree error when processing templates")
 	}
@@ -123,12 +123,21 @@ func (r *aggregatorRole) ProcessTemplates(workflowRepo repos.IRepo, loadSubworkf
 	}
 
 	// TODO: push cached templates here
-	err = templSequence.Execute(the.ConfSvc(), r.GetPath(), template.VarStack{
-		Locals:   r.Locals,
-		Defaults: r.Defaults,
-		Vars:     r.Vars,
-		UserVars: r.UserVars,
-	}, r.makeBuildObjectStackFunc(), make(map[string]texttemplate.Template), workflowRepo, MakeDisabledRoleCallback(r))
+	err = templSequence.Execute(
+		the.ConfSvc(),
+		r.GetPath(),
+		template.VarStack{
+			Locals:   r.Locals,
+			Defaults: r.Defaults,
+			Vars:     r.Vars,
+			UserVars: r.UserVars,
+		},
+		r.makeBuildObjectStackFunc(),
+		baseConfigStack,
+		make(map[string]texttemplate.Template),
+		workflowRepo,
+		MakeDisabledRoleCallback(r),
+	)
 	if err != nil {
 		var roleDisabledErrorType *template.RoleDisabledError
 		if isRoleDisabled := errors.As(err, &roleDisabledErrorType); isRoleDisabled {
@@ -167,7 +176,7 @@ func (r *aggregatorRole) ProcessTemplates(workflowRepo repos.IRepo, loadSubworkf
 				defer wg.Done()
 				role := r.Roles[roleIdx]
 				role.setParent(r)
-				err = role.ProcessTemplates(workflowRepo, loadSubworkflow)
+				err = role.ProcessTemplates(workflowRepo, loadSubworkflow, baseConfigStack)
 				if err != nil {
 					roleErrors = multierror.Append(roleErrors, err)
 				}
@@ -183,7 +192,7 @@ func (r *aggregatorRole) ProcessTemplates(workflowRepo repos.IRepo, loadSubworkf
 	} else {
 		for _, role := range r.Roles {
 			role.setParent(r)
-			err = role.ProcessTemplates(workflowRepo, loadSubworkflow)
+			err = role.ProcessTemplates(workflowRepo, loadSubworkflow, baseConfigStack)
 			if err != nil {
 				return
 			}
diff --git a/core/workflow/callable/call.go b/core/workflow/callable/call.go
@@ -130,7 +130,7 @@ func (c *Call) Call() error {
 
 	objStack := integration.PluginsInstance().CallStack(c)
 
-	err = fields.Execute(apricot.Instance(), c.GetName(), c.VarStack, objStack, make(map[string]texttemplate.Template), nil)
+	err = fields.Execute(apricot.Instance(), c.GetName(), c.VarStack, objStack, nil, make(map[string]texttemplate.Template), nil)
 	if err != nil {
 		return err
 	}
diff --git a/core/workflow/callrole.go b/core/workflow/callrole.go
diff --git a/core/workflow/includerole.go b/core/workflow/includerole.go
diff --git a/core/workflow/iteratorrange.go b/core/workflow/iteratorrange.go
diff --git a/core/workflow/iteratorrole.go b/core/workflow/iteratorrole.go
diff --git a/core/workflow/load.go b/core/workflow/load.go
diff --git a/core/workflow/role.go b/core/workflow/role.go
diff --git a/core/workflow/taskrole.go b/core/workflow/taskrole.go

Original file line number	Diff line number	Diff line change
`@@ -159,8 +159,8 @@ func MakeConfigAccessFuncsMultiVar(confSvc ConfigurationService, varStack map[st`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`
`162`		`-func MakePluginObjectStack(varStack map[string]string) map[string]interface{} {`
`163`		`- return integration.PluginsInstance().ObjectStack(varStack)`
	`162`	`+func MakePluginObjectStack(varStack map[string]string, baseConfigStack map[string]string) map[string]interface{} {`
	`163`	`+ return integration.PluginsInstance().ObjectStack(varStack, baseConfigStack)`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`func MakeConfigAndRepoAccessFuncs(confSvc ConfigurationService, varStack map[string]string, workflowRepo repos.IRepo) map[string]interface{} {`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func getConfigLegacy(confSvc ConfigurationService, varStack map[string]string, p`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`fields := Fields{WrapPointer(&payload)}`
`53`		`- err = fields.Execute(confSvc, query.Path(), varStack, nil, make(map[string]texttemplate.Template), nil)`
	`53`	`+ err = fields.Execute(confSvc, query.Path(), varStack, nil, nil, make(map[string]texttemplate.Template), nil)`
`54`	`54`	`log.Warn(varStack)`
`55`	`55`	`log.Warn(payload)`
`56`	`56`	`return payload`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ func (envs *Manager) CreateEnvironment(workflowPath string, userVars map[string]`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`// We load the workflow (includes template processing)`
`222`		`- env.workflow, err = envs.loadWorkflow(workflowPath, env.wfAdapter, workflowUserVars)`
	`222`	`+ env.workflow, err = envs.loadWorkflow(workflowPath, env.wfAdapter, workflowUserVars, env.BaseConfigStack)`
`223`	`223`	`if err != nil {`
`224`	`224`	`err = fmt.Errorf("cannot load workflow template: %w", err)`
`225`	`225`
`@@ -507,11 +507,11 @@ func (envs Manager) environment(environmentId uid.ID) (env Environment, err er`
`507`	`507`	`return`
`508`	`508`	`}`
`509`	`509`
`510`		`-func (envs *Manager) loadWorkflow(workflowPath string, parent workflow.Updatable, workflowUserVars map[string]string) (root workflow.Role, err error) {`
	`510`	`+func (envs *Manager) loadWorkflow(workflowPath string, parent workflow.Updatable, workflowUserVars map[string]string, baseConfigStack map[string]string) (root workflow.Role, err error) {`
`511`	`511`	`if strings.Contains(workflowPath, "://") {`
`512`	`512`	`return nil, errors.New("workflow loading from file not implemented yet")`
`513`	`513`	`}`
`514`		`- return workflow.Load(workflowPath, parent, envs.taskman, workflowUserVars)`
	`514`	`+ return workflow.Load(workflowPath, parent, envs.taskman, workflowUserVars, baseConfigStack)`
`515`	`515`	`}`
`516`	`516`
`517`	`517`	`func (envs *Manager) handleDeviceEvent(evt event.DeviceEvent) {`
`@@ -665,7 +665,7 @@ func (envs *Manager) CreateAutoEnvironment(workflowPath string, userVars map[str`
`665`	`665`	`Warn("parse workflow public info failed.")`
`666`	`666`	`}`
`667`	`667`
`668`		`- env.workflow, err = envs.loadWorkflow(workflowPath, env.wfAdapter, workflowUserVars)`
	`668`	`+ env.workflow, err = envs.loadWorkflow(workflowPath, env.wfAdapter, workflowUserVars, env.BaseConfigStack)`
`669`	`669`	`if err != nil {`
`670`	`670`	`err = fmt.Errorf("cannot load workflow template: %w", err)`
`671`	`671`	`env.sendEnvironmentEvent(&event.EnvironmentEvent{EnvironmentID: env.Id().String(), Error: err})`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ func (p *Plugin) Init(instanceId string) error {`
`174`	`174`	`return nil`
`175`	`175`	`}`
`176`	`176`
`177`		`-func (p *Plugin) ObjectStack(_ map[string]string) (stack map[string]interface{}) {`
	`177`	`+func (p *Plugin) ObjectStack(_ map[string]string, _ map[string]string) (stack map[string]interface{}) {`
`178`	`178`	`stack = make(map[string]interface{})`
`179`	`179`	`return stack`
`180`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ func (p *Plugin) Init(_ string) error {`
`191`	`191`	`return nil`
`192`	`192`	`}`
`193`	`193`
`194`		`-func (p *Plugin) ObjectStack(_ map[string]string) (stack map[string]interface{}) {`
	`194`	`+func (p *Plugin) ObjectStack(_ map[string]string, _ map[string]string) (stack map[string]interface{}) {`
`195`	`195`	`stack = make(map[string]interface{})`
`196`	`196`	`return stack`
`197`	`197`	`}`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ func (p *Plugin) Init(_ string) error {`
`157`	`157`	`return nil`
`158`	`158`	`}`
`159`	`159`
`160`		`-func (p *Plugin) ObjectStack(_ map[string]string) (stack map[string]interface{}) {`
	`160`	`+func (p *Plugin) ObjectStack(_ map[string]string, _ map[string]string) (stack map[string]interface{}) {`
`161`	`161`	`stack = make(map[string]interface{})`
`162`	`162`	`return stack`
`163`	`163`	`}`