[core] Avoid direct Apricot defaults/vars calls from ODC client

Author: teo

core/environment/environment.go

@@ -34,7 +34,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/AliceO2Group/Control/apricot"
 	"github.com/AliceO2Group/Control/common/event"
 	"github.com/AliceO2Group/Control/common/gera"
 	"github.com/AliceO2Group/Control/common/logger"
@@ -68,14 +67,16 @@ type Environment struct {
 	hookHandlerF     func(hooks task.Tasks) error
 	incomingEvents   chan event.DeviceEvent
 
-	GlobalDefaults gera.StringMap // From Consul
-	GlobalVars     gera.StringMap // From Consul
-	UserVars       gera.StringMap // From user input
-	stateChangedCh chan *event.TasksStateChangedEvent
-	unsubscribe    chan struct{}
-	eventStream    Subscription
-	Public         bool   // From workflow or user
-	Description    string // From workflow
+	GlobalDefaults  gera.StringMap // From Consul
+	GlobalVars      gera.StringMap // From Consul
+	UserVars        gera.StringMap // From user input
+	BaseConfigStack map[string]string // Exclusively from Consul, already flattened for performance
+
+	stateChangedCh  chan *event.TasksStateChangedEvent
+	unsubscribe     chan struct{}
+	eventStream     Subscription
+	Public          bool   // From workflow or user
+	Description     string // From workflow
 
 	callsPendingAwait map[string] /*await expression, trigger only*/ callable.CallsMap
 
@@ -123,6 +124,12 @@ func newEnvironment(userVars map[string]string) (env *Environment, err error) {
 	)
 	env.GlobalVars.Set("__fmq_cleanup_count", "0") // initialize to 0 the number of START transitions
 
+	env.BaseConfigStack, err = gera.MakeStringMapWithMap(env.GlobalVars.Raw()).
+		WrappedAndFlattened(gera.MakeStringMapWithMap(env.GlobalDefaults.Raw())) // prepare the base config stack
+	if err != nil {
+		return nil, err
+	}
+
 	// We start with STANDBY, which will not be preceded with enter_STANDBY, thus we set the value here.
 	enterStateTimeMs := strconv.FormatInt(time.Now().UnixMilli(), 10)
 	env.UserVars.Set("enter_state_time_ms", enterStateTimeMs)
@@ -171,14 +178,12 @@ func newEnvironment(userVars map[string]string) (env *Environment, err error) {
 					}
 					env.GlobalVars.Set("__fmq_cleanup_count", strconv.Itoa(cleanupCount)) // number of times the START transition has run for this env
 
-					configStack, err := gera.MakeStringMapWithMap(apricot.Instance().GetVars()).
-						WrappedAndFlattened(gera.MakeStringMapWithMap(the.ConfSvc().GetDefaults()))
 					if err == nil {
-						lhcPeriod, ok := configStack["lhc_period"]
+						lhcPeriod, ok := env.BaseConfigStack["lhc_period"]
 						if ok {
 							env.workflow.GetVars().Set("lhc_period", lhcPeriod)
 						}
-						nHbfPerTf, ok := configStack["n_hbf_per_tf"]
+						nHbfPerTf, ok := env.BaseConfigStack["n_hbf_per_tf"]
 						if ok {
 							env.workflow.GetVars().Set("n_hbf_per_tf", nHbfPerTf)
 						}

core/integration/odc/plugin.go

@@ -39,9 +39,9 @@ import (
 	"time"
 
 	"github.com/AliceO2Group/Control/apricot"
-	"github.com/AliceO2Group/Control/common/gera"
 	"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"
@@ -258,17 +258,14 @@ func (p *Plugin) Init(_ string) error {
 }
 
 func (p *Plugin) ObjectStack(varStack map[string]string) (stack map[string]interface{}) {
-	envId, ok := varStack["environment_id"]
-	if !ok {
+	envId, envIdOk := varStack["environment_id"]
+	if !envIdOk {
 		log.Error("ObjectStack cannot acquire environment ID")
 		return
 	}
-
-	var csErr error
-	configStack := apricot.Instance().GetDefaults()
-	configStack, csErr = gera.MakeStringMapWithMap(apricot.Instance().GetVars()).WrappedAndFlattened(gera.MakeStringMapWithMap(configStack))
-	if csErr != nil {
-		log.Error("cannot access AliECS workflow configuration defaults")
+	envUid, err := uid.FromString(envId)
+	if err != nil {
+		log.Error("ObjectStack cannot parse environment ID")
 		return
 	}
 
@@ -316,6 +313,17 @@ 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
+
 		pdpConfigOption, ok = varStack["pdp_config_option"]
 		if !ok {
 			log.WithField("partition", envId).