From 595a871b0d3aa39cf939cee1ffe6dbefa78dbf57 Mon Sep 17 00:00:00 2001 From: barnettZQG Date: Fri, 28 Oct 2022 13:55:18 +0800 Subject: [PATCH] Fix: change the output Signed-off-by: barnettZQG --- pkg/apiserver/domain/service/pipeline.go | 8 +++----- pkg/apiserver/utils/bcode/017_pipeline.go | 2 -- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkg/apiserver/domain/service/pipeline.go b/pkg/apiserver/domain/service/pipeline.go index d3539c8e9..9594bac36 100644 --- a/pkg/apiserver/domain/service/pipeline.go +++ b/pkg/apiserver/domain/service/pipeline.go @@ -320,8 +320,7 @@ func (p pipelineRunServiceImpl) GetPipelineRunOutput(ctx context.Context, pipeli } ctxBackend := pipelineRun.Status.ContextBackend if ctxBackend == nil { - log.Logger.Errorf("context backend is nil") - return apis.GetPipelineRunOutputResponse{}, bcode.ErrContextBackendNil + return apis.GetPipelineRunOutputResponse{}, nil } v, err := wfUtils.GetDataFromContext(ctx, p.KubeClient, ctxBackend.Name, pipelineRun.PipelineRunName, ctxBackend.Namespace) if err != nil { @@ -377,8 +376,7 @@ func (p pipelineRunServiceImpl) GetPipelineRunInput(ctx context.Context, pipelin } ctxBackend := pipelineRun.Status.ContextBackend if ctxBackend == nil { - log.Logger.Errorf("context backend is nil") - return apis.GetPipelineRunInputResponse{}, bcode.ErrContextBackendNil + return apis.GetPipelineRunInputResponse{}, nil } v, err := wfUtils.GetDataFromContext(ctx, p.KubeClient, ctxBackend.Name, pipelineRun.PipelineRunName, ctxBackend.Namespace) if err != nil { @@ -428,7 +426,7 @@ func haveSubSteps(step *v1alpha1.WorkflowStepStatus, subStep string) (*v1alpha1. func (p pipelineRunServiceImpl) GetPipelineRunLog(ctx context.Context, pipelineRun apis.PipelineRun, step string) (apis.GetPipelineRunLogResponse, error) { project := ctx.Value(&apis.CtxKeyProject).(*model.Project) if pipelineRun.Status.ContextBackend == nil { - return apis.GetPipelineRunLogResponse{}, bcode.ErrContextBackendNil + return apis.GetPipelineRunLogResponse{}, nil } logConfig, err := wfUtils.GetLogConfigFromStep(ctx, p.KubeClient, pipelineRun.Status.ContextBackend.Name, pipelineRun.PipelineName, project.GetNamespace(), step) diff --git a/pkg/apiserver/utils/bcode/017_pipeline.go b/pkg/apiserver/utils/bcode/017_pipeline.go index 5cdc2ce3b..798f4aeb3 100644 --- a/pkg/apiserver/utils/bcode/017_pipeline.go +++ b/pkg/apiserver/utils/bcode/017_pipeline.go @@ -25,8 +25,6 @@ var ( ErrGetPipelineInfo = NewBcode(400, 17003, "get pipeline info failed") // ErrFindingLogPods means no valid pod found ErrFindingLogPods = NewBcode(400, 17004, "failed to find log pods") - // ErrContextBackendNil means context backend field is nil - ErrContextBackendNil = NewBcode(400, 17005, "no context backend found in pipeline") // ErrGetPodsLogs means failed to get pods logs ErrGetPodsLogs = NewBcode(500, 17006, "failed to get pods logs") // ErrReadSourceLog means failed to read source log