Feat: add category for workflow step definition (#5471)

Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com>
This commit is contained in:
Tianxin Dong
2023-02-10 14:23:04 +08:00
committed by GitHub
parent 7f7814851b
commit 4a16b2f6fe
99 changed files with 206 additions and 53 deletions
+5 -6
View File
@@ -403,17 +403,16 @@ func (def *Definition) FromCUEString(cueString string, config *rest.Config) erro
if err != nil {
return err
}
var pd *packages.PackageDiscover
// validate template
if config != nil {
pd, err := packages.NewPackageDiscover(config)
pd, err = packages.NewPackageDiscover(config)
if err != nil {
return err
}
if _, err = value.NewValue(templateString+"\n"+velacue.BaseTemplate, pd, ""); err != nil {
return err
}
} else if val := cuectx.CompileString(templateString + "\n" + velacue.BaseTemplate); val.Err() != nil {
return val.Err()
}
if _, err = value.NewValue(templateString+"\n"+velacue.BaseTemplate, pd, ""); err != nil {
return err
}
return def.FromCUE(&inst, templateString)
}
+6 -1
View File
@@ -27,6 +27,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"github.com/oam-dev/kubevela/apis/types"
"github.com/oam-dev/kubevela/pkg/stdlib"
"github.com/oam-dev/kubevela/pkg/utils/common"
)
@@ -310,6 +311,8 @@ var (
)
func TestGenAllDef(t *testing.T) {
err := stdlib.SetupBuiltinImports()
assert.NoError(t, err)
skipDefs := []string{
// non-concrete structs like
// foo: string|{secretRef: string}
@@ -319,6 +322,7 @@ func TestGenAllDef(t *testing.T) {
"notification.cue",
"env.cue",
"command.cue",
"apply-terraform-config.cue",
// not supported
"json-merge-patch.cue",
@@ -327,8 +331,9 @@ func TestGenAllDef(t *testing.T) {
// no args
"apply-application.cue",
"apply-application-in-parallel.cue",
"step-group.cue",
}
glob, err := filepath.Glob("../../vela-templates/definitions/*/*.cue")
glob, err := filepath.Glob("../../vela-templates/definitions/*/*/*.cue")
assert.NoError(t, err)
for _, f := range glob {
if !stringInSlice(filepath.Base(f), skipDefs) {