[core] Ensure consolidated defaults/vars/userVars are sent back

Author: teo

core/server.go

@@ -209,16 +209,24 @@ func (m *RpcServer) GetEnvironments(cxt context.Context, request *pb.GetEnvironm
 			continue
 		}
 		tasks := env.Workflow().GetTasks()
+		var defaults, vars, userVars map[string]string
+		defaults, vars, userVars, err = env.Workflow().ConsolidatedVarMaps()
+		if err != nil {
+			defaults = env.GlobalDefaults.Raw()
+			vars = env.GlobalVars.Raw()
+			userVars = env.UserVars.Raw()
+		}
+
 		e := &pb.EnvironmentInfo{
 			Id:               env.Id().String(),
 			CreatedWhen:      env.CreatedWhen().UnixMilli(),
 			State:            env.CurrentState(),
 			RootRole:         env.Workflow().GetName(),
 			Description:      env.Description,
 			CurrentRunNumber: env.GetCurrentRunNumber(),
-			Defaults:         env.GlobalDefaults.Raw(),
-			Vars:             env.GlobalVars.Raw(),
-			UserVars:         env.UserVars.Raw(),
+			Defaults:         defaults,
+			Vars:             vars,
+			UserVars:         userVars,
 			NumberOfFlps:     int32(len(env.GetFLPs())),
 			NumberOfHosts:    int32(len(env.GetAllHosts())),
 		}
@@ -300,6 +308,14 @@ func (m *RpcServer) NewEnvironment(cxt context.Context, request *pb.NewEnvironme
 	}
 
 	tasks := newEnv.Workflow().GetTasks()
+	var defaults, vars, userVars map[string]string
+	defaults, vars, userVars, err = newEnv.Workflow().ConsolidatedVarMaps()
+	if err != nil {
+		defaults = newEnv.GlobalDefaults.Raw()
+		vars = newEnv.GlobalVars.Raw()
+		userVars = newEnv.UserVars.Raw()
+	}
+
 	ei := &pb.EnvironmentInfo{
 		Id:                newEnv.Id().String(),
 		CreatedWhen:       newEnv.CreatedWhen().UnixMilli(),
@@ -308,9 +324,9 @@ func (m *RpcServer) NewEnvironment(cxt context.Context, request *pb.NewEnvironme
 		RootRole:          newEnv.Workflow().GetName(),
 		Description:       newEnv.Description,
 		CurrentRunNumber:  newEnv.GetCurrentRunNumber(),
-		Defaults:          newEnv.GlobalDefaults.Raw(),
-		Vars:              newEnv.GlobalVars.Raw(),
-		UserVars:          newEnv.UserVars.Raw(),
+		Defaults:          defaults,
+		Vars:              vars,
+		UserVars:          userVars,
 		NumberOfFlps:      int32(len(newEnv.GetFLPs())),
 		NumberOfHosts:     int32(len(newEnv.GetAllHosts())),
 		IncludedDetectors: newEnv.GetActiveDetectors().StringList(),
@@ -342,6 +358,13 @@ func (m *RpcServer) GetEnvironment(cxt context.Context, req *pb.GetEnvironmentRe
 	}
 
 	tasks := env.Workflow().GetTasks()
+	var defaults, vars, userVars map[string]string
+	defaults, vars, userVars, err = env.Workflow().ConsolidatedVarMaps()
+	if err != nil {
+		defaults = env.GlobalDefaults.Raw()
+		vars = env.GlobalVars.Raw()
+		userVars = env.UserVars.Raw()
+	}
 	reply = &pb.GetEnvironmentReply{
 		Environment: &pb.EnvironmentInfo{
 			Id:               env.Id().String(),
@@ -351,9 +374,9 @@ func (m *RpcServer) GetEnvironment(cxt context.Context, req *pb.GetEnvironmentRe
 			RootRole:         env.Workflow().GetName(),
 			Description:      env.Description,
 			CurrentRunNumber: env.GetCurrentRunNumber(),
-			Defaults:         env.GlobalDefaults.Raw(),
-			Vars:             env.GlobalVars.Raw(),
-			UserVars:         env.UserVars.Raw(),
+			Defaults:         defaults,
+			Vars:             vars,
+			UserVars:         userVars,
 			NumberOfFlps:     int32(len(env.GetFLPs())),
 			NumberOfHosts:    int32(len(env.GetAllHosts())),
 		},
@@ -394,7 +417,7 @@ func (m *RpcServer) ControlEnvironment(cxt context.Context, req *pb.ControlEnvir
 	td := eot.Sub(sot)
 
 	if err != nil {
-		err := env.TryTransition(environment.NewGoErrorTransition(m.state.taskman))
+		err = env.TryTransition(environment.NewGoErrorTransition(m.state.taskman))
 		if err != nil {
 			log.WithField("partition", env.Id()).Warnf("could not complete requested GO_ERROR transition, forcing move to ERROR: %s", err.Error())
 			env.Sm.SetState("ERROR")

core/workflow/iteratorrole.go

@@ -227,6 +227,10 @@ func (i *iteratorRole) ConsolidatedVarStack() (varStack map[string]string, err e
 	return nil, errors.New("iterator has no stack")
 }
 
+func (r *iteratorRole) ConsolidatedVarMaps() (defaults map[string]string, vars map[string]string, userVars map[string]string, err error) {
+	return nil, nil, nil, nil
+}
+
 func (i *iteratorRole) GetParent() Updatable {
 	if i == nil || i.template == nil {
 		return nil

core/workflow/role.go

@@ -67,6 +67,7 @@ type Role interface {
 	IsEnabled() bool
 	GetCurrentRunNumber() uint32
 	ConsolidatedVarStack() (varStack map[string]string, err error)
+	ConsolidatedVarMaps() (defaults, vars, userVars map[string]string, err error)
 	GetEnvironmentId() uid.ID
 }
 

core/workflow/rolebase.go

@@ -142,6 +142,19 @@ func (r *roleBase) ConsolidatedVarStack() (varStack map[string]string, err error
 	return
 }
 
+func (r *roleBase) ConsolidatedVarMaps() (defaults map[string]string, vars map[string]string, userVars map[string]string, err error) {
+	defaults, err = r.Defaults.Flattened()
+	if err != nil {
+		return
+	}
+	vars, err = r.Vars.Flattened()
+	if err != nil {
+		return
+	}
+	userVars, err = r.UserVars.Flattened()
+	return
+}
+
 func (r *roleBase) makeBuildObjectStackFunc() template.BuildObjectStackFunc {
 	return func(stage template.Stage) map[string]interface{} {
 		type wfNode struct {