github/kubevela
1
0
Fork 0
mirror of https://github.com/kubevela/kubevela.git synced 2026-08-19 04:26:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: add sub step in vela workflow logs (#4915)

Browse Source 
* Fix: add sub step in vela workflow logs

Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com>

* fix lint

Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com>

Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com>
This commit is contained in:
Tianxin Dong
2022-10-25 16:39:38 +08:00
committed by GitHub
parent 1e3759bb25
commit 2324357907
2 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
references/cli/debug.go
+1
View File
@@ -261,6 +261,7 @@ func wrapStepName(step workflowv1alpha1.StepStatus) string {
}
func unwrapStepName(step string) string {
step = strings.TrimPrefix(step, " ")
switch {
case strings.HasPrefix(step, emojiSucceed):
return strings.TrimPrefix(step, emojiSucceed)
references/cli/workflow.go
+10 -18
View File
@@ -280,7 +280,7 @@ func NewWorkflowLogsCommand(c common.Args, ioStream cmdutil.IOStreams) *cobra.Co
Use: "logs",
Short: "Tail logs for workflow steps",
Long: "Tail logs for workflow steps, note that you need to use op.#Logs in step definition to set the log config of the step.",
Example: "vela workflow logs <application-name>",
Example: "vela workflow logs <workflow-name>",
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) < 1 {
return fmt.Errorf("must specify Application or WorkflowRun name")
@@ -422,7 +422,7 @@ func (w *WorkflowArgs) printStepLogs(ctx context.Context, cli client.Client, ioS
}
logConfig, err := wfUtils.GetLogConfigFromStep(ctx, cli, w.WorkflowInstance.Status.ContextBackend.Name, w.WorkflowInstance.Name, w.WorkflowInstance.Namespace, w.StepName)
if err != nil {
return err
return errors.WithMessage(err, fmt.Sprintf("step [%s]", w.StepName))
}
if err := selectStepLogSource(logConfig); err != nil {
return err
@@ -453,11 +453,17 @@ func (w *WorkflowArgs) printStepLogs(ctx context.Context, cli client.Client, ioS
}
func (w *WorkflowArgs) selectWorkflowStep() error {
steps := make(map[string]workflowv1alpha1.WorkflowStepStatus)
stepsKey := make([]string, 0)
for _, step := range w.WorkflowInstance.Status.Steps {
stepsKey = append(stepsKey, wrapStepName(step.StepStatus))
for _, sub := range step.SubStepsStatus {
stepsKey = append(stepsKey, fmt.Sprintf(" %s", wrapStepName(sub)))
}
}
if len(stepsKey) == 0 {
return fmt.Errorf("workflow is not start")
}
prompt := &survey.Select{
Message: "Select a step to show logs:",
Options: stepsKey,
@@ -465,21 +471,7 @@ func (w *WorkflowArgs) selectWorkflowStep() error {
var stepName string
err := survey.AskOne(prompt, &stepName, survey.WithValidator(survey.Required))
if err != nil {
return fmt.Errorf("failed to select %s: %w", w.StepName, err)
}
if step := steps[w.StepName]; step.Type == wfTypes.WorkflowStepTypeStepGroup {
stepsKey := make([]string, 0)
for _, sub := range step.SubStepsStatus {
stepsKey = append(stepsKey, wrapStepName(sub))
}
prompt := &survey.Select{
Message: "Select a sub step to show logs:",
Options: stepsKey,
}
err := survey.AskOne(prompt, &stepName, survey.WithValidator(survey.Required))
if err != nil {
return fmt.Errorf("failed to select %s: %w", w.StepName, err)
}
return fmt.Errorf("failed to select step %s: %w", unwrapStepName(w.StepName), err)
}
w.StepName = unwrapStepName(stepName)
return nil