From 8883fadb9aa0c52671054017b293e66efc8ae411 Mon Sep 17 00:00:00 2001 From: Bence Santha Date: Wed, 2 Oct 2024 10:55:31 +0200 Subject: [PATCH] refactor Signed-off-by: Bence Santha --- routers/api/v1/repo/action.go | 6 ++++-- services/actions/workflow.go | 10 +++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/routers/api/v1/repo/action.go b/routers/api/v1/repo/action.go index a026c66ee4..460f5d0d36 100644 --- a/routers/api/v1/repo/action.go +++ b/routers/api/v1/repo/action.go @@ -623,11 +623,12 @@ func (a ActionWorkflow) ListRepositoryWorkflows(ctx *context.APIContext) { workflows, err := actions_service.ListActionWorkflows(ctx) if err != nil { + ctx.Error(http.StatusInternalServerError, "ListActionWorkflows", err) return } if len(workflows) == 0 { - ctx.JSON(http.StatusNotFound, nil) + ctx.Error(http.StatusNotFound, "ListActionWorkflows", err) return } @@ -679,11 +680,12 @@ func (a ActionWorkflow) GetWorkflow(ctx *context.APIContext) { workflow, err := actions_service.GetActionWorkflow(ctx, workflowID) if err != nil { + ctx.Error(http.StatusInternalServerError, "GetActionWorkflow", err) return } if workflow == nil { - ctx.JSON(http.StatusNotFound, nil) + ctx.Error(http.StatusNotFound, "GetActionWorkflow", err) return } diff --git a/services/actions/workflow.go b/services/actions/workflow.go index a7970a4dd1..f136eb5f7d 100644 --- a/services/actions/workflow.go +++ b/services/actions/workflow.go @@ -138,7 +138,7 @@ func GetActionWorkflow(ctx *context.APIContext, workflowID string) (*api.ActionW } } - return nil, fmt.Errorf("workflow not found") + return nil, fmt.Errorf("workflow '%s' not found", workflowID) } func DisableActionWorkflow(ctx *context.APIContext, workflowID string) error { @@ -150,7 +150,7 @@ func DispatchActionWorkflow(ctx *context.APIContext, workflowID string, opt *api cfg := cfgUnit.ActionsConfig() if cfg.IsWorkflowDisabled(workflowID) { - ctx.Error(http.StatusInternalServerError, "WorkflowDisabled", ctx.Tr("actions.workflow.disabled")) + ctx.Error(http.StatusInternalServerError, "WorkflowDisabled", fmt.Sprintf("workflow '%s' is disabled", workflowID)) return } @@ -164,12 +164,12 @@ func DispatchActionWorkflow(ctx *context.APIContext, workflowID string, opt *api case refName.IsBranch(): runTargetCommit, err = ctx.Repo.GitRepo.GetBranchCommit(refName.BranchName()) default: - ctx.Error(http.StatusInternalServerError, "WorkflowRefNameError", ctx.Tr("form.git_ref_name_error", opt.Ref)) + ctx.Error(http.StatusInternalServerError, "WorkflowRefNameError", fmt.Sprintf("%s must be a well-formed Git reference name.", opt.Ref)) return } if err != nil { - ctx.Error(http.StatusNotFound, "WorkflowRefNotFound", ctx.Tr("form.target_ref_not_exist", opt.Ref)) + ctx.Error(http.StatusNotFound, "WorkflowRefNotFound", fmt.Sprintf("target ref does not exist %s", opt.Ref)) return } @@ -204,7 +204,7 @@ func DispatchActionWorkflow(ctx *context.APIContext, workflowID string, opt *api } if workflow == nil { - ctx.Error(http.StatusNotFound, "WorkflowNotFound", ctx.Tr("actions.workflow.not_found", workflowID)) + ctx.Error(http.StatusNotFound, "WorkflowNotFound", fmt.Sprintf("workflow '%s' is not found", workflowID)) return }