diff --git a/pkg/pipelines/tekton/pipelines_pac_provider.go b/pkg/pipelines/tekton/pipelines_pac_provider.go index caad5bf94a..df45454ad6 100644 --- a/pkg/pipelines/tekton/pipelines_pac_provider.go +++ b/pkg/pipelines/tekton/pipelines_pac_provider.go @@ -30,14 +30,10 @@ func (pp *PipelinesProvider) ConfigurePAC(ctx context.Context, f fn.Function, me return fmt.Errorf("incorrect type of pipelines metadata: %T", metadata) } - var warningMsg string var err error - if warningMsg, err = validatePipeline(f); err != nil { + if err = validatePipeline(f); err != nil { return err } - if warningMsg != "" { - pp.progressListener.Increment(warningMsg) - } if data.ConfigureLocalResources { if err := pp.createLocalPACResources(ctx, f); err != nil { diff --git a/pkg/pipelines/tekton/pipelines_provider.go b/pkg/pipelines/tekton/pipelines_provider.go index a053214fc1..e9240d7fb1 100644 --- a/pkg/pipelines/tekton/pipelines_provider.go +++ b/pkg/pipelines/tekton/pipelines_provider.go @@ -118,14 +118,10 @@ func NewPipelinesProvider(opts ...Opt) *PipelinesProvider { // After the PipelineRun is being initialized, the progress of the PipelineRun is being watched and printed to the output. func (pp *PipelinesProvider) Run(ctx context.Context, f fn.Function) error { pp.progressListener.Increment("Creating Pipeline resources") - var warningMsg string var err error - if warningMsg, err = validatePipeline(f); err != nil { + if err = validatePipeline(f); err != nil { return err } - if warningMsg != "" { - pp.progressListener.Increment(warningMsg) - } client, namespace, err := NewTektonClientAndResolvedNamespace(pp.namespace) if err != nil { diff --git a/pkg/pipelines/tekton/validate.go b/pkg/pipelines/tekton/validate.go index cfe723e7a5..671d123048 100644 --- a/pkg/pipelines/tekton/validate.go +++ b/pkg/pipelines/tekton/validate.go @@ -24,22 +24,21 @@ func (e ErrRuntimeNotSupported) Error() string { return fmt.Sprintf("runtime %q is not supported for on cluster build with default builders", e.Runtime) } -func validatePipeline(f fn.Function) (string, error) { - var warningMsg string +func validatePipeline(f fn.Function) error { if f.Build.Builder == builders.Pack { if f.Runtime == "" { - return "", ErrRuntimeRequired + return ErrRuntimeRequired } if len(f.Build.Buildpacks) > 0 { - return "", ErrBuilpacksNotSupported + return ErrBuilpacksNotSupported } } else if f.Build.Builder == builders.S2I { _, err := s2i.BuilderImage(f, builders.S2I) - return "", err + return err } else { - return "", builders.ErrUnknownBuilder{Name: f.Build.Builder} + return builders.ErrUnknownBuilder{Name: f.Build.Builder} } - return warningMsg, nil + return nil }