Skip to content

Commit 94988f0

Browse files
committed
[core] Do not write back to varSpecMap coming from repos backend
1 parent 4ea06eb commit 94988f0

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

core/server.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import (
3939
"github.com/AliceO2Group/Control/core/integration"
4040
"github.com/AliceO2Group/Control/core/repos"
4141
"github.com/AliceO2Group/Control/core/repos/varsource"
42+
"github.com/jinzhu/copier"
4243
"github.com/spf13/viper"
4344
"google.golang.org/grpc/codes"
4445
"google.golang.org/grpc/reflection"
@@ -741,12 +742,11 @@ func (m *RpcServer) GetWorkflowTemplates(cxt context.Context, req *pb.GetWorkflo
741742
for revision, templates := range revisions {
742743
for _, template := range templates {
743744
// First we take care of overriding any WFT VarSpec defaults with Apricot vars
744-
var varSpecMap repos.VarSpecMap
745+
varSpecMap := make(repos.VarSpecMap)
745746
if template.VarInfo != nil {
746-
varSpecMap = template.VarInfo
747-
} else {
748-
varSpecMap = repos.VarSpecMap{}
747+
_ = copier.Copy(&varSpecMap, template.VarInfo)
749748
}
749+
750750
for k, v := range varSpecMap {
751751
if v.Source == varsource.WorkflowDefaults { // if this varSpec was declared as a default
752752
if apricotValue, exists := vars[k]; exists { // and a corresponding Apricot var exists

0 commit comments

Comments
 (0)