From 221449ff4a1116000869609a4339b48375c7376c Mon Sep 17 00:00:00 2001 From: Miguel Martinez Date: Tue, 24 Jun 2025 12:47:25 +0200 Subject: [PATCH] fix; improve wording Signed-off-by: Miguel Martinez --- app/cli/cmd/attestation_reset.go | 7 ++++++- app/cli/internal/action/workflow_run_list.go | 15 ++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/cli/cmd/attestation_reset.go b/app/cli/cmd/attestation_reset.go index f791ec6eb..cc5a5df29 100644 --- a/app/cli/cmd/attestation_reset.go +++ b/app/cli/cmd/attestation_reset.go @@ -50,7 +50,12 @@ func newAttestationResetCmd() *cobra.Command { return newGracefulError(err) } - logger.Info().Msg("Attestation canceled") + msg := "Attestation canceled" + if trigger == triggerFailed { + msg = "Attestation marked as failed" + } + + logger.Info().Msg(msg) return nil }, diff --git a/app/cli/internal/action/workflow_run_list.go b/app/cli/internal/action/workflow_run_list.go index 4a4fb82b1..28ae50b9d 100644 --- a/app/cli/internal/action/workflow_run_list.go +++ b/app/cli/internal/action/workflow_run_list.go @@ -115,13 +115,26 @@ func (action *WorkflowRunList) Run(opts *WorkflowRunListOpts) (*PaginatedWorkflo return res, nil } +func humanizedRunStatus(in pb.RunStatus) string { + mapping := map[pb.RunStatus]string{ + pb.RunStatus_RUN_STATUS_UNSPECIFIED: "unspecified", + pb.RunStatus_RUN_STATUS_INITIALIZED: "in progress", + pb.RunStatus_RUN_STATUS_SUCCEEDED: "success", + pb.RunStatus_RUN_STATUS_FAILED: "failed", + pb.RunStatus_RUN_STATUS_CANCELLED: "canceled", + pb.RunStatus_RUN_STATUS_EXPIRED: "expired", + } + + return mapping[in] +} + func pbWorkflowRunItemToAction(in *pb.WorkflowRunItem) *WorkflowRunItem { if in == nil { return nil } item := &WorkflowRunItem{ - ID: in.Id, State: in.State, Reason: in.Reason, CreatedAt: toTimePtr(in.CreatedAt.AsTime()), + ID: in.Id, State: humanizedRunStatus(in.GetStatus()), Reason: in.Reason, CreatedAt: toTimePtr(in.CreatedAt.AsTime()), Workflow: pbWorkflowItemToAction(in.Workflow), RunURL: in.GetJobUrl(), RunnerType: humanizedRunnerType(in.GetRunnerType()),