fix: cr

engine/api/pipeline.go

@@ -40,11 +40,8 @@ func (api *API) updateAsCodePipelineHandler() service.Handler {
 		if err := service.UnmarshalBody(r, &p); err != nil {
 			return err
 		}
-
-		// check pipeline name pattern
-		regexp := sdk.NamePatternRegex
-		if !regexp.MatchString(p.Name) {
-			return sdk.WrapError(sdk.ErrInvalidPipelinePattern, "updateAsCodePipelineHandler: pipeline name %s do not respect pattern", p.Name)
+		if err := p.IsValid(); err != nil {
+			return err
 		}
 
 		tx, err := api.mustDB().Begin()
@@ -154,13 +151,10 @@ func (api *API) updatePipelineHandler() service.Handler {
 
 		var p sdk.Pipeline
 		if err := service.UnmarshalBody(r, &p); err != nil {
-			return sdk.WrapError(err, "Cannot read body")
+			return err
 		}
-
-		// check pipeline name pattern
-		regexp := sdk.NamePatternRegex
-		if !regexp.MatchString(p.Name) {
-			return sdk.WrapError(sdk.ErrInvalidPipelinePattern, "updatePipelineHandler: Pipeline name %s do not respect pattern", p.Name)
+		if err := p.IsValid(); err != nil {
+			return err
 		}
 
 		pipelineDB, err := pipeline.LoadPipeline(ctx, api.mustDB(), key, name, true)
@@ -172,9 +166,9 @@ func (api *API) updatePipelineHandler() service.Handler {
 			return sdk.WithStack(sdk.ErrForbidden)
 		}
 
-		tx, errB := api.mustDB().Begin()
-		if errB != nil {
-			sdk.WrapError(errB, "updatePipelineHandler> Cannot start transaction")
+		tx, err := api.mustDB().Begin()
+		if err != nil {
+			return sdk.WrapError(err, "cannot start transaction")
 		}
 		defer tx.Rollback() // nolint
 
@@ -283,10 +277,8 @@ func (api *API) addPipelineHandler() service.Handler {
 		if err := service.UnmarshalBody(r, &p); err != nil {
 			return err
 		}
-
-		// check pipeline name pattern
-		if regexp := sdk.NamePatternRegex; !regexp.MatchString(p.Name) {
-			return sdk.NewErrorFrom(sdk.ErrInvalidPipelinePattern, "pipeline name %s do not respect pattern %s", p.Name, sdk.NamePattern)
+		if err := p.IsValid(); err != nil {
+			return err
 		}
 
 		// Check that pipeline does not already exists

engine/api/pipeline/pipeline_parser.go

@@ -22,9 +22,9 @@ type ImportOptions struct {
 // ParseAndImport parse an exportentities.pipeline and insert or update the pipeline in database
 func ParseAndImport(ctx context.Context, db gorp.SqlExecutor, cache cache.Store, proj sdk.Project, epip exportentities.Pipeliner, u sdk.Identifiable, opts ImportOptions) (*sdk.Pipeline, []sdk.Message, error) {
 	//Transform payload to a sdk.Pipeline
-	pip, errP := epip.Pipeline()
-	if errP != nil {
-		return pip, nil, sdk.WrapError(sdk.NewError(sdk.ErrWrongRequest, errP), "unable to parse pipeline")
+	pip, err := epip.Pipeline()
+	if err != nil {
+		return nil, nil, err
 	}
 
 	pip.FromRepository = opts.FromRepository
@@ -34,9 +34,9 @@ func ParseAndImport(ctx context.Context, db gorp.SqlExecutor, cache cache.Store,
 	}
 
 	// Check if pipeline exists
-	exist, errE := ExistPipeline(db, proj.ID, pip.Name)
-	if errE != nil {
-		return pip, nil, sdk.WrapError(errE, "unable to check if pipeline %v exists", pip.Name)
+	exist, err := ExistPipeline(db, proj.ID, pip.Name)
+	if err != nil {
+		return pip, nil, sdk.WrapError(err, "unable to check if pipeline %v exists", pip.Name)
 	}
 
 	done := new(sync.WaitGroup)

engine/api/pipeline_import.go

@@ -149,7 +149,7 @@ func (api *API) putImportPipelineHandler() service.Handler {
 		pip, allMsg, err := pipeline.ParseAndImport(ctx, tx, api.Cache, *proj, data, getAPIConsumer(ctx), pipeline.ImportOptions{Force: true, PipelineName: pipelineName})
 		msgListString := translate(allMsg)
 		if err != nil {
-			return sdk.NewErrorWithStack(err, sdk.NewErrorFrom(sdk.ErrInvalidPipeline, "unable to parse and import pipeline"))
+			return sdk.ErrorWithFallback(err, sdk.ErrWrongRequest, "unable to import pipeline")
 		}
 
 		if err := tx.Commit(); err != nil {

sdk/error.go

@@ -499,7 +499,7 @@ func (w errorWithStack) Format(s fmt.State, verb rune) {
 // ErrorWithFallback returns the current error if it's not a ErrUnknownError else it returns a new ErrorWithStack
 func ErrorWithFallback(err error, httpError Error, from string, args ...interface{}) error {
 	if ErrorIs(err, ErrUnknownError) {
-		return NewErrorWithStack(err, NewError(ErrWrongRequest, fmt.Errorf(from, args...)))
+		return NewErrorWithStack(err, NewError(httpError, fmt.Errorf(from, args...)))
 	}
 	return err
 }

sdk/exportentities/pipeline.go

@@ -269,6 +269,10 @@ func computeJob(name string, j Job) (*sdk.Job, error) {
 	}
 	job.Action.Actions = children
 
+	if err := job.Action.Requirements.IsValid(); err != nil {
+		return nil, err
+	}
+
 	return &job, nil
 }
 

sdk/pipeline.go

@@ -21,6 +21,14 @@ type Pipeline struct {
 	WorkflowAscodeHolder *Workflow `json:"workflow_ascode_holder,omitempty" cli:"-" db:"-"`
 }
 
+func (p Pipeline) IsValid() error {
+	// check pipeline name pattern
+	if regexp := NamePatternRegex; !regexp.MatchString(p.Name) {
+		return NewErrorFrom(ErrInvalidPipelinePattern, "pipeline name %s do not respect pattern %s", p.Name, NamePattern)
+	}
+	return nil
+}
+
 // PipelineAudit represents pipeline audit
 type PipelineAudit struct {
 	ID         int64     `json:"id" db:"id"`