fix: fix lint and rebase

Signed-off-by: FogDong <[email protected]>

pkg/context/context.go

@@ -191,7 +191,7 @@ func (wf *WorkflowContext) sync(ctx context.Context) error {
 }
 
 // LoadFromConfigMap recover workflow context from configMap.
-func (wf *WorkflowContext) LoadFromConfigMap(ctx context.Context, cm corev1.ConfigMap) error {
+func (wf *WorkflowContext) LoadFromConfigMap(_ context.Context, cm corev1.ConfigMap) error {
 	if wf.store == nil {
 		wf.store = &cm
 	}

pkg/debug/context.go

@@ -70,21 +70,15 @@ func setStore(ctx context.Context, instance *wfTypes.WorkflowInstance, id, data
 			}
 			cm.Labels = map[string]string{}
 			cm.SetOwnerReferences(instance.ChildOwnerReferences)
-			if err := cli.Create(ctx, cm); err != nil {
-				return err
-			}
-			return nil
+			return cli.Create(ctx, cm)
 		}
 		return err
 	}
 	cm.Data = map[string]string{
 		"debug": data,
 	}
-	if err := cli.Update(ctx, cm); err != nil {
-		return err
-	}
 
-	return nil
+	return cli.Update(ctx, cm)
 }
 
 // NewContext new workflow context without initialize data.

pkg/executor/options.go

@@ -17,7 +17,6 @@ limitations under the License.
 package executor
 
 import (
-	"github.com/kubevela/pkg/cue/cuex"
 	"github.com/kubevela/workflow/pkg/types"
 )
 
@@ -26,19 +25,6 @@ type Option interface {
 	ApplyTo(*workflowExecutor)
 }
 
-type withCompiler struct {
-	compiler *cuex.Compiler
-}
-
-func (w *withCompiler) ApplyTo(e *workflowExecutor) {
-	e.compiler = w.compiler
-}
-
-// WithCompiler set the cue compiler
-func WithCompiler(compiler *cuex.Compiler) Option {
-	return &withCompiler{compiler: compiler}
-}
-
 type withStatusPatcher struct {
 	patcher types.StatusPatcher
 }

pkg/executor/workflow.go

@@ -29,7 +29,6 @@ import (
 	"k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/apiserver/pkg/util/feature"
 
-	"github.com/kubevela/pkg/cue/cuex"
 	monitorContext "github.com/kubevela/pkg/monitor/context"
 
 	"github.com/kubevela/workflow/api/v1alpha1"
@@ -38,7 +37,6 @@ import (
 	"github.com/kubevela/workflow/pkg/features"
 	"github.com/kubevela/workflow/pkg/hooks"
 	"github.com/kubevela/workflow/pkg/monitor/metrics"
-	"github.com/kubevela/workflow/pkg/providers"
 	"github.com/kubevela/workflow/pkg/providers/legacy/workspace"
 	"github.com/kubevela/workflow/pkg/tasks/custom"
 	"github.com/kubevela/workflow/pkg/types"
@@ -62,7 +60,6 @@ type workflowExecutor struct {
 	instance *types.WorkflowInstance
 	wfCtx    wfContext.Context
 	patcher  types.StatusPatcher
-	compiler *cuex.Compiler
 }
 
 // New returns a Workflow Executor implementation.
@@ -71,9 +68,6 @@ func New(instance *types.WorkflowInstance, options ...Option) WorkflowExecutor {
 	for _, opt := range options {
 		opt.ApplyTo(executor)
 	}
-	if executor.compiler == nil {
-		executor.compiler = providers.Compiler.Get()
-	}
 	return executor
 }
 
@@ -214,7 +208,6 @@ func newEngine(ctx monitorContext.Context, wfCtx wfContext.Context, w *workflowE
 		stepTimeout:   make(map[string]time.Time),
 		taskRunners:   taskRunners,
 		statusPatcher: w.patcher,
-		compiler:      w.compiler,
 	}
 }
 
@@ -587,7 +580,6 @@ func (e *engine) generateRunOptions(ctx monitorContext.Context, dependsOnPhase v
 		},
 		StepStatus: e.stepStatus,
 		Engine:     e,
-		Compiler:   e.compiler,
 		PreCheckHooks: []types.TaskPreCheckHook{
 			func(step v1alpha1.WorkflowStep, options *types.PreCheckOptions) (*types.PreCheckResult, error) {
 				if feature.DefaultMutableFeatureGate.Enabled(features.EnableSuspendOnFailure) {
@@ -643,10 +635,7 @@ func (e *engine) generateRunOptions(ctx monitorContext.Context, dependsOnPhase v
 	if e.debug {
 		options.Debug = func(id string, v cue.Value) error {
 			debugContext := debug.NewContext(e.instance, id)
-			if err := debugContext.Set(v); err != nil {
-				return err
-			}
-			return nil
+			return debugContext.Set(v)
 		}
 	}
 	return options
@@ -666,7 +655,6 @@ type engine struct {
 	stepDependsOn      map[string][]string
 	taskRunners        []types.TaskRunner
 	statusPatcher      types.StatusPatcher
-	compiler           *cuex.Compiler
 }
 
 func (e *engine) finishStep(operation *types.Operation) {

pkg/executor/workflow_test.go

@@ -43,6 +43,7 @@ import (
 	wfContext "github.com/kubevela/workflow/pkg/context"
 	"github.com/kubevela/workflow/pkg/cue/process"
 	"github.com/kubevela/workflow/pkg/features"
+	"github.com/kubevela/workflow/pkg/providers"
 	"github.com/kubevela/workflow/pkg/tasks/builtin"
 	"github.com/kubevela/workflow/pkg/tasks/custom"
 	"github.com/kubevela/workflow/pkg/types"
@@ -2373,7 +2374,7 @@ func (tr *testTaskRunner) Run(ctx wfContext.Context, options *types.TaskRunOptio
 	resetter := tr.fillContext(logCtx, options.PCtx)
 	defer resetter(options.PCtx)
 
-	basicVal, err := custom.MakeBasicValue(logCtx, nil, options.PCtx)
+	basicVal, err := custom.MakeBasicValue(logCtx, providers.Compiler.Get(), nil, options.PCtx)
 	if err != nil {
 		return v1alpha1.StepStatus{}, nil, err
 	}

pkg/generator/generator.go

@@ -33,6 +33,7 @@ import (
 	"github.com/kubevela/workflow/pkg/executor"
 	"github.com/kubevela/workflow/pkg/monitor/metrics"
 
+	"github.com/kubevela/workflow/pkg/providers"
 	"github.com/kubevela/workflow/pkg/tasks"
 	"github.com/kubevela/workflow/pkg/tasks/template"
 	"github.com/kubevela/workflow/pkg/types"
@@ -132,13 +133,16 @@ func GenerateWorkflowInstance(ctx context.Context, cli client.Client, run *v1alp
 	return instance, nil
 }
 
-func initStepGeneratorOptions(ctx monitorContext.Context, instance *types.WorkflowInstance, options types.StepGeneratorOptions) types.StepGeneratorOptions {
+func initStepGeneratorOptions(_ monitorContext.Context, instance *types.WorkflowInstance, options types.StepGeneratorOptions) types.StepGeneratorOptions {
 	if options.ProcessCtx == nil {
 		options.ProcessCtx = process.NewContext(generateContextDataFromWorkflowRun(instance))
 	}
 	if options.TemplateLoader == nil {
 		options.TemplateLoader = template.NewWorkflowStepTemplateLoader()
 	}
+	if options.Compiler == nil {
+		options.Compiler = providers.Compiler.Get()
+	}
 	return options
 }