github/kubevela
1
0
Fork 0
mirror of https://github.com/kubevela/kubevela.git synced 2026-02-14 18:10:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Chore: upgrade workflow vendor version (#4876)

Browse Source 
Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com>

Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com>
This commit is contained in:
Tianxin Dong
2022-10-17 19:28:04 +08:00
committed by GitHub
parent ccf7bdd2d6
commit 51c803cc12
5 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@@ -57,7 +57,7 @@ require (
github.com/koding/websocketproxy v0.0.0-20181220232114-7ed82d81a28c
github.com/kubevela/pkg v0.0.0-20220930055431-990bad3c95e6
github.com/kubevela/prism v1.5.1-0.20220915071949-6bf3ad33f84f
github.com/kubevela/workflow v0.0.0-20221011135522-9342135d2fca
github.com/kubevela/workflow v0.0.0-20221014070336-7404bd534be0
github.com/kyokomi/emoji v2.2.4+incompatible
github.com/mitchellh/hashstructure/v2 v2.0.1
github.com/oam-dev/cluster-gateway v1.4.0

4
go.sum
View File

@@ -1334,8 +1334,8 @@ github.com/kubevela/pkg v0.0.0-20220930055431-990bad3c95e6 h1:O6eSMQvPmWMTdUSqKI
github.com/kubevela/pkg v0.0.0-20220930055431-990bad3c95e6/go.mod h1:M1teY5NgwzOqvUdwSYKe1eM4Qe4EQj8Cr2oey2xhV3I=
github.com/kubevela/prism v1.5.1-0.20220915071949-6bf3ad33f84f h1:1lUtU1alPThdcsn4MI6XjPb7eJLuZPpmlEdgjtnUMKw=
github.com/kubevela/prism v1.5.1-0.20220915071949-6bf3ad33f84f/go.mod h1:m724/7ANnB/iukyHW20+DicpeJMEC/JA0ZhgsHY10MA=
github.com/kubevela/workflow v0.0.0-20221011135522-9342135d2fca h1:/zucHEew0fCLGddSbRLYsnDc8Tll9wpThftgMbdW7gk=
github.com/kubevela/workflow v0.0.0-20221011135522-9342135d2fca/go.mod h1:ARKC8DRqBRRiq9YrmjrGUGKmB8Yib/H3g6VUCh3EGY8=
github.com/kubevela/workflow v0.0.0-20221014070336-7404bd534be0 h1:0hD77VJ4rSU+sxVGB6e2cPcvV/u1NfA5jOY58lbBZfM=
github.com/kubevela/workflow v0.0.0-20221014070336-7404bd534be0/go.mod h1:ARKC8DRqBRRiq9YrmjrGUGKmB8Yib/H3g6VUCh3EGY8=
github.com/kulti/thelper v0.4.0/go.mod h1:vMu2Cizjy/grP+jmsvOFDx1kYP6+PD1lqg4Yu5exl2U=
github.com/kunwardeep/paralleltest v1.0.3/go.mod h1:vLydzomDFpk7yu5UX02RmP0H8QfRPOV/oFhWN85Mjb4=
github.com/kylelemons/godebug v0.0.0-20160406211939-eadb3ce320cb/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=

4
pkg/cue/definition/template.go
View File

@@ -110,7 +110,7 @@ func (wd *workloadDef) Complete(ctx process.Context, abstractTemplate string, pa
return errors.WithMessagef(err, "invalid parameter of workload %s", wd.name)
}
c, err := ctx.ExtendedContextFile()
c, err := ctx.BaseContextFile()
if err != nil {
return err
}
@@ -301,7 +301,7 @@ func (td *traitDef) Complete(ctx process.Context, abstractTemplate string, param
buff += fmt.Sprintf("%s: %s\n", velaprocess.ParameterFieldName, string(bt))
}
}
c, err := ctx.ExtendedContextFile()
c, err := ctx.BaseContextFile()
if err != nil {
return err
}

2
pkg/cue/process/handle_test.go
View File

@@ -108,7 +108,7 @@ image: "myserver"
ctx.PushData(ContextDataArtifacts, targetData)
ctx.PushData("arbitraryData", targetArbitraryData)
c, err := ctx.ExtendedContextFile()
c, err := ctx.BaseContextFile()
if err != nil {
t.Error(err)
return

17
pkg/velaql/context.go
View File

@@ -17,8 +17,6 @@
package velaql
import (
"encoding/json"
"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
@@ -112,18 +110,13 @@ func (c ViewContext) Commit() error {
return errors.New("not support func Commit")
}
// MakeParameter make 'value' with interface{}
func (c ViewContext) MakeParameter(parameter interface{}) (*value.Value, error) {
var s = "{}"
if parameter != nil {
bt, err := json.Marshal(parameter)
if err != nil {
return nil, err
}
s = string(bt)
// MakeParameter make 'value' with string
func (c ViewContext) MakeParameter(parameter string) (*value.Value, error) {
if parameter == "" {
parameter = "{}"
}
return c.vars.MakeValue(s)
return c.vars.MakeValue(parameter)
}
// StoreRef return the store reference of workflow context.